Remove generated files, unlike the trunk we assume --enable-java-maintaner-mode

is feasible and desirable.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_1-branch-java-merge-20070117@121126 138bc75d-0d04-0410-961f-82ee72b054a4

15283 files changed, 0 insertions, 386974 deletions

diff --git a/libjava/classpath/lib/gnu/CORBA/Asynchron.class b/libjava/classpath/lib/gnu/CORBA/Asynchron.class
deleted file mode 100644
index 785a3af53d2..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Asynchron.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/BigDecimalHelper.class b/libjava/classpath/lib/gnu/CORBA/BigDecimalHelper.class
deleted file mode 100644
index 89e1b94e81e..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/BigDecimalHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/ByteArrayComparator.class b/libjava/classpath/lib/gnu/CORBA/ByteArrayComparator.class
deleted file mode 100644
index 85adfcd3b6e..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/ByteArrayComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/AbstractCdrInput.class b/libjava/classpath/lib/gnu/CORBA/CDR/AbstractCdrInput.class
deleted file mode 100644
index 74cf0f95395..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/AbstractCdrInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/AbstractCdrOutput.class b/libjava/classpath/lib/gnu/CORBA/CDR/AbstractCdrOutput.class
deleted file mode 100644
index 3da6e965b73..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/AbstractCdrOutput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/AbstractDataInput.class b/libjava/classpath/lib/gnu/CORBA/CDR/AbstractDataInput.class
deleted file mode 100644
index b14322c5b44..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/AbstractDataInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/AbstractDataOutput.class b/libjava/classpath/lib/gnu/CORBA/CDR/AbstractDataOutput.class
deleted file mode 100644
index 0a266486edc..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/AbstractDataOutput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/AligningInput.class b/libjava/classpath/lib/gnu/CORBA/CDR/AligningInput.class
deleted file mode 100644
index 90eeba64f5e..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/AligningInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/AligningOutput.class b/libjava/classpath/lib/gnu/CORBA/CDR/AligningOutput.class
deleted file mode 100644
index 1c08c43371c..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/AligningOutput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/ArrayValueHelper.class b/libjava/classpath/lib/gnu/CORBA/CDR/ArrayValueHelper.class
deleted file mode 100644
index d23c17b4b31..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/ArrayValueHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/BigEndianInputStream.class b/libjava/classpath/lib/gnu/CORBA/CDR/BigEndianInputStream.class
deleted file mode 100644
index 7d6f7925c55..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/BigEndianInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/BigEndianOutputStream.class b/libjava/classpath/lib/gnu/CORBA/CDR/BigEndianOutputStream.class
deleted file mode 100644
index 2481c133870..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/BigEndianOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/BufferedCdrOutput.class b/libjava/classpath/lib/gnu/CORBA/CDR/BufferedCdrOutput.class
deleted file mode 100644
index e0a737cd530..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/BufferedCdrOutput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/BufferredCdrInput.class b/libjava/classpath/lib/gnu/CORBA/CDR/BufferredCdrInput.class
deleted file mode 100644
index d44536091c2..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/BufferredCdrInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/EncapsulationStream.class b/libjava/classpath/lib/gnu/CORBA/CDR/EncapsulationStream.class
deleted file mode 100644
index 15c7a8ecf85..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/EncapsulationStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/HeadlessInput.class b/libjava/classpath/lib/gnu/CORBA/CDR/HeadlessInput.class
deleted file mode 100644
index ad9579001d7..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/HeadlessInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/IDLTypeHelper.class b/libjava/classpath/lib/gnu/CORBA/CDR/IDLTypeHelper.class
deleted file mode 100644
index c1a861d58e5..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/IDLTypeHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/LittleEndianInputStream.class b/libjava/classpath/lib/gnu/CORBA/CDR/LittleEndianInputStream.class
deleted file mode 100644
index c6cfcd242a2..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/LittleEndianInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/LittleEndianOutputStream.class b/libjava/classpath/lib/gnu/CORBA/CDR/LittleEndianOutputStream.class
deleted file mode 100644
index 68855f67040..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/LittleEndianOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/UnknownExceptionCtxHandler.class b/libjava/classpath/lib/gnu/CORBA/CDR/UnknownExceptionCtxHandler.class
deleted file mode 100644
index d778d0d3781..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/UnknownExceptionCtxHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/VMVio.class b/libjava/classpath/lib/gnu/CORBA/CDR/VMVio.class
deleted file mode 100644
index 45ca509ccc8..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/VMVio.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/Vio.class b/libjava/classpath/lib/gnu/CORBA/CDR/Vio.class
deleted file mode 100644
index 1d738de5f76..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/Vio.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime$1.class b/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime$1.class
deleted file mode 100644
index 5df83dc7498..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime$Entry.class b/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime$Entry.class
deleted file mode 100644
index 2ed828f2daf..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime$Entry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime$Redirection.class b/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime$Redirection.class
deleted file mode 100644
index c449d002b2b..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime$Redirection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime.class b/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime.class
deleted file mode 100644
index 3744aa0fc1c..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/gnuRuntime.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CDR/gnuValueStream.class b/libjava/classpath/lib/gnu/CORBA/CDR/gnuValueStream.class
deleted file mode 100644
index 7d2de8d74ce..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CDR/gnuValueStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CdrEncapsCodecImpl.class b/libjava/classpath/lib/gnu/CORBA/CdrEncapsCodecImpl.class
deleted file mode 100644
index 57fcd54ea81..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CdrEncapsCodecImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CollocatedOrbs.class b/libjava/classpath/lib/gnu/CORBA/CollocatedOrbs.class
deleted file mode 100644
index 87c0b3f3b17..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CollocatedOrbs.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Connected_objects$cObject.class b/libjava/classpath/lib/gnu/CORBA/Connected_objects$cObject.class
deleted file mode 100644
index c99cb850ce1..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Connected_objects$cObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Connected_objects.class b/libjava/classpath/lib/gnu/CORBA/Connected_objects.class
deleted file mode 100644
index 4cbca85bad8..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Connected_objects.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/CorbaList.class b/libjava/classpath/lib/gnu/CORBA/CorbaList.class
deleted file mode 100644
index 3a72c1398ab..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/CorbaList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DefaultSocketFactory.class b/libjava/classpath/lib/gnu/CORBA/DefaultSocketFactory.class
deleted file mode 100644
index bab1e26a908..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DefaultSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DefinitionKindHolder.class b/libjava/classpath/lib/gnu/CORBA/DefinitionKindHolder.class
deleted file mode 100644
index 1213b2a4042..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DefinitionKindHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DuplicateNameHolder.class b/libjava/classpath/lib/gnu/CORBA/DuplicateNameHolder.class
deleted file mode 100644
index c4141074d02..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DuplicateNameHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/AbstractAny.class b/libjava/classpath/lib/gnu/CORBA/DynAn/AbstractAny.class
deleted file mode 100644
index 100fea31919..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/AbstractAny.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/DivideableAny.class b/libjava/classpath/lib/gnu/CORBA/DynAn/DivideableAny.class
deleted file mode 100644
index a2b42881116..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/DivideableAny.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/NameValuePairHolder.class b/libjava/classpath/lib/gnu/CORBA/DynAn/NameValuePairHolder.class
deleted file mode 100644
index abe1f1023de..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/NameValuePairHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/RecordAny.class b/libjava/classpath/lib/gnu/CORBA/DynAn/RecordAny.class
deleted file mode 100644
index 6afb7ebcc17..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/RecordAny.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/UndivideableAny.class b/libjava/classpath/lib/gnu/CORBA/DynAn/UndivideableAny.class
deleted file mode 100644
index 70cf1771b8b..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/UndivideableAny.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/ValueChangeListener.class b/libjava/classpath/lib/gnu/CORBA/DynAn/ValueChangeListener.class
deleted file mode 100644
index a6802178d73..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/ValueChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynAny.class b/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynAny.class
deleted file mode 100644
index 1c780c76985..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynAny.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynAnyFactory.class b/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynAnyFactory.class
deleted file mode 100644
index 0be01daf51c..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynAnyFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynArray.class b/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynArray.class
deleted file mode 100644
index 56c73a613ac..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynArray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynEnum.class b/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynEnum.class
deleted file mode 100644
index 930e78e1551..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynEnum.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynFixed.class b/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynFixed.class
deleted file mode 100644
index 1f4a2e63468..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynFixed.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynSequence.class b/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynSequence.class
deleted file mode 100644
index 3ec77c4f276..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynSequence.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynStruct.class b/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynStruct.class
deleted file mode 100644
index d2fd7db4197..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynStruct.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynUnion.class b/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynUnion.class
deleted file mode 100644
index 5e7f599bef1..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynUnion.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynValue.class b/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynValue.class
deleted file mode 100644
index 7389fb9ea8a..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynValueBox.class b/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynValueBox.class
deleted file mode 100644
index 259cfea1302..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAn/gnuDynValueBox.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/DynAnySeqHolder.class b/libjava/classpath/lib/gnu/CORBA/DynAnySeqHolder.class
deleted file mode 100644
index 7d7590257e7..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/DynAnySeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/EmptyExceptionHolder.class b/libjava/classpath/lib/gnu/CORBA/EmptyExceptionHolder.class
deleted file mode 100644
index af7cb100bc7..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/EmptyExceptionHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/ForwardRequestHelper.class b/libjava/classpath/lib/gnu/CORBA/ForwardRequestHelper.class
deleted file mode 100644
index 24582ca8e88..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/ForwardRequestHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/CancelHeader.class b/libjava/classpath/lib/gnu/CORBA/GIOP/CancelHeader.class
deleted file mode 100644
index 748d3a8cdb1..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/CancelHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/CharSets_OSF.class b/libjava/classpath/lib/gnu/CORBA/GIOP/CharSets_OSF.class
deleted file mode 100644
index ed33648bc78..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/CharSets_OSF.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/CloseMessage.class b/libjava/classpath/lib/gnu/CORBA/GIOP/CloseMessage.class
deleted file mode 100644
index d3cee3137c7..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/CloseMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/CodeSetServiceContext.class b/libjava/classpath/lib/gnu/CORBA/GIOP/CodeSetServiceContext.class
deleted file mode 100644
index b78c989ce41..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/CodeSetServiceContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/ContextHandler.class b/libjava/classpath/lib/gnu/CORBA/GIOP/ContextHandler.class
deleted file mode 100644
index 63d4ba20655..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/ContextHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/ErrorMessage.class b/libjava/classpath/lib/gnu/CORBA/GIOP/ErrorMessage.class
deleted file mode 100644
index a30c1d8ed62..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/ErrorMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/MessageHeader.class b/libjava/classpath/lib/gnu/CORBA/GIOP/MessageHeader.class
deleted file mode 100644
index 35147ecbaab..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/MessageHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/ReplyHeader.class b/libjava/classpath/lib/gnu/CORBA/GIOP/ReplyHeader.class
deleted file mode 100644
index 941eb2e4b97..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/ReplyHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/RequestHeader.class b/libjava/classpath/lib/gnu/CORBA/GIOP/RequestHeader.class
deleted file mode 100644
index 21fdb446625..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/RequestHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/ServiceContext.class b/libjava/classpath/lib/gnu/CORBA/GIOP/ServiceContext.class
deleted file mode 100644
index e7dbebf424d..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/ServiceContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/v1_0/CancelHeader.class b/libjava/classpath/lib/gnu/CORBA/GIOP/v1_0/CancelHeader.class
deleted file mode 100644
index 41b8e764778..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/v1_0/CancelHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/v1_0/ReplyHeader.class b/libjava/classpath/lib/gnu/CORBA/GIOP/v1_0/ReplyHeader.class
deleted file mode 100644
index 37f52f82a02..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/v1_0/ReplyHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/v1_0/RequestHeader.class b/libjava/classpath/lib/gnu/CORBA/GIOP/v1_0/RequestHeader.class
deleted file mode 100644
index 9bcc7b4bfa6..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/v1_0/RequestHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/v1_2/ReplyHeader.class b/libjava/classpath/lib/gnu/CORBA/GIOP/v1_2/ReplyHeader.class
deleted file mode 100644
index 3d7f81d01b6..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/v1_2/ReplyHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GIOP/v1_2/RequestHeader.class b/libjava/classpath/lib/gnu/CORBA/GIOP/v1_2/RequestHeader.class
deleted file mode 100644
index 76603214d10..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GIOP/v1_2/RequestHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/GeneralHolder.class b/libjava/classpath/lib/gnu/CORBA/GeneralHolder.class
deleted file mode 100644
index 290badb06fc..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/GeneralHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/HolderLocator.class b/libjava/classpath/lib/gnu/CORBA/HolderLocator.class
deleted file mode 100644
index b9a3bc177b4..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/HolderLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/IOR$CodeSets_profile$CodeSet_component.class b/libjava/classpath/lib/gnu/CORBA/IOR$CodeSets_profile$CodeSet_component.class
deleted file mode 100644
index 3be7042133e..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/IOR$CodeSets_profile$CodeSet_component.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/IOR$CodeSets_profile.class b/libjava/classpath/lib/gnu/CORBA/IOR$CodeSets_profile.class
deleted file mode 100644
index ffdb1728b26..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/IOR$CodeSets_profile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/IOR$Internet_profile.class b/libjava/classpath/lib/gnu/CORBA/IOR$Internet_profile.class
deleted file mode 100644
index d3fdd4a89fc..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/IOR$Internet_profile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/IOR.class b/libjava/classpath/lib/gnu/CORBA/IOR.class
deleted file mode 100644
index b67542dc393..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/IOR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Interceptor/ClientRequestInterceptors.class b/libjava/classpath/lib/gnu/CORBA/Interceptor/ClientRequestInterceptors.class
deleted file mode 100644
index b7a849ec286..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Interceptor/ClientRequestInterceptors.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Interceptor/ForwardRequestHolder.class b/libjava/classpath/lib/gnu/CORBA/Interceptor/ForwardRequestHolder.class
deleted file mode 100644
index f9f78ebfc5e..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Interceptor/ForwardRequestHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Interceptor/IORInterceptors.class b/libjava/classpath/lib/gnu/CORBA/Interceptor/IORInterceptors.class
deleted file mode 100644
index b6eda9e7fe0..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Interceptor/IORInterceptors.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Interceptor/Registrator.class b/libjava/classpath/lib/gnu/CORBA/Interceptor/Registrator.class
deleted file mode 100644
index 1b2bea62185..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Interceptor/Registrator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Interceptor/ServerRequestInterceptors.class b/libjava/classpath/lib/gnu/CORBA/Interceptor/ServerRequestInterceptors.class
deleted file mode 100644
index 1bc41867ded..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Interceptor/ServerRequestInterceptors.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuClientRequestInfo.class b/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuClientRequestInfo.class
deleted file mode 100644
index 5dcc95643c3..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuClientRequestInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuIcCurrent.class b/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuIcCurrent.class
deleted file mode 100644
index e7664a351a1..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuIcCurrent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuIorInfo.class b/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuIorInfo.class
deleted file mode 100644
index 9cf539697c6..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuIorInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuServerRequestInfo.class b/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuServerRequestInfo.class
deleted file mode 100644
index 2331a17ff6c..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Interceptor/gnuServerRequestInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/IorDelegate.class b/libjava/classpath/lib/gnu/CORBA/IorDelegate.class
deleted file mode 100644
index f7c29adc237..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/IorDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/IorObject.class b/libjava/classpath/lib/gnu/CORBA/IorObject.class
deleted file mode 100644
index b0415f7e67d..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/IorObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/IorProvider.class b/libjava/classpath/lib/gnu/CORBA/IorProvider.class
deleted file mode 100644
index 2d47a20a749..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/IorProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Minor.class b/libjava/classpath/lib/gnu/CORBA/Minor.class
deleted file mode 100644
index 0ffafd84214..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Minor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NameDynAnyPairHolder.class b/libjava/classpath/lib/gnu/CORBA/NameDynAnyPairHolder.class
deleted file mode 100644
index 711d8ddf4f5..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NameDynAnyPairHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NameDynAnyPairSeqHolder.class b/libjava/classpath/lib/gnu/CORBA/NameDynAnyPairSeqHolder.class
deleted file mode 100644
index c68ffa75e33..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NameDynAnyPairSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NameValuePairHolder.class b/libjava/classpath/lib/gnu/CORBA/NameValuePairHolder.class
deleted file mode 100644
index c62639ddcd7..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NameValuePairHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NameValuePairSeqHolder.class b/libjava/classpath/lib/gnu/CORBA/NameValuePairSeqHolder.class
deleted file mode 100644
index ccd69b05741..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NameValuePairSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NamingService/Binding_iterator_impl.class b/libjava/classpath/lib/gnu/CORBA/NamingService/Binding_iterator_impl.class
deleted file mode 100644
index 699ecaa221b..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NamingService/Binding_iterator_impl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NamingService/Ext.class b/libjava/classpath/lib/gnu/CORBA/NamingService/Ext.class
deleted file mode 100644
index b94a7ff4de7..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NamingService/Ext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NamingService/NameComponentComparator.class b/libjava/classpath/lib/gnu/CORBA/NamingService/NameComponentComparator.class
deleted file mode 100644
index 5b06b4528c9..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NamingService/NameComponentComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NamingService/NameParser.class b/libjava/classpath/lib/gnu/CORBA/NamingService/NameParser.class
deleted file mode 100644
index 0cf077e89f4..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NamingService/NameParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NamingService/NameTransformer.class b/libjava/classpath/lib/gnu/CORBA/NamingService/NameTransformer.class
deleted file mode 100644
index a65900972fe..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NamingService/NameTransformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NamingService/NameValidator.class b/libjava/classpath/lib/gnu/CORBA/NamingService/NameValidator.class
deleted file mode 100644
index ffef004b468..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NamingService/NameValidator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NamingService/NamingMap.class b/libjava/classpath/lib/gnu/CORBA/NamingService/NamingMap.class
deleted file mode 100644
index d82940a577b..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NamingService/NamingMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NamingService/NamingServiceTransient$1.class b/libjava/classpath/lib/gnu/CORBA/NamingService/NamingServiceTransient$1.class
deleted file mode 100644
index 4694671cb6f..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NamingService/NamingServiceTransient$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NamingService/NamingServiceTransient.class b/libjava/classpath/lib/gnu/CORBA/NamingService/NamingServiceTransient.class
deleted file mode 100644
index 4037d10712b..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NamingService/NamingServiceTransient.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/NamingService/TransientContext.class b/libjava/classpath/lib/gnu/CORBA/NamingService/TransientContext.class
deleted file mode 100644
index 1495c4a9522..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/NamingService/TransientContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/ObjectCreator.class b/libjava/classpath/lib/gnu/CORBA/ObjectCreator.class
deleted file mode 100644
index 4e97ba909b2..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/ObjectCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/OctetHolder.class b/libjava/classpath/lib/gnu/CORBA/OctetHolder.class
deleted file mode 100644
index c3dd57adeac..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/OctetHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/OrbFocused.class b/libjava/classpath/lib/gnu/CORBA/OrbFocused.class
deleted file mode 100644
index 153005bc56f..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/OrbFocused.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/OrbFunctional$1.class b/libjava/classpath/lib/gnu/CORBA/OrbFunctional$1.class
deleted file mode 100644
index 2b33d364c38..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/OrbFunctional$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/OrbFunctional$2.class b/libjava/classpath/lib/gnu/CORBA/OrbFunctional$2.class
deleted file mode 100644
index bfe897d2bf4..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/OrbFunctional$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/OrbFunctional$portServer.class b/libjava/classpath/lib/gnu/CORBA/OrbFunctional$portServer.class
deleted file mode 100644
index 459e5c35656..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/OrbFunctional$portServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/OrbFunctional$sharedPortServer.class b/libjava/classpath/lib/gnu/CORBA/OrbFunctional$sharedPortServer.class
deleted file mode 100644
index 73f76bdec5e..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/OrbFunctional$sharedPortServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/OrbFunctional.class b/libjava/classpath/lib/gnu/CORBA/OrbFunctional.class
deleted file mode 100644
index ce4038d40fa..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/OrbFunctional.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/OrbRestricted.class b/libjava/classpath/lib/gnu/CORBA/OrbRestricted.class
deleted file mode 100644
index 0b91fe4d4a0..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/OrbRestricted.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/AOM$Obj.class b/libjava/classpath/lib/gnu/CORBA/Poa/AOM$Obj.class
deleted file mode 100644
index aca1817574e..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/AOM$Obj.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/AOM.class b/libjava/classpath/lib/gnu/CORBA/Poa/AOM.class
deleted file mode 100644
index c361b7d1129..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/AOM.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/AccessiblePolicy.class b/libjava/classpath/lib/gnu/CORBA/Poa/AccessiblePolicy.class
deleted file mode 100644
index f16a829eca8..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/AccessiblePolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/DynamicImpHandler.class b/libjava/classpath/lib/gnu/CORBA/Poa/DynamicImpHandler.class
deleted file mode 100644
index cacffe68c24..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/DynamicImpHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/ForwardRequestHolder.class b/libjava/classpath/lib/gnu/CORBA/Poa/ForwardRequestHolder.class
deleted file mode 100644
index 3fd93be8051..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/ForwardRequestHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/ForwardedServant.class b/libjava/classpath/lib/gnu/CORBA/Poa/ForwardedServant.class
deleted file mode 100644
index c1a615436e2..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/ForwardedServant.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/InvalidPolicyHolder.class b/libjava/classpath/lib/gnu/CORBA/Poa/InvalidPolicyHolder.class
deleted file mode 100644
index 24af65c0af4..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/InvalidPolicyHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/LocalDelegate.class b/libjava/classpath/lib/gnu/CORBA/Poa/LocalDelegate.class
deleted file mode 100644
index 23b18895966..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/LocalDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/LocalRequest.class b/libjava/classpath/lib/gnu/CORBA/Poa/LocalRequest.class
deleted file mode 100644
index 5c46cd7fcd7..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/LocalRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/LocalServerRequest.class b/libjava/classpath/lib/gnu/CORBA/Poa/LocalServerRequest.class
deleted file mode 100644
index ff4005a7940..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/LocalServerRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/ORB_1_4.class b/libjava/classpath/lib/gnu/CORBA/Poa/ORB_1_4.class
deleted file mode 100644
index 380a3915055..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/ORB_1_4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/ServantDelegateImpl.class b/libjava/classpath/lib/gnu/CORBA/Poa/ServantDelegateImpl.class
deleted file mode 100644
index 0f99e142800..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/ServantDelegateImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/StandardPolicies.class b/libjava/classpath/lib/gnu/CORBA/Poa/StandardPolicies.class
deleted file mode 100644
index 8401d6130eb..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/StandardPolicies.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuAdapterActivator.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuAdapterActivator.class
deleted file mode 100644
index 5443062282b..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuAdapterActivator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuForwardRequest.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuForwardRequest.class
deleted file mode 100644
index d916d35d716..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuForwardRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuIdAssignmentPolicy.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuIdAssignmentPolicy.class
deleted file mode 100644
index 990e51d4286..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuIdAssignmentPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuIdUniquenessPolicy.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuIdUniquenessPolicy.class
deleted file mode 100644
index 7d6696a160f..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuIdUniquenessPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuImplicitActivationPolicy.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuImplicitActivationPolicy.class
deleted file mode 100644
index 80c09ade818..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuImplicitActivationPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuLifespanPolicy.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuLifespanPolicy.class
deleted file mode 100644
index 5864cdf75c4..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuLifespanPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuPOA$RefTemplate.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuPOA$RefTemplate.class
deleted file mode 100644
index fa7a1412bd2..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuPOA$RefTemplate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuPOA.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuPOA.class
deleted file mode 100644
index 9a94dd328ff..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuPOA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuPOAManager.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuPOAManager.class
deleted file mode 100644
index 8881d5db133..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuPOAManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuPoaCurrent.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuPoaCurrent.class
deleted file mode 100644
index 8de62d0b68e..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuPoaCurrent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuRequestProcessingPolicy.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuRequestProcessingPolicy.class
deleted file mode 100644
index 0fc5ba4a1cc..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuRequestProcessingPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuServantObject.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuServantObject.class
deleted file mode 100644
index 56b89a3a0a7..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuServantObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuServantRetentionPolicy.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuServantRetentionPolicy.class
deleted file mode 100644
index 40865eb8d26..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuServantRetentionPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Poa/gnuThreadPolicy.class b/libjava/classpath/lib/gnu/CORBA/Poa/gnuThreadPolicy.class
deleted file mode 100644
index bae7864c16c..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Poa/gnuThreadPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/RawReply.class b/libjava/classpath/lib/gnu/CORBA/RawReply.class
deleted file mode 100644
index 097a106907d..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/RawReply.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/ResponseHandlerImpl.class b/libjava/classpath/lib/gnu/CORBA/ResponseHandlerImpl.class
deleted file mode 100644
index 96a4b576bcd..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/ResponseHandlerImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/SafeForDirectCalls.class b/libjava/classpath/lib/gnu/CORBA/SafeForDirectCalls.class
deleted file mode 100644
index d3fbd82b5cb..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/SafeForDirectCalls.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/ServiceDetailHolder.class b/libjava/classpath/lib/gnu/CORBA/ServiceDetailHolder.class
deleted file mode 100644
index 226c3963aa5..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/ServiceDetailHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/ServiceRequestAdapter.class b/libjava/classpath/lib/gnu/CORBA/ServiceRequestAdapter.class
deleted file mode 100644
index bc813062b99..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/ServiceRequestAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/SetOverrideTypeHolder.class b/libjava/classpath/lib/gnu/CORBA/SetOverrideTypeHolder.class
deleted file mode 100644
index df821bfd837..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/SetOverrideTypeHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/SimpleDelegate.class b/libjava/classpath/lib/gnu/CORBA/SimpleDelegate.class
deleted file mode 100644
index 8cff1143472..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/SimpleDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/SocketRepository.class b/libjava/classpath/lib/gnu/CORBA/SocketRepository.class
deleted file mode 100644
index 81448b3b117..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/SocketRepository.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/StreamBasedRequest.class b/libjava/classpath/lib/gnu/CORBA/StreamBasedRequest.class
deleted file mode 100644
index 8cd3433d182..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/StreamBasedRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/StreamHolder.class b/libjava/classpath/lib/gnu/CORBA/StreamHolder.class
deleted file mode 100644
index 5d06c9156af..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/StreamHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/StubLocator.class b/libjava/classpath/lib/gnu/CORBA/StubLocator.class
deleted file mode 100644
index bdd2ca7c258..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/StubLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/TypeCodeHelper.class b/libjava/classpath/lib/gnu/CORBA/TypeCodeHelper.class
deleted file mode 100644
index 091f5413ec3..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/TypeCodeHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/TypeKindNamer.class b/libjava/classpath/lib/gnu/CORBA/TypeKindNamer.class
deleted file mode 100644
index d17efde8352..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/TypeKindNamer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Unexpected.class b/libjava/classpath/lib/gnu/CORBA/Unexpected.class
deleted file mode 100644
index 14e326e42be..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Unexpected.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/Version.class b/libjava/classpath/lib/gnu/CORBA/Version.class
deleted file mode 100644
index 1e420498640..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/Version.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/WCharHolder.class b/libjava/classpath/lib/gnu/CORBA/WCharHolder.class
deleted file mode 100644
index eb7a44e52e1..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/WCharHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/WStringHolder.class b/libjava/classpath/lib/gnu/CORBA/WStringHolder.class
deleted file mode 100644
index 71343782852..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/WStringHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/_PolicyImplBase.class b/libjava/classpath/lib/gnu/CORBA/_PolicyImplBase.class
deleted file mode 100644
index f5520a7359e..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/_PolicyImplBase.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuAny.class b/libjava/classpath/lib/gnu/CORBA/gnuAny.class
deleted file mode 100644
index 266d5ba8259..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuAny.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuCodecFactory.class b/libjava/classpath/lib/gnu/CORBA/gnuCodecFactory.class
deleted file mode 100644
index d739ab5d3db..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuCodecFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuContext.class b/libjava/classpath/lib/gnu/CORBA/gnuContext.class
deleted file mode 100644
index d5c34c6649f..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuContextList.class b/libjava/classpath/lib/gnu/CORBA/gnuContextList.class
deleted file mode 100644
index 11d150dbf51..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuContextList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuEnvironment.class b/libjava/classpath/lib/gnu/CORBA/gnuEnvironment.class
deleted file mode 100644
index 7bf0a1634d2..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuEnvironment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuExceptionList.class b/libjava/classpath/lib/gnu/CORBA/gnuExceptionList.class
deleted file mode 100644
index 4afd4167444..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuExceptionList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuNVList.class b/libjava/classpath/lib/gnu/CORBA/gnuNVList.class
deleted file mode 100644
index d85ebd24911..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuNVList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuNamedValue.class b/libjava/classpath/lib/gnu/CORBA/gnuNamedValue.class
deleted file mode 100644
index 7453402da12..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuNamedValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuRequest$1.class b/libjava/classpath/lib/gnu/CORBA/gnuRequest$1.class
deleted file mode 100644
index 59c92986fb2..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuRequest$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuRequest$2.class b/libjava/classpath/lib/gnu/CORBA/gnuRequest$2.class
deleted file mode 100644
index 81feb54a99d..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuRequest$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuRequest.class b/libjava/classpath/lib/gnu/CORBA/gnuRequest.class
deleted file mode 100644
index c192425288a..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/gnuValueHolder.class b/libjava/classpath/lib/gnu/CORBA/gnuValueHolder.class
deleted file mode 100644
index 0e6db7efef8..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/gnuValueHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/interfaces/SocketFactory.class b/libjava/classpath/lib/gnu/CORBA/interfaces/SocketFactory.class
deleted file mode 100644
index b3bcb327532..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/interfaces/SocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/typecodes/AliasTypeCode.class b/libjava/classpath/lib/gnu/CORBA/typecodes/AliasTypeCode.class
deleted file mode 100644
index 6da15c1abe7..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/typecodes/AliasTypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/typecodes/ArrayTypeCode.class b/libjava/classpath/lib/gnu/CORBA/typecodes/ArrayTypeCode.class
deleted file mode 100644
index 0ad4bb8329d..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/typecodes/ArrayTypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/typecodes/FixedTypeCode.class b/libjava/classpath/lib/gnu/CORBA/typecodes/FixedTypeCode.class
deleted file mode 100644
index 9dda03ad0df..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/typecodes/FixedTypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/typecodes/GeneralTypeCode.class b/libjava/classpath/lib/gnu/CORBA/typecodes/GeneralTypeCode.class
deleted file mode 100644
index 809ec3264e0..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/typecodes/GeneralTypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/typecodes/PrimitiveTypeCode.class b/libjava/classpath/lib/gnu/CORBA/typecodes/PrimitiveTypeCode.class
deleted file mode 100644
index cce5b770b19..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/typecodes/PrimitiveTypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/typecodes/RecordTypeCode$Field.class b/libjava/classpath/lib/gnu/CORBA/typecodes/RecordTypeCode$Field.class
deleted file mode 100644
index 5914e5f824c..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/typecodes/RecordTypeCode$Field.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/typecodes/RecordTypeCode.class b/libjava/classpath/lib/gnu/CORBA/typecodes/RecordTypeCode.class
deleted file mode 100644
index eafcacfee48..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/typecodes/RecordTypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/typecodes/RecursiveTypeCode.class b/libjava/classpath/lib/gnu/CORBA/typecodes/RecursiveTypeCode.class
deleted file mode 100644
index 0059b2f9ab4..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/typecodes/RecursiveTypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/CORBA/typecodes/StringTypeCode.class b/libjava/classpath/lib/gnu/CORBA/typecodes/StringTypeCode.class
deleted file mode 100644
index 0f81c868b67..00000000000
--- a/libjava/classpath/lib/gnu/CORBA/typecodes/StringTypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/LightweightRedirector.class b/libjava/classpath/lib/gnu/awt/LightweightRedirector.class
deleted file mode 100644
index ff065f5dbbb..00000000000
--- a/libjava/classpath/lib/gnu/awt/LightweightRedirector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/j2d/AbstractGraphicsState.class b/libjava/classpath/lib/gnu/awt/j2d/AbstractGraphicsState.class
deleted file mode 100644
index b927ed5e29d..00000000000
--- a/libjava/classpath/lib/gnu/awt/j2d/AbstractGraphicsState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/j2d/DirectRasterGraphics.class b/libjava/classpath/lib/gnu/awt/j2d/DirectRasterGraphics.class
deleted file mode 100644
index fc2165cade2..00000000000
--- a/libjava/classpath/lib/gnu/awt/j2d/DirectRasterGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/j2d/Graphics2DImpl.class b/libjava/classpath/lib/gnu/awt/j2d/Graphics2DImpl.class
deleted file mode 100644
index 1e5afad2b97..00000000000
--- a/libjava/classpath/lib/gnu/awt/j2d/Graphics2DImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/j2d/IntegerGraphicsState$ScreenCoupledImage.class b/libjava/classpath/lib/gnu/awt/j2d/IntegerGraphicsState$ScreenCoupledImage.class
deleted file mode 100644
index c2cc6bca111..00000000000
--- a/libjava/classpath/lib/gnu/awt/j2d/IntegerGraphicsState$ScreenCoupledImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/j2d/IntegerGraphicsState.class b/libjava/classpath/lib/gnu/awt/j2d/IntegerGraphicsState.class
deleted file mode 100644
index 04551d055c6..00000000000
--- a/libjava/classpath/lib/gnu/awt/j2d/IntegerGraphicsState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/j2d/MappedRaster.class b/libjava/classpath/lib/gnu/awt/j2d/MappedRaster.class
deleted file mode 100644
index 8a63c469887..00000000000
--- a/libjava/classpath/lib/gnu/awt/j2d/MappedRaster.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XCanvasPeer$DoMap.class b/libjava/classpath/lib/gnu/awt/xlib/XCanvasPeer$DoMap.class
deleted file mode 100644
index 85e366de381..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XCanvasPeer$DoMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XCanvasPeer.class b/libjava/classpath/lib/gnu/awt/xlib/XCanvasPeer.class
deleted file mode 100644
index 33f2a591284..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XCanvasPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XEventLoop.class b/libjava/classpath/lib/gnu/awt/xlib/XEventLoop.class
deleted file mode 100644
index 08f76c68d82..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XEventLoop.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XEventQueue.class b/libjava/classpath/lib/gnu/awt/xlib/XEventQueue.class
deleted file mode 100644
index 17891b14a27..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XEventQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XFontMetrics.class b/libjava/classpath/lib/gnu/awt/xlib/XFontMetrics.class
deleted file mode 100644
index 0ad67f35ded..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XFontMetrics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XFontPeer.class b/libjava/classpath/lib/gnu/awt/xlib/XFontPeer.class
deleted file mode 100644
index 49be95c4984..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XFontPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XFramePeer.class b/libjava/classpath/lib/gnu/awt/xlib/XFramePeer.class
deleted file mode 100644
index 43e9b4bcb84..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XFramePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XGraphics$XRaster.class b/libjava/classpath/lib/gnu/awt/xlib/XGraphics$XRaster.class
deleted file mode 100644
index 27b14d0b3eb..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XGraphics$XRaster.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XGraphics.class b/libjava/classpath/lib/gnu/awt/xlib/XGraphics.class
deleted file mode 100644
index 02601e0af39..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry.class b/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry.class
deleted file mode 100644
index 7ec5b1ca7e1..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache.class b/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache.class
deleted file mode 100644
index f1ad48c2f9c..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache.class b/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache.class
deleted file mode 100644
index 13d939241c0..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration.class b/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration.class
deleted file mode 100644
index f1ade26026f..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsConfiguration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsDevice.class b/libjava/classpath/lib/gnu/awt/xlib/XGraphicsDevice.class
deleted file mode 100644
index 0acf6d19389..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsDevice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsEnvironment.class b/libjava/classpath/lib/gnu/awt/xlib/XGraphicsEnvironment.class
deleted file mode 100644
index 1d10fa802fd..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XGraphicsEnvironment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XOffScreenImage.class b/libjava/classpath/lib/gnu/awt/xlib/XOffScreenImage.class
deleted file mode 100644
index 5b72ee16129..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XOffScreenImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XPanelPeer.class b/libjava/classpath/lib/gnu/awt/xlib/XPanelPeer.class
deleted file mode 100644
index 861cb40a374..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XPanelPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/awt/xlib/XToolkit.class b/libjava/classpath/lib/gnu/awt/xlib/XToolkit.class
deleted file mode 100644
index cbbe2a92bdd..00000000000
--- a/libjava/classpath/lib/gnu/awt/xlib/XToolkit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/Configuration.class b/libjava/classpath/lib/gnu/classpath/Configuration.class
deleted file mode 100644
index 16a411a5ef2..00000000000
--- a/libjava/classpath/lib/gnu/classpath/Configuration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/ListenerData.class b/libjava/classpath/lib/gnu/classpath/ListenerData.class
deleted file mode 100644
index 2ab92adf60d..00000000000
--- a/libjava/classpath/lib/gnu/classpath/ListenerData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/NotImplementedException.class b/libjava/classpath/lib/gnu/classpath/NotImplementedException.class
deleted file mode 100644
index 56130dfab87..00000000000
--- a/libjava/classpath/lib/gnu/classpath/NotImplementedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/Pointer.class b/libjava/classpath/lib/gnu/classpath/Pointer.class
deleted file mode 100644
index a8fc21f3f6a..00000000000
--- a/libjava/classpath/lib/gnu/classpath/Pointer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/Pointer32.class b/libjava/classpath/lib/gnu/classpath/Pointer32.class
deleted file mode 100644
index e57e4da7542..00000000000
--- a/libjava/classpath/lib/gnu/classpath/Pointer32.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/Pointer64.class b/libjava/classpath/lib/gnu/classpath/Pointer64.class
deleted file mode 100644
index 66c53d93b58..00000000000
--- a/libjava/classpath/lib/gnu/classpath/Pointer64.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/ServiceFactory$ServiceIterator.class b/libjava/classpath/lib/gnu/classpath/ServiceFactory$ServiceIterator.class
deleted file mode 100644
index cd38e30f254..00000000000
--- a/libjava/classpath/lib/gnu/classpath/ServiceFactory$ServiceIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/ServiceFactory.class b/libjava/classpath/lib/gnu/classpath/ServiceFactory.class
deleted file mode 100644
index ea98d904484..00000000000
--- a/libjava/classpath/lib/gnu/classpath/ServiceFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/ServiceProviderLoadingAction.class b/libjava/classpath/lib/gnu/classpath/ServiceProviderLoadingAction.class
deleted file mode 100644
index 3d1680839e1..00000000000
--- a/libjava/classpath/lib/gnu/classpath/ServiceProviderLoadingAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/SystemProperties.class b/libjava/classpath/lib/gnu/classpath/SystemProperties.class
deleted file mode 100644
index 4ed22f83761..00000000000
--- a/libjava/classpath/lib/gnu/classpath/SystemProperties.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/VMStackWalker.class b/libjava/classpath/lib/gnu/classpath/VMStackWalker.class
deleted file mode 100644
index 449d365ed5e..00000000000
--- a/libjava/classpath/lib/gnu/classpath/VMStackWalker.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/debug/Component.class b/libjava/classpath/lib/gnu/classpath/debug/Component.class
deleted file mode 100644
index 70a3533fbbc..00000000000
--- a/libjava/classpath/lib/gnu/classpath/debug/Component.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/debug/PreciseFilter.class b/libjava/classpath/lib/gnu/classpath/debug/PreciseFilter.class
deleted file mode 100644
index 86cc273c0de..00000000000
--- a/libjava/classpath/lib/gnu/classpath/debug/PreciseFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/debug/Simple1LineFormatter.class b/libjava/classpath/lib/gnu/classpath/debug/Simple1LineFormatter.class
deleted file mode 100644
index 0a1b92a0d7e..00000000000
--- a/libjava/classpath/lib/gnu/classpath/debug/Simple1LineFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/debug/SystemLogger.class b/libjava/classpath/lib/gnu/classpath/debug/SystemLogger.class
deleted file mode 100644
index e40478eb4b0..00000000000
--- a/libjava/classpath/lib/gnu/classpath/debug/SystemLogger.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/debug/TeeInputStream.class b/libjava/classpath/lib/gnu/classpath/debug/TeeInputStream.class
deleted file mode 100644
index 7d22a760e8f..00000000000
--- a/libjava/classpath/lib/gnu/classpath/debug/TeeInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/debug/TeeOutputStream.class b/libjava/classpath/lib/gnu/classpath/debug/TeeOutputStream.class
deleted file mode 100644
index 3ec42ac2846..00000000000
--- a/libjava/classpath/lib/gnu/classpath/debug/TeeOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/debug/TeeReader.class b/libjava/classpath/lib/gnu/classpath/debug/TeeReader.class
deleted file mode 100644
index 588fcca6a39..00000000000
--- a/libjava/classpath/lib/gnu/classpath/debug/TeeReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/debug/TeeWriter.class b/libjava/classpath/lib/gnu/classpath/debug/TeeWriter.class
deleted file mode 100644
index 46809bb747e..00000000000
--- a/libjava/classpath/lib/gnu/classpath/debug/TeeWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp$1.class b/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp$1.class
deleted file mode 100644
index ce9e9a32bf2..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp.class b/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp.class
deleted file mode 100644
index e16ddb6b313..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$ClassStatus.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$ClassStatus.class
deleted file mode 100644
index 939e212bd5c..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$ClassStatus.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayReference.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayReference.class
deleted file mode 100644
index bf53f5d8bbd..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayType.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayType.class
deleted file mode 100644
index 2a8546819ce..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ArrayType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassLoaderReference.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassLoaderReference.class
deleted file mode 100644
index 0ca114da20a..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassLoaderReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassObjectReference.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassObjectReference.class
deleted file mode 100644
index 2a7f1ce3623..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassObjectReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassType.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassType.class
deleted file mode 100644
index a5487a1fe40..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ClassType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$Event.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$Event.class
deleted file mode 100644
index 423d818497e..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$Event.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$EventRequest.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$EventRequest.class
deleted file mode 100644
index f33416322d5..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$EventRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$Field.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$Field.class
deleted file mode 100644
index 07312b68429..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$Field.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$InterfaceType.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$InterfaceType.class
deleted file mode 100644
index 90c72fef553..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$InterfaceType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$Method.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$Method.class
deleted file mode 100644
index 886bf971e6a..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$Method.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ObjectReference.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ObjectReference.class
deleted file mode 100644
index e720d5aaff9..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ObjectReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ReferenceType.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ReferenceType.class
deleted file mode 100644
index 6eb00671b80..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ReferenceType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$StackFrame.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$StackFrame.class
deleted file mode 100644
index 01ab67df654..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$StackFrame.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$StringReference.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$StringReference.class
deleted file mode 100644
index 00e831d9d76..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$StringReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadGroupReference.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadGroupReference.class
deleted file mode 100644
index 21bd487e028..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadGroupReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadReference.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadReference.class
deleted file mode 100644
index d86fb49a989..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$ThreadReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$VirtualMachine.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$VirtualMachine.class
deleted file mode 100644
index 0218b6ac69a..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet$VirtualMachine.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet.class
deleted file mode 100644
index a6228afe141..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$CommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$Error.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$Error.class
deleted file mode 100644
index 4fb74b7d5d8..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$Error.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$EventKind.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$EventKind.class
deleted file mode 100644
index cf86889f2b3..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$EventKind.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$InvokeOptions.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$InvokeOptions.class
deleted file mode 100644
index 6ded49a4319..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$InvokeOptions.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$ModKind.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$ModKind.class
deleted file mode 100644
index 8f9f5bd9e6a..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$ModKind.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$StepDepth.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$StepDepth.class
deleted file mode 100644
index 1acc46cf4cb..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$StepDepth.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$StepSize.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$StepSize.class
deleted file mode 100644
index 7331760f652..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$StepSize.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$SuspendPolicy.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$SuspendPolicy.class
deleted file mode 100644
index 0d3d661fcbb..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$SuspendPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$SuspendStatus.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$SuspendStatus.class
deleted file mode 100644
index 278ad885da2..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$SuspendStatus.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$Tag.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$Tag.class
deleted file mode 100644
index f0c90313c4c..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$Tag.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$ThreadStatus.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$ThreadStatus.class
deleted file mode 100644
index 2d3b9aa0234..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$ThreadStatus.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$TypeTag.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$TypeTag.class
deleted file mode 100644
index 0cf5f139350..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$TypeTag.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$Version.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$Version.class
deleted file mode 100644
index f3601fe1967..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants$Version.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants.class b/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants.class
deleted file mode 100644
index 6659ab9ff9a..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/JdwpConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/VMFrame.class b/libjava/classpath/lib/gnu/classpath/jdwp/VMFrame.class
deleted file mode 100644
index 40c8c2da7c2..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/VMFrame.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/VMIdManager$IdFactory.class b/libjava/classpath/lib/gnu/classpath/jdwp/VMIdManager$IdFactory.class
deleted file mode 100644
index 836eecd1980..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/VMIdManager$IdFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/VMIdManager$ReferenceKey.class b/libjava/classpath/lib/gnu/classpath/jdwp/VMIdManager$ReferenceKey.class
deleted file mode 100644
index d23f881a2f3..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/VMIdManager$ReferenceKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/VMIdManager.class b/libjava/classpath/lib/gnu/classpath/jdwp/VMIdManager.class
deleted file mode 100644
index 55b765688d0..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/VMIdManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/VMMethod.class b/libjava/classpath/lib/gnu/classpath/jdwp/VMMethod.class
deleted file mode 100644
index 25cc9e0c40f..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/VMMethod.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class b/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class
deleted file mode 100644
index 7b7be23febc..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/BreakpointEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/BreakpointEvent.class
deleted file mode 100644
index b7e1de9eabb..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/BreakpointEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/ClassPrepareEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/ClassPrepareEvent.class
deleted file mode 100644
index e260ac89f56..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/ClassPrepareEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/ClassUnloadEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/ClassUnloadEvent.class
deleted file mode 100644
index c910a78e804..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/ClassUnloadEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/Event.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/Event.class
deleted file mode 100644
index d7230bd5ab3..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/Event.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/EventManager.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/EventManager.class
deleted file mode 100644
index 49fd7f90d9f..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/EventManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/EventRequest.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/EventRequest.class
deleted file mode 100644
index 2b423e956d2..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/EventRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/ExceptionEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/ExceptionEvent.class
deleted file mode 100644
index 3ce2f59cd27..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/ExceptionEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/MethodEntryEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/MethodEntryEvent.class
deleted file mode 100644
index da1c51d5cfd..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/MethodEntryEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/MethodExitEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/MethodExitEvent.class
deleted file mode 100644
index 59f0f093041..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/MethodExitEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/SingleStepEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/SingleStepEvent.class
deleted file mode 100644
index 8fc0e450b26..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/SingleStepEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/ThreadEndEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/ThreadEndEvent.class
deleted file mode 100644
index 090a690a1bf..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/ThreadEndEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/ThreadStartEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/ThreadStartEvent.class
deleted file mode 100644
index 05fd3dcb570..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/ThreadStartEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/VmDeathEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/VmDeathEvent.class
deleted file mode 100644
index 1bdcec4d586..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/VmDeathEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/VmInitEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/VmInitEvent.class
deleted file mode 100644
index a9795032fbb..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/VmInitEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.class
deleted file mode 100644
index a08cd3265ee..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ClassMatchFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ClassMatchFilter.class
deleted file mode 100644
index 0025509c612..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ClassMatchFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.class
deleted file mode 100644
index 6f60ab9c941..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ConditionalFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ConditionalFilter.class
deleted file mode 100644
index d0471ff1ffe..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ConditionalFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/CountFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/CountFilter.class
deleted file mode 100644
index 0a01eab4902..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/CountFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.class
deleted file mode 100644
index 8c8877a309b..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.class
deleted file mode 100644
index 5b6efd26597..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/IEventFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/IEventFilter.class
deleted file mode 100644
index 4c99806ecee..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/IEventFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.class
deleted file mode 100644
index 9d4534a2b03..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.class
deleted file mode 100644
index 1e8d19b24e6..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/StepFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/StepFilter.class
deleted file mode 100644
index ce6d2fbaca9..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/StepFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.class
deleted file mode 100644
index b9d6d01a9d7..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidClassException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidClassException.class
deleted file mode 100644
index 5ece4d57a57..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidClassException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidClassLoaderException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidClassLoaderException.class
deleted file mode 100644
index 1c99c4b11ea..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidClassLoaderException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidCountException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidCountException.class
deleted file mode 100644
index 7112f8bda36..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidCountException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidEventTypeException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidEventTypeException.class
deleted file mode 100644
index 9101c09ab26..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidEventTypeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidFieldException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidFieldException.class
deleted file mode 100644
index e87690b42d5..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidFieldException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidLocationException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidLocationException.class
deleted file mode 100644
index 337a73b0630..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidLocationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidMethodException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidMethodException.class
deleted file mode 100644
index 03a7ea9fdde..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidMethodException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidObjectException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidObjectException.class
deleted file mode 100644
index e1eeecf02f4..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidObjectException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidStringException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidStringException.class
deleted file mode 100644
index 7973ac6e965..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidStringException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidThreadException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidThreadException.class
deleted file mode 100644
index e12c51e51fa..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidThreadException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidThreadGroupException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidThreadGroupException.class
deleted file mode 100644
index 331d9a27cd3..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/InvalidThreadGroupException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/JdwpException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/JdwpException.class
deleted file mode 100644
index 3076b0bc4b3..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/JdwpException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/JdwpIllegalArgumentException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/JdwpIllegalArgumentException.class
deleted file mode 100644
index 7bdff533ece..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/JdwpIllegalArgumentException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/JdwpInternalErrorException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/JdwpInternalErrorException.class
deleted file mode 100644
index 28a94b94c88..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/JdwpInternalErrorException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/NativeMethodException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/NativeMethodException.class
deleted file mode 100644
index 585ae37c817..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/NativeMethodException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/NotImplementedException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/NotImplementedException.class
deleted file mode 100644
index 8f7bf9c3f58..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/NotImplementedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/exception/VmDeadException.class b/libjava/classpath/lib/gnu/classpath/jdwp/exception/VmDeadException.class
deleted file mode 100644
index ef8d5b27989..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/exception/VmDeadException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/ArrayId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/ArrayId.class
deleted file mode 100644
index 3511ffc9424..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/ArrayId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/ArrayReferenceTypeId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/ArrayReferenceTypeId.class
deleted file mode 100644
index 079eac5e591..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/ArrayReferenceTypeId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/ClassLoaderId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/ClassLoaderId.class
deleted file mode 100644
index 09a781f0109..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/ClassLoaderId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/ClassObjectId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/ClassObjectId.class
deleted file mode 100644
index 91706216d2b..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/ClassObjectId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/ClassReferenceTypeId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/ClassReferenceTypeId.class
deleted file mode 100644
index 3d65d0da2f0..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/ClassReferenceTypeId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.class
deleted file mode 100644
index d8bd1b9be61..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/JdwpId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/JdwpId.class
deleted file mode 100644
index 322ea4ad73f..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/JdwpId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/ObjectId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/ObjectId.class
deleted file mode 100644
index 412d2d5d814..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/ObjectId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/ReferenceTypeId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/ReferenceTypeId.class
deleted file mode 100644
index 65ee9ea2f92..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/ReferenceTypeId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/StringId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/StringId.class
deleted file mode 100644
index 7cc0ed60e16..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/StringId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/ThreadGroupId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/ThreadGroupId.class
deleted file mode 100644
index 2e28ff83cea..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/ThreadGroupId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/id/ThreadId.class b/libjava/classpath/lib/gnu/classpath/jdwp/id/ThreadId.class
deleted file mode 100644
index 37782c54184..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/id/ThreadId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.class
deleted file mode 100644
index 7f0f3a4dade..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.class
deleted file mode 100644
index 686bb6e19cc..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.class
deleted file mode 100644
index 9902c528b95..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.class
deleted file mode 100644
index ce043ddb4db..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class
deleted file mode 100644
index 18757d3f273..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/CommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/CommandSet.class
deleted file mode 100644
index 226489de3a8..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/CommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/EventRequestCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/EventRequestCommandSet.class
deleted file mode 100644
index e1f284cd54d..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/EventRequestCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/FieldCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/FieldCommandSet.class
deleted file mode 100644
index 74685c062e1..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/FieldCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.class
deleted file mode 100644
index 4cf81a22ab1..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/MethodCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/MethodCommandSet.class
deleted file mode 100644
index bc2b3e71917..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/MethodCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class
deleted file mode 100644
index 3efdacfe6b1..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/PacketProcessor.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/PacketProcessor.class
deleted file mode 100644
index 18234c60f7d..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/PacketProcessor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.class
deleted file mode 100644
index 1eedfc1dbe1..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/StackFrameCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/StackFrameCommandSet.class
deleted file mode 100644
index 9e8d2a02bc4..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/StackFrameCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/StringReferenceCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/StringReferenceCommandSet.class
deleted file mode 100644
index 106710539b2..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/StringReferenceCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.class
deleted file mode 100644
index d71fd305474..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.class
deleted file mode 100644
index 7aea1a69560..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.class
deleted file mode 100644
index d92898641f8..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/ITransport.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/ITransport.class
deleted file mode 100644
index 021cbcbc065..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/transport/ITransport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpCommandPacket.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpCommandPacket.class
deleted file mode 100644
index 505622a7da1..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpCommandPacket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpConnection.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpConnection.class
deleted file mode 100644
index 2f1c37d2fd5..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpPacket.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpPacket.class
deleted file mode 100644
index 17eee560910..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpPacket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpReplyPacket.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpReplyPacket.class
deleted file mode 100644
index ccf01789e06..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpReplyPacket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/SocketTransport.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/SocketTransport.class
deleted file mode 100644
index 8d7f0932b02..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/transport/SocketTransport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/TransportException.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/TransportException.class
deleted file mode 100644
index 3064962dbb7..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/transport/TransportException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/TransportFactory$TransportMethod.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/TransportFactory$TransportMethod.class
deleted file mode 100644
index fae00826705..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/transport/TransportFactory$TransportMethod.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/TransportFactory.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/TransportFactory.class
deleted file mode 100644
index 79dc3513ade..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/transport/TransportFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/JdwpString.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/JdwpString.class
deleted file mode 100644
index d37bc871685..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/util/JdwpString.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/LineTable.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/LineTable.class
deleted file mode 100644
index 2d5f61ee0b8..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/util/LineTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/Location.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/Location.class
deleted file mode 100644
index 593418c29b7..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/util/Location.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class
deleted file mode 100644
index 71f7f1f3781..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/Signature.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/Signature.class
deleted file mode 100644
index e9525687d3c..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/util/Signature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/Value.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/Value.class
deleted file mode 100644
index 20293c12746..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/util/Value.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/VariableTable.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/VariableTable.class
deleted file mode 100644
index 7c653c3d6d3..00000000000
--- a/libjava/classpath/lib/gnu/classpath/jdwp/util/VariableTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/Core.class b/libjava/classpath/lib/gnu/gcj/Core.class
deleted file mode 100644
index 8a26255f175..00000000000
--- a/libjava/classpath/lib/gnu/gcj/Core.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/RawData.class b/libjava/classpath/lib/gnu/gcj/RawData.class
deleted file mode 100644
index a00b1c488d4..00000000000
--- a/libjava/classpath/lib/gnu/gcj/RawData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/RawDataManaged.class b/libjava/classpath/lib/gnu/gcj/RawDataManaged.class
deleted file mode 100644
index 7e5b982ce6c..00000000000
--- a/libjava/classpath/lib/gnu/gcj/RawDataManaged.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class b/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class
deleted file mode 100644
index 7efd0fe778b..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/BytesToUnicode.class b/libjava/classpath/lib/gnu/gcj/convert/BytesToUnicode.class
deleted file mode 100644
index dc97d8454fa..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/BytesToUnicode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/CharsetToBytesAdaptor.class b/libjava/classpath/lib/gnu/gcj/convert/CharsetToBytesAdaptor.class
deleted file mode 100644
index cf73dc114e6..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/CharsetToBytesAdaptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Convert.class b/libjava/classpath/lib/gnu/gcj/convert/Convert.class
deleted file mode 100644
index baff2de415f..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Convert.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/IOConverter.class b/libjava/classpath/lib/gnu/gcj/convert/IOConverter.class
deleted file mode 100644
index d283842bba1..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/IOConverter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Input_8859_1.class b/libjava/classpath/lib/gnu/gcj/convert/Input_8859_1.class
deleted file mode 100644
index 8da067f53d1..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Input_8859_1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Input_ASCII.class b/libjava/classpath/lib/gnu/gcj/convert/Input_ASCII.class
deleted file mode 100644
index 584e27b984f..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Input_ASCII.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Input_EUCJIS.class b/libjava/classpath/lib/gnu/gcj/convert/Input_EUCJIS.class
deleted file mode 100644
index 4ff9c7d934c..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Input_EUCJIS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Input_JavaSrc.class b/libjava/classpath/lib/gnu/gcj/convert/Input_JavaSrc.class
deleted file mode 100644
index 795dd8e29bb..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Input_JavaSrc.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Input_SJIS.class b/libjava/classpath/lib/gnu/gcj/convert/Input_SJIS.class
deleted file mode 100644
index b8d120cb0ee..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Input_SJIS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Input_UTF8.class b/libjava/classpath/lib/gnu/gcj/convert/Input_UTF8.class
deleted file mode 100644
index c368e605a25..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Input_UTF8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Input_UnicodeBig.class b/libjava/classpath/lib/gnu/gcj/convert/Input_UnicodeBig.class
deleted file mode 100644
index e3076866997..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Input_UnicodeBig.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Input_UnicodeLittle.class b/libjava/classpath/lib/gnu/gcj/convert/Input_UnicodeLittle.class
deleted file mode 100644
index 6d02c3174b5..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Input_UnicodeLittle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Input_iconv.class b/libjava/classpath/lib/gnu/gcj/convert/Input_iconv.class
deleted file mode 100644
index 6700903f2ac..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Input_iconv.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Output_8859_1.class b/libjava/classpath/lib/gnu/gcj/convert/Output_8859_1.class
deleted file mode 100644
index 8433e736146..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Output_8859_1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Output_ASCII.class b/libjava/classpath/lib/gnu/gcj/convert/Output_ASCII.class
deleted file mode 100644
index 659b00064f4..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Output_ASCII.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Output_EUCJIS.class b/libjava/classpath/lib/gnu/gcj/convert/Output_EUCJIS.class
deleted file mode 100644
index 379ba3decb6..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Output_EUCJIS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Output_JavaSrc.class b/libjava/classpath/lib/gnu/gcj/convert/Output_JavaSrc.class
deleted file mode 100644
index 842d5fac9eb..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Output_JavaSrc.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Output_SJIS.class b/libjava/classpath/lib/gnu/gcj/convert/Output_SJIS.class
deleted file mode 100644
index 2ed3f80373c..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Output_SJIS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Output_UTF8.class b/libjava/classpath/lib/gnu/gcj/convert/Output_UTF8.class
deleted file mode 100644
index f89683a61eb..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Output_UTF8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Output_UnicodeLittleUnmarked.class b/libjava/classpath/lib/gnu/gcj/convert/Output_UnicodeLittleUnmarked.class
deleted file mode 100644
index 69320f86133..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Output_UnicodeLittleUnmarked.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/Output_iconv.class b/libjava/classpath/lib/gnu/gcj/convert/Output_iconv.class
deleted file mode 100644
index 4f743793c9f..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/Output_iconv.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/convert/UnicodeToBytes.class b/libjava/classpath/lib/gnu/gcj/convert/UnicodeToBytes.class
deleted file mode 100644
index 354fb7f58f9..00000000000
--- a/libjava/classpath/lib/gnu/gcj/convert/UnicodeToBytes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/io/DefaultMimeTypes.class b/libjava/classpath/lib/gnu/gcj/io/DefaultMimeTypes.class
deleted file mode 100644
index 2d97570ad38..00000000000
--- a/libjava/classpath/lib/gnu/gcj/io/DefaultMimeTypes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/io/MimeTypes.class b/libjava/classpath/lib/gnu/gcj/io/MimeTypes.class
deleted file mode 100644
index 4d2cc671ae7..00000000000
--- a/libjava/classpath/lib/gnu/gcj/io/MimeTypes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/io/SimpleSHSStream.class b/libjava/classpath/lib/gnu/gcj/io/SimpleSHSStream.class
deleted file mode 100644
index bdd227ec1c9..00000000000
--- a/libjava/classpath/lib/gnu/gcj/io/SimpleSHSStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/jvmti/Breakpoint.class b/libjava/classpath/lib/gnu/gcj/jvmti/Breakpoint.class
deleted file mode 100644
index be2f539139b..00000000000
--- a/libjava/classpath/lib/gnu/gcj/jvmti/Breakpoint.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/jvmti/BreakpointManager.class b/libjava/classpath/lib/gnu/gcj/jvmti/BreakpointManager.class
deleted file mode 100644
index c0bf97744a7..00000000000
--- a/libjava/classpath/lib/gnu/gcj/jvmti/BreakpointManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/jvmti/Location.class b/libjava/classpath/lib/gnu/gcj/jvmti/Location.class
deleted file mode 100644
index 37bcdd962af..00000000000
--- a/libjava/classpath/lib/gnu/gcj/jvmti/Location.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/BootClassLoader.class b/libjava/classpath/lib/gnu/gcj/runtime/BootClassLoader.class
deleted file mode 100644
index 857b7a17cba..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/BootClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/ExtensionClassLoader.class b/libjava/classpath/lib/gnu/gcj/runtime/ExtensionClassLoader.class
deleted file mode 100644
index d0fee5eabd8..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/ExtensionClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/FinalizerThread.class b/libjava/classpath/lib/gnu/gcj/runtime/FinalizerThread.class
deleted file mode 100644
index 40e118d78bb..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/FinalizerThread.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/HelperClassLoader$1.class b/libjava/classpath/lib/gnu/gcj/runtime/HelperClassLoader$1.class
deleted file mode 100644
index 0503a71b279..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/HelperClassLoader$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/HelperClassLoader.class b/libjava/classpath/lib/gnu/gcj/runtime/HelperClassLoader.class
deleted file mode 100644
index 4aac103708c..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/HelperClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/JNIWeakRef.class b/libjava/classpath/lib/gnu/gcj/runtime/JNIWeakRef.class
deleted file mode 100644
index 02793559bc2..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/JNIWeakRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/NameFinder$Addr2Line.class b/libjava/classpath/lib/gnu/gcj/runtime/NameFinder$Addr2Line.class
deleted file mode 100644
index 9299252b2ad..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/NameFinder$Addr2Line.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/NameFinder.class b/libjava/classpath/lib/gnu/gcj/runtime/NameFinder.class
deleted file mode 100644
index 15d34ef9ab5..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/NameFinder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$AccessMode.class b/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$AccessMode.class
deleted file mode 100644
index e5f77e9cee6..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$AccessMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$ByteWrapper.class b/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$ByteWrapper.class
deleted file mode 100644
index ac8b998ccdd..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$ByteWrapper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$HashIterator.class b/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$HashIterator.class
deleted file mode 100644
index d6a39d0acfa..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$HashIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$MapEntry.class b/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$MapEntry.class
deleted file mode 100644
index c07e1c7b9ff..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap$MapEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap.class b/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap.class
deleted file mode 100644
index ff84e010eea..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/PersistentByteMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/SharedLibHelper.class b/libjava/classpath/lib/gnu/gcj/runtime/SharedLibHelper.class
deleted file mode 100644
index 6ed177b738e..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/SharedLibHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/SharedLibLoader.class b/libjava/classpath/lib/gnu/gcj/runtime/SharedLibLoader.class
deleted file mode 100644
index 44636a57257..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/SharedLibLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/StringBuffer.class b/libjava/classpath/lib/gnu/gcj/runtime/StringBuffer.class
deleted file mode 100644
index 69c43c39f80..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/StringBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/runtime/SystemClassLoader.class b/libjava/classpath/lib/gnu/gcj/runtime/SystemClassLoader.class
deleted file mode 100644
index fc6e6a4030a..00000000000
--- a/libjava/classpath/lib/gnu/gcj/runtime/SystemClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Fileset.class b/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Fileset.class
deleted file mode 100644
index 906431cb7a6..00000000000
--- a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Fileset.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Main.class b/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Main.class
deleted file mode 100644
index c785ed41bf7..00000000000
--- a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Main.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Tokenizer.class b/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Tokenizer.class
deleted file mode 100644
index 2ddd589f87e..00000000000
--- a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Tokenizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/util/Debug.class b/libjava/classpath/lib/gnu/gcj/util/Debug.class
deleted file mode 100644
index ac8d1ecde36..00000000000
--- a/libjava/classpath/lib/gnu/gcj/util/Debug.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/Clip.class b/libjava/classpath/lib/gnu/gcj/xlib/Clip.class
deleted file mode 100644
index c01abf5e9b7..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/Clip.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/Colormap.class b/libjava/classpath/lib/gnu/gcj/xlib/Colormap.class
deleted file mode 100644
index ebebe56304b..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/Colormap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/Display.class b/libjava/classpath/lib/gnu/gcj/xlib/Display.class
deleted file mode 100644
index 15ea12b6369..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/Display.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/Drawable.class b/libjava/classpath/lib/gnu/gcj/xlib/Drawable.class
deleted file mode 100644
index 9a3bc4d2f46..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/Drawable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/Font.class b/libjava/classpath/lib/gnu/gcj/xlib/Font.class
deleted file mode 100644
index c54c0dda6a7..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/Font.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/GC.class b/libjava/classpath/lib/gnu/gcj/xlib/GC.class
deleted file mode 100644
index 9d57dc7f3eb..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/GC.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/Pixmap.class b/libjava/classpath/lib/gnu/gcj/xlib/Pixmap.class
deleted file mode 100644
index 9ba88b6d479..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/Pixmap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/Screen.class b/libjava/classpath/lib/gnu/gcj/xlib/Screen.class
deleted file mode 100644
index 24740762e32..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/Screen.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/Visual.class b/libjava/classpath/lib/gnu/gcj/xlib/Visual.class
deleted file mode 100644
index 32ec71e7cd9..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/Visual.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/WMSizeHints.class b/libjava/classpath/lib/gnu/gcj/xlib/WMSizeHints.class
deleted file mode 100644
index 308f6b41940..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/WMSizeHints.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/Window.class b/libjava/classpath/lib/gnu/gcj/xlib/Window.class
deleted file mode 100644
index f7e46480298..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/Window.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/WindowAttributes.class b/libjava/classpath/lib/gnu/gcj/xlib/WindowAttributes.class
deleted file mode 100644
index 7d62e6d3b93..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/WindowAttributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XAnyEvent.class b/libjava/classpath/lib/gnu/gcj/xlib/XAnyEvent.class
deleted file mode 100644
index fdc29098508..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XAnyEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XButtonEvent.class b/libjava/classpath/lib/gnu/gcj/xlib/XButtonEvent.class
deleted file mode 100644
index 8fc07afd90b..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XButtonEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XColor.class b/libjava/classpath/lib/gnu/gcj/xlib/XColor.class
deleted file mode 100644
index 278ca685ab2..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XColor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XConfigureEvent.class b/libjava/classpath/lib/gnu/gcj/xlib/XConfigureEvent.class
deleted file mode 100644
index 30a7162fb9f..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XConfigureEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XConnectException.class b/libjava/classpath/lib/gnu/gcj/xlib/XConnectException.class
deleted file mode 100644
index aad27d57832..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XConnectException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XEvent.class b/libjava/classpath/lib/gnu/gcj/xlib/XEvent.class
deleted file mode 100644
index f646dc0adac..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XException.class b/libjava/classpath/lib/gnu/gcj/xlib/XException.class
deleted file mode 100644
index 59de9dbeeb5..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XExposeEvent.class b/libjava/classpath/lib/gnu/gcj/xlib/XExposeEvent.class
deleted file mode 100644
index 82e1f8dcfe9..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XExposeEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XID.class b/libjava/classpath/lib/gnu/gcj/xlib/XID.class
deleted file mode 100644
index 90062ab4b4e..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XImage.class b/libjava/classpath/lib/gnu/gcj/xlib/XImage.class
deleted file mode 100644
index 53a84317ac3..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/gcj/xlib/XUnmapEvent.class b/libjava/classpath/lib/gnu/gcj/xlib/XUnmapEvent.class
deleted file mode 100644
index 88b5366f320..00000000000
--- a/libjava/classpath/lib/gnu/gcj/xlib/XUnmapEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.class b/libjava/classpath/lib/gnu/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.class
deleted file mode 100644
index cbc0f6fdbd0..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/AWTUtilities$VisibleComponentList.class b/libjava/classpath/lib/gnu/java/awt/AWTUtilities$VisibleComponentList.class
deleted file mode 100644
index fb992fec655..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/AWTUtilities$VisibleComponentList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/AWTUtilities.class b/libjava/classpath/lib/gnu/java/awt/AWTUtilities.class
deleted file mode 100644
index acf2f1ec1f6..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/AWTUtilities.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/BitMaskExtent.class b/libjava/classpath/lib/gnu/java/awt/BitMaskExtent.class
deleted file mode 100644
index 29e68738555..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/BitMaskExtent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/BitwiseXORComposite$GeneralContext.class b/libjava/classpath/lib/gnu/java/awt/BitwiseXORComposite$GeneralContext.class
deleted file mode 100644
index 0d25849129c..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/BitwiseXORComposite$GeneralContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/BitwiseXORComposite$IntContext.class b/libjava/classpath/lib/gnu/java/awt/BitwiseXORComposite$IntContext.class
deleted file mode 100644
index aa889bd088e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/BitwiseXORComposite$IntContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/BitwiseXORComposite.class b/libjava/classpath/lib/gnu/java/awt/BitwiseXORComposite.class
deleted file mode 100644
index b379f7a71c1..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/BitwiseXORComposite.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/Buffers.class b/libjava/classpath/lib/gnu/java/awt/Buffers.class
deleted file mode 100644
index 65e57b89f47..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/Buffers.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/ClasspathToolkit.class b/libjava/classpath/lib/gnu/java/awt/ClasspathToolkit.class
deleted file mode 100644
index b0a5b1497b2..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/ClasspathToolkit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/ComponentDataBlitOp.class b/libjava/classpath/lib/gnu/java/awt/ComponentDataBlitOp.class
deleted file mode 100644
index e65cee5e097..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/ComponentDataBlitOp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/ComponentReshapeEvent.class b/libjava/classpath/lib/gnu/java/awt/ComponentReshapeEvent.class
deleted file mode 100644
index 533e2afd687..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/ComponentReshapeEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/EmbeddedWindow.class b/libjava/classpath/lib/gnu/java/awt/EmbeddedWindow.class
deleted file mode 100644
index 39357c5236a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/EmbeddedWindow.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/EventModifier.class b/libjava/classpath/lib/gnu/java/awt/EventModifier.class
deleted file mode 100644
index d43d64e9386..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/EventModifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/GradientPaintContext.class b/libjava/classpath/lib/gnu/java/awt/GradientPaintContext.class
deleted file mode 100644
index 5d143ffc32e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/GradientPaintContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/LowPriorityEvent.class b/libjava/classpath/lib/gnu/java/awt/LowPriorityEvent.class
deleted file mode 100644
index a35f4de610d..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/LowPriorityEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/CieXyzConverter.class b/libjava/classpath/lib/gnu/java/awt/color/CieXyzConverter.class
deleted file mode 100644
index edf6d328842..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/CieXyzConverter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/ClutProfileConverter.class b/libjava/classpath/lib/gnu/java/awt/color/ClutProfileConverter.class
deleted file mode 100644
index d5d38bb1bbc..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/ClutProfileConverter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/ColorLookUpTable.class b/libjava/classpath/lib/gnu/java/awt/color/ColorLookUpTable.class
deleted file mode 100644
index 899c1588120..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/ColorLookUpTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/ColorSpaceConverter.class b/libjava/classpath/lib/gnu/java/awt/color/ColorSpaceConverter.class
deleted file mode 100644
index 2ca97e2078b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/ColorSpaceConverter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/GrayProfileConverter.class b/libjava/classpath/lib/gnu/java/awt/color/GrayProfileConverter.class
deleted file mode 100644
index bac7ddc7cea..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/GrayProfileConverter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/GrayScaleConverter.class b/libjava/classpath/lib/gnu/java/awt/color/GrayScaleConverter.class
deleted file mode 100644
index 5c1d6fc423b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/GrayScaleConverter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/LinearRGBConverter.class b/libjava/classpath/lib/gnu/java/awt/color/LinearRGBConverter.class
deleted file mode 100644
index 9dd3ecb53c6..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/LinearRGBConverter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/ProfileHeader.class b/libjava/classpath/lib/gnu/java/awt/color/ProfileHeader.class
deleted file mode 100644
index 742a3e36214..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/ProfileHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/PyccConverter.class b/libjava/classpath/lib/gnu/java/awt/color/PyccConverter.class
deleted file mode 100644
index 31e5c148e04..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/PyccConverter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/RgbProfileConverter.class b/libjava/classpath/lib/gnu/java/awt/color/RgbProfileConverter.class
deleted file mode 100644
index 796c205631b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/RgbProfileConverter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/SrgbConverter.class b/libjava/classpath/lib/gnu/java/awt/color/SrgbConverter.class
deleted file mode 100644
index 9b1bd7846a5..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/SrgbConverter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/TagEntry.class b/libjava/classpath/lib/gnu/java/awt/color/TagEntry.class
deleted file mode 100644
index 8671cd128d0..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/TagEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/color/ToneReproductionCurve.class b/libjava/classpath/lib/gnu/java/awt/color/ToneReproductionCurve.class
deleted file mode 100644
index 1058f507380..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/color/ToneReproductionCurve.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.class b/libjava/classpath/lib/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.class
deleted file mode 100644
index a98f2234b92..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.class b/libjava/classpath/lib/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.class
deleted file mode 100644
index 73098309d66..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.class b/libjava/classpath/lib/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.class
deleted file mode 100644
index 802f67c73a3..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.class b/libjava/classpath/lib/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.class
deleted file mode 100644
index e7460d52345..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/FontDelegate.class b/libjava/classpath/lib/gnu/java/awt/font/FontDelegate.class
deleted file mode 100644
index d1a4f5cc05d..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/FontDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/FontFactory.class b/libjava/classpath/lib/gnu/java/awt/font/FontFactory.class
deleted file mode 100644
index 9cbf8ad1ec8..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/FontFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/GNUGlyphVector.class b/libjava/classpath/lib/gnu/java/awt/font/GNUGlyphVector.class
deleted file mode 100644
index 15a63b46234..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/GNUGlyphVector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/AxisHints.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/AxisHints.class
deleted file mode 100644
index a9273d1fa70..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/AxisHints.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/Constants.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/Constants.class
deleted file mode 100644
index d3db2fd0c47..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/Constants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/GlyphHints.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/GlyphHints.class
deleted file mode 100644
index 5324cebe34b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/GlyphHints.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/Latin.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/Latin.class
deleted file mode 100644
index 01014faf23a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/Latin.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/LatinAxis.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/LatinAxis.class
deleted file mode 100644
index ba60a11055f..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/LatinAxis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/LatinMetrics.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/LatinMetrics.class
deleted file mode 100644
index 81c17e85d02..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/LatinMetrics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/Scaler.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/Scaler.class
deleted file mode 100644
index 96ffa84e913..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/Scaler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/Script.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/Script.class
deleted file mode 100644
index d909a152757..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/Script.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/ScriptMetrics.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/ScriptMetrics.class
deleted file mode 100644
index 1e22288fe17..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/ScriptMetrics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/Segment.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/Segment.class
deleted file mode 100644
index a44b85c5781..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/Segment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/autofit/Width.class b/libjava/classpath/lib/gnu/java/awt/font/autofit/Width.class
deleted file mode 100644
index 04a11d86aae..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/autofit/Width.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Dummy.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Dummy.class
deleted file mode 100644
index d070a3e8dde..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Dummy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Type0.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Type0.class
deleted file mode 100644
index 4f9d2e1089d..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Type0.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Type12.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Type12.class
deleted file mode 100644
index e7169e72749..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Type12.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Type4.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Type4.class
deleted file mode 100644
index 7b70521ef2e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap$Type4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap.class
deleted file mode 100644
index a96ede9f3d2..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/CharGlyphMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/GlyphNamer.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/GlyphNamer.class
deleted file mode 100644
index 31a1d649f9b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/GlyphNamer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/MacResourceFork$Resource.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/MacResourceFork$Resource.class
deleted file mode 100644
index 2f54ec7154e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/MacResourceFork$Resource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/MacResourceFork.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/MacResourceFork.class
deleted file mode 100644
index fbb42510d34..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/MacResourceFork.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/NameDecoder.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/NameDecoder.class
deleted file mode 100644
index c2e7a0b817e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/NameDecoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/OpenTypeFont.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/OpenTypeFont.class
deleted file mode 100644
index de0cffd6a27..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/OpenTypeFont.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/OpenTypeFontFactory.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/OpenTypeFontFactory.class
deleted file mode 100644
index 6fe831dcce7..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/OpenTypeFontFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/Scaler.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/Scaler.class
deleted file mode 100644
index b5ce93d5972..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/Scaler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/Fixed.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/Fixed.class
deleted file mode 100644
index 55422175480..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/Fixed.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLoader.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLoader.class
deleted file mode 100644
index 5528bd08e72..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLocator$FourByte.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLocator$FourByte.class
deleted file mode 100644
index d6ffe04c616..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLocator$FourByte.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLocator$TwoByte.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLocator$TwoByte.class
deleted file mode 100644
index 1f218efd928..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLocator$TwoByte.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLocator.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLocator.class
deleted file mode 100644
index 9315d0c6d51..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.class
deleted file mode 100644
index b29fa6ff2d3..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.class
deleted file mode 100644
index 933bf56b537..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/VirtualMachine.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/VirtualMachine.class
deleted file mode 100644
index 2c2fef0ff2b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/VirtualMachine.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/Zone.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/Zone.class
deleted file mode 100644
index d362cb1f426..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/Zone.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/ZonePathIterator.class b/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/ZonePathIterator.class
deleted file mode 100644
index d3f857f76cc..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/font/opentype/truetype/ZonePathIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/image/ImageDecoder$DataInputStreamWrapper.class b/libjava/classpath/lib/gnu/java/awt/image/ImageDecoder$DataInputStreamWrapper.class
deleted file mode 100644
index 0d7d61bdc63..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/image/ImageDecoder$DataInputStreamWrapper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/image/ImageDecoder.class b/libjava/classpath/lib/gnu/java/awt/image/ImageDecoder.class
deleted file mode 100644
index 319ecbcffea..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/image/ImageDecoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/image/XBMDecoder.class b/libjava/classpath/lib/gnu/java/awt/image/XBMDecoder.class
deleted file mode 100644
index b803a7abb7b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/image/XBMDecoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/AbstractGraphics2D.class b/libjava/classpath/lib/gnu/java/awt/java2d/AbstractGraphics2D.class
deleted file mode 100644
index 25b1e1e3d70..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/AbstractGraphics2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/AlphaCompositeContext.class b/libjava/classpath/lib/gnu/java/awt/java2d/AlphaCompositeContext.class
deleted file mode 100644
index 0cc558f9521..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/AlphaCompositeContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/CubicSegment.class b/libjava/classpath/lib/gnu/java/awt/java2d/CubicSegment.class
deleted file mode 100644
index 94b625a0c49..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/CubicSegment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/ImagePaint$ImagePaintContext.class b/libjava/classpath/lib/gnu/java/awt/java2d/ImagePaint$ImagePaintContext.class
deleted file mode 100644
index 79e523895dc..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/ImagePaint$ImagePaintContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/ImagePaint.class b/libjava/classpath/lib/gnu/java/awt/java2d/ImagePaint.class
deleted file mode 100644
index 48e06a2d478..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/ImagePaint.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/LineSegment.class b/libjava/classpath/lib/gnu/java/awt/java2d/LineSegment.class
deleted file mode 100644
index 378a9df0752..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/LineSegment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/PolyEdge.class b/libjava/classpath/lib/gnu/java/awt/java2d/PolyEdge.class
deleted file mode 100644
index a41557a60d3..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/PolyEdge.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/PolyEdgeComparator.class b/libjava/classpath/lib/gnu/java/awt/java2d/PolyEdgeComparator.class
deleted file mode 100644
index 772f42c1cff..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/PolyEdgeComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/QuadSegment.class b/libjava/classpath/lib/gnu/java/awt/java2d/QuadSegment.class
deleted file mode 100644
index 1cdd0b4b96a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/QuadSegment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/RasterGraphics.class b/libjava/classpath/lib/gnu/java/awt/java2d/RasterGraphics.class
deleted file mode 100644
index c52e502d6ed..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/RasterGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/Segment.class b/libjava/classpath/lib/gnu/java/awt/java2d/Segment.class
deleted file mode 100644
index 18d241d4a83..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/Segment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/ShapeCache.class b/libjava/classpath/lib/gnu/java/awt/java2d/ShapeCache.class
deleted file mode 100644
index d82213949e5..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/ShapeCache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/java2d/TexturePaintContext.class b/libjava/classpath/lib/gnu/java/awt/java2d/TexturePaintContext.class
deleted file mode 100644
index e808da67d5c..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/java2d/TexturePaintContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/ClasspathFontPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/ClasspathFontPeer.class
deleted file mode 100644
index a0ed006b9fb..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/ClasspathFontPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/EmbeddedWindowPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/EmbeddedWindowPeer.class
deleted file mode 100644
index 5dc239fd3f7..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/EmbeddedWindowPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/GLightweightPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/GLightweightPeer.class
deleted file mode 100644
index ebb93ecb277..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/GLightweightPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/NativeEventLoopRunningEvent.class b/libjava/classpath/lib/gnu/java/awt/peer/NativeEventLoopRunningEvent.class
deleted file mode 100644
index f49301a7d23..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/NativeEventLoopRunningEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/AsyncImage$Loader.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/AsyncImage$Loader.class
deleted file mode 100644
index 62f7c076f1b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/AsyncImage$Loader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/AsyncImage$NullImageSource.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/AsyncImage$NullImageSource.class
deleted file mode 100644
index 33331c774c9..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/AsyncImage$NullImageSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/AsyncImage.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/AsyncImage.class
deleted file mode 100644
index 884957553cd..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/AsyncImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/BufferedImageGraphics.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/BufferedImageGraphics.class
deleted file mode 100644
index 26ac9f85f48..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/BufferedImageGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class
deleted file mode 100644
index 2c472c48685..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.class
deleted file mode 100644
index c80d33b0a4e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoSurface.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoSurface.class
deleted file mode 100644
index eb4bf173b5c..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoSurface.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.class
deleted file mode 100644
index 326d4355db4..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/ComponentGraphics.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/ComponentGraphics.class
deleted file mode 100644
index 655eba16fc1..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/ComponentGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.class
deleted file mode 100644
index d9a29a2cdb2..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/FreetypeGlyphVector.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/FreetypeGlyphVector.class
deleted file mode 100644
index a3923958161..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/FreetypeGlyphVector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GThreadMutex.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GThreadMutex.class
deleted file mode 100644
index 6362e5c07d8..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GThreadMutex.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.class
deleted file mode 100644
index f24f934b431..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontLineMetrics.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontLineMetrics.class
deleted file mode 100644
index 64d47db6b38..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontLineMetrics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontMetrics.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontMetrics.class
deleted file mode 100644
index 0807a240c95..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer$GdkFontMetrics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class
deleted file mode 100644
index 90698647c89..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkFontPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.class
deleted file mode 100644
index fd4492219aa..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class
deleted file mode 100644
index e62ee53d652..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReader.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReader.class
deleted file mode 100644
index eb61d5056b9..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReaderSpi.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReaderSpi.class
deleted file mode 100644
index 7566b0bc4ba..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufReaderSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriter.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriter.class
deleted file mode 100644
index 6328b156a3d..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriterSpi.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriterSpi.class
deleted file mode 100644
index 54adeb7576e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriterSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$ImageFormatSpec.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$ImageFormatSpec.class
deleted file mode 100644
index 86b97376812..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder$ImageFormatSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class
deleted file mode 100644
index 9b332f9184d..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkRobotPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkRobotPeer.class
deleted file mode 100644
index a3330885a21..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkRobotPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice$X11DisplayMode.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice$X11DisplayMode.class
deleted file mode 100644
index 0494728ecb6..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice$X11DisplayMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class
deleted file mode 100644
index 87481e787dd..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkButtonPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkButtonPeer.class
deleted file mode 100644
index a0e6f0a3cec..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkButtonPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCanvasPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCanvasPeer.class
deleted file mode 100644
index f9d343cca0d..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCanvasPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.class
deleted file mode 100644
index 50d6dbeef8a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCheckboxPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCheckboxPeer.class
deleted file mode 100644
index 511f60b4b74..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCheckboxPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkChoicePeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkChoicePeer.class
deleted file mode 100644
index 7efc35afa27..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkChoicePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkClipboard.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkClipboard.class
deleted file mode 100644
index 863a1746ffc..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkClipboard.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkClipboardNotifier.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkClipboardNotifier.class
deleted file mode 100644
index 0e92e5d438b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkClipboardNotifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.class
deleted file mode 100644
index 097713c014a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer.class
deleted file mode 100644
index 9768413597a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkContainerPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkContainerPeer.class
deleted file mode 100644
index 242bee5d57b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkContainerPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCursor.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCursor.class
deleted file mode 100644
index 233d653bbe1..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkCursor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkDialogPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkDialogPeer.class
deleted file mode 100644
index 95a5653758c..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkDialogPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.class
deleted file mode 100644
index 4243902b29d..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkFileDialogPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkFileDialogPeer.class
deleted file mode 100644
index c869a820d2f..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkFileDialogPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkFramePeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkFramePeer.class
deleted file mode 100644
index f22c732c2a8..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkFramePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkGenericPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkGenericPeer.class
deleted file mode 100644
index 956a5e1c989..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkGenericPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkImage.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkImage.class
deleted file mode 100644
index 07cfdeba7a1..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkImageConsumer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkImageConsumer.class
deleted file mode 100644
index 1879e9feb83..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkImageConsumer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkLabelPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkLabelPeer.class
deleted file mode 100644
index 9188160aaad..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkLabelPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkListPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkListPeer.class
deleted file mode 100644
index 30f3a9866a2..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkListPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMainThread.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMainThread.class
deleted file mode 100644
index 88ae463ff9a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMainThread.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuBarPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuBarPeer.class
deleted file mode 100644
index 8663b43a186..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuBarPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.class
deleted file mode 100644
index 7da4f7ac48e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuItemPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuItemPeer.class
deleted file mode 100644
index 0259bb5f42f..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuItemPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuPeer.class
deleted file mode 100644
index 28d7ed6bbf0..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMenuPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.class
deleted file mode 100644
index 35c5677f5b8..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkPanelPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkPanelPeer.class
deleted file mode 100644
index 4e2760f40c5..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkPanelPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.class
deleted file mode 100644
index fc9d1db17f0..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkScrollPanePeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkScrollPanePeer.class
deleted file mode 100644
index afcc4a75d59..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkScrollPanePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkScrollbarPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkScrollbarPeer.class
deleted file mode 100644
index a3251facead..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkScrollbarPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkSelection.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkSelection.class
deleted file mode 100644
index a01a65b8a51..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkSelection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkTextAreaPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkTextAreaPeer.class
deleted file mode 100644
index 122e3808c43..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkTextAreaPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.class
deleted file mode 100644
index aa0a9ce610a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit$LRUCache.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit$LRUCache.class
deleted file mode 100644
index 685bdaa5986..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit$LRUCache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class
deleted file mode 100644
index 1ccba58c9b5..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkToolkit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkVolatileImage.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkVolatileImage.class
deleted file mode 100644
index c219eaf07f3..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkVolatileImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkWindowPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkWindowPeer.class
deleted file mode 100644
index 49926397575..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkWindowPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/VolatileImageGraphics.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/VolatileImageGraphics.class
deleted file mode 100644
index 76c143e2333..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/gtk/VolatileImageGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.class b/libjava/classpath/lib/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.class
deleted file mode 100644
index 83f88f9fb8a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/headless/HeadlessToolkit.class b/libjava/classpath/lib/gnu/java/awt/peer/headless/HeadlessToolkit.class
deleted file mode 100644
index 609c79cf092..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/headless/HeadlessToolkit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/MainQtThread.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/MainQtThread.class
deleted file mode 100644
index 405283f49fb..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/MainQtThread.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/NativeWrapper.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/NativeWrapper.class
deleted file mode 100644
index a11283bde1b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/NativeWrapper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QMatrix.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QMatrix.class
deleted file mode 100644
index 3a514fe5b94..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QMatrix.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QPainterPath.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QPainterPath.class
deleted file mode 100644
index 86e55c0cada..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QPainterPath.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QPen.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QPen.class
deleted file mode 100644
index 2bb3ebb3ebc..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QPen.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtAudioClip.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtAudioClip.class
deleted file mode 100644
index 134f45c3498..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtAudioClip.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtButtonPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtButtonPeer.class
deleted file mode 100644
index 5f1ae747e75..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtButtonPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtCanvasPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtCanvasPeer.class
deleted file mode 100644
index 21f82b53c18..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtCanvasPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtCheckboxPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtCheckboxPeer.class
deleted file mode 100644
index c3bf72b2b08..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtCheckboxPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtChoicePeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtChoicePeer.class
deleted file mode 100644
index 3b95253e1a0..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtChoicePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtComponentGraphics.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtComponentGraphics.class
deleted file mode 100644
index 62adf5f30cd..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtComponentGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtComponentPeer$RepaintTimerTask.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtComponentPeer$RepaintTimerTask.class
deleted file mode 100644
index 753994d8f9c..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtComponentPeer$RepaintTimerTask.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtComponentPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtComponentPeer.class
deleted file mode 100644
index f41b6b1a33e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtComponentPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtContainerPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtContainerPeer.class
deleted file mode 100644
index 47bd94ed763..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtContainerPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtDialogPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtDialogPeer.class
deleted file mode 100644
index 5123eea84c2..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtDialogPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.class
deleted file mode 100644
index db22dbc97d6..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFileDialogPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFileDialogPeer.class
deleted file mode 100644
index 0ea094826fc..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFileDialogPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFontMetrics.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFontMetrics.class
deleted file mode 100644
index f70900ce602..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFontMetrics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFontPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFontPeer.class
deleted file mode 100644
index dfdfde005b1..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFontPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFramePeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFramePeer.class
deleted file mode 100644
index d658fe22eda..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtFramePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtGraphics.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtGraphics.class
deleted file mode 100644
index 922e7102897..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtGraphicsEnvironment.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtGraphicsEnvironment.class
deleted file mode 100644
index a13721aa2ae..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtGraphicsEnvironment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImage.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImage.class
deleted file mode 100644
index 737657f91f3..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImageConsumer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImageConsumer.class
deleted file mode 100644
index dcbf9f85a61..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImageConsumer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImageDirectGraphics.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImageDirectGraphics.class
deleted file mode 100644
index fd14c75902a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImageDirectGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImageGraphics.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImageGraphics.class
deleted file mode 100644
index 2729dea88a0..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtImageGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtLabelPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtLabelPeer.class
deleted file mode 100644
index afe1edccaab..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtLabelPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtListPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtListPeer.class
deleted file mode 100644
index 68aa5d1c301..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtListPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuBarPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuBarPeer.class
deleted file mode 100644
index 7486b331a07..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuBarPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuComponentPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuComponentPeer.class
deleted file mode 100644
index aa832f3a2ec..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuComponentPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuItemPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuItemPeer.class
deleted file mode 100644
index daf3915702c..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuItemPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuPeer.class
deleted file mode 100644
index cb09534d395..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtMenuPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtPanelPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtPanelPeer.class
deleted file mode 100644
index c2f879ad9ad..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtPanelPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtPopupMenuPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtPopupMenuPeer.class
deleted file mode 100644
index ac7e26a97e2..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtPopupMenuPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtRepaintThread$RepaintComponent.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtRepaintThread$RepaintComponent.class
deleted file mode 100644
index fbe705535c5..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtRepaintThread$RepaintComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtRepaintThread.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtRepaintThread.class
deleted file mode 100644
index 2a608811105..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtRepaintThread.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScreenDevice.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScreenDevice.class
deleted file mode 100644
index d3b13af2084..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScreenDevice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.class
deleted file mode 100644
index ea2937a54b9..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScrollPanePeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScrollPanePeer.class
deleted file mode 100644
index 175f69d486e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScrollPanePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScrollbarPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScrollbarPeer.class
deleted file mode 100644
index 500b12a6752..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtScrollbarPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtTextAreaPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtTextAreaPeer.class
deleted file mode 100644
index 56d5a334ca7..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtTextAreaPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtTextFieldPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtTextFieldPeer.class
deleted file mode 100644
index 63e4fb0b006..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtTextFieldPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtToolkit.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtToolkit.class
deleted file mode 100644
index 40669292c92..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtToolkit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtVolatileImage$1.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtVolatileImage$1.class
deleted file mode 100644
index d290cfd2d64..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtVolatileImage$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtVolatileImage.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtVolatileImage.class
deleted file mode 100644
index d3c5a27e32f..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtVolatileImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtWindowPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/qt/QtWindowPeer.class
deleted file mode 100644
index ae9fa720e73..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/qt/QtWindowPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.class
deleted file mode 100644
index 602b48fb91b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButtonListener.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButtonListener.class
deleted file mode 100644
index 24adbb8af3c..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButtonListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingButtonPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingButtonPeer.class
deleted file mode 100644
index 8c8a09afeeb..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingButtonPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingCanvasPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingCanvasPeer.class
deleted file mode 100644
index d5c8cec0157..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingCanvasPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingComponent.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingComponent.class
deleted file mode 100644
index 75a9113d86e..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingComponentPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingComponentPeer.class
deleted file mode 100644
index 41c7972205c..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingComponentPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingContainerPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingContainerPeer.class
deleted file mode 100644
index edf0a7d0b7b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingContainerPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingFramePeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingFramePeer.class
deleted file mode 100644
index f70594d7b35..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingFramePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.class
deleted file mode 100644
index 2334fe73c75..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingLabelPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingLabelPeer.class
deleted file mode 100644
index 7d34f8504f2..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingLabelPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingListPeer$SwingList.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingListPeer$SwingList.class
deleted file mode 100644
index 6351297a9d0..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingListPeer$SwingList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingListPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingListPeer.class
deleted file mode 100644
index 094a417f432..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingListPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuBarPeer$SwingMenuBar.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuBarPeer$SwingMenuBar.class
deleted file mode 100644
index 0e5d050c32d..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuBarPeer$SwingMenuBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuBarPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuBarPeer.class
deleted file mode 100644
index 6fa417b0fed..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuBarPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuItemPeer$SwingMenuItemListener.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuItemPeer$SwingMenuItemListener.class
deleted file mode 100644
index a9eb8411f24..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuItemPeer$SwingMenuItemListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuItemPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuItemPeer.class
deleted file mode 100644
index c571ead688b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuItemPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuPeer$SwingMenu.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuPeer$SwingMenu.class
deleted file mode 100644
index 409c1f7ac5a..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuPeer$SwingMenu.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuPeer.class
deleted file mode 100644
index b7f8b64235d..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingMenuPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingPanelPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingPanelPeer.class
deleted file mode 100644
index 18e9842d89c..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingPanelPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.class
deleted file mode 100644
index 59edb75bbe0..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextAreaPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextAreaPeer.class
deleted file mode 100644
index e8836be2637..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextAreaPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.class
deleted file mode 100644
index fe242f791dc..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextFieldPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextFieldPeer.class
deleted file mode 100644
index 0250fba193b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingTextFieldPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingToolkit.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingToolkit.class
deleted file mode 100644
index f44acac3806..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingToolkit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingWindowPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingWindowPeer.class
deleted file mode 100644
index f3f2f6fb9a0..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/peer/swing/SwingWindowPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/print/JavaPrinterGraphics.class b/libjava/classpath/lib/gnu/java/awt/print/JavaPrinterGraphics.class
deleted file mode 100644
index fc1d805fe4b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/print/JavaPrinterGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/print/JavaPrinterJob.class b/libjava/classpath/lib/gnu/java/awt/print/JavaPrinterJob.class
deleted file mode 100644
index 823adb2464b..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/print/JavaPrinterJob.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/print/PostScriptGraphics2D.class b/libjava/classpath/lib/gnu/java/awt/print/PostScriptGraphics2D.class
deleted file mode 100644
index a19303c4239..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/print/PostScriptGraphics2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/awt/print/SpooledDocument.class b/libjava/classpath/lib/gnu/java/awt/print/SpooledDocument.class
deleted file mode 100644
index 3fcf170debf..00000000000
--- a/libjava/classpath/lib/gnu/java/awt/print/SpooledDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/BeanInfoEmbryo.class b/libjava/classpath/lib/gnu/java/beans/BeanInfoEmbryo.class
deleted file mode 100644
index c1d5b277caf..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/BeanInfoEmbryo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/DefaultExceptionListener.class b/libjava/classpath/lib/gnu/java/beans/DefaultExceptionListener.class
deleted file mode 100644
index 447615f2ee7..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/DefaultExceptionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/DoubleKey.class b/libjava/classpath/lib/gnu/java/beans/DoubleKey.class
deleted file mode 100644
index 23f32207594..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/DoubleKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/DummyAppletContext.class b/libjava/classpath/lib/gnu/java/beans/DummyAppletContext.class
deleted file mode 100644
index 107f28451ed..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/DummyAppletContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/DummyAppletStub.class b/libjava/classpath/lib/gnu/java/beans/DummyAppletStub.class
deleted file mode 100644
index f15b6dd21bf..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/DummyAppletStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/ExplicitBeanInfo.class b/libjava/classpath/lib/gnu/java/beans/ExplicitBeanInfo.class
deleted file mode 100644
index 6ecc8847a49..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/ExplicitBeanInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/IntrospectionIncubator.class b/libjava/classpath/lib/gnu/java/beans/IntrospectionIncubator.class
deleted file mode 100644
index 8d714b5c02c..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/IntrospectionIncubator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/AbstractContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/AbstractContext.class
deleted file mode 100644
index aacfd92f2e0..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/AbstractContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/AbstractCreatableObjectContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/AbstractCreatableObjectContext.class
deleted file mode 100644
index 16cd898b203..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/AbstractCreatableObjectContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/AbstractElementHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/AbstractElementHandler.class
deleted file mode 100644
index f46cc064370..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/AbstractElementHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/AbstractObjectContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/AbstractObjectContext.class
deleted file mode 100644
index acb6cac35ed..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/AbstractObjectContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/ArrayContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/ArrayContext.class
deleted file mode 100644
index 0d859204211..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/ArrayContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/ArrayHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/ArrayHandler.class
deleted file mode 100644
index c463af07fce..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/ArrayHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/AssemblyException.class b/libjava/classpath/lib/gnu/java/beans/decoder/AssemblyException.class
deleted file mode 100644
index 7ebd9a2c23b..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/AssemblyException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/BooleanHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/BooleanHandler.class
deleted file mode 100644
index ca089192694..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/BooleanHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/ByteHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/ByteHandler.class
deleted file mode 100644
index 593c134a404..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/ByteHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/CharHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/CharHandler.class
deleted file mode 100644
index 66f9e156358..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/CharHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/ClassHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/ClassHandler.class
deleted file mode 100644
index 3f46b96e284..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/ClassHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/ConstructorContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/ConstructorContext.class
deleted file mode 100644
index 5eb460eedf3..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/ConstructorContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/Context.class b/libjava/classpath/lib/gnu/java/beans/decoder/Context.class
deleted file mode 100644
index 8754b12fd37..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/Context.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/DecoderContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/DecoderContext.class
deleted file mode 100644
index e4de1f5def2..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/DecoderContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/DoubleHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/DoubleHandler.class
deleted file mode 100644
index a9c063218ab..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/DoubleHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/DummyContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/DummyContext.class
deleted file mode 100644
index 9877814d6e8..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/DummyContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/DummyHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/DummyHandler.class
deleted file mode 100644
index fdd55743363..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/DummyHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/ElementHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/ElementHandler.class
deleted file mode 100644
index c80530b6ef0..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/ElementHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/FloatHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/FloatHandler.class
deleted file mode 100644
index 64158311e40..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/FloatHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/GrowableArrayContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/GrowableArrayContext.class
deleted file mode 100644
index 18954269711..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/GrowableArrayContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/IndexContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/IndexContext.class
deleted file mode 100644
index 6290b2973af..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/IndexContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/IntHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/IntHandler.class
deleted file mode 100644
index f7bf4d59493..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/IntHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/JavaHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/JavaHandler.class
deleted file mode 100644
index 5a5f3b65d8c..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/JavaHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/LongHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/LongHandler.class
deleted file mode 100644
index 0ec0762a263..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/LongHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/MethodContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/MethodContext.class
deleted file mode 100644
index c2dc1151cf2..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/MethodContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/MethodFinder.class b/libjava/classpath/lib/gnu/java/beans/decoder/MethodFinder.class
deleted file mode 100644
index 8d04024bb81..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/MethodFinder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/NullHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/NullHandler.class
deleted file mode 100644
index 2861be28771..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/NullHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/ObjectContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/ObjectContext.class
deleted file mode 100644
index 2efa16a940f..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/ObjectContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/ObjectHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/ObjectHandler.class
deleted file mode 100644
index 4dc2d191fed..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/ObjectHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ArrayHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ArrayHandlerCreator.class
deleted file mode 100644
index 60d8209c67e..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ArrayHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$BooleanHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$BooleanHandlerCreator.class
deleted file mode 100644
index 172160ffd54..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$BooleanHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ByteHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ByteHandlerCreator.class
deleted file mode 100644
index 745f552df2a..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ByteHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$CharHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$CharHandlerCreator.class
deleted file mode 100644
index 40b14a41a22..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$CharHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ClassHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ClassHandlerCreator.class
deleted file mode 100644
index 711db205b9f..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ClassHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$Creator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$Creator.class
deleted file mode 100644
index d1321619fda..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$Creator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$DoubleHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$DoubleHandlerCreator.class
deleted file mode 100644
index e07c444da61..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$DoubleHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$FloatHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$FloatHandlerCreator.class
deleted file mode 100644
index 7498fb0316a..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$FloatHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$IntHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$IntHandlerCreator.class
deleted file mode 100644
index 4bf147bd89c..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$IntHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$JavaHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$JavaHandlerCreator.class
deleted file mode 100644
index 3bd67f5c40b..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$JavaHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$LongHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$LongHandlerCreator.class
deleted file mode 100644
index 0129d63545b..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$LongHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$NullHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$NullHandlerCreator.class
deleted file mode 100644
index b1ed7ad4fbb..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$NullHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ObjectHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ObjectHandlerCreator.class
deleted file mode 100644
index 4574efc157f..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ObjectHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ShortHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ShortHandlerCreator.class
deleted file mode 100644
index ed04aa5ba4e..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$ShortHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$StringHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$StringHandlerCreator.class
deleted file mode 100644
index 9f5b8049292..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$StringHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$VoidHandlerCreator.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$VoidHandlerCreator.class
deleted file mode 100644
index 2368742b3df..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser$VoidHandlerCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser.class b/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser.class
deleted file mode 100644
index a6b6cc0df92..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PersistenceParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/PropertyContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/PropertyContext.class
deleted file mode 100644
index 28a58910a0d..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/PropertyContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/ShortHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/ShortHandler.class
deleted file mode 100644
index 012ce512026..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/ShortHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/SimpleHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/SimpleHandler.class
deleted file mode 100644
index c549f8af827..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/SimpleHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/StaticMethodContext.class b/libjava/classpath/lib/gnu/java/beans/decoder/StaticMethodContext.class
deleted file mode 100644
index a1ee4aed140..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/StaticMethodContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/StringHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/StringHandler.class
deleted file mode 100644
index 643ed3f395d..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/StringHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/decoder/VoidHandler.class b/libjava/classpath/lib/gnu/java/beans/decoder/VoidHandler.class
deleted file mode 100644
index 82b5e9885b2..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/decoder/VoidHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/editors/ColorEditor.class b/libjava/classpath/lib/gnu/java/beans/editors/ColorEditor.class
deleted file mode 100644
index 5d010e752bb..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/editors/ColorEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/editors/FontEditor.class b/libjava/classpath/lib/gnu/java/beans/editors/FontEditor.class
deleted file mode 100644
index 976d05d7e7d..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/editors/FontEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/editors/NativeBooleanEditor.class b/libjava/classpath/lib/gnu/java/beans/editors/NativeBooleanEditor.class
deleted file mode 100644
index e59fdceca41..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/editors/NativeBooleanEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/editors/NativeByteEditor.class b/libjava/classpath/lib/gnu/java/beans/editors/NativeByteEditor.class
deleted file mode 100644
index acf80903d48..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/editors/NativeByteEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/editors/NativeDoubleEditor.class b/libjava/classpath/lib/gnu/java/beans/editors/NativeDoubleEditor.class
deleted file mode 100644
index 74f6a332217..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/editors/NativeDoubleEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/editors/NativeFloatEditor.class b/libjava/classpath/lib/gnu/java/beans/editors/NativeFloatEditor.class
deleted file mode 100644
index 928dc783ff3..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/editors/NativeFloatEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/editors/NativeIntEditor.class b/libjava/classpath/lib/gnu/java/beans/editors/NativeIntEditor.class
deleted file mode 100644
index 8c95656ed57..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/editors/NativeIntEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/editors/NativeLongEditor.class b/libjava/classpath/lib/gnu/java/beans/editors/NativeLongEditor.class
deleted file mode 100644
index 8c89201a7a2..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/editors/NativeLongEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/editors/NativeShortEditor.class b/libjava/classpath/lib/gnu/java/beans/editors/NativeShortEditor.class
deleted file mode 100644
index f24af87e905..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/editors/NativeShortEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/editors/StringEditor.class b/libjava/classpath/lib/gnu/java/beans/editors/StringEditor.class
deleted file mode 100644
index da5999a779c..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/editors/StringEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/ArrayPersistenceDelegate.class b/libjava/classpath/lib/gnu/java/beans/encoder/ArrayPersistenceDelegate.class
deleted file mode 100644
index 79f80a38423..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/ArrayPersistenceDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/ClassPersistenceDelegate.class b/libjava/classpath/lib/gnu/java/beans/encoder/ClassPersistenceDelegate.class
deleted file mode 100644
index 70dfedff6e4..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/ClassPersistenceDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/CollectionPersistenceDelegate.class b/libjava/classpath/lib/gnu/java/beans/encoder/CollectionPersistenceDelegate.class
deleted file mode 100644
index 7d3450cf4da..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/CollectionPersistenceDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/Context.class b/libjava/classpath/lib/gnu/java/beans/encoder/Context.class
deleted file mode 100644
index 24ca4c464f7..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/Context.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/GenericScannerState.class b/libjava/classpath/lib/gnu/java/beans/encoder/GenericScannerState.class
deleted file mode 100644
index 2a7a74adfcb..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/GenericScannerState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/IgnoringScannerState.class b/libjava/classpath/lib/gnu/java/beans/encoder/IgnoringScannerState.class
deleted file mode 100644
index bfa63af3606..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/IgnoringScannerState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/MapPersistenceDelegate.class b/libjava/classpath/lib/gnu/java/beans/encoder/MapPersistenceDelegate.class
deleted file mode 100644
index e69ab0aba72..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/MapPersistenceDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/ObjectId.class b/libjava/classpath/lib/gnu/java/beans/encoder/ObjectId.class
deleted file mode 100644
index 595699c362e..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/ObjectId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/PrimitivePersistenceDelegate.class b/libjava/classpath/lib/gnu/java/beans/encoder/PrimitivePersistenceDelegate.class
deleted file mode 100644
index cef87423be6..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/PrimitivePersistenceDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/ReportingScannerState.class b/libjava/classpath/lib/gnu/java/beans/encoder/ReportingScannerState.class
deleted file mode 100644
index 7d04254cd53..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/ReportingScannerState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/Root$RootElement.class b/libjava/classpath/lib/gnu/java/beans/encoder/Root$RootElement.class
deleted file mode 100644
index 654bdbb8dd9..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/Root$RootElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/Root.class b/libjava/classpath/lib/gnu/java/beans/encoder/Root.class
deleted file mode 100644
index 134b03eafaf..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/Root.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/ScanEngine.class b/libjava/classpath/lib/gnu/java/beans/encoder/ScanEngine.class
deleted file mode 100644
index 8a7bf56d26a..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/ScanEngine.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/ScannerState.class b/libjava/classpath/lib/gnu/java/beans/encoder/ScannerState.class
deleted file mode 100644
index 5a582aca229..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/ScannerState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/StAXWriter.class b/libjava/classpath/lib/gnu/java/beans/encoder/StAXWriter.class
deleted file mode 100644
index c1799e02b73..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/StAXWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/Writer.class b/libjava/classpath/lib/gnu/java/beans/encoder/Writer.class
deleted file mode 100644
index 52d08008154..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/Writer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/ArrayInstantiation.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/ArrayInstantiation.class
deleted file mode 100644
index 793ebbf999b..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/ArrayInstantiation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/Array_Get.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/Array_Get.class
deleted file mode 100644
index a66241235f4..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/Array_Get.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/Array_Set.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/Array_Set.class
deleted file mode 100644
index 54ef6bccfdf..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/Array_Set.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/ClassResolution.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/ClassResolution.class
deleted file mode 100644
index 07dba7173e7..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/ClassResolution.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/Element.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/Element.class
deleted file mode 100644
index df059b790a4..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/Element.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/List_Get.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/List_Get.class
deleted file mode 100644
index 3e5d0d89452..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/List_Get.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/List_Set.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/List_Set.class
deleted file mode 100644
index ca92bdef0d5..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/List_Set.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/MethodInvocation.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/MethodInvocation.class
deleted file mode 100644
index bad42bcd117..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/MethodInvocation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/NullObject.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/NullObject.class
deleted file mode 100644
index 8ae465fb697..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/NullObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/ObjectInstantiation.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/ObjectInstantiation.class
deleted file mode 100644
index 8c13ec149d9..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/ObjectInstantiation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/ObjectReference.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/ObjectReference.class
deleted file mode 100644
index ad8d84eae5d..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/ObjectReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/PrimitiveInstantiation.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/PrimitiveInstantiation.class
deleted file mode 100644
index dadb0b0cb39..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/PrimitiveInstantiation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/StaticFieldAccess.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/StaticFieldAccess.class
deleted file mode 100644
index 1ed966c5464..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/StaticFieldAccess.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/StaticMethodInvocation.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/StaticMethodInvocation.class
deleted file mode 100644
index 895d02399c8..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/StaticMethodInvocation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/beans/encoder/elements/StringReference.class b/libjava/classpath/lib/gnu/java/beans/encoder/elements/StringReference.class
deleted file mode 100644
index 5b0b7d794c9..00000000000
--- a/libjava/classpath/lib/gnu/java/beans/encoder/elements/StringReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/io/ASN1ParsingException.class b/libjava/classpath/lib/gnu/java/io/ASN1ParsingException.class
deleted file mode 100644
index a17e9703b87..00000000000
--- a/libjava/classpath/lib/gnu/java/io/ASN1ParsingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/io/Base64InputStream.class b/libjava/classpath/lib/gnu/java/io/Base64InputStream.class
deleted file mode 100644
index a6c30791de6..00000000000
--- a/libjava/classpath/lib/gnu/java/io/Base64InputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/io/ClassLoaderObjectInputStream.class b/libjava/classpath/lib/gnu/java/io/ClassLoaderObjectInputStream.class
deleted file mode 100644
index f5db7cc9604..00000000000
--- a/libjava/classpath/lib/gnu/java/io/ClassLoaderObjectInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/io/NullOutputStream.class b/libjava/classpath/lib/gnu/java/io/NullOutputStream.class
deleted file mode 100644
index f42efa75e7c..00000000000
--- a/libjava/classpath/lib/gnu/java/io/NullOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/io/ObjectIdentityMap2Int.class b/libjava/classpath/lib/gnu/java/io/ObjectIdentityMap2Int.class
deleted file mode 100644
index 80de46198f3..00000000000
--- a/libjava/classpath/lib/gnu/java/io/ObjectIdentityMap2Int.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/io/ObjectIdentityWrapper.class b/libjava/classpath/lib/gnu/java/io/ObjectIdentityWrapper.class
deleted file mode 100644
index 6bd97540589..00000000000
--- a/libjava/classpath/lib/gnu/java/io/ObjectIdentityWrapper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/io/PlatformHelper.class b/libjava/classpath/lib/gnu/java/io/PlatformHelper.class
deleted file mode 100644
index 76e89f2ce92..00000000000
--- a/libjava/classpath/lib/gnu/java/io/PlatformHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/ArrayHelper.class b/libjava/classpath/lib/gnu/java/lang/ArrayHelper.class
deleted file mode 100644
index 48181d048b1..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/ArrayHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/CharData.class b/libjava/classpath/lib/gnu/java/lang/CharData.class
deleted file mode 100644
index 44ea768e152..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/CharData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/ClassHelper.class b/libjava/classpath/lib/gnu/java/lang/ClassHelper.class
deleted file mode 100644
index 484c4a8ef80..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/ClassHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/InstrumentationImpl.class b/libjava/classpath/lib/gnu/java/lang/InstrumentationImpl.class
deleted file mode 100644
index e8caf56aec9..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/InstrumentationImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/MainThread.class b/libjava/classpath/lib/gnu/java/lang/MainThread.class
deleted file mode 100644
index 128ba4e0815..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/MainThread.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/VMInstrumentationImpl.class b/libjava/classpath/lib/gnu/java/lang/VMInstrumentationImpl.class
deleted file mode 100644
index d5e8c809454..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/VMInstrumentationImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/BeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/BeanImpl.class
deleted file mode 100644
index 2d188b25901..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/BeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/ClassLoadingMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/ClassLoadingMXBeanImpl.class
deleted file mode 100644
index b6d7413272e..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/ClassLoadingMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/CompilationMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/CompilationMXBeanImpl.class
deleted file mode 100644
index 748d54ffada..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/CompilationMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/GarbageCollectorMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/GarbageCollectorMXBeanImpl.class
deleted file mode 100644
index 9291b170c93..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/GarbageCollectorMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/MemoryMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/MemoryMXBeanImpl.class
deleted file mode 100644
index 714075ef180..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/MemoryMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/MemoryManagerMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/MemoryManagerMXBeanImpl.class
deleted file mode 100644
index 0f457326ea5..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/MemoryManagerMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/MemoryPoolMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/MemoryPoolMXBeanImpl.class
deleted file mode 100644
index b9b285b53b4..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/MemoryPoolMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/OperatingSystemMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/OperatingSystemMXBeanImpl.class
deleted file mode 100644
index 9442a8a9dc8..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/OperatingSystemMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/RuntimeMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/RuntimeMXBeanImpl.class
deleted file mode 100644
index 0a610d9d644..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/RuntimeMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/ThreadMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/ThreadMXBeanImpl.class
deleted file mode 100644
index 8d2f1b09365..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/ThreadMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/VMClassLoadingMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/VMClassLoadingMXBeanImpl.class
deleted file mode 100644
index 988d4fb9f17..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/VMClassLoadingMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/VMCompilationMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/VMCompilationMXBeanImpl.class
deleted file mode 100644
index cd743a65fc2..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/VMCompilationMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.class
deleted file mode 100644
index 7ab86e616d7..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/VMMemoryMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/VMMemoryMXBeanImpl.class
deleted file mode 100644
index 80df17599fe..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/VMMemoryMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.class
deleted file mode 100644
index f5d09aeecef..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.class
deleted file mode 100644
index 422c850ba65..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/VMRuntimeMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/VMRuntimeMXBeanImpl.class
deleted file mode 100644
index 7eee11d9601..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/VMRuntimeMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/management/VMThreadMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/VMThreadMXBeanImpl.class
deleted file mode 100644
index a0589e04554..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/management/VMThreadMXBeanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/ClassSignatureParser.class b/libjava/classpath/lib/gnu/java/lang/reflect/ClassSignatureParser.class
deleted file mode 100644
index cca4f03b466..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/ClassSignatureParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/FieldSignatureParser.class b/libjava/classpath/lib/gnu/java/lang/reflect/FieldSignatureParser.class
deleted file mode 100644
index 0f86cfaab75..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/FieldSignatureParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/GenericArrayTypeImpl.class b/libjava/classpath/lib/gnu/java/lang/reflect/GenericArrayTypeImpl.class
deleted file mode 100644
index 84f2433cbaa..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/GenericArrayTypeImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/GenericSignatureParser.class b/libjava/classpath/lib/gnu/java/lang/reflect/GenericSignatureParser.class
deleted file mode 100644
index 11a8fa0af7b..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/GenericSignatureParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/MethodSignatureParser.class b/libjava/classpath/lib/gnu/java/lang/reflect/MethodSignatureParser.class
deleted file mode 100644
index 29f54424411..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/MethodSignatureParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/ParameterizedTypeImpl.class b/libjava/classpath/lib/gnu/java/lang/reflect/ParameterizedTypeImpl.class
deleted file mode 100644
index a244f0f4313..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/ParameterizedTypeImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/TypeImpl.class b/libjava/classpath/lib/gnu/java/lang/reflect/TypeImpl.class
deleted file mode 100644
index b580459f8ac..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/TypeImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/TypeSignature.class b/libjava/classpath/lib/gnu/java/lang/reflect/TypeSignature.class
deleted file mode 100644
index 80aa4cf7789..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/TypeSignature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/TypeVariableImpl.class b/libjava/classpath/lib/gnu/java/lang/reflect/TypeVariableImpl.class
deleted file mode 100644
index 78946cd10be..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/TypeVariableImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/UnresolvedTypeVariable.class b/libjava/classpath/lib/gnu/java/lang/reflect/UnresolvedTypeVariable.class
deleted file mode 100644
index 07d9a8da059..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/UnresolvedTypeVariable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/lang/reflect/WildcardTypeImpl.class b/libjava/classpath/lib/gnu/java/lang/reflect/WildcardTypeImpl.class
deleted file mode 100644
index 98b51a98f91..00000000000
--- a/libjava/classpath/lib/gnu/java/lang/reflect/WildcardTypeImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/Calendar.class b/libjava/classpath/lib/gnu/java/locale/Calendar.class
deleted file mode 100644
index b7b8240e7de..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/Calendar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/Calendar_de.class b/libjava/classpath/lib/gnu/java/locale/Calendar_de.class
deleted file mode 100644
index 4d8c8cd22fe..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/Calendar_de.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/Calendar_en.class b/libjava/classpath/lib/gnu/java/locale/Calendar_en.class
deleted file mode 100644
index a4bd37bd58c..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/Calendar_en.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/Calendar_nl.class b/libjava/classpath/lib/gnu/java/locale/Calendar_nl.class
deleted file mode 100644
index 12a29098390..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/Calendar_nl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleData.class b/libjava/classpath/lib/gnu/java/locale/LocaleData.class
deleted file mode 100644
index 338cc8fc352..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleHelper.class b/libjava/classpath/lib/gnu/java/locale/LocaleHelper.class
deleted file mode 100644
index 101cf04c4c8..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation.class
deleted file mode 100644
index c9f1dec7e33..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_af_ZA.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_af_ZA.class
deleted file mode 100644
index 729064cecc5..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_af_ZA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_AE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_AE.class
deleted file mode 100644
index e3c7fc7ce71..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_AE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_BH.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_BH.class
deleted file mode 100644
index b141f210444..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_BH.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_DZ.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_DZ.class
deleted file mode 100644
index fd6305f21b0..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_DZ.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_EG.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_EG.class
deleted file mode 100644
index f0cbb10854d..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_EG.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_IN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_IN.class
deleted file mode 100644
index b2330f00c80..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_IN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_IQ.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_IQ.class
deleted file mode 100644
index e95055012ad..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_IQ.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_JO.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_JO.class
deleted file mode 100644
index 716e7c3d1ed..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_JO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_KW.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_KW.class
deleted file mode 100644
index b24ade7af17..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_KW.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_LB.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_LB.class
deleted file mode 100644
index a64387beb94..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_LB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_LY.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_LY.class
deleted file mode 100644
index 8707922160b..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_LY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_MA.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_MA.class
deleted file mode 100644
index 204f9ad7759..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_MA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_OM.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_OM.class
deleted file mode 100644
index 8f0e338b878..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_OM.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_QA.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_QA.class
deleted file mode 100644
index d9419f3e396..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_QA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_SD.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_SD.class
deleted file mode 100644
index fe2446b0012..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_SD.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_SY.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_SY.class
deleted file mode 100644
index f48749e819e..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_SY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_TN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_TN.class
deleted file mode 100644
index 94d142985d9..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_TN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_YE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_YE.class
deleted file mode 100644
index 277a3317448..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ar_YE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_be_BY.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_be_BY.class
deleted file mode 100644
index 21f5f50c372..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_be_BY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_bn_IN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_bn_IN.class
deleted file mode 100644
index f3ad3dff5f2..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_bn_IN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_br_FR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_br_FR.class
deleted file mode 100644
index 08a98b7d84d..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_br_FR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_bs_BA.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_bs_BA.class
deleted file mode 100644
index 358c91182ec..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_bs_BA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ca_ES.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ca_ES.class
deleted file mode 100644
index a06e022c94d..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ca_ES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_cs_CZ.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_cs_CZ.class
deleted file mode 100644
index 269b02094eb..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_cs_CZ.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_cy_GB.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_cy_GB.class
deleted file mode 100644
index 43f59539d40..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_cy_GB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_da_DK.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_da_DK.class
deleted file mode 100644
index f8ab484deae..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_da_DK.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de.class
deleted file mode 100644
index 35e50631876..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_AT.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_AT.class
deleted file mode 100644
index b4183d5e4cf..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_AT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_BE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_BE.class
deleted file mode 100644
index cdb4ed1df84..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_BE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_CH.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_CH.class
deleted file mode 100644
index 03e0f52d6aa..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_CH.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_DE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_DE.class
deleted file mode 100644
index a17a8d0d9ee..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_DE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_LU.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_LU.class
deleted file mode 100644
index 01d8cefca45..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_de_LU.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_el_GR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_el_GR.class
deleted file mode 100644
index 6801e4fa1ff..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_el_GR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en.class
deleted file mode 100644
index 9b0737af2f1..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_AU.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_AU.class
deleted file mode 100644
index b4b4589a967..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_AU.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_BW.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_BW.class
deleted file mode 100644
index b335913c5b2..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_BW.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_CA.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_CA.class
deleted file mode 100644
index fd3662fac6a..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_CA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_DK.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_DK.class
deleted file mode 100644
index b21a64e2ed0..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_DK.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_GB.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_GB.class
deleted file mode 100644
index 726bc09d55e..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_GB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_HK.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_HK.class
deleted file mode 100644
index d93fa78ddf6..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_HK.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_IE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_IE.class
deleted file mode 100644
index 29f94926666..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_IE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_IN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_IN.class
deleted file mode 100644
index 8b481d3a790..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_IN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_NZ.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_NZ.class
deleted file mode 100644
index 79da6e7893f..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_NZ.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_PH.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_PH.class
deleted file mode 100644
index 34b0b6de6b3..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_PH.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_SG.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_SG.class
deleted file mode 100644
index bcac524b291..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_SG.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_US.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_US.class
deleted file mode 100644
index 86ac887c5ba..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_US.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_ZA.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_ZA.class
deleted file mode 100644
index ad39c7410b6..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_ZA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_ZW.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_ZW.class
deleted file mode 100644
index c091717dde6..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_en_ZW.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_AR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_AR.class
deleted file mode 100644
index 89d7016db36..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_AR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_BO.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_BO.class
deleted file mode 100644
index 9fc3b4f1ea4..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_BO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_CL.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_CL.class
deleted file mode 100644
index 2b26bbb4751..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_CL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_CO.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_CO.class
deleted file mode 100644
index a8bdc90aeb7..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_CO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_CR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_CR.class
deleted file mode 100644
index d04fdc6af1e..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_CR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_DO.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_DO.class
deleted file mode 100644
index ab3b866e5b3..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_DO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_EC.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_EC.class
deleted file mode 100644
index e9bfefb3cd5..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_EC.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_ES.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_ES.class
deleted file mode 100644
index d6949ff6b02..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_ES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_GT.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_GT.class
deleted file mode 100644
index d973bd51292..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_GT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_HN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_HN.class
deleted file mode 100644
index 22a9587b1fc..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_HN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_MX.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_MX.class
deleted file mode 100644
index 14b1c58ae7f..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_MX.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_NI.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_NI.class
deleted file mode 100644
index 18e8b732dcf..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_NI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PA.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PA.class
deleted file mode 100644
index 07e1832f4c6..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PE.class
deleted file mode 100644
index 5c979a5bb19..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PR.class
deleted file mode 100644
index 9fd5d7e2b69..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PY.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PY.class
deleted file mode 100644
index a5c2920fd98..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_PY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_SV.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_SV.class
deleted file mode 100644
index 799972be2f9..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_SV.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_US.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_US.class
deleted file mode 100644
index 98642cd3ba1..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_US.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_UY.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_UY.class
deleted file mode 100644
index 1d588f93a7b..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_UY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_VE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_VE.class
deleted file mode 100644
index 807553e5a72..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_es_VE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_et_EE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_et_EE.class
deleted file mode 100644
index 24124993499..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_et_EE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_eu_ES.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_eu_ES.class
deleted file mode 100644
index 19617158941..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_eu_ES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fa_IR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fa_IR.class
deleted file mode 100644
index e66957fc387..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fa_IR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fi_FI.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fi_FI.class
deleted file mode 100644
index 55c2ee410cf..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fi_FI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fo_FO.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fo_FO.class
deleted file mode 100644
index a8dba36d778..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fo_FO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_BE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_BE.class
deleted file mode 100644
index ffaa796c44b..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_BE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_CA.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_CA.class
deleted file mode 100644
index 45f47a39afd..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_CA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_CH.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_CH.class
deleted file mode 100644
index 5d38b8e3add..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_CH.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_FR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_FR.class
deleted file mode 100644
index e9f94c3259d..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_FR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_LU.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_LU.class
deleted file mode 100644
index d85f9c12833..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_fr_LU.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ga_IE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ga_IE.class
deleted file mode 100644
index 49406bdd3c7..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ga_IE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_gd_GB.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_gd_GB.class
deleted file mode 100644
index 783ca689b98..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_gd_GB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_gl_ES.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_gl_ES.class
deleted file mode 100644
index 02d23282fa2..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_gl_ES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_gv_GB.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_gv_GB.class
deleted file mode 100644
index 7d8d888c205..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_gv_GB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_he_IL.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_he_IL.class
deleted file mode 100644
index cdf9faa6813..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_he_IL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_hi_IN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_hi_IN.class
deleted file mode 100644
index 1455cf41094..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_hi_IN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_hr_HR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_hr_HR.class
deleted file mode 100644
index a0b17507e09..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_hr_HR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_hu_HU.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_hu_HU.class
deleted file mode 100644
index 669990ff552..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_hu_HU.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_id_ID.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_id_ID.class
deleted file mode 100644
index f92f3f5b4ec..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_id_ID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_it_CH.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_it_CH.class
deleted file mode 100644
index 84a8630b1ac..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_it_CH.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_it_IT.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_it_IT.class
deleted file mode 100644
index 9ba8a69446d..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_it_IT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_iw_IL.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_iw_IL.class
deleted file mode 100644
index 72274174fe8..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_iw_IL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ja_JP.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ja_JP.class
deleted file mode 100644
index 80cd3d37019..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ja_JP.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ka_GE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ka_GE.class
deleted file mode 100644
index 5fa3ef3ae47..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ka_GE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_kl_GL.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_kl_GL.class
deleted file mode 100644
index b135dd6be12..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_kl_GL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ko_KR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ko_KR.class
deleted file mode 100644
index f15729b3774..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ko_KR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_kw_GB.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_kw_GB.class
deleted file mode 100644
index 6455ce9cabd..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_kw_GB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_lt_LT.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_lt_LT.class
deleted file mode 100644
index a2d480d87f4..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_lt_LT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_lv_LV.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_lv_LV.class
deleted file mode 100644
index 7b1fb49fe94..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_lv_LV.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mi_NZ.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mi_NZ.class
deleted file mode 100644
index b51852fecbd..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mi_NZ.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mk_MK.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mk_MK.class
deleted file mode 100644
index fe192ab51fb..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mk_MK.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mr_IN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mr_IN.class
deleted file mode 100644
index 1d3a552d3e9..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mr_IN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mt_MT.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mt_MT.class
deleted file mode 100644
index f2f84f2dffc..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_mt_MT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nl.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nl.class
deleted file mode 100644
index 9c0d94886a9..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nl_BE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nl_BE.class
deleted file mode 100644
index dca6e00fcfe..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nl_BE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nl_NL.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nl_NL.class
deleted file mode 100644
index 2b56f82dbed..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nl_NL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nn_NO.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nn_NO.class
deleted file mode 100644
index 1bbdb0e6278..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_nn_NO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_no_NO.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_no_NO.class
deleted file mode 100644
index 7790732dc65..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_no_NO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_oc_FR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_oc_FR.class
deleted file mode 100644
index 7dcb834cf48..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_oc_FR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_pl_PL.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_pl_PL.class
deleted file mode 100644
index f74b3d0cd99..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_pl_PL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_pt_BR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_pt_BR.class
deleted file mode 100644
index 2723253fd7e..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_pt_BR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_pt_PT.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_pt_PT.class
deleted file mode 100644
index bf2692ee02a..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_pt_PT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ro_RO.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ro_RO.class
deleted file mode 100644
index 7e8a32cbd1b..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ro_RO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ru_RU.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ru_RU.class
deleted file mode 100644
index ae37812879a..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ru_RU.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ru_UA.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ru_UA.class
deleted file mode 100644
index 65f67e8d30d..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ru_UA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_se_NO.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_se_NO.class
deleted file mode 100644
index df03a3f52c8..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_se_NO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sk_SK.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sk_SK.class
deleted file mode 100644
index a847f706658..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sk_SK.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sl_SI.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sl_SI.class
deleted file mode 100644
index ceed0395b90..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sl_SI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sq_AL.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sq_AL.class
deleted file mode 100644
index f2bf4fae11c..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sq_AL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sr_YU.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sr_YU.class
deleted file mode 100644
index 95386a25b35..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sr_YU.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sv_FI.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sv_FI.class
deleted file mode 100644
index 352e9bf557d..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sv_FI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sv_SE.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sv_SE.class
deleted file mode 100644
index a9f6592fffc..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_sv_SE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ta_IN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ta_IN.class
deleted file mode 100644
index 0df44135d9c..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ta_IN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_te_IN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_te_IN.class
deleted file mode 100644
index 7fda0919519..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_te_IN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_tg_TJ.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_tg_TJ.class
deleted file mode 100644
index 6f137d6aa90..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_tg_TJ.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_tl_PH.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_tl_PH.class
deleted file mode 100644
index 8638b0b4b16..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_tl_PH.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_tr_TR.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_tr_TR.class
deleted file mode 100644
index 37eb8a3ac51..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_tr_TR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_uk_UA.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_uk_UA.class
deleted file mode 100644
index 435c40fcfbc..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_uk_UA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ur_PK.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ur_PK.class
deleted file mode 100644
index f9f79c8c27d..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_ur_PK.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_uz_UZ.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_uz_UZ.class
deleted file mode 100644
index 99520b036fb..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_uz_UZ.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_vi_VN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_vi_VN.class
deleted file mode 100644
index 537181b9971..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_vi_VN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_yi_US.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_yi_US.class
deleted file mode 100644
index 59b99e01411..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_yi_US.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_CN.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_CN.class
deleted file mode 100644
index 248fa2e5e1b..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_CN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_HK.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_HK.class
deleted file mode 100644
index 43826134f7b..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_HK.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_SG.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_SG.class
deleted file mode 100644
index 8129928f8d1..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_SG.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_TW.class b/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_TW.class
deleted file mode 100644
index 075188639f7..00000000000
--- a/libjava/classpath/lib/gnu/java/locale/LocaleInformation_zh_TW.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/math/MPN.class b/libjava/classpath/lib/gnu/java/math/MPN.class
deleted file mode 100644
index 1893134596e..00000000000
--- a/libjava/classpath/lib/gnu/java/math/MPN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/BASE64.class b/libjava/classpath/lib/gnu/java/net/BASE64.class
deleted file mode 100644
index 45e8b6793e2..00000000000
--- a/libjava/classpath/lib/gnu/java/net/BASE64.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/CRLFInputStream.class b/libjava/classpath/lib/gnu/java/net/CRLFInputStream.class
deleted file mode 100644
index 90ac71c5866..00000000000
--- a/libjava/classpath/lib/gnu/java/net/CRLFInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/CRLFOutputStream.class b/libjava/classpath/lib/gnu/java/net/CRLFOutputStream.class
deleted file mode 100644
index 8133d6f5c9d..00000000000
--- a/libjava/classpath/lib/gnu/java/net/CRLFOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/DefaultContentHandlerFactory.class b/libjava/classpath/lib/gnu/java/net/DefaultContentHandlerFactory.class
deleted file mode 100644
index c8df6145f83..00000000000
--- a/libjava/classpath/lib/gnu/java/net/DefaultContentHandlerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/DefaultProxySelector.class b/libjava/classpath/lib/gnu/java/net/DefaultProxySelector.class
deleted file mode 100644
index 7f1ac73b1b8..00000000000
--- a/libjava/classpath/lib/gnu/java/net/DefaultProxySelector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/EmptyX509TrustManager.class b/libjava/classpath/lib/gnu/java/net/EmptyX509TrustManager.class
deleted file mode 100644
index ce58175f9f8..00000000000
--- a/libjava/classpath/lib/gnu/java/net/EmptyX509TrustManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/GetLocalHostAction.class b/libjava/classpath/lib/gnu/java/net/GetLocalHostAction.class
deleted file mode 100644
index ff5b5a4f491..00000000000
--- a/libjava/classpath/lib/gnu/java/net/GetLocalHostAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/HeaderFieldHelper.class b/libjava/classpath/lib/gnu/java/net/HeaderFieldHelper.class
deleted file mode 100644
index 6f6b28abb9c..00000000000
--- a/libjava/classpath/lib/gnu/java/net/HeaderFieldHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/ImageHandler.class b/libjava/classpath/lib/gnu/java/net/ImageHandler.class
deleted file mode 100644
index 02848b621dc..00000000000
--- a/libjava/classpath/lib/gnu/java/net/ImageHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/IndexListParser.class b/libjava/classpath/lib/gnu/java/net/IndexListParser.class
deleted file mode 100644
index 8aa7b07c034..00000000000
--- a/libjava/classpath/lib/gnu/java/net/IndexListParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/LineInputStream.class b/libjava/classpath/lib/gnu/java/net/LineInputStream.class
deleted file mode 100644
index 3f8e906acac..00000000000
--- a/libjava/classpath/lib/gnu/java/net/LineInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class b/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class
deleted file mode 100644
index 376931bdd68..00000000000
--- a/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class
deleted file mode 100644
index c03ad3228a8..00000000000
--- a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class
deleted file mode 100644
index 4b93b302f00..00000000000
--- a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class
deleted file mode 100644
index 7b9e3e8b878..00000000000
--- a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/URLParseError.class b/libjava/classpath/lib/gnu/java/net/URLParseError.class
deleted file mode 100644
index d0b903cd36e..00000000000
--- a/libjava/classpath/lib/gnu/java/net/URLParseError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/FileResource.class b/libjava/classpath/lib/gnu/java/net/loader/FileResource.class
deleted file mode 100644
index a5bf750a841..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/FileResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/FileURLLoader.class b/libjava/classpath/lib/gnu/java/net/loader/FileURLLoader.class
deleted file mode 100644
index 96d33fa16fd..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/FileURLLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/JarURLLoader.class b/libjava/classpath/lib/gnu/java/net/loader/JarURLLoader.class
deleted file mode 100644
index 403e4e967e9..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/JarURLLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/JarURLResource.class b/libjava/classpath/lib/gnu/java/net/loader/JarURLResource.class
deleted file mode 100644
index 1ceca69272c..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/JarURLResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/Load_gcjlib$SoResource.class b/libjava/classpath/lib/gnu/java/net/loader/Load_gcjlib$SoResource.class
deleted file mode 100644
index 86c42ea8020..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/Load_gcjlib$SoResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/Load_gcjlib.class b/libjava/classpath/lib/gnu/java/net/loader/Load_gcjlib.class
deleted file mode 100644
index 3293b2e59e7..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/Load_gcjlib.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/RemoteResource.class b/libjava/classpath/lib/gnu/java/net/loader/RemoteResource.class
deleted file mode 100644
index b11c6fca789..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/RemoteResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/RemoteURLLoader.class b/libjava/classpath/lib/gnu/java/net/loader/RemoteURLLoader.class
deleted file mode 100644
index 7b498aa4d4f..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/RemoteURLLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/Resource.class b/libjava/classpath/lib/gnu/java/net/loader/Resource.class
deleted file mode 100644
index 23565e1fb31..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/Resource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/URLLoader.class b/libjava/classpath/lib/gnu/java/net/loader/URLLoader.class
deleted file mode 100644
index f64dacb3ae7..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/URLLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/loader/URLStreamHandlerCache.class b/libjava/classpath/lib/gnu/java/net/loader/URLStreamHandlerCache.class
deleted file mode 100644
index a218ce9c490..00000000000
--- a/libjava/classpath/lib/gnu/java/net/loader/URLStreamHandlerCache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/local/LocalServerSocket.class b/libjava/classpath/lib/gnu/java/net/local/LocalServerSocket.class
deleted file mode 100644
index 546291d3b56..00000000000
--- a/libjava/classpath/lib/gnu/java/net/local/LocalServerSocket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/local/LocalSocket.class b/libjava/classpath/lib/gnu/java/net/local/LocalSocket.class
deleted file mode 100644
index 8a2707e1315..00000000000
--- a/libjava/classpath/lib/gnu/java/net/local/LocalSocket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/local/LocalSocketAddress.class b/libjava/classpath/lib/gnu/java/net/local/LocalSocketAddress.class
deleted file mode 100644
index fa23b4d4bc7..00000000000
--- a/libjava/classpath/lib/gnu/java/net/local/LocalSocketAddress.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/local/LocalSocketImpl$LocalInputStream.class b/libjava/classpath/lib/gnu/java/net/local/LocalSocketImpl$LocalInputStream.class
deleted file mode 100644
index 63ed23d8d38..00000000000
--- a/libjava/classpath/lib/gnu/java/net/local/LocalSocketImpl$LocalInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/local/LocalSocketImpl$LocalOutputStream.class b/libjava/classpath/lib/gnu/java/net/local/LocalSocketImpl$LocalOutputStream.class
deleted file mode 100644
index 7c239d4ee28..00000000000
--- a/libjava/classpath/lib/gnu/java/net/local/LocalSocketImpl$LocalOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/local/LocalSocketImpl.class b/libjava/classpath/lib/gnu/java/net/local/LocalSocketImpl.class
deleted file mode 100644
index 34b587ad0de..00000000000
--- a/libjava/classpath/lib/gnu/java/net/local/LocalSocketImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/core/Connection.class b/libjava/classpath/lib/gnu/java/net/protocol/core/Connection.class
deleted file mode 100644
index 339a3e87fa4..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/core/Connection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/core/CoreInputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/core/CoreInputStream.class
deleted file mode 100644
index ca3b397efd1..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/core/CoreInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/core/Handler.class b/libjava/classpath/lib/gnu/java/net/protocol/core/Handler.class
deleted file mode 100644
index f4869133e31..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/core/Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/file/Connection$StaticData.class b/libjava/classpath/lib/gnu/java/net/protocol/file/Connection$StaticData.class
deleted file mode 100644
index fd22f746a60..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/file/Connection$StaticData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/file/Connection.class b/libjava/classpath/lib/gnu/java/net/protocol/file/Connection.class
deleted file mode 100644
index 522343b2efb..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/file/Connection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/file/Handler.class b/libjava/classpath/lib/gnu/java/net/protocol/file/Handler.class
deleted file mode 100644
index d122e0c6e63..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/file/Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/ActiveModeDTP.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/ActiveModeDTP.class
deleted file mode 100644
index ebd0caa719c..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/ActiveModeDTP.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/BlockInputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/BlockInputStream.class
deleted file mode 100644
index ce1c6bafa54..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/BlockInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/BlockOutputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/BlockOutputStream.class
deleted file mode 100644
index 086a3293cf2..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/BlockOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/CompressedInputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/CompressedInputStream.class
deleted file mode 100644
index 90704cdce65..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/CompressedInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/CompressedOutputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/CompressedOutputStream.class
deleted file mode 100644
index 894d77070cb..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/CompressedOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/DTP.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/DTP.class
deleted file mode 100644
index 007d01e24c7..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/DTP.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/DTPInputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/DTPInputStream.class
deleted file mode 100644
index 9f3a4bcc973..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/DTPInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/DTPOutputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/DTPOutputStream.class
deleted file mode 100644
index 4d48d3c2647..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/DTPOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPConnection.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPConnection.class
deleted file mode 100644
index bca990e550e..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPException.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPException.class
deleted file mode 100644
index f52293ed605..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPResponse.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPResponse.class
deleted file mode 100644
index 13e8a9fedaa..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPResponse.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingInputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingInputStream.class
deleted file mode 100644
index 94df65728c6..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingOutputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingOutputStream.class
deleted file mode 100644
index bb6e74b3600..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPURLConnection$ClosingOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPURLConnection.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPURLConnection.class
deleted file mode 100644
index 29c476162c2..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/FTPURLConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/Handler.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/Handler.class
deleted file mode 100644
index 685c9070ca7..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/PassiveModeDTP.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/PassiveModeDTP.class
deleted file mode 100644
index 611b0e3b6d4..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/PassiveModeDTP.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/StreamInputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/StreamInputStream.class
deleted file mode 100644
index e97e4cbe4c1..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/StreamInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/ftp/StreamOutputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/ftp/StreamOutputStream.class
deleted file mode 100644
index bc74bf96d13..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/ftp/StreamOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/gcjlib/Connection.class b/libjava/classpath/lib/gnu/java/net/protocol/gcjlib/Connection.class
deleted file mode 100644
index f035395d0e1..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/gcjlib/Connection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/gcjlib/Handler.class b/libjava/classpath/lib/gnu/java/net/protocol/gcjlib/Handler.class
deleted file mode 100644
index f3104480ae4..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/gcjlib/Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/Authenticator.class b/libjava/classpath/lib/gnu/java/net/protocol/http/Authenticator.class
deleted file mode 100644
index 318aa3a6a72..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/Authenticator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.class b/libjava/classpath/lib/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.class
deleted file mode 100644
index 0d7cf7af762..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/ChunkedInputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/http/ChunkedInputStream.class
deleted file mode 100644
index cfdd83395e2..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/ChunkedInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/Cookie.class b/libjava/classpath/lib/gnu/java/net/protocol/http/Cookie.class
deleted file mode 100644
index ecba5b060fe..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/Cookie.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/CookieManager.class b/libjava/classpath/lib/gnu/java/net/protocol/http/CookieManager.class
deleted file mode 100644
index 95d3b66bf3d..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/CookieManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/Credentials.class b/libjava/classpath/lib/gnu/java/net/protocol/http/Credentials.class
deleted file mode 100644
index 289b5015f60..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/Credentials.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPConnection$Pool$Reaper.class b/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPConnection$Pool$Reaper.class
deleted file mode 100644
index b30005ce21a..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPConnection$Pool$Reaper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPConnection$Pool.class b/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPConnection$Pool.class
deleted file mode 100644
index 6ca44acf866..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPConnection$Pool.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPConnection.class b/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPConnection.class
deleted file mode 100644
index 6fd6262a332..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPDateFormat.class b/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPDateFormat.class
deleted file mode 100644
index 20079d60fb9..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPDateFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPURLConnection$1.class b/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPURLConnection$1.class
deleted file mode 100644
index 0e0631d513d..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPURLConnection$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPURLConnection.class b/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPURLConnection.class
deleted file mode 100644
index 76f4e90ccff..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/HTTPURLConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/Handler.class b/libjava/classpath/lib/gnu/java/net/protocol/http/Handler.class
deleted file mode 100644
index 22e8d09793c..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/Headers$HeaderElement.class b/libjava/classpath/lib/gnu/java/net/protocol/http/Headers$HeaderElement.class
deleted file mode 100644
index f6c26f3ebe4..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/Headers$HeaderElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/Headers.class b/libjava/classpath/lib/gnu/java/net/protocol/http/Headers.class
deleted file mode 100644
index 97bf2ad61a7..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/Headers.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/LimitedLengthInputStream.class b/libjava/classpath/lib/gnu/java/net/protocol/http/LimitedLengthInputStream.class
deleted file mode 100644
index 630f16a4c9c..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/LimitedLengthInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/Request.class b/libjava/classpath/lib/gnu/java/net/protocol/http/Request.class
deleted file mode 100644
index 67e49234e99..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/Request.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/RequestBodyWriter.class b/libjava/classpath/lib/gnu/java/net/protocol/http/RequestBodyWriter.class
deleted file mode 100644
index 96d9510d62f..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/RequestBodyWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/Response.class b/libjava/classpath/lib/gnu/java/net/protocol/http/Response.class
deleted file mode 100644
index 844d50c5ce9..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/Response.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/ResponseHeaderHandler.class b/libjava/classpath/lib/gnu/java/net/protocol/http/ResponseHeaderHandler.class
deleted file mode 100644
index 1a8bb81d858..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/ResponseHeaderHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/http/SimpleCookieManager.class b/libjava/classpath/lib/gnu/java/net/protocol/http/SimpleCookieManager.class
deleted file mode 100644
index 00cafb1bcd9..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/http/SimpleCookieManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/https/Handler.class b/libjava/classpath/lib/gnu/java/net/protocol/https/Handler.class
deleted file mode 100644
index fba1da8d284..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/https/Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/jar/Connection$JarFileCache.class b/libjava/classpath/lib/gnu/java/net/protocol/jar/Connection$JarFileCache.class
deleted file mode 100644
index 0efc688b18c..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/jar/Connection$JarFileCache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/jar/Connection.class b/libjava/classpath/lib/gnu/java/net/protocol/jar/Connection.class
deleted file mode 100644
index d67ec4c0310..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/jar/Connection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/net/protocol/jar/Handler.class b/libjava/classpath/lib/gnu/java/net/protocol/jar/Handler.class
deleted file mode 100644
index 51ca4c3c468..00000000000
--- a/libjava/classpath/lib/gnu/java/net/protocol/jar/Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/ChannelInputStream.class b/libjava/classpath/lib/gnu/java/nio/ChannelInputStream.class
deleted file mode 100644
index eb59e72598f..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/ChannelInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/ChannelOutputStream.class b/libjava/classpath/lib/gnu/java/nio/ChannelOutputStream.class
deleted file mode 100644
index 7da924174ee..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/ChannelOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/ChannelReader.class b/libjava/classpath/lib/gnu/java/nio/ChannelReader.class
deleted file mode 100644
index 45afa8cec12..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/ChannelReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/ChannelWriter.class b/libjava/classpath/lib/gnu/java/nio/ChannelWriter.class
deleted file mode 100644
index eca45f64455..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/ChannelWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/DatagramChannelImpl.class b/libjava/classpath/lib/gnu/java/nio/DatagramChannelImpl.class
deleted file mode 100644
index 8ec3162f45c..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/DatagramChannelImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/DatagramChannelSelectionKey.class b/libjava/classpath/lib/gnu/java/nio/DatagramChannelSelectionKey.class
deleted file mode 100644
index 3159eeb85b6..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/DatagramChannelSelectionKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/FileLockImpl.class b/libjava/classpath/lib/gnu/java/nio/FileLockImpl.class
deleted file mode 100644
index ffb2da7509b..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/FileLockImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/InputStreamChannel.class b/libjava/classpath/lib/gnu/java/nio/InputStreamChannel.class
deleted file mode 100644
index 7550dd6e78a..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/InputStreamChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/NIOConstants.class b/libjava/classpath/lib/gnu/java/nio/NIOConstants.class
deleted file mode 100644
index b1bb782e53a..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/NIOConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/NIODatagramSocket.class b/libjava/classpath/lib/gnu/java/nio/NIODatagramSocket.class
deleted file mode 100644
index a5175b5ac27..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/NIODatagramSocket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/NIOServerSocket.class b/libjava/classpath/lib/gnu/java/nio/NIOServerSocket.class
deleted file mode 100644
index 48081b19f3b..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/NIOServerSocket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/NIOSocket.class b/libjava/classpath/lib/gnu/java/nio/NIOSocket.class
deleted file mode 100644
index 5d18dd42c25..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/NIOSocket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/OutputStreamChannel.class b/libjava/classpath/lib/gnu/java/nio/OutputStreamChannel.class
deleted file mode 100644
index 4a32c59c1c0..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/OutputStreamChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/PipeImpl$SinkChannelImpl.class b/libjava/classpath/lib/gnu/java/nio/PipeImpl$SinkChannelImpl.class
deleted file mode 100644
index 21dd064ad9e..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/PipeImpl$SinkChannelImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/PipeImpl$SourceChannelImpl.class b/libjava/classpath/lib/gnu/java/nio/PipeImpl$SourceChannelImpl.class
deleted file mode 100644
index e5dea7f33c4..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/PipeImpl$SourceChannelImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/PipeImpl.class b/libjava/classpath/lib/gnu/java/nio/PipeImpl.class
deleted file mode 100644
index a0459a1235c..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/PipeImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/SelectionKeyImpl.class b/libjava/classpath/lib/gnu/java/nio/SelectionKeyImpl.class
deleted file mode 100644
index f9070f668d0..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/SelectionKeyImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/SelectorImpl.class b/libjava/classpath/lib/gnu/java/nio/SelectorImpl.class
deleted file mode 100644
index 7e0b5dafdc0..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/SelectorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/SelectorProviderImpl.class b/libjava/classpath/lib/gnu/java/nio/SelectorProviderImpl.class
deleted file mode 100644
index aa0ff844141..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/SelectorProviderImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/ServerSocketChannelImpl.class b/libjava/classpath/lib/gnu/java/nio/ServerSocketChannelImpl.class
deleted file mode 100644
index 6188d794caf..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/ServerSocketChannelImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/ServerSocketChannelSelectionKey.class b/libjava/classpath/lib/gnu/java/nio/ServerSocketChannelSelectionKey.class
deleted file mode 100644
index aabae1ea38f..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/ServerSocketChannelSelectionKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/SocketChannelImpl.class b/libjava/classpath/lib/gnu/java/nio/SocketChannelImpl.class
deleted file mode 100644
index 26c94fce092..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/SocketChannelImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/SocketChannelSelectionKey.class b/libjava/classpath/lib/gnu/java/nio/SocketChannelSelectionKey.class
deleted file mode 100644
index 455861650c8..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/SocketChannelSelectionKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/SocketChannelSelectionKeyImpl.class b/libjava/classpath/lib/gnu/java/nio/SocketChannelSelectionKeyImpl.class
deleted file mode 100644
index 648378a0d19..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/SocketChannelSelectionKeyImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/VMChannel.class b/libjava/classpath/lib/gnu/java/nio/VMChannel.class
deleted file mode 100644
index 8ee7d1cf8f0..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/VMChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/VMChannelOwner.class b/libjava/classpath/lib/gnu/java/nio/VMChannelOwner.class
deleted file mode 100644
index e4dbde81e2d..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/VMChannelOwner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/VMPipe.class b/libjava/classpath/lib/gnu/java/nio/VMPipe.class
deleted file mode 100644
index 19ccc258662..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/VMPipe.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/VMSelector.class b/libjava/classpath/lib/gnu/java/nio/VMSelector.class
deleted file mode 100644
index c022f8f92be..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/VMSelector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/channels/FileChannelImpl.class b/libjava/classpath/lib/gnu/java/nio/channels/FileChannelImpl.class
deleted file mode 100644
index 817ba710b1e..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/channels/FileChannelImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ByteCharset$Decoder.class b/libjava/classpath/lib/gnu/java/nio/charset/ByteCharset$Decoder.class
deleted file mode 100644
index bb1dcbc58c8..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ByteCharset$Decoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ByteCharset$Encoder.class b/libjava/classpath/lib/gnu/java/nio/charset/ByteCharset$Encoder.class
deleted file mode 100644
index d434b325092..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ByteCharset$Encoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ByteCharset.class b/libjava/classpath/lib/gnu/java/nio/charset/ByteCharset.class
deleted file mode 100644
index abbfcc29ec5..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ByteCharset.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp424.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp424.class
deleted file mode 100644
index 85f73b42322..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp424.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp437.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp437.class
deleted file mode 100644
index 6799af3e1ea..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp437.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp737.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp737.class
deleted file mode 100644
index 3dc1a6402f1..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp737.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp775.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp775.class
deleted file mode 100644
index d571c10661a..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp775.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp850.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp850.class
deleted file mode 100644
index 7196ca2de2d..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp850.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp852.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp852.class
deleted file mode 100644
index 8373403213e..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp852.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp855.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp855.class
deleted file mode 100644
index 17c1793bd75..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp855.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp857.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp857.class
deleted file mode 100644
index a214f8effa3..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp857.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp860.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp860.class
deleted file mode 100644
index 8553e8d875c..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp860.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp861.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp861.class
deleted file mode 100644
index 634255c87ef..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp861.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp862.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp862.class
deleted file mode 100644
index ef5df442108..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp862.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp863.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp863.class
deleted file mode 100644
index 0e03ff4d4b2..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp863.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp864.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp864.class
deleted file mode 100644
index c982051bfb7..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp864.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp865.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp865.class
deleted file mode 100644
index cb82993678a..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp865.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp866.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp866.class
deleted file mode 100644
index 16ca0f4cd82..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp866.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp869.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp869.class
deleted file mode 100644
index 4b692542f23..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp869.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Cp874.class b/libjava/classpath/lib/gnu/java/nio/charset/Cp874.class
deleted file mode 100644
index 24ab44ca942..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Cp874.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/EncodingHelper.class b/libjava/classpath/lib/gnu/java/nio/charset/EncodingHelper.class
deleted file mode 100644
index e64d2d57f78..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/EncodingHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_1$Decoder.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_1$Decoder.class
deleted file mode 100644
index d4bb421d738..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_1$Decoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_1$Encoder.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_1$Encoder.class
deleted file mode 100644
index 0262718eb66..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_1$Encoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_1.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_1.class
deleted file mode 100644
index 8447ee37479..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_13.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_13.class
deleted file mode 100644
index cc21df464c6..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_13.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_15.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_15.class
deleted file mode 100644
index 89bf8bfd60e..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_15.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_2.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_2.class
deleted file mode 100644
index 71744a0ffdd..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_3.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_3.class
deleted file mode 100644
index 807b45e816b..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_4.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_4.class
deleted file mode 100644
index e4fe0185583..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_5.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_5.class
deleted file mode 100644
index 70601828b0e..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_6.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_6.class
deleted file mode 100644
index 4e7ed95828f..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_7.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_7.class
deleted file mode 100644
index 11c9523c7d9..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_7.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_8.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_8.class
deleted file mode 100644
index 58f8954a97b..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_9.class b/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_9.class
deleted file mode 100644
index 8c9a6fa38a2..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/ISO_8859_9.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/KOI_8.class b/libjava/classpath/lib/gnu/java/nio/charset/KOI_8.class
deleted file mode 100644
index 32beb9e7867..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/KOI_8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MS874.class b/libjava/classpath/lib/gnu/java/nio/charset/MS874.class
deleted file mode 100644
index 20728d0b68f..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MS874.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacCentralEurope.class b/libjava/classpath/lib/gnu/java/nio/charset/MacCentralEurope.class
deleted file mode 100644
index 53a16c28317..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacCentralEurope.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacCroatian.class b/libjava/classpath/lib/gnu/java/nio/charset/MacCroatian.class
deleted file mode 100644
index 531b25f6391..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacCroatian.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacCyrillic.class b/libjava/classpath/lib/gnu/java/nio/charset/MacCyrillic.class
deleted file mode 100644
index 15818087052..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacCyrillic.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacDingbat.class b/libjava/classpath/lib/gnu/java/nio/charset/MacDingbat.class
deleted file mode 100644
index fe35fe8e123..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacDingbat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacGreek.class b/libjava/classpath/lib/gnu/java/nio/charset/MacGreek.class
deleted file mode 100644
index 3e88fad3a52..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacGreek.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacIceland.class b/libjava/classpath/lib/gnu/java/nio/charset/MacIceland.class
deleted file mode 100644
index 5d72231184a..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacIceland.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacRoman.class b/libjava/classpath/lib/gnu/java/nio/charset/MacRoman.class
deleted file mode 100644
index 9185ccc6d81..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacRoman.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacRomania.class b/libjava/classpath/lib/gnu/java/nio/charset/MacRomania.class
deleted file mode 100644
index ff7cd8a13c7..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacRomania.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacSymbol.class b/libjava/classpath/lib/gnu/java/nio/charset/MacSymbol.class
deleted file mode 100644
index 16996e6ff40..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacSymbol.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacThai.class b/libjava/classpath/lib/gnu/java/nio/charset/MacThai.class
deleted file mode 100644
index 92a895a7887..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacThai.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/MacTurkish.class b/libjava/classpath/lib/gnu/java/nio/charset/MacTurkish.class
deleted file mode 100644
index 177250741dc..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/MacTurkish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Provider$1.class b/libjava/classpath/lib/gnu/java/nio/charset/Provider$1.class
deleted file mode 100644
index 30aebbad4f2..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Provider$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Provider.class b/libjava/classpath/lib/gnu/java/nio/charset/Provider.class
deleted file mode 100644
index 33fb54b6aaa..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Provider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/US_ASCII$Decoder.class b/libjava/classpath/lib/gnu/java/nio/charset/US_ASCII$Decoder.class
deleted file mode 100644
index afa2964f97e..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/US_ASCII$Decoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/US_ASCII$Encoder.class b/libjava/classpath/lib/gnu/java/nio/charset/US_ASCII$Encoder.class
deleted file mode 100644
index 6b770a24f00..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/US_ASCII$Encoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/US_ASCII.class b/libjava/classpath/lib/gnu/java/nio/charset/US_ASCII.class
deleted file mode 100644
index 7e33ad70eeb..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/US_ASCII.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/UTF_16.class b/libjava/classpath/lib/gnu/java/nio/charset/UTF_16.class
deleted file mode 100644
index 8a2afa49ede..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/UTF_16.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/UTF_16BE.class b/libjava/classpath/lib/gnu/java/nio/charset/UTF_16BE.class
deleted file mode 100644
index 7c61d7e0ff1..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/UTF_16BE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/UTF_16Decoder.class b/libjava/classpath/lib/gnu/java/nio/charset/UTF_16Decoder.class
deleted file mode 100644
index ef6a6745589..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/UTF_16Decoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/UTF_16Encoder.class b/libjava/classpath/lib/gnu/java/nio/charset/UTF_16Encoder.class
deleted file mode 100644
index f411c933c7b..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/UTF_16Encoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/UTF_16LE.class b/libjava/classpath/lib/gnu/java/nio/charset/UTF_16LE.class
deleted file mode 100644
index d692b5aeae4..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/UTF_16LE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/UTF_8$Decoder.class b/libjava/classpath/lib/gnu/java/nio/charset/UTF_8$Decoder.class
deleted file mode 100644
index 4bd770bda8c..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/UTF_8$Decoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/UTF_8$Encoder.class b/libjava/classpath/lib/gnu/java/nio/charset/UTF_8$Encoder.class
deleted file mode 100644
index a4bcdf24353..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/UTF_8$Encoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/UTF_8.class b/libjava/classpath/lib/gnu/java/nio/charset/UTF_8.class
deleted file mode 100644
index 4185988fc57..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/UTF_8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/UnicodeLittle.class b/libjava/classpath/lib/gnu/java/nio/charset/UnicodeLittle.class
deleted file mode 100644
index ba587056b74..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/UnicodeLittle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Windows1250.class b/libjava/classpath/lib/gnu/java/nio/charset/Windows1250.class
deleted file mode 100644
index 3cf9112ac60..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Windows1250.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Windows1251.class b/libjava/classpath/lib/gnu/java/nio/charset/Windows1251.class
deleted file mode 100644
index 55fdf449389..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Windows1251.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Windows1252.class b/libjava/classpath/lib/gnu/java/nio/charset/Windows1252.class
deleted file mode 100644
index 8885cd85c7b..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Windows1252.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Windows1253.class b/libjava/classpath/lib/gnu/java/nio/charset/Windows1253.class
deleted file mode 100644
index 522f9c3987e..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Windows1253.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Windows1254.class b/libjava/classpath/lib/gnu/java/nio/charset/Windows1254.class
deleted file mode 100644
index a254778da8b..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Windows1254.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Windows1255.class b/libjava/classpath/lib/gnu/java/nio/charset/Windows1255.class
deleted file mode 100644
index 2326a628c88..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Windows1255.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Windows1256.class b/libjava/classpath/lib/gnu/java/nio/charset/Windows1256.class
deleted file mode 100644
index 132aee77931..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Windows1256.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Windows1257.class b/libjava/classpath/lib/gnu/java/nio/charset/Windows1257.class
deleted file mode 100644
index 9b2c6935ec3..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Windows1257.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/nio/charset/Windows1258.class b/libjava/classpath/lib/gnu/java/nio/charset/Windows1258.class
deleted file mode 100644
index dff7817b2ac..00000000000
--- a/libjava/classpath/lib/gnu/java/nio/charset/Windows1258.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/RMIMarshalledObjectInputStream.class b/libjava/classpath/lib/gnu/java/rmi/RMIMarshalledObjectInputStream.class
deleted file mode 100644
index 4223c7d9968..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/RMIMarshalledObjectInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/RMIMarshalledObjectOutputStream.class b/libjava/classpath/lib/gnu/java/rmi/RMIMarshalledObjectOutputStream.class
deleted file mode 100644
index 4956b2610a8..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/RMIMarshalledObjectOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/activation/ActivationSystemTransient.class b/libjava/classpath/lib/gnu/java/rmi/activation/ActivationSystemTransient.class
deleted file mode 100644
index 3441be9c8d8..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/activation/ActivationSystemTransient.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/activation/BidiTable.class b/libjava/classpath/lib/gnu/java/rmi/activation/BidiTable.class
deleted file mode 100644
index 2399011b826..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/activation/BidiTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/activation/DefaultActivationGroup.class b/libjava/classpath/lib/gnu/java/rmi/activation/DefaultActivationGroup.class
deleted file mode 100644
index 539b79a3d2c..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/activation/DefaultActivationGroup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/activation/DefaultActivationSystem.class b/libjava/classpath/lib/gnu/java/rmi/activation/DefaultActivationSystem.class
deleted file mode 100644
index db9506a6693..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/activation/DefaultActivationSystem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl$RefProtector.class b/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl$RefProtector.class
deleted file mode 100644
index 0c23886f98b..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl$RefProtector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl.class b/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl.class
deleted file mode 100644
index 8595984fc7b..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl_Skel.class b/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl_Skel.class
deleted file mode 100644
index f745a86fccd..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl_Skel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl_Stub.class b/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl_Stub.class
deleted file mode 100644
index af0f76e26f5..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/dgc/DGCImpl_Stub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/dgc/LeaseRenewingTask$LeaseTimerTask.class b/libjava/classpath/lib/gnu/java/rmi/dgc/LeaseRenewingTask$LeaseTimerTask.class
deleted file mode 100644
index b4877483282..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/dgc/LeaseRenewingTask$LeaseTimerTask.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/dgc/LeaseRenewingTask.class b/libjava/classpath/lib/gnu/java/rmi/dgc/LeaseRenewingTask.class
deleted file mode 100644
index cab36a1241e..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/dgc/LeaseRenewingTask.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/registry/RegistryImpl.class b/libjava/classpath/lib/gnu/java/rmi/registry/RegistryImpl.class
deleted file mode 100644
index b3627694897..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/registry/RegistryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/registry/RegistryImpl_Skel.class b/libjava/classpath/lib/gnu/java/rmi/registry/RegistryImpl_Skel.class
deleted file mode 100644
index 2ac5aeebb60..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/registry/RegistryImpl_Skel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/registry/RegistryImpl_Stub.class b/libjava/classpath/lib/gnu/java/rmi/registry/RegistryImpl_Stub.class
deleted file mode 100644
index 3c75c888930..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/registry/RegistryImpl_Stub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/ActivatableRef.class b/libjava/classpath/lib/gnu/java/rmi/server/ActivatableRef.class
deleted file mode 100644
index 3b3f048a052..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/ActivatableRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/ActivatableServerRef.class b/libjava/classpath/lib/gnu/java/rmi/server/ActivatableServerRef.class
deleted file mode 100644
index 1e17e2acc4b..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/ActivatableServerRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/CombinedClassLoader.class b/libjava/classpath/lib/gnu/java/rmi/server/CombinedClassLoader.class
deleted file mode 100644
index 6d28f179e68..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/CombinedClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.class b/libjava/classpath/lib/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.class
deleted file mode 100644
index 3b7e35205b4..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/ConnectionRunnerPool.class b/libjava/classpath/lib/gnu/java/rmi/server/ConnectionRunnerPool.class
deleted file mode 100644
index 1f187b76794..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/ConnectionRunnerPool.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/ProtocolConstants.class b/libjava/classpath/lib/gnu/java/rmi/server/ProtocolConstants.class
deleted file mode 100644
index 4859ff5ef5c..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/ProtocolConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/RMIClassLoaderImpl$CacheKey.class b/libjava/classpath/lib/gnu/java/rmi/server/RMIClassLoaderImpl$CacheKey.class
deleted file mode 100644
index 39323eb2a9d..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/RMIClassLoaderImpl$CacheKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.class b/libjava/classpath/lib/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.class
deleted file mode 100644
index fef7f673bd1..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/RMIClassLoaderImpl.class b/libjava/classpath/lib/gnu/java/rmi/server/RMIClassLoaderImpl.class
deleted file mode 100644
index b703c43827d..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/RMIClassLoaderImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/RMIDefaultSocketFactory.class b/libjava/classpath/lib/gnu/java/rmi/server/RMIDefaultSocketFactory.class
deleted file mode 100644
index d00d777fbc4..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/RMIDefaultSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/RMIHashes.class b/libjava/classpath/lib/gnu/java/rmi/server/RMIHashes.class
deleted file mode 100644
index 1a661494888..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/RMIHashes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/RMIIncomingThread.class b/libjava/classpath/lib/gnu/java/rmi/server/RMIIncomingThread.class
deleted file mode 100644
index fecf25d8d1a..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/RMIIncomingThread.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/RMIObjectInputStream.class b/libjava/classpath/lib/gnu/java/rmi/server/RMIObjectInputStream.class
deleted file mode 100644
index 88a6fdec356..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/RMIObjectInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/RMIObjectOutputStream.class b/libjava/classpath/lib/gnu/java/rmi/server/RMIObjectOutputStream.class
deleted file mode 100644
index 56721ea9898..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/RMIObjectOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/RMIVoidValue.class b/libjava/classpath/lib/gnu/java/rmi/server/RMIVoidValue.class
deleted file mode 100644
index d6280beb4b6..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/RMIVoidValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/TripleKey.class b/libjava/classpath/lib/gnu/java/rmi/server/TripleKey.class
deleted file mode 100644
index faa602b8bb2..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/TripleKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnection.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnection.class
deleted file mode 100644
index 39f35efdc9b..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnectionManager$1.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnectionManager$1.class
deleted file mode 100644
index 7d928f54f87..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnectionManager$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnectionManager.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnectionManager.class
deleted file mode 100644
index e5d55790973..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnectionManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastRef.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastRef.class
deleted file mode 100644
index 47faa31897b..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/UnicastRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectInputStream.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectInputStream.class
deleted file mode 100644
index 3079c045943..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectOutputStream.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectOutputStream.class
deleted file mode 100644
index 3ea34588121..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteCall$DummyObjectOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteCall.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteCall.class
deleted file mode 100644
index 2f25fef2f43..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteCall.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteStub.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteStub.class
deleted file mode 100644
index 546a9798e8d..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/UnicastRemoteStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastServer.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastServer.class
deleted file mode 100644
index 16057467e8b..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/UnicastServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastServerRef.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastServerRef.class
deleted file mode 100644
index 9f20856e240..00000000000
--- a/libjava/classpath/lib/gnu/java/rmi/server/UnicastServerRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/Configuration.class b/libjava/classpath/lib/gnu/java/security/Configuration.class
deleted file mode 100644
index cad8db3bfb9..00000000000
--- a/libjava/classpath/lib/gnu/java/security/Configuration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/Engine.class b/libjava/classpath/lib/gnu/java/security/Engine.class
deleted file mode 100644
index b9b5a3f916d..00000000000
--- a/libjava/classpath/lib/gnu/java/security/Engine.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/OID.class b/libjava/classpath/lib/gnu/java/security/OID.class
deleted file mode 100644
index db37e6964a9..00000000000
--- a/libjava/classpath/lib/gnu/java/security/OID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/PolicyFile$1.class b/libjava/classpath/lib/gnu/java/security/PolicyFile$1.class
deleted file mode 100644
index c5168d406ed..00000000000
--- a/libjava/classpath/lib/gnu/java/security/PolicyFile$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/PolicyFile.class b/libjava/classpath/lib/gnu/java/security/PolicyFile.class
deleted file mode 100644
index 9efb3e65393..00000000000
--- a/libjava/classpath/lib/gnu/java/security/PolicyFile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/Properties$1.class b/libjava/classpath/lib/gnu/java/security/Properties$1.class
deleted file mode 100644
index 2664158bd3f..00000000000
--- a/libjava/classpath/lib/gnu/java/security/Properties$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/Properties.class b/libjava/classpath/lib/gnu/java/security/Properties.class
deleted file mode 100644
index aa0b0bbd2ea..00000000000
--- a/libjava/classpath/lib/gnu/java/security/Properties.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/Registry.class b/libjava/classpath/lib/gnu/java/security/Registry.class
deleted file mode 100644
index f2be0f46c1e..00000000000
--- a/libjava/classpath/lib/gnu/java/security/Registry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/Requires.class b/libjava/classpath/lib/gnu/java/security/Requires.class
deleted file mode 100644
index 6df34241aa2..00000000000
--- a/libjava/classpath/lib/gnu/java/security/Requires.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/action/GetPropertyAction.class b/libjava/classpath/lib/gnu/java/security/action/GetPropertyAction.class
deleted file mode 100644
index a2d0e38c47e..00000000000
--- a/libjava/classpath/lib/gnu/java/security/action/GetPropertyAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/action/GetSecurityPropertyAction.class b/libjava/classpath/lib/gnu/java/security/action/GetSecurityPropertyAction.class
deleted file mode 100644
index d49ba7c80b7..00000000000
--- a/libjava/classpath/lib/gnu/java/security/action/GetSecurityPropertyAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/action/SetAccessibleAction.class b/libjava/classpath/lib/gnu/java/security/action/SetAccessibleAction.class
deleted file mode 100644
index d1714441c44..00000000000
--- a/libjava/classpath/lib/gnu/java/security/action/SetAccessibleAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/ber/BER.class b/libjava/classpath/lib/gnu/java/security/ber/BER.class
deleted file mode 100644
index f0486a3b244..00000000000
--- a/libjava/classpath/lib/gnu/java/security/ber/BER.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/ber/BEREncodingException.class b/libjava/classpath/lib/gnu/java/security/ber/BEREncodingException.class
deleted file mode 100644
index 8f83eb28a96..00000000000
--- a/libjava/classpath/lib/gnu/java/security/ber/BEREncodingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/ber/BERReader.class b/libjava/classpath/lib/gnu/java/security/ber/BERReader.class
deleted file mode 100644
index 6e962fe13b7..00000000000
--- a/libjava/classpath/lib/gnu/java/security/ber/BERReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/ber/BERValue.class b/libjava/classpath/lib/gnu/java/security/ber/BERValue.class
deleted file mode 100644
index 2405fd71d29..00000000000
--- a/libjava/classpath/lib/gnu/java/security/ber/BERValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/der/BitString.class b/libjava/classpath/lib/gnu/java/security/der/BitString.class
deleted file mode 100644
index c70e401c456..00000000000
--- a/libjava/classpath/lib/gnu/java/security/der/BitString.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/der/DER.class b/libjava/classpath/lib/gnu/java/security/der/DER.class
deleted file mode 100644
index 98e7a9ce72a..00000000000
--- a/libjava/classpath/lib/gnu/java/security/der/DER.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/der/DEREncodingException.class b/libjava/classpath/lib/gnu/java/security/der/DEREncodingException.class
deleted file mode 100644
index ddcdeb26f9b..00000000000
--- a/libjava/classpath/lib/gnu/java/security/der/DEREncodingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/der/DERReader.class b/libjava/classpath/lib/gnu/java/security/der/DERReader.class
deleted file mode 100644
index 20ebbdb87b4..00000000000
--- a/libjava/classpath/lib/gnu/java/security/der/DERReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/der/DERValue.class b/libjava/classpath/lib/gnu/java/security/der/DERValue.class
deleted file mode 100644
index 446fbd7b0f8..00000000000
--- a/libjava/classpath/lib/gnu/java/security/der/DERValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/der/DERWriter.class b/libjava/classpath/lib/gnu/java/security/der/DERWriter.class
deleted file mode 100644
index 4a09d076b90..00000000000
--- a/libjava/classpath/lib/gnu/java/security/der/DERWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/BaseHash.class b/libjava/classpath/lib/gnu/java/security/hash/BaseHash.class
deleted file mode 100644
index 520cbd0c789..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/BaseHash.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/HashFactory.class b/libjava/classpath/lib/gnu/java/security/hash/HashFactory.class
deleted file mode 100644
index a023e1e53ac..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/HashFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/Haval.class b/libjava/classpath/lib/gnu/java/security/hash/Haval.class
deleted file mode 100644
index ca0a624ef62..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/Haval.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/IMessageDigest.class b/libjava/classpath/lib/gnu/java/security/hash/IMessageDigest.class
deleted file mode 100644
index eb1faf6b2ee..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/IMessageDigest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/MD2.class b/libjava/classpath/lib/gnu/java/security/hash/MD2.class
deleted file mode 100644
index 0062efab859..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/MD2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/MD4.class b/libjava/classpath/lib/gnu/java/security/hash/MD4.class
deleted file mode 100644
index a426e3d6343..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/MD4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/MD5.class b/libjava/classpath/lib/gnu/java/security/hash/MD5.class
deleted file mode 100644
index 38c6515787e..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/MD5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/RipeMD128.class b/libjava/classpath/lib/gnu/java/security/hash/RipeMD128.class
deleted file mode 100644
index 88e95d2dbaa..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/RipeMD128.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/RipeMD160.class b/libjava/classpath/lib/gnu/java/security/hash/RipeMD160.class
deleted file mode 100644
index de071dec641..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/RipeMD160.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/Sha160.class b/libjava/classpath/lib/gnu/java/security/hash/Sha160.class
deleted file mode 100644
index 7bf70b05fbd..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/Sha160.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/Sha256.class b/libjava/classpath/lib/gnu/java/security/hash/Sha256.class
deleted file mode 100644
index ffb909b7595..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/Sha256.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/Sha384.class b/libjava/classpath/lib/gnu/java/security/hash/Sha384.class
deleted file mode 100644
index dd338a97fc9..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/Sha384.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/Sha512.class b/libjava/classpath/lib/gnu/java/security/hash/Sha512.class
deleted file mode 100644
index 9e3e53e697e..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/Sha512.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/Tiger.class b/libjava/classpath/lib/gnu/java/security/hash/Tiger.class
deleted file mode 100644
index 36bd7277376..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/Tiger.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/hash/Whirlpool.class b/libjava/classpath/lib/gnu/java/security/hash/Whirlpool.class
deleted file mode 100644
index d734a4d5beb..00000000000
--- a/libjava/classpath/lib/gnu/java/security/hash/Whirlpool.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/HavalSpi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/HavalSpi.class
deleted file mode 100644
index 51a42cdf075..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/HavalSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/MD2Spi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/MD2Spi.class
deleted file mode 100644
index 1ea42682b62..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/MD2Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/MD4Spi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/MD4Spi.class
deleted file mode 100644
index 919f6ad924b..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/MD4Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/MD5Spi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/MD5Spi.class
deleted file mode 100644
index d7eac77350e..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/MD5Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/MessageDigestAdapter.class b/libjava/classpath/lib/gnu/java/security/jce/hash/MessageDigestAdapter.class
deleted file mode 100644
index a5f8f7b5ba0..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/MessageDigestAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/RipeMD128Spi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/RipeMD128Spi.class
deleted file mode 100644
index 9e64e886cc6..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/RipeMD128Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/RipeMD160Spi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/RipeMD160Spi.class
deleted file mode 100644
index 15dab49868b..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/RipeMD160Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/Sha160Spi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/Sha160Spi.class
deleted file mode 100644
index e608311d0d1..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/Sha160Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/Sha256Spi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/Sha256Spi.class
deleted file mode 100644
index d8bbdad949c..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/Sha256Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/Sha384Spi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/Sha384Spi.class
deleted file mode 100644
index 3087553bc46..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/Sha384Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/Sha512Spi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/Sha512Spi.class
deleted file mode 100644
index 19c6274b12e..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/Sha512Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/TigerSpi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/TigerSpi.class
deleted file mode 100644
index 314580c2232..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/TigerSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/hash/WhirlpoolSpi.class b/libjava/classpath/lib/gnu/java/security/jce/hash/WhirlpoolSpi.class
deleted file mode 100644
index 76fb5647ab0..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/hash/WhirlpoolSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/HavalRandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/HavalRandomSpi.class
deleted file mode 100644
index db9029bb143..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/HavalRandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/MD2RandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/MD2RandomSpi.class
deleted file mode 100644
index b043f1baada..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/MD2RandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/MD4RandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/MD4RandomSpi.class
deleted file mode 100644
index 2b314952ae3..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/MD4RandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/MD5RandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/MD5RandomSpi.class
deleted file mode 100644
index 6256b186976..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/MD5RandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/RipeMD128RandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/RipeMD128RandomSpi.class
deleted file mode 100644
index 0ab8ce92632..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/RipeMD128RandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/RipeMD160RandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/RipeMD160RandomSpi.class
deleted file mode 100644
index a05207414b9..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/RipeMD160RandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/SecureRandomAdapter.class b/libjava/classpath/lib/gnu/java/security/jce/prng/SecureRandomAdapter.class
deleted file mode 100644
index 7bacedb0d5e..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/SecureRandomAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/Sha160RandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/Sha160RandomSpi.class
deleted file mode 100644
index b26d8ecc29b..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/Sha160RandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/Sha256RandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/Sha256RandomSpi.class
deleted file mode 100644
index 4f95aec7165..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/Sha256RandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/Sha384RandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/Sha384RandomSpi.class
deleted file mode 100644
index 010507d9234..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/Sha384RandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/Sha512RandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/Sha512RandomSpi.class
deleted file mode 100644
index f31e348c2ae..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/Sha512RandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/TigerRandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/TigerRandomSpi.class
deleted file mode 100644
index 787b68bff17..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/TigerRandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/prng/WhirlpoolRandomSpi.class b/libjava/classpath/lib/gnu/java/security/jce/prng/WhirlpoolRandomSpi.class
deleted file mode 100644
index abe86b01c15..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/prng/WhirlpoolRandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/DSSKeyFactory.class b/libjava/classpath/lib/gnu/java/security/jce/sig/DSSKeyFactory.class
deleted file mode 100644
index fa74bd74bc4..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/DSSKeyFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.class b/libjava/classpath/lib/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.class
deleted file mode 100644
index 2ec3779a8ea..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/DSSParameters.class b/libjava/classpath/lib/gnu/java/security/jce/sig/DSSParameters.class
deleted file mode 100644
index 895c8f22183..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/DSSParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/DSSParametersGenerator.class b/libjava/classpath/lib/gnu/java/security/jce/sig/DSSParametersGenerator.class
deleted file mode 100644
index 393aaf0e420..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/DSSParametersGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/DSSRawSignatureSpi.class b/libjava/classpath/lib/gnu/java/security/jce/sig/DSSRawSignatureSpi.class
deleted file mode 100644
index c26cfe6f6fa..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/DSSRawSignatureSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/EncodedKeyFactory.class b/libjava/classpath/lib/gnu/java/security/jce/sig/EncodedKeyFactory.class
deleted file mode 100644
index 9bf4ba4bccd..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/EncodedKeyFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.class b/libjava/classpath/lib/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.class
deleted file mode 100644
index b82fa0b1a02..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/MD2withRSA.class b/libjava/classpath/lib/gnu/java/security/jce/sig/MD2withRSA.class
deleted file mode 100644
index ee79076645c..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/MD2withRSA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/MD5withRSA.class b/libjava/classpath/lib/gnu/java/security/jce/sig/MD5withRSA.class
deleted file mode 100644
index c88c51d9916..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/MD5withRSA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/RSAKeyFactory.class b/libjava/classpath/lib/gnu/java/security/jce/sig/RSAKeyFactory.class
deleted file mode 100644
index 6f06edc69bf..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/RSAKeyFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.class b/libjava/classpath/lib/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.class
deleted file mode 100644
index 70c34ed7e8b..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.class b/libjava/classpath/lib/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.class
deleted file mode 100644
index f735eab972c..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/SHA160withDSS.class b/libjava/classpath/lib/gnu/java/security/jce/sig/SHA160withDSS.class
deleted file mode 100644
index f4a23b615c6..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/SHA160withDSS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/SHA160withRSA.class b/libjava/classpath/lib/gnu/java/security/jce/sig/SHA160withRSA.class
deleted file mode 100644
index 02df94ee7f3..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/SHA160withRSA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/SHA256withRSA.class b/libjava/classpath/lib/gnu/java/security/jce/sig/SHA256withRSA.class
deleted file mode 100644
index d14df91c5c4..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/SHA256withRSA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/SHA384withRSA.class b/libjava/classpath/lib/gnu/java/security/jce/sig/SHA384withRSA.class
deleted file mode 100644
index 05acfdf4610..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/SHA384withRSA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/SHA512withRSA.class b/libjava/classpath/lib/gnu/java/security/jce/sig/SHA512withRSA.class
deleted file mode 100644
index c220000c6d8..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/SHA512withRSA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/jce/sig/SignatureAdapter.class b/libjava/classpath/lib/gnu/java/security/jce/sig/SignatureAdapter.class
deleted file mode 100644
index 299c7bfd0e9..00000000000
--- a/libjava/classpath/lib/gnu/java/security/jce/sig/SignatureAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/IKeyPairCodec.class b/libjava/classpath/lib/gnu/java/security/key/IKeyPairCodec.class
deleted file mode 100644
index b9c7a76d75a..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/IKeyPairCodec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/IKeyPairGenerator.class b/libjava/classpath/lib/gnu/java/security/key/IKeyPairGenerator.class
deleted file mode 100644
index 54396a643bc..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/IKeyPairGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/KeyPairCodecFactory.class b/libjava/classpath/lib/gnu/java/security/key/KeyPairCodecFactory.class
deleted file mode 100644
index b67f2337860..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/KeyPairCodecFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/KeyPairGeneratorFactory.class b/libjava/classpath/lib/gnu/java/security/key/KeyPairGeneratorFactory.class
deleted file mode 100644
index abafeeac050..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/KeyPairGeneratorFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/dss/DSSKey.class b/libjava/classpath/lib/gnu/java/security/key/dss/DSSKey.class
deleted file mode 100644
index c5462e16559..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/dss/DSSKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairGenerator.class b/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairGenerator.class
deleted file mode 100644
index 97938b62587..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.class b/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.class
deleted file mode 100644
index 6532a20ee74..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairRawCodec.class b/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairRawCodec.class
deleted file mode 100644
index 848cbfe39df..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairRawCodec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairX509Codec.class b/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairX509Codec.class
deleted file mode 100644
index 7ca18493b55..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/dss/DSSKeyPairX509Codec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/dss/DSSPrivateKey.class b/libjava/classpath/lib/gnu/java/security/key/dss/DSSPrivateKey.class
deleted file mode 100644
index 958c05228e4..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/dss/DSSPrivateKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/dss/DSSPublicKey.class b/libjava/classpath/lib/gnu/java/security/key/dss/DSSPublicKey.class
deleted file mode 100644
index 909a027c038..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/dss/DSSPublicKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/dss/FIPS186.class b/libjava/classpath/lib/gnu/java/security/key/dss/FIPS186.class
deleted file mode 100644
index 9be1d405fc3..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/dss/FIPS186.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/rsa/GnuRSAKey.class b/libjava/classpath/lib/gnu/java/security/key/rsa/GnuRSAKey.class
deleted file mode 100644
index c95e6c418fc..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/rsa/GnuRSAKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/rsa/GnuRSAPrivateKey.class b/libjava/classpath/lib/gnu/java/security/key/rsa/GnuRSAPrivateKey.class
deleted file mode 100644
index 1c7f6fd4129..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/rsa/GnuRSAPrivateKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/rsa/GnuRSAPublicKey.class b/libjava/classpath/lib/gnu/java/security/key/rsa/GnuRSAPublicKey.class
deleted file mode 100644
index 5d93064f5d7..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/rsa/GnuRSAPublicKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairGenerator.class b/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairGenerator.class
deleted file mode 100644
index e09c4234183..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.class b/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.class
deleted file mode 100644
index b8a5f4cf431..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairRawCodec.class b/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairRawCodec.class
deleted file mode 100644
index 15ccade3152..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairRawCodec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairX509Codec.class b/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairX509Codec.class
deleted file mode 100644
index f6b6573af65..00000000000
--- a/libjava/classpath/lib/gnu/java/security/key/rsa/RSAKeyPairX509Codec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/pkcs/PKCS7Data.class b/libjava/classpath/lib/gnu/java/security/pkcs/PKCS7Data.class
deleted file mode 100644
index efd7a578933..00000000000
--- a/libjava/classpath/lib/gnu/java/security/pkcs/PKCS7Data.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/pkcs/PKCS7SignedData.class b/libjava/classpath/lib/gnu/java/security/pkcs/PKCS7SignedData.class
deleted file mode 100644
index 5ec095a4325..00000000000
--- a/libjava/classpath/lib/gnu/java/security/pkcs/PKCS7SignedData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/pkcs/SignerInfo.class b/libjava/classpath/lib/gnu/java/security/pkcs/SignerInfo.class
deleted file mode 100644
index 604a7355239..00000000000
--- a/libjava/classpath/lib/gnu/java/security/pkcs/SignerInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/prng/BasePRNG.class b/libjava/classpath/lib/gnu/java/security/prng/BasePRNG.class
deleted file mode 100644
index cd9b6aa3bd1..00000000000
--- a/libjava/classpath/lib/gnu/java/security/prng/BasePRNG.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/prng/EntropySource.class b/libjava/classpath/lib/gnu/java/security/prng/EntropySource.class
deleted file mode 100644
index 3810c893bcd..00000000000
--- a/libjava/classpath/lib/gnu/java/security/prng/EntropySource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/prng/IRandom.class b/libjava/classpath/lib/gnu/java/security/prng/IRandom.class
deleted file mode 100644
index f89eacbb9f4..00000000000
--- a/libjava/classpath/lib/gnu/java/security/prng/IRandom.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/prng/LimitReachedException.class b/libjava/classpath/lib/gnu/java/security/prng/LimitReachedException.class
deleted file mode 100644
index 5a0e5048e01..00000000000
--- a/libjava/classpath/lib/gnu/java/security/prng/LimitReachedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/prng/MDGenerator.class b/libjava/classpath/lib/gnu/java/security/prng/MDGenerator.class
deleted file mode 100644
index dc88d8dd935..00000000000
--- a/libjava/classpath/lib/gnu/java/security/prng/MDGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/prng/PRNGFactory.class b/libjava/classpath/lib/gnu/java/security/prng/PRNGFactory.class
deleted file mode 100644
index a2754327797..00000000000
--- a/libjava/classpath/lib/gnu/java/security/prng/PRNGFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/prng/RandomEvent.class b/libjava/classpath/lib/gnu/java/security/prng/RandomEvent.class
deleted file mode 100644
index fa3ee8ecd48..00000000000
--- a/libjava/classpath/lib/gnu/java/security/prng/RandomEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/prng/RandomEventListener.class b/libjava/classpath/lib/gnu/java/security/prng/RandomEventListener.class
deleted file mode 100644
index ca9c8fa214f..00000000000
--- a/libjava/classpath/lib/gnu/java/security/prng/RandomEventListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/provider/CollectionCertStoreImpl.class b/libjava/classpath/lib/gnu/java/security/provider/CollectionCertStoreImpl.class
deleted file mode 100644
index c3dd00069f5..00000000000
--- a/libjava/classpath/lib/gnu/java/security/provider/CollectionCertStoreImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/provider/DefaultPolicy.class b/libjava/classpath/lib/gnu/java/security/provider/DefaultPolicy.class
deleted file mode 100644
index 48a748c81ab..00000000000
--- a/libjava/classpath/lib/gnu/java/security/provider/DefaultPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/provider/Gnu$1.class b/libjava/classpath/lib/gnu/java/security/provider/Gnu$1.class
deleted file mode 100644
index 2e949b0debe..00000000000
--- a/libjava/classpath/lib/gnu/java/security/provider/Gnu$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/provider/Gnu.class b/libjava/classpath/lib/gnu/java/security/provider/Gnu.class
deleted file mode 100644
index 642a24abac0..00000000000
--- a/libjava/classpath/lib/gnu/java/security/provider/Gnu.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/provider/PKIXCertPathValidatorImpl.class b/libjava/classpath/lib/gnu/java/security/provider/PKIXCertPathValidatorImpl.class
deleted file mode 100644
index 4feb3469085..00000000000
--- a/libjava/classpath/lib/gnu/java/security/provider/PKIXCertPathValidatorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/provider/X509CertificateFactory.class b/libjava/classpath/lib/gnu/java/security/provider/X509CertificateFactory.class
deleted file mode 100644
index 3fedb12ef53..00000000000
--- a/libjava/classpath/lib/gnu/java/security/provider/X509CertificateFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/BaseSignature.class b/libjava/classpath/lib/gnu/java/security/sig/BaseSignature.class
deleted file mode 100644
index 7267a24e8fd..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/BaseSignature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/ISignature.class b/libjava/classpath/lib/gnu/java/security/sig/ISignature.class
deleted file mode 100644
index 24174a1aa8b..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/ISignature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/ISignatureCodec.class b/libjava/classpath/lib/gnu/java/security/sig/ISignatureCodec.class
deleted file mode 100644
index f998fd081c7..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/ISignatureCodec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/SignatureCodecFactory.class b/libjava/classpath/lib/gnu/java/security/sig/SignatureCodecFactory.class
deleted file mode 100644
index da49c576104..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/SignatureCodecFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/SignatureFactory.class b/libjava/classpath/lib/gnu/java/security/sig/SignatureFactory.class
deleted file mode 100644
index 0e7bd568525..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/SignatureFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/dss/DSSSignature.class b/libjava/classpath/lib/gnu/java/security/sig/dss/DSSSignature.class
deleted file mode 100644
index 4fc0e689424..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/dss/DSSSignature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/dss/DSSSignatureRawCodec.class b/libjava/classpath/lib/gnu/java/security/sig/dss/DSSSignatureRawCodec.class
deleted file mode 100644
index a8e8cad5aa9..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/dss/DSSSignatureRawCodec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/dss/DSSSignatureX509Codec.class b/libjava/classpath/lib/gnu/java/security/sig/dss/DSSSignatureX509Codec.class
deleted file mode 100644
index 99494c6c8dc..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/dss/DSSSignatureX509Codec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.class b/libjava/classpath/lib/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.class
deleted file mode 100644
index bbd18de8e5c..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.class b/libjava/classpath/lib/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.class
deleted file mode 100644
index e03cdaf8031..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/rsa/EMSA_PSS.class b/libjava/classpath/lib/gnu/java/security/sig/rsa/EMSA_PSS.class
deleted file mode 100644
index 5484fd578c5..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/rsa/EMSA_PSS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSA.class b/libjava/classpath/lib/gnu/java/security/sig/rsa/RSA.class
deleted file mode 100644
index 68c37239c80..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.class b/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.class
deleted file mode 100644
index f788cedc6d9..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.class b/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.class
deleted file mode 100644
index 7f8762a6e87..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.class b/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.class
deleted file mode 100644
index faa4a94b65d..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPSSSignature.class b/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPSSSignature.class
deleted file mode 100644
index 961bd7d3b67..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPSSSignature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.class b/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.class
deleted file mode 100644
index e9942689636..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSASignatureFactory.class b/libjava/classpath/lib/gnu/java/security/sig/rsa/RSASignatureFactory.class
deleted file mode 100644
index 4d51e4c2c48..00000000000
--- a/libjava/classpath/lib/gnu/java/security/sig/rsa/RSASignatureFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/Base64.class b/libjava/classpath/lib/gnu/java/security/util/Base64.class
deleted file mode 100644
index 75ad3c941ab..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/Base64.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/ByteArray.class b/libjava/classpath/lib/gnu/java/security/util/ByteArray.class
deleted file mode 100644
index beb2df45619..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/ByteArray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/ByteBufferOutputStream.class b/libjava/classpath/lib/gnu/java/security/util/ByteBufferOutputStream.class
deleted file mode 100644
index 2d7439a3c24..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/ByteBufferOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/DerUtil.class b/libjava/classpath/lib/gnu/java/security/util/DerUtil.class
deleted file mode 100644
index ef4b9150c84..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/DerUtil.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/ExpirableObject$Destroyer.class b/libjava/classpath/lib/gnu/java/security/util/ExpirableObject$Destroyer.class
deleted file mode 100644
index a3cf941eb21..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/ExpirableObject$Destroyer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/ExpirableObject.class b/libjava/classpath/lib/gnu/java/security/util/ExpirableObject.class
deleted file mode 100644
index 44f30dd9090..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/ExpirableObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/FormatUtil.class b/libjava/classpath/lib/gnu/java/security/util/FormatUtil.class
deleted file mode 100644
index c3485f317ca..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/FormatUtil.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/IntegerUtil$1.class b/libjava/classpath/lib/gnu/java/security/util/IntegerUtil$1.class
deleted file mode 100644
index 518fc646877..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/IntegerUtil$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/IntegerUtil.class b/libjava/classpath/lib/gnu/java/security/util/IntegerUtil.class
deleted file mode 100644
index e18daef73d0..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/IntegerUtil.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/PRNG.class b/libjava/classpath/lib/gnu/java/security/util/PRNG.class
deleted file mode 100644
index 6e2d054ce1a..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/PRNG.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/Prime.class b/libjava/classpath/lib/gnu/java/security/util/Prime.class
deleted file mode 100644
index 0246963e34a..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/Prime.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/Sequence.class b/libjava/classpath/lib/gnu/java/security/util/Sequence.class
deleted file mode 100644
index 9ff5eaaefc2..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/Sequence.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/SimpleList.class b/libjava/classpath/lib/gnu/java/security/util/SimpleList.class
deleted file mode 100644
index c30ecdea117..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/SimpleList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/util/Util.class b/libjava/classpath/lib/gnu/java/security/util/Util.class
deleted file mode 100644
index 896b4bfa72a..00000000000
--- a/libjava/classpath/lib/gnu/java/security/util/Util.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/GnuPKIExtension.class b/libjava/classpath/lib/gnu/java/security/x509/GnuPKIExtension.class
deleted file mode 100644
index fbada1312e1..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/GnuPKIExtension.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/PolicyNodeImpl.class b/libjava/classpath/lib/gnu/java/security/x509/PolicyNodeImpl.class
deleted file mode 100644
index bfca58d7b44..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/PolicyNodeImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/Util.class b/libjava/classpath/lib/gnu/java/security/x509/Util.class
deleted file mode 100644
index b21e8d818cf..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/Util.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/X500DistinguishedName.class b/libjava/classpath/lib/gnu/java/security/x509/X500DistinguishedName.class
deleted file mode 100644
index 8aba2259813..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/X500DistinguishedName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/X509CRL.class b/libjava/classpath/lib/gnu/java/security/x509/X509CRL.class
deleted file mode 100644
index 5e2ce964ec4..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/X509CRL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/X509CRLEntry.class b/libjava/classpath/lib/gnu/java/security/x509/X509CRLEntry.class
deleted file mode 100644
index 04aa144a2cb..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/X509CRLEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/X509CRLSelectorImpl.class b/libjava/classpath/lib/gnu/java/security/x509/X509CRLSelectorImpl.class
deleted file mode 100644
index c23f76eb00e..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/X509CRLSelectorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/X509CertPath.class b/libjava/classpath/lib/gnu/java/security/x509/X509CertPath.class
deleted file mode 100644
index 98e112e9d6e..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/X509CertPath.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/X509CertSelectorImpl.class b/libjava/classpath/lib/gnu/java/security/x509/X509CertSelectorImpl.class
deleted file mode 100644
index 823a6578b0a..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/X509CertSelectorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/X509Certificate.class b/libjava/classpath/lib/gnu/java/security/x509/X509Certificate.class
deleted file mode 100644
index 377554e1ffd..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/X509Certificate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/AuthorityKeyIdentifier.class b/libjava/classpath/lib/gnu/java/security/x509/ext/AuthorityKeyIdentifier.class
deleted file mode 100644
index 73bc76cac3c..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/AuthorityKeyIdentifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/BasicConstraints.class b/libjava/classpath/lib/gnu/java/security/x509/ext/BasicConstraints.class
deleted file mode 100644
index 5880c34fec0..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/BasicConstraints.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/CRLNumber.class b/libjava/classpath/lib/gnu/java/security/x509/ext/CRLNumber.class
deleted file mode 100644
index 98b5b2fed23..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/CRLNumber.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/CertificatePolicies.class b/libjava/classpath/lib/gnu/java/security/x509/ext/CertificatePolicies.class
deleted file mode 100644
index f562f35fb3d..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/CertificatePolicies.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/ExtendedKeyUsage.class b/libjava/classpath/lib/gnu/java/security/x509/ext/ExtendedKeyUsage.class
deleted file mode 100644
index c4dcb1c8d91..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/ExtendedKeyUsage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/Extension$Value.class b/libjava/classpath/lib/gnu/java/security/x509/ext/Extension$Value.class
deleted file mode 100644
index 5d8e83288f1..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/Extension$Value.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/Extension.class b/libjava/classpath/lib/gnu/java/security/x509/ext/Extension.class
deleted file mode 100644
index db1472dc5a8..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/Extension.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/GeneralNames.class b/libjava/classpath/lib/gnu/java/security/x509/ext/GeneralNames.class
deleted file mode 100644
index 9fb83d0e68e..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/GeneralNames.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/IssuerAlternativeNames.class b/libjava/classpath/lib/gnu/java/security/x509/ext/IssuerAlternativeNames.class
deleted file mode 100644
index 15df55404d8..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/IssuerAlternativeNames.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/KeyUsage.class b/libjava/classpath/lib/gnu/java/security/x509/ext/KeyUsage.class
deleted file mode 100644
index ca69c62a4f7..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/KeyUsage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/PolicyConstraint.class b/libjava/classpath/lib/gnu/java/security/x509/ext/PolicyConstraint.class
deleted file mode 100644
index 79fe36cc65d..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/PolicyConstraint.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/PolicyMappings.class b/libjava/classpath/lib/gnu/java/security/x509/ext/PolicyMappings.class
deleted file mode 100644
index 5d1da689c97..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/PolicyMappings.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.class b/libjava/classpath/lib/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.class
deleted file mode 100644
index 483ce3ea57d..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/ReasonCode.class b/libjava/classpath/lib/gnu/java/security/x509/ext/ReasonCode.class
deleted file mode 100644
index 2b5d1606ce0..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/ReasonCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/SubjectAlternativeNames.class b/libjava/classpath/lib/gnu/java/security/x509/ext/SubjectAlternativeNames.class
deleted file mode 100644
index 75f97382f94..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/SubjectAlternativeNames.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/security/x509/ext/SubjectKeyIdentifier.class b/libjava/classpath/lib/gnu/java/security/x509/ext/SubjectKeyIdentifier.class
deleted file mode 100644
index 2bb8d26c4ba..00000000000
--- a/libjava/classpath/lib/gnu/java/security/x509/ext/SubjectKeyIdentifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/text/AttributedFormatBuffer.class b/libjava/classpath/lib/gnu/java/text/AttributedFormatBuffer.class
deleted file mode 100644
index 6d0fb150c5a..00000000000
--- a/libjava/classpath/lib/gnu/java/text/AttributedFormatBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/text/BaseBreakIterator.class b/libjava/classpath/lib/gnu/java/text/BaseBreakIterator.class
deleted file mode 100644
index 3fe59cdb3f3..00000000000
--- a/libjava/classpath/lib/gnu/java/text/BaseBreakIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/text/CharacterBreakIterator.class b/libjava/classpath/lib/gnu/java/text/CharacterBreakIterator.class
deleted file mode 100644
index 3f55a8f2cc6..00000000000
--- a/libjava/classpath/lib/gnu/java/text/CharacterBreakIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/text/FormatBuffer.class b/libjava/classpath/lib/gnu/java/text/FormatBuffer.class
deleted file mode 100644
index fa4394e044a..00000000000
--- a/libjava/classpath/lib/gnu/java/text/FormatBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/text/FormatCharacterIterator.class b/libjava/classpath/lib/gnu/java/text/FormatCharacterIterator.class
deleted file mode 100644
index 0597d6e0183..00000000000
--- a/libjava/classpath/lib/gnu/java/text/FormatCharacterIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/text/LineBreakIterator.class b/libjava/classpath/lib/gnu/java/text/LineBreakIterator.class
deleted file mode 100644
index 6c97fd54e21..00000000000
--- a/libjava/classpath/lib/gnu/java/text/LineBreakIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/text/SentenceBreakIterator.class b/libjava/classpath/lib/gnu/java/text/SentenceBreakIterator.class
deleted file mode 100644
index 5b3975c3ea2..00000000000
--- a/libjava/classpath/lib/gnu/java/text/SentenceBreakIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/text/StringFormatBuffer.class b/libjava/classpath/lib/gnu/java/text/StringFormatBuffer.class
deleted file mode 100644
index de6b9d9dd17..00000000000
--- a/libjava/classpath/lib/gnu/java/text/StringFormatBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/text/WordBreakIterator.class b/libjava/classpath/lib/gnu/java/text/WordBreakIterator.class
deleted file mode 100644
index e1526fc3d62..00000000000
--- a/libjava/classpath/lib/gnu/java/text/WordBreakIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/DoubleEnumeration.class b/libjava/classpath/lib/gnu/java/util/DoubleEnumeration.class
deleted file mode 100644
index d26b3fe1013..00000000000
--- a/libjava/classpath/lib/gnu/java/util/DoubleEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/EmptyEnumeration.class b/libjava/classpath/lib/gnu/java/util/EmptyEnumeration.class
deleted file mode 100644
index 808980d83cf..00000000000
--- a/libjava/classpath/lib/gnu/java/util/EmptyEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$1.class b/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$1.class
deleted file mode 100644
index eb7c64a1df1..00000000000
--- a/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$WeakBucket$WeakEntry.class b/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$WeakBucket$WeakEntry.class
deleted file mode 100644
index b7bf52c692e..00000000000
--- a/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$WeakBucket$WeakEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$WeakBucket.class b/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$WeakBucket.class
deleted file mode 100644
index 08875e5b171..00000000000
--- a/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$WeakBucket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$WeakEntrySet.class b/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$WeakEntrySet.class
deleted file mode 100644
index a889aae9727..00000000000
--- a/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap$WeakEntrySet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap.class b/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap.class
deleted file mode 100644
index 0b205de2497..00000000000
--- a/libjava/classpath/lib/gnu/java/util/WeakIdentityHashMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/jar/JarUtils.class b/libjava/classpath/lib/gnu/java/util/jar/JarUtils.class
deleted file mode 100644
index a1acf2525ee..00000000000
--- a/libjava/classpath/lib/gnu/java/util/jar/JarUtils.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/EventDispatcher.class b/libjava/classpath/lib/gnu/java/util/prefs/EventDispatcher.class
deleted file mode 100644
index 6f7ec172e27..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/EventDispatcher.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/FileBasedFactory.class b/libjava/classpath/lib/gnu/java/util/prefs/FileBasedFactory.class
deleted file mode 100644
index 04da65abd4e..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/FileBasedFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/FileBasedPreferences$1.class b/libjava/classpath/lib/gnu/java/util/prefs/FileBasedPreferences$1.class
deleted file mode 100644
index d7082f4a270..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/FileBasedPreferences$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/FileBasedPreferences.class b/libjava/classpath/lib/gnu/java/util/prefs/FileBasedPreferences.class
deleted file mode 100644
index 7cb1c96f19f..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/FileBasedPreferences.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/GConfBasedFactory.class b/libjava/classpath/lib/gnu/java/util/prefs/GConfBasedFactory.class
deleted file mode 100644
index 0c97da9c3c1..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/GConfBasedFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/GConfBasedPreferences.class b/libjava/classpath/lib/gnu/java/util/prefs/GConfBasedPreferences.class
deleted file mode 100644
index db5bd124f19..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/GConfBasedPreferences.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/MemoryBasedFactory.class b/libjava/classpath/lib/gnu/java/util/prefs/MemoryBasedFactory.class
deleted file mode 100644
index 0520bb58e85..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/MemoryBasedFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/MemoryBasedPreferences.class b/libjava/classpath/lib/gnu/java/util/prefs/MemoryBasedPreferences.class
deleted file mode 100644
index 9f25fa47e7b..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/MemoryBasedPreferences.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/NodeReader.class b/libjava/classpath/lib/gnu/java/util/prefs/NodeReader.class
deleted file mode 100644
index 9557a132dd2..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/NodeReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/NodeWriter.class b/libjava/classpath/lib/gnu/java/util/prefs/NodeWriter.class
deleted file mode 100644
index 929229e540a..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/NodeWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/prefs/gconf/GConfNativePeer.class b/libjava/classpath/lib/gnu/java/util/prefs/gconf/GConfNativePeer.class
deleted file mode 100644
index 7a24d86aa6b..00000000000
--- a/libjava/classpath/lib/gnu/java/util/prefs/gconf/GConfNativePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/BacktrackStack$Backtrack.class b/libjava/classpath/lib/gnu/java/util/regex/BacktrackStack$Backtrack.class
deleted file mode 100644
index 34b9e51a650..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/BacktrackStack$Backtrack.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/BacktrackStack.class b/libjava/classpath/lib/gnu/java/util/regex/BacktrackStack.class
deleted file mode 100644
index b615849609e..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/BacktrackStack.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/CharIndexed.class b/libjava/classpath/lib/gnu/java/util/regex/CharIndexed.class
deleted file mode 100644
index 09beb399a25..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/CharIndexed.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/CharIndexedCharArray.class b/libjava/classpath/lib/gnu/java/util/regex/CharIndexedCharArray.class
deleted file mode 100644
index 2ede3d64525..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/CharIndexedCharArray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/CharIndexedCharSequence.class b/libjava/classpath/lib/gnu/java/util/regex/CharIndexedCharSequence.class
deleted file mode 100644
index 351c0af1abe..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/CharIndexedCharSequence.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/CharIndexedInputStream.class b/libjava/classpath/lib/gnu/java/util/regex/CharIndexedInputStream.class
deleted file mode 100644
index cf5fd881cfe..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/CharIndexedInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/CharIndexedString.class b/libjava/classpath/lib/gnu/java/util/regex/CharIndexedString.class
deleted file mode 100644
index 0710442c602..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/CharIndexedString.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/CharIndexedStringBuffer.class b/libjava/classpath/lib/gnu/java/util/regex/CharIndexedStringBuffer.class
deleted file mode 100644
index 8dfff383393..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/CharIndexedStringBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RE$CharExpression.class b/libjava/classpath/lib/gnu/java/util/regex/RE$CharExpression.class
deleted file mode 100644
index da1645dc711..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RE$CharExpression.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RE$CharUnit.class b/libjava/classpath/lib/gnu/java/util/regex/RE$CharUnit.class
deleted file mode 100644
index 4dd3fd602f9..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RE$CharUnit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RE$IntPair.class b/libjava/classpath/lib/gnu/java/util/regex/RE$IntPair.class
deleted file mode 100644
index 8d2299f63e5..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RE$IntPair.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RE$NamedProperty.class b/libjava/classpath/lib/gnu/java/util/regex/RE$NamedProperty.class
deleted file mode 100644
index b9be6348bd0..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RE$NamedProperty.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RE$ParseCharClassResult.class b/libjava/classpath/lib/gnu/java/util/regex/RE$ParseCharClassResult.class
deleted file mode 100644
index e7e5fac75f3..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RE$ParseCharClassResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RE.class b/libjava/classpath/lib/gnu/java/util/regex/RE.class
deleted file mode 100644
index d2b08dade12..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/REException.class b/libjava/classpath/lib/gnu/java/util/regex/REException.class
deleted file mode 100644
index 03dd2facb4a..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/REException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/REFilterInputStream.class b/libjava/classpath/lib/gnu/java/util/regex/REFilterInputStream.class
deleted file mode 100644
index 46830048af8..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/REFilterInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/REMatch.class b/libjava/classpath/lib/gnu/java/util/regex/REMatch.class
deleted file mode 100644
index aa08c348abc..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/REMatch.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/REMatchEnumeration.class b/libjava/classpath/lib/gnu/java/util/regex/REMatchEnumeration.class
deleted file mode 100644
index d3f9af9c84e..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/REMatchEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RESyntax.class b/libjava/classpath/lib/gnu/java/util/regex/RESyntax.class
deleted file mode 100644
index 6c630cb677b..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RESyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/REToken.class b/libjava/classpath/lib/gnu/java/util/regex/REToken.class
deleted file mode 100644
index 4d639446e7d..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/REToken.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenAny.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenAny.class
deleted file mode 100644
index f41668e1ba9..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenAny.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenBackRef.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenBackRef.class
deleted file mode 100644
index 72d37f4d897..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenBackRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenChar.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenChar.class
deleted file mode 100644
index 0d9a72acdf6..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenChar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenEnd.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenEnd.class
deleted file mode 100644
index 47cd3b90e59..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenEnd.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenEndOfPreviousMatch.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenEndOfPreviousMatch.class
deleted file mode 100644
index a5a3db55d13..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenEndOfPreviousMatch.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenEndSub.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenEndSub.class
deleted file mode 100644
index 15fd74c5ad2..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenEndSub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenIndependent.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenIndependent.class
deleted file mode 100644
index ae764c80b6c..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenIndependent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenLookAhead.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenLookAhead.class
deleted file mode 100644
index a77b64b1951..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenLookAhead.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.class
deleted file mode 100644
index 9c8b3a3deb7..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenLookBehind.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenLookBehind.class
deleted file mode 100644
index 3e09060fd27..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenLookBehind.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$1.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$1.class
deleted file mode 100644
index 109851311fc..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$Handler.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$Handler.class
deleted file mode 100644
index 64eefa696ce..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$POSIXHandler.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$POSIXHandler.class
deleted file mode 100644
index 8ac5ab21aa0..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$POSIXHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$UnicodeBlockHandler.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$UnicodeBlockHandler.class
deleted file mode 100644
index 5807ea3d6b3..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$UnicodeBlockHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoriesHandler.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoriesHandler.class
deleted file mode 100644
index 9a0cdb5359e..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoriesHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoryHandler.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoryHandler.class
deleted file mode 100644
index fb099b6b9b8..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty$UnicodeCategoryHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty.class
deleted file mode 100644
index c4e36ae6629..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenNamedProperty.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenOneOf.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenOneOf.class
deleted file mode 100644
index 2606bd63e0f..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenOneOf.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenPOSIX.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenPOSIX.class
deleted file mode 100644
index 6db3c463cf1..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenPOSIX.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenRange.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenRange.class
deleted file mode 100644
index e5ec4b23bb8..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenRange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$DoablesFinder.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$DoablesFinder.class
deleted file mode 100644
index 5fa7c5e5aac..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$DoablesFinder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$FindMatchControl.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$FindMatchControl.class
deleted file mode 100644
index f73abcb1861..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$FindMatchControl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.class
deleted file mode 100644
index b13752e34a3..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$StackedInfo.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$StackedInfo.class
deleted file mode 100644
index cea639307b2..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$StackedInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$TryAnotherResult.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$TryAnotherResult.class
deleted file mode 100644
index cc1574552ae..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated$TryAnotherResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated.class
deleted file mode 100644
index b3570c14063..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenRepeated.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenStart.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenStart.class
deleted file mode 100644
index c1bfc44dbf2..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenStart.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/RETokenWordBoundary.class b/libjava/classpath/lib/gnu/java/util/regex/RETokenWordBoundary.class
deleted file mode 100644
index e83e5fd23fe..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/RETokenWordBoundary.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/java/util/regex/UncheckedRE.class b/libjava/classpath/lib/gnu/java/util/regex/UncheckedRE.class
deleted file mode 100644
index e9684862f53..00000000000
--- a/libjava/classpath/lib/gnu/java/util/regex/UncheckedRE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/RSACipherImpl.class b/libjava/classpath/lib/gnu/javax/crypto/RSACipherImpl.class
deleted file mode 100644
index 154be44ca2b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/RSACipherImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/Assembly.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/Assembly.class
deleted file mode 100644
index 2d5c0e1d2d3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/Assembly.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/Cascade.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/Cascade.class
deleted file mode 100644
index 171e508bf8c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/Cascade.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/CascadeStage.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/CascadeStage.class
deleted file mode 100644
index ca41b8b06a5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/CascadeStage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/CascadeTransformer.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/CascadeTransformer.class
deleted file mode 100644
index 64e5a14190b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/CascadeTransformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/DeflateTransformer.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/DeflateTransformer.class
deleted file mode 100644
index 9b47c8c5650..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/DeflateTransformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/Direction.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/Direction.class
deleted file mode 100644
index fb994978e4b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/Direction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/LoopbackTransformer.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/LoopbackTransformer.class
deleted file mode 100644
index 34ff3fc6e97..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/LoopbackTransformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/ModeStage.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/ModeStage.class
deleted file mode 100644
index bb7f8859c78..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/ModeStage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/Operation.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/Operation.class
deleted file mode 100644
index 69dbdacc54e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/Operation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/PaddingTransformer.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/PaddingTransformer.class
deleted file mode 100644
index 24c6e27e98c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/PaddingTransformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/Stage.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/Stage.class
deleted file mode 100644
index 03019f30ac8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/Stage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/Transformer.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/Transformer.class
deleted file mode 100644
index e5850c4f081..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/Transformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/assembly/TransformerException.class b/libjava/classpath/lib/gnu/javax/crypto/assembly/TransformerException.class
deleted file mode 100644
index 6b37720404e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/assembly/TransformerException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Anubis.class
deleted file mode 100644
index 81dca322c34..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/BaseCipher.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/BaseCipher.class
deleted file mode 100644
index dc48fc22ee4..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/BaseCipher.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Blowfish$Block.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Blowfish$Block.class
deleted file mode 100644
index c46c20d4872..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Blowfish$Block.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Blowfish$Context.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Blowfish$Context.class
deleted file mode 100644
index 30d5f8eee93..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Blowfish$Context.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Blowfish.class
deleted file mode 100644
index ac561249f78..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Cast5$Cast5Key.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Cast5$Cast5Key.class
deleted file mode 100644
index bb7757f8070..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Cast5$Cast5Key.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Cast5.class
deleted file mode 100644
index bb4f9697352..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/CipherFactory.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/CipherFactory.class
deleted file mode 100644
index 4548e23b01a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/CipherFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/DES$Context.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/DES$Context.class
deleted file mode 100644
index 5edf6fbd833..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/DES$Context.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/DES.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/DES.class
deleted file mode 100644
index de8e57ef5e3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/IBlockCipher.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/IBlockCipher.class
deleted file mode 100644
index be921c15829..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/IBlockCipher.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/IBlockCipherSpi.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/IBlockCipherSpi.class
deleted file mode 100644
index 4f686b20872..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/IBlockCipherSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Khazad.class
deleted file mode 100644
index 40dd935901a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/NullCipher.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/NullCipher.class
deleted file mode 100644
index 332e2914a6b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/NullCipher.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Rijndael.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Rijndael.class
deleted file mode 100644
index 2e074e51f04..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Rijndael.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Serpent$Key.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Serpent$Key.class
deleted file mode 100644
index effa3851b2c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Serpent$Key.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Serpent.class
deleted file mode 100644
index 6736a55b5fb..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Square.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Square.class
deleted file mode 100644
index 0900898d90b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/TripleDES$Context.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/TripleDES$Context.class
deleted file mode 100644
index e1c47abef00..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/TripleDES$Context.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/TripleDES.class
deleted file mode 100644
index a92b9620cc2..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/Twofish.class
deleted file mode 100644
index 74f36a673f2..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/cipher/WeakKeyException.class b/libjava/classpath/lib/gnu/javax/crypto/cipher/WeakKeyException.class
deleted file mode 100644
index 2b13b7f453a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/cipher/WeakKeyException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/DiffieHellmanImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/DiffieHellmanImpl.class
deleted file mode 100644
index 777d436d796..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/DiffieHellmanImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/GnuCrypto$1.class b/libjava/classpath/lib/gnu/javax/crypto/jce/GnuCrypto$1.class
deleted file mode 100644
index 13b01ac78da..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/GnuCrypto$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/GnuCrypto.class b/libjava/classpath/lib/gnu/javax/crypto/jce/GnuCrypto.class
deleted file mode 100644
index 746da7bb610..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/GnuCrypto.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/GnuSasl$1.class b/libjava/classpath/lib/gnu/javax/crypto/jce/GnuSasl$1.class
deleted file mode 100644
index 039f92cb0b0..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/GnuSasl$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/GnuSasl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/GnuSasl.class
deleted file mode 100644
index cad5a40b7fe..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/GnuSasl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacHaval.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacHaval.class
deleted file mode 100644
index 593f4c3bce0..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacHaval.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD2.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD2.class
deleted file mode 100644
index bb69c04be6e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD4.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD4.class
deleted file mode 100644
index 8f0da33e1b4..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD5.class
deleted file mode 100644
index 0bbb39ca25b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD128.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD128.class
deleted file mode 100644
index a3238132001..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD128.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD160.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD160.class
deleted file mode 100644
index e1cd7d86c2a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD160.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA1.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA1.class
deleted file mode 100644
index 9fd94f73360..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA256.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA256.class
deleted file mode 100644
index 23d2192b26c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA256.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA384.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA384.class
deleted file mode 100644
index f0b86274a1a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA384.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA512.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA512.class
deleted file mode 100644
index bfee628bffe..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA512.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacTiger.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacTiger.class
deleted file mode 100644
index 77213f4b154..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacTiger.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacWhirlpool.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacWhirlpool.class
deleted file mode 100644
index cc418647da5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacWhirlpool.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.class b/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.class
deleted file mode 100644
index 4497929739d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.class
deleted file mode 100644
index 34a075a3ba7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.class
deleted file mode 100644
index cdf9ac289d0..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.class
deleted file mode 100644
index 7755f91c203..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.class
deleted file mode 100644
index e40e028002e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AESSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AESSpi.class
deleted file mode 100644
index 268adb81c16..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AESSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/ARCFourSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/ARCFourSpi.class
deleted file mode 100644
index f1bf06f8f49..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/ARCFourSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AnubisSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AnubisSpi.class
deleted file mode 100644
index b1b9f438158..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/AnubisSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/BlowfishSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/BlowfishSpi.class
deleted file mode 100644
index 4b5a1308e7b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/BlowfishSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/Cast5Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/Cast5Spi.class
deleted file mode 100644
index 767b8902d2d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/Cast5Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/CipherAdapter.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/CipherAdapter.class
deleted file mode 100644
index 91f2649b852..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/CipherAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/DESSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/DESSpi.class
deleted file mode 100644
index 91e1931b6c9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/DESSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.class
deleted file mode 100644
index 172c5bb2934..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/KhazadSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/KhazadSpi.class
deleted file mode 100644
index 0c133eab682..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/KhazadSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/NullCipherSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/NullCipherSpi.class
deleted file mode 100644
index f6796be3adf..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/NullCipherSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$AES.class
deleted file mode 100644
index 9aeda4489e1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Anubis.class
deleted file mode 100644
index a3bb8bbbdf4..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Blowfish.class
deleted file mode 100644
index bad376a9460..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Cast5.class
deleted file mode 100644
index fd458d97c07..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$DES.class
deleted file mode 100644
index ef111d4f87b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Khazad.class
deleted file mode 100644
index 185d966ca3e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Serpent.class
deleted file mode 100644
index 098c4a88693..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Square.class
deleted file mode 100644
index 58d1c9eda3c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$TripleDES.class
deleted file mode 100644
index 9fc6cac7f28..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Twofish.class
deleted file mode 100644
index c869e58b08b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.class
deleted file mode 100644
index 5a2d9d07840..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$AES.class
deleted file mode 100644
index 5055d05711b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Anubis.class
deleted file mode 100644
index 6d12fd65a02..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Blowfish.class
deleted file mode 100644
index 5af49f2fe50..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Cast5.class
deleted file mode 100644
index 4deb7839cd8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$DES.class
deleted file mode 100644
index cef6bf86d41..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Khazad.class
deleted file mode 100644
index dfcd56b27dc..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Serpent.class
deleted file mode 100644
index f1c4c31d3b4..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Square.class
deleted file mode 100644
index 2b96c5e2153..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$TripleDES.class
deleted file mode 100644
index 4cc7e61f2d6..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Twofish.class
deleted file mode 100644
index 01a5cc85c0b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.class
deleted file mode 100644
index 951d2d461a8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$AES.class
deleted file mode 100644
index 764c572d193..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Anubis.class
deleted file mode 100644
index 76eab32ca78..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Blowfish.class
deleted file mode 100644
index 07eeee4c215..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Cast5.class
deleted file mode 100644
index 36b90c57748..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$DES.class
deleted file mode 100644
index ed4e239ce98..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Khazad.class
deleted file mode 100644
index 1b5f8115fcd..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Serpent.class
deleted file mode 100644
index 5888670ae88..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Square.class
deleted file mode 100644
index 83dc11485a3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$TripleDES.class
deleted file mode 100644
index d033ef089a7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Twofish.class
deleted file mode 100644
index 1f14a5c171b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.class
deleted file mode 100644
index 46d45f3d30d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$AES.class
deleted file mode 100644
index 4e8b00de248..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Anubis.class
deleted file mode 100644
index 2834bda6446..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Blowfish.class
deleted file mode 100644
index 93e1aebee9e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Cast5.class
deleted file mode 100644
index e9acdf5c7ea..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$DES.class
deleted file mode 100644
index 6dbd18e6b4c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Khazad.class
deleted file mode 100644
index 422cf816dc3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Serpent.class
deleted file mode 100644
index a994a84b414..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Square.class
deleted file mode 100644
index 7f40d2ea87c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$TripleDES.class
deleted file mode 100644
index fcd265c0095..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Twofish.class
deleted file mode 100644
index d7aa6abb85d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.class
deleted file mode 100644
index 02f11062461..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$AES.class
deleted file mode 100644
index ea3973338c1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Anubis.class
deleted file mode 100644
index 60ffacb16e7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Blowfish.class
deleted file mode 100644
index 6b23e1ed04c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Cast5.class
deleted file mode 100644
index 675a03203c1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$DES.class
deleted file mode 100644
index eb13f91b568..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Khazad.class
deleted file mode 100644
index aec2baf7e6b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Serpent.class
deleted file mode 100644
index 12a41e920b0..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Square.class
deleted file mode 100644
index a5a201e45be..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$TripleDES.class
deleted file mode 100644
index 0ccba04988b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Twofish.class
deleted file mode 100644
index f2b60be6884..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.class
deleted file mode 100644
index 53e3a02b28f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$AES.class
deleted file mode 100644
index a633fe26ec0..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Anubis.class
deleted file mode 100644
index 0d15238d8ce..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Blowfish.class
deleted file mode 100644
index 1e635f22990..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Cast5.class
deleted file mode 100644
index b478acce27e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$DES.class
deleted file mode 100644
index 1b1288aa535..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Khazad.class
deleted file mode 100644
index b8499e1c8b7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Serpent.class
deleted file mode 100644
index f922f8199bc..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Square.class
deleted file mode 100644
index 17118c6d583..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$TripleDES.class
deleted file mode 100644
index 789ab4d6d06..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Twofish.class
deleted file mode 100644
index 8c0ad6765d1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.class
deleted file mode 100644
index a7a532635e7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$AES.class
deleted file mode 100644
index 3a04a90d341..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Anubis.class
deleted file mode 100644
index 961cb32f90e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Blowfish.class
deleted file mode 100644
index 3eb8deaed0d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Cast5.class
deleted file mode 100644
index 8ac55be5d27..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$DES.class
deleted file mode 100644
index 91488005a71..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Khazad.class
deleted file mode 100644
index 89754165e1c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Serpent.class
deleted file mode 100644
index 2276d36f7ea..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Square.class
deleted file mode 100644
index 17957937de1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$TripleDES.class
deleted file mode 100644
index d31fe635fad..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Twofish.class
deleted file mode 100644
index 9d12d74ba2a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.class
deleted file mode 100644
index ea88cade8e4..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$AES.class
deleted file mode 100644
index 254537a4b2d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Anubis.class
deleted file mode 100644
index 23f036eebc1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Blowfish.class
deleted file mode 100644
index ce38efe190b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Cast5.class
deleted file mode 100644
index a6750d9b9d2..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$DES.class
deleted file mode 100644
index 3c4bed0e852..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Khazad.class
deleted file mode 100644
index 89a356e67b1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Serpent.class
deleted file mode 100644
index 25c9f924e10..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Square.class
deleted file mode 100644
index c1b509b42f5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$TripleDES.class
deleted file mode 100644
index 9632900ebed..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Twofish.class
deleted file mode 100644
index aef1323e4ea..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.class
deleted file mode 100644
index 09987b56230..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$AES.class
deleted file mode 100644
index e3b64f532f9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Anubis.class
deleted file mode 100644
index 91b351de587..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Blowfish.class
deleted file mode 100644
index 811609ae3db..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Cast5.class
deleted file mode 100644
index 7ad49d92832..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$DES.class
deleted file mode 100644
index 0aa1d6376ef..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Khazad.class
deleted file mode 100644
index e01232584e4..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Serpent.class
deleted file mode 100644
index 3b002970369..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Square.class
deleted file mode 100644
index 6a5f44146f5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$TripleDES.class
deleted file mode 100644
index 5a40a1f5988..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Twofish.class
deleted file mode 100644
index c743a62cbc2..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.class
deleted file mode 100644
index 2a8b1776eff..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$AES.class
deleted file mode 100644
index 1470121544d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Anubis.class
deleted file mode 100644
index 2c776e85cfe..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Blowfish.class
deleted file mode 100644
index cbc2e47bb7f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Cast5.class
deleted file mode 100644
index cd0feeda22b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$DES.class
deleted file mode 100644
index ad9d2541493..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Khazad.class
deleted file mode 100644
index e37e63f9f5d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Serpent.class
deleted file mode 100644
index 5459f9a0edc..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Square.class
deleted file mode 100644
index 5f7786b9ada..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$TripleDES.class
deleted file mode 100644
index ba1edd4ede9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Twofish.class
deleted file mode 100644
index d4d3d7d5581..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.class
deleted file mode 100644
index 1d608201cc1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$AES.class
deleted file mode 100644
index c84ed67fc34..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Anubis.class
deleted file mode 100644
index 2645583248d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Blowfish.class
deleted file mode 100644
index e5e01317a49..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Cast5.class
deleted file mode 100644
index c02333fa0d6..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$DES.class
deleted file mode 100644
index 25e9e19bf83..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Khazad.class
deleted file mode 100644
index 1a74a38d9f7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Serpent.class
deleted file mode 100644
index 1f3e1ec07da..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Square.class
deleted file mode 100644
index 9429d491e34..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$TripleDES.class
deleted file mode 100644
index 3f7ca86b8b0..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Twofish.class
deleted file mode 100644
index 354b5b25fb1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.class
deleted file mode 100644
index 7fac486914f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$AES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$AES.class
deleted file mode 100644
index 14d17e983d4..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$AES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Anubis.class
deleted file mode 100644
index 5482386eb60..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Blowfish.class
deleted file mode 100644
index 6d5c34e543c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Cast5.class
deleted file mode 100644
index f1096cce1dc..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$DES.class
deleted file mode 100644
index 2c761635f72..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Khazad.class
deleted file mode 100644
index f485a804102..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Serpent.class
deleted file mode 100644
index 887c846443e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Square.class
deleted file mode 100644
index 29b8389d627..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$TripleDES.class
deleted file mode 100644
index 887dc9d13e2..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Twofish.class
deleted file mode 100644
index fda3802ebb5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.class
deleted file mode 100644
index 794f2c113b1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2.class
deleted file mode 100644
index f82f244bb56..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/PBES2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/RijndaelSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/RijndaelSpi.class
deleted file mode 100644
index 225be83f675..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/RijndaelSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/SerpentSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/SerpentSpi.class
deleted file mode 100644
index c1791f9f0a9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/SerpentSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/SquareSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/SquareSpi.class
deleted file mode 100644
index 8d5c25c8431..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/SquareSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.class
deleted file mode 100644
index cd1e9b0cb6a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/TripleDESSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/TripleDESSpi.class
deleted file mode 100644
index 0feb2cb07dc..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/TripleDESSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/TwofishSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/TwofishSpi.class
deleted file mode 100644
index e2d48984299..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/cipher/TwofishSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.class
deleted file mode 100644
index 14b129724f9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.class
deleted file mode 100644
index 174f53e421f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.class
deleted file mode 100644
index 5550f50e1f8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.class
deleted file mode 100644
index d176027eb50..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.class
deleted file mode 100644
index b2e45be7c9d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.class
deleted file mode 100644
index 08f86a58ee7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.class
deleted file mode 100644
index bc3ec363d4f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.class
deleted file mode 100644
index e64eb900b28..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.class
deleted file mode 100644
index a8e7c2577fe..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.class
deleted file mode 100644
index 815b3ff6a5f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.class
deleted file mode 100644
index 7b5b0cc27c8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.class
deleted file mode 100644
index 2a7b461693d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.class
deleted file mode 100644
index cae0da3208d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.class
deleted file mode 100644
index 4ecb9f067e3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.class
deleted file mode 100644
index d66c81e6fd3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.class
deleted file mode 100644
index 3d46a1c60cc..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.class
deleted file mode 100644
index 327a65519e0..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.class
deleted file mode 100644
index 408fe816246..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.class
deleted file mode 100644
index 9fa94579f18..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.class
deleted file mode 100644
index 4621cde694c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.class
deleted file mode 100644
index 6f0d4497cb6..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.class
deleted file mode 100644
index c4ad7fc780b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/keyring/GnuKeyring.class b/libjava/classpath/lib/gnu/javax/crypto/jce/keyring/GnuKeyring.class
deleted file mode 100644
index 4aa0694df0f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/keyring/GnuKeyring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacHavalSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacHavalSpi.class
deleted file mode 100644
index 5647594400a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacHavalSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacMD2Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacMD2Spi.class
deleted file mode 100644
index f87845df244..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacMD2Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacMD4Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacMD4Spi.class
deleted file mode 100644
index d7442b2e3e1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacMD4Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacMD5Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacMD5Spi.class
deleted file mode 100644
index c2b04f19881..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacMD5Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.class
deleted file mode 100644
index 1aeb2c6cebd..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.class
deleted file mode 100644
index 472f488f3bf..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA160Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA160Spi.class
deleted file mode 100644
index e2114629bb8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA160Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA256Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA256Spi.class
deleted file mode 100644
index d5355c1999f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA256Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA384Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA384Spi.class
deleted file mode 100644
index eb31def4ecc..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA384Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA512Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA512Spi.class
deleted file mode 100644
index b64fc623d90..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacSHA512Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacTigerSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacTigerSpi.class
deleted file mode 100644
index d995497a82f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacTigerSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.class
deleted file mode 100644
index 6c56d2e8ee3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/MacAdapter.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/MacAdapter.class
deleted file mode 100644
index 08d9ad164d8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/MacAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacAnubisImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacAnubisImpl.class
deleted file mode 100644
index cd8c33c1adc..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacAnubisImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.class
deleted file mode 100644
index aa2fb8251b2..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacCast5Impl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacCast5Impl.class
deleted file mode 100644
index 10db59be166..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacCast5Impl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacDESImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacDESImpl.class
deleted file mode 100644
index 4010a1097a8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacDESImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Anubis.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Anubis.class
deleted file mode 100644
index f08262006e8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Anubis.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Blowfish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Blowfish.class
deleted file mode 100644
index 7988e67a1d5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Blowfish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Cast5.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Cast5.class
deleted file mode 100644
index 255c05e1d14..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Cast5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$DES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$DES.class
deleted file mode 100644
index 471a25e1260..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$DES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Khazad.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Khazad.class
deleted file mode 100644
index 6600160d4c3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Khazad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Rijndael.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Rijndael.class
deleted file mode 100644
index 7837efc974c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Rijndael.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Serpent.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Serpent.class
deleted file mode 100644
index 328f5dffb3a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Serpent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Square.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Square.class
deleted file mode 100644
index cec0a630305..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Square.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$TripleDES.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$TripleDES.class
deleted file mode 100644
index d1f77800722..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$TripleDES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Twofish.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Twofish.class
deleted file mode 100644
index c497e637eda..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl$Twofish.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl.class
deleted file mode 100644
index a0149939a98..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacKhazadImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacKhazadImpl.class
deleted file mode 100644
index b64d4926e00..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacKhazadImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.class
deleted file mode 100644
index 5d88093668b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacSerpentImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacSerpentImpl.class
deleted file mode 100644
index c47eb5404dc..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacSerpentImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacSquareImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacSquareImpl.class
deleted file mode 100644
index 4040fa8aee3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacSquareImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.class
deleted file mode 100644
index e6c390c610d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacTwofishImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacTwofishImpl.class
deleted file mode 100644
index ce7041da24a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/OMacTwofishImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/TMMH16Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/TMMH16Spi.class
deleted file mode 100644
index 17a67ecc72a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/TMMH16Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/UHash32Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/UHash32Spi.class
deleted file mode 100644
index eaf7c1b1807..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/UHash32Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/UMac32Spi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/mac/UMac32Spi.class
deleted file mode 100644
index 506ad50e2a7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/mac/UMac32Spi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/params/BlockCipherParameters.class b/libjava/classpath/lib/gnu/javax/crypto/jce/params/BlockCipherParameters.class
deleted file mode 100644
index 733b746319f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/params/BlockCipherParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/params/DEREncodingException.class b/libjava/classpath/lib/gnu/javax/crypto/jce/params/DEREncodingException.class
deleted file mode 100644
index ab9166b5be5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/params/DEREncodingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/params/DERReader.class b/libjava/classpath/lib/gnu/javax/crypto/jce/params/DERReader.class
deleted file mode 100644
index e9489a5b224..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/params/DERReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/params/DERWriter.class b/libjava/classpath/lib/gnu/javax/crypto/jce/params/DERWriter.class
deleted file mode 100644
index d974a1510fe..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/params/DERWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.class
deleted file mode 100644
index 1adddb1be0c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/prng/CSPRNGSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/prng/CSPRNGSpi.class
deleted file mode 100644
index c10db7a1e0d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/prng/CSPRNGSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/prng/FortunaImpl.class b/libjava/classpath/lib/gnu/javax/crypto/jce/prng/FortunaImpl.class
deleted file mode 100644
index 817c972c95d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/prng/FortunaImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/prng/ICMRandomSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/prng/ICMRandomSpi.class
deleted file mode 100644
index 747f0032817..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/prng/ICMRandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/prng/UMacRandomSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/prng/UMacRandomSpi.class
deleted file mode 100644
index 214773133bf..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/prng/UMacRandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHKeyFactory.class b/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHKeyFactory.class
deleted file mode 100644
index 2111a7b9e06..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHKeyFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.class b/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.class
deleted file mode 100644
index 0a6560ca21b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHParameters.class b/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHParameters.class
deleted file mode 100644
index 39c15bce981..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHParametersGenerator.class b/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHParametersGenerator.class
deleted file mode 100644
index b11159bed13..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/sig/DHParametersGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.class b/libjava/classpath/lib/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.class
deleted file mode 100644
index 5156be2e8ec..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/spec/TMMHParameterSpec.class b/libjava/classpath/lib/gnu/javax/crypto/jce/spec/TMMHParameterSpec.class
deleted file mode 100644
index 890ba8ae194..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/spec/TMMHParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.class b/libjava/classpath/lib/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.class
deleted file mode 100644
index 64639b0a11c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/BaseKeyAgreementParty.class b/libjava/classpath/lib/gnu/javax/crypto/key/BaseKeyAgreementParty.class
deleted file mode 100644
index 634d0bb7972..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/BaseKeyAgreementParty.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/GnuPBEKey.class b/libjava/classpath/lib/gnu/javax/crypto/key/GnuPBEKey.class
deleted file mode 100644
index 1b4c4293f80..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/GnuPBEKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/GnuSecretKey.class b/libjava/classpath/lib/gnu/javax/crypto/key/GnuSecretKey.class
deleted file mode 100644
index f19c4bc4ee9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/GnuSecretKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/IKeyAgreementParty.class b/libjava/classpath/lib/gnu/javax/crypto/key/IKeyAgreementParty.class
deleted file mode 100644
index 96da8838ee2..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/IKeyAgreementParty.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/IncomingMessage.class b/libjava/classpath/lib/gnu/javax/crypto/key/IncomingMessage.class
deleted file mode 100644
index 2275acfffb9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/IncomingMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/KeyAgreementException.class b/libjava/classpath/lib/gnu/javax/crypto/key/KeyAgreementException.class
deleted file mode 100644
index d56655ed3a6..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/KeyAgreementException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/KeyAgreementFactory.class b/libjava/classpath/lib/gnu/javax/crypto/key/KeyAgreementFactory.class
deleted file mode 100644
index 9d26b5d0943..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/KeyAgreementFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/OutgoingMessage.class b/libjava/classpath/lib/gnu/javax/crypto/key/OutgoingMessage.class
deleted file mode 100644
index 5bf101b6f8a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/OutgoingMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.class
deleted file mode 100644
index 251a2997cdd..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.class
deleted file mode 100644
index 60a83476580..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.class
deleted file mode 100644
index f05804fd185..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.class
deleted file mode 100644
index eb5ce608d13..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.class
deleted file mode 100644
index cdc4b3e0d32..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DiffieHellmanSender.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/DiffieHellmanSender.class
deleted file mode 100644
index 71253615473..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/DiffieHellmanSender.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.class
deleted file mode 100644
index e321d6c1eea..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/ElGamalReceiver.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/ElGamalReceiver.class
deleted file mode 100644
index 24c52c99dcd..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/ElGamalReceiver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/ElGamalSender.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/ElGamalSender.class
deleted file mode 100644
index 6a1edcab3f2..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/ElGamalSender.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHKey.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHKey.class
deleted file mode 100644
index ae3a53fd4d8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.class
deleted file mode 100644
index 21708e4f450..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHPrivateKey.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHPrivateKey.class
deleted file mode 100644
index ea6c6c3dbb9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHPrivateKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHPublicKey.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHPublicKey.class
deleted file mode 100644
index 4ce1e3aa7a7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/GnuDHPublicKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/dh/RFC2631.class b/libjava/classpath/lib/gnu/javax/crypto/key/dh/RFC2631.class
deleted file mode 100644
index 6fde5f69b8b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/dh/RFC2631.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6Host.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6Host.class
deleted file mode 100644
index 26a7ff42701..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6Host.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.class
deleted file mode 100644
index 9122ca787b9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6SaslClient.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6SaslClient.class
deleted file mode 100644
index 0255854fa80..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6SaslClient.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6SaslServer.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6SaslServer.class
deleted file mode 100644
index 401fed7a5ff..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6SaslServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6TLSClient.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6TLSClient.class
deleted file mode 100644
index 158119e4f8a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6TLSClient.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6TLSServer.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6TLSServer.class
deleted file mode 100644
index 6278669cd2c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6TLSServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6User.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6User.class
deleted file mode 100644
index c37bd3b210b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRP6User.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPAlgorithm.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPAlgorithm.class
deleted file mode 100644
index 32cc96a1bdf..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPAlgorithm.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPKey.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPKey.class
deleted file mode 100644
index d98f9332e00..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.class
deleted file mode 100644
index 74565271313..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.class
deleted file mode 100644
index e34b81e38ea..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPPrivateKey.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPPrivateKey.class
deleted file mode 100644
index 10b2065104d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPPrivateKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPPublicKey.class b/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPPublicKey.class
deleted file mode 100644
index 8083719df0b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/key/srp6/SRPPublicKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/AuthenticatedEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/AuthenticatedEntry.class
deleted file mode 100644
index bdca3a13825..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/AuthenticatedEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/BaseKeyring.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/BaseKeyring.class
deleted file mode 100644
index d57b08a95e9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/BaseKeyring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/BinaryDataEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/BinaryDataEntry.class
deleted file mode 100644
index f2a5db7fac2..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/BinaryDataEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/CertPathEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/CertPathEntry.class
deleted file mode 100644
index fe5083ff83e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/CertPathEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/CertificateEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/CertificateEntry.class
deleted file mode 100644
index d732dc661a5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/CertificateEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/CompressedEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/CompressedEntry.class
deleted file mode 100644
index f1955ca0afb..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/CompressedEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/EncryptedEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/EncryptedEntry.class
deleted file mode 100644
index c9125f334be..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/EncryptedEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/Entry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/Entry.class
deleted file mode 100644
index 15feb5cdb2e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/Entry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/EnvelopeEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/EnvelopeEntry.class
deleted file mode 100644
index d2ba95df2aa..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/EnvelopeEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/GnuPrivateKeyring.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/GnuPrivateKeyring.class
deleted file mode 100644
index e270487ff75..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/GnuPrivateKeyring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/GnuPublicKeyring.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/GnuPublicKeyring.class
deleted file mode 100644
index af49c02363b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/GnuPublicKeyring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/IKeyring.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/IKeyring.class
deleted file mode 100644
index cbfd18fc5b4..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/IKeyring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/IPrivateKeyring.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/IPrivateKeyring.class
deleted file mode 100644
index 9c575e139d6..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/IPrivateKeyring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/IPublicKeyring.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/IPublicKeyring.class
deleted file mode 100644
index d494a27c4ea..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/IPublicKeyring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/MalformedKeyringException.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/MalformedKeyringException.class
deleted file mode 100644
index 62afc92739a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/MalformedKeyringException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.class
deleted file mode 100644
index a847d81a2e1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/MeteredInputStream.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/MeteredInputStream.class
deleted file mode 100644
index e179a91954f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/MeteredInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.class
deleted file mode 100644
index ccc911035a1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/PasswordEncryptedEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/PasswordEncryptedEntry.class
deleted file mode 100644
index 15f4eb45dda..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/PasswordEncryptedEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/PasswordProtectedEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/PasswordProtectedEntry.class
deleted file mode 100644
index 1b2578e9b16..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/PasswordProtectedEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/PrimitiveEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/PrimitiveEntry.class
deleted file mode 100644
index ed589f5bdd5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/PrimitiveEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/PrivateKeyEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/PrivateKeyEntry.class
deleted file mode 100644
index 024cdb30811..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/PrivateKeyEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/Properties.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/Properties.class
deleted file mode 100644
index 1a02d62dc28..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/Properties.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/keyring/PublicKeyEntry.class b/libjava/classpath/lib/gnu/javax/crypto/keyring/PublicKeyEntry.class
deleted file mode 100644
index 21447b519f3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/keyring/PublicKeyEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/kwa/AESKeyWrap.class b/libjava/classpath/lib/gnu/javax/crypto/kwa/AESKeyWrap.class
deleted file mode 100644
index cc53cc89b33..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/kwa/AESKeyWrap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.class b/libjava/classpath/lib/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.class
deleted file mode 100644
index 2d15a56c879..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.class b/libjava/classpath/lib/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.class
deleted file mode 100644
index 06256a9966a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/kwa/KeyUnwrappingException.class b/libjava/classpath/lib/gnu/javax/crypto/kwa/KeyUnwrappingException.class
deleted file mode 100644
index 5fb8b4684d9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/kwa/KeyUnwrappingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.class b/libjava/classpath/lib/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.class
deleted file mode 100644
index 1c3b89b8b60..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/kwa/TripleDESKeyWrap.class b/libjava/classpath/lib/gnu/javax/crypto/kwa/TripleDESKeyWrap.class
deleted file mode 100644
index 544e205e436..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/kwa/TripleDESKeyWrap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/BaseMac.class b/libjava/classpath/lib/gnu/javax/crypto/mac/BaseMac.class
deleted file mode 100644
index d617c4426c1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/BaseMac.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/HMac.class b/libjava/classpath/lib/gnu/javax/crypto/mac/HMac.class
deleted file mode 100644
index 5cb2ef2c2e8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/HMac.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/HMacFactory.class b/libjava/classpath/lib/gnu/javax/crypto/mac/HMacFactory.class
deleted file mode 100644
index 3d2608d1843..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/HMacFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/IMac.class b/libjava/classpath/lib/gnu/javax/crypto/mac/IMac.class
deleted file mode 100644
index 21fcbdbd869..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/IMac.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/MacFactory.class b/libjava/classpath/lib/gnu/javax/crypto/mac/MacFactory.class
deleted file mode 100644
index c3ed66a258e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/MacFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/MacInputStream.class b/libjava/classpath/lib/gnu/javax/crypto/mac/MacInputStream.class
deleted file mode 100644
index b862aedb6c0..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/MacInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/MacOutputStream.class b/libjava/classpath/lib/gnu/javax/crypto/mac/MacOutputStream.class
deleted file mode 100644
index 87a03e55e0e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/MacOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/OMAC.class b/libjava/classpath/lib/gnu/javax/crypto/mac/OMAC.class
deleted file mode 100644
index 449ad35b322..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/OMAC.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/TMMH16.class b/libjava/classpath/lib/gnu/javax/crypto/mac/TMMH16.class
deleted file mode 100644
index e245bda88d9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/TMMH16.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32$L1Hash32.class b/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32$L1Hash32.class
deleted file mode 100644
index f6276a81a15..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32$L1Hash32.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32$L2Hash32.class b/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32$L2Hash32.class
deleted file mode 100644
index 7f57ef27334..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32$L2Hash32.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32$L3Hash32.class b/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32$L3Hash32.class
deleted file mode 100644
index 8f721424fca..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32$L3Hash32.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32.class b/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32.class
deleted file mode 100644
index afa01f824be..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/UHash32.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mac/UMac32.class b/libjava/classpath/lib/gnu/javax/crypto/mac/UMac32.class
deleted file mode 100644
index c0df13dc3a5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mac/UMac32.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/BaseMode.class b/libjava/classpath/lib/gnu/javax/crypto/mode/BaseMode.class
deleted file mode 100644
index f608e3f6363..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/BaseMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/CBC.class b/libjava/classpath/lib/gnu/javax/crypto/mode/CBC.class
deleted file mode 100644
index 631dd8f3a83..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/CBC.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/CFB.class b/libjava/classpath/lib/gnu/javax/crypto/mode/CFB.class
deleted file mode 100644
index df8c22fbd37..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/CFB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/CTR.class b/libjava/classpath/lib/gnu/javax/crypto/mode/CTR.class
deleted file mode 100644
index 471a2bdc029..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/CTR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/EAX.class b/libjava/classpath/lib/gnu/javax/crypto/mode/EAX.class
deleted file mode 100644
index 3bc66f205ea..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/EAX.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/ECB.class b/libjava/classpath/lib/gnu/javax/crypto/mode/ECB.class
deleted file mode 100644
index cdd23851060..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/ECB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/IAuthenticatedMode.class b/libjava/classpath/lib/gnu/javax/crypto/mode/IAuthenticatedMode.class
deleted file mode 100644
index c2778aca6b3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/IAuthenticatedMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/ICM.class b/libjava/classpath/lib/gnu/javax/crypto/mode/ICM.class
deleted file mode 100644
index cbfff4b4f45..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/ICM.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/IMode.class b/libjava/classpath/lib/gnu/javax/crypto/mode/IMode.class
deleted file mode 100644
index fa3408e851d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/IMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/ModeFactory.class b/libjava/classpath/lib/gnu/javax/crypto/mode/ModeFactory.class
deleted file mode 100644
index 81f85823a7e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/ModeFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/mode/OFB.class b/libjava/classpath/lib/gnu/javax/crypto/mode/OFB.class
deleted file mode 100644
index faf5fa22f6c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/mode/OFB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/pad/BasePad.class b/libjava/classpath/lib/gnu/javax/crypto/pad/BasePad.class
deleted file mode 100644
index 8c8468361ff..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/pad/BasePad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/pad/IPad.class b/libjava/classpath/lib/gnu/javax/crypto/pad/IPad.class
deleted file mode 100644
index 772670851cb..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/pad/IPad.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/pad/ISO10126.class b/libjava/classpath/lib/gnu/javax/crypto/pad/ISO10126.class
deleted file mode 100644
index 02c8a312efa..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/pad/ISO10126.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/pad/PKCS1_V1_5.class b/libjava/classpath/lib/gnu/javax/crypto/pad/PKCS1_V1_5.class
deleted file mode 100644
index b7c141094f7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/pad/PKCS1_V1_5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/pad/PKCS7.class b/libjava/classpath/lib/gnu/javax/crypto/pad/PKCS7.class
deleted file mode 100644
index c47e354005e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/pad/PKCS7.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/pad/PadFactory.class b/libjava/classpath/lib/gnu/javax/crypto/pad/PadFactory.class
deleted file mode 100644
index d63a84395db..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/pad/PadFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/pad/SSL3.class b/libjava/classpath/lib/gnu/javax/crypto/pad/SSL3.class
deleted file mode 100644
index 407a35c249a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/pad/SSL3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/pad/TBC.class b/libjava/classpath/lib/gnu/javax/crypto/pad/TBC.class
deleted file mode 100644
index 87fb7f43d67..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/pad/TBC.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/pad/TLS1.class b/libjava/classpath/lib/gnu/javax/crypto/pad/TLS1.class
deleted file mode 100644
index 877195e7bb3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/pad/TLS1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/pad/WrongPaddingException.class b/libjava/classpath/lib/gnu/javax/crypto/pad/WrongPaddingException.class
deleted file mode 100644
index b733e14c5eb..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/pad/WrongPaddingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/ARCFour.class b/libjava/classpath/lib/gnu/javax/crypto/prng/ARCFour.class
deleted file mode 100644
index 35a40c04b53..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/ARCFour.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG$1.class b/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG$1.class
deleted file mode 100644
index c7592d24057..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG$Poller.class b/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG$Poller.class
deleted file mode 100644
index ebb8e4a2d3a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG$Poller.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG$Spinner.class b/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG$Spinner.class
deleted file mode 100644
index 937382eab7c..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG$Spinner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG.class b/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG.class
deleted file mode 100644
index 537fe2f5fc7..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/CSPRNG.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/Fortuna$Generator.class b/libjava/classpath/lib/gnu/javax/crypto/prng/Fortuna$Generator.class
deleted file mode 100644
index 1b7c9283160..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/Fortuna$Generator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/Fortuna.class b/libjava/classpath/lib/gnu/javax/crypto/prng/Fortuna.class
deleted file mode 100644
index b74d5da8738..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/Fortuna.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/ICMGenerator.class b/libjava/classpath/lib/gnu/javax/crypto/prng/ICMGenerator.class
deleted file mode 100644
index 9c38cdf1799..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/ICMGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/IPBE.class b/libjava/classpath/lib/gnu/javax/crypto/prng/IPBE.class
deleted file mode 100644
index 6ddd98ad499..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/IPBE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/PBKDF2.class b/libjava/classpath/lib/gnu/javax/crypto/prng/PBKDF2.class
deleted file mode 100644
index 494e88a1ff4..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/PBKDF2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/PRNGFactory.class b/libjava/classpath/lib/gnu/javax/crypto/prng/PRNGFactory.class
deleted file mode 100644
index fda72a8a709..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/PRNGFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/prng/UMacGenerator.class b/libjava/classpath/lib/gnu/javax/crypto/prng/UMacGenerator.class
deleted file mode 100644
index b82bbfbbfff..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/prng/UMacGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/AuthInfo.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/AuthInfo.class
deleted file mode 100644
index 001a63e4e4d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/AuthInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/AuthInfoProviderFactory.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/AuthInfoProviderFactory.class
deleted file mode 100644
index 91d180d1de8..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/AuthInfoProviderFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/ClientFactory.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/ClientFactory.class
deleted file mode 100644
index 02f22f692f5..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/ClientFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/ClientMechanism.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/ClientMechanism.class
deleted file mode 100644
index ce05c73f4a1..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/ClientMechanism.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/ConfidentialityException.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/ConfidentialityException.class
deleted file mode 100644
index a16f1efeb37..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/ConfidentialityException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/IAuthInfoProvider.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/IAuthInfoProvider.class
deleted file mode 100644
index 26f9af2e8db..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/IAuthInfoProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.class
deleted file mode 100644
index 0ece0848024..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/IllegalMechanismStateException.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/IllegalMechanismStateException.class
deleted file mode 100644
index e4804d86707..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/IllegalMechanismStateException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/InputBuffer.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/InputBuffer.class
deleted file mode 100644
index 25b4f11c5fa..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/InputBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/IntegrityException.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/IntegrityException.class
deleted file mode 100644
index b8cbebd541e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/IntegrityException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/NoSuchMechanismException.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/NoSuchMechanismException.class
deleted file mode 100644
index 5296788baaf..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/NoSuchMechanismException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/NoSuchUserException.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/NoSuchUserException.class
deleted file mode 100644
index c6f042dc363..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/NoSuchUserException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/OutputBuffer.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/OutputBuffer.class
deleted file mode 100644
index f163d3c1265..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/OutputBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslEncodingException.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslEncodingException.class
deleted file mode 100644
index befd9ccb2f3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslEncodingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslInputStream.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslInputStream.class
deleted file mode 100644
index 8672abc861a..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslOutputStream.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslOutputStream.class
deleted file mode 100644
index 06036018541..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslUtil.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslUtil.class
deleted file mode 100644
index 8a4b0211405..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/SaslUtil.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/ServerFactory.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/ServerFactory.class
deleted file mode 100644
index a7eb9b4a2d9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/ServerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/ServerMechanism.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/ServerMechanism.class
deleted file mode 100644
index 165e46a3f30..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/ServerMechanism.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/UserAlreadyExistsException.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/UserAlreadyExistsException.class
deleted file mode 100644
index 48614ee35e9..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/UserAlreadyExistsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/anonymous/AnonymousClient.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/anonymous/AnonymousClient.class
deleted file mode 100644
index d455f55e268..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/anonymous/AnonymousClient.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/anonymous/AnonymousServer.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/anonymous/AnonymousServer.class
deleted file mode 100644
index 6f7e3141bd3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/anonymous/AnonymousServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.class
deleted file mode 100644
index 266dd041e8f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.class
deleted file mode 100644
index ff24bb4a445..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Client.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Client.class
deleted file mode 100644
index aa53a44ca72..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Client.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.class
deleted file mode 100644
index 745e176636d..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Server.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Server.class
deleted file mode 100644
index 6c51063967b..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Server.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Util.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Util.class
deleted file mode 100644
index ac4fc0bc8c4..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/CramMD5Util.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/PasswordFile.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/PasswordFile.class
deleted file mode 100644
index 51523b5a7a0..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/crammd5/PasswordFile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PasswordFile.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PasswordFile.class
deleted file mode 100644
index b7e4cc00b58..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PasswordFile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.class
deleted file mode 100644
index f62e9f89c4e..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainClient.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainClient.class
deleted file mode 100644
index 928a8694f14..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainClient.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainRegistry.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainRegistry.class
deleted file mode 100644
index aa70f14be44..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainRegistry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainServer.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainServer.class
deleted file mode 100644
index 8a5f810b0f6..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/plain/PlainServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/CALG.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/CALG.class
deleted file mode 100644
index fdc5ffa02a0..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/CALG.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/ClientStore.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/ClientStore.class
deleted file mode 100644
index 9c800a17428..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/ClientStore.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/IALG.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/IALG.class
deleted file mode 100644
index 0ed3d23f017..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/IALG.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/KDF.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/KDF.class
deleted file mode 100644
index 178af34da69..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/KDF.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/PasswordFile.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/PasswordFile.class
deleted file mode 100644
index b92fe4f6dac..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/PasswordFile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRP.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRP.class
deleted file mode 100644
index 76c863be696..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRP.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.class
deleted file mode 100644
index e5ec9572b53..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPClient.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPClient.class
deleted file mode 100644
index e20ffb6333f..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPClient.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPRegistry.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPRegistry.class
deleted file mode 100644
index 4bf66fe9ffc..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPRegistry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPServer.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPServer.class
deleted file mode 100644
index c81ddc2ec85..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SRPServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SecurityContext.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SecurityContext.class
deleted file mode 100644
index 3830ff959e3..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/SecurityContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/ServerStore.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/ServerStore.class
deleted file mode 100644
index 9757964c614..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/ServerStore.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/StoreEntry.class b/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/StoreEntry.class
deleted file mode 100644
index 97ed0be25ee..00000000000
--- a/libjava/classpath/lib/gnu/javax/crypto/sasl/srp/StoreEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/IIOInputStream.class b/libjava/classpath/lib/gnu/javax/imageio/IIOInputStream.class
deleted file mode 100644
index 6ae0df103d7..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/IIOInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPDecoder.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPDecoder.class
deleted file mode 100644
index 50b29cb530f..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPDecoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPEncoder.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPEncoder.class
deleted file mode 100644
index efc1a6d6692..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPEncoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPException.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPException.class
deleted file mode 100644
index ad67b890440..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPFileHeader.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPFileHeader.class
deleted file mode 100644
index a7f09556c9c..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPFileHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageReader.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageReader.class
deleted file mode 100644
index 3a53ab1dd3b..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageReaderSpi.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageReaderSpi.class
deleted file mode 100644
index edcfcda2bf4..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageReaderSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageWriter.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageWriter.class
deleted file mode 100644
index 23934b7a076..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageWriterSpi.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageWriterSpi.class
deleted file mode 100644
index d29770d6e16..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPImageWriterSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPInfoHeader.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPInfoHeader.class
deleted file mode 100644
index 3088838a42c..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/BMPInfoHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeBF16.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeBF16.class
deleted file mode 100644
index 2f65103b73c..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeBF16.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeBF32.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeBF32.class
deleted file mode 100644
index a49e61efe66..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeBF32.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB1.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB1.class
deleted file mode 100644
index 6bd47877e5a..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB24.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB24.class
deleted file mode 100644
index 30db342f7f6..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB24.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB4.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB4.class
deleted file mode 100644
index 2723c69ddc8..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB8.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB8.class
deleted file mode 100644
index 280e069e117..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRGB8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRLE4.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRLE4.class
deleted file mode 100644
index 1fd12dde785..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRLE4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRLE8.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRLE8.class
deleted file mode 100644
index 3395c9dc940..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/DecodeRLE8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB1.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB1.class
deleted file mode 100644
index 645a36027a3..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB16.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB16.class
deleted file mode 100644
index 21fa35b8382..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB16.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB24.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB24.class
deleted file mode 100644
index aa42a130394..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB24.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB32.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB32.class
deleted file mode 100644
index fe373030d4f..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB32.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB4.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB4.class
deleted file mode 100644
index eb279534f20..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB8.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB8.class
deleted file mode 100644
index 8c0ca496473..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRGB8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRLE4.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRLE4.class
deleted file mode 100644
index bfe8f87be2f..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRLE4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRLE8.class b/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRLE8.class
deleted file mode 100644
index 78d8bea4b8e..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/bmp/EncodeRLE8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/gif/GIFFile$GIFException.class b/libjava/classpath/lib/gnu/javax/imageio/gif/GIFFile$GIFException.class
deleted file mode 100644
index ea01c212780..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/gif/GIFFile$GIFException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/gif/GIFFile.class b/libjava/classpath/lib/gnu/javax/imageio/gif/GIFFile.class
deleted file mode 100644
index 535f2062232..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/gif/GIFFile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/gif/GIFImageReader.class b/libjava/classpath/lib/gnu/javax/imageio/gif/GIFImageReader.class
deleted file mode 100644
index 28bc2583ca9..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/gif/GIFImageReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/gif/GIFImageReaderSpi.class b/libjava/classpath/lib/gnu/javax/imageio/gif/GIFImageReaderSpi.class
deleted file mode 100644
index 5db948a7d98..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/gif/GIFImageReaderSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/DCT.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/DCT.class
deleted file mode 100644
index 2108bde0dcb..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/DCT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/HuffmanTable.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/HuffmanTable.class
deleted file mode 100644
index fa94d71675d..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/HuffmanTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGComponent.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGComponent.class
deleted file mode 100644
index ca2e690e050..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGDecoder.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGDecoder.class
deleted file mode 100644
index f834155317a..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGDecoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGException.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGException.class
deleted file mode 100644
index 0ae6fd9a3fe..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGFrame.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGFrame.class
deleted file mode 100644
index 55349a9d929..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGFrame.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGImageInputStream.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGImageInputStream.class
deleted file mode 100644
index 4dc722d41a9..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGImageInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGImageReader.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGImageReader.class
deleted file mode 100644
index 748767500ec..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGImageReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.class
deleted file mode 100644
index aaa0460dd50..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGMarker.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGMarker.class
deleted file mode 100644
index 3d677aaf920..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGMarker.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.class
deleted file mode 100644
index aafc5c4d564..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGMarkerFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGScan.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGScan.class
deleted file mode 100644
index 19532a9c02f..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/JPEGScan.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.class
deleted file mode 100644
index c773e197059..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/YCbCr_ColorSpace.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/jpeg/ZigZag.class b/libjava/classpath/lib/gnu/javax/imageio/jpeg/ZigZag.class
deleted file mode 100644
index 12c6a8952c3..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/jpeg/ZigZag.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGChunk.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGChunk.class
deleted file mode 100644
index e5bd013ae00..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGChunk.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGData.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGData.class
deleted file mode 100644
index 5186febbb4f..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGDecoder.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGDecoder.class
deleted file mode 100644
index ab6c3034e93..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGDecoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGEncoder.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGEncoder.class
deleted file mode 100644
index 6712c7ecacf..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGEncoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGException.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGException.class
deleted file mode 100644
index 8db2224ce69..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGFile.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGFile.class
deleted file mode 100644
index 85f16e07f3c..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGFile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGFilter.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGFilter.class
deleted file mode 100644
index b419b9ba2cd..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGGamma.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGGamma.class
deleted file mode 100644
index a806c42419c..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGGamma.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGHeader.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGHeader.class
deleted file mode 100644
index 7cfb2b44886..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGICCProfile.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGICCProfile.class
deleted file mode 100644
index ea403864db7..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGICCProfile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGImageReader.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGImageReader.class
deleted file mode 100644
index 250520747c8..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGImageReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGImageReaderSpi.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGImageReaderSpi.class
deleted file mode 100644
index ac1c7e79645..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGImageReaderSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGPalette.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGPalette.class
deleted file mode 100644
index b553c2ff0fa..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGPalette.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGPhys.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGPhys.class
deleted file mode 100644
index 483336b8e60..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGPhys.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/imageio/png/PNGTime.class b/libjava/classpath/lib/gnu/javax/imageio/png/PNGTime.class
deleted file mode 100644
index d8c2799cb70..00000000000
--- a/libjava/classpath/lib/gnu/javax/imageio/png/PNGTime.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/management/Server$ServerInfo.class b/libjava/classpath/lib/gnu/javax/management/Server$ServerInfo.class
deleted file mode 100644
index 644d5a40574..00000000000
--- a/libjava/classpath/lib/gnu/javax/management/Server$ServerInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/management/Server$ServerInputStream.class b/libjava/classpath/lib/gnu/javax/management/Server$ServerInputStream.class
deleted file mode 100644
index 536ac420c81..00000000000
--- a/libjava/classpath/lib/gnu/javax/management/Server$ServerInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/management/Server$ServerNotificationListener.class b/libjava/classpath/lib/gnu/javax/management/Server$ServerNotificationListener.class
deleted file mode 100644
index 769500cada3..00000000000
--- a/libjava/classpath/lib/gnu/javax/management/Server$ServerNotificationListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/management/Server.class b/libjava/classpath/lib/gnu/javax/management/Server.class
deleted file mode 100644
index 54552f00585..00000000000
--- a/libjava/classpath/lib/gnu/javax/management/Server.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/giop/ContextContinuation.class b/libjava/classpath/lib/gnu/javax/naming/giop/ContextContinuation.class
deleted file mode 100644
index 4a60d0b0e71..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/giop/ContextContinuation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/giop/CorbalocParser.class b/libjava/classpath/lib/gnu/javax/naming/giop/CorbalocParser.class
deleted file mode 100644
index e31b24f799f..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/giop/CorbalocParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingEnumeration.class b/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingEnumeration.class
deleted file mode 100644
index 1936b365ecc..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingServiceFactory$1.class b/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingServiceFactory$1.class
deleted file mode 100644
index 71206978915..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingServiceFactory$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingServiceFactory.class b/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingServiceFactory.class
deleted file mode 100644
index 249ecb29f3a..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingServiceFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingServiceURLContext.class b/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingServiceURLContext.class
deleted file mode 100644
index c06abb85ec6..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/giop/GiopNamingServiceURLContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/giop/ListBindingsEnumeration.class b/libjava/classpath/lib/gnu/javax/naming/giop/ListBindingsEnumeration.class
deleted file mode 100644
index e668e217069..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/giop/ListBindingsEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/giop/ListEnumeration.class b/libjava/classpath/lib/gnu/javax/naming/giop/ListEnumeration.class
deleted file mode 100644
index 0232cc693f8..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/giop/ListEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/ictxImpl/trans/GnuName$GnuNameEnum.class b/libjava/classpath/lib/gnu/javax/naming/ictxImpl/trans/GnuName$GnuNameEnum.class
deleted file mode 100644
index 778e0419661..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/ictxImpl/trans/GnuName$GnuNameEnum.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/ictxImpl/trans/GnuName.class b/libjava/classpath/lib/gnu/javax/naming/ictxImpl/trans/GnuName.class
deleted file mode 100644
index 23f9833499e..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/ictxImpl/trans/GnuName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.class b/libjava/classpath/lib/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.class
deleted file mode 100644
index 8f94219ca9e..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/ContextContinuation.class b/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/ContextContinuation.class
deleted file mode 100644
index c12490e32cb..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/ContextContinuation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.class b/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.class
deleted file mode 100644
index cf7b508fc97..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/ListEnumeration.class b/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/ListEnumeration.class
deleted file mode 100644
index ebe526a4f1a..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/ListEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/RmiContinuation.class b/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/RmiContinuation.class
deleted file mode 100644
index f8b6df6dd28..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/RmiContinuation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.class b/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.class
deleted file mode 100644
index a16cb51ea63..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/rmiURLContext.class b/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/rmiURLContext.class
deleted file mode 100644
index b9a5f28385a..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/rmiURLContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.class b/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.class
deleted file mode 100644
index 86da48cb36b..00000000000
--- a/libjava/classpath/lib/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/AbstractSessionContext.class b/libjava/classpath/lib/gnu/javax/net/ssl/AbstractSessionContext.class
deleted file mode 100644
index e6beaf07062..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/AbstractSessionContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/Base64.class b/libjava/classpath/lib/gnu/javax/net/ssl/Base64.class
deleted file mode 100644
index dbbea5b430b..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/Base64.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/EntropySource.class b/libjava/classpath/lib/gnu/javax/net/ssl/EntropySource.class
deleted file mode 100644
index cb6337a8192..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/EntropySource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/NullManagerParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/NullManagerParameters.class
deleted file mode 100644
index 5c66d4bde0e..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/NullManagerParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/PreSharedKeyManager.class b/libjava/classpath/lib/gnu/javax/net/ssl/PreSharedKeyManager.class
deleted file mode 100644
index 9dabfbe3f67..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/PreSharedKeyManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/PreSharedKeyManagerParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/PreSharedKeyManagerParameters.class
deleted file mode 100644
index 8b6418e6601..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/PreSharedKeyManagerParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/PrivateCredentials.class b/libjava/classpath/lib/gnu/javax/net/ssl/PrivateCredentials.class
deleted file mode 100644
index 78dc1ff30be..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/PrivateCredentials.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/SRPManagerParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/SRPManagerParameters.class
deleted file mode 100644
index f51aab7a1c7..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/SRPManagerParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/SRPTrustManager.class b/libjava/classpath/lib/gnu/javax/net/ssl/SRPTrustManager.class
deleted file mode 100644
index 74bbe0727a2..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/SRPTrustManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/SSLCipherSuite.class b/libjava/classpath/lib/gnu/javax/net/ssl/SSLCipherSuite.class
deleted file mode 100644
index 557e437300a..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/SSLCipherSuite.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/SSLProtocolVersion.class b/libjava/classpath/lib/gnu/javax/net/ssl/SSLProtocolVersion.class
deleted file mode 100644
index e36144967ae..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/SSLProtocolVersion.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/SSLRecordHandler.class b/libjava/classpath/lib/gnu/javax/net/ssl/SSLRecordHandler.class
deleted file mode 100644
index 5c399712b0e..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/SSLRecordHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/Session$ID.class b/libjava/classpath/lib/gnu/javax/net/ssl/Session$ID.class
deleted file mode 100644
index e9803984522..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/Session$ID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/Session.class b/libjava/classpath/lib/gnu/javax/net/ssl/Session.class
deleted file mode 100644
index fce5c3c40d8..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/Session.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/SessionStoreException.class b/libjava/classpath/lib/gnu/javax/net/ssl/SessionStoreException.class
deleted file mode 100644
index 71de739a91f..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/SessionStoreException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/StaticTrustAnchors.class b/libjava/classpath/lib/gnu/javax/net/ssl/StaticTrustAnchors.class
deleted file mode 100644
index 50b76a7c281..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/StaticTrustAnchors.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$1.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$1.class
deleted file mode 100644
index 9e6a7d2ed6a..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$CertVerifier.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$CertVerifier.class
deleted file mode 100644
index 1b68307eaaf..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$CertVerifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$DHE_PSKGen.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$DHE_PSKGen.class
deleted file mode 100644
index d7c38ec5de5..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$DHE_PSKGen.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$DHPhase.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$DHPhase.class
deleted file mode 100644
index 2225d7d0afc..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake$DHPhase.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake.class
deleted file mode 100644
index 063f2b20c95..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AbstractHandshake.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Alert$Description.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Alert$Description.class
deleted file mode 100644
index c8403e8ad84..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Alert$Description.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Alert$Level.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Alert$Level.class
deleted file mode 100644
index 6cdbb324e23..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Alert$Level.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Alert.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Alert.class
deleted file mode 100644
index 56c061916c7..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Alert.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AlertException.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/AlertException.class
deleted file mode 100644
index 153a8a2ad3f..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/AlertException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Builder.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Builder.class
deleted file mode 100644
index 71007f5b809..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Builder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Certificate.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Certificate.class
deleted file mode 100644
index 46876c90421..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Certificate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateBuilder.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateBuilder.class
deleted file mode 100644
index 486ab65f8a0..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateRequest$ClientCertificateType.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateRequest$ClientCertificateType.class
deleted file mode 100644
index 29a529cd786..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateRequest$ClientCertificateType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateRequest.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateRequest.class
deleted file mode 100644
index 9423b74f6bf..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateRequestBuilder.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateRequestBuilder.class
deleted file mode 100644
index 55e36481f6d..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateRequestBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateStatusRequest$ResponderIdIterator.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateStatusRequest$ResponderIdIterator.class
deleted file mode 100644
index a5b971d5bea..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateStatusRequest$ResponderIdIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateStatusRequest.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateStatusRequest.class
deleted file mode 100644
index 51fd52164db..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateStatusRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateStatusType.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateStatusType.class
deleted file mode 100644
index ab5d495b94d..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateStatusType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateType.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateType.class
deleted file mode 100644
index 3f39d010ab4..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL$CertChainType.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL$CertChainType.class
deleted file mode 100644
index a91b0f736d4..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL$CertChainType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL$Iterator.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL$Iterator.class
deleted file mode 100644
index 5d6bd64d77b..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL$Iterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL$URLAndOptionalHash.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL$URLAndOptionalHash.class
deleted file mode 100644
index 977b86b34ea..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL$URLAndOptionalHash.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL.class
deleted file mode 100644
index 93c03fc4d6b..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateURL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateVerify.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateVerify.class
deleted file mode 100644
index 256517cc4f6..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CertificateVerify.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherAlgorithm.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherAlgorithm.class
deleted file mode 100644
index 8d24f3a7cf8..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherAlgorithm.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherSuite.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherSuite.class
deleted file mode 100644
index 4f6e02f755f..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherSuite.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherSuiteList$Iterator.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherSuiteList$Iterator.class
deleted file mode 100644
index 860010af4e9..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherSuiteList$Iterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherSuiteList.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherSuiteList.class
deleted file mode 100644
index d3e12e18dd7..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CipherSuiteList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientCertificateTypeList$Iterator.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientCertificateTypeList$Iterator.class
deleted file mode 100644
index 5aa251ed7f3..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientCertificateTypeList$Iterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientCertificateTypeList.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientCertificateTypeList.class
deleted file mode 100644
index 5c4c4e4cfba..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientCertificateTypeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.class
deleted file mode 100644
index 5279e3b19b1..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.class
deleted file mode 100644
index eb619058318..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$CertLoader.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$CertLoader.class
deleted file mode 100644
index 615693f3a14..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$CertLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$ClientDHGen.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$ClientDHGen.class
deleted file mode 100644
index 1e1a5c222b7..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$ClientDHGen.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$GenCertVerify.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$GenCertVerify.class
deleted file mode 100644
index 51a1a2b9508..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$GenCertVerify.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$ParamsVerifier.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$ParamsVerifier.class
deleted file mode 100644
index ae8f45ed816..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$ParamsVerifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$RSAGen.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$RSAGen.class
deleted file mode 100644
index c7a8f8760db..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$RSAGen.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$State.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$State.class
deleted file mode 100644
index abdc3cc54d3..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake$State.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake.class
deleted file mode 100644
index a8a202eb6d7..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHandshake.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHello.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHello.class
deleted file mode 100644
index 7e903493d27..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHello.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHelloBuilder.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHelloBuilder.class
deleted file mode 100644
index 63b37365316..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHelloBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHelloV2.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHelloV2.class
deleted file mode 100644
index 82fb99371c5..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientHelloV2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientKeyExchange.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientKeyExchange.class
deleted file mode 100644
index 13b5f4fbf91..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientKeyExchange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.class
deleted file mode 100644
index a18851baca4..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientPSKParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientPSKParameters.class
deleted file mode 100644
index 43c99e03767..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientPSKParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.class
deleted file mode 100644
index 776eb4a1898..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CompressionMethod.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CompressionMethod.class
deleted file mode 100644
index 83819e2cf18..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CompressionMethod.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CompressionMethodList$Iterator.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CompressionMethodList$Iterator.class
deleted file mode 100644
index 2b144ae754e..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CompressionMethodList$Iterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CompressionMethodList.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/CompressionMethodList.class
deleted file mode 100644
index a686a9d929e..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/CompressionMethodList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Constructed.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Constructed.class
deleted file mode 100644
index ab4fbda2eac..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Constructed.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ContentType.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ContentType.class
deleted file mode 100644
index b4d148a45d5..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ContentType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Debug.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Debug.class
deleted file mode 100644
index cd47c506ed9..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Debug.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/DelegatedTask.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/DelegatedTask.class
deleted file mode 100644
index 8523bdd1065..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/DelegatedTask.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/DiffieHellman.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/DiffieHellman.class
deleted file mode 100644
index 587b65abcdd..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/DiffieHellman.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/EmptyExchangeKeys.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/EmptyExchangeKeys.class
deleted file mode 100644
index 5796f8b3ed4..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/EmptyExchangeKeys.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.class
deleted file mode 100644
index 381d8668168..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ExchangeKeys.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ExchangeKeys.class
deleted file mode 100644
index 6fe3431abe3..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ExchangeKeys.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Extension$Type.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Extension$Type.class
deleted file mode 100644
index 6bd8fd9be7b..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Extension$Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Extension$Value.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Extension$Value.class
deleted file mode 100644
index b3a089e811d..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Extension$Value.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Extension.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Extension.class
deleted file mode 100644
index aa43c5df3f9..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Extension.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ExtensionList$ExtensionsIterator.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ExtensionList$ExtensionsIterator.class
deleted file mode 100644
index 1192103f452..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ExtensionList$ExtensionsIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ExtensionList.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ExtensionList.class
deleted file mode 100644
index b63f29142c0..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ExtensionList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Finished.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Finished.class
deleted file mode 100644
index 50e67a23569..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Finished.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Handshake$Body.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Handshake$Body.class
deleted file mode 100644
index 5cbbf3d53f2..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Handshake$Body.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Handshake$Type.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Handshake$Type.class
deleted file mode 100644
index fb1af75e5a2..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Handshake$Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Handshake.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Handshake.class
deleted file mode 100644
index 85412abbdfa..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Handshake.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/HelloRequest.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/HelloRequest.class
deleted file mode 100644
index 4fd04289230..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/HelloRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/InputSecurityParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/InputSecurityParameters.class
deleted file mode 100644
index ff278f3e56f..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/InputSecurityParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Jessie$1.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Jessie$1.class
deleted file mode 100644
index fdd87231b07..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Jessie$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Jessie.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Jessie.class
deleted file mode 100644
index fb217bec666..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Jessie.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.class
deleted file mode 100644
index 2e494b6c44b..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/MacAlgorithm.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/MacAlgorithm.class
deleted file mode 100644
index 8dda1d5af3a..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/MacAlgorithm.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/MacException.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/MacException.class
deleted file mode 100644
index aa3f3e4595a..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/MacException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/MaxFragmentLength.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/MaxFragmentLength.class
deleted file mode 100644
index b9341fadb7b..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/MaxFragmentLength.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/OutputSecurityParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/OutputSecurityParameters.class
deleted file mode 100644
index c36422821d7..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/OutputSecurityParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl$Manager.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl$Manager.class
deleted file mode 100644
index 6068aed38f0..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl$Manager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.class
deleted file mode 100644
index 876fc6da638..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ProtocolVersion.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ProtocolVersion.class
deleted file mode 100644
index e1943659012..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ProtocolVersion.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Random.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Random.class
deleted file mode 100644
index dca9cec7425..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Random.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Record.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Record.class
deleted file mode 100644
index 82c3db5b089..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Record.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SRPTrustManagerFactory$Manager.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SRPTrustManagerFactory$Manager.class
deleted file mode 100644
index 94c704bde66..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SRPTrustManagerFactory$Manager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.class
deleted file mode 100644
index 5a6957bfaf1..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLContextImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLContextImpl.class
deleted file mode 100644
index 7f3a8f7d9cb..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLContextImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLEngineImpl$Mode.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLEngineImpl$Mode.class
deleted file mode 100644
index 5a21dae612b..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLEngineImpl$Mode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLEngineImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLEngineImpl.class
deleted file mode 100644
index 1080d19c129..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLEngineImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLHMac.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLHMac.class
deleted file mode 100644
index e59baf6a675..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLHMac.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.class
deleted file mode 100644
index c080983e716..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLRandom.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLRandom.class
deleted file mode 100644
index 05a9336d9e2..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLRandom.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.class
deleted file mode 100644
index b6353ffeb89..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLServerSocketImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLServerSocketImpl.class
deleted file mode 100644
index b9373981308..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLServerSocketImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class
deleted file mode 100644
index de053ac51df..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl$1.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl$1.class
deleted file mode 100644
index ffeeabd64c7..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketInputStream.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketInputStream.class
deleted file mode 100644
index 807805ca940..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketOutputStream.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketOutputStream.class
deleted file mode 100644
index 0df84a5fc22..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl$SocketOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl.class
deleted file mode 100644
index 8c53151598d..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLSocketImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.class
deleted file mode 100644
index 31c271c9dd2..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.class
deleted file mode 100644
index adbeaacb05d..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.class
deleted file mode 100644
index d8f64b27a95..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerDHParams.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerDHParams.class
deleted file mode 100644
index 4633e65b471..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerDHParams.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$CertLoader.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$CertLoader.class
deleted file mode 100644
index c1c3bd9a649..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$CertLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$GenDH.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$GenDH.class
deleted file mode 100644
index 1c50e6e1a7d..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$GenDH.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$RSAKeyExchange.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$RSAKeyExchange.class
deleted file mode 100644
index 8f3bc829b19..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$RSAKeyExchange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$RSA_PSKExchange.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$RSA_PSKExchange.class
deleted file mode 100644
index e5a8be7b4f7..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$RSA_PSKExchange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$State.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$State.class
deleted file mode 100644
index 120d8119b5a..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake$State.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake.class
deleted file mode 100644
index 092029d2bb5..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHandshake.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHello.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHello.class
deleted file mode 100644
index 5f4bafbbe2a..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHello.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHelloBuilder.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHelloBuilder.class
deleted file mode 100644
index d46e850802e..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHelloBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHelloDone.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHelloDone.class
deleted file mode 100644
index 8dfb2607528..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerHelloDone.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerKeyExchange.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerKeyExchange.class
deleted file mode 100644
index ec0a6ae4550..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerKeyExchange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.class
deleted file mode 100644
index 691f08ac949..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerKeyExchangeParams.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerKeyExchangeParams.class
deleted file mode 100644
index dfd4e75c4ae..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerKeyExchangeParams.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList$Iterator.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList$Iterator.class
deleted file mode 100644
index 67f8df47ff1..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList$Iterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList$NameType.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList$NameType.class
deleted file mode 100644
index 2fbaf341fd8..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList$NameType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList$ServerName.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList$ServerName.class
deleted file mode 100644
index 14aa39f6a51..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList$ServerName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList.class
deleted file mode 100644
index feed520b9f4..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerNameList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerPSKParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerPSKParameters.class
deleted file mode 100644
index fe9d7142e43..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerPSKParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerRSAParams.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerRSAParams.class
deleted file mode 100644
index e3e1b90569f..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerRSAParams.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.class
deleted file mode 100644
index d68e2476d21..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SessionImpl$PrivateData.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SessionImpl$PrivateData.class
deleted file mode 100644
index d938211ac99..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SessionImpl$PrivateData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SessionImpl.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SessionImpl.class
deleted file mode 100644
index 106f9ce1276..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SessionImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Signature.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Signature.class
deleted file mode 100644
index 31d3f3d650e..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Signature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SignatureAlgorithm.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SignatureAlgorithm.class
deleted file mode 100644
index 4cc244b3209..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SignatureAlgorithm.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SimpleSessionContext$1.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SimpleSessionContext$1.class
deleted file mode 100644
index 5e48767d17c..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SimpleSessionContext$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SimpleSessionContext.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/SimpleSessionContext.class
deleted file mode 100644
index 6dfd010008c..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/SimpleSessionContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TLSHMac.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/TLSHMac.class
deleted file mode 100644
index 22ce76a9f51..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TLSHMac.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TLSRandom.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/TLSRandom.class
deleted file mode 100644
index 3e14e8a55e0..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TLSRandom.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TruncatedHMAC.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/TruncatedHMAC.class
deleted file mode 100644
index c270beb33e7..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TruncatedHMAC.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities$AuthoritiesIterator.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities$AuthoritiesIterator.class
deleted file mode 100644
index aee80a9fbb5..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities$AuthoritiesIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities$IdentifierType.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities$IdentifierType.class
deleted file mode 100644
index 92955986e98..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities$IdentifierType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities$TrustedAuthority.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities$TrustedAuthority.class
deleted file mode 100644
index da386d6d1e6..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities$TrustedAuthority.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities.class
deleted file mode 100644
index 6fb51677d16..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/TrustedAuthorities.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.class
deleted file mode 100644
index e1fe208606f..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util$1.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util$1.class
deleted file mode 100644
index 7c58dce94c3..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util$2.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util$2.class
deleted file mode 100644
index e85173e938c..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util$WrappedBuffer.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util$WrappedBuffer.class
deleted file mode 100644
index 663d50bcb4d..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util$WrappedBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util.class
deleted file mode 100644
index f6142e3c45b..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/Util.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X500PrincipalList$Iterator.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/X500PrincipalList$Iterator.class
deleted file mode 100644
index e5fa0f04f5d..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X500PrincipalList$Iterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X500PrincipalList.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/X500PrincipalList.class
deleted file mode 100644
index 5e7b6e997de..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X500PrincipalList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509KeyManagerFactory$Manager.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509KeyManagerFactory$Manager.class
deleted file mode 100644
index a8676d628b6..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509KeyManagerFactory$Manager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509KeyManagerFactory.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509KeyManagerFactory.class
deleted file mode 100644
index 5a45271700a..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509KeyManagerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509TrustManagerFactory$Manager.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509TrustManagerFactory$Manager.class
deleted file mode 100644
index fcbf57006a7..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509TrustManagerFactory$Manager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509TrustManagerFactory.class b/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509TrustManagerFactory.class
deleted file mode 100644
index dda2c145703..00000000000
--- a/libjava/classpath/lib/gnu/javax/net/ssl/provider/X509TrustManagerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/CupsIppOperation.class b/libjava/classpath/lib/gnu/javax/print/CupsIppOperation.class
deleted file mode 100644
index 35b2608e33b..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/CupsIppOperation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/CupsMediaMapping.class b/libjava/classpath/lib/gnu/javax/print/CupsMediaMapping.class
deleted file mode 100644
index 27cbc7cbc00..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/CupsMediaMapping.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/CupsPrintService.class b/libjava/classpath/lib/gnu/javax/print/CupsPrintService.class
deleted file mode 100644
index 2598d34eac3..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/CupsPrintService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/CupsPrintServiceLookup.class b/libjava/classpath/lib/gnu/javax/print/CupsPrintServiceLookup.class
deleted file mode 100644
index 5d5abd5448e..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/CupsPrintServiceLookup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/CupsServer.class b/libjava/classpath/lib/gnu/javax/print/CupsServer.class
deleted file mode 100644
index 06f6c23bbc0..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/CupsServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrintAttributeException.class b/libjava/classpath/lib/gnu/javax/print/PrintAttributeException.class
deleted file mode 100644
index fb2f527a642..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrintAttributeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrintFlavorException.class b/libjava/classpath/lib/gnu/javax/print/PrintFlavorException.class
deleted file mode 100644
index ace70f38fe1..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrintFlavorException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrintUriException.class b/libjava/classpath/lib/gnu/javax/print/PrintUriException.class
deleted file mode 100644
index efc7ebebaf8..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrintUriException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$Color.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$Color.class
deleted file mode 100644
index 7c22d8e52f0..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$Color.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$JobAttributes.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$JobAttributes.class
deleted file mode 100644
index f94ab1c46aa..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$JobAttributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$Quality.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$Quality.class
deleted file mode 100644
index f1d54d08a09..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$Quality.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$SidesPanel.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$SidesPanel.class
deleted file mode 100644
index 364154fcbb8..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel$SidesPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel.class
deleted file mode 100644
index d1624662a83..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$AppearancePanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel$CopiesAndSorted.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel$CopiesAndSorted.class
deleted file mode 100644
index 6dce1bf64c8..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel$CopiesAndSorted.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel$PrintRange.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel$PrintRange.class
deleted file mode 100644
index b2bfa93a1eb..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel$PrintRange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel$PrintServices.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel$PrintServices.class
deleted file mode 100644
index c187f142352..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel$PrintServices.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel.class
deleted file mode 100644
index 6ae6977ffeb..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$GeneralPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel$Margins.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel$Margins.class
deleted file mode 100644
index e39037012ac..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel$Margins.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel$MediaTypes.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel$MediaTypes.class
deleted file mode 100644
index 8b96fcd6ecf..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel$MediaTypes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel$Orientation.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel$Orientation.class
deleted file mode 100644
index 36419521ae5..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel$Orientation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel.class
deleted file mode 100644
index 73df9933a5f..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog$PageSetupPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/PrinterDialog.class b/libjava/classpath/lib/gnu/javax/print/PrinterDialog.class
deleted file mode 100644
index 9fc4db1730d..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/PrinterDialog.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/DocPrintJobImpl.class b/libjava/classpath/lib/gnu/javax/print/ipp/DocPrintJobImpl.class
deleted file mode 100644
index 07ffdabc27d..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/DocPrintJobImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppDelimiterTag.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppDelimiterTag.class
deleted file mode 100644
index 13792445694..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppDelimiterTag.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppException.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppException.class
deleted file mode 100644
index a7f5c0345b5..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppMultiDocPrintService.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppMultiDocPrintService.class
deleted file mode 100644
index cf6f34e6bf4..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppMultiDocPrintService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class
deleted file mode 100644
index ebaf409b67d..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class
deleted file mode 100644
index ef631bbc2e2..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class
deleted file mode 100644
index aadef6cb135..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class
deleted file mode 100644
index a6d3829f4c4..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class
deleted file mode 100644
index 0653dc80c97..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppStatusCode.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppStatusCode.class
deleted file mode 100644
index 16ecc7b8b2a..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppStatusCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppUtilities.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppUtilities.class
deleted file mode 100644
index a98c3c3f2ef..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppUtilities.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppValueTag.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppValueTag.class
deleted file mode 100644
index 75b174fb8d0..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/IppValueTag.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/MultiDocPrintJobImpl.class b/libjava/classpath/lib/gnu/javax/print/ipp/MultiDocPrintJobImpl.class
deleted file mode 100644
index 4414b6260b6..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/MultiDocPrintJobImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/CharsetSyntax.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/CharsetSyntax.class
deleted file mode 100644
index bda6259ed1a..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/CharsetSyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DefaultValueAttribute.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DefaultValueAttribute.class
deleted file mode 100644
index 57279beda55..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DefaultValueAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DetailedStatusMessage.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DetailedStatusMessage.class
deleted file mode 100644
index a673700138b..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DetailedStatusMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DocumentAccessError.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DocumentAccessError.class
deleted file mode 100644
index 810d80dfde7..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/DocumentAccessError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.class
deleted file mode 100644
index 48b83e74607..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/NaturalLanguageSyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/RequestedAttributes.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/RequestedAttributes.class
deleted file mode 100644
index ce51861aabd..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/RequestedAttributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/StatusMessage.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/StatusMessage.class
deleted file mode 100644
index 529bf4eebd0..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/StatusMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/UnknownAttribute.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/UnknownAttribute.class
deleted file mode 100644
index 61158195de3..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/UnknownAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.class
deleted file mode 100644
index 70d93f6022e..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/CopiesDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.class
deleted file mode 100644
index fd452d080ea..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/DocumentFormatDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.class
deleted file mode 100644
index 31904750b1d..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/FinishingsDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.class
deleted file mode 100644
index 4c24ab0bae4..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobHoldUntilDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.class
deleted file mode 100644
index 5a5542fb612..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobPriorityDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.class
deleted file mode 100644
index 175d9df5ed9..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/JobSheetsDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MediaDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MediaDefault.class
deleted file mode 100644
index 1b569744f37..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MediaDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.class
deleted file mode 100644
index b0aaf09781a..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/MultipleDocumentHandlingDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.class
deleted file mode 100644
index 85ab6b4a025..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/NumberUpDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.class
deleted file mode 100644
index 06ea2a66c82..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/OrientationRequestedDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.class
deleted file mode 100644
index aa0d7a04528..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrintQualityDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.class
deleted file mode 100644
index 52518aae293..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/PrinterResolutionDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/SidesDefault.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/SidesDefault.class
deleted file mode 100644
index ebb5f42d30a..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/defaults/SidesDefault.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesCharset.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesCharset.class
deleted file mode 100644
index 2bb5b6f6e15..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesCharset.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.class
deleted file mode 100644
index bfe2a71b35d..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/AttributesNaturalLanguage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.class
deleted file mode 100644
index cb8fb466771..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDetailedStatusMessages.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.class
deleted file mode 100644
index 1d80bce239b..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobDocumentAccessErrors.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobId.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobId.class
deleted file mode 100644
index 66dc5e1025c..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobId.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobMoreInfo.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobMoreInfo.class
deleted file mode 100644
index dd4d0972aa3..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobMoreInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobPrinterUri.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobPrinterUri.class
deleted file mode 100644
index f05531cccb9..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobPrinterUri.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobStateMessage.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobStateMessage.class
deleted file mode 100644
index 26c28a9f320..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobStateMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobUri.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobUri.class
deleted file mode 100644
index bcb38baf778..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/job/JobUri.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.class
deleted file mode 100644
index 473e134dd01..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/CharsetConfigured.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/DocumentFormat.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/DocumentFormat.class
deleted file mode 100644
index 164c6fef2a2..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/DocumentFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.class
deleted file mode 100644
index d3fec69ffcb..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/MultipleOperationTimeOut.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.class
deleted file mode 100644
index 421196e8ce8..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/NaturalLanguageConfigured.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.class
deleted file mode 100644
index 95d28bd4603..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterCurrentTime.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.class
deleted file mode 100644
index db550ba8905..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterDriverInstaller.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.class
deleted file mode 100644
index 3c01302eaf7..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterStateMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.class
deleted file mode 100644
index 55c5a0bb008..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/printer/PrinterUpTime.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CharsetSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CharsetSupported.class
deleted file mode 100644
index 1c79ec97fe3..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CharsetSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CompressionSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CompressionSupported.class
deleted file mode 100644
index eb72871d84b..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/CompressionSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.class
deleted file mode 100644
index f61ae2a2c9b..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/DocumentFormatSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.class
deleted file mode 100644
index ae13c0ebad4..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/FinishingsSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.class
deleted file mode 100644
index e699d06b143..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/GeneratedNaturalLanguageSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.class
deleted file mode 100644
index 1d5c711ec48..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/IppVersionsSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.class
deleted file mode 100644
index beff50151c9..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobHoldUntilSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.class
deleted file mode 100644
index f3fa0734ab5..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/JobSheetsSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MediaSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MediaSupported.class
deleted file mode 100644
index 3732dcb9ee0..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MediaSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.class
deleted file mode 100644
index 583af160e22..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentHandlingSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.class
deleted file mode 100644
index 178d41ac7e7..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/MultipleDocumentJobsSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OperationsSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OperationsSupported.class
deleted file mode 100644
index 90fdd259480..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OperationsSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.class
deleted file mode 100644
index b5e02a44882..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/OrientationRequestedSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.class
deleted file mode 100644
index a29d08c318e..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PageRangesSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.class
deleted file mode 100644
index 52db096290e..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrintQualitySupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.class
deleted file mode 100644
index 93ea94f318a..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterResolutionSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.class
deleted file mode 100644
index 561eaffb240..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/PrinterUriSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/SidesSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/SidesSupported.class
deleted file mode 100644
index ac100801793..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/SidesSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.class
deleted file mode 100644
index c90e6345f5f..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriAuthenticationSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.class b/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.class
deleted file mode 100644
index fcaa2fffddd..00000000000
--- a/libjava/classpath/lib/gnu/javax/print/ipp/attribute/supported/UriSecuritySupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/CorbaInput.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/CorbaInput.class
deleted file mode 100644
index 906d9aeeec4..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/CorbaInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/CorbaOutput.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/CorbaOutput.class
deleted file mode 100644
index 9dda2f230f2..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/CorbaOutput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.class
deleted file mode 100644
index 37a9c8379ed..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/DelegateFactory.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/DelegateFactory.class
deleted file mode 100644
index 4652d0654ee..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/DelegateFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/GetDelegateInstanceException.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/GetDelegateInstanceException.class
deleted file mode 100644
index d03037c7163..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/GetDelegateInstanceException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.class
deleted file mode 100644
index 01b7bb8b867..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/RmiUtilities$1.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/RmiUtilities$1.class
deleted file mode 100644
index b4312276227..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/RmiUtilities$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/RmiUtilities$2.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/RmiUtilities$2.class
deleted file mode 100644
index dcedc9ce289..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/RmiUtilities$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/RmiUtilities.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/RmiUtilities.class
deleted file mode 100644
index 403b5e6fa52..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/RmiUtilities.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/StubDelegateImpl.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/StubDelegateImpl.class
deleted file mode 100644
index a5c64c1b866..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/StubDelegateImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/TieTargetRecord.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/TieTargetRecord.class
deleted file mode 100644
index 3869364453e..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/TieTargetRecord.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/UtilDelegateImpl.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/UtilDelegateImpl.class
deleted file mode 100644
index d2e50ba1c3c..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/UtilDelegateImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.class b/libjava/classpath/lib/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.class
deleted file mode 100644
index f4f068bd581..00000000000
--- a/libjava/classpath/lib/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/Password.class b/libjava/classpath/lib/gnu/javax/security/auth/Password.class
deleted file mode 100644
index df75b3a5470..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/Password.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/AWTCallbackHandler.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/AWTCallbackHandler.class
deleted file mode 100644
index e387600a32d..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/AWTCallbackHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/AbstractCallbackHandler.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/AbstractCallbackHandler.class
deleted file mode 100644
index 806be85bb3c..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/AbstractCallbackHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/CertificateCallback.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/CertificateCallback.class
deleted file mode 100644
index c67139d1f27..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/CertificateCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/ConsoleCallbackHandler.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/ConsoleCallbackHandler.class
deleted file mode 100644
index ffaa77f35ed..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/ConsoleCallbackHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/DefaultCallbackHandler.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/DefaultCallbackHandler.class
deleted file mode 100644
index 6626fed6adb..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/DefaultCallbackHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/GnuCallbacks$1.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/GnuCallbacks$1.class
deleted file mode 100644
index 82895346434..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/GnuCallbacks$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/GnuCallbacks.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/GnuCallbacks.class
deleted file mode 100644
index 3485c08d2ea..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/GnuCallbacks.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$1.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$1.class
deleted file mode 100644
index 54f86511b9d..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$2.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$2.class
deleted file mode 100644
index 764f6246b9c..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$3.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$3.class
deleted file mode 100644
index 039dc83b575..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$4.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$4.class
deleted file mode 100644
index 48b477334b5..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$5.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$5.class
deleted file mode 100644
index 9c232e86c65..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$6.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$6.class
deleted file mode 100644
index 95590fe47a5..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$7.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$7.class
deleted file mode 100644
index 59ea0f712c9..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler$7.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler.class b/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler.class
deleted file mode 100644
index a8781c2c65b..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/callback/SwingCallbackHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/login/ConfigFileParser.class b/libjava/classpath/lib/gnu/javax/security/auth/login/ConfigFileParser.class
deleted file mode 100644
index a6318907f3d..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/login/ConfigFileParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/login/ConfigFileTokenizer.class b/libjava/classpath/lib/gnu/javax/security/auth/login/ConfigFileTokenizer.class
deleted file mode 100644
index 751608e5faf..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/login/ConfigFileTokenizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/security/auth/login/GnuConfiguration.class b/libjava/classpath/lib/gnu/javax/security/auth/login/GnuConfiguration.class
deleted file mode 100644
index ca593c31c38..00000000000
--- a/libjava/classpath/lib/gnu/javax/security/auth/login/GnuConfiguration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.class
deleted file mode 100644
index b6849564508..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInfo.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInfo.class
deleted file mode 100644
index 1aca771aac3..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInputPortInfo.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInputPortInfo.class
deleted file mode 100644
index f618affed49..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaInputPortInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaOutputPortInfo.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaOutputPortInfo.class
deleted file mode 100644
index 967fbbdfca2..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaOutputPortInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaPortInfo.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaPortInfo.class
deleted file mode 100644
index f84357fb8fd..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaPortInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaSequencerInfo.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaSequencerInfo.class
deleted file mode 100644
index 021a78358ba..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider$AlsaSequencerInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.class
deleted file mode 100644
index e73ad93dae9..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.class
deleted file mode 100644
index e321d8daeb0..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.class
deleted file mode 100644
index 09552ad627b..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaReceiver.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaReceiver.class
deleted file mode 100644
index df52c733f8f..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaReceiver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaTransmitter.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaTransmitter.class
deleted file mode 100644
index 1759a93f3f5..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaPortDevice$AlsaTransmitter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaPortDevice.class b/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaPortDevice.class
deleted file mode 100644
index 895d98f4577..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/alsa/AlsaPortDevice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$1.class b/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$1.class
deleted file mode 100644
index c928dad5665..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$DSSIInfo.class b/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$DSSIInfo.class
deleted file mode 100644
index 94e1a759910..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$DSSIInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.class b/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.class
deleted file mode 100644
index 5c21bd45677..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIInstrument.class b/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIInstrument.class
deleted file mode 100644
index fba99b598bb..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIInstrument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIMidiChannel.class b/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIMidiChannel.class
deleted file mode 100644
index 6eafee5759e..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIMidiChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIReceiver.class b/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIReceiver.class
deleted file mode 100644
index 89d7fd6c4e1..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSIReceiver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSISoundbank.class b/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSISoundbank.class
deleted file mode 100644
index 2669da8e3e4..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer$DSSISoundbank.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer.class b/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer.class
deleted file mode 100644
index fc8191c97d0..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/dssi/DSSISynthesizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.class b/libjava/classpath/lib/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.class
deleted file mode 100644
index 0efae67cfe5..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiDataInputStream.class b/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiDataInputStream.class
deleted file mode 100644
index 1dce70845d8..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiDataInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiDataOutputStream.class b/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiDataOutputStream.class
deleted file mode 100644
index 5de7c501b06..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiDataOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiFileReader.class b/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiFileReader.class
deleted file mode 100644
index 00b1da899c5..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiFileReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiFileWriter.class b/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiFileWriter.class
deleted file mode 100644
index 1982f16ae34..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/midi/file/MidiFileWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/sampled/AU/AUReader$AUFormatType.class b/libjava/classpath/lib/gnu/javax/sound/sampled/AU/AUReader$AUFormatType.class
deleted file mode 100644
index 5191a9dc7f5..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/sampled/AU/AUReader$AUFormatType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/sampled/AU/AUReader$AUHeader.class b/libjava/classpath/lib/gnu/javax/sound/sampled/AU/AUReader$AUHeader.class
deleted file mode 100644
index cc0736d8716..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/sampled/AU/AUReader$AUHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/sampled/AU/AUReader.class b/libjava/classpath/lib/gnu/javax/sound/sampled/AU/AUReader.class
deleted file mode 100644
index b47ae8aa608..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/sampled/AU/AUReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/sound/sampled/WAV/WAVReader.class b/libjava/classpath/lib/gnu/javax/sound/sampled/WAV/WAVReader.class
deleted file mode 100644
index 9bf00f74361..00000000000
--- a/libjava/classpath/lib/gnu/javax/sound/sampled/WAV/WAVReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/plaf/gnu/GNULookAndFeel$CheckBoxIcon.class b/libjava/classpath/lib/gnu/javax/swing/plaf/gnu/GNULookAndFeel$CheckBoxIcon.class
deleted file mode 100644
index 1f1dc137d06..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/plaf/gnu/GNULookAndFeel$CheckBoxIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/plaf/gnu/GNULookAndFeel$RadioButtonIcon.class b/libjava/classpath/lib/gnu/javax/swing/plaf/gnu/GNULookAndFeel$RadioButtonIcon.class
deleted file mode 100644
index 4b660932429..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/plaf/gnu/GNULookAndFeel$RadioButtonIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/plaf/gnu/GNULookAndFeel.class b/libjava/classpath/lib/gnu/javax/swing/plaf/gnu/GNULookAndFeel.class
deleted file mode 100644
index 53b330b32ea..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/plaf/gnu/GNULookAndFeel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/plaf/metal/CustomizableTheme.class b/libjava/classpath/lib/gnu/javax/swing/plaf/metal/CustomizableTheme.class
deleted file mode 100644
index c27ff08925e..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/plaf/metal/CustomizableTheme.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/CharacterAttributeTranslator.class b/libjava/classpath/lib/gnu/javax/swing/text/html/CharacterAttributeTranslator.class
deleted file mode 100644
index 88aaece43ac..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/CharacterAttributeTranslator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/CombinedAttributes$CombinedEnumeration.class b/libjava/classpath/lib/gnu/javax/swing/text/html/CombinedAttributes$CombinedEnumeration.class
deleted file mode 100644
index 94bf071d5bb..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/CombinedAttributes$CombinedEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/CombinedAttributes.class b/libjava/classpath/lib/gnu/javax/swing/text/html/CombinedAttributes.class
deleted file mode 100644
index 34d9de70e97..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/CombinedAttributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/ImageViewIconFactory$LoadingImageIcon.class b/libjava/classpath/lib/gnu/javax/swing/text/html/ImageViewIconFactory$LoadingImageIcon.class
deleted file mode 100644
index bf5601cfea6..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/ImageViewIconFactory$LoadingImageIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/ImageViewIconFactory$NoImageIcon.class b/libjava/classpath/lib/gnu/javax/swing/text/html/ImageViewIconFactory$NoImageIcon.class
deleted file mode 100644
index b6a75d7c384..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/ImageViewIconFactory$NoImageIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/ImageViewIconFactory.class b/libjava/classpath/lib/gnu/javax/swing/text/html/ImageViewIconFactory.class
deleted file mode 100644
index f97df57e087..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/ImageViewIconFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/BorderStyle.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/BorderStyle.class
deleted file mode 100644
index f51a09709d3..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/BorderStyle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/BorderWidth.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/BorderWidth.class
deleted file mode 100644
index caea7dec0d2..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/BorderWidth.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSColor.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSColor.class
deleted file mode 100644
index 07ac9f9bbed..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSColor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSLexicalException.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSLexicalException.class
deleted file mode 100644
index e17935fe345..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSLexicalException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParser$1.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParser$1.class
deleted file mode 100644
index 40025b684dd..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParser$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParser.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParser.class
deleted file mode 100644
index fb05d08a33e..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParserCallback.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParserCallback.class
deleted file mode 100644
index abfda1483cf..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParserCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParserException.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParserException.class
deleted file mode 100644
index 860cf3cdd9c..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSParserException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSScanner.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSScanner.class
deleted file mode 100644
index 044cc5edf49..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/CSSScanner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/FontSize.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/FontSize.class
deleted file mode 100644
index a847e5c8f31..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/FontSize.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/FontStyle.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/FontStyle.class
deleted file mode 100644
index e66ae34b122..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/FontStyle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/FontWeight.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/FontWeight.class
deleted file mode 100644
index a0c7f447c4e..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/FontWeight.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/Length.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/Length.class
deleted file mode 100644
index b5b30964397..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/Length.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/css/Selector.class b/libjava/classpath/lib/gnu/javax/swing/text/html/css/Selector.class
deleted file mode 100644
index fb5de5c5040..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/css/Selector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/GnuParserDelegator$gnuParser.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/GnuParserDelegator$gnuParser.class
deleted file mode 100644
index 96638d692c3..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/GnuParserDelegator$gnuParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/GnuParserDelegator.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/GnuParserDelegator.class
deleted file mode 100644
index fa8aa3b6146..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/GnuParserDelegator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/HTML_401F.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/HTML_401F.class
deleted file mode 100644
index 5d9889c62e0..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/HTML_401F.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet$1.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet$1.class
deleted file mode 100644
index 95b5278b73c..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.class
deleted file mode 100644
index d2342a5d5df..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/gnuDTD.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/gnuDTD.class
deleted file mode 100644
index e0c19152da6..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/gnuDTD.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlAttributeSet$1.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlAttributeSet$1.class
deleted file mode 100644
index 8517b19d479..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlAttributeSet$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlAttributeSet.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlAttributeSet.class
deleted file mode 100644
index d4f6a65ff6f..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlValidator$hTag.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlValidator$hTag.class
deleted file mode 100644
index 2ed578a3f5f..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlValidator$hTag.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlValidator.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlValidator.class
deleted file mode 100644
index 32a21a5a288..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/htmlValidator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/PCDATAonly_model.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/PCDATAonly_model.class
deleted file mode 100644
index 192b3ad9e5a..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/PCDATAonly_model.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/TableRowContentModel.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/TableRowContentModel.class
deleted file mode 100644
index 8599669972a..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/TableRowContentModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/list.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/list.class
deleted file mode 100644
index d90cc458729..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/list.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/noTagModel.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/noTagModel.class
deleted file mode 100644
index d95f8c6f7ce..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/noTagModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/node.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/node.class
deleted file mode 100644
index f551dbf5977..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/transformer.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/transformer.class
deleted file mode 100644
index 9b5e29a9466..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/models/transformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/Parser$1.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/Parser$1.class
deleted file mode 100644
index 0db9a27ba30..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/Parser$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/Parser$2.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/Parser$2.class
deleted file mode 100644
index 546fddc6b50..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/Parser$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/Parser.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/Parser.class
deleted file mode 100644
index 6c330e24eae..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/Parser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.class
deleted file mode 100644
index c6ee266838a..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Buffer.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Buffer.class
deleted file mode 100644
index 12e6aa89966..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Buffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Constants.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Constants.class
deleted file mode 100644
index c4ffa342648..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Constants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Location.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Location.class
deleted file mode 100644
index c43fb01a38e..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Location.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/ParseException.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/ParseException.class
deleted file mode 100644
index dfa6e9b56de..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/ParseException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Queue.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Queue.class
deleted file mode 100644
index dfe3cb347eb..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Queue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.class
deleted file mode 100644
index d7f253263a2..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Token.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Token.class
deleted file mode 100644
index e5b7a939742..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/Token.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/node.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/node.class
deleted file mode 100644
index 9a3b6dcbee7..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/pattern.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/pattern.class
deleted file mode 100644
index cea9d459946..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/low/pattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/parameterDefaulter.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/parameterDefaulter.class
deleted file mode 100644
index 084edd742a9..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/parameterDefaulter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/textPreProcessor.class b/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/textPreProcessor.class
deleted file mode 100644
index d9daa90ed49..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/text/html/parser/support/textPreProcessor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/javax/swing/tree/GnuPath.class b/libjava/classpath/lib/gnu/javax/swing/tree/GnuPath.class
deleted file mode 100644
index 841cc89adef..00000000000
--- a/libjava/classpath/lib/gnu/javax/swing/tree/GnuPath.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/JAXPFactory$JaxpParser.class b/libjava/classpath/lib/gnu/xml/aelfred2/JAXPFactory$JaxpParser.class
deleted file mode 100644
index 904351c6b5c..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/JAXPFactory$JaxpParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/JAXPFactory.class b/libjava/classpath/lib/gnu/xml/aelfred2/JAXPFactory.class
deleted file mode 100644
index 49fa7f3e702..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/JAXPFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/SAXDriver$Adapter.class b/libjava/classpath/lib/gnu/xml/aelfred2/SAXDriver$Adapter.class
deleted file mode 100644
index d34cb43c537..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/SAXDriver$Adapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/SAXDriver$Attribute.class b/libjava/classpath/lib/gnu/xml/aelfred2/SAXDriver$Attribute.class
deleted file mode 100644
index 68cfbc16965..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/SAXDriver$Attribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/SAXDriver.class b/libjava/classpath/lib/gnu/xml/aelfred2/SAXDriver.class
deleted file mode 100644
index d690c175254..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/SAXDriver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$AttributeDecl.class b/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$AttributeDecl.class
deleted file mode 100644
index 8bb85a3f0ec..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$AttributeDecl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$ElementDecl.class b/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$ElementDecl.class
deleted file mode 100644
index 9fbede093bb..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$ElementDecl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$EntityInfo.class b/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$EntityInfo.class
deleted file mode 100644
index 2a0779ea5dc..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$EntityInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$ExternalIdentifiers.class b/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$ExternalIdentifiers.class
deleted file mode 100644
index 65a9cb98b3f..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$ExternalIdentifiers.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$Input.class b/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$Input.class
deleted file mode 100644
index 7347af6010d..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser$Input.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser.class b/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser.class
deleted file mode 100644
index fddb3e796b3..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/XmlParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/XmlReader$FatalErrorHandler.class b/libjava/classpath/lib/gnu/xml/aelfred2/XmlReader$FatalErrorHandler.class
deleted file mode 100644
index 5aadec5355b..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/XmlReader$FatalErrorHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/aelfred2/XmlReader.class b/libjava/classpath/lib/gnu/xml/aelfred2/XmlReader.class
deleted file mode 100644
index 6330918d62c..00000000000
--- a/libjava/classpath/lib/gnu/xml/aelfred2/XmlReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/Consumer$Backdoor.class b/libjava/classpath/lib/gnu/xml/dom/Consumer$Backdoor.class
deleted file mode 100644
index 6b3c5ce78be..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/Consumer$Backdoor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/Consumer.class b/libjava/classpath/lib/gnu/xml/dom/Consumer.class
deleted file mode 100644
index b7dae3f68bc..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/Consumer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DTDAttributeTypeInfo.class b/libjava/classpath/lib/gnu/xml/dom/DTDAttributeTypeInfo.class
deleted file mode 100644
index d7438845b4c..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DTDAttributeTypeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DTDElementTypeInfo.class b/libjava/classpath/lib/gnu/xml/dom/DTDElementTypeInfo.class
deleted file mode 100644
index cd47fc332f6..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DTDElementTypeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomAttr.class b/libjava/classpath/lib/gnu/xml/dom/DomAttr.class
deleted file mode 100644
index 034639a9ea1..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomAttr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomCDATASection.class b/libjava/classpath/lib/gnu/xml/dom/DomCDATASection.class
deleted file mode 100644
index c7b346bb93c..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomCDATASection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomCharacterData$EmptyNodeList.class b/libjava/classpath/lib/gnu/xml/dom/DomCharacterData$EmptyNodeList.class
deleted file mode 100644
index b3bdeb5e5e5..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomCharacterData$EmptyNodeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomCharacterData.class b/libjava/classpath/lib/gnu/xml/dom/DomCharacterData.class
deleted file mode 100644
index 47cd710c753..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomCharacterData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomComment.class b/libjava/classpath/lib/gnu/xml/dom/DomComment.class
deleted file mode 100644
index deb808dd57f..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomComment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomDOMException.class b/libjava/classpath/lib/gnu/xml/dom/DomDOMException.class
deleted file mode 100644
index 729a9446d60..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomDOMException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomDoctype.class b/libjava/classpath/lib/gnu/xml/dom/DomDoctype.class
deleted file mode 100644
index 7698d8f797a..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomDoctype.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomDocument.class b/libjava/classpath/lib/gnu/xml/dom/DomDocument.class
deleted file mode 100644
index 9ff8f0d1ff9..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomDocumentBuilder.class b/libjava/classpath/lib/gnu/xml/dom/DomDocumentBuilder.class
deleted file mode 100644
index 41f2981c4b9..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomDocumentBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomDocumentBuilderFactory.class b/libjava/classpath/lib/gnu/xml/dom/DomDocumentBuilderFactory.class
deleted file mode 100644
index 4e082d19a9d..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomDocumentBuilderFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomDocumentConfiguration.class b/libjava/classpath/lib/gnu/xml/dom/DomDocumentConfiguration.class
deleted file mode 100644
index 1d0038f9d0a..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomDocumentConfiguration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomDocumentFragment.class b/libjava/classpath/lib/gnu/xml/dom/DomDocumentFragment.class
deleted file mode 100644
index 9bdd263ea24..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomDocumentFragment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomElement.class b/libjava/classpath/lib/gnu/xml/dom/DomElement.class
deleted file mode 100644
index 0800405b631..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomEntity.class b/libjava/classpath/lib/gnu/xml/dom/DomEntity.class
deleted file mode 100644
index 554b701c682..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomEntity.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomEntityReference.class b/libjava/classpath/lib/gnu/xml/dom/DomEntityReference.class
deleted file mode 100644
index ebeb3f8a231..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomEntityReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomEvent$DomMutationEvent.class b/libjava/classpath/lib/gnu/xml/dom/DomEvent$DomMutationEvent.class
deleted file mode 100644
index d8932f652b7..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomEvent$DomMutationEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomEvent$DomUIEvent.class b/libjava/classpath/lib/gnu/xml/dom/DomEvent$DomUIEvent.class
deleted file mode 100644
index 860ab7772a7..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomEvent$DomUIEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomEvent.class b/libjava/classpath/lib/gnu/xml/dom/DomEvent.class
deleted file mode 100644
index a2f853f54ac..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomExtern.class b/libjava/classpath/lib/gnu/xml/dom/DomExtern.class
deleted file mode 100644
index 11ed4294340..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomExtern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomImpl.class b/libjava/classpath/lib/gnu/xml/dom/DomImpl.class
deleted file mode 100644
index 62eabbb4f71..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomIterator.class b/libjava/classpath/lib/gnu/xml/dom/DomIterator.class
deleted file mode 100644
index 1ca7fa2a979..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomNSResolverContext.class b/libjava/classpath/lib/gnu/xml/dom/DomNSResolverContext.class
deleted file mode 100644
index 3f76bc655d4..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomNSResolverContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomNamedNodeMap.class b/libjava/classpath/lib/gnu/xml/dom/DomNamedNodeMap.class
deleted file mode 100644
index 5ff3c7a8dbe..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomNamedNodeMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomNode$DomEventException.class b/libjava/classpath/lib/gnu/xml/dom/DomNode$DomEventException.class
deleted file mode 100644
index e2c1a29b51f..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomNode$DomEventException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomNode$ListenerRecord.class b/libjava/classpath/lib/gnu/xml/dom/DomNode$ListenerRecord.class
deleted file mode 100644
index 71bf96f4167..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomNode$ListenerRecord.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomNode$LiveNodeList.class b/libjava/classpath/lib/gnu/xml/dom/DomNode$LiveNodeList.class
deleted file mode 100644
index 6be5e27c404..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomNode$LiveNodeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomNode$ShadowList.class b/libjava/classpath/lib/gnu/xml/dom/DomNode$ShadowList.class
deleted file mode 100644
index b1006cefff4..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomNode$ShadowList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomNode.class b/libjava/classpath/lib/gnu/xml/dom/DomNode.class
deleted file mode 100644
index 61378095b2b..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomNodeIterator.class b/libjava/classpath/lib/gnu/xml/dom/DomNodeIterator.class
deleted file mode 100644
index 3875450ae4b..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomNodeIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomNotation.class b/libjava/classpath/lib/gnu/xml/dom/DomNotation.class
deleted file mode 100644
index 0eebc788ca5..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomNotation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomNsNode.class b/libjava/classpath/lib/gnu/xml/dom/DomNsNode.class
deleted file mode 100644
index 63a6addf9d2..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomNsNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomProcessingInstruction.class b/libjava/classpath/lib/gnu/xml/dom/DomProcessingInstruction.class
deleted file mode 100644
index 1ae20a37502..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomProcessingInstruction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomText.class b/libjava/classpath/lib/gnu/xml/dom/DomText.class
deleted file mode 100644
index fd371db59cb..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomText.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomXPathExpression.class b/libjava/classpath/lib/gnu/xml/dom/DomXPathExpression.class
deleted file mode 100644
index 0dc76e0e39a..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomXPathExpression.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomXPathNSResolver.class b/libjava/classpath/lib/gnu/xml/dom/DomXPathNSResolver.class
deleted file mode 100644
index 5f9db6e3fa3..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomXPathNSResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/DomXPathResult.class b/libjava/classpath/lib/gnu/xml/dom/DomXPathResult.class
deleted file mode 100644
index 09ab411c5f0..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/DomXPathResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ImplementationList.class b/libjava/classpath/lib/gnu/xml/dom/ImplementationList.class
deleted file mode 100644
index 256e59d7959..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ImplementationList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ImplementationSource.class b/libjava/classpath/lib/gnu/xml/dom/ImplementationSource.class
deleted file mode 100644
index 6ba53300369..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ImplementationSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/JAXPFactory$JAXPBuilder.class b/libjava/classpath/lib/gnu/xml/dom/JAXPFactory$JAXPBuilder.class
deleted file mode 100644
index 5252a06311f..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/JAXPFactory$JAXPBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/JAXPFactory.class b/libjava/classpath/lib/gnu/xml/dom/JAXPFactory.class
deleted file mode 100644
index aff36d2a486..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/JAXPFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLAnchorElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLAnchorElement.class
deleted file mode 100644
index 5fd7d7de21b..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLAnchorElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLAppletElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLAppletElement.class
deleted file mode 100644
index 7744e7c15f7..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLAppletElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLAreaElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLAreaElement.class
deleted file mode 100644
index 674f85bbe7b..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLAreaElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBRElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBRElement.class
deleted file mode 100644
index f7db7e404db..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBRElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBaseElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBaseElement.class
deleted file mode 100644
index 4e58d2f09e5..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBaseElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBaseFontElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBaseFontElement.class
deleted file mode 100644
index ac899f1feb4..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBaseFontElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBodyElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBodyElement.class
deleted file mode 100644
index ef2f3d1965d..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLBodyElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLButtonElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLButtonElement.class
deleted file mode 100644
index 93e0e4c798a..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLButtonElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLCollection.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLCollection.class
deleted file mode 100644
index c1438b30b60..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDListElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDListElement.class
deleted file mode 100644
index ee60476f0df..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDListElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDirectoryElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDirectoryElement.class
deleted file mode 100644
index b80e6231623..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDirectoryElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDivElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDivElement.class
deleted file mode 100644
index 6433f235d66..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDivElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDocument.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDocument.class
deleted file mode 100644
index 528c28d4a34..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLElement.class
deleted file mode 100644
index d47e495ec21..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLEmbedElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLEmbedElement.class
deleted file mode 100644
index abbe2879731..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLEmbedElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFieldSetElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFieldSetElement.class
deleted file mode 100644
index 3a26b4d036a..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFieldSetElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFontElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFontElement.class
deleted file mode 100644
index a8b89f0ae13..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFontElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFormElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFormElement.class
deleted file mode 100644
index 57e56179ea4..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFormElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFrameElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFrameElement.class
deleted file mode 100644
index 396a7ce3e21..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFrameElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFrameSetElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFrameSetElement.class
deleted file mode 100644
index 291b20f97b1..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLFrameSetElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHRElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHRElement.class
deleted file mode 100644
index de198963440..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHRElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHeadElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHeadElement.class
deleted file mode 100644
index 9b0e5c2fce7..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHeadElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHeadingElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHeadingElement.class
deleted file mode 100644
index 851145ef67a..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHeadingElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHtmlElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHtmlElement.class
deleted file mode 100644
index 0ce08630506..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLHtmlElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLIFrameElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLIFrameElement.class
deleted file mode 100644
index 2cdbaa635fc..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLIFrameElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLImageElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLImageElement.class
deleted file mode 100644
index 2ee11c579e4..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLImageElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLImpl.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLImpl.class
deleted file mode 100644
index 51b462af2ba..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLInputElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLInputElement.class
deleted file mode 100644
index 22c5cb07f53..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLInputElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLIsIndexElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLIsIndexElement.class
deleted file mode 100644
index b8281f93a2c..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLIsIndexElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLIElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLIElement.class
deleted file mode 100644
index b16aac2a3e9..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLIElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLabelElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLabelElement.class
deleted file mode 100644
index 9cd0807d956..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLabelElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLegendElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLegendElement.class
deleted file mode 100644
index 763de42e4c9..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLegendElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLinkElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLinkElement.class
deleted file mode 100644
index bd92dc1c093..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLLinkElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLMapElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLMapElement.class
deleted file mode 100644
index 6f3a25d011f..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLMapElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLMenuElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLMenuElement.class
deleted file mode 100644
index 275ef2ccf2f..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLMenuElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLMetaElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLMetaElement.class
deleted file mode 100644
index d1202761511..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLMetaElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLModElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLModElement.class
deleted file mode 100644
index b9d1bbaae47..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLModElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLOListElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLOListElement.class
deleted file mode 100644
index b198cba8f45..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLOListElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLObjectElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLObjectElement.class
deleted file mode 100644
index 25f196249b4..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLObjectElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLOptGroupElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLOptGroupElement.class
deleted file mode 100644
index f34bf4d1059..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLOptGroupElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLOptionElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLOptionElement.class
deleted file mode 100644
index fa059bbb702..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLOptionElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLParagraphElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLParagraphElement.class
deleted file mode 100644
index 389ecd8e9e2..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLParagraphElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLParamElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLParamElement.class
deleted file mode 100644
index 8477d00e02f..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLParamElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLParser.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLParser.class
deleted file mode 100644
index 5a8f379c5df..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLPreElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLPreElement.class
deleted file mode 100644
index 9164532e88f..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLPreElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLQuoteElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLQuoteElement.class
deleted file mode 100644
index 6d5b2408a62..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLQuoteElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLScriptElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLScriptElement.class
deleted file mode 100644
index 918b4e12ac3..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLScriptElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLSelectElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLSelectElement.class
deleted file mode 100644
index 64b41b728a6..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLSelectElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLStyleElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLStyleElement.class
deleted file mode 100644
index 4d7b9efe5c7..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLStyleElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableCaptionElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableCaptionElement.class
deleted file mode 100644
index e1a373ebc4c..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableCaptionElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableCellElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableCellElement.class
deleted file mode 100644
index f145daebe73..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableCellElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableColElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableColElement.class
deleted file mode 100644
index 00405fee201..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableColElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableElement.class
deleted file mode 100644
index 2e32ae9fda8..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableRowElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableRowElement.class
deleted file mode 100644
index 1962a990f03..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableRowElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableSectionElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableSectionElement.class
deleted file mode 100644
index 518fda89102..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTableSectionElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTextAreaElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTextAreaElement.class
deleted file mode 100644
index 9ac42790fa6..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTextAreaElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTitleElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTitleElement.class
deleted file mode 100644
index a6eb748069c..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLTitleElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLUListElement.class b/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLUListElement.class
deleted file mode 100644
index 3f4840a3123..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/html2/DomHTMLUListElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSException.class b/libjava/classpath/lib/gnu/xml/dom/ls/DomLSException.class
deleted file mode 100644
index 1e5aadd0958..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSInput.class b/libjava/classpath/lib/gnu/xml/dom/ls/DomLSInput.class
deleted file mode 100644
index ebff3b21f07..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSOutput.class b/libjava/classpath/lib/gnu/xml/dom/ls/DomLSOutput.class
deleted file mode 100644
index ef0f74d865c..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSOutput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class b/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class
deleted file mode 100644
index 616257deb34..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSSerializer.class b/libjava/classpath/lib/gnu/xml/dom/ls/DomLSSerializer.class
deleted file mode 100644
index d8b4b59043f..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSSerializer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/FilteredSAXEventSink.class b/libjava/classpath/lib/gnu/xml/dom/ls/FilteredSAXEventSink.class
deleted file mode 100644
index dee62bfc95f..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ls/FilteredSAXEventSink.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/ReaderInputStream.class b/libjava/classpath/lib/gnu/xml/dom/ls/ReaderInputStream.class
deleted file mode 100644
index 2be7972948f..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ls/ReaderInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/SAXEventSink.class b/libjava/classpath/lib/gnu/xml/dom/ls/SAXEventSink.class
deleted file mode 100644
index f5f281ea196..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ls/SAXEventSink.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/WriterOutputStream.class b/libjava/classpath/lib/gnu/xml/dom/ls/WriterOutputStream.class
deleted file mode 100644
index 946908441d3..00000000000
--- a/libjava/classpath/lib/gnu/xml/dom/ls/WriterOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeAttr.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeAttr.class
deleted file mode 100644
index b9bde45fbdc..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeAttr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeCDATASection.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeCDATASection.class
deleted file mode 100644
index 7944d0309cc..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeCDATASection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeCharacterData.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeCharacterData.class
deleted file mode 100644
index 1c746262886..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeCharacterData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeComment.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeComment.class
deleted file mode 100644
index 11801ef1a23..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeComment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDOMException.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDOMException.class
deleted file mode 100644
index 63644b4110b..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDOMException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDOMStringList.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDOMStringList.class
deleted file mode 100644
index 489ddafc656..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDOMStringList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocument.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocument.class
deleted file mode 100644
index fec965957a8..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.class
deleted file mode 100644
index f34c5fa075d..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.class
deleted file mode 100644
index a6b1bb27854..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentFragment.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentFragment.class
deleted file mode 100644
index bacf0e76eff..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentFragment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentType.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentType.class
deleted file mode 100644
index 0ca7bd4c5ef..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeDocumentType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeElement.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeElement.class
deleted file mode 100644
index 8e398a215d8..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeEntity.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeEntity.class
deleted file mode 100644
index 24197b0b881..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeEntity.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeEntityReference.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeEntityReference.class
deleted file mode 100644
index 4a8f196072b..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeEntityReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.class
deleted file mode 100644
index 0ca72878a5a..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNode.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNode.class
deleted file mode 100644
index 9a6a5c69e97..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNodeList.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNodeList.class
deleted file mode 100644
index 552641a98df..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNodeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNotation.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNotation.class
deleted file mode 100644
index f6b5d11d411..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeNotation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.class
deleted file mode 100644
index 7e0c32059f4..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeText.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeText.class
deleted file mode 100644
index 79299bd1dc4..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeText.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeTypeInfo.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeTypeInfo.class
deleted file mode 100644
index 91918d9c64e..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeTypeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathExpression.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathExpression.class
deleted file mode 100644
index 6a9eeacbdb8..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathExpression.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.class
deleted file mode 100644
index 1ac3fe11903..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathNodeList.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathNodeList.class
deleted file mode 100644
index a8568c73105..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathNodeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathResult.class b/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathResult.class
deleted file mode 100644
index d8006e3e3f8..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/dom/GnomeXPathResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeLocator.class b/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeLocator.class
deleted file mode 100644
index 3cd1ee602c6..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeSAXParser.class b/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeSAXParser.class
deleted file mode 100644
index 458c7f04f9f..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeSAXParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.class b/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.class
deleted file mode 100644
index 0b2f698567c..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeXMLReader.class b/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeXMLReader.class
deleted file mode 100644
index a12f58e3098..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/sax/GnomeXMLReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/sax/Namespaces.class b/libjava/classpath/lib/gnu/xml/libxmlj/sax/Namespaces.class
deleted file mode 100644
index 9cdd479f9b0..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/sax/Namespaces.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/sax/StringArrayAttributes.class b/libjava/classpath/lib/gnu/xml/libxmlj/sax/StringArrayAttributes.class
deleted file mode 100644
index f3d4fba1ef8..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/sax/StringArrayAttributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/sax/XMLName.class b/libjava/classpath/lib/gnu/xml/libxmlj/sax/XMLName.class
deleted file mode 100644
index d66655ed28a..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/sax/XMLName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.class b/libjava/classpath/lib/gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.class
deleted file mode 100644
index 9c377bb5df3..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/transform/GnomeTransformer.class b/libjava/classpath/lib/gnu/xml/libxmlj/transform/GnomeTransformer.class
deleted file mode 100644
index 5595c3c834d..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/transform/GnomeTransformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/transform/GnomeTransformerFactory$AssociatedStylesheetHandler.class b/libjava/classpath/lib/gnu/xml/libxmlj/transform/GnomeTransformerFactory$AssociatedStylesheetHandler.class
deleted file mode 100644
index f64bb975b9c..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/transform/GnomeTransformerFactory$AssociatedStylesheetHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.class b/libjava/classpath/lib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.class
deleted file mode 100644
index 33872e17d2a..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/transform/GnomeTransformerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/transform/URIResolverEntityResolver.class b/libjava/classpath/lib/gnu/xml/libxmlj/transform/URIResolverEntityResolver.class
deleted file mode 100644
index 799f455143a..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/transform/URIResolverEntityResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/util/EmptyNodeList.class b/libjava/classpath/lib/gnu/xml/libxmlj/util/EmptyNodeList.class
deleted file mode 100644
index cbff97daa65..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/util/EmptyNodeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/util/NamedInputStream.class b/libjava/classpath/lib/gnu/xml/libxmlj/util/NamedInputStream.class
deleted file mode 100644
index b0fa30cd37d..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/util/NamedInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/util/StandaloneDocumentType.class b/libjava/classpath/lib/gnu/xml/libxmlj/util/StandaloneDocumentType.class
deleted file mode 100644
index 63c1435b662..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/util/StandaloneDocumentType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/util/StandaloneLocator.class b/libjava/classpath/lib/gnu/xml/libxmlj/util/StandaloneLocator.class
deleted file mode 100644
index c02bd6d6a53..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/util/StandaloneLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/util/XMLJ$XMLJShutdownHook.class b/libjava/classpath/lib/gnu/xml/libxmlj/util/XMLJ$XMLJShutdownHook.class
deleted file mode 100644
index 69baedb3e32..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/util/XMLJ$XMLJShutdownHook.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/libxmlj/util/XMLJ.class b/libjava/classpath/lib/gnu/xml/libxmlj/util/XMLJ.class
deleted file mode 100644
index 00aceaed4aa..00000000000
--- a/libjava/classpath/lib/gnu/xml/libxmlj/util/XMLJ.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/CallFilter$Requestor.class b/libjava/classpath/lib/gnu/xml/pipeline/CallFilter$Requestor.class
deleted file mode 100644
index 6734da4eb58..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/CallFilter$Requestor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/CallFilter.class b/libjava/classpath/lib/gnu/xml/pipeline/CallFilter.class
deleted file mode 100644
index 2a0abca2527..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/CallFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/DomConsumer$Handler.class b/libjava/classpath/lib/gnu/xml/pipeline/DomConsumer$Handler.class
deleted file mode 100644
index e9877fc80b6..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/DomConsumer$Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/DomConsumer.class b/libjava/classpath/lib/gnu/xml/pipeline/DomConsumer.class
deleted file mode 100644
index 024b879bc47..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/DomConsumer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/EventConsumer.class b/libjava/classpath/lib/gnu/xml/pipeline/EventConsumer.class
deleted file mode 100644
index d6b45fca09c..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/EventConsumer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/EventFilter.class b/libjava/classpath/lib/gnu/xml/pipeline/EventFilter.class
deleted file mode 100644
index ada998d556e..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/EventFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/LinkFilter.class b/libjava/classpath/lib/gnu/xml/pipeline/LinkFilter.class
deleted file mode 100644
index fff322f472e..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/LinkFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/NSFilter.class b/libjava/classpath/lib/gnu/xml/pipeline/NSFilter.class
deleted file mode 100644
index 792319d9c13..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/NSFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/PipelineFactory$Pipeline.class b/libjava/classpath/lib/gnu/xml/pipeline/PipelineFactory$Pipeline.class
deleted file mode 100644
index 27c6977ba8a..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/PipelineFactory$Pipeline.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/PipelineFactory$Stage.class b/libjava/classpath/lib/gnu/xml/pipeline/PipelineFactory$Stage.class
deleted file mode 100644
index 4f2b6b85c54..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/PipelineFactory$Stage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/PipelineFactory.class b/libjava/classpath/lib/gnu/xml/pipeline/PipelineFactory.class
deleted file mode 100644
index 0f8ee98bee1..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/PipelineFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/TeeConsumer.class b/libjava/classpath/lib/gnu/xml/pipeline/TeeConsumer.class
deleted file mode 100644
index 2e620356d3a..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/TeeConsumer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/TextConsumer.class b/libjava/classpath/lib/gnu/xml/pipeline/TextConsumer.class
deleted file mode 100644
index 09a0ec47fa9..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/TextConsumer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$AttributeInfo.class b/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$AttributeInfo.class
deleted file mode 100644
index 60246a5676d..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$AttributeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$ChildrenRecognizer.class b/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$ChildrenRecognizer.class
deleted file mode 100644
index 8e0d5e56b96..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$ChildrenRecognizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$ElementInfo.class b/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$ElementInfo.class
deleted file mode 100644
index e00c7ac40e8..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$ElementInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$EmptyRecognizer.class b/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$EmptyRecognizer.class
deleted file mode 100644
index 81e1374e8a5..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$EmptyRecognizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$MixedRecognizer.class b/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$MixedRecognizer.class
deleted file mode 100644
index 0f2250722a4..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$MixedRecognizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$Recognizer.class b/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$Recognizer.class
deleted file mode 100644
index f2581c1f0da..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer$Recognizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer.class b/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer.class
deleted file mode 100644
index cfaa0fd5bd3..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/ValidationConsumer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/WellFormednessFilter.class b/libjava/classpath/lib/gnu/xml/pipeline/WellFormednessFilter.class
deleted file mode 100644
index 9fe9cae42ab..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/WellFormednessFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/XIncludeFilter$Scrubber.class b/libjava/classpath/lib/gnu/xml/pipeline/XIncludeFilter$Scrubber.class
deleted file mode 100644
index 0905ebdba07..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/XIncludeFilter$Scrubber.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/XIncludeFilter.class b/libjava/classpath/lib/gnu/xml/pipeline/XIncludeFilter.class
deleted file mode 100644
index 8e76a74d40e..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/XIncludeFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/pipeline/XsltFilter.class b/libjava/classpath/lib/gnu/xml/pipeline/XsltFilter.class
deleted file mode 100644
index 6209a5b8f26..00000000000
--- a/libjava/classpath/lib/gnu/xml/pipeline/XsltFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/AttributeImpl.class b/libjava/classpath/lib/gnu/xml/stream/AttributeImpl.class
deleted file mode 100644
index b3ebe4577dc..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/AttributeImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/BufferedReader.class b/libjava/classpath/lib/gnu/xml/stream/BufferedReader.class
deleted file mode 100644
index aba98124f50..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/BufferedReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/CRLFReader.class b/libjava/classpath/lib/gnu/xml/stream/CRLFReader.class
deleted file mode 100644
index d0d1f16f274..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/CRLFReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/CharactersImpl.class b/libjava/classpath/lib/gnu/xml/stream/CharactersImpl.class
deleted file mode 100644
index 915b3be491c..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/CharactersImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/CommentImpl.class b/libjava/classpath/lib/gnu/xml/stream/CommentImpl.class
deleted file mode 100644
index 0122df27a2b..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/CommentImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/DTDImpl.class b/libjava/classpath/lib/gnu/xml/stream/DTDImpl.class
deleted file mode 100644
index e2487a5d006..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/DTDImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/EndDocumentImpl.class b/libjava/classpath/lib/gnu/xml/stream/EndDocumentImpl.class
deleted file mode 100644
index d017cf68b59..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/EndDocumentImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/EndElementImpl.class b/libjava/classpath/lib/gnu/xml/stream/EndElementImpl.class
deleted file mode 100644
index b7278bba827..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/EndElementImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/EntityDeclarationImpl.class b/libjava/classpath/lib/gnu/xml/stream/EntityDeclarationImpl.class
deleted file mode 100644
index a04e1348a2e..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/EntityDeclarationImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/EntityReferenceImpl.class b/libjava/classpath/lib/gnu/xml/stream/EntityReferenceImpl.class
deleted file mode 100644
index d2c136a4038..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/EntityReferenceImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/FilteredEventReader.class b/libjava/classpath/lib/gnu/xml/stream/FilteredEventReader.class
deleted file mode 100644
index 1fbee1aa2f9..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/FilteredEventReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/FilteredStreamReader.class b/libjava/classpath/lib/gnu/xml/stream/FilteredStreamReader.class
deleted file mode 100644
index 52af9eb1d38..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/FilteredStreamReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/NamespaceImpl.class b/libjava/classpath/lib/gnu/xml/stream/NamespaceImpl.class
deleted file mode 100644
index dc1e8a43861..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/NamespaceImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/NotationDeclarationImpl.class b/libjava/classpath/lib/gnu/xml/stream/NotationDeclarationImpl.class
deleted file mode 100644
index 5dfe9b63aee..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/NotationDeclarationImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/ProcessingInstructionImpl.class b/libjava/classpath/lib/gnu/xml/stream/ProcessingInstructionImpl.class
deleted file mode 100644
index c22ae475079..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/ProcessingInstructionImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/SAXParser.class b/libjava/classpath/lib/gnu/xml/stream/SAXParser.class
deleted file mode 100644
index 10d7f073197..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/SAXParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/SAXParserFactory.class b/libjava/classpath/lib/gnu/xml/stream/SAXParserFactory.class
deleted file mode 100644
index 5013c5be9f0..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/SAXParserFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/StartDocumentImpl.class b/libjava/classpath/lib/gnu/xml/stream/StartDocumentImpl.class
deleted file mode 100644
index 46074a86be8..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/StartDocumentImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/StartElementImpl.class b/libjava/classpath/lib/gnu/xml/stream/StartElementImpl.class
deleted file mode 100644
index 05783549f56..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/StartElementImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/UnicodeReader.class b/libjava/classpath/lib/gnu/xml/stream/UnicodeReader.class
deleted file mode 100644
index 75aa1182070..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/UnicodeReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XIncludeFilter.class b/libjava/classpath/lib/gnu/xml/stream/XIncludeFilter.class
deleted file mode 100644
index f659aa6cad5..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XIncludeFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLEventAllocatorImpl.class b/libjava/classpath/lib/gnu/xml/stream/XMLEventAllocatorImpl.class
deleted file mode 100644
index 1a19a8f4a2a..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLEventAllocatorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLEventFactoryImpl.class b/libjava/classpath/lib/gnu/xml/stream/XMLEventFactoryImpl.class
deleted file mode 100644
index b6336683457..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLEventFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLEventImpl.class b/libjava/classpath/lib/gnu/xml/stream/XMLEventImpl.class
deleted file mode 100644
index 187ee4f6e27..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLEventImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLEventReaderImpl.class b/libjava/classpath/lib/gnu/xml/stream/XMLEventReaderImpl.class
deleted file mode 100644
index bcc1376e172..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLEventReaderImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLEventWriterImpl.class b/libjava/classpath/lib/gnu/xml/stream/XMLEventWriterImpl.class
deleted file mode 100644
index 9efa1e25116..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLEventWriterImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLInputFactoryImpl.class b/libjava/classpath/lib/gnu/xml/stream/XMLInputFactoryImpl.class
deleted file mode 100644
index 5e8c60a8014..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLInputFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLOutputFactoryImpl.class b/libjava/classpath/lib/gnu/xml/stream/XMLOutputFactoryImpl.class
deleted file mode 100644
index 62f20e369e3..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLOutputFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$AnyContentModel.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$AnyContentModel.class
deleted file mode 100644
index df7b43baf03..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$AnyContentModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$Attribute.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$Attribute.class
deleted file mode 100644
index b3457c54270..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$Attribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$AttributeDecl.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$AttributeDecl.class
deleted file mode 100644
index 8ca9de327de..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$AttributeDecl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$ContentModel.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$ContentModel.class
deleted file mode 100644
index 95921cf64b5..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$ContentModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$ContentParticle.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$ContentParticle.class
deleted file mode 100644
index d6189eb3a47..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$ContentParticle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$Doctype.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$Doctype.class
deleted file mode 100644
index 405545d9604..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$Doctype.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$ElementContentModel.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$ElementContentModel.class
deleted file mode 100644
index 30d2626e86f..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$ElementContentModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$EmptyContentModel.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$EmptyContentModel.class
deleted file mode 100644
index fcfaca7a49e..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$EmptyContentModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$ExternalIds.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$ExternalIds.class
deleted file mode 100644
index e1a134fdba4..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$ExternalIds.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$Input.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$Input.class
deleted file mode 100644
index ddd6c4c2abf..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$Input.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser$MixedContentModel.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser$MixedContentModel.class
deleted file mode 100644
index 63bc30f3a03..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser$MixedContentModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLParser.class b/libjava/classpath/lib/gnu/xml/stream/XMLParser.class
deleted file mode 100644
index 54792a1be55..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/stream/XMLStreamWriterImpl.class b/libjava/classpath/lib/gnu/xml/stream/XMLStreamWriterImpl.class
deleted file mode 100644
index de4a722c113..00000000000
--- a/libjava/classpath/lib/gnu/xml/stream/XMLStreamWriterImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/AbstractNumberNode.class b/libjava/classpath/lib/gnu/xml/transform/AbstractNumberNode.class
deleted file mode 100644
index 6a14d1be698..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/AbstractNumberNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/ApplyImportsNode.class b/libjava/classpath/lib/gnu/xml/transform/ApplyImportsNode.class
deleted file mode 100644
index 551bfc93d3a..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/ApplyImportsNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/ApplyTemplatesNode.class b/libjava/classpath/lib/gnu/xml/transform/ApplyTemplatesNode.class
deleted file mode 100644
index bb84b9ed7bb..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/ApplyTemplatesNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/AttributeNode.class b/libjava/classpath/lib/gnu/xml/transform/AttributeNode.class
deleted file mode 100644
index a73cf7ee874..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/AttributeNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/AttributeSet.class b/libjava/classpath/lib/gnu/xml/transform/AttributeSet.class
deleted file mode 100644
index fbdd9abb1b8..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/AttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/Bindings.class b/libjava/classpath/lib/gnu/xml/transform/Bindings.class
deleted file mode 100644
index bc75bd80e69..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/Bindings.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/CallTemplateNode.class b/libjava/classpath/lib/gnu/xml/transform/CallTemplateNode.class
deleted file mode 100644
index af045b2c671..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/CallTemplateNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/ChooseNode.class b/libjava/classpath/lib/gnu/xml/transform/ChooseNode.class
deleted file mode 100644
index fa8495e5fd6..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/ChooseNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/CommentNode.class b/libjava/classpath/lib/gnu/xml/transform/CommentNode.class
deleted file mode 100644
index 601e8fdbcb4..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/CommentNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/CopyNode.class b/libjava/classpath/lib/gnu/xml/transform/CopyNode.class
deleted file mode 100644
index c74f384beeb..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/CopyNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/CopyOfNode.class b/libjava/classpath/lib/gnu/xml/transform/CopyOfNode.class
deleted file mode 100644
index e15bc898a51..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/CopyOfNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/CurrentFunction.class b/libjava/classpath/lib/gnu/xml/transform/CurrentFunction.class
deleted file mode 100644
index 8fb1b608d20..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/CurrentFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/DOMSourceLocator.class b/libjava/classpath/lib/gnu/xml/transform/DOMSourceLocator.class
deleted file mode 100644
index a52c3608669..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/DOMSourceLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/DocumentFunction.class b/libjava/classpath/lib/gnu/xml/transform/DocumentFunction.class
deleted file mode 100644
index a4797a838c1..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/DocumentFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/ElementAvailableFunction.class b/libjava/classpath/lib/gnu/xml/transform/ElementAvailableFunction.class
deleted file mode 100644
index 98e0bb87bd3..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/ElementAvailableFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/ElementNode.class b/libjava/classpath/lib/gnu/xml/transform/ElementNode.class
deleted file mode 100644
index b6f5f4ae90e..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/ElementNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/ErrorListenerErrorHandler.class b/libjava/classpath/lib/gnu/xml/transform/ErrorListenerErrorHandler.class
deleted file mode 100644
index 2cf13cb72ed..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/ErrorListenerErrorHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/ForEachNode.class b/libjava/classpath/lib/gnu/xml/transform/ForEachNode.class
deleted file mode 100644
index 1ba63386b77..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/ForEachNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/FormatNumberFunction.class b/libjava/classpath/lib/gnu/xml/transform/FormatNumberFunction.class
deleted file mode 100644
index 02e8c1cd282..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/FormatNumberFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/FunctionAvailableFunction.class b/libjava/classpath/lib/gnu/xml/transform/FunctionAvailableFunction.class
deleted file mode 100644
index f73e2a5fbf6..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/FunctionAvailableFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/GenerateIdFunction.class b/libjava/classpath/lib/gnu/xml/transform/GenerateIdFunction.class
deleted file mode 100644
index d843772f094..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/GenerateIdFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/IfNode.class b/libjava/classpath/lib/gnu/xml/transform/IfNode.class
deleted file mode 100644
index 4abd1d272a0..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/IfNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/Key.class b/libjava/classpath/lib/gnu/xml/transform/Key.class
deleted file mode 100644
index a4c12046394..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/Key.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/KeyFunction.class b/libjava/classpath/lib/gnu/xml/transform/KeyFunction.class
deleted file mode 100644
index f8057652c93..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/KeyFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/LiteralNode.class b/libjava/classpath/lib/gnu/xml/transform/LiteralNode.class
deleted file mode 100644
index 5c7c1e8e712..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/LiteralNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/MessageNode.class b/libjava/classpath/lib/gnu/xml/transform/MessageNode.class
deleted file mode 100644
index b07186678db..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/MessageNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/NamespaceProxy.class b/libjava/classpath/lib/gnu/xml/transform/NamespaceProxy.class
deleted file mode 100644
index bfde993d73d..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/NamespaceProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/NodeNumberNode.class b/libjava/classpath/lib/gnu/xml/transform/NodeNumberNode.class
deleted file mode 100644
index eaf5e4a9cd3..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/NodeNumberNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/NumberNode.class b/libjava/classpath/lib/gnu/xml/transform/NumberNode.class
deleted file mode 100644
index 1f2a9c79df5..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/NumberNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/OtherwiseNode.class b/libjava/classpath/lib/gnu/xml/transform/OtherwiseNode.class
deleted file mode 100644
index f6daf9e52ae..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/OtherwiseNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/ParameterNode.class b/libjava/classpath/lib/gnu/xml/transform/ParameterNode.class
deleted file mode 100644
index 7352637c78f..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/ParameterNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/ProcessingInstructionNode.class b/libjava/classpath/lib/gnu/xml/transform/ProcessingInstructionNode.class
deleted file mode 100644
index 9ce2b35e6bd..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/ProcessingInstructionNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/SAXSerializer.class b/libjava/classpath/lib/gnu/xml/transform/SAXSerializer.class
deleted file mode 100644
index 46a63395c04..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/SAXSerializer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/SAXTemplatesHandler.class b/libjava/classpath/lib/gnu/xml/transform/SAXTemplatesHandler.class
deleted file mode 100644
index 9264e76cf53..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/SAXTemplatesHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/SAXTransformerHandler.class b/libjava/classpath/lib/gnu/xml/transform/SAXTransformerHandler.class
deleted file mode 100644
index 2a70ca1b6db..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/SAXTransformerHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/SortKey.class b/libjava/classpath/lib/gnu/xml/transform/SortKey.class
deleted file mode 100644
index dbcaf406225..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/SortKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/StreamSerializer.class b/libjava/classpath/lib/gnu/xml/transform/StreamSerializer.class
deleted file mode 100644
index cc3e5b80d20..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/StreamSerializer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/StrippingInstruction.class b/libjava/classpath/lib/gnu/xml/transform/StrippingInstruction.class
deleted file mode 100644
index 6bf335d8200..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/StrippingInstruction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/Stylesheet.class b/libjava/classpath/lib/gnu/xml/transform/Stylesheet.class
deleted file mode 100644
index 595eccd76af..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/Stylesheet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/SystemPropertyFunction.class b/libjava/classpath/lib/gnu/xml/transform/SystemPropertyFunction.class
deleted file mode 100644
index ba2ba8cad79..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/SystemPropertyFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/Template.class b/libjava/classpath/lib/gnu/xml/transform/Template.class
deleted file mode 100644
index 693eab11c74..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/Template.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/TemplateNode.class b/libjava/classpath/lib/gnu/xml/transform/TemplateNode.class
deleted file mode 100644
index 507c38f0d28..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/TemplateNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/TemplatesImpl.class b/libjava/classpath/lib/gnu/xml/transform/TemplatesImpl.class
deleted file mode 100644
index 34e0f74af36..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/TemplatesImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/TextNode.class b/libjava/classpath/lib/gnu/xml/transform/TextNode.class
deleted file mode 100644
index dcea7b96ef5..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/TextNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/TransformerFactoryImpl.class b/libjava/classpath/lib/gnu/xml/transform/TransformerFactoryImpl.class
deleted file mode 100644
index b7470cf85a8..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/TransformerFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/TransformerImpl.class b/libjava/classpath/lib/gnu/xml/transform/TransformerImpl.class
deleted file mode 100644
index 55db4fe5ba1..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/TransformerImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/TransformerOutputProperties.class b/libjava/classpath/lib/gnu/xml/transform/TransformerOutputProperties.class
deleted file mode 100644
index f8a20b8adf4..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/TransformerOutputProperties.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/URIResolverEntityResolver.class b/libjava/classpath/lib/gnu/xml/transform/URIResolverEntityResolver.class
deleted file mode 100644
index c69728c49a8..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/URIResolverEntityResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/UnparsedEntityUriFunction.class b/libjava/classpath/lib/gnu/xml/transform/UnparsedEntityUriFunction.class
deleted file mode 100644
index 470c75c99fc..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/UnparsedEntityUriFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/ValueOfNode.class b/libjava/classpath/lib/gnu/xml/transform/ValueOfNode.class
deleted file mode 100644
index d583dcfd35e..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/ValueOfNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/WhenNode.class b/libjava/classpath/lib/gnu/xml/transform/WhenNode.class
deleted file mode 100644
index fccfca9b54e..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/WhenNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/WithParam.class b/libjava/classpath/lib/gnu/xml/transform/WithParam.class
deleted file mode 100644
index 788a08467bb..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/WithParam.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/XSLComparator.class b/libjava/classpath/lib/gnu/xml/transform/XSLComparator.class
deleted file mode 100644
index 554411177be..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/XSLComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/transform/XSLURIResolver.class b/libjava/classpath/lib/gnu/xml/transform/XSLURIResolver.class
deleted file mode 100644
index 5fc53be4fd5..00000000000
--- a/libjava/classpath/lib/gnu/xml/transform/XSLURIResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/DoParse$MyErrorHandler.class b/libjava/classpath/lib/gnu/xml/util/DoParse$MyErrorHandler.class
deleted file mode 100644
index eb178d755fb..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/DoParse$MyErrorHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/DoParse.class b/libjava/classpath/lib/gnu/xml/util/DoParse.class
deleted file mode 100644
index 7f87a146613..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/DoParse.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/DomParser.class b/libjava/classpath/lib/gnu/xml/util/DomParser.class
deleted file mode 100644
index 6a42fea2371..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/DomParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/Resolver.class b/libjava/classpath/lib/gnu/xml/util/Resolver.class
deleted file mode 100644
index 67f58619204..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/Resolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$DomHandler.class b/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$DomHandler.class
deleted file mode 100644
index 2d27b394094..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$DomHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$DomTerminus.class b/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$DomTerminus.class
deleted file mode 100644
index a1c13cc6aa9..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$DomTerminus.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$ListenerAdapter.class b/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$ListenerAdapter.class
deleted file mode 100644
index 84517f3e8db..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$ListenerAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$LocatorAdapter.class b/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$LocatorAdapter.class
deleted file mode 100644
index 7ae3a25f3e5..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$LocatorAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$NullHandler.class b/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$NullHandler.class
deleted file mode 100644
index 9f46375356d..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$NullHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$NullTransformer.class b/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$NullTransformer.class
deleted file mode 100644
index 3f7845cd836..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory$NullTransformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory.class b/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory.class
deleted file mode 100644
index 8e43b6c5e37..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/SAXNullTransformerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/XCat$Catalog.class b/libjava/classpath/lib/gnu/xml/util/XCat$Catalog.class
deleted file mode 100644
index 6ffce36b358..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/XCat$Catalog.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/XCat$DoneDelegation.class b/libjava/classpath/lib/gnu/xml/util/XCat$DoneDelegation.class
deleted file mode 100644
index 3d8b904cbc5..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/XCat$DoneDelegation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/XCat$Loader.class b/libjava/classpath/lib/gnu/xml/util/XCat$Loader.class
deleted file mode 100644
index 5c55575b1a4..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/XCat$Loader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/XCat.class b/libjava/classpath/lib/gnu/xml/util/XCat.class
deleted file mode 100644
index 9e1af09ac3d..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/XCat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/XHTMLWriter.class b/libjava/classpath/lib/gnu/xml/util/XHTMLWriter.class
deleted file mode 100644
index 717eb4f39d0..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/XHTMLWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/util/XMLWriter.class b/libjava/classpath/lib/gnu/xml/util/XMLWriter.class
deleted file mode 100644
index 65ac2d0eb62..00000000000
--- a/libjava/classpath/lib/gnu/xml/util/XMLWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/Annotation.class b/libjava/classpath/lib/gnu/xml/validation/datatype/Annotation.class
deleted file mode 100644
index 155ce7dd990..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/Annotation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/AnySimpleType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/AnySimpleType.class
deleted file mode 100644
index 2a2088e8601..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/AnySimpleType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/AnyType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/AnyType.class
deleted file mode 100644
index 4d8dea99939..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/AnyType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/AnyURIType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/AnyURIType.class
deleted file mode 100644
index 46e6aef3c41..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/AnyURIType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/AtomicSimpleType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/AtomicSimpleType.class
deleted file mode 100644
index acc196e01f4..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/AtomicSimpleType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/Base64BinaryType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/Base64BinaryType.class
deleted file mode 100644
index 65a8ec99432..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/Base64BinaryType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/BooleanType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/BooleanType.class
deleted file mode 100644
index 321f8973df0..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/BooleanType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/ByteType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/ByteType.class
deleted file mode 100644
index d9d58a25a5b..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/ByteType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/DateTimeType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/DateTimeType.class
deleted file mode 100644
index 8537c0394a9..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/DateTimeType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/DateType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/DateType.class
deleted file mode 100644
index 8e2aba55a59..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/DateType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/DecimalType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/DecimalType.class
deleted file mode 100644
index ea1d9f4d280..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/DecimalType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/DoubleType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/DoubleType.class
deleted file mode 100644
index 371fe616877..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/DoubleType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/DurationType$Duration.class b/libjava/classpath/lib/gnu/xml/validation/datatype/DurationType$Duration.class
deleted file mode 100644
index 6fceee19587..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/DurationType$Duration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/DurationType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/DurationType.class
deleted file mode 100644
index 8103c76bee2..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/DurationType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/EntitiesType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/EntitiesType.class
deleted file mode 100644
index 26034eef8e1..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/EntitiesType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/EntityType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/EntityType.class
deleted file mode 100644
index 3f3dbf93422..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/EntityType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/EnumerationFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/EnumerationFacet.class
deleted file mode 100644
index 64f07fd2f61..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/EnumerationFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/Facet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/Facet.class
deleted file mode 100644
index 3032a8003e3..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/Facet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/FloatType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/FloatType.class
deleted file mode 100644
index 39741ba75cc..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/FloatType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/FractionDigitsFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/FractionDigitsFacet.class
deleted file mode 100644
index 683ffd4ebd0..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/FractionDigitsFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/GDayType$GDay.class b/libjava/classpath/lib/gnu/xml/validation/datatype/GDayType$GDay.class
deleted file mode 100644
index e64eded39c4..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/GDayType$GDay.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/GDayType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/GDayType.class
deleted file mode 100644
index fb39e466e70..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/GDayType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthDayType$GMonthDay.class b/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthDayType$GMonthDay.class
deleted file mode 100644
index 3b9cf6ee68b..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthDayType$GMonthDay.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthDayType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthDayType.class
deleted file mode 100644
index 80001ae83b2..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthDayType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthType$GMonth.class b/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthType$GMonth.class
deleted file mode 100644
index 12e7280be0e..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthType$GMonth.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthType.class
deleted file mode 100644
index b9d0b89a94b..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/GMonthType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/GYearMonthType$GYearMonth.class b/libjava/classpath/lib/gnu/xml/validation/datatype/GYearMonthType$GYearMonth.class
deleted file mode 100644
index ea64e7c4664..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/GYearMonthType$GYearMonth.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/GYearMonthType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/GYearMonthType.class
deleted file mode 100644
index bc4606d9fe1..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/GYearMonthType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/GYearType$GYear.class b/libjava/classpath/lib/gnu/xml/validation/datatype/GYearType$GYear.class
deleted file mode 100644
index 586112b08a2..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/GYearType$GYear.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/GYearType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/GYearType.class
deleted file mode 100644
index 17c15342912..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/GYearType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/HexBinaryType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/HexBinaryType.class
deleted file mode 100644
index 9ff9248e6ef..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/HexBinaryType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/IDRefType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/IDRefType.class
deleted file mode 100644
index d18c802d280..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/IDRefType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/IDRefsType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/IDRefsType.class
deleted file mode 100644
index 84caeeda571..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/IDRefsType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/IDType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/IDType.class
deleted file mode 100644
index cc0b69b7479..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/IDType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/IntType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/IntType.class
deleted file mode 100644
index e3a0fa55a91..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/IntType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/IntegerType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/IntegerType.class
deleted file mode 100644
index 2efe2068ed1..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/IntegerType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/LanguageType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/LanguageType.class
deleted file mode 100644
index 0ba7112e55d..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/LanguageType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/LengthFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/LengthFacet.class
deleted file mode 100644
index ad35403df56..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/LengthFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/ListSimpleType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/ListSimpleType.class
deleted file mode 100644
index 17366313e06..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/ListSimpleType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/LongType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/LongType.class
deleted file mode 100644
index ef1b1bbe949..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/LongType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/MaxExclusiveFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/MaxExclusiveFacet.class
deleted file mode 100644
index d0df8875f23..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/MaxExclusiveFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/MaxInclusiveFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/MaxInclusiveFacet.class
deleted file mode 100644
index ec68c3a66f5..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/MaxInclusiveFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/MaxLengthFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/MaxLengthFacet.class
deleted file mode 100644
index bb9969d6d39..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/MaxLengthFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/MinExclusiveFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/MinExclusiveFacet.class
deleted file mode 100644
index 3d5671496c2..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/MinExclusiveFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/MinInclusiveFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/MinInclusiveFacet.class
deleted file mode 100644
index bb77abf6542..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/MinInclusiveFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/MinLengthFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/MinLengthFacet.class
deleted file mode 100644
index 49fdb410b23..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/MinLengthFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/NCNameType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/NCNameType.class
deleted file mode 100644
index de7aa264096..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/NCNameType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/NMTokenType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/NMTokenType.class
deleted file mode 100644
index e741b06c3a7..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/NMTokenType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/NMTokensType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/NMTokensType.class
deleted file mode 100644
index f0a0dffd706..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/NMTokensType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/NameType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/NameType.class
deleted file mode 100644
index c06c6f14972..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/NameType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/NegativeIntegerType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/NegativeIntegerType.class
deleted file mode 100644
index c6f5fba4a3d..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/NegativeIntegerType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/NonNegativeIntegerType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/NonNegativeIntegerType.class
deleted file mode 100644
index d262b84ae1b..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/NonNegativeIntegerType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/NonPositiveIntegerType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/NonPositiveIntegerType.class
deleted file mode 100644
index a3b9b762722..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/NonPositiveIntegerType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/NormalizedStringType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/NormalizedStringType.class
deleted file mode 100644
index 4cf49a60240..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/NormalizedStringType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/NotationType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/NotationType.class
deleted file mode 100644
index bea3e1e0218..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/NotationType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/PatternFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/PatternFacet.class
deleted file mode 100644
index 2ac44071b2d..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/PatternFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/PositiveIntegerType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/PositiveIntegerType.class
deleted file mode 100644
index 9d4f2a83e28..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/PositiveIntegerType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/QNameType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/QNameType.class
deleted file mode 100644
index 0d6e5832a0d..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/QNameType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/ShortType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/ShortType.class
deleted file mode 100644
index 000e6e84613..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/ShortType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/SimpleType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/SimpleType.class
deleted file mode 100644
index 7151477bf5e..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/SimpleType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/StringType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/StringType.class
deleted file mode 100644
index 35cf9412357..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/StringType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/TimeType$Time.class b/libjava/classpath/lib/gnu/xml/validation/datatype/TimeType$Time.class
deleted file mode 100644
index 008e0729a63..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/TimeType$Time.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/TimeType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/TimeType.class
deleted file mode 100644
index 522aa1acefe..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/TimeType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/TokenType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/TokenType.class
deleted file mode 100644
index 03c3846295d..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/TokenType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/TotalDigitsFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/TotalDigitsFacet.class
deleted file mode 100644
index 569d3583938..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/TotalDigitsFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/Type.class b/libjava/classpath/lib/gnu/xml/validation/datatype/Type.class
deleted file mode 100644
index 637eb4f2500..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/TypeBuilder.class b/libjava/classpath/lib/gnu/xml/validation/datatype/TypeBuilder.class
deleted file mode 100644
index 6c9ee2a353e..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/TypeBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/TypeLibrary.class b/libjava/classpath/lib/gnu/xml/validation/datatype/TypeLibrary.class
deleted file mode 100644
index 37f6f8383c2..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/TypeLibrary.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/TypeLibraryFactory.class b/libjava/classpath/lib/gnu/xml/validation/datatype/TypeLibraryFactory.class
deleted file mode 100644
index 90fc6357d77..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/TypeLibraryFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/UnionSimpleType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/UnionSimpleType.class
deleted file mode 100644
index 958b266ea3e..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/UnionSimpleType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedByteType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedByteType.class
deleted file mode 100644
index d839b1e684c..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedByteType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedIntType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedIntType.class
deleted file mode 100644
index 12b0317169c..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedIntType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedLongType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedLongType.class
deleted file mode 100644
index 4264205e699..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedLongType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedShortType.class b/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedShortType.class
deleted file mode 100644
index a6bf3ddade0..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/UnsignedShortType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/datatype/WhiteSpaceFacet.class b/libjava/classpath/lib/gnu/xml/validation/datatype/WhiteSpaceFacet.class
deleted file mode 100644
index a8e452ff8e3..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/datatype/WhiteSpaceFacet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/AnyNameNameClass.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/AnyNameNameClass.class
deleted file mode 100644
index 64cd6ac1b9c..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/AnyNameNameClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/AttributePattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/AttributePattern.class
deleted file mode 100644
index 7e83bd124a7..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/AttributePattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/ChoiceNameClass.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/ChoiceNameClass.class
deleted file mode 100644
index 81ec7af80db..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/ChoiceNameClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/ChoicePattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/ChoicePattern.class
deleted file mode 100644
index 91b170ff262..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/ChoicePattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/DataPattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/DataPattern.class
deleted file mode 100644
index 1fda20dc748..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/DataPattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/Define.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/Define.class
deleted file mode 100644
index 41fee5eff5a..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/Define.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/ElementPattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/ElementPattern.class
deleted file mode 100644
index d351d4c0d60..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/ElementPattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/EmptyPattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/EmptyPattern.class
deleted file mode 100644
index 53ced659dcf..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/EmptyPattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/FullSyntaxBuilder.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/FullSyntaxBuilder.class
deleted file mode 100644
index 879ead3a456..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/FullSyntaxBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/Grammar.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/Grammar.class
deleted file mode 100644
index 26630a9710f..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/Grammar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/GrammarException.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/GrammarException.class
deleted file mode 100644
index 7ee2e47e2d5..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/GrammarException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/GrammarValidator.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/GrammarValidator.class
deleted file mode 100644
index a7ba34f578d..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/GrammarValidator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/GroupPattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/GroupPattern.class
deleted file mode 100644
index 4593becd067..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/GroupPattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/InterleavePattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/InterleavePattern.class
deleted file mode 100644
index ee085010dc9..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/InterleavePattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/ListPattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/ListPattern.class
deleted file mode 100644
index 563ea50583e..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/ListPattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/NSNameNameClass.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/NSNameNameClass.class
deleted file mode 100644
index 44526e8f873..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/NSNameNameClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/NameClass.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/NameClass.class
deleted file mode 100644
index 9f68a9f83be..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/NameClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/NameNameClass.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/NameNameClass.class
deleted file mode 100644
index 8508269730e..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/NameNameClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/NotAllowedPattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/NotAllowedPattern.class
deleted file mode 100644
index de7c1fdde94..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/NotAllowedPattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/OneOrMorePattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/OneOrMorePattern.class
deleted file mode 100644
index a551b439860..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/OneOrMorePattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/Param.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/Param.class
deleted file mode 100644
index 339ab0963ad..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/Param.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/Pattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/Pattern.class
deleted file mode 100644
index 8c4fa5331b8..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/Pattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.class
deleted file mode 100644
index 9baf00beac7..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/RefPattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/RefPattern.class
deleted file mode 100644
index bc1088a01fa..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/RefPattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/TextPattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/TextPattern.class
deleted file mode 100644
index 4cf2b89a3b8..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/TextPattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/relaxng/ValuePattern.class b/libjava/classpath/lib/gnu/xml/validation/relaxng/ValuePattern.class
deleted file mode 100644
index f27bc0dddce..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/relaxng/ValuePattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/AnyAttribute.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/AnyAttribute.class
deleted file mode 100644
index 3b05d7e2c2b..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/AnyAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/AttributeDeclaration.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/AttributeDeclaration.class
deleted file mode 100644
index 55d207a0892..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/AttributeDeclaration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/AttributeUse.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/AttributeUse.class
deleted file mode 100644
index 5df4ffda546..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/AttributeUse.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/ComplexType.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/ComplexType.class
deleted file mode 100644
index 1249a43af09..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/ComplexType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/ElementDeclaration.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/ElementDeclaration.class
deleted file mode 100644
index d56b4b83a93..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/ElementDeclaration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/Particle.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/Particle.class
deleted file mode 100644
index cd48e71059e..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/Particle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/ValidationException.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/ValidationException.class
deleted file mode 100644
index f09a79ca306..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/ValidationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchema.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchema.class
deleted file mode 100644
index 393f3f2c3df..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchema.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.class
deleted file mode 100644
index e3294ea9b69..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaBuilder.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaBuilder.class
deleted file mode 100644
index 04a824ba9c0..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.class
deleted file mode 100644
index a5c892cbf50..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.class
deleted file mode 100644
index 60ac110b7c2..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.class
deleted file mode 100644
index edcc6149575..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.class
deleted file mode 100644
index 7a457b6669c..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaValidator.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaValidator.class
deleted file mode 100644
index 823a554e09c..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaValidator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.class b/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.class
deleted file mode 100644
index da9085fab52..00000000000
--- a/libjava/classpath/lib/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/AndExpr.class b/libjava/classpath/lib/gnu/xml/xpath/AndExpr.class
deleted file mode 100644
index 42a921f32ce..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/AndExpr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/ArithmeticExpr.class b/libjava/classpath/lib/gnu/xml/xpath/ArithmeticExpr.class
deleted file mode 100644
index de7f2fcb684..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/ArithmeticExpr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/BooleanFunction.class b/libjava/classpath/lib/gnu/xml/xpath/BooleanFunction.class
deleted file mode 100644
index 960604c8314..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/BooleanFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/CeilingFunction.class b/libjava/classpath/lib/gnu/xml/xpath/CeilingFunction.class
deleted file mode 100644
index 361d12464db..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/CeilingFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/ConcatFunction.class b/libjava/classpath/lib/gnu/xml/xpath/ConcatFunction.class
deleted file mode 100644
index 4c706a233c0..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/ConcatFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Constant.class b/libjava/classpath/lib/gnu/xml/xpath/Constant.class
deleted file mode 100644
index f3e58753adb..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Constant.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/ContainsFunction.class b/libjava/classpath/lib/gnu/xml/xpath/ContainsFunction.class
deleted file mode 100644
index 5fb6023a045..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/ContainsFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/CountFunction.class b/libjava/classpath/lib/gnu/xml/xpath/CountFunction.class
deleted file mode 100644
index fad78cae443..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/CountFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/DocumentOrderComparator.class b/libjava/classpath/lib/gnu/xml/xpath/DocumentOrderComparator.class
deleted file mode 100644
index 8b375856f4d..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/DocumentOrderComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/EqualityExpr.class b/libjava/classpath/lib/gnu/xml/xpath/EqualityExpr.class
deleted file mode 100644
index fb3075b1939..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/EqualityExpr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Expr$ExprNodeSet.class b/libjava/classpath/lib/gnu/xml/xpath/Expr$ExprNodeSet.class
deleted file mode 100644
index ebf27e41d19..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Expr$ExprNodeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Expr.class b/libjava/classpath/lib/gnu/xml/xpath/Expr.class
deleted file mode 100644
index cc1e8c7c22a..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Expr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/FalseFunction.class b/libjava/classpath/lib/gnu/xml/xpath/FalseFunction.class
deleted file mode 100644
index 5c950ab1cc6..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/FalseFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/FloorFunction.class b/libjava/classpath/lib/gnu/xml/xpath/FloorFunction.class
deleted file mode 100644
index e630680de5c..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/FloorFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Function.class b/libjava/classpath/lib/gnu/xml/xpath/Function.class
deleted file mode 100644
index eb4c96e1c39..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Function.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/FunctionCall.class b/libjava/classpath/lib/gnu/xml/xpath/FunctionCall.class
deleted file mode 100644
index e78249cf237..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/FunctionCall.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/IdFunction.class b/libjava/classpath/lib/gnu/xml/xpath/IdFunction.class
deleted file mode 100644
index 701fe7e5d19..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/IdFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/LangFunction.class b/libjava/classpath/lib/gnu/xml/xpath/LangFunction.class
deleted file mode 100644
index 454957c4487..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/LangFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/LastFunction.class b/libjava/classpath/lib/gnu/xml/xpath/LastFunction.class
deleted file mode 100644
index 37765a7324a..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/LastFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/LocalNameFunction.class b/libjava/classpath/lib/gnu/xml/xpath/LocalNameFunction.class
deleted file mode 100644
index 3e5d22afd6c..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/LocalNameFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/NameFunction.class b/libjava/classpath/lib/gnu/xml/xpath/NameFunction.class
deleted file mode 100644
index ae556d205b7..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/NameFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/NameTest.class b/libjava/classpath/lib/gnu/xml/xpath/NameTest.class
deleted file mode 100644
index 7786e0bd9b7..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/NameTest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/NamespaceTest.class b/libjava/classpath/lib/gnu/xml/xpath/NamespaceTest.class
deleted file mode 100644
index dc83c9834d3..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/NamespaceTest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/NamespaceUriFunction.class b/libjava/classpath/lib/gnu/xml/xpath/NamespaceUriFunction.class
deleted file mode 100644
index d143bfd8dd0..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/NamespaceUriFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/NegativeExpr.class b/libjava/classpath/lib/gnu/xml/xpath/NegativeExpr.class
deleted file mode 100644
index 486a7ecbb1e..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/NegativeExpr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/NodeTypeTest.class b/libjava/classpath/lib/gnu/xml/xpath/NodeTypeTest.class
deleted file mode 100644
index 19dd1e7824f..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/NodeTypeTest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/NormalizeSpaceFunction.class b/libjava/classpath/lib/gnu/xml/xpath/NormalizeSpaceFunction.class
deleted file mode 100644
index 8077365c42e..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/NormalizeSpaceFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/NotFunction.class b/libjava/classpath/lib/gnu/xml/xpath/NotFunction.class
deleted file mode 100644
index a62c05e9646..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/NotFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/NumberFunction.class b/libjava/classpath/lib/gnu/xml/xpath/NumberFunction.class
deleted file mode 100644
index 49843d274dd..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/NumberFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/OrExpr.class b/libjava/classpath/lib/gnu/xml/xpath/OrExpr.class
deleted file mode 100644
index f693efc63d4..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/OrExpr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/ParenthesizedExpr.class b/libjava/classpath/lib/gnu/xml/xpath/ParenthesizedExpr.class
deleted file mode 100644
index 3204f7ab7ac..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/ParenthesizedExpr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Path.class b/libjava/classpath/lib/gnu/xml/xpath/Path.class
deleted file mode 100644
index 9dfbb9f3557..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Path.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Pattern.class b/libjava/classpath/lib/gnu/xml/xpath/Pattern.class
deleted file mode 100644
index a4e620f6ac0..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Pattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/PositionFunction.class b/libjava/classpath/lib/gnu/xml/xpath/PositionFunction.class
deleted file mode 100644
index a3332267dea..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/PositionFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Predicate.class b/libjava/classpath/lib/gnu/xml/xpath/Predicate.class
deleted file mode 100644
index 3dd2338f206..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Predicate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/RelationalExpr.class b/libjava/classpath/lib/gnu/xml/xpath/RelationalExpr.class
deleted file mode 100644
index e1534ca8840..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/RelationalExpr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Root.class b/libjava/classpath/lib/gnu/xml/xpath/Root.class
deleted file mode 100644
index f72433e704e..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Root.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/RoundFunction.class b/libjava/classpath/lib/gnu/xml/xpath/RoundFunction.class
deleted file mode 100644
index 69af4c9bc7e..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/RoundFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Selector.class b/libjava/classpath/lib/gnu/xml/xpath/Selector.class
deleted file mode 100644
index d31e58ca0ee..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Selector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/StartsWithFunction.class b/libjava/classpath/lib/gnu/xml/xpath/StartsWithFunction.class
deleted file mode 100644
index e44af9f17ba..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/StartsWithFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Steps.class b/libjava/classpath/lib/gnu/xml/xpath/Steps.class
deleted file mode 100644
index e2feed64d04..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Steps.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/StringFunction.class b/libjava/classpath/lib/gnu/xml/xpath/StringFunction.class
deleted file mode 100644
index de96161567b..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/StringFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/StringLengthFunction.class b/libjava/classpath/lib/gnu/xml/xpath/StringLengthFunction.class
deleted file mode 100644
index ef7032bd1d9..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/StringLengthFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/SubstringAfterFunction.class b/libjava/classpath/lib/gnu/xml/xpath/SubstringAfterFunction.class
deleted file mode 100644
index df689d64aad..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/SubstringAfterFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/SubstringBeforeFunction.class b/libjava/classpath/lib/gnu/xml/xpath/SubstringBeforeFunction.class
deleted file mode 100644
index ccbe7c5fd93..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/SubstringBeforeFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/SubstringFunction.class b/libjava/classpath/lib/gnu/xml/xpath/SubstringFunction.class
deleted file mode 100644
index 53746375c65..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/SubstringFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/SumFunction.class b/libjava/classpath/lib/gnu/xml/xpath/SumFunction.class
deleted file mode 100644
index e4fbcbea6c6..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/SumFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/Test.class b/libjava/classpath/lib/gnu/xml/xpath/Test.class
deleted file mode 100644
index 40eaeafb152..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/Test.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/TranslateFunction.class b/libjava/classpath/lib/gnu/xml/xpath/TranslateFunction.class
deleted file mode 100644
index afbe0b2d2a5..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/TranslateFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/TrueFunction.class b/libjava/classpath/lib/gnu/xml/xpath/TrueFunction.class
deleted file mode 100644
index 00b08371877..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/TrueFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/UnionExpr.class b/libjava/classpath/lib/gnu/xml/xpath/UnionExpr.class
deleted file mode 100644
index 1d0f4c3be0f..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/UnionExpr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/VariableReference.class b/libjava/classpath/lib/gnu/xml/xpath/VariableReference.class
deleted file mode 100644
index 43e13e0153d..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/VariableReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathFactoryImpl.class b/libjava/classpath/lib/gnu/xml/xpath/XPathFactoryImpl.class
deleted file mode 100644
index 09d426b7341..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathFactoryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathImpl.class b/libjava/classpath/lib/gnu/xml/xpath/XPathImpl.class
deleted file mode 100644
index 7da93cc9a7e..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyCheckClass.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyCheckClass.class
deleted file mode 100644
index 8be1bbc8d92..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyCheckClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyDefRedClass.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyDefRedClass.class
deleted file mode 100644
index 1fe427dbd35..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyDefRedClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyDgotoClass.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyDgotoClass.class
deleted file mode 100644
index eb13d8206b4..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyDgotoClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyGindexClass.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyGindexClass.class
deleted file mode 100644
index ae12af85ade..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyGindexClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyLenClass.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyLenClass.class
deleted file mode 100644
index 563f40d74a6..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyLenClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyLhsClass.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyLhsClass.class
deleted file mode 100644
index 61bb72ccb69..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyLhsClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyNameClass.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyNameClass.class
deleted file mode 100644
index 345c33c482f..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyNameClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyRindexClass.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyRindexClass.class
deleted file mode 100644
index c1d94e25537..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyRindexClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YySindexClass.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YySindexClass.class
deleted file mode 100644
index 1ac22ce4858..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YySindexClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyTableClass.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyTableClass.class
deleted file mode 100644
index 66abc5a9871..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$YyTableClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$yyException.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$yyException.class
deleted file mode 100644
index 11453366a5c..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$yyException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$yyInput.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser$yyInput.class
deleted file mode 100644
index 7b672736d12..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser$yyInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathParser.class b/libjava/classpath/lib/gnu/xml/xpath/XPathParser.class
deleted file mode 100644
index b93bf0af60c..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathTokenizer$XPathToken.class b/libjava/classpath/lib/gnu/xml/xpath/XPathTokenizer$XPathToken.class
deleted file mode 100644
index 00854233319..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathTokenizer$XPathToken.class
+++ /dev/null
diff --git a/libjava/classpath/lib/gnu/xml/xpath/XPathTokenizer.class b/libjava/classpath/lib/gnu/xml/xpath/XPathTokenizer.class
deleted file mode 100644
index 1f6743cbbe8..00000000000
--- a/libjava/classpath/lib/gnu/xml/xpath/XPathTokenizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/applet/Applet$AccessibleApplet.class b/libjava/classpath/lib/java/applet/Applet$AccessibleApplet.class
deleted file mode 100644
index 941060f307d..00000000000
--- a/libjava/classpath/lib/java/applet/Applet$AccessibleApplet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/applet/Applet$URLAudioClip.class b/libjava/classpath/lib/java/applet/Applet$URLAudioClip.class
deleted file mode 100644
index e402a4a14bd..00000000000
--- a/libjava/classpath/lib/java/applet/Applet$URLAudioClip.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/applet/Applet.class b/libjava/classpath/lib/java/applet/Applet.class
deleted file mode 100644
index f698f174783..00000000000
--- a/libjava/classpath/lib/java/applet/Applet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/applet/AppletContext.class b/libjava/classpath/lib/java/applet/AppletContext.class
deleted file mode 100644
index 4e3e677c1c8..00000000000
--- a/libjava/classpath/lib/java/applet/AppletContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/applet/AppletStub.class b/libjava/classpath/lib/java/applet/AppletStub.class
deleted file mode 100644
index 95622ca5ebf..00000000000
--- a/libjava/classpath/lib/java/applet/AppletStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/applet/AudioClip.class b/libjava/classpath/lib/java/applet/AudioClip.class
deleted file mode 100644
index 5a337f100be..00000000000
--- a/libjava/classpath/lib/java/applet/AudioClip.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AWTError.class b/libjava/classpath/lib/java/awt/AWTError.class
deleted file mode 100644
index 1c2c2d68360..00000000000
--- a/libjava/classpath/lib/java/awt/AWTError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AWTEvent.class b/libjava/classpath/lib/java/awt/AWTEvent.class
deleted file mode 100644
index c48dbf1ad43..00000000000
--- a/libjava/classpath/lib/java/awt/AWTEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AWTEventMulticaster.class b/libjava/classpath/lib/java/awt/AWTEventMulticaster.class
deleted file mode 100644
index 1e543de2941..00000000000
--- a/libjava/classpath/lib/java/awt/AWTEventMulticaster.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AWTException.class b/libjava/classpath/lib/java/awt/AWTException.class
deleted file mode 100644
index 65a5c73c244..00000000000
--- a/libjava/classpath/lib/java/awt/AWTException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AWTKeyStroke$1.class b/libjava/classpath/lib/java/awt/AWTKeyStroke$1.class
deleted file mode 100644
index b82323aeaf1..00000000000
--- a/libjava/classpath/lib/java/awt/AWTKeyStroke$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AWTKeyStroke$2.class b/libjava/classpath/lib/java/awt/AWTKeyStroke$2.class
deleted file mode 100644
index a23cf24f820..00000000000
--- a/libjava/classpath/lib/java/awt/AWTKeyStroke$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AWTKeyStroke$3.class b/libjava/classpath/lib/java/awt/AWTKeyStroke$3.class
deleted file mode 100644
index c6e66864b19..00000000000
--- a/libjava/classpath/lib/java/awt/AWTKeyStroke$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AWTKeyStroke.class b/libjava/classpath/lib/java/awt/AWTKeyStroke.class
deleted file mode 100644
index 5695cda2d17..00000000000
--- a/libjava/classpath/lib/java/awt/AWTKeyStroke.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AWTPermission.class b/libjava/classpath/lib/java/awt/AWTPermission.class
deleted file mode 100644
index 40d3e029d8f..00000000000
--- a/libjava/classpath/lib/java/awt/AWTPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/ActiveEvent.class b/libjava/classpath/lib/java/awt/ActiveEvent.class
deleted file mode 100644
index 759557aa292..00000000000
--- a/libjava/classpath/lib/java/awt/ActiveEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Adjustable.class b/libjava/classpath/lib/java/awt/Adjustable.class
deleted file mode 100644
index 64d46c13b49..00000000000
--- a/libjava/classpath/lib/java/awt/Adjustable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AlphaComposite$1.class b/libjava/classpath/lib/java/awt/AlphaComposite$1.class
deleted file mode 100644
index 4587a1736f7..00000000000
--- a/libjava/classpath/lib/java/awt/AlphaComposite$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AlphaComposite.class b/libjava/classpath/lib/java/awt/AlphaComposite.class
deleted file mode 100644
index 78eba385519..00000000000
--- a/libjava/classpath/lib/java/awt/AlphaComposite.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/AttributeValue.class b/libjava/classpath/lib/java/awt/AttributeValue.class
deleted file mode 100644
index 43d074d0558..00000000000
--- a/libjava/classpath/lib/java/awt/AttributeValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/BasicStroke.class b/libjava/classpath/lib/java/awt/BasicStroke.class
deleted file mode 100644
index 560647171aa..00000000000
--- a/libjava/classpath/lib/java/awt/BasicStroke.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/BorderLayout.class b/libjava/classpath/lib/java/awt/BorderLayout.class
deleted file mode 100644
index 0a076d342ee..00000000000
--- a/libjava/classpath/lib/java/awt/BorderLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/BufferCapabilities$FlipContents.class b/libjava/classpath/lib/java/awt/BufferCapabilities$FlipContents.class
deleted file mode 100644
index 80d0199048d..00000000000
--- a/libjava/classpath/lib/java/awt/BufferCapabilities$FlipContents.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/BufferCapabilities.class b/libjava/classpath/lib/java/awt/BufferCapabilities.class
deleted file mode 100644
index e0a4b670c68..00000000000
--- a/libjava/classpath/lib/java/awt/BufferCapabilities.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Button$AccessibleAWTButton.class b/libjava/classpath/lib/java/awt/Button$AccessibleAWTButton.class
deleted file mode 100644
index bba52b1be95..00000000000
--- a/libjava/classpath/lib/java/awt/Button$AccessibleAWTButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Button.class b/libjava/classpath/lib/java/awt/Button.class
deleted file mode 100644
index 1acfc276f01..00000000000
--- a/libjava/classpath/lib/java/awt/Button.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Canvas$AccessibleAWTCanvas.class b/libjava/classpath/lib/java/awt/Canvas$AccessibleAWTCanvas.class
deleted file mode 100644
index 0a1b1b59c2d..00000000000
--- a/libjava/classpath/lib/java/awt/Canvas$AccessibleAWTCanvas.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Canvas$CanvasBltBufferStrategy.class b/libjava/classpath/lib/java/awt/Canvas$CanvasBltBufferStrategy.class
deleted file mode 100644
index b2536002266..00000000000
--- a/libjava/classpath/lib/java/awt/Canvas$CanvasBltBufferStrategy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Canvas$CanvasFlipBufferStrategy.class b/libjava/classpath/lib/java/awt/Canvas$CanvasFlipBufferStrategy.class
deleted file mode 100644
index 122ed3ab179..00000000000
--- a/libjava/classpath/lib/java/awt/Canvas$CanvasFlipBufferStrategy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Canvas.class b/libjava/classpath/lib/java/awt/Canvas.class
deleted file mode 100644
index e10c2e82e41..00000000000
--- a/libjava/classpath/lib/java/awt/Canvas.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/CardLayout.class b/libjava/classpath/lib/java/awt/CardLayout.class
deleted file mode 100644
index 15b2e95e5e7..00000000000
--- a/libjava/classpath/lib/java/awt/CardLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Checkbox$AccessibleAWTCheckbox.class b/libjava/classpath/lib/java/awt/Checkbox$AccessibleAWTCheckbox.class
deleted file mode 100644
index eaff0a1d38d..00000000000
--- a/libjava/classpath/lib/java/awt/Checkbox$AccessibleAWTCheckbox.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Checkbox.class b/libjava/classpath/lib/java/awt/Checkbox.class
deleted file mode 100644
index a1dad185e3c..00000000000
--- a/libjava/classpath/lib/java/awt/Checkbox.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/CheckboxGroup.class b/libjava/classpath/lib/java/awt/CheckboxGroup.class
deleted file mode 100644
index d3318dc4946..00000000000
--- a/libjava/classpath/lib/java/awt/CheckboxGroup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.class b/libjava/classpath/lib/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.class
deleted file mode 100644
index b9249c1f48a..00000000000
--- a/libjava/classpath/lib/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/CheckboxMenuItem.class b/libjava/classpath/lib/java/awt/CheckboxMenuItem.class
deleted file mode 100644
index e4428250812..00000000000
--- a/libjava/classpath/lib/java/awt/CheckboxMenuItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Choice$AccessibleAWTChoice.class b/libjava/classpath/lib/java/awt/Choice$AccessibleAWTChoice.class
deleted file mode 100644
index fa4121af6c8..00000000000
--- a/libjava/classpath/lib/java/awt/Choice$AccessibleAWTChoice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Choice.class b/libjava/classpath/lib/java/awt/Choice.class
deleted file mode 100644
index a790c17c7f7..00000000000
--- a/libjava/classpath/lib/java/awt/Choice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Color.class b/libjava/classpath/lib/java/awt/Color.class
deleted file mode 100644
index 68857ce01aa..00000000000
--- a/libjava/classpath/lib/java/awt/Color.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/ColorPaintContext$ColorRaster.class b/libjava/classpath/lib/java/awt/ColorPaintContext$ColorRaster.class
deleted file mode 100644
index 677693124da..00000000000
--- a/libjava/classpath/lib/java/awt/ColorPaintContext$ColorRaster.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/ColorPaintContext.class b/libjava/classpath/lib/java/awt/ColorPaintContext.class
deleted file mode 100644
index f0637671bf3..00000000000
--- a/libjava/classpath/lib/java/awt/ColorPaintContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.class b/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.class
deleted file mode 100644
index 938f39d68a4..00000000000
--- a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.class b/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.class
deleted file mode 100644
index 530ca77bf01..00000000000
--- a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent.class b/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent.class
deleted file mode 100644
index 96ce9797bf4..00000000000
--- a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Component$BltBufferStrategy.class b/libjava/classpath/lib/java/awt/Component$BltBufferStrategy.class
deleted file mode 100644
index 2701fffcf9f..00000000000
--- a/libjava/classpath/lib/java/awt/Component$BltBufferStrategy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Component$FlipBufferStrategy.class b/libjava/classpath/lib/java/awt/Component$FlipBufferStrategy.class
deleted file mode 100644
index 0fefc2186dc..00000000000
--- a/libjava/classpath/lib/java/awt/Component$FlipBufferStrategy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Component$HeavyweightInLightweightListener.class b/libjava/classpath/lib/java/awt/Component$HeavyweightInLightweightListener.class
deleted file mode 100644
index 633d9af77bf..00000000000
--- a/libjava/classpath/lib/java/awt/Component$HeavyweightInLightweightListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Component.class b/libjava/classpath/lib/java/awt/Component.class
deleted file mode 100644
index 0533b9c697d..00000000000
--- a/libjava/classpath/lib/java/awt/Component.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/ComponentOrientation.class b/libjava/classpath/lib/java/awt/ComponentOrientation.class
deleted file mode 100644
index 37defe8d013..00000000000
--- a/libjava/classpath/lib/java/awt/ComponentOrientation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Composite.class b/libjava/classpath/lib/java/awt/Composite.class
deleted file mode 100644
index 76e23ac1370..00000000000
--- a/libjava/classpath/lib/java/awt/Composite.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/CompositeContext.class b/libjava/classpath/lib/java/awt/CompositeContext.class
deleted file mode 100644
index e6c4c26e2b4..00000000000
--- a/libjava/classpath/lib/java/awt/CompositeContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.class b/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.class
deleted file mode 100644
index a07e427861d..00000000000
--- a/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer.class b/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer.class
deleted file mode 100644
index 1e8cf52b670..00000000000
--- a/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Container$GfxPaintAllVisitor.class b/libjava/classpath/lib/java/awt/Container$GfxPaintAllVisitor.class
deleted file mode 100644
index 0d36436ecd8..00000000000
--- a/libjava/classpath/lib/java/awt/Container$GfxPaintAllVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Container$GfxPaintVisitor.class b/libjava/classpath/lib/java/awt/Container$GfxPaintVisitor.class
deleted file mode 100644
index 1098464e2d3..00000000000
--- a/libjava/classpath/lib/java/awt/Container$GfxPaintVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Container$GfxPrintAllVisitor.class b/libjava/classpath/lib/java/awt/Container$GfxPrintAllVisitor.class
deleted file mode 100644
index 504e985c722..00000000000
--- a/libjava/classpath/lib/java/awt/Container$GfxPrintAllVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Container$GfxPrintVisitor.class b/libjava/classpath/lib/java/awt/Container$GfxPrintVisitor.class
deleted file mode 100644
index d054e5e9a94..00000000000
--- a/libjava/classpath/lib/java/awt/Container$GfxPrintVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Container$GfxVisitor.class b/libjava/classpath/lib/java/awt/Container$GfxVisitor.class
deleted file mode 100644
index f9f85ae5215..00000000000
--- a/libjava/classpath/lib/java/awt/Container$GfxVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Container.class b/libjava/classpath/lib/java/awt/Container.class
deleted file mode 100644
index 12cc33e95c6..00000000000
--- a/libjava/classpath/lib/java/awt/Container.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/ContainerOrderFocusTraversalPolicy.class b/libjava/classpath/lib/java/awt/ContainerOrderFocusTraversalPolicy.class
deleted file mode 100644
index b5b42caa5e9..00000000000
--- a/libjava/classpath/lib/java/awt/ContainerOrderFocusTraversalPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Cursor.class b/libjava/classpath/lib/java/awt/Cursor.class
deleted file mode 100644
index 72aff9a81ca..00000000000
--- a/libjava/classpath/lib/java/awt/Cursor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/DefaultFocusTraversalPolicy.class b/libjava/classpath/lib/java/awt/DefaultFocusTraversalPolicy.class
deleted file mode 100644
index f366cbe3510..00000000000
--- a/libjava/classpath/lib/java/awt/DefaultFocusTraversalPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/DefaultKeyboardFocusManager$EventDelayRequest.class b/libjava/classpath/lib/java/awt/DefaultKeyboardFocusManager$EventDelayRequest.class
deleted file mode 100644
index 45f07b9d465..00000000000
--- a/libjava/classpath/lib/java/awt/DefaultKeyboardFocusManager$EventDelayRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/DefaultKeyboardFocusManager.class b/libjava/classpath/lib/java/awt/DefaultKeyboardFocusManager.class
deleted file mode 100644
index a4ca603f344..00000000000
--- a/libjava/classpath/lib/java/awt/DefaultKeyboardFocusManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Dialog$AccessibleAWTDialog.class b/libjava/classpath/lib/java/awt/Dialog$AccessibleAWTDialog.class
deleted file mode 100644
index fd490883058..00000000000
--- a/libjava/classpath/lib/java/awt/Dialog$AccessibleAWTDialog.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Dialog.class b/libjava/classpath/lib/java/awt/Dialog.class
deleted file mode 100644
index dd13eb4bab9..00000000000
--- a/libjava/classpath/lib/java/awt/Dialog.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Dimension.class b/libjava/classpath/lib/java/awt/Dimension.class
deleted file mode 100644
index ea55474ec13..00000000000
--- a/libjava/classpath/lib/java/awt/Dimension.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/DisplayMode.class b/libjava/classpath/lib/java/awt/DisplayMode.class
deleted file mode 100644
index 17358a5917f..00000000000
--- a/libjava/classpath/lib/java/awt/DisplayMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Event.class b/libjava/classpath/lib/java/awt/Event.class
deleted file mode 100644
index c6dd1c9985f..00000000000
--- a/libjava/classpath/lib/java/awt/Event.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/EventDispatchThread.class b/libjava/classpath/lib/java/awt/EventDispatchThread.class
deleted file mode 100644
index 3b891f26935..00000000000
--- a/libjava/classpath/lib/java/awt/EventDispatchThread.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/EventQueue$Queue.class b/libjava/classpath/lib/java/awt/EventQueue$Queue.class
deleted file mode 100644
index 580abceaf96..00000000000
--- a/libjava/classpath/lib/java/awt/EventQueue$Queue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/EventQueue.class b/libjava/classpath/lib/java/awt/EventQueue.class
deleted file mode 100644
index 51a92c34e5a..00000000000
--- a/libjava/classpath/lib/java/awt/EventQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/FileDialog.class b/libjava/classpath/lib/java/awt/FileDialog.class
deleted file mode 100644
index 1587d0c5804..00000000000
--- a/libjava/classpath/lib/java/awt/FileDialog.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/FlowLayout.class b/libjava/classpath/lib/java/awt/FlowLayout.class
deleted file mode 100644
index 4ce2004612d..00000000000
--- a/libjava/classpath/lib/java/awt/FlowLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/FocusTraversalPolicy.class b/libjava/classpath/lib/java/awt/FocusTraversalPolicy.class
deleted file mode 100644
index 57fdf4b72f6..00000000000
--- a/libjava/classpath/lib/java/awt/FocusTraversalPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Font.class b/libjava/classpath/lib/java/awt/Font.class
deleted file mode 100644
index c1f8b52e2f9..00000000000
--- a/libjava/classpath/lib/java/awt/Font.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/FontFormatException.class b/libjava/classpath/lib/java/awt/FontFormatException.class
deleted file mode 100644
index 19946fd6871..00000000000
--- a/libjava/classpath/lib/java/awt/FontFormatException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/FontMetrics.class b/libjava/classpath/lib/java/awt/FontMetrics.class
deleted file mode 100644
index 0b1e6dba9b7..00000000000
--- a/libjava/classpath/lib/java/awt/FontMetrics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Frame$AccessibleAWTFrame.class b/libjava/classpath/lib/java/awt/Frame$AccessibleAWTFrame.class
deleted file mode 100644
index 9401dc3c189..00000000000
--- a/libjava/classpath/lib/java/awt/Frame$AccessibleAWTFrame.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Frame.class b/libjava/classpath/lib/java/awt/Frame.class
deleted file mode 100644
index c01f91ee7f4..00000000000
--- a/libjava/classpath/lib/java/awt/Frame.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/GradientPaint.class b/libjava/classpath/lib/java/awt/GradientPaint.class
deleted file mode 100644
index eba1d116fca..00000000000
--- a/libjava/classpath/lib/java/awt/GradientPaint.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Graphics.class b/libjava/classpath/lib/java/awt/Graphics.class
deleted file mode 100644
index 31b6c9071b7..00000000000
--- a/libjava/classpath/lib/java/awt/Graphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Graphics2D.class b/libjava/classpath/lib/java/awt/Graphics2D.class
deleted file mode 100644
index 9dc56205be6..00000000000
--- a/libjava/classpath/lib/java/awt/Graphics2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/GraphicsConfigTemplate.class b/libjava/classpath/lib/java/awt/GraphicsConfigTemplate.class
deleted file mode 100644
index 372b3b5decb..00000000000
--- a/libjava/classpath/lib/java/awt/GraphicsConfigTemplate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/GraphicsConfiguration.class b/libjava/classpath/lib/java/awt/GraphicsConfiguration.class
deleted file mode 100644
index 2887c1bb551..00000000000
--- a/libjava/classpath/lib/java/awt/GraphicsConfiguration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/GraphicsDevice.class b/libjava/classpath/lib/java/awt/GraphicsDevice.class
deleted file mode 100644
index 43b711e27ba..00000000000
--- a/libjava/classpath/lib/java/awt/GraphicsDevice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/GraphicsEnvironment.class b/libjava/classpath/lib/java/awt/GraphicsEnvironment.class
deleted file mode 100644
index 27aa4c06fad..00000000000
--- a/libjava/classpath/lib/java/awt/GraphicsEnvironment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/GridBagConstraints.class b/libjava/classpath/lib/java/awt/GridBagConstraints.class
deleted file mode 100644
index 4e042d74ce8..00000000000
--- a/libjava/classpath/lib/java/awt/GridBagConstraints.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/GridBagLayout.class b/libjava/classpath/lib/java/awt/GridBagLayout.class
deleted file mode 100644
index 2c406eb9978..00000000000
--- a/libjava/classpath/lib/java/awt/GridBagLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/GridBagLayoutInfo.class b/libjava/classpath/lib/java/awt/GridBagLayoutInfo.class
deleted file mode 100644
index 1d24218988d..00000000000
--- a/libjava/classpath/lib/java/awt/GridBagLayoutInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/GridLayout.class b/libjava/classpath/lib/java/awt/GridLayout.class
deleted file mode 100644
index 66b4ff692ed..00000000000
--- a/libjava/classpath/lib/java/awt/GridLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/HeadlessException.class b/libjava/classpath/lib/java/awt/HeadlessException.class
deleted file mode 100644
index e51c1cccaa7..00000000000
--- a/libjava/classpath/lib/java/awt/HeadlessException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/IllegalComponentStateException.class b/libjava/classpath/lib/java/awt/IllegalComponentStateException.class
deleted file mode 100644
index e54323b445c..00000000000
--- a/libjava/classpath/lib/java/awt/IllegalComponentStateException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Image.class b/libjava/classpath/lib/java/awt/Image.class
deleted file mode 100644
index 1e5376f34f8..00000000000
--- a/libjava/classpath/lib/java/awt/Image.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/ImageCapabilities.class b/libjava/classpath/lib/java/awt/ImageCapabilities.class
deleted file mode 100644
index a44063289ee..00000000000
--- a/libjava/classpath/lib/java/awt/ImageCapabilities.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Insets.class b/libjava/classpath/lib/java/awt/Insets.class
deleted file mode 100644
index 82d22f105c1..00000000000
--- a/libjava/classpath/lib/java/awt/Insets.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/ItemSelectable.class b/libjava/classpath/lib/java/awt/ItemSelectable.class
deleted file mode 100644
index 8c353f73383..00000000000
--- a/libjava/classpath/lib/java/awt/ItemSelectable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/JobAttributes$DefaultSelectionType.class b/libjava/classpath/lib/java/awt/JobAttributes$DefaultSelectionType.class
deleted file mode 100644
index 6f8e4779fa2..00000000000
--- a/libjava/classpath/lib/java/awt/JobAttributes$DefaultSelectionType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/JobAttributes$DestinationType.class b/libjava/classpath/lib/java/awt/JobAttributes$DestinationType.class
deleted file mode 100644
index 944d5ec8af5..00000000000
--- a/libjava/classpath/lib/java/awt/JobAttributes$DestinationType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/JobAttributes$DialogType.class b/libjava/classpath/lib/java/awt/JobAttributes$DialogType.class
deleted file mode 100644
index 0657d71262b..00000000000
--- a/libjava/classpath/lib/java/awt/JobAttributes$DialogType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/JobAttributes$MultipleDocumentHandlingType.class b/libjava/classpath/lib/java/awt/JobAttributes$MultipleDocumentHandlingType.class
deleted file mode 100644
index ede25d6102d..00000000000
--- a/libjava/classpath/lib/java/awt/JobAttributes$MultipleDocumentHandlingType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/JobAttributes$SidesType.class b/libjava/classpath/lib/java/awt/JobAttributes$SidesType.class
deleted file mode 100644
index 23984c1520c..00000000000
--- a/libjava/classpath/lib/java/awt/JobAttributes$SidesType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/JobAttributes.class b/libjava/classpath/lib/java/awt/JobAttributes.class
deleted file mode 100644
index 7aec9160989..00000000000
--- a/libjava/classpath/lib/java/awt/JobAttributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/KeyEventDispatcher.class b/libjava/classpath/lib/java/awt/KeyEventDispatcher.class
deleted file mode 100644
index ad98fb896bf..00000000000
--- a/libjava/classpath/lib/java/awt/KeyEventDispatcher.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/KeyEventPostProcessor.class b/libjava/classpath/lib/java/awt/KeyEventPostProcessor.class
deleted file mode 100644
index acf6c6ded8d..00000000000
--- a/libjava/classpath/lib/java/awt/KeyEventPostProcessor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/KeyboardFocusManager.class b/libjava/classpath/lib/java/awt/KeyboardFocusManager.class
deleted file mode 100644
index 721cf56f637..00000000000
--- a/libjava/classpath/lib/java/awt/KeyboardFocusManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Label$AccessibleAWTLabel.class b/libjava/classpath/lib/java/awt/Label$AccessibleAWTLabel.class
deleted file mode 100644
index 9a85795de2a..00000000000
--- a/libjava/classpath/lib/java/awt/Label$AccessibleAWTLabel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Label.class b/libjava/classpath/lib/java/awt/Label.class
deleted file mode 100644
index 1c6f5a5a051..00000000000
--- a/libjava/classpath/lib/java/awt/Label.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/LayoutManager.class b/libjava/classpath/lib/java/awt/LayoutManager.class
deleted file mode 100644
index 34b079f1542..00000000000
--- a/libjava/classpath/lib/java/awt/LayoutManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/LayoutManager2.class b/libjava/classpath/lib/java/awt/LayoutManager2.class
deleted file mode 100644
index fc4ad498ce6..00000000000
--- a/libjava/classpath/lib/java/awt/LayoutManager2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/LightweightDispatcher.class b/libjava/classpath/lib/java/awt/LightweightDispatcher.class
deleted file mode 100644
index f8377f8d877..00000000000
--- a/libjava/classpath/lib/java/awt/LightweightDispatcher.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.class b/libjava/classpath/lib/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.class
deleted file mode 100644
index e8079ba4474..00000000000
--- a/libjava/classpath/lib/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/List$AccessibleAWTList.class b/libjava/classpath/lib/java/awt/List$AccessibleAWTList.class
deleted file mode 100644
index 35fda74954b..00000000000
--- a/libjava/classpath/lib/java/awt/List$AccessibleAWTList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/List.class b/libjava/classpath/lib/java/awt/List.class
deleted file mode 100644
index 38022bf56d9..00000000000
--- a/libjava/classpath/lib/java/awt/List.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MediaTracker$MediaEntry.class b/libjava/classpath/lib/java/awt/MediaTracker$MediaEntry.class
deleted file mode 100644
index 2195d3b7fc8..00000000000
--- a/libjava/classpath/lib/java/awt/MediaTracker$MediaEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MediaTracker.class b/libjava/classpath/lib/java/awt/MediaTracker.class
deleted file mode 100644
index b85cda41340..00000000000
--- a/libjava/classpath/lib/java/awt/MediaTracker.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Menu$AccessibleAWTMenu.class b/libjava/classpath/lib/java/awt/Menu$AccessibleAWTMenu.class
deleted file mode 100644
index a337003eccf..00000000000
--- a/libjava/classpath/lib/java/awt/Menu$AccessibleAWTMenu.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Menu.class b/libjava/classpath/lib/java/awt/Menu.class
deleted file mode 100644
index d228702a916..00000000000
--- a/libjava/classpath/lib/java/awt/Menu.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MenuBar$AccessibleAWTMenuBar.class b/libjava/classpath/lib/java/awt/MenuBar$AccessibleAWTMenuBar.class
deleted file mode 100644
index 8b9fbbcc453..00000000000
--- a/libjava/classpath/lib/java/awt/MenuBar$AccessibleAWTMenuBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MenuBar.class b/libjava/classpath/lib/java/awt/MenuBar.class
deleted file mode 100644
index 46df50581c8..00000000000
--- a/libjava/classpath/lib/java/awt/MenuBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MenuComponent$AccessibleAWTMenuComponent.class b/libjava/classpath/lib/java/awt/MenuComponent$AccessibleAWTMenuComponent.class
deleted file mode 100644
index 3c94d68691b..00000000000
--- a/libjava/classpath/lib/java/awt/MenuComponent$AccessibleAWTMenuComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MenuComponent.class b/libjava/classpath/lib/java/awt/MenuComponent.class
deleted file mode 100644
index f0d98fca07d..00000000000
--- a/libjava/classpath/lib/java/awt/MenuComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MenuContainer.class b/libjava/classpath/lib/java/awt/MenuContainer.class
deleted file mode 100644
index fce0285dd70..00000000000
--- a/libjava/classpath/lib/java/awt/MenuContainer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MenuItem$AccessibleAWTMenuItem.class b/libjava/classpath/lib/java/awt/MenuItem$AccessibleAWTMenuItem.class
deleted file mode 100644
index d9014fe6448..00000000000
--- a/libjava/classpath/lib/java/awt/MenuItem$AccessibleAWTMenuItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MenuItem.class b/libjava/classpath/lib/java/awt/MenuItem.class
deleted file mode 100644
index fe5895291c1..00000000000
--- a/libjava/classpath/lib/java/awt/MenuItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MenuShortcut.class b/libjava/classpath/lib/java/awt/MenuShortcut.class
deleted file mode 100644
index 44cbb58936c..00000000000
--- a/libjava/classpath/lib/java/awt/MenuShortcut.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/MouseInfo.class b/libjava/classpath/lib/java/awt/MouseInfo.class
deleted file mode 100644
index dd9eb3a962e..00000000000
--- a/libjava/classpath/lib/java/awt/MouseInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PageAttributes$ColorType.class b/libjava/classpath/lib/java/awt/PageAttributes$ColorType.class
deleted file mode 100644
index c7dfcd5fd97..00000000000
--- a/libjava/classpath/lib/java/awt/PageAttributes$ColorType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PageAttributes$MediaType.class b/libjava/classpath/lib/java/awt/PageAttributes$MediaType.class
deleted file mode 100644
index 30f35d971d9..00000000000
--- a/libjava/classpath/lib/java/awt/PageAttributes$MediaType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PageAttributes$OrientationRequestedType.class b/libjava/classpath/lib/java/awt/PageAttributes$OrientationRequestedType.class
deleted file mode 100644
index a79bceccccf..00000000000
--- a/libjava/classpath/lib/java/awt/PageAttributes$OrientationRequestedType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PageAttributes$OriginType.class b/libjava/classpath/lib/java/awt/PageAttributes$OriginType.class
deleted file mode 100644
index f98e92249d5..00000000000
--- a/libjava/classpath/lib/java/awt/PageAttributes$OriginType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PageAttributes$PrintQualityType.class b/libjava/classpath/lib/java/awt/PageAttributes$PrintQualityType.class
deleted file mode 100644
index 338ca80a825..00000000000
--- a/libjava/classpath/lib/java/awt/PageAttributes$PrintQualityType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PageAttributes.class b/libjava/classpath/lib/java/awt/PageAttributes.class
deleted file mode 100644
index 71691df5c67..00000000000
--- a/libjava/classpath/lib/java/awt/PageAttributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Paint.class b/libjava/classpath/lib/java/awt/Paint.class
deleted file mode 100644
index 500bf4c6de1..00000000000
--- a/libjava/classpath/lib/java/awt/Paint.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PaintContext.class b/libjava/classpath/lib/java/awt/PaintContext.class
deleted file mode 100644
index e282250a341..00000000000
--- a/libjava/classpath/lib/java/awt/PaintContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Panel$AccessibleAWTPanel.class b/libjava/classpath/lib/java/awt/Panel$AccessibleAWTPanel.class
deleted file mode 100644
index d5003c7c91e..00000000000
--- a/libjava/classpath/lib/java/awt/Panel$AccessibleAWTPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Panel.class b/libjava/classpath/lib/java/awt/Panel.class
deleted file mode 100644
index 1351688437a..00000000000
--- a/libjava/classpath/lib/java/awt/Panel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Point.class b/libjava/classpath/lib/java/awt/Point.class
deleted file mode 100644
index 68f6f964fe2..00000000000
--- a/libjava/classpath/lib/java/awt/Point.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PointerInfo.class b/libjava/classpath/lib/java/awt/PointerInfo.class
deleted file mode 100644
index b044a3985d5..00000000000
--- a/libjava/classpath/lib/java/awt/PointerInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Polygon$1.class b/libjava/classpath/lib/java/awt/Polygon$1.class
deleted file mode 100644
index 06849f1c367..00000000000
--- a/libjava/classpath/lib/java/awt/Polygon$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Polygon.class b/libjava/classpath/lib/java/awt/Polygon.class
deleted file mode 100644
index 6425ac79e35..00000000000
--- a/libjava/classpath/lib/java/awt/Polygon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PopupMenu$AccessibleAWTPopupMenu.class b/libjava/classpath/lib/java/awt/PopupMenu$AccessibleAWTPopupMenu.class
deleted file mode 100644
index 64f469e6f4f..00000000000
--- a/libjava/classpath/lib/java/awt/PopupMenu$AccessibleAWTPopupMenu.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PopupMenu.class b/libjava/classpath/lib/java/awt/PopupMenu.class
deleted file mode 100644
index 25d87dda163..00000000000
--- a/libjava/classpath/lib/java/awt/PopupMenu.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PrintGraphics.class b/libjava/classpath/lib/java/awt/PrintGraphics.class
deleted file mode 100644
index 92853709ded..00000000000
--- a/libjava/classpath/lib/java/awt/PrintGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/PrintJob.class b/libjava/classpath/lib/java/awt/PrintJob.class
deleted file mode 100644
index 7f8b88f2908..00000000000
--- a/libjava/classpath/lib/java/awt/PrintJob.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Rectangle.class b/libjava/classpath/lib/java/awt/Rectangle.class
deleted file mode 100644
index d9811065108..00000000000
--- a/libjava/classpath/lib/java/awt/Rectangle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/RenderingHints$Key.class b/libjava/classpath/lib/java/awt/RenderingHints$Key.class
deleted file mode 100644
index f813f3c81aa..00000000000
--- a/libjava/classpath/lib/java/awt/RenderingHints$Key.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/RenderingHints$KeyImpl.class b/libjava/classpath/lib/java/awt/RenderingHints$KeyImpl.class
deleted file mode 100644
index 84e5bdb90ab..00000000000
--- a/libjava/classpath/lib/java/awt/RenderingHints$KeyImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/RenderingHints.class b/libjava/classpath/lib/java/awt/RenderingHints.class
deleted file mode 100644
index 7afce724d42..00000000000
--- a/libjava/classpath/lib/java/awt/RenderingHints.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Robot$1.class b/libjava/classpath/lib/java/awt/Robot$1.class
deleted file mode 100644
index 90fe05b0d66..00000000000
--- a/libjava/classpath/lib/java/awt/Robot$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Robot.class b/libjava/classpath/lib/java/awt/Robot.class
deleted file mode 100644
index d237b3a28a5..00000000000
--- a/libjava/classpath/lib/java/awt/Robot.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/ScrollPane$AccessibleAWTScrollPane.class b/libjava/classpath/lib/java/awt/ScrollPane$AccessibleAWTScrollPane.class
deleted file mode 100644
index 8028ed5667a..00000000000
--- a/libjava/classpath/lib/java/awt/ScrollPane$AccessibleAWTScrollPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/ScrollPane.class b/libjava/classpath/lib/java/awt/ScrollPane.class
deleted file mode 100644
index ec4e3637b92..00000000000
--- a/libjava/classpath/lib/java/awt/ScrollPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/ScrollPaneAdjustable.class b/libjava/classpath/lib/java/awt/ScrollPaneAdjustable.class
deleted file mode 100644
index 61ee1732547..00000000000
--- a/libjava/classpath/lib/java/awt/ScrollPaneAdjustable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Scrollbar$AccessibleAWTScrollBar.class b/libjava/classpath/lib/java/awt/Scrollbar$AccessibleAWTScrollBar.class
deleted file mode 100644
index 9816ac27a5f..00000000000
--- a/libjava/classpath/lib/java/awt/Scrollbar$AccessibleAWTScrollBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Scrollbar.class b/libjava/classpath/lib/java/awt/Scrollbar.class
deleted file mode 100644
index d6ad5bd8d08..00000000000
--- a/libjava/classpath/lib/java/awt/Scrollbar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Shape.class b/libjava/classpath/lib/java/awt/Shape.class
deleted file mode 100644
index 347e1609b73..00000000000
--- a/libjava/classpath/lib/java/awt/Shape.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Stroke.class b/libjava/classpath/lib/java/awt/Stroke.class
deleted file mode 100644
index 27e2461f929..00000000000
--- a/libjava/classpath/lib/java/awt/Stroke.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/SystemColor.class b/libjava/classpath/lib/java/awt/SystemColor.class
deleted file mode 100644
index dedf23c1ba9..00000000000
--- a/libjava/classpath/lib/java/awt/SystemColor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/TextArea$AccessibleAWTTextArea.class b/libjava/classpath/lib/java/awt/TextArea$AccessibleAWTTextArea.class
deleted file mode 100644
index 73aee8f1685..00000000000
--- a/libjava/classpath/lib/java/awt/TextArea$AccessibleAWTTextArea.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/TextArea.class b/libjava/classpath/lib/java/awt/TextArea.class
deleted file mode 100644
index 0729f1517df..00000000000
--- a/libjava/classpath/lib/java/awt/TextArea.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/TextComponent$AccessibleAWTTextComponent.class b/libjava/classpath/lib/java/awt/TextComponent$AccessibleAWTTextComponent.class
deleted file mode 100644
index 717c63720bc..00000000000
--- a/libjava/classpath/lib/java/awt/TextComponent$AccessibleAWTTextComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/TextComponent.class b/libjava/classpath/lib/java/awt/TextComponent.class
deleted file mode 100644
index 66928c35ede..00000000000
--- a/libjava/classpath/lib/java/awt/TextComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/TextField$AccessibleAWTTextField.class b/libjava/classpath/lib/java/awt/TextField$AccessibleAWTTextField.class
deleted file mode 100644
index b73147dd7f3..00000000000
--- a/libjava/classpath/lib/java/awt/TextField$AccessibleAWTTextField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/TextField.class b/libjava/classpath/lib/java/awt/TextField.class
deleted file mode 100644
index f99e266949f..00000000000
--- a/libjava/classpath/lib/java/awt/TextField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/TexturePaint.class b/libjava/classpath/lib/java/awt/TexturePaint.class
deleted file mode 100644
index 83ff9e1b6d9..00000000000
--- a/libjava/classpath/lib/java/awt/TexturePaint.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Toolkit$1.class b/libjava/classpath/lib/java/awt/Toolkit$1.class
deleted file mode 100644
index 74fdda086e5..00000000000
--- a/libjava/classpath/lib/java/awt/Toolkit$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Toolkit$2.class b/libjava/classpath/lib/java/awt/Toolkit$2.class
deleted file mode 100644
index a6fd5018360..00000000000
--- a/libjava/classpath/lib/java/awt/Toolkit$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Toolkit.class b/libjava/classpath/lib/java/awt/Toolkit.class
deleted file mode 100644
index 1156a7835b6..00000000000
--- a/libjava/classpath/lib/java/awt/Toolkit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Transparency.class b/libjava/classpath/lib/java/awt/Transparency.class
deleted file mode 100644
index aa13410ccff..00000000000
--- a/libjava/classpath/lib/java/awt/Transparency.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Window$AccessibleAWTWindow.class b/libjava/classpath/lib/java/awt/Window$AccessibleAWTWindow.class
deleted file mode 100644
index 0bc97fd1d21..00000000000
--- a/libjava/classpath/lib/java/awt/Window$AccessibleAWTWindow.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Window$WindowBltBufferStrategy.class b/libjava/classpath/lib/java/awt/Window$WindowBltBufferStrategy.class
deleted file mode 100644
index 03433e90fdf..00000000000
--- a/libjava/classpath/lib/java/awt/Window$WindowBltBufferStrategy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Window$WindowFlipBufferStrategy.class b/libjava/classpath/lib/java/awt/Window$WindowFlipBufferStrategy.class
deleted file mode 100644
index 2f24d47d120..00000000000
--- a/libjava/classpath/lib/java/awt/Window$WindowFlipBufferStrategy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/Window.class b/libjava/classpath/lib/java/awt/Window.class
deleted file mode 100644
index dc4ba0d7698..00000000000
--- a/libjava/classpath/lib/java/awt/Window.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/color/CMMException.class b/libjava/classpath/lib/java/awt/color/CMMException.class
deleted file mode 100644
index 03ce7757263..00000000000
--- a/libjava/classpath/lib/java/awt/color/CMMException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/color/ColorSpace.class b/libjava/classpath/lib/java/awt/color/ColorSpace.class
deleted file mode 100644
index 7e6542bbbd8..00000000000
--- a/libjava/classpath/lib/java/awt/color/ColorSpace.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/color/ICC_ColorSpace.class b/libjava/classpath/lib/java/awt/color/ICC_ColorSpace.class
deleted file mode 100644
index 4dd5cf3ad7a..00000000000
--- a/libjava/classpath/lib/java/awt/color/ICC_ColorSpace.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/color/ICC_Profile.class b/libjava/classpath/lib/java/awt/color/ICC_Profile.class
deleted file mode 100644
index 6e698a6a889..00000000000
--- a/libjava/classpath/lib/java/awt/color/ICC_Profile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/color/ICC_ProfileGray.class b/libjava/classpath/lib/java/awt/color/ICC_ProfileGray.class
deleted file mode 100644
index 9cb948845b9..00000000000
--- a/libjava/classpath/lib/java/awt/color/ICC_ProfileGray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/color/ICC_ProfileRGB.class b/libjava/classpath/lib/java/awt/color/ICC_ProfileRGB.class
deleted file mode 100644
index fb93875d713..00000000000
--- a/libjava/classpath/lib/java/awt/color/ICC_ProfileRGB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/color/ProfileDataException.class b/libjava/classpath/lib/java/awt/color/ProfileDataException.class
deleted file mode 100644
index 81a5896d9e6..00000000000
--- a/libjava/classpath/lib/java/awt/color/ProfileDataException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/Clipboard.class b/libjava/classpath/lib/java/awt/datatransfer/Clipboard.class
deleted file mode 100644
index f72038f74d6..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/Clipboard.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/ClipboardOwner.class b/libjava/classpath/lib/java/awt/datatransfer/ClipboardOwner.class
deleted file mode 100644
index fdbac55887e..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/ClipboardOwner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/DataFlavor.class b/libjava/classpath/lib/java/awt/datatransfer/DataFlavor.class
deleted file mode 100644
index d324b362ff7..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/DataFlavor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/FlavorEvent.class b/libjava/classpath/lib/java/awt/datatransfer/FlavorEvent.class
deleted file mode 100644
index 6104199288b..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/FlavorEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/FlavorListener.class b/libjava/classpath/lib/java/awt/datatransfer/FlavorListener.class
deleted file mode 100644
index 8a6d4f70a8b..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/FlavorListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/FlavorMap.class b/libjava/classpath/lib/java/awt/datatransfer/FlavorMap.class
deleted file mode 100644
index 283e1cd0660..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/FlavorMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/FlavorTable.class b/libjava/classpath/lib/java/awt/datatransfer/FlavorTable.class
deleted file mode 100644
index ec8e95df54b..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/FlavorTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/MimeType.class b/libjava/classpath/lib/java/awt/datatransfer/MimeType.class
deleted file mode 100644
index 28d191278a3..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/MimeType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/MimeTypeParseException.class b/libjava/classpath/lib/java/awt/datatransfer/MimeTypeParseException.class
deleted file mode 100644
index 69f24fa8b24..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/MimeTypeParseException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/StringSelection.class b/libjava/classpath/lib/java/awt/datatransfer/StringSelection.class
deleted file mode 100644
index 278553e654e..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/StringSelection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/SystemFlavorMap.class b/libjava/classpath/lib/java/awt/datatransfer/SystemFlavorMap.class
deleted file mode 100644
index cfd7e14397c..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/SystemFlavorMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/Transferable.class b/libjava/classpath/lib/java/awt/datatransfer/Transferable.class
deleted file mode 100644
index c0197554a10..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/Transferable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/datatransfer/UnsupportedFlavorException.class b/libjava/classpath/lib/java/awt/datatransfer/UnsupportedFlavorException.class
deleted file mode 100644
index 5eddd5f15f2..00000000000
--- a/libjava/classpath/lib/java/awt/datatransfer/UnsupportedFlavorException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/Autoscroll.class b/libjava/classpath/lib/java/awt/dnd/Autoscroll.class
deleted file mode 100644
index c4a7f7bb209..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/Autoscroll.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DnDConstants.class b/libjava/classpath/lib/java/awt/dnd/DnDConstants.class
deleted file mode 100644
index d62c7e410ae..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DnDConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DnDEventMulticaster.class b/libjava/classpath/lib/java/awt/dnd/DnDEventMulticaster.class
deleted file mode 100644
index b5189734567..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DnDEventMulticaster.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragGestureEvent.class b/libjava/classpath/lib/java/awt/dnd/DragGestureEvent.class
deleted file mode 100644
index 76158679c1b..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragGestureEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragGestureListener.class b/libjava/classpath/lib/java/awt/dnd/DragGestureListener.class
deleted file mode 100644
index f1bf00b6d45..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragGestureListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragGestureRecognizer.class b/libjava/classpath/lib/java/awt/dnd/DragGestureRecognizer.class
deleted file mode 100644
index 54c013e5b4f..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragGestureRecognizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragSource.class b/libjava/classpath/lib/java/awt/dnd/DragSource.class
deleted file mode 100644
index 7feb64583bf..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragSourceAdapter.class b/libjava/classpath/lib/java/awt/dnd/DragSourceAdapter.class
deleted file mode 100644
index b7fbf90b4bc..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragSourceAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragSourceContext.class b/libjava/classpath/lib/java/awt/dnd/DragSourceContext.class
deleted file mode 100644
index 54642267290..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragSourceContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragSourceDragEvent.class b/libjava/classpath/lib/java/awt/dnd/DragSourceDragEvent.class
deleted file mode 100644
index 3015a774e56..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragSourceDragEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragSourceDropEvent.class b/libjava/classpath/lib/java/awt/dnd/DragSourceDropEvent.class
deleted file mode 100644
index a7bc78a9086..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragSourceDropEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragSourceEvent.class b/libjava/classpath/lib/java/awt/dnd/DragSourceEvent.class
deleted file mode 100644
index ac3c1f68d60..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragSourceEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragSourceListener.class b/libjava/classpath/lib/java/awt/dnd/DragSourceListener.class
deleted file mode 100644
index 209520b8121..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragSourceListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DragSourceMotionListener.class b/libjava/classpath/lib/java/awt/dnd/DragSourceMotionListener.class
deleted file mode 100644
index 9d606b48c6c..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DragSourceMotionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DropTarget$DropTargetAutoScroller.class b/libjava/classpath/lib/java/awt/dnd/DropTarget$DropTargetAutoScroller.class
deleted file mode 100644
index ae9b26129bc..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DropTarget$DropTargetAutoScroller.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DropTarget.class b/libjava/classpath/lib/java/awt/dnd/DropTarget.class
deleted file mode 100644
index 7b25c5b56c9..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DropTarget.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DropTargetAdapter.class b/libjava/classpath/lib/java/awt/dnd/DropTargetAdapter.class
deleted file mode 100644
index 4436ebcb67e..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DropTargetAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DropTargetContext$TransferableProxy.class b/libjava/classpath/lib/java/awt/dnd/DropTargetContext$TransferableProxy.class
deleted file mode 100644
index 921235ed401..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DropTargetContext$TransferableProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DropTargetContext.class b/libjava/classpath/lib/java/awt/dnd/DropTargetContext.class
deleted file mode 100644
index 048bf4eab1f..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DropTargetContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DropTargetDragEvent.class b/libjava/classpath/lib/java/awt/dnd/DropTargetDragEvent.class
deleted file mode 100644
index 220357182b7..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DropTargetDragEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DropTargetDropEvent.class b/libjava/classpath/lib/java/awt/dnd/DropTargetDropEvent.class
deleted file mode 100644
index 210fba75833..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DropTargetDropEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DropTargetEvent.class b/libjava/classpath/lib/java/awt/dnd/DropTargetEvent.class
deleted file mode 100644
index 7d7027c7b47..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DropTargetEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/DropTargetListener.class b/libjava/classpath/lib/java/awt/dnd/DropTargetListener.class
deleted file mode 100644
index 97c74ba50c1..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/DropTargetListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/InvalidDnDOperationException.class b/libjava/classpath/lib/java/awt/dnd/InvalidDnDOperationException.class
deleted file mode 100644
index 3cbfa7c6291..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/InvalidDnDOperationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/MouseDragGestureRecognizer.class b/libjava/classpath/lib/java/awt/dnd/MouseDragGestureRecognizer.class
deleted file mode 100644
index 0cde8b7ed71..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/MouseDragGestureRecognizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/peer/DragSourceContextPeer.class b/libjava/classpath/lib/java/awt/dnd/peer/DragSourceContextPeer.class
deleted file mode 100644
index 441d7d064f0..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/peer/DragSourceContextPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/peer/DropTargetContextPeer.class b/libjava/classpath/lib/java/awt/dnd/peer/DropTargetContextPeer.class
deleted file mode 100644
index ef6b334e32e..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/peer/DropTargetContextPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/dnd/peer/DropTargetPeer.class b/libjava/classpath/lib/java/awt/dnd/peer/DropTargetPeer.class
deleted file mode 100644
index 895750c9833..00000000000
--- a/libjava/classpath/lib/java/awt/dnd/peer/DropTargetPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/AWTEventListener.class b/libjava/classpath/lib/java/awt/event/AWTEventListener.class
deleted file mode 100644
index 221d7748763..00000000000
--- a/libjava/classpath/lib/java/awt/event/AWTEventListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/AWTEventListenerProxy.class b/libjava/classpath/lib/java/awt/event/AWTEventListenerProxy.class
deleted file mode 100644
index a6bfb77b084..00000000000
--- a/libjava/classpath/lib/java/awt/event/AWTEventListenerProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/ActionEvent.class b/libjava/classpath/lib/java/awt/event/ActionEvent.class
deleted file mode 100644
index 2fa8ea42b65..00000000000
--- a/libjava/classpath/lib/java/awt/event/ActionEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/ActionListener.class b/libjava/classpath/lib/java/awt/event/ActionListener.class
deleted file mode 100644
index 0471d3f3bb0..00000000000
--- a/libjava/classpath/lib/java/awt/event/ActionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/AdjustmentEvent.class b/libjava/classpath/lib/java/awt/event/AdjustmentEvent.class
deleted file mode 100644
index 70ce2f7fa37..00000000000
--- a/libjava/classpath/lib/java/awt/event/AdjustmentEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/AdjustmentListener.class b/libjava/classpath/lib/java/awt/event/AdjustmentListener.class
deleted file mode 100644
index b4235947012..00000000000
--- a/libjava/classpath/lib/java/awt/event/AdjustmentListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/ComponentAdapter.class b/libjava/classpath/lib/java/awt/event/ComponentAdapter.class
deleted file mode 100644
index 72763f746f9..00000000000
--- a/libjava/classpath/lib/java/awt/event/ComponentAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/ComponentEvent.class b/libjava/classpath/lib/java/awt/event/ComponentEvent.class
deleted file mode 100644
index 08c2ede9db8..00000000000
--- a/libjava/classpath/lib/java/awt/event/ComponentEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/ComponentListener.class b/libjava/classpath/lib/java/awt/event/ComponentListener.class
deleted file mode 100644
index 10c71883082..00000000000
--- a/libjava/classpath/lib/java/awt/event/ComponentListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/ContainerAdapter.class b/libjava/classpath/lib/java/awt/event/ContainerAdapter.class
deleted file mode 100644
index 5e17c40299b..00000000000
--- a/libjava/classpath/lib/java/awt/event/ContainerAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/ContainerEvent.class b/libjava/classpath/lib/java/awt/event/ContainerEvent.class
deleted file mode 100644
index ff071921053..00000000000
--- a/libjava/classpath/lib/java/awt/event/ContainerEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/ContainerListener.class b/libjava/classpath/lib/java/awt/event/ContainerListener.class
deleted file mode 100644
index f8ccf49cf69..00000000000
--- a/libjava/classpath/lib/java/awt/event/ContainerListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/FocusAdapter.class b/libjava/classpath/lib/java/awt/event/FocusAdapter.class
deleted file mode 100644
index 3db720ef74a..00000000000
--- a/libjava/classpath/lib/java/awt/event/FocusAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/FocusEvent.class b/libjava/classpath/lib/java/awt/event/FocusEvent.class
deleted file mode 100644
index 031122b758d..00000000000
--- a/libjava/classpath/lib/java/awt/event/FocusEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/FocusListener.class b/libjava/classpath/lib/java/awt/event/FocusListener.class
deleted file mode 100644
index db8ff09d835..00000000000
--- a/libjava/classpath/lib/java/awt/event/FocusListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/HierarchyBoundsAdapter.class b/libjava/classpath/lib/java/awt/event/HierarchyBoundsAdapter.class
deleted file mode 100644
index 79aa2f93836..00000000000
--- a/libjava/classpath/lib/java/awt/event/HierarchyBoundsAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/HierarchyBoundsListener.class b/libjava/classpath/lib/java/awt/event/HierarchyBoundsListener.class
deleted file mode 100644
index 2642d35d4bd..00000000000
--- a/libjava/classpath/lib/java/awt/event/HierarchyBoundsListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/HierarchyEvent.class b/libjava/classpath/lib/java/awt/event/HierarchyEvent.class
deleted file mode 100644
index b1efe7988ea..00000000000
--- a/libjava/classpath/lib/java/awt/event/HierarchyEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/HierarchyListener.class b/libjava/classpath/lib/java/awt/event/HierarchyListener.class
deleted file mode 100644
index d6789af71e5..00000000000
--- a/libjava/classpath/lib/java/awt/event/HierarchyListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/InputEvent.class b/libjava/classpath/lib/java/awt/event/InputEvent.class
deleted file mode 100644
index f4fa20c5b39..00000000000
--- a/libjava/classpath/lib/java/awt/event/InputEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/InputMethodEvent.class b/libjava/classpath/lib/java/awt/event/InputMethodEvent.class
deleted file mode 100644
index c1889bbb925..00000000000
--- a/libjava/classpath/lib/java/awt/event/InputMethodEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/InputMethodListener.class b/libjava/classpath/lib/java/awt/event/InputMethodListener.class
deleted file mode 100644
index 4d94869152c..00000000000
--- a/libjava/classpath/lib/java/awt/event/InputMethodListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/InvocationEvent.class b/libjava/classpath/lib/java/awt/event/InvocationEvent.class
deleted file mode 100644
index 11a75ffcbb6..00000000000
--- a/libjava/classpath/lib/java/awt/event/InvocationEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/ItemEvent.class b/libjava/classpath/lib/java/awt/event/ItemEvent.class
deleted file mode 100644
index 5a913e69c77..00000000000
--- a/libjava/classpath/lib/java/awt/event/ItemEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/ItemListener.class b/libjava/classpath/lib/java/awt/event/ItemListener.class
deleted file mode 100644
index 6bd6bb6da91..00000000000
--- a/libjava/classpath/lib/java/awt/event/ItemListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/KeyAdapter.class b/libjava/classpath/lib/java/awt/event/KeyAdapter.class
deleted file mode 100644
index 5c5a32fbb87..00000000000
--- a/libjava/classpath/lib/java/awt/event/KeyAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/KeyEvent.class b/libjava/classpath/lib/java/awt/event/KeyEvent.class
deleted file mode 100644
index 7b219839340..00000000000
--- a/libjava/classpath/lib/java/awt/event/KeyEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/KeyListener.class b/libjava/classpath/lib/java/awt/event/KeyListener.class
deleted file mode 100644
index ef02711401e..00000000000
--- a/libjava/classpath/lib/java/awt/event/KeyListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/MouseAdapter.class b/libjava/classpath/lib/java/awt/event/MouseAdapter.class
deleted file mode 100644
index 321a7bc916b..00000000000
--- a/libjava/classpath/lib/java/awt/event/MouseAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/MouseEvent.class b/libjava/classpath/lib/java/awt/event/MouseEvent.class
deleted file mode 100644
index 9bd3051178e..00000000000
--- a/libjava/classpath/lib/java/awt/event/MouseEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/MouseListener.class b/libjava/classpath/lib/java/awt/event/MouseListener.class
deleted file mode 100644
index 381fa93f2ae..00000000000
--- a/libjava/classpath/lib/java/awt/event/MouseListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/MouseMotionAdapter.class b/libjava/classpath/lib/java/awt/event/MouseMotionAdapter.class
deleted file mode 100644
index a8317b653ff..00000000000
--- a/libjava/classpath/lib/java/awt/event/MouseMotionAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/MouseMotionListener.class b/libjava/classpath/lib/java/awt/event/MouseMotionListener.class
deleted file mode 100644
index c862ac4ccba..00000000000
--- a/libjava/classpath/lib/java/awt/event/MouseMotionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/MouseWheelEvent.class b/libjava/classpath/lib/java/awt/event/MouseWheelEvent.class
deleted file mode 100644
index cdb4470a107..00000000000
--- a/libjava/classpath/lib/java/awt/event/MouseWheelEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/MouseWheelListener.class b/libjava/classpath/lib/java/awt/event/MouseWheelListener.class
deleted file mode 100644
index 27d4cb3709b..00000000000
--- a/libjava/classpath/lib/java/awt/event/MouseWheelListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/PaintEvent.class b/libjava/classpath/lib/java/awt/event/PaintEvent.class
deleted file mode 100644
index 138f249b430..00000000000
--- a/libjava/classpath/lib/java/awt/event/PaintEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/TextEvent.class b/libjava/classpath/lib/java/awt/event/TextEvent.class
deleted file mode 100644
index 5e7677909be..00000000000
--- a/libjava/classpath/lib/java/awt/event/TextEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/TextListener.class b/libjava/classpath/lib/java/awt/event/TextListener.class
deleted file mode 100644
index 023e38d7844..00000000000
--- a/libjava/classpath/lib/java/awt/event/TextListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/WindowAdapter.class b/libjava/classpath/lib/java/awt/event/WindowAdapter.class
deleted file mode 100644
index 17f1d762d05..00000000000
--- a/libjava/classpath/lib/java/awt/event/WindowAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/WindowEvent.class b/libjava/classpath/lib/java/awt/event/WindowEvent.class
deleted file mode 100644
index 38aa1d64017..00000000000
--- a/libjava/classpath/lib/java/awt/event/WindowEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/WindowFocusListener.class b/libjava/classpath/lib/java/awt/event/WindowFocusListener.class
deleted file mode 100644
index a6b51f9a4f2..00000000000
--- a/libjava/classpath/lib/java/awt/event/WindowFocusListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/WindowListener.class b/libjava/classpath/lib/java/awt/event/WindowListener.class
deleted file mode 100644
index 81a4d4f9770..00000000000
--- a/libjava/classpath/lib/java/awt/event/WindowListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/event/WindowStateListener.class b/libjava/classpath/lib/java/awt/event/WindowStateListener.class
deleted file mode 100644
index fbb7cd2140c..00000000000
--- a/libjava/classpath/lib/java/awt/event/WindowStateListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/FontRenderContext.class b/libjava/classpath/lib/java/awt/font/FontRenderContext.class
deleted file mode 100644
index 2a70ec44ce5..00000000000
--- a/libjava/classpath/lib/java/awt/font/FontRenderContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/GlyphJustificationInfo.class b/libjava/classpath/lib/java/awt/font/GlyphJustificationInfo.class
deleted file mode 100644
index ce4951e58ae..00000000000
--- a/libjava/classpath/lib/java/awt/font/GlyphJustificationInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/GlyphMetrics.class b/libjava/classpath/lib/java/awt/font/GlyphMetrics.class
deleted file mode 100644
index 689b1c0860d..00000000000
--- a/libjava/classpath/lib/java/awt/font/GlyphMetrics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/GlyphVector.class b/libjava/classpath/lib/java/awt/font/GlyphVector.class
deleted file mode 100644
index 37dffe624d9..00000000000
--- a/libjava/classpath/lib/java/awt/font/GlyphVector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/GraphicAttribute.class b/libjava/classpath/lib/java/awt/font/GraphicAttribute.class
deleted file mode 100644
index 579a766da43..00000000000
--- a/libjava/classpath/lib/java/awt/font/GraphicAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/ImageGraphicAttribute.class b/libjava/classpath/lib/java/awt/font/ImageGraphicAttribute.class
deleted file mode 100644
index 97af1d64bed..00000000000
--- a/libjava/classpath/lib/java/awt/font/ImageGraphicAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/LineBreakMeasurer.class b/libjava/classpath/lib/java/awt/font/LineBreakMeasurer.class
deleted file mode 100644
index 5219b788e38..00000000000
--- a/libjava/classpath/lib/java/awt/font/LineBreakMeasurer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/LineMetrics.class b/libjava/classpath/lib/java/awt/font/LineMetrics.class
deleted file mode 100644
index 750960e9e17..00000000000
--- a/libjava/classpath/lib/java/awt/font/LineMetrics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/MultipleMaster.class b/libjava/classpath/lib/java/awt/font/MultipleMaster.class
deleted file mode 100644
index e64ad0c2398..00000000000
--- a/libjava/classpath/lib/java/awt/font/MultipleMaster.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/NumericShaper.class b/libjava/classpath/lib/java/awt/font/NumericShaper.class
deleted file mode 100644
index 01bbc22fac6..00000000000
--- a/libjava/classpath/lib/java/awt/font/NumericShaper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/OpenType.class b/libjava/classpath/lib/java/awt/font/OpenType.class
deleted file mode 100644
index a751f1d9780..00000000000
--- a/libjava/classpath/lib/java/awt/font/OpenType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/ShapeGraphicAttribute.class b/libjava/classpath/lib/java/awt/font/ShapeGraphicAttribute.class
deleted file mode 100644
index 9442a7479e0..00000000000
--- a/libjava/classpath/lib/java/awt/font/ShapeGraphicAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/TextAttribute.class b/libjava/classpath/lib/java/awt/font/TextAttribute.class
deleted file mode 100644
index ec4a9d2873e..00000000000
--- a/libjava/classpath/lib/java/awt/font/TextAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/TextHitInfo.class b/libjava/classpath/lib/java/awt/font/TextHitInfo.class
deleted file mode 100644
index cb1f3139ce3..00000000000
--- a/libjava/classpath/lib/java/awt/font/TextHitInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/TextLayout$CaretPolicy.class b/libjava/classpath/lib/java/awt/font/TextLayout$CaretPolicy.class
deleted file mode 100644
index 5b4117e5c89..00000000000
--- a/libjava/classpath/lib/java/awt/font/TextLayout$CaretPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/TextLayout$Run.class b/libjava/classpath/lib/java/awt/font/TextLayout$Run.class
deleted file mode 100644
index 09bb71dc8b9..00000000000
--- a/libjava/classpath/lib/java/awt/font/TextLayout$Run.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/TextLayout.class b/libjava/classpath/lib/java/awt/font/TextLayout.class
deleted file mode 100644
index bea832a12be..00000000000
--- a/libjava/classpath/lib/java/awt/font/TextLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/TextMeasurer.class b/libjava/classpath/lib/java/awt/font/TextMeasurer.class
deleted file mode 100644
index dbbb2a3ad7f..00000000000
--- a/libjava/classpath/lib/java/awt/font/TextMeasurer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/font/TransformAttribute.class b/libjava/classpath/lib/java/awt/font/TransformAttribute.class
deleted file mode 100644
index d52f7a2503f..00000000000
--- a/libjava/classpath/lib/java/awt/font/TransformAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/AffineTransform.class b/libjava/classpath/lib/java/awt/geom/AffineTransform.class
deleted file mode 100644
index 2da59944d37..00000000000
--- a/libjava/classpath/lib/java/awt/geom/AffineTransform.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Arc2D$ArcIterator.class b/libjava/classpath/lib/java/awt/geom/Arc2D$ArcIterator.class
deleted file mode 100644
index e1e4a4f5cd3..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Arc2D$ArcIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Arc2D$Double.class b/libjava/classpath/lib/java/awt/geom/Arc2D$Double.class
deleted file mode 100644
index 3777bf17659..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Arc2D$Double.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Arc2D$Float.class b/libjava/classpath/lib/java/awt/geom/Arc2D$Float.class
deleted file mode 100644
index 74359a783b0..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Arc2D$Float.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Arc2D.class b/libjava/classpath/lib/java/awt/geom/Arc2D.class
deleted file mode 100644
index ff01a0961fc..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Arc2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Area$AreaIterator$IteratorSegment.class b/libjava/classpath/lib/java/awt/geom/Area$AreaIterator$IteratorSegment.class
deleted file mode 100644
index fc1e1f6c58b..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Area$AreaIterator$IteratorSegment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Area$AreaIterator.class b/libjava/classpath/lib/java/awt/geom/Area$AreaIterator.class
deleted file mode 100644
index c0510c73e35..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Area$AreaIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Area$CubicSegment.class b/libjava/classpath/lib/java/awt/geom/Area$CubicSegment.class
deleted file mode 100644
index 8425f445b11..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Area$CubicSegment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Area$Intersection.class b/libjava/classpath/lib/java/awt/geom/Area$Intersection.class
deleted file mode 100644
index c9408392097..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Area$Intersection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Area$LineSegment.class b/libjava/classpath/lib/java/awt/geom/Area$LineSegment.class
deleted file mode 100644
index c770e64f49d..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Area$LineSegment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Area$QuadSegment.class b/libjava/classpath/lib/java/awt/geom/Area$QuadSegment.class
deleted file mode 100644
index f2f61d1eab7..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Area$QuadSegment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Area$Segment.class b/libjava/classpath/lib/java/awt/geom/Area$Segment.class
deleted file mode 100644
index b3a1e8b3226..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Area$Segment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Area.class b/libjava/classpath/lib/java/awt/geom/Area.class
deleted file mode 100644
index c8c40b48a16..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Area.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/CubicCurve2D$1.class b/libjava/classpath/lib/java/awt/geom/CubicCurve2D$1.class
deleted file mode 100644
index 3aedc6bc736..00000000000
--- a/libjava/classpath/lib/java/awt/geom/CubicCurve2D$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/CubicCurve2D$Double.class b/libjava/classpath/lib/java/awt/geom/CubicCurve2D$Double.class
deleted file mode 100644
index 503543bc8f8..00000000000
--- a/libjava/classpath/lib/java/awt/geom/CubicCurve2D$Double.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/CubicCurve2D$Float.class b/libjava/classpath/lib/java/awt/geom/CubicCurve2D$Float.class
deleted file mode 100644
index b185581c604..00000000000
--- a/libjava/classpath/lib/java/awt/geom/CubicCurve2D$Float.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/CubicCurve2D.class b/libjava/classpath/lib/java/awt/geom/CubicCurve2D.class
deleted file mode 100644
index 1557091b997..00000000000
--- a/libjava/classpath/lib/java/awt/geom/CubicCurve2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Dimension2D.class b/libjava/classpath/lib/java/awt/geom/Dimension2D.class
deleted file mode 100644
index 35af578c46b..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Dimension2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Ellipse2D$Double.class b/libjava/classpath/lib/java/awt/geom/Ellipse2D$Double.class
deleted file mode 100644
index b2e12a5700e..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Ellipse2D$Double.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Ellipse2D$Float.class b/libjava/classpath/lib/java/awt/geom/Ellipse2D$Float.class
deleted file mode 100644
index b6ce49b4730..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Ellipse2D$Float.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Ellipse2D.class b/libjava/classpath/lib/java/awt/geom/Ellipse2D.class
deleted file mode 100644
index 2a782332a32..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Ellipse2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/FlatteningPathIterator.class b/libjava/classpath/lib/java/awt/geom/FlatteningPathIterator.class
deleted file mode 100644
index 41ea2bcf972..00000000000
--- a/libjava/classpath/lib/java/awt/geom/FlatteningPathIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/GeneralPath$GeneralPathIterator.class b/libjava/classpath/lib/java/awt/geom/GeneralPath$GeneralPathIterator.class
deleted file mode 100644
index f71ffe500c4..00000000000
--- a/libjava/classpath/lib/java/awt/geom/GeneralPath$GeneralPathIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/GeneralPath.class b/libjava/classpath/lib/java/awt/geom/GeneralPath.class
deleted file mode 100644
index 995e5535784..00000000000
--- a/libjava/classpath/lib/java/awt/geom/GeneralPath.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/IllegalPathStateException.class b/libjava/classpath/lib/java/awt/geom/IllegalPathStateException.class
deleted file mode 100644
index ffac54a35da..00000000000
--- a/libjava/classpath/lib/java/awt/geom/IllegalPathStateException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Line2D$1.class b/libjava/classpath/lib/java/awt/geom/Line2D$1.class
deleted file mode 100644
index 876a78dc9f0..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Line2D$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Line2D$Double.class b/libjava/classpath/lib/java/awt/geom/Line2D$Double.class
deleted file mode 100644
index f1fdb8f2e3c..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Line2D$Double.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Line2D$Float.class b/libjava/classpath/lib/java/awt/geom/Line2D$Float.class
deleted file mode 100644
index a022ae480e4..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Line2D$Float.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Line2D.class b/libjava/classpath/lib/java/awt/geom/Line2D.class
deleted file mode 100644
index 5845bb5123b..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Line2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/NoninvertibleTransformException.class b/libjava/classpath/lib/java/awt/geom/NoninvertibleTransformException.class
deleted file mode 100644
index c4a8580c38b..00000000000
--- a/libjava/classpath/lib/java/awt/geom/NoninvertibleTransformException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/PathIterator.class b/libjava/classpath/lib/java/awt/geom/PathIterator.class
deleted file mode 100644
index 1abdb31e697..00000000000
--- a/libjava/classpath/lib/java/awt/geom/PathIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Point2D$Double.class b/libjava/classpath/lib/java/awt/geom/Point2D$Double.class
deleted file mode 100644
index 0e6019cdef9..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Point2D$Double.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Point2D$Float.class b/libjava/classpath/lib/java/awt/geom/Point2D$Float.class
deleted file mode 100644
index fbf7abc206a..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Point2D$Float.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Point2D.class b/libjava/classpath/lib/java/awt/geom/Point2D.class
deleted file mode 100644
index 7cc6b35b655..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Point2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/QuadCurve2D$1.class b/libjava/classpath/lib/java/awt/geom/QuadCurve2D$1.class
deleted file mode 100644
index 93ba86abba4..00000000000
--- a/libjava/classpath/lib/java/awt/geom/QuadCurve2D$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/QuadCurve2D$Double.class b/libjava/classpath/lib/java/awt/geom/QuadCurve2D$Double.class
deleted file mode 100644
index f0c92f7b436..00000000000
--- a/libjava/classpath/lib/java/awt/geom/QuadCurve2D$Double.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/QuadCurve2D$Float.class b/libjava/classpath/lib/java/awt/geom/QuadCurve2D$Float.class
deleted file mode 100644
index f6b42b06da5..00000000000
--- a/libjava/classpath/lib/java/awt/geom/QuadCurve2D$Float.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/QuadCurve2D.class b/libjava/classpath/lib/java/awt/geom/QuadCurve2D.class
deleted file mode 100644
index 8324a377fc6..00000000000
--- a/libjava/classpath/lib/java/awt/geom/QuadCurve2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Rectangle2D$1.class b/libjava/classpath/lib/java/awt/geom/Rectangle2D$1.class
deleted file mode 100644
index 4b38908f6a8..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Rectangle2D$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Rectangle2D$Double.class b/libjava/classpath/lib/java/awt/geom/Rectangle2D$Double.class
deleted file mode 100644
index ab68a5c690f..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Rectangle2D$Double.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Rectangle2D$Float.class b/libjava/classpath/lib/java/awt/geom/Rectangle2D$Float.class
deleted file mode 100644
index 3dc000fcd30..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Rectangle2D$Float.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/Rectangle2D.class b/libjava/classpath/lib/java/awt/geom/Rectangle2D.class
deleted file mode 100644
index 628b608ec10..00000000000
--- a/libjava/classpath/lib/java/awt/geom/Rectangle2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/RectangularShape.class b/libjava/classpath/lib/java/awt/geom/RectangularShape.class
deleted file mode 100644
index 69458e3d750..00000000000
--- a/libjava/classpath/lib/java/awt/geom/RectangularShape.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/RoundRectangle2D$1.class b/libjava/classpath/lib/java/awt/geom/RoundRectangle2D$1.class
deleted file mode 100644
index de604f003e8..00000000000
--- a/libjava/classpath/lib/java/awt/geom/RoundRectangle2D$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/RoundRectangle2D$Double.class b/libjava/classpath/lib/java/awt/geom/RoundRectangle2D$Double.class
deleted file mode 100644
index 4b3a3f46c2b..00000000000
--- a/libjava/classpath/lib/java/awt/geom/RoundRectangle2D$Double.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/RoundRectangle2D$Float.class b/libjava/classpath/lib/java/awt/geom/RoundRectangle2D$Float.class
deleted file mode 100644
index c8ab25a649e..00000000000
--- a/libjava/classpath/lib/java/awt/geom/RoundRectangle2D$Float.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/geom/RoundRectangle2D.class b/libjava/classpath/lib/java/awt/geom/RoundRectangle2D.class
deleted file mode 100644
index ff0e1fa28ee..00000000000
--- a/libjava/classpath/lib/java/awt/geom/RoundRectangle2D.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/im/InputContext.class b/libjava/classpath/lib/java/awt/im/InputContext.class
deleted file mode 100644
index 84acbd2666f..00000000000
--- a/libjava/classpath/lib/java/awt/im/InputContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/im/InputMethodHighlight.class b/libjava/classpath/lib/java/awt/im/InputMethodHighlight.class
deleted file mode 100644
index 603a3a0e87a..00000000000
--- a/libjava/classpath/lib/java/awt/im/InputMethodHighlight.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/im/InputMethodRequests.class b/libjava/classpath/lib/java/awt/im/InputMethodRequests.class
deleted file mode 100644
index 1e602d630ea..00000000000
--- a/libjava/classpath/lib/java/awt/im/InputMethodRequests.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/im/InputSubset.class b/libjava/classpath/lib/java/awt/im/InputSubset.class
deleted file mode 100644
index ad26f37192a..00000000000
--- a/libjava/classpath/lib/java/awt/im/InputSubset.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/im/spi/InputMethod.class b/libjava/classpath/lib/java/awt/im/spi/InputMethod.class
deleted file mode 100644
index 9f74de82a61..00000000000
--- a/libjava/classpath/lib/java/awt/im/spi/InputMethod.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/im/spi/InputMethodContext.class b/libjava/classpath/lib/java/awt/im/spi/InputMethodContext.class
deleted file mode 100644
index c9c622c58ca..00000000000
--- a/libjava/classpath/lib/java/awt/im/spi/InputMethodContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/im/spi/InputMethodDescriptor.class b/libjava/classpath/lib/java/awt/im/spi/InputMethodDescriptor.class
deleted file mode 100644
index 4d3ef9ca9fe..00000000000
--- a/libjava/classpath/lib/java/awt/im/spi/InputMethodDescriptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/AffineTransformOp.class b/libjava/classpath/lib/java/awt/image/AffineTransformOp.class
deleted file mode 100644
index bc2eefe9293..00000000000
--- a/libjava/classpath/lib/java/awt/image/AffineTransformOp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/AreaAveragingScaleFilter.class b/libjava/classpath/lib/java/awt/image/AreaAveragingScaleFilter.class
deleted file mode 100644
index 6fa585e6c09..00000000000
--- a/libjava/classpath/lib/java/awt/image/AreaAveragingScaleFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/BandCombineOp.class b/libjava/classpath/lib/java/awt/image/BandCombineOp.class
deleted file mode 100644
index e56e395ca40..00000000000
--- a/libjava/classpath/lib/java/awt/image/BandCombineOp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/BandedSampleModel.class b/libjava/classpath/lib/java/awt/image/BandedSampleModel.class
deleted file mode 100644
index 534e15f266f..00000000000
--- a/libjava/classpath/lib/java/awt/image/BandedSampleModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/BufferStrategy.class b/libjava/classpath/lib/java/awt/image/BufferStrategy.class
deleted file mode 100644
index 117080e7058..00000000000
--- a/libjava/classpath/lib/java/awt/image/BufferStrategy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/BufferedImage$1.class b/libjava/classpath/lib/java/awt/image/BufferedImage$1.class
deleted file mode 100644
index 75e331ef818..00000000000
--- a/libjava/classpath/lib/java/awt/image/BufferedImage$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/BufferedImage.class b/libjava/classpath/lib/java/awt/image/BufferedImage.class
deleted file mode 100644
index c1156b6a6f3..00000000000
--- a/libjava/classpath/lib/java/awt/image/BufferedImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/BufferedImageFilter.class b/libjava/classpath/lib/java/awt/image/BufferedImageFilter.class
deleted file mode 100644
index cb8d712f4c1..00000000000
--- a/libjava/classpath/lib/java/awt/image/BufferedImageFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/BufferedImageOp.class b/libjava/classpath/lib/java/awt/image/BufferedImageOp.class
deleted file mode 100644
index e33b1a0a5fb..00000000000
--- a/libjava/classpath/lib/java/awt/image/BufferedImageOp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ByteLookupTable.class b/libjava/classpath/lib/java/awt/image/ByteLookupTable.class
deleted file mode 100644
index 8fa3faabc00..00000000000
--- a/libjava/classpath/lib/java/awt/image/ByteLookupTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ColorConvertOp.class b/libjava/classpath/lib/java/awt/image/ColorConvertOp.class
deleted file mode 100644
index bc3fa08e914..00000000000
--- a/libjava/classpath/lib/java/awt/image/ColorConvertOp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ColorModel$SRGBColorModel.class b/libjava/classpath/lib/java/awt/image/ColorModel$SRGBColorModel.class
deleted file mode 100644
index b9a971b2d5f..00000000000
--- a/libjava/classpath/lib/java/awt/image/ColorModel$SRGBColorModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ColorModel.class b/libjava/classpath/lib/java/awt/image/ColorModel.class
deleted file mode 100644
index 5806aabe368..00000000000
--- a/libjava/classpath/lib/java/awt/image/ColorModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ComponentColorModel.class b/libjava/classpath/lib/java/awt/image/ComponentColorModel.class
deleted file mode 100644
index e9be93f657e..00000000000
--- a/libjava/classpath/lib/java/awt/image/ComponentColorModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ComponentSampleModel.class b/libjava/classpath/lib/java/awt/image/ComponentSampleModel.class
deleted file mode 100644
index 74ba60a0881..00000000000
--- a/libjava/classpath/lib/java/awt/image/ComponentSampleModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ConvolveOp.class b/libjava/classpath/lib/java/awt/image/ConvolveOp.class
deleted file mode 100644
index f9b2ca14d7a..00000000000
--- a/libjava/classpath/lib/java/awt/image/ConvolveOp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/CropImageFilter.class b/libjava/classpath/lib/java/awt/image/CropImageFilter.class
deleted file mode 100644
index 0be58d674f7..00000000000
--- a/libjava/classpath/lib/java/awt/image/CropImageFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/DataBuffer.class b/libjava/classpath/lib/java/awt/image/DataBuffer.class
deleted file mode 100644
index 39af177d929..00000000000
--- a/libjava/classpath/lib/java/awt/image/DataBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/DataBufferByte.class b/libjava/classpath/lib/java/awt/image/DataBufferByte.class
deleted file mode 100644
index 6b411008cd2..00000000000
--- a/libjava/classpath/lib/java/awt/image/DataBufferByte.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/DataBufferDouble.class b/libjava/classpath/lib/java/awt/image/DataBufferDouble.class
deleted file mode 100644
index eb2bd40914f..00000000000
--- a/libjava/classpath/lib/java/awt/image/DataBufferDouble.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/DataBufferFloat.class b/libjava/classpath/lib/java/awt/image/DataBufferFloat.class
deleted file mode 100644
index 842678d17b2..00000000000
--- a/libjava/classpath/lib/java/awt/image/DataBufferFloat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/DataBufferInt.class b/libjava/classpath/lib/java/awt/image/DataBufferInt.class
deleted file mode 100644
index 7aacea6dc56..00000000000
--- a/libjava/classpath/lib/java/awt/image/DataBufferInt.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/DataBufferShort.class b/libjava/classpath/lib/java/awt/image/DataBufferShort.class
deleted file mode 100644
index 0b126b07722..00000000000
--- a/libjava/classpath/lib/java/awt/image/DataBufferShort.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/DataBufferUShort.class b/libjava/classpath/lib/java/awt/image/DataBufferUShort.class
deleted file mode 100644
index addb229f8cc..00000000000
--- a/libjava/classpath/lib/java/awt/image/DataBufferUShort.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/DirectColorModel.class b/libjava/classpath/lib/java/awt/image/DirectColorModel.class
deleted file mode 100644
index a149ac63135..00000000000
--- a/libjava/classpath/lib/java/awt/image/DirectColorModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/FilteredImageSource.class b/libjava/classpath/lib/java/awt/image/FilteredImageSource.class
deleted file mode 100644
index 8c9705655d5..00000000000
--- a/libjava/classpath/lib/java/awt/image/FilteredImageSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ImageConsumer.class b/libjava/classpath/lib/java/awt/image/ImageConsumer.class
deleted file mode 100644
index 4ee56a733d6..00000000000
--- a/libjava/classpath/lib/java/awt/image/ImageConsumer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ImageFilter.class b/libjava/classpath/lib/java/awt/image/ImageFilter.class
deleted file mode 100644
index b9f4a2d15ef..00000000000
--- a/libjava/classpath/lib/java/awt/image/ImageFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ImageObserver.class b/libjava/classpath/lib/java/awt/image/ImageObserver.class
deleted file mode 100644
index 22427c22106..00000000000
--- a/libjava/classpath/lib/java/awt/image/ImageObserver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ImageProducer.class b/libjava/classpath/lib/java/awt/image/ImageProducer.class
deleted file mode 100644
index b7582dfa237..00000000000
--- a/libjava/classpath/lib/java/awt/image/ImageProducer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ImagingOpException.class b/libjava/classpath/lib/java/awt/image/ImagingOpException.class
deleted file mode 100644
index a45bd1cbdfa..00000000000
--- a/libjava/classpath/lib/java/awt/image/ImagingOpException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/IndexColorModel.class b/libjava/classpath/lib/java/awt/image/IndexColorModel.class
deleted file mode 100644
index c8f917f7d59..00000000000
--- a/libjava/classpath/lib/java/awt/image/IndexColorModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/Kernel.class b/libjava/classpath/lib/java/awt/image/Kernel.class
deleted file mode 100644
index b5d70f5df00..00000000000
--- a/libjava/classpath/lib/java/awt/image/Kernel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/LookupOp.class b/libjava/classpath/lib/java/awt/image/LookupOp.class
deleted file mode 100644
index 657be12c04a..00000000000
--- a/libjava/classpath/lib/java/awt/image/LookupOp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/LookupTable.class b/libjava/classpath/lib/java/awt/image/LookupTable.class
deleted file mode 100644
index af0e68f0a75..00000000000
--- a/libjava/classpath/lib/java/awt/image/LookupTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/MemoryImageSource.class b/libjava/classpath/lib/java/awt/image/MemoryImageSource.class
deleted file mode 100644
index 25ab31a45ef..00000000000
--- a/libjava/classpath/lib/java/awt/image/MemoryImageSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/MultiPixelPackedSampleModel.class b/libjava/classpath/lib/java/awt/image/MultiPixelPackedSampleModel.class
deleted file mode 100644
index 9fae4aba855..00000000000
--- a/libjava/classpath/lib/java/awt/image/MultiPixelPackedSampleModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/PackedColorModel.class b/libjava/classpath/lib/java/awt/image/PackedColorModel.class
deleted file mode 100644
index 0d90ac3c427..00000000000
--- a/libjava/classpath/lib/java/awt/image/PackedColorModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/PixelGrabber$1.class b/libjava/classpath/lib/java/awt/image/PixelGrabber$1.class
deleted file mode 100644
index f12bf8d2c5c..00000000000
--- a/libjava/classpath/lib/java/awt/image/PixelGrabber$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/PixelGrabber.class b/libjava/classpath/lib/java/awt/image/PixelGrabber.class
deleted file mode 100644
index b4797bd79fa..00000000000
--- a/libjava/classpath/lib/java/awt/image/PixelGrabber.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/PixelInterleavedSampleModel.class b/libjava/classpath/lib/java/awt/image/PixelInterleavedSampleModel.class
deleted file mode 100644
index 9f456ec8235..00000000000
--- a/libjava/classpath/lib/java/awt/image/PixelInterleavedSampleModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/RGBImageFilter.class b/libjava/classpath/lib/java/awt/image/RGBImageFilter.class
deleted file mode 100644
index c0573de77c7..00000000000
--- a/libjava/classpath/lib/java/awt/image/RGBImageFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/Raster.class b/libjava/classpath/lib/java/awt/image/Raster.class
deleted file mode 100644
index 054d9b364a6..00000000000
--- a/libjava/classpath/lib/java/awt/image/Raster.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/RasterFormatException.class b/libjava/classpath/lib/java/awt/image/RasterFormatException.class
deleted file mode 100644
index 2f76b3e50f2..00000000000
--- a/libjava/classpath/lib/java/awt/image/RasterFormatException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/RasterOp.class b/libjava/classpath/lib/java/awt/image/RasterOp.class
deleted file mode 100644
index 201a7803b05..00000000000
--- a/libjava/classpath/lib/java/awt/image/RasterOp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/RenderedImage.class b/libjava/classpath/lib/java/awt/image/RenderedImage.class
deleted file mode 100644
index de5e3efd00c..00000000000
--- a/libjava/classpath/lib/java/awt/image/RenderedImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ReplicateScaleFilter.class b/libjava/classpath/lib/java/awt/image/ReplicateScaleFilter.class
deleted file mode 100644
index a6aa9917a25..00000000000
--- a/libjava/classpath/lib/java/awt/image/ReplicateScaleFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/RescaleOp.class b/libjava/classpath/lib/java/awt/image/RescaleOp.class
deleted file mode 100644
index 5e96dfbbbbd..00000000000
--- a/libjava/classpath/lib/java/awt/image/RescaleOp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/SampleModel.class b/libjava/classpath/lib/java/awt/image/SampleModel.class
deleted file mode 100644
index fdb7ab3dcfc..00000000000
--- a/libjava/classpath/lib/java/awt/image/SampleModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/ShortLookupTable.class b/libjava/classpath/lib/java/awt/image/ShortLookupTable.class
deleted file mode 100644
index 6011a335556..00000000000
--- a/libjava/classpath/lib/java/awt/image/ShortLookupTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/SinglePixelPackedSampleModel.class b/libjava/classpath/lib/java/awt/image/SinglePixelPackedSampleModel.class
deleted file mode 100644
index 52564fc4bf3..00000000000
--- a/libjava/classpath/lib/java/awt/image/SinglePixelPackedSampleModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/TileObserver.class b/libjava/classpath/lib/java/awt/image/TileObserver.class
deleted file mode 100644
index 9aa292ab8af..00000000000
--- a/libjava/classpath/lib/java/awt/image/TileObserver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/VolatileImage.class b/libjava/classpath/lib/java/awt/image/VolatileImage.class
deleted file mode 100644
index 5cf77025e95..00000000000
--- a/libjava/classpath/lib/java/awt/image/VolatileImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/WritableRaster.class b/libjava/classpath/lib/java/awt/image/WritableRaster.class
deleted file mode 100644
index d80cfee662c..00000000000
--- a/libjava/classpath/lib/java/awt/image/WritableRaster.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/WritableRenderedImage.class b/libjava/classpath/lib/java/awt/image/WritableRenderedImage.class
deleted file mode 100644
index a28e08dbdb8..00000000000
--- a/libjava/classpath/lib/java/awt/image/WritableRenderedImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/renderable/ContextualRenderedImageFactory.class b/libjava/classpath/lib/java/awt/image/renderable/ContextualRenderedImageFactory.class
deleted file mode 100644
index acdf0cfec06..00000000000
--- a/libjava/classpath/lib/java/awt/image/renderable/ContextualRenderedImageFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/renderable/ParameterBlock.class b/libjava/classpath/lib/java/awt/image/renderable/ParameterBlock.class
deleted file mode 100644
index 1b3573b9d50..00000000000
--- a/libjava/classpath/lib/java/awt/image/renderable/ParameterBlock.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/renderable/RenderContext.class b/libjava/classpath/lib/java/awt/image/renderable/RenderContext.class
deleted file mode 100644
index 4a42f233081..00000000000
--- a/libjava/classpath/lib/java/awt/image/renderable/RenderContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/renderable/RenderableImage.class b/libjava/classpath/lib/java/awt/image/renderable/RenderableImage.class
deleted file mode 100644
index 13e554c7a4a..00000000000
--- a/libjava/classpath/lib/java/awt/image/renderable/RenderableImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/renderable/RenderableImageOp.class b/libjava/classpath/lib/java/awt/image/renderable/RenderableImageOp.class
deleted file mode 100644
index 2a7aedb5af2..00000000000
--- a/libjava/classpath/lib/java/awt/image/renderable/RenderableImageOp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/renderable/RenderableImageProducer.class b/libjava/classpath/lib/java/awt/image/renderable/RenderableImageProducer.class
deleted file mode 100644
index 339f8a429ea..00000000000
--- a/libjava/classpath/lib/java/awt/image/renderable/RenderableImageProducer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/image/renderable/RenderedImageFactory.class b/libjava/classpath/lib/java/awt/image/renderable/RenderedImageFactory.class
deleted file mode 100644
index 5b6801ab411..00000000000
--- a/libjava/classpath/lib/java/awt/image/renderable/RenderedImageFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/ButtonPeer.class b/libjava/classpath/lib/java/awt/peer/ButtonPeer.class
deleted file mode 100644
index f0581ea3602..00000000000
--- a/libjava/classpath/lib/java/awt/peer/ButtonPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/CanvasPeer.class b/libjava/classpath/lib/java/awt/peer/CanvasPeer.class
deleted file mode 100644
index 0785476928c..00000000000
--- a/libjava/classpath/lib/java/awt/peer/CanvasPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/CheckboxMenuItemPeer.class b/libjava/classpath/lib/java/awt/peer/CheckboxMenuItemPeer.class
deleted file mode 100644
index 880dfbd17c2..00000000000
--- a/libjava/classpath/lib/java/awt/peer/CheckboxMenuItemPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/CheckboxPeer.class b/libjava/classpath/lib/java/awt/peer/CheckboxPeer.class
deleted file mode 100644
index 843fe79980f..00000000000
--- a/libjava/classpath/lib/java/awt/peer/CheckboxPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/ChoicePeer.class b/libjava/classpath/lib/java/awt/peer/ChoicePeer.class
deleted file mode 100644
index d496c1f2c69..00000000000
--- a/libjava/classpath/lib/java/awt/peer/ChoicePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/ComponentPeer.class b/libjava/classpath/lib/java/awt/peer/ComponentPeer.class
deleted file mode 100644
index 37cd47ca2c1..00000000000
--- a/libjava/classpath/lib/java/awt/peer/ComponentPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/ContainerPeer.class b/libjava/classpath/lib/java/awt/peer/ContainerPeer.class
deleted file mode 100644
index 97e8f987584..00000000000
--- a/libjava/classpath/lib/java/awt/peer/ContainerPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/DialogPeer.class b/libjava/classpath/lib/java/awt/peer/DialogPeer.class
deleted file mode 100644
index 39d9887e8f4..00000000000
--- a/libjava/classpath/lib/java/awt/peer/DialogPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/FileDialogPeer.class b/libjava/classpath/lib/java/awt/peer/FileDialogPeer.class
deleted file mode 100644
index 502ef7da034..00000000000
--- a/libjava/classpath/lib/java/awt/peer/FileDialogPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/FontPeer.class b/libjava/classpath/lib/java/awt/peer/FontPeer.class
deleted file mode 100644
index 74f5d9ae7b7..00000000000
--- a/libjava/classpath/lib/java/awt/peer/FontPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/FramePeer.class b/libjava/classpath/lib/java/awt/peer/FramePeer.class
deleted file mode 100644
index b8bc7585d5f..00000000000
--- a/libjava/classpath/lib/java/awt/peer/FramePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/LabelPeer.class b/libjava/classpath/lib/java/awt/peer/LabelPeer.class
deleted file mode 100644
index dab684df922..00000000000
--- a/libjava/classpath/lib/java/awt/peer/LabelPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/LightweightPeer.class b/libjava/classpath/lib/java/awt/peer/LightweightPeer.class
deleted file mode 100644
index 37a38244d9c..00000000000
--- a/libjava/classpath/lib/java/awt/peer/LightweightPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/ListPeer.class b/libjava/classpath/lib/java/awt/peer/ListPeer.class
deleted file mode 100644
index 817a2c2e8a8..00000000000
--- a/libjava/classpath/lib/java/awt/peer/ListPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/MenuBarPeer.class b/libjava/classpath/lib/java/awt/peer/MenuBarPeer.class
deleted file mode 100644
index d1563ab3ee3..00000000000
--- a/libjava/classpath/lib/java/awt/peer/MenuBarPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/MenuComponentPeer.class b/libjava/classpath/lib/java/awt/peer/MenuComponentPeer.class
deleted file mode 100644
index 07de124cadf..00000000000
--- a/libjava/classpath/lib/java/awt/peer/MenuComponentPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/MenuItemPeer.class b/libjava/classpath/lib/java/awt/peer/MenuItemPeer.class
deleted file mode 100644
index 682201777ad..00000000000
--- a/libjava/classpath/lib/java/awt/peer/MenuItemPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/MenuPeer.class b/libjava/classpath/lib/java/awt/peer/MenuPeer.class
deleted file mode 100644
index 6ac26847645..00000000000
--- a/libjava/classpath/lib/java/awt/peer/MenuPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/MouseInfoPeer.class b/libjava/classpath/lib/java/awt/peer/MouseInfoPeer.class
deleted file mode 100644
index a02bdce47e3..00000000000
--- a/libjava/classpath/lib/java/awt/peer/MouseInfoPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/PanelPeer.class b/libjava/classpath/lib/java/awt/peer/PanelPeer.class
deleted file mode 100644
index f24f5edf90f..00000000000
--- a/libjava/classpath/lib/java/awt/peer/PanelPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/PopupMenuPeer.class b/libjava/classpath/lib/java/awt/peer/PopupMenuPeer.class
deleted file mode 100644
index d71742ec1e0..00000000000
--- a/libjava/classpath/lib/java/awt/peer/PopupMenuPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/RobotPeer.class b/libjava/classpath/lib/java/awt/peer/RobotPeer.class
deleted file mode 100644
index 983c6d5114f..00000000000
--- a/libjava/classpath/lib/java/awt/peer/RobotPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/ScrollPanePeer.class b/libjava/classpath/lib/java/awt/peer/ScrollPanePeer.class
deleted file mode 100644
index 2870529851d..00000000000
--- a/libjava/classpath/lib/java/awt/peer/ScrollPanePeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/ScrollbarPeer.class b/libjava/classpath/lib/java/awt/peer/ScrollbarPeer.class
deleted file mode 100644
index 19c5d229258..00000000000
--- a/libjava/classpath/lib/java/awt/peer/ScrollbarPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/TextAreaPeer.class b/libjava/classpath/lib/java/awt/peer/TextAreaPeer.class
deleted file mode 100644
index 485b54ac88c..00000000000
--- a/libjava/classpath/lib/java/awt/peer/TextAreaPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/TextComponentPeer.class b/libjava/classpath/lib/java/awt/peer/TextComponentPeer.class
deleted file mode 100644
index d854876cc17..00000000000
--- a/libjava/classpath/lib/java/awt/peer/TextComponentPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/TextFieldPeer.class b/libjava/classpath/lib/java/awt/peer/TextFieldPeer.class
deleted file mode 100644
index ec17b2acddf..00000000000
--- a/libjava/classpath/lib/java/awt/peer/TextFieldPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/peer/WindowPeer.class b/libjava/classpath/lib/java/awt/peer/WindowPeer.class
deleted file mode 100644
index 09f9d3415e5..00000000000
--- a/libjava/classpath/lib/java/awt/peer/WindowPeer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/Book.class b/libjava/classpath/lib/java/awt/print/Book.class
deleted file mode 100644
index 10d8748d051..00000000000
--- a/libjava/classpath/lib/java/awt/print/Book.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/NoPrinterJob.class b/libjava/classpath/lib/java/awt/print/NoPrinterJob.class
deleted file mode 100644
index fc2123bc36f..00000000000
--- a/libjava/classpath/lib/java/awt/print/NoPrinterJob.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/PageFormat.class b/libjava/classpath/lib/java/awt/print/PageFormat.class
deleted file mode 100644
index ce914954afc..00000000000
--- a/libjava/classpath/lib/java/awt/print/PageFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/Pageable.class b/libjava/classpath/lib/java/awt/print/Pageable.class
deleted file mode 100644
index 40beda57f41..00000000000
--- a/libjava/classpath/lib/java/awt/print/Pageable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/Paper.class b/libjava/classpath/lib/java/awt/print/Paper.class
deleted file mode 100644
index e52514093c9..00000000000
--- a/libjava/classpath/lib/java/awt/print/Paper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/Printable.class b/libjava/classpath/lib/java/awt/print/Printable.class
deleted file mode 100644
index a9b56af9d97..00000000000
--- a/libjava/classpath/lib/java/awt/print/Printable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/PrinterAbortException.class b/libjava/classpath/lib/java/awt/print/PrinterAbortException.class
deleted file mode 100644
index 06d7d59cf1a..00000000000
--- a/libjava/classpath/lib/java/awt/print/PrinterAbortException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/PrinterException.class b/libjava/classpath/lib/java/awt/print/PrinterException.class
deleted file mode 100644
index 909c44b1486..00000000000
--- a/libjava/classpath/lib/java/awt/print/PrinterException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/PrinterGraphics.class b/libjava/classpath/lib/java/awt/print/PrinterGraphics.class
deleted file mode 100644
index 86b6950f535..00000000000
--- a/libjava/classpath/lib/java/awt/print/PrinterGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/PrinterIOException.class b/libjava/classpath/lib/java/awt/print/PrinterIOException.class
deleted file mode 100644
index 27b6f35ab3a..00000000000
--- a/libjava/classpath/lib/java/awt/print/PrinterIOException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/awt/print/PrinterJob.class b/libjava/classpath/lib/java/awt/print/PrinterJob.class
deleted file mode 100644
index 2f31fd57da9..00000000000
--- a/libjava/classpath/lib/java/awt/print/PrinterJob.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/AppletInitializer.class b/libjava/classpath/lib/java/beans/AppletInitializer.class
deleted file mode 100644
index e0b3ba42299..00000000000
--- a/libjava/classpath/lib/java/beans/AppletInitializer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/BeanDescriptor.class b/libjava/classpath/lib/java/beans/BeanDescriptor.class
deleted file mode 100644
index b95fda619ff..00000000000
--- a/libjava/classpath/lib/java/beans/BeanDescriptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/BeanInfo.class b/libjava/classpath/lib/java/beans/BeanInfo.class
deleted file mode 100644
index 53408ca1fc8..00000000000
--- a/libjava/classpath/lib/java/beans/BeanInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/Beans.class b/libjava/classpath/lib/java/beans/Beans.class
deleted file mode 100644
index 76fe24c89f8..00000000000
--- a/libjava/classpath/lib/java/beans/Beans.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/Customizer.class b/libjava/classpath/lib/java/beans/Customizer.class
deleted file mode 100644
index 4c550c7a349..00000000000
--- a/libjava/classpath/lib/java/beans/Customizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/DefaultPersistenceDelegate.class b/libjava/classpath/lib/java/beans/DefaultPersistenceDelegate.class
deleted file mode 100644
index 6c13217644f..00000000000
--- a/libjava/classpath/lib/java/beans/DefaultPersistenceDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/DesignMode.class b/libjava/classpath/lib/java/beans/DesignMode.class
deleted file mode 100644
index 70c1d8367c3..00000000000
--- a/libjava/classpath/lib/java/beans/DesignMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/Encoder$1.class b/libjava/classpath/lib/java/beans/Encoder$1.class
deleted file mode 100644
index 6bb7946d625..00000000000
--- a/libjava/classpath/lib/java/beans/Encoder$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/Encoder.class b/libjava/classpath/lib/java/beans/Encoder.class
deleted file mode 100644
index 69a258f6dca..00000000000
--- a/libjava/classpath/lib/java/beans/Encoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/EventHandler.class b/libjava/classpath/lib/java/beans/EventHandler.class
deleted file mode 100644
index 9e0c30b914a..00000000000
--- a/libjava/classpath/lib/java/beans/EventHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/EventSetDescriptor.class b/libjava/classpath/lib/java/beans/EventSetDescriptor.class
deleted file mode 100644
index 0241e553141..00000000000
--- a/libjava/classpath/lib/java/beans/EventSetDescriptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/ExceptionListener.class b/libjava/classpath/lib/java/beans/ExceptionListener.class
deleted file mode 100644
index 897171e5a5f..00000000000
--- a/libjava/classpath/lib/java/beans/ExceptionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/ExplicitInfo.class b/libjava/classpath/lib/java/beans/ExplicitInfo.class
deleted file mode 100644
index 857e0c33ebc..00000000000
--- a/libjava/classpath/lib/java/beans/ExplicitInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/Expression.class b/libjava/classpath/lib/java/beans/Expression.class
deleted file mode 100644
index d7082903c9a..00000000000
--- a/libjava/classpath/lib/java/beans/Expression.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/FeatureDescriptor.class b/libjava/classpath/lib/java/beans/FeatureDescriptor.class
deleted file mode 100644
index 4b3480160e5..00000000000
--- a/libjava/classpath/lib/java/beans/FeatureDescriptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/IndexedPropertyChangeEvent.class b/libjava/classpath/lib/java/beans/IndexedPropertyChangeEvent.class
deleted file mode 100644
index 25748f37c9b..00000000000
--- a/libjava/classpath/lib/java/beans/IndexedPropertyChangeEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/IndexedPropertyDescriptor.class b/libjava/classpath/lib/java/beans/IndexedPropertyDescriptor.class
deleted file mode 100644
index b15f18c0703..00000000000
--- a/libjava/classpath/lib/java/beans/IndexedPropertyDescriptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/IntrospectionException.class b/libjava/classpath/lib/java/beans/IntrospectionException.class
deleted file mode 100644
index 1ce546d321e..00000000000
--- a/libjava/classpath/lib/java/beans/IntrospectionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/Introspector.class b/libjava/classpath/lib/java/beans/Introspector.class
deleted file mode 100644
index f6f290801ef..00000000000
--- a/libjava/classpath/lib/java/beans/Introspector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/MethodDescriptor.class b/libjava/classpath/lib/java/beans/MethodDescriptor.class
deleted file mode 100644
index e19b45f677e..00000000000
--- a/libjava/classpath/lib/java/beans/MethodDescriptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/ParameterDescriptor.class b/libjava/classpath/lib/java/beans/ParameterDescriptor.class
deleted file mode 100644
index 061e648e615..00000000000
--- a/libjava/classpath/lib/java/beans/ParameterDescriptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/PersistenceDelegate.class b/libjava/classpath/lib/java/beans/PersistenceDelegate.class
deleted file mode 100644
index 7612ea187f5..00000000000
--- a/libjava/classpath/lib/java/beans/PersistenceDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/PropertyChangeEvent.class b/libjava/classpath/lib/java/beans/PropertyChangeEvent.class
deleted file mode 100644
index 405ba52f7a1..00000000000
--- a/libjava/classpath/lib/java/beans/PropertyChangeEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/PropertyChangeListener.class b/libjava/classpath/lib/java/beans/PropertyChangeListener.class
deleted file mode 100644
index 336de4a3a73..00000000000
--- a/libjava/classpath/lib/java/beans/PropertyChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/PropertyChangeListenerProxy.class b/libjava/classpath/lib/java/beans/PropertyChangeListenerProxy.class
deleted file mode 100644
index 6e9a0527abe..00000000000
--- a/libjava/classpath/lib/java/beans/PropertyChangeListenerProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/PropertyChangeSupport.class b/libjava/classpath/lib/java/beans/PropertyChangeSupport.class
deleted file mode 100644
index 030b81a208b..00000000000
--- a/libjava/classpath/lib/java/beans/PropertyChangeSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/PropertyDescriptor.class b/libjava/classpath/lib/java/beans/PropertyDescriptor.class
deleted file mode 100644
index c4197ca89fc..00000000000
--- a/libjava/classpath/lib/java/beans/PropertyDescriptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/PropertyEditor.class b/libjava/classpath/lib/java/beans/PropertyEditor.class
deleted file mode 100644
index d37a5823d91..00000000000
--- a/libjava/classpath/lib/java/beans/PropertyEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/PropertyEditorManager.class b/libjava/classpath/lib/java/beans/PropertyEditorManager.class
deleted file mode 100644
index 3f0aef15be7..00000000000
--- a/libjava/classpath/lib/java/beans/PropertyEditorManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/PropertyEditorSupport.class b/libjava/classpath/lib/java/beans/PropertyEditorSupport.class
deleted file mode 100644
index d0c495dd022..00000000000
--- a/libjava/classpath/lib/java/beans/PropertyEditorSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/PropertyVetoException.class b/libjava/classpath/lib/java/beans/PropertyVetoException.class
deleted file mode 100644
index 30a4aaaba16..00000000000
--- a/libjava/classpath/lib/java/beans/PropertyVetoException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/SimpleBeanInfo.class b/libjava/classpath/lib/java/beans/SimpleBeanInfo.class
deleted file mode 100644
index 496ecd600e3..00000000000
--- a/libjava/classpath/lib/java/beans/SimpleBeanInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/Statement.class b/libjava/classpath/lib/java/beans/Statement.class
deleted file mode 100644
index c9eddc2cb44..00000000000
--- a/libjava/classpath/lib/java/beans/Statement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/VetoableChangeListener.class b/libjava/classpath/lib/java/beans/VetoableChangeListener.class
deleted file mode 100644
index dbca45eea90..00000000000
--- a/libjava/classpath/lib/java/beans/VetoableChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/VetoableChangeListenerProxy.class b/libjava/classpath/lib/java/beans/VetoableChangeListenerProxy.class
deleted file mode 100644
index 63ed47f3b5a..00000000000
--- a/libjava/classpath/lib/java/beans/VetoableChangeListenerProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/VetoableChangeSupport.class b/libjava/classpath/lib/java/beans/VetoableChangeSupport.class
deleted file mode 100644
index bb27ac11e45..00000000000
--- a/libjava/classpath/lib/java/beans/VetoableChangeSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/Visibility.class b/libjava/classpath/lib/java/beans/Visibility.class
deleted file mode 100644
index 291bfc4b337..00000000000
--- a/libjava/classpath/lib/java/beans/Visibility.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/XMLDecoder.class b/libjava/classpath/lib/java/beans/XMLDecoder.class
deleted file mode 100644
index 813af311c12..00000000000
--- a/libjava/classpath/lib/java/beans/XMLDecoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/XMLEncoder.class b/libjava/classpath/lib/java/beans/XMLEncoder.class
deleted file mode 100644
index 3abe27c826a..00000000000
--- a/libjava/classpath/lib/java/beans/XMLEncoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContext.class b/libjava/classpath/lib/java/beans/beancontext/BeanContext.class
deleted file mode 100644
index d3d5710a14d..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextChild.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextChild.class
deleted file mode 100644
index f0b3ed8f92a..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextChild.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextChildComponentProxy.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextChildComponentProxy.class
deleted file mode 100644
index 4089781fef6..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextChildComponentProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextChildSupport.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextChildSupport.class
deleted file mode 100644
index c6698f86083..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextChildSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextContainerProxy.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextContainerProxy.class
deleted file mode 100644
index 5e3750bc4bc..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextContainerProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextEvent.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextEvent.class
deleted file mode 100644
index 390216ddf6d..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextMembershipEvent.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextMembershipEvent.class
deleted file mode 100644
index 631c0dac898..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextMembershipEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextMembershipListener.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextMembershipListener.class
deleted file mode 100644
index c6fa4fcec9f..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextMembershipListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextProxy.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextProxy.class
deleted file mode 100644
index 82deaafa8e3..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceAvailableEvent.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceAvailableEvent.class
deleted file mode 100644
index 9df6d17730a..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceAvailableEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceProvider.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceProvider.class
deleted file mode 100644
index 4b71ff33148..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceProviderBeanInfo.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceProviderBeanInfo.class
deleted file mode 100644
index df17989c2bf..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceProviderBeanInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceRevokedEvent.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceRevokedEvent.class
deleted file mode 100644
index 261e673437e..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceRevokedEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceRevokedListener.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceRevokedListener.class
deleted file mode 100644
index 417c562f778..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServiceRevokedListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServices.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServices.class
deleted file mode 100644
index 98a05f3e94c..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServices.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesListener.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesListener.class
deleted file mode 100644
index ca4a9a41a92..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$BCSSChild.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$BCSSChild.class
deleted file mode 100644
index e5f12c848fb..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$BCSSChild.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.class
deleted file mode 100644
index 53724e026a2..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider.class
deleted file mode 100644
index 4881c940616..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$Request.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$Request.class
deleted file mode 100644
index 6fef7beb1a7..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$Request.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$ServiceLease.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$ServiceLease.class
deleted file mode 100644
index 9daefd69259..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$ServiceLease.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$ServiceRequest.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$ServiceRequest.class
deleted file mode 100644
index 3a186951f74..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport$ServiceRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport.class
deleted file mode 100644
index 5d0f1b87602..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextServicesSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextSupport$BCSChild.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextSupport$BCSChild.class
deleted file mode 100644
index 85298ff70a4..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextSupport$BCSChild.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextSupport$BCSIterator.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextSupport$BCSIterator.class
deleted file mode 100644
index e976f883174..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextSupport$BCSIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/beans/beancontext/BeanContextSupport.class b/libjava/classpath/lib/java/beans/beancontext/BeanContextSupport.class
deleted file mode 100644
index 3b745035bd6..00000000000
--- a/libjava/classpath/lib/java/beans/beancontext/BeanContextSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/BufferedInputStream.class b/libjava/classpath/lib/java/io/BufferedInputStream.class
deleted file mode 100644
index ee9850be49e..00000000000
--- a/libjava/classpath/lib/java/io/BufferedInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/BufferedOutputStream.class b/libjava/classpath/lib/java/io/BufferedOutputStream.class
deleted file mode 100644
index d39a9d93d57..00000000000
--- a/libjava/classpath/lib/java/io/BufferedOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/BufferedReader.class b/libjava/classpath/lib/java/io/BufferedReader.class
deleted file mode 100644
index efe3c2caf90..00000000000
--- a/libjava/classpath/lib/java/io/BufferedReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/BufferedWriter.class b/libjava/classpath/lib/java/io/BufferedWriter.class
deleted file mode 100644
index 167054da892..00000000000
--- a/libjava/classpath/lib/java/io/BufferedWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ByteArrayInputStream.class b/libjava/classpath/lib/java/io/ByteArrayInputStream.class
deleted file mode 100644
index 637f2e2adf8..00000000000
--- a/libjava/classpath/lib/java/io/ByteArrayInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ByteArrayOutputStream.class b/libjava/classpath/lib/java/io/ByteArrayOutputStream.class
deleted file mode 100644
index 7f23a4b1262..00000000000
--- a/libjava/classpath/lib/java/io/ByteArrayOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/CharArrayReader.class b/libjava/classpath/lib/java/io/CharArrayReader.class
deleted file mode 100644
index e4fe697a35f..00000000000
--- a/libjava/classpath/lib/java/io/CharArrayReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/CharArrayWriter.class b/libjava/classpath/lib/java/io/CharArrayWriter.class
deleted file mode 100644
index b5d557c6d89..00000000000
--- a/libjava/classpath/lib/java/io/CharArrayWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/CharConversionException.class b/libjava/classpath/lib/java/io/CharConversionException.class
deleted file mode 100644
index 2c9b2e39397..00000000000
--- a/libjava/classpath/lib/java/io/CharConversionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/Closeable.class b/libjava/classpath/lib/java/io/Closeable.class
deleted file mode 100644
index e47f5e4dbbb..00000000000
--- a/libjava/classpath/lib/java/io/Closeable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/DataInput.class b/libjava/classpath/lib/java/io/DataInput.class
deleted file mode 100644
index 384a9febd30..00000000000
--- a/libjava/classpath/lib/java/io/DataInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/DataInputStream.class b/libjava/classpath/lib/java/io/DataInputStream.class
deleted file mode 100644
index 6730b4a9241..00000000000
--- a/libjava/classpath/lib/java/io/DataInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/DataOutput.class b/libjava/classpath/lib/java/io/DataOutput.class
deleted file mode 100644
index 0e4c74c1eb4..00000000000
--- a/libjava/classpath/lib/java/io/DataOutput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/DataOutputStream.class b/libjava/classpath/lib/java/io/DataOutputStream.class
deleted file mode 100644
index 228fbeb7401..00000000000
--- a/libjava/classpath/lib/java/io/DataOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/DeleteFileHelper$1.class b/libjava/classpath/lib/java/io/DeleteFileHelper$1.class
deleted file mode 100644
index c9ecae4ca58..00000000000
--- a/libjava/classpath/lib/java/io/DeleteFileHelper$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/DeleteFileHelper.class b/libjava/classpath/lib/java/io/DeleteFileHelper.class
deleted file mode 100644
index 14570bd29eb..00000000000
--- a/libjava/classpath/lib/java/io/DeleteFileHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/EOFException.class b/libjava/classpath/lib/java/io/EOFException.class
deleted file mode 100644
index 48252ca0fbd..00000000000
--- a/libjava/classpath/lib/java/io/EOFException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/Externalizable.class b/libjava/classpath/lib/java/io/Externalizable.class
deleted file mode 100644
index 5de5c5ed66c..00000000000
--- a/libjava/classpath/lib/java/io/Externalizable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/File.class b/libjava/classpath/lib/java/io/File.class
deleted file mode 100644
index 06a7442a3a9..00000000000
--- a/libjava/classpath/lib/java/io/File.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FileDescriptor.class b/libjava/classpath/lib/java/io/FileDescriptor.class
deleted file mode 100644
index a04a8a1998f..00000000000
--- a/libjava/classpath/lib/java/io/FileDescriptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FileFilter.class b/libjava/classpath/lib/java/io/FileFilter.class
deleted file mode 100644
index 6f80d89c9c4..00000000000
--- a/libjava/classpath/lib/java/io/FileFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FileInputStream.class b/libjava/classpath/lib/java/io/FileInputStream.class
deleted file mode 100644
index 13b283e916d..00000000000
--- a/libjava/classpath/lib/java/io/FileInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FileNotFoundException.class b/libjava/classpath/lib/java/io/FileNotFoundException.class
deleted file mode 100644
index ceefd617fba..00000000000
--- a/libjava/classpath/lib/java/io/FileNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FileOutputStream.class b/libjava/classpath/lib/java/io/FileOutputStream.class
deleted file mode 100644
index d01dbbec17c..00000000000
--- a/libjava/classpath/lib/java/io/FileOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FilePermission.class b/libjava/classpath/lib/java/io/FilePermission.class
deleted file mode 100644
index c5356442f25..00000000000
--- a/libjava/classpath/lib/java/io/FilePermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FileReader.class b/libjava/classpath/lib/java/io/FileReader.class
deleted file mode 100644
index ed97856c4ea..00000000000
--- a/libjava/classpath/lib/java/io/FileReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FileWriter.class b/libjava/classpath/lib/java/io/FileWriter.class
deleted file mode 100644
index f8cbdfc2dfe..00000000000
--- a/libjava/classpath/lib/java/io/FileWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FilenameFilter.class b/libjava/classpath/lib/java/io/FilenameFilter.class
deleted file mode 100644
index 4eaf5af0887..00000000000
--- a/libjava/classpath/lib/java/io/FilenameFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FilterInputStream.class b/libjava/classpath/lib/java/io/FilterInputStream.class
deleted file mode 100644
index 20e17edca82..00000000000
--- a/libjava/classpath/lib/java/io/FilterInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FilterOutputStream.class b/libjava/classpath/lib/java/io/FilterOutputStream.class
deleted file mode 100644
index 958701f045a..00000000000
--- a/libjava/classpath/lib/java/io/FilterOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FilterReader.class b/libjava/classpath/lib/java/io/FilterReader.class
deleted file mode 100644
index 3a2511e1d8e..00000000000
--- a/libjava/classpath/lib/java/io/FilterReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/FilterWriter.class b/libjava/classpath/lib/java/io/FilterWriter.class
deleted file mode 100644
index 393312c942e..00000000000
--- a/libjava/classpath/lib/java/io/FilterWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/Flushable.class b/libjava/classpath/lib/java/io/Flushable.class
deleted file mode 100644
index 66335634686..00000000000
--- a/libjava/classpath/lib/java/io/Flushable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/IOException.class b/libjava/classpath/lib/java/io/IOException.class
deleted file mode 100644
index 8ace2958ee6..00000000000
--- a/libjava/classpath/lib/java/io/IOException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/InputStream.class b/libjava/classpath/lib/java/io/InputStream.class
deleted file mode 100644
index 6839fb8fc09..00000000000
--- a/libjava/classpath/lib/java/io/InputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/InputStreamReader.class b/libjava/classpath/lib/java/io/InputStreamReader.class
deleted file mode 100644
index 8e752b9e606..00000000000
--- a/libjava/classpath/lib/java/io/InputStreamReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/InterruptedIOException.class b/libjava/classpath/lib/java/io/InterruptedIOException.class
deleted file mode 100644
index 0025ea890ec..00000000000
--- a/libjava/classpath/lib/java/io/InterruptedIOException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/InvalidClassException.class b/libjava/classpath/lib/java/io/InvalidClassException.class
deleted file mode 100644
index df3aa4d98b9..00000000000
--- a/libjava/classpath/lib/java/io/InvalidClassException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/InvalidObjectException.class b/libjava/classpath/lib/java/io/InvalidObjectException.class
deleted file mode 100644
index dca02dfb540..00000000000
--- a/libjava/classpath/lib/java/io/InvalidObjectException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/LineNumberInputStream.class b/libjava/classpath/lib/java/io/LineNumberInputStream.class
deleted file mode 100644
index f422337ca4b..00000000000
--- a/libjava/classpath/lib/java/io/LineNumberInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/LineNumberReader.class b/libjava/classpath/lib/java/io/LineNumberReader.class
deleted file mode 100644
index 2b1f52dc642..00000000000
--- a/libjava/classpath/lib/java/io/LineNumberReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/NotActiveException.class b/libjava/classpath/lib/java/io/NotActiveException.class
deleted file mode 100644
index 55fd435de77..00000000000
--- a/libjava/classpath/lib/java/io/NotActiveException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/NotSerializableException.class b/libjava/classpath/lib/java/io/NotSerializableException.class
deleted file mode 100644
index f7bec05f427..00000000000
--- a/libjava/classpath/lib/java/io/NotSerializableException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectInput.class b/libjava/classpath/lib/java/io/ObjectInput.class
deleted file mode 100644
index f0d1a9ea8e4..00000000000
--- a/libjava/classpath/lib/java/io/ObjectInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectInputStream$1.class b/libjava/classpath/lib/java/io/ObjectInputStream$1.class
deleted file mode 100644
index 43e3a0c23fc..00000000000
--- a/libjava/classpath/lib/java/io/ObjectInputStream$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectInputStream$2.class b/libjava/classpath/lib/java/io/ObjectInputStream$2.class
deleted file mode 100644
index 053a354bde5..00000000000
--- a/libjava/classpath/lib/java/io/ObjectInputStream$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectInputStream$GetField.class b/libjava/classpath/lib/java/io/ObjectInputStream$GetField.class
deleted file mode 100644
index da4ee377470..00000000000
--- a/libjava/classpath/lib/java/io/ObjectInputStream$GetField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectInputStream$ValidatorAndPriority.class b/libjava/classpath/lib/java/io/ObjectInputStream$ValidatorAndPriority.class
deleted file mode 100644
index ee951cfdb05..00000000000
--- a/libjava/classpath/lib/java/io/ObjectInputStream$ValidatorAndPriority.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectInputStream.class b/libjava/classpath/lib/java/io/ObjectInputStream.class
deleted file mode 100644
index d6ae861ea0c..00000000000
--- a/libjava/classpath/lib/java/io/ObjectInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectInputValidation.class b/libjava/classpath/lib/java/io/ObjectInputValidation.class
deleted file mode 100644
index cfc25151e85..00000000000
--- a/libjava/classpath/lib/java/io/ObjectInputValidation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectOutput.class b/libjava/classpath/lib/java/io/ObjectOutput.class
deleted file mode 100644
index ccc1902d67c..00000000000
--- a/libjava/classpath/lib/java/io/ObjectOutput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectOutputStream$1.class b/libjava/classpath/lib/java/io/ObjectOutputStream$1.class
deleted file mode 100644
index 56e2f75d352..00000000000
--- a/libjava/classpath/lib/java/io/ObjectOutputStream$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectOutputStream$PutField.class b/libjava/classpath/lib/java/io/ObjectOutputStream$PutField.class
deleted file mode 100644
index 87df0f1cbec..00000000000
--- a/libjava/classpath/lib/java/io/ObjectOutputStream$PutField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectOutputStream.class b/libjava/classpath/lib/java/io/ObjectOutputStream.class
deleted file mode 100644
index fb3f40a9d74..00000000000
--- a/libjava/classpath/lib/java/io/ObjectOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectStreamClass$1.class b/libjava/classpath/lib/java/io/ObjectStreamClass$1.class
deleted file mode 100644
index 6279a244cd8..00000000000
--- a/libjava/classpath/lib/java/io/ObjectStreamClass$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectStreamClass$2.class b/libjava/classpath/lib/java/io/ObjectStreamClass$2.class
deleted file mode 100644
index 4c91ea650b2..00000000000
--- a/libjava/classpath/lib/java/io/ObjectStreamClass$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectStreamClass$InterfaceComparator.class b/libjava/classpath/lib/java/io/ObjectStreamClass$InterfaceComparator.class
deleted file mode 100644
index 7c0ac37ee2f..00000000000
--- a/libjava/classpath/lib/java/io/ObjectStreamClass$InterfaceComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectStreamClass$MemberComparator.class b/libjava/classpath/lib/java/io/ObjectStreamClass$MemberComparator.class
deleted file mode 100644
index 233aa690ae4..00000000000
--- a/libjava/classpath/lib/java/io/ObjectStreamClass$MemberComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectStreamClass.class b/libjava/classpath/lib/java/io/ObjectStreamClass.class
deleted file mode 100644
index e0d9e7f21b2..00000000000
--- a/libjava/classpath/lib/java/io/ObjectStreamClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectStreamConstants.class b/libjava/classpath/lib/java/io/ObjectStreamConstants.class
deleted file mode 100644
index 6fa614618ed..00000000000
--- a/libjava/classpath/lib/java/io/ObjectStreamConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectStreamException.class b/libjava/classpath/lib/java/io/ObjectStreamException.class
deleted file mode 100644
index 376b1710397..00000000000
--- a/libjava/classpath/lib/java/io/ObjectStreamException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectStreamField$1.class b/libjava/classpath/lib/java/io/ObjectStreamField$1.class
deleted file mode 100644
index bdc0407212a..00000000000
--- a/libjava/classpath/lib/java/io/ObjectStreamField$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/ObjectStreamField.class b/libjava/classpath/lib/java/io/ObjectStreamField.class
deleted file mode 100644
index 7877ba80525..00000000000
--- a/libjava/classpath/lib/java/io/ObjectStreamField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/OptionalDataException.class b/libjava/classpath/lib/java/io/OptionalDataException.class
deleted file mode 100644
index a1d6b6cf045..00000000000
--- a/libjava/classpath/lib/java/io/OptionalDataException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/OutputStream.class b/libjava/classpath/lib/java/io/OutputStream.class
deleted file mode 100644
index 48cb02fa457..00000000000
--- a/libjava/classpath/lib/java/io/OutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/OutputStreamWriter.class b/libjava/classpath/lib/java/io/OutputStreamWriter.class
deleted file mode 100644
index 16013787972..00000000000
--- a/libjava/classpath/lib/java/io/OutputStreamWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/PipedInputStream.class b/libjava/classpath/lib/java/io/PipedInputStream.class
deleted file mode 100644
index b2c32046a97..00000000000
--- a/libjava/classpath/lib/java/io/PipedInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/PipedOutputStream.class b/libjava/classpath/lib/java/io/PipedOutputStream.class
deleted file mode 100644
index 480b7aa4a55..00000000000
--- a/libjava/classpath/lib/java/io/PipedOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/PipedReader.class b/libjava/classpath/lib/java/io/PipedReader.class
deleted file mode 100644
index d63d4dee52d..00000000000
--- a/libjava/classpath/lib/java/io/PipedReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/PipedWriter.class b/libjava/classpath/lib/java/io/PipedWriter.class
deleted file mode 100644
index d032a5e2364..00000000000
--- a/libjava/classpath/lib/java/io/PipedWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/PrintStream.class b/libjava/classpath/lib/java/io/PrintStream.class
deleted file mode 100644
index c5db701b9df..00000000000
--- a/libjava/classpath/lib/java/io/PrintStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/PrintWriter.class b/libjava/classpath/lib/java/io/PrintWriter.class
deleted file mode 100644
index 1b4258ffb61..00000000000
--- a/libjava/classpath/lib/java/io/PrintWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/PushbackInputStream.class b/libjava/classpath/lib/java/io/PushbackInputStream.class
deleted file mode 100644
index 1d9c17e77e8..00000000000
--- a/libjava/classpath/lib/java/io/PushbackInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/PushbackReader.class b/libjava/classpath/lib/java/io/PushbackReader.class
deleted file mode 100644
index c890c21685a..00000000000
--- a/libjava/classpath/lib/java/io/PushbackReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/RandomAccessFile.class b/libjava/classpath/lib/java/io/RandomAccessFile.class
deleted file mode 100644
index 61322e8a56c..00000000000
--- a/libjava/classpath/lib/java/io/RandomAccessFile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/Reader.class b/libjava/classpath/lib/java/io/Reader.class
deleted file mode 100644
index e18637f8728..00000000000
--- a/libjava/classpath/lib/java/io/Reader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/SequenceInputStream.class b/libjava/classpath/lib/java/io/SequenceInputStream.class
deleted file mode 100644
index 69f28ff7251..00000000000
--- a/libjava/classpath/lib/java/io/SequenceInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/Serializable.class b/libjava/classpath/lib/java/io/Serializable.class
deleted file mode 100644
index dbf1442165e..00000000000
--- a/libjava/classpath/lib/java/io/Serializable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/SerializablePermission.class b/libjava/classpath/lib/java/io/SerializablePermission.class
deleted file mode 100644
index 8b687ead5f6..00000000000
--- a/libjava/classpath/lib/java/io/SerializablePermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/StreamCorruptedException.class b/libjava/classpath/lib/java/io/StreamCorruptedException.class
deleted file mode 100644
index 0c064216cba..00000000000
--- a/libjava/classpath/lib/java/io/StreamCorruptedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/StreamTokenizer.class b/libjava/classpath/lib/java/io/StreamTokenizer.class
deleted file mode 100644
index b9ee6f70965..00000000000
--- a/libjava/classpath/lib/java/io/StreamTokenizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/StringBufferInputStream.class b/libjava/classpath/lib/java/io/StringBufferInputStream.class
deleted file mode 100644
index 5e56f154b2f..00000000000
--- a/libjava/classpath/lib/java/io/StringBufferInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/StringReader.class b/libjava/classpath/lib/java/io/StringReader.class
deleted file mode 100644
index a81a99b5f63..00000000000
--- a/libjava/classpath/lib/java/io/StringReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/StringWriter.class b/libjava/classpath/lib/java/io/StringWriter.class
deleted file mode 100644
index 0206af0969a..00000000000
--- a/libjava/classpath/lib/java/io/StringWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/SyncFailedException.class b/libjava/classpath/lib/java/io/SyncFailedException.class
deleted file mode 100644
index e8f7c7da63f..00000000000
--- a/libjava/classpath/lib/java/io/SyncFailedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/UTFDataFormatException.class b/libjava/classpath/lib/java/io/UTFDataFormatException.class
deleted file mode 100644
index 1b4df0dd804..00000000000
--- a/libjava/classpath/lib/java/io/UTFDataFormatException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/UnsupportedEncodingException.class b/libjava/classpath/lib/java/io/UnsupportedEncodingException.class
deleted file mode 100644
index aaac133dca8..00000000000
--- a/libjava/classpath/lib/java/io/UnsupportedEncodingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/VMObjectInputStream.class b/libjava/classpath/lib/java/io/VMObjectInputStream.class
deleted file mode 100644
index 71147789f0b..00000000000
--- a/libjava/classpath/lib/java/io/VMObjectInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/VMObjectStreamClass.class b/libjava/classpath/lib/java/io/VMObjectStreamClass.class
deleted file mode 100644
index f73400c4c96..00000000000
--- a/libjava/classpath/lib/java/io/VMObjectStreamClass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/WriteAbortedException.class b/libjava/classpath/lib/java/io/WriteAbortedException.class
deleted file mode 100644
index 8ca44710d72..00000000000
--- a/libjava/classpath/lib/java/io/WriteAbortedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/io/Writer.class b/libjava/classpath/lib/java/io/Writer.class
deleted file mode 100644
index dcccbe06e22..00000000000
--- a/libjava/classpath/lib/java/io/Writer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/AbstractMethodError.class b/libjava/classpath/lib/java/lang/AbstractMethodError.class
deleted file mode 100644
index 625357d5b7e..00000000000
--- a/libjava/classpath/lib/java/lang/AbstractMethodError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Appendable.class b/libjava/classpath/lib/java/lang/Appendable.class
deleted file mode 100644
index 5e4f77eb9eb..00000000000
--- a/libjava/classpath/lib/java/lang/Appendable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ArithmeticException.class b/libjava/classpath/lib/java/lang/ArithmeticException.class
deleted file mode 100644
index 1be9eecd328..00000000000
--- a/libjava/classpath/lib/java/lang/ArithmeticException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ArrayIndexOutOfBoundsException.class b/libjava/classpath/lib/java/lang/ArrayIndexOutOfBoundsException.class
deleted file mode 100644
index 82bf0f0ee4d..00000000000
--- a/libjava/classpath/lib/java/lang/ArrayIndexOutOfBoundsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ArrayStoreException.class b/libjava/classpath/lib/java/lang/ArrayStoreException.class
deleted file mode 100644
index 4e20e87e3cf..00000000000
--- a/libjava/classpath/lib/java/lang/ArrayStoreException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/AssertionError.class b/libjava/classpath/lib/java/lang/AssertionError.class
deleted file mode 100644
index e81c3c60d33..00000000000
--- a/libjava/classpath/lib/java/lang/AssertionError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Boolean.class b/libjava/classpath/lib/java/lang/Boolean.class
deleted file mode 100644
index 820c590167e..00000000000
--- a/libjava/classpath/lib/java/lang/Boolean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Byte.class b/libjava/classpath/lib/java/lang/Byte.class
deleted file mode 100644
index 1ace4ada996..00000000000
--- a/libjava/classpath/lib/java/lang/Byte.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/CharSequence.class b/libjava/classpath/lib/java/lang/CharSequence.class
deleted file mode 100644
index 8abd02a9331..00000000000
--- a/libjava/classpath/lib/java/lang/CharSequence.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Character$Subset.class b/libjava/classpath/lib/java/lang/Character$Subset.class
deleted file mode 100644
index 5a928021d65..00000000000
--- a/libjava/classpath/lib/java/lang/Character$Subset.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Character$UnicodeBlock.class b/libjava/classpath/lib/java/lang/Character$UnicodeBlock.class
deleted file mode 100644
index fddba6abbb1..00000000000
--- a/libjava/classpath/lib/java/lang/Character$UnicodeBlock.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Character.class b/libjava/classpath/lib/java/lang/Character.class
deleted file mode 100644
index 3d41ebef22d..00000000000
--- a/libjava/classpath/lib/java/lang/Character.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Class.class b/libjava/classpath/lib/java/lang/Class.class
deleted file mode 100644
index 13b56116d94..00000000000
--- a/libjava/classpath/lib/java/lang/Class.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ClassCastException.class b/libjava/classpath/lib/java/lang/ClassCastException.class
deleted file mode 100644
index d7700242f35..00000000000
--- a/libjava/classpath/lib/java/lang/ClassCastException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ClassCircularityError.class b/libjava/classpath/lib/java/lang/ClassCircularityError.class
deleted file mode 100644
index 4651dab1e76..00000000000
--- a/libjava/classpath/lib/java/lang/ClassCircularityError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ClassFormatError.class b/libjava/classpath/lib/java/lang/ClassFormatError.class
deleted file mode 100644
index a0a3352c440..00000000000
--- a/libjava/classpath/lib/java/lang/ClassFormatError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ClassLoader$AnnotationsKey.class b/libjava/classpath/lib/java/lang/ClassLoader$AnnotationsKey.class
deleted file mode 100644
index 5f0b96d7acf..00000000000
--- a/libjava/classpath/lib/java/lang/ClassLoader$AnnotationsKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ClassLoader.class b/libjava/classpath/lib/java/lang/ClassLoader.class
deleted file mode 100644
index 5cbd090872a..00000000000
--- a/libjava/classpath/lib/java/lang/ClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ClassNotFoundException.class b/libjava/classpath/lib/java/lang/ClassNotFoundException.class
deleted file mode 100644
index 27239e48359..00000000000
--- a/libjava/classpath/lib/java/lang/ClassNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/CloneNotSupportedException.class b/libjava/classpath/lib/java/lang/CloneNotSupportedException.class
deleted file mode 100644
index 3b942f46479..00000000000
--- a/libjava/classpath/lib/java/lang/CloneNotSupportedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Cloneable.class b/libjava/classpath/lib/java/lang/Cloneable.class
deleted file mode 100644
index 313c5247485..00000000000
--- a/libjava/classpath/lib/java/lang/Cloneable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Comparable.class b/libjava/classpath/lib/java/lang/Comparable.class
deleted file mode 100644
index 3051c4fd10f..00000000000
--- a/libjava/classpath/lib/java/lang/Comparable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Compiler.class b/libjava/classpath/lib/java/lang/Compiler.class
deleted file mode 100644
index 02bbf9ce22c..00000000000
--- a/libjava/classpath/lib/java/lang/Compiler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Deprecated.class b/libjava/classpath/lib/java/lang/Deprecated.class
deleted file mode 100644
index 676228576f0..00000000000
--- a/libjava/classpath/lib/java/lang/Deprecated.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Double.class b/libjava/classpath/lib/java/lang/Double.class
deleted file mode 100644
index d6757549165..00000000000
--- a/libjava/classpath/lib/java/lang/Double.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/EcosProcess.class b/libjava/classpath/lib/java/lang/EcosProcess.class
deleted file mode 100644
index f306e4c87af..00000000000
--- a/libjava/classpath/lib/java/lang/EcosProcess.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Enum.class b/libjava/classpath/lib/java/lang/Enum.class
deleted file mode 100644
index e7961262241..00000000000
--- a/libjava/classpath/lib/java/lang/Enum.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/EnumConstantNotPresentException.class b/libjava/classpath/lib/java/lang/EnumConstantNotPresentException.class
deleted file mode 100644
index dd66f1cead0..00000000000
--- a/libjava/classpath/lib/java/lang/EnumConstantNotPresentException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Error.class b/libjava/classpath/lib/java/lang/Error.class
deleted file mode 100644
index 20eb8cb977c..00000000000
--- a/libjava/classpath/lib/java/lang/Error.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Exception.class b/libjava/classpath/lib/java/lang/Exception.class
deleted file mode 100644
index cc0a6ce77eb..00000000000
--- a/libjava/classpath/lib/java/lang/Exception.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ExceptionInInitializerError.class b/libjava/classpath/lib/java/lang/ExceptionInInitializerError.class
deleted file mode 100644
index 26ca8577673..00000000000
--- a/libjava/classpath/lib/java/lang/ExceptionInInitializerError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Float.class b/libjava/classpath/lib/java/lang/Float.class
deleted file mode 100644
index 42732a6f381..00000000000
--- a/libjava/classpath/lib/java/lang/Float.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/IllegalAccessError.class b/libjava/classpath/lib/java/lang/IllegalAccessError.class
deleted file mode 100644
index ef0dedacf7d..00000000000
--- a/libjava/classpath/lib/java/lang/IllegalAccessError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/IllegalAccessException.class b/libjava/classpath/lib/java/lang/IllegalAccessException.class
deleted file mode 100644
index e5dd5b449a7..00000000000
--- a/libjava/classpath/lib/java/lang/IllegalAccessException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/IllegalArgumentException.class b/libjava/classpath/lib/java/lang/IllegalArgumentException.class
deleted file mode 100644
index 11a02e9e814..00000000000
--- a/libjava/classpath/lib/java/lang/IllegalArgumentException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/IllegalMonitorStateException.class b/libjava/classpath/lib/java/lang/IllegalMonitorStateException.class
deleted file mode 100644
index 8e7de1e0774..00000000000
--- a/libjava/classpath/lib/java/lang/IllegalMonitorStateException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/IllegalStateException.class b/libjava/classpath/lib/java/lang/IllegalStateException.class
deleted file mode 100644
index 08bcb4d3ab1..00000000000
--- a/libjava/classpath/lib/java/lang/IllegalStateException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/IllegalThreadStateException.class b/libjava/classpath/lib/java/lang/IllegalThreadStateException.class
deleted file mode 100644
index e75e16b1e47..00000000000
--- a/libjava/classpath/lib/java/lang/IllegalThreadStateException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/IncompatibleClassChangeError.class b/libjava/classpath/lib/java/lang/IncompatibleClassChangeError.class
deleted file mode 100644
index b5f1c8216d2..00000000000
--- a/libjava/classpath/lib/java/lang/IncompatibleClassChangeError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/IndexOutOfBoundsException.class b/libjava/classpath/lib/java/lang/IndexOutOfBoundsException.class
deleted file mode 100644
index b33f109955f..00000000000
--- a/libjava/classpath/lib/java/lang/IndexOutOfBoundsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/InheritableThreadLocal.class b/libjava/classpath/lib/java/lang/InheritableThreadLocal.class
deleted file mode 100644
index 3eea8f7bb47..00000000000
--- a/libjava/classpath/lib/java/lang/InheritableThreadLocal.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/InstantiationError.class b/libjava/classpath/lib/java/lang/InstantiationError.class
deleted file mode 100644
index 9dd5fc20042..00000000000
--- a/libjava/classpath/lib/java/lang/InstantiationError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/InstantiationException.class b/libjava/classpath/lib/java/lang/InstantiationException.class
deleted file mode 100644
index 60311a8eb8f..00000000000
--- a/libjava/classpath/lib/java/lang/InstantiationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Integer.class b/libjava/classpath/lib/java/lang/Integer.class
deleted file mode 100644
index 3fc97252e29..00000000000
--- a/libjava/classpath/lib/java/lang/Integer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/InternalError.class b/libjava/classpath/lib/java/lang/InternalError.class
deleted file mode 100644
index 6e61654b539..00000000000
--- a/libjava/classpath/lib/java/lang/InternalError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/InterruptedException.class b/libjava/classpath/lib/java/lang/InterruptedException.class
deleted file mode 100644
index 6504769956f..00000000000
--- a/libjava/classpath/lib/java/lang/InterruptedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Iterable.class b/libjava/classpath/lib/java/lang/Iterable.class
deleted file mode 100644
index 973203260c2..00000000000
--- a/libjava/classpath/lib/java/lang/Iterable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/LinkageError.class b/libjava/classpath/lib/java/lang/LinkageError.class
deleted file mode 100644
index b297fe1b51b..00000000000
--- a/libjava/classpath/lib/java/lang/LinkageError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Long.class b/libjava/classpath/lib/java/lang/Long.class
deleted file mode 100644
index df9dc0ce90f..00000000000
--- a/libjava/classpath/lib/java/lang/Long.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Math.class b/libjava/classpath/lib/java/lang/Math.class
deleted file mode 100644
index 612c3655535..00000000000
--- a/libjava/classpath/lib/java/lang/Math.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/NegativeArraySizeException.class b/libjava/classpath/lib/java/lang/NegativeArraySizeException.class
deleted file mode 100644
index 9749e1bf370..00000000000
--- a/libjava/classpath/lib/java/lang/NegativeArraySizeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/NoClassDefFoundError.class b/libjava/classpath/lib/java/lang/NoClassDefFoundError.class
deleted file mode 100644
index 58e72ba3058..00000000000
--- a/libjava/classpath/lib/java/lang/NoClassDefFoundError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/NoSuchFieldError.class b/libjava/classpath/lib/java/lang/NoSuchFieldError.class
deleted file mode 100644
index 28df34afcbd..00000000000
--- a/libjava/classpath/lib/java/lang/NoSuchFieldError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/NoSuchFieldException.class b/libjava/classpath/lib/java/lang/NoSuchFieldException.class
deleted file mode 100644
index 4ead8e6eec1..00000000000
--- a/libjava/classpath/lib/java/lang/NoSuchFieldException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/NoSuchMethodError.class b/libjava/classpath/lib/java/lang/NoSuchMethodError.class
deleted file mode 100644
index 73d94719415..00000000000
--- a/libjava/classpath/lib/java/lang/NoSuchMethodError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/NoSuchMethodException.class b/libjava/classpath/lib/java/lang/NoSuchMethodException.class
deleted file mode 100644
index 47cacd0af19..00000000000
--- a/libjava/classpath/lib/java/lang/NoSuchMethodException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/NullPointerException.class b/libjava/classpath/lib/java/lang/NullPointerException.class
deleted file mode 100644
index 78457726131..00000000000
--- a/libjava/classpath/lib/java/lang/NullPointerException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Number.class b/libjava/classpath/lib/java/lang/Number.class
deleted file mode 100644
index cb609da71e9..00000000000
--- a/libjava/classpath/lib/java/lang/Number.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/NumberFormatException.class b/libjava/classpath/lib/java/lang/NumberFormatException.class
deleted file mode 100644
index 447205f3e44..00000000000
--- a/libjava/classpath/lib/java/lang/NumberFormatException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Object.class b/libjava/classpath/lib/java/lang/Object.class
deleted file mode 100644
index 40563bf1549..00000000000
--- a/libjava/classpath/lib/java/lang/Object.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/OutOfMemoryError.class b/libjava/classpath/lib/java/lang/OutOfMemoryError.class
deleted file mode 100644
index c7bcaa02cb1..00000000000
--- a/libjava/classpath/lib/java/lang/OutOfMemoryError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Override.class b/libjava/classpath/lib/java/lang/Override.class
deleted file mode 100644
index 15a0dd46663..00000000000
--- a/libjava/classpath/lib/java/lang/Override.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Package.class b/libjava/classpath/lib/java/lang/Package.class
deleted file mode 100644
index e0b732347d5..00000000000
--- a/libjava/classpath/lib/java/lang/Package.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/PosixProcess$EOFInputStream.class b/libjava/classpath/lib/java/lang/PosixProcess$EOFInputStream.class
deleted file mode 100644
index b9e9c72bafb..00000000000
--- a/libjava/classpath/lib/java/lang/PosixProcess$EOFInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/PosixProcess$ProcessManager.class b/libjava/classpath/lib/java/lang/PosixProcess$ProcessManager.class
deleted file mode 100644
index 4c4024141a7..00000000000
--- a/libjava/classpath/lib/java/lang/PosixProcess$ProcessManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/PosixProcess.class b/libjava/classpath/lib/java/lang/PosixProcess.class
deleted file mode 100644
index f7c52649fb9..00000000000
--- a/libjava/classpath/lib/java/lang/PosixProcess.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Process.class b/libjava/classpath/lib/java/lang/Process.class
deleted file mode 100644
index b6c01653af3..00000000000
--- a/libjava/classpath/lib/java/lang/Process.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ProcessBuilder.class b/libjava/classpath/lib/java/lang/ProcessBuilder.class
deleted file mode 100644
index 10bbc8183bd..00000000000
--- a/libjava/classpath/lib/java/lang/ProcessBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Readable.class b/libjava/classpath/lib/java/lang/Readable.class
deleted file mode 100644
index 1c0e440b839..00000000000
--- a/libjava/classpath/lib/java/lang/Readable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Runnable.class b/libjava/classpath/lib/java/lang/Runnable.class
deleted file mode 100644
index 417dd2ed2f7..00000000000
--- a/libjava/classpath/lib/java/lang/Runnable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Runtime.class b/libjava/classpath/lib/java/lang/Runtime.class
deleted file mode 100644
index 620f1c8af9f..00000000000
--- a/libjava/classpath/lib/java/lang/Runtime.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/RuntimeException.class b/libjava/classpath/lib/java/lang/RuntimeException.class
deleted file mode 100644
index 3e7f3434dd0..00000000000
--- a/libjava/classpath/lib/java/lang/RuntimeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/RuntimePermission.class b/libjava/classpath/lib/java/lang/RuntimePermission.class
deleted file mode 100644
index 2d30ce604e5..00000000000
--- a/libjava/classpath/lib/java/lang/RuntimePermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/SecurityException.class b/libjava/classpath/lib/java/lang/SecurityException.class
deleted file mode 100644
index f49f047647d..00000000000
--- a/libjava/classpath/lib/java/lang/SecurityException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/SecurityManager$1.class b/libjava/classpath/lib/java/lang/SecurityManager$1.class
deleted file mode 100644
index 176f5ed9ec6..00000000000
--- a/libjava/classpath/lib/java/lang/SecurityManager$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/SecurityManager.class b/libjava/classpath/lib/java/lang/SecurityManager.class
deleted file mode 100644
index c8c93029712..00000000000
--- a/libjava/classpath/lib/java/lang/SecurityManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Short.class b/libjava/classpath/lib/java/lang/Short.class
deleted file mode 100644
index 0c6abf13070..00000000000
--- a/libjava/classpath/lib/java/lang/Short.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/StackOverflowError.class b/libjava/classpath/lib/java/lang/StackOverflowError.class
deleted file mode 100644
index a661920e791..00000000000
--- a/libjava/classpath/lib/java/lang/StackOverflowError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/StackTraceElement.class b/libjava/classpath/lib/java/lang/StackTraceElement.class
deleted file mode 100644
index 623d8d9e2a9..00000000000
--- a/libjava/classpath/lib/java/lang/StackTraceElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/StrictMath.class b/libjava/classpath/lib/java/lang/StrictMath.class
deleted file mode 100644
index e56d06760df..00000000000
--- a/libjava/classpath/lib/java/lang/StrictMath.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/String$CaseInsensitiveComparator.class b/libjava/classpath/lib/java/lang/String$CaseInsensitiveComparator.class
deleted file mode 100644
index ffb4541d293..00000000000
--- a/libjava/classpath/lib/java/lang/String$CaseInsensitiveComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/String.class b/libjava/classpath/lib/java/lang/String.class
deleted file mode 100644
index 873c22c546d..00000000000
--- a/libjava/classpath/lib/java/lang/String.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/StringBuffer.class b/libjava/classpath/lib/java/lang/StringBuffer.class
deleted file mode 100644
index 6fca27a3fad..00000000000
--- a/libjava/classpath/lib/java/lang/StringBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/StringBuilder.class b/libjava/classpath/lib/java/lang/StringBuilder.class
deleted file mode 100644
index 8636b53aa5d..00000000000
--- a/libjava/classpath/lib/java/lang/StringBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/StringIndexOutOfBoundsException.class b/libjava/classpath/lib/java/lang/StringIndexOutOfBoundsException.class
deleted file mode 100644
index 0debd302b6f..00000000000
--- a/libjava/classpath/lib/java/lang/StringIndexOutOfBoundsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/SuppressWarnings.class b/libjava/classpath/lib/java/lang/SuppressWarnings.class
deleted file mode 100644
index 9c41ba051e0..00000000000
--- a/libjava/classpath/lib/java/lang/SuppressWarnings.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/System$EnvironmentCollection.class b/libjava/classpath/lib/java/lang/System$EnvironmentCollection.class
deleted file mode 100644
index dd6d4c0d492..00000000000
--- a/libjava/classpath/lib/java/lang/System$EnvironmentCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/System$EnvironmentMap.class b/libjava/classpath/lib/java/lang/System$EnvironmentMap.class
deleted file mode 100644
index b06eeb938cb..00000000000
--- a/libjava/classpath/lib/java/lang/System$EnvironmentMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/System$EnvironmentSet.class b/libjava/classpath/lib/java/lang/System$EnvironmentSet.class
deleted file mode 100644
index 6510f9563e4..00000000000
--- a/libjava/classpath/lib/java/lang/System$EnvironmentSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/System.class b/libjava/classpath/lib/java/lang/System.class
deleted file mode 100644
index dfc895a9f95..00000000000
--- a/libjava/classpath/lib/java/lang/System.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Thread$State.class b/libjava/classpath/lib/java/lang/Thread$State.class
deleted file mode 100644
index a7d5a333f22..00000000000
--- a/libjava/classpath/lib/java/lang/Thread$State.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Thread$UncaughtExceptionHandler.class b/libjava/classpath/lib/java/lang/Thread$UncaughtExceptionHandler.class
deleted file mode 100644
index d4fa204a05a..00000000000
--- a/libjava/classpath/lib/java/lang/Thread$UncaughtExceptionHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Thread.class b/libjava/classpath/lib/java/lang/Thread.class
deleted file mode 100644
index 7c33d004474..00000000000
--- a/libjava/classpath/lib/java/lang/Thread.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ThreadDeath.class b/libjava/classpath/lib/java/lang/ThreadDeath.class
deleted file mode 100644
index 4205d7d640c..00000000000
--- a/libjava/classpath/lib/java/lang/ThreadDeath.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ThreadGroup.class b/libjava/classpath/lib/java/lang/ThreadGroup.class
deleted file mode 100644
index a9e5a1e7b23..00000000000
--- a/libjava/classpath/lib/java/lang/ThreadGroup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ThreadLocal.class b/libjava/classpath/lib/java/lang/ThreadLocal.class
deleted file mode 100644
index 35c7fb8e56c..00000000000
--- a/libjava/classpath/lib/java/lang/ThreadLocal.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Throwable$StaticData.class b/libjava/classpath/lib/java/lang/Throwable$StaticData.class
deleted file mode 100644
index 540bf1d49ad..00000000000
--- a/libjava/classpath/lib/java/lang/Throwable$StaticData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Throwable.class b/libjava/classpath/lib/java/lang/Throwable.class
deleted file mode 100644
index 3f3b5ffddfd..00000000000
--- a/libjava/classpath/lib/java/lang/Throwable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/TypeNotPresentException.class b/libjava/classpath/lib/java/lang/TypeNotPresentException.class
deleted file mode 100644
index de8756ef651..00000000000
--- a/libjava/classpath/lib/java/lang/TypeNotPresentException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/UnknownError.class b/libjava/classpath/lib/java/lang/UnknownError.class
deleted file mode 100644
index 434c66b3dd0..00000000000
--- a/libjava/classpath/lib/java/lang/UnknownError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/UnsatisfiedLinkError.class b/libjava/classpath/lib/java/lang/UnsatisfiedLinkError.class
deleted file mode 100644
index 7381e8fb46e..00000000000
--- a/libjava/classpath/lib/java/lang/UnsatisfiedLinkError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/UnsupportedClassVersionError.class b/libjava/classpath/lib/java/lang/UnsupportedClassVersionError.class
deleted file mode 100644
index fb59a023026..00000000000
--- a/libjava/classpath/lib/java/lang/UnsupportedClassVersionError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/UnsupportedOperationException.class b/libjava/classpath/lib/java/lang/UnsupportedOperationException.class
deleted file mode 100644
index 27f93ab84e9..00000000000
--- a/libjava/classpath/lib/java/lang/UnsupportedOperationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/VMClassLoader.class b/libjava/classpath/lib/java/lang/VMClassLoader.class
deleted file mode 100644
index 1033291ffc3..00000000000
--- a/libjava/classpath/lib/java/lang/VMClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/VMCompiler.class b/libjava/classpath/lib/java/lang/VMCompiler.class
deleted file mode 100644
index 4b968fb48df..00000000000
--- a/libjava/classpath/lib/java/lang/VMCompiler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/VMDouble.class b/libjava/classpath/lib/java/lang/VMDouble.class
deleted file mode 100644
index 690c19e80f3..00000000000
--- a/libjava/classpath/lib/java/lang/VMDouble.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/VMFloat.class b/libjava/classpath/lib/java/lang/VMFloat.class
deleted file mode 100644
index f2c252ea865..00000000000
--- a/libjava/classpath/lib/java/lang/VMFloat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/VMThrowable.class b/libjava/classpath/lib/java/lang/VMThrowable.class
deleted file mode 100644
index b561d559135..00000000000
--- a/libjava/classpath/lib/java/lang/VMThrowable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/VerifyError.class b/libjava/classpath/lib/java/lang/VerifyError.class
deleted file mode 100644
index 9e7f7d0a346..00000000000
--- a/libjava/classpath/lib/java/lang/VerifyError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/VirtualMachineError.class b/libjava/classpath/lib/java/lang/VirtualMachineError.class
deleted file mode 100644
index d28aedfd4ed..00000000000
--- a/libjava/classpath/lib/java/lang/VirtualMachineError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Void.class b/libjava/classpath/lib/java/lang/Void.class
deleted file mode 100644
index 28864579db1..00000000000
--- a/libjava/classpath/lib/java/lang/Void.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/Win32Process.class b/libjava/classpath/lib/java/lang/Win32Process.class
deleted file mode 100644
index 4ee8415b917..00000000000
--- a/libjava/classpath/lib/java/lang/Win32Process.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/annotation/Annotation.class b/libjava/classpath/lib/java/lang/annotation/Annotation.class
deleted file mode 100644
index ffa644d1149..00000000000
--- a/libjava/classpath/lib/java/lang/annotation/Annotation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/annotation/AnnotationFormatError.class b/libjava/classpath/lib/java/lang/annotation/AnnotationFormatError.class
deleted file mode 100644
index 9e033050ab0..00000000000
--- a/libjava/classpath/lib/java/lang/annotation/AnnotationFormatError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/annotation/AnnotationTypeMismatchException.class b/libjava/classpath/lib/java/lang/annotation/AnnotationTypeMismatchException.class
deleted file mode 100644
index 0a5969470c5..00000000000
--- a/libjava/classpath/lib/java/lang/annotation/AnnotationTypeMismatchException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/annotation/Documented.class b/libjava/classpath/lib/java/lang/annotation/Documented.class
deleted file mode 100644
index b0c3baf46df..00000000000
--- a/libjava/classpath/lib/java/lang/annotation/Documented.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/annotation/ElementType.class b/libjava/classpath/lib/java/lang/annotation/ElementType.class
deleted file mode 100644
index 09f77d0415c..00000000000
--- a/libjava/classpath/lib/java/lang/annotation/ElementType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/annotation/IncompleteAnnotationException.class b/libjava/classpath/lib/java/lang/annotation/IncompleteAnnotationException.class
deleted file mode 100644
index 3b13d92081b..00000000000
--- a/libjava/classpath/lib/java/lang/annotation/IncompleteAnnotationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/annotation/Inherited.class b/libjava/classpath/lib/java/lang/annotation/Inherited.class
deleted file mode 100644
index 5916ecf2b32..00000000000
--- a/libjava/classpath/lib/java/lang/annotation/Inherited.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/annotation/Retention.class b/libjava/classpath/lib/java/lang/annotation/Retention.class
deleted file mode 100644
index 3badb946e25..00000000000
--- a/libjava/classpath/lib/java/lang/annotation/Retention.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/annotation/RetentionPolicy.class b/libjava/classpath/lib/java/lang/annotation/RetentionPolicy.class
deleted file mode 100644
index e0bed52dacd..00000000000
--- a/libjava/classpath/lib/java/lang/annotation/RetentionPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/annotation/Target.class b/libjava/classpath/lib/java/lang/annotation/Target.class
deleted file mode 100644
index 1e7bf4c9820..00000000000
--- a/libjava/classpath/lib/java/lang/annotation/Target.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/instrument/ClassDefinition.class b/libjava/classpath/lib/java/lang/instrument/ClassDefinition.class
deleted file mode 100644
index e1d143fb6cf..00000000000
--- a/libjava/classpath/lib/java/lang/instrument/ClassDefinition.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/instrument/ClassFileTransformer.class b/libjava/classpath/lib/java/lang/instrument/ClassFileTransformer.class
deleted file mode 100644
index d52c8a89d5d..00000000000
--- a/libjava/classpath/lib/java/lang/instrument/ClassFileTransformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/instrument/IllegalClassFormatException.class b/libjava/classpath/lib/java/lang/instrument/IllegalClassFormatException.class
deleted file mode 100644
index a11446d756f..00000000000
--- a/libjava/classpath/lib/java/lang/instrument/IllegalClassFormatException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/instrument/Instrumentation.class b/libjava/classpath/lib/java/lang/instrument/Instrumentation.class
deleted file mode 100644
index 62d3e0bdc43..00000000000
--- a/libjava/classpath/lib/java/lang/instrument/Instrumentation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/instrument/UnmodifiableClassException.class b/libjava/classpath/lib/java/lang/instrument/UnmodifiableClassException.class
deleted file mode 100644
index c5c8e618ef5..00000000000
--- a/libjava/classpath/lib/java/lang/instrument/UnmodifiableClassException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/ClassLoadingMXBean.class b/libjava/classpath/lib/java/lang/management/ClassLoadingMXBean.class
deleted file mode 100644
index 0682224ecdc..00000000000
--- a/libjava/classpath/lib/java/lang/management/ClassLoadingMXBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/CompilationMXBean.class b/libjava/classpath/lib/java/lang/management/CompilationMXBean.class
deleted file mode 100644
index 452295df969..00000000000
--- a/libjava/classpath/lib/java/lang/management/CompilationMXBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/GarbageCollectorMXBean.class b/libjava/classpath/lib/java/lang/management/GarbageCollectorMXBean.class
deleted file mode 100644
index 64c5b0a7f02..00000000000
--- a/libjava/classpath/lib/java/lang/management/GarbageCollectorMXBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/ManagementFactory.class b/libjava/classpath/lib/java/lang/management/ManagementFactory.class
deleted file mode 100644
index 0d022ca4273..00000000000
--- a/libjava/classpath/lib/java/lang/management/ManagementFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/ManagementPermission.class b/libjava/classpath/lib/java/lang/management/ManagementPermission.class
deleted file mode 100644
index 194e9914c84..00000000000
--- a/libjava/classpath/lib/java/lang/management/ManagementPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/MemoryMXBean.class b/libjava/classpath/lib/java/lang/management/MemoryMXBean.class
deleted file mode 100644
index 019e5899ec9..00000000000
--- a/libjava/classpath/lib/java/lang/management/MemoryMXBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/MemoryManagerMXBean.class b/libjava/classpath/lib/java/lang/management/MemoryManagerMXBean.class
deleted file mode 100644
index 1ada025d038..00000000000
--- a/libjava/classpath/lib/java/lang/management/MemoryManagerMXBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/MemoryNotificationInfo.class b/libjava/classpath/lib/java/lang/management/MemoryNotificationInfo.class
deleted file mode 100644
index 1b64e3c9d9b..00000000000
--- a/libjava/classpath/lib/java/lang/management/MemoryNotificationInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/MemoryPoolMXBean.class b/libjava/classpath/lib/java/lang/management/MemoryPoolMXBean.class
deleted file mode 100644
index 748378a200d..00000000000
--- a/libjava/classpath/lib/java/lang/management/MemoryPoolMXBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/MemoryType.class b/libjava/classpath/lib/java/lang/management/MemoryType.class
deleted file mode 100644
index 74f016552f3..00000000000
--- a/libjava/classpath/lib/java/lang/management/MemoryType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/MemoryUsage.class b/libjava/classpath/lib/java/lang/management/MemoryUsage.class
deleted file mode 100644
index 401f08c6543..00000000000
--- a/libjava/classpath/lib/java/lang/management/MemoryUsage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/OperatingSystemMXBean.class b/libjava/classpath/lib/java/lang/management/OperatingSystemMXBean.class
deleted file mode 100644
index b63966b93f9..00000000000
--- a/libjava/classpath/lib/java/lang/management/OperatingSystemMXBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/RuntimeMXBean.class b/libjava/classpath/lib/java/lang/management/RuntimeMXBean.class
deleted file mode 100644
index 292d8b8b077..00000000000
--- a/libjava/classpath/lib/java/lang/management/RuntimeMXBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/ThreadInfo.class b/libjava/classpath/lib/java/lang/management/ThreadInfo.class
deleted file mode 100644
index 4f878343ad6..00000000000
--- a/libjava/classpath/lib/java/lang/management/ThreadInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/ThreadMXBean.class b/libjava/classpath/lib/java/lang/management/ThreadMXBean.class
deleted file mode 100644
index af295c329df..00000000000
--- a/libjava/classpath/lib/java/lang/management/ThreadMXBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/management/VMManagementFactory.class b/libjava/classpath/lib/java/lang/management/VMManagementFactory.class
deleted file mode 100644
index 98185d22de3..00000000000
--- a/libjava/classpath/lib/java/lang/management/VMManagementFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ref/PhantomReference.class b/libjava/classpath/lib/java/lang/ref/PhantomReference.class
deleted file mode 100644
index 30e6eb00fa0..00000000000
--- a/libjava/classpath/lib/java/lang/ref/PhantomReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ref/Reference.class b/libjava/classpath/lib/java/lang/ref/Reference.class
deleted file mode 100644
index 4ae53b32d34..00000000000
--- a/libjava/classpath/lib/java/lang/ref/Reference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ref/ReferenceQueue.class b/libjava/classpath/lib/java/lang/ref/ReferenceQueue.class
deleted file mode 100644
index 21557e3280c..00000000000
--- a/libjava/classpath/lib/java/lang/ref/ReferenceQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ref/SoftReference.class b/libjava/classpath/lib/java/lang/ref/SoftReference.class
deleted file mode 100644
index 50bbf52fcff..00000000000
--- a/libjava/classpath/lib/java/lang/ref/SoftReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/ref/WeakReference.class b/libjava/classpath/lib/java/lang/ref/WeakReference.class
deleted file mode 100644
index 634bd192a2e..00000000000
--- a/libjava/classpath/lib/java/lang/ref/WeakReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/AccessibleObject.class b/libjava/classpath/lib/java/lang/reflect/AccessibleObject.class
deleted file mode 100644
index 6f4023f2910..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/AccessibleObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/AnnotatedElement.class b/libjava/classpath/lib/java/lang/reflect/AnnotatedElement.class
deleted file mode 100644
index 23294b2ca80..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/AnnotatedElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Array.class b/libjava/classpath/lib/java/lang/reflect/Array.class
deleted file mode 100644
index 62952c3d14c..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Array.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Constructor.class b/libjava/classpath/lib/java/lang/reflect/Constructor.class
deleted file mode 100644
index a54f69aeec0..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Constructor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Field.class b/libjava/classpath/lib/java/lang/reflect/Field.class
deleted file mode 100644
index 24bfabdf732..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Field.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/GenericArrayType.class b/libjava/classpath/lib/java/lang/reflect/GenericArrayType.class
deleted file mode 100644
index d7a60be409d..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/GenericArrayType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/GenericDeclaration.class b/libjava/classpath/lib/java/lang/reflect/GenericDeclaration.class
deleted file mode 100644
index 89b7c79e2ec..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/GenericDeclaration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/GenericSignatureFormatError.class b/libjava/classpath/lib/java/lang/reflect/GenericSignatureFormatError.class
deleted file mode 100644
index f2ffdbf0804..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/GenericSignatureFormatError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/InvocationHandler.class b/libjava/classpath/lib/java/lang/reflect/InvocationHandler.class
deleted file mode 100644
index df9fec65128..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/InvocationHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/InvocationTargetException.class b/libjava/classpath/lib/java/lang/reflect/InvocationTargetException.class
deleted file mode 100644
index fa53a89a74a..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/InvocationTargetException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/MalformedParameterizedTypeException.class b/libjava/classpath/lib/java/lang/reflect/MalformedParameterizedTypeException.class
deleted file mode 100644
index e94c2466aaf..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/MalformedParameterizedTypeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Member.class b/libjava/classpath/lib/java/lang/reflect/Member.class
deleted file mode 100644
index aca4f3daaac..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Member.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Method.class b/libjava/classpath/lib/java/lang/reflect/Method.class
deleted file mode 100644
index 0a0b45cd514..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Method.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Modifier.class b/libjava/classpath/lib/java/lang/reflect/Modifier.class
deleted file mode 100644
index b4f5a31b032..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Modifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/ParameterizedType.class b/libjava/classpath/lib/java/lang/reflect/ParameterizedType.class
deleted file mode 100644
index 2edce1f8a03..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/ParameterizedType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Proxy$ClassFactory.class b/libjava/classpath/lib/java/lang/reflect/Proxy$ClassFactory.class
deleted file mode 100644
index 99141353b96..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Proxy$ClassFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Proxy$ProxyData.class b/libjava/classpath/lib/java/lang/reflect/Proxy$ProxyData.class
deleted file mode 100644
index e595c2a1b1e..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Proxy$ProxyData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Proxy$ProxySignature.class b/libjava/classpath/lib/java/lang/reflect/Proxy$ProxySignature.class
deleted file mode 100644
index 3df0e487390..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Proxy$ProxySignature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Proxy$ProxyType.class b/libjava/classpath/lib/java/lang/reflect/Proxy$ProxyType.class
deleted file mode 100644
index d43a4836ef4..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Proxy$ProxyType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Proxy.class b/libjava/classpath/lib/java/lang/reflect/Proxy.class
deleted file mode 100644
index ee410035fe5..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Proxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/ReflectPermission.class b/libjava/classpath/lib/java/lang/reflect/ReflectPermission.class
deleted file mode 100644
index 28fac663c26..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/ReflectPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/Type.class b/libjava/classpath/lib/java/lang/reflect/Type.class
deleted file mode 100644
index fce84d93b80..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/TypeVariable.class b/libjava/classpath/lib/java/lang/reflect/TypeVariable.class
deleted file mode 100644
index 49cb372e307..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/TypeVariable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/UndeclaredThrowableException.class b/libjava/classpath/lib/java/lang/reflect/UndeclaredThrowableException.class
deleted file mode 100644
index 13c08d47221..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/UndeclaredThrowableException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/VMProxy.class b/libjava/classpath/lib/java/lang/reflect/VMProxy.class
deleted file mode 100644
index 69a3314d064..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/VMProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/lang/reflect/WildcardType.class b/libjava/classpath/lib/java/lang/reflect/WildcardType.class
deleted file mode 100644
index f05e27764df..00000000000
--- a/libjava/classpath/lib/java/lang/reflect/WildcardType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/math/BigDecimal.class b/libjava/classpath/lib/java/math/BigDecimal.class
deleted file mode 100644
index 6ba16bad4c4..00000000000
--- a/libjava/classpath/lib/java/math/BigDecimal.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/math/BigInteger.class b/libjava/classpath/lib/java/math/BigInteger.class
deleted file mode 100644
index 97bede685bc..00000000000
--- a/libjava/classpath/lib/java/math/BigInteger.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/math/MathContext.class b/libjava/classpath/lib/java/math/MathContext.class
deleted file mode 100644
index c9099e9eb11..00000000000
--- a/libjava/classpath/lib/java/math/MathContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/math/RoundingMode.class b/libjava/classpath/lib/java/math/RoundingMode.class
deleted file mode 100644
index 84dff2c38bf..00000000000
--- a/libjava/classpath/lib/java/math/RoundingMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/Authenticator.class b/libjava/classpath/lib/java/net/Authenticator.class
deleted file mode 100644
index fcd17233d15..00000000000
--- a/libjava/classpath/lib/java/net/Authenticator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/BindException.class b/libjava/classpath/lib/java/net/BindException.class
deleted file mode 100644
index 6b8391227b9..00000000000
--- a/libjava/classpath/lib/java/net/BindException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/ConnectException.class b/libjava/classpath/lib/java/net/ConnectException.class
deleted file mode 100644
index 8dea4cef308..00000000000
--- a/libjava/classpath/lib/java/net/ConnectException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/ContentHandler.class b/libjava/classpath/lib/java/net/ContentHandler.class
deleted file mode 100644
index 3eea635f56d..00000000000
--- a/libjava/classpath/lib/java/net/ContentHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/ContentHandlerFactory.class b/libjava/classpath/lib/java/net/ContentHandlerFactory.class
deleted file mode 100644
index 7a4e8545044..00000000000
--- a/libjava/classpath/lib/java/net/ContentHandlerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/DatagramPacket.class b/libjava/classpath/lib/java/net/DatagramPacket.class
deleted file mode 100644
index ffa036299e1..00000000000
--- a/libjava/classpath/lib/java/net/DatagramPacket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/DatagramSocket.class b/libjava/classpath/lib/java/net/DatagramSocket.class
deleted file mode 100644
index 033684ec72f..00000000000
--- a/libjava/classpath/lib/java/net/DatagramSocket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/DatagramSocketImpl.class b/libjava/classpath/lib/java/net/DatagramSocketImpl.class
deleted file mode 100644
index bd8a144e49f..00000000000
--- a/libjava/classpath/lib/java/net/DatagramSocketImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/DatagramSocketImplFactory.class b/libjava/classpath/lib/java/net/DatagramSocketImplFactory.class
deleted file mode 100644
index bbdd18598c3..00000000000
--- a/libjava/classpath/lib/java/net/DatagramSocketImplFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/FileNameMap.class b/libjava/classpath/lib/java/net/FileNameMap.class
deleted file mode 100644
index ae390177a24..00000000000
--- a/libjava/classpath/lib/java/net/FileNameMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/HttpURLConnection.class b/libjava/classpath/lib/java/net/HttpURLConnection.class
deleted file mode 100644
index 6450b95a852..00000000000
--- a/libjava/classpath/lib/java/net/HttpURLConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/Inet4Address.class b/libjava/classpath/lib/java/net/Inet4Address.class
deleted file mode 100644
index b3a652bc637..00000000000
--- a/libjava/classpath/lib/java/net/Inet4Address.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/Inet6Address.class b/libjava/classpath/lib/java/net/Inet6Address.class
deleted file mode 100644
index d43e8a77e42..00000000000
--- a/libjava/classpath/lib/java/net/Inet6Address.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/InetAddress.class b/libjava/classpath/lib/java/net/InetAddress.class
deleted file mode 100644
index 5a419625e76..00000000000
--- a/libjava/classpath/lib/java/net/InetAddress.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/InetSocketAddress.class b/libjava/classpath/lib/java/net/InetSocketAddress.class
deleted file mode 100644
index 68caa5d5258..00000000000
--- a/libjava/classpath/lib/java/net/InetSocketAddress.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/JarURLConnection.class b/libjava/classpath/lib/java/net/JarURLConnection.class
deleted file mode 100644
index 98b16c3d034..00000000000
--- a/libjava/classpath/lib/java/net/JarURLConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/MalformedURLException.class b/libjava/classpath/lib/java/net/MalformedURLException.class
deleted file mode 100644
index 6cee07b4584..00000000000
--- a/libjava/classpath/lib/java/net/MalformedURLException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/MimeTypeMapper.class b/libjava/classpath/lib/java/net/MimeTypeMapper.class
deleted file mode 100644
index eb7f5b5a7a5..00000000000
--- a/libjava/classpath/lib/java/net/MimeTypeMapper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/MulticastSocket.class b/libjava/classpath/lib/java/net/MulticastSocket.class
deleted file mode 100644
index f218e52e567..00000000000
--- a/libjava/classpath/lib/java/net/MulticastSocket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/NetPermission.class b/libjava/classpath/lib/java/net/NetPermission.class
deleted file mode 100644
index 6c77f388cd8..00000000000
--- a/libjava/classpath/lib/java/net/NetPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/NetworkInterface.class b/libjava/classpath/lib/java/net/NetworkInterface.class
deleted file mode 100644
index f5db00bd612..00000000000
--- a/libjava/classpath/lib/java/net/NetworkInterface.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/NoRouteToHostException.class b/libjava/classpath/lib/java/net/NoRouteToHostException.class
deleted file mode 100644
index fc373e7800b..00000000000
--- a/libjava/classpath/lib/java/net/NoRouteToHostException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/PasswordAuthentication.class b/libjava/classpath/lib/java/net/PasswordAuthentication.class
deleted file mode 100644
index c1a91a112e0..00000000000
--- a/libjava/classpath/lib/java/net/PasswordAuthentication.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/PortUnreachableException.class b/libjava/classpath/lib/java/net/PortUnreachableException.class
deleted file mode 100644
index 900285ad240..00000000000
--- a/libjava/classpath/lib/java/net/PortUnreachableException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/ProtocolException.class b/libjava/classpath/lib/java/net/ProtocolException.class
deleted file mode 100644
index aad8b24aef2..00000000000
--- a/libjava/classpath/lib/java/net/ProtocolException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/Proxy$Type.class b/libjava/classpath/lib/java/net/Proxy$Type.class
deleted file mode 100644
index 7e0674a2d64..00000000000
--- a/libjava/classpath/lib/java/net/Proxy$Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/Proxy.class b/libjava/classpath/lib/java/net/Proxy.class
deleted file mode 100644
index 9c7f6d87abd..00000000000
--- a/libjava/classpath/lib/java/net/Proxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/ProxySelector.class b/libjava/classpath/lib/java/net/ProxySelector.class
deleted file mode 100644
index bb713702c75..00000000000
--- a/libjava/classpath/lib/java/net/ProxySelector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/ResolverCache$Entry.class b/libjava/classpath/lib/java/net/ResolverCache$Entry.class
deleted file mode 100644
index 4ef651145d3..00000000000
--- a/libjava/classpath/lib/java/net/ResolverCache$Entry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/ResolverCache.class b/libjava/classpath/lib/java/net/ResolverCache.class
deleted file mode 100644
index 3e8eec89ffb..00000000000
--- a/libjava/classpath/lib/java/net/ResolverCache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/ServerSocket.class b/libjava/classpath/lib/java/net/ServerSocket.class
deleted file mode 100644
index 51e194828dd..00000000000
--- a/libjava/classpath/lib/java/net/ServerSocket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/Socket.class b/libjava/classpath/lib/java/net/Socket.class
deleted file mode 100644
index d833b437ef6..00000000000
--- a/libjava/classpath/lib/java/net/Socket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/SocketAddress.class b/libjava/classpath/lib/java/net/SocketAddress.class
deleted file mode 100644
index 7372d9dc39e..00000000000
--- a/libjava/classpath/lib/java/net/SocketAddress.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/SocketException.class b/libjava/classpath/lib/java/net/SocketException.class
deleted file mode 100644
index 574c0e6250b..00000000000
--- a/libjava/classpath/lib/java/net/SocketException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/SocketImpl.class b/libjava/classpath/lib/java/net/SocketImpl.class
deleted file mode 100644
index dc05b76b502..00000000000
--- a/libjava/classpath/lib/java/net/SocketImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/SocketImplFactory.class b/libjava/classpath/lib/java/net/SocketImplFactory.class
deleted file mode 100644
index c7ea6135b26..00000000000
--- a/libjava/classpath/lib/java/net/SocketImplFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/SocketOptions.class b/libjava/classpath/lib/java/net/SocketOptions.class
deleted file mode 100644
index 69e4f1f0a92..00000000000
--- a/libjava/classpath/lib/java/net/SocketOptions.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/SocketPermission.class b/libjava/classpath/lib/java/net/SocketPermission.class
deleted file mode 100644
index addeebec615..00000000000
--- a/libjava/classpath/lib/java/net/SocketPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/SocketTimeoutException.class b/libjava/classpath/lib/java/net/SocketTimeoutException.class
deleted file mode 100644
index 8b83a276590..00000000000
--- a/libjava/classpath/lib/java/net/SocketTimeoutException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URI.class b/libjava/classpath/lib/java/net/URI.class
deleted file mode 100644
index 4d328f3126a..00000000000
--- a/libjava/classpath/lib/java/net/URI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URISyntaxException.class b/libjava/classpath/lib/java/net/URISyntaxException.class
deleted file mode 100644
index fc96d6f138f..00000000000
--- a/libjava/classpath/lib/java/net/URISyntaxException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URL$1.class b/libjava/classpath/lib/java/net/URL$1.class
deleted file mode 100644
index b4932208003..00000000000
--- a/libjava/classpath/lib/java/net/URL$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URL.class b/libjava/classpath/lib/java/net/URL.class
deleted file mode 100644
index 8eb71fda53d..00000000000
--- a/libjava/classpath/lib/java/net/URL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URLClassLoader$1.class b/libjava/classpath/lib/java/net/URLClassLoader$1.class
deleted file mode 100644
index 762625a3c7a..00000000000
--- a/libjava/classpath/lib/java/net/URLClassLoader$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URLClassLoader$2.class b/libjava/classpath/lib/java/net/URLClassLoader$2.class
deleted file mode 100644
index 741aa3bf03f..00000000000
--- a/libjava/classpath/lib/java/net/URLClassLoader$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URLClassLoader.class b/libjava/classpath/lib/java/net/URLClassLoader.class
deleted file mode 100644
index ceb736bdc91..00000000000
--- a/libjava/classpath/lib/java/net/URLClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URLConnection.class b/libjava/classpath/lib/java/net/URLConnection.class
deleted file mode 100644
index ed9a6f9389d..00000000000
--- a/libjava/classpath/lib/java/net/URLConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URLDecoder.class b/libjava/classpath/lib/java/net/URLDecoder.class
deleted file mode 100644
index 8c27d421871..00000000000
--- a/libjava/classpath/lib/java/net/URLDecoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URLEncoder.class b/libjava/classpath/lib/java/net/URLEncoder.class
deleted file mode 100644
index 4beca0018fb..00000000000
--- a/libjava/classpath/lib/java/net/URLEncoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URLStreamHandler.class b/libjava/classpath/lib/java/net/URLStreamHandler.class
deleted file mode 100644
index 2d21739bb28..00000000000
--- a/libjava/classpath/lib/java/net/URLStreamHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/URLStreamHandlerFactory.class b/libjava/classpath/lib/java/net/URLStreamHandlerFactory.class
deleted file mode 100644
index 5fd239f5cb7..00000000000
--- a/libjava/classpath/lib/java/net/URLStreamHandlerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/UnknownHostException.class b/libjava/classpath/lib/java/net/UnknownHostException.class
deleted file mode 100644
index 129af71ea43..00000000000
--- a/libjava/classpath/lib/java/net/UnknownHostException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/UnknownServiceException.class b/libjava/classpath/lib/java/net/UnknownServiceException.class
deleted file mode 100644
index 70101d849f0..00000000000
--- a/libjava/classpath/lib/java/net/UnknownServiceException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/VMInetAddress.class b/libjava/classpath/lib/java/net/VMInetAddress.class
deleted file mode 100644
index 419535677b0..00000000000
--- a/libjava/classpath/lib/java/net/VMInetAddress.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/VMNetworkInterface.class b/libjava/classpath/lib/java/net/VMNetworkInterface.class
deleted file mode 100644
index 5aa6ec55b0b..00000000000
--- a/libjava/classpath/lib/java/net/VMNetworkInterface.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/net/VMURLConnection.class b/libjava/classpath/lib/java/net/VMURLConnection.class
deleted file mode 100644
index b925d88c62e..00000000000
--- a/libjava/classpath/lib/java/net/VMURLConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/Buffer.class b/libjava/classpath/lib/java/nio/Buffer.class
deleted file mode 100644
index 4d9ef52ee85..00000000000
--- a/libjava/classpath/lib/java/nio/Buffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/BufferOverflowException.class b/libjava/classpath/lib/java/nio/BufferOverflowException.class
deleted file mode 100644
index 33d782572d9..00000000000
--- a/libjava/classpath/lib/java/nio/BufferOverflowException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/BufferUnderflowException.class b/libjava/classpath/lib/java/nio/BufferUnderflowException.class
deleted file mode 100644
index 5e60e5cba60..00000000000
--- a/libjava/classpath/lib/java/nio/BufferUnderflowException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/ByteBuffer.class b/libjava/classpath/lib/java/nio/ByteBuffer.class
deleted file mode 100644
index 183f21fa877..00000000000
--- a/libjava/classpath/lib/java/nio/ByteBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/ByteBufferHelper.class b/libjava/classpath/lib/java/nio/ByteBufferHelper.class
deleted file mode 100644
index 419c0e0b322..00000000000
--- a/libjava/classpath/lib/java/nio/ByteBufferHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/ByteBufferImpl.class b/libjava/classpath/lib/java/nio/ByteBufferImpl.class
deleted file mode 100644
index 91c35308136..00000000000
--- a/libjava/classpath/lib/java/nio/ByteBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/ByteOrder.class b/libjava/classpath/lib/java/nio/ByteOrder.class
deleted file mode 100644
index 23f94c49431..00000000000
--- a/libjava/classpath/lib/java/nio/ByteOrder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/CharBuffer.class b/libjava/classpath/lib/java/nio/CharBuffer.class
deleted file mode 100644
index 2da715f4a4b..00000000000
--- a/libjava/classpath/lib/java/nio/CharBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/CharBufferImpl.class b/libjava/classpath/lib/java/nio/CharBufferImpl.class
deleted file mode 100644
index e1beb2eaf02..00000000000
--- a/libjava/classpath/lib/java/nio/CharBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/CharViewBufferImpl.class b/libjava/classpath/lib/java/nio/CharViewBufferImpl.class
deleted file mode 100644
index 25e84f01cd4..00000000000
--- a/libjava/classpath/lib/java/nio/CharViewBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/DirectByteBufferImpl$ReadOnly.class b/libjava/classpath/lib/java/nio/DirectByteBufferImpl$ReadOnly.class
deleted file mode 100644
index c5e3561b682..00000000000
--- a/libjava/classpath/lib/java/nio/DirectByteBufferImpl$ReadOnly.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/DirectByteBufferImpl$ReadWrite.class b/libjava/classpath/lib/java/nio/DirectByteBufferImpl$ReadWrite.class
deleted file mode 100644
index 0d415d019e4..00000000000
--- a/libjava/classpath/lib/java/nio/DirectByteBufferImpl$ReadWrite.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/DirectByteBufferImpl.class b/libjava/classpath/lib/java/nio/DirectByteBufferImpl.class
deleted file mode 100644
index c6b685d8798..00000000000
--- a/libjava/classpath/lib/java/nio/DirectByteBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/DoubleBuffer.class b/libjava/classpath/lib/java/nio/DoubleBuffer.class
deleted file mode 100644
index ed274620c77..00000000000
--- a/libjava/classpath/lib/java/nio/DoubleBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/DoubleBufferImpl.class b/libjava/classpath/lib/java/nio/DoubleBufferImpl.class
deleted file mode 100644
index 91f3dc2c7e1..00000000000
--- a/libjava/classpath/lib/java/nio/DoubleBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/DoubleViewBufferImpl.class b/libjava/classpath/lib/java/nio/DoubleViewBufferImpl.class
deleted file mode 100644
index 1e50947b6d3..00000000000
--- a/libjava/classpath/lib/java/nio/DoubleViewBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/FloatBuffer.class b/libjava/classpath/lib/java/nio/FloatBuffer.class
deleted file mode 100644
index 5dde0edc370..00000000000
--- a/libjava/classpath/lib/java/nio/FloatBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/FloatBufferImpl.class b/libjava/classpath/lib/java/nio/FloatBufferImpl.class
deleted file mode 100644
index 4cacfea09ef..00000000000
--- a/libjava/classpath/lib/java/nio/FloatBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/FloatViewBufferImpl.class b/libjava/classpath/lib/java/nio/FloatViewBufferImpl.class
deleted file mode 100644
index 09fa18e1caa..00000000000
--- a/libjava/classpath/lib/java/nio/FloatViewBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/IntBuffer.class b/libjava/classpath/lib/java/nio/IntBuffer.class
deleted file mode 100644
index f604662e64a..00000000000
--- a/libjava/classpath/lib/java/nio/IntBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/IntBufferImpl.class b/libjava/classpath/lib/java/nio/IntBufferImpl.class
deleted file mode 100644
index 95b0c4d267c..00000000000
--- a/libjava/classpath/lib/java/nio/IntBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/IntViewBufferImpl.class b/libjava/classpath/lib/java/nio/IntViewBufferImpl.class
deleted file mode 100644
index 116807e8b22..00000000000
--- a/libjava/classpath/lib/java/nio/IntViewBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/InvalidMarkException.class b/libjava/classpath/lib/java/nio/InvalidMarkException.class
deleted file mode 100644
index 78b04874d7c..00000000000
--- a/libjava/classpath/lib/java/nio/InvalidMarkException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/LongBuffer.class b/libjava/classpath/lib/java/nio/LongBuffer.class
deleted file mode 100644
index 510b91eb0ef..00000000000
--- a/libjava/classpath/lib/java/nio/LongBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/LongBufferImpl.class b/libjava/classpath/lib/java/nio/LongBufferImpl.class
deleted file mode 100644
index 6c85f50580d..00000000000
--- a/libjava/classpath/lib/java/nio/LongBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/LongViewBufferImpl.class b/libjava/classpath/lib/java/nio/LongViewBufferImpl.class
deleted file mode 100644
index 381a3419b36..00000000000
--- a/libjava/classpath/lib/java/nio/LongViewBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/MappedByteBuffer.class b/libjava/classpath/lib/java/nio/MappedByteBuffer.class
deleted file mode 100644
index 05f6493a0cd..00000000000
--- a/libjava/classpath/lib/java/nio/MappedByteBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/MappedByteBufferImpl.class b/libjava/classpath/lib/java/nio/MappedByteBufferImpl.class
deleted file mode 100644
index ad5846f9294..00000000000
--- a/libjava/classpath/lib/java/nio/MappedByteBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/ReadOnlyBufferException.class b/libjava/classpath/lib/java/nio/ReadOnlyBufferException.class
deleted file mode 100644
index 358289b1fcb..00000000000
--- a/libjava/classpath/lib/java/nio/ReadOnlyBufferException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/ShortBuffer.class b/libjava/classpath/lib/java/nio/ShortBuffer.class
deleted file mode 100644
index 40d4faf3839..00000000000
--- a/libjava/classpath/lib/java/nio/ShortBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/ShortBufferImpl.class b/libjava/classpath/lib/java/nio/ShortBufferImpl.class
deleted file mode 100644
index cb5b4f3f721..00000000000
--- a/libjava/classpath/lib/java/nio/ShortBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/ShortViewBufferImpl.class b/libjava/classpath/lib/java/nio/ShortViewBufferImpl.class
deleted file mode 100644
index 5570a67d3e9..00000000000
--- a/libjava/classpath/lib/java/nio/ShortViewBufferImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/VMDirectByteBuffer.class b/libjava/classpath/lib/java/nio/VMDirectByteBuffer.class
deleted file mode 100644
index 27021f4b646..00000000000
--- a/libjava/classpath/lib/java/nio/VMDirectByteBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/AlreadyConnectedException.class b/libjava/classpath/lib/java/nio/channels/AlreadyConnectedException.class
deleted file mode 100644
index 0231c028cd2..00000000000
--- a/libjava/classpath/lib/java/nio/channels/AlreadyConnectedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/AsynchronousCloseException.class b/libjava/classpath/lib/java/nio/channels/AsynchronousCloseException.class
deleted file mode 100644
index b8e55cf4621..00000000000
--- a/libjava/classpath/lib/java/nio/channels/AsynchronousCloseException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/ByteChannel.class b/libjava/classpath/lib/java/nio/channels/ByteChannel.class
deleted file mode 100644
index b68871ff3a9..00000000000
--- a/libjava/classpath/lib/java/nio/channels/ByteChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/CancelledKeyException.class b/libjava/classpath/lib/java/nio/channels/CancelledKeyException.class
deleted file mode 100644
index 6c5ca90e8df..00000000000
--- a/libjava/classpath/lib/java/nio/channels/CancelledKeyException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/Channel.class b/libjava/classpath/lib/java/nio/channels/Channel.class
deleted file mode 100644
index 10201b69aee..00000000000
--- a/libjava/classpath/lib/java/nio/channels/Channel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/Channels.class b/libjava/classpath/lib/java/nio/channels/Channels.class
deleted file mode 100644
index 4e5a6f2631c..00000000000
--- a/libjava/classpath/lib/java/nio/channels/Channels.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/ClosedByInterruptException.class b/libjava/classpath/lib/java/nio/channels/ClosedByInterruptException.class
deleted file mode 100644
index bd381b3f6c8..00000000000
--- a/libjava/classpath/lib/java/nio/channels/ClosedByInterruptException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/ClosedChannelException.class b/libjava/classpath/lib/java/nio/channels/ClosedChannelException.class
deleted file mode 100644
index 7934e83faf1..00000000000
--- a/libjava/classpath/lib/java/nio/channels/ClosedChannelException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/ClosedSelectorException.class b/libjava/classpath/lib/java/nio/channels/ClosedSelectorException.class
deleted file mode 100644
index 086e705d832..00000000000
--- a/libjava/classpath/lib/java/nio/channels/ClosedSelectorException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/ConnectionPendingException.class b/libjava/classpath/lib/java/nio/channels/ConnectionPendingException.class
deleted file mode 100644
index 332739cb8e3..00000000000
--- a/libjava/classpath/lib/java/nio/channels/ConnectionPendingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/DatagramChannel.class b/libjava/classpath/lib/java/nio/channels/DatagramChannel.class
deleted file mode 100644
index ca3ecb35ec4..00000000000
--- a/libjava/classpath/lib/java/nio/channels/DatagramChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/FileChannel$MapMode.class b/libjava/classpath/lib/java/nio/channels/FileChannel$MapMode.class
deleted file mode 100644
index 4d7fc068624..00000000000
--- a/libjava/classpath/lib/java/nio/channels/FileChannel$MapMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/FileChannel.class b/libjava/classpath/lib/java/nio/channels/FileChannel.class
deleted file mode 100644
index a96eda95934..00000000000
--- a/libjava/classpath/lib/java/nio/channels/FileChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/FileLock.class b/libjava/classpath/lib/java/nio/channels/FileLock.class
deleted file mode 100644
index 605380da8ae..00000000000
--- a/libjava/classpath/lib/java/nio/channels/FileLock.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/FileLockInterruptionException.class b/libjava/classpath/lib/java/nio/channels/FileLockInterruptionException.class
deleted file mode 100644
index 5d7073eca25..00000000000
--- a/libjava/classpath/lib/java/nio/channels/FileLockInterruptionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/GatheringByteChannel.class b/libjava/classpath/lib/java/nio/channels/GatheringByteChannel.class
deleted file mode 100644
index a74b873ea69..00000000000
--- a/libjava/classpath/lib/java/nio/channels/GatheringByteChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/IllegalBlockingModeException.class b/libjava/classpath/lib/java/nio/channels/IllegalBlockingModeException.class
deleted file mode 100644
index f65eb9869ef..00000000000
--- a/libjava/classpath/lib/java/nio/channels/IllegalBlockingModeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/IllegalSelectorException.class b/libjava/classpath/lib/java/nio/channels/IllegalSelectorException.class
deleted file mode 100644
index 33234829f0b..00000000000
--- a/libjava/classpath/lib/java/nio/channels/IllegalSelectorException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/InterruptibleChannel.class b/libjava/classpath/lib/java/nio/channels/InterruptibleChannel.class
deleted file mode 100644
index 309067b764d..00000000000
--- a/libjava/classpath/lib/java/nio/channels/InterruptibleChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/NoConnectionPendingException.class b/libjava/classpath/lib/java/nio/channels/NoConnectionPendingException.class
deleted file mode 100644
index 727c3bdc113..00000000000
--- a/libjava/classpath/lib/java/nio/channels/NoConnectionPendingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/NonReadableChannelException.class b/libjava/classpath/lib/java/nio/channels/NonReadableChannelException.class
deleted file mode 100644
index 68f3e2d09cb..00000000000
--- a/libjava/classpath/lib/java/nio/channels/NonReadableChannelException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/NonWritableChannelException.class b/libjava/classpath/lib/java/nio/channels/NonWritableChannelException.class
deleted file mode 100644
index 479e770f2f1..00000000000
--- a/libjava/classpath/lib/java/nio/channels/NonWritableChannelException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/NotYetBoundException.class b/libjava/classpath/lib/java/nio/channels/NotYetBoundException.class
deleted file mode 100644
index bd3d9dc64d7..00000000000
--- a/libjava/classpath/lib/java/nio/channels/NotYetBoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/NotYetConnectedException.class b/libjava/classpath/lib/java/nio/channels/NotYetConnectedException.class
deleted file mode 100644
index 2da53ee8f27..00000000000
--- a/libjava/classpath/lib/java/nio/channels/NotYetConnectedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/OverlappingFileLockException.class b/libjava/classpath/lib/java/nio/channels/OverlappingFileLockException.class
deleted file mode 100644
index a9ef46c9ecd..00000000000
--- a/libjava/classpath/lib/java/nio/channels/OverlappingFileLockException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/Pipe$SinkChannel.class b/libjava/classpath/lib/java/nio/channels/Pipe$SinkChannel.class
deleted file mode 100644
index a960160ee72..00000000000
--- a/libjava/classpath/lib/java/nio/channels/Pipe$SinkChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/Pipe$SourceChannel.class b/libjava/classpath/lib/java/nio/channels/Pipe$SourceChannel.class
deleted file mode 100644
index edeaf53b593..00000000000
--- a/libjava/classpath/lib/java/nio/channels/Pipe$SourceChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/Pipe.class b/libjava/classpath/lib/java/nio/channels/Pipe.class
deleted file mode 100644
index 5a056fe7feb..00000000000
--- a/libjava/classpath/lib/java/nio/channels/Pipe.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/ReadableByteChannel.class b/libjava/classpath/lib/java/nio/channels/ReadableByteChannel.class
deleted file mode 100644
index 48e306ecf83..00000000000
--- a/libjava/classpath/lib/java/nio/channels/ReadableByteChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/ScatteringByteChannel.class b/libjava/classpath/lib/java/nio/channels/ScatteringByteChannel.class
deleted file mode 100644
index 8c5b95e5783..00000000000
--- a/libjava/classpath/lib/java/nio/channels/ScatteringByteChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/SelectableChannel.class b/libjava/classpath/lib/java/nio/channels/SelectableChannel.class
deleted file mode 100644
index 17aff976a2e..00000000000
--- a/libjava/classpath/lib/java/nio/channels/SelectableChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/SelectionKey.class b/libjava/classpath/lib/java/nio/channels/SelectionKey.class
deleted file mode 100644
index f9bddf6e3b2..00000000000
--- a/libjava/classpath/lib/java/nio/channels/SelectionKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/Selector.class b/libjava/classpath/lib/java/nio/channels/Selector.class
deleted file mode 100644
index 0469ab55c2d..00000000000
--- a/libjava/classpath/lib/java/nio/channels/Selector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/ServerSocketChannel.class b/libjava/classpath/lib/java/nio/channels/ServerSocketChannel.class
deleted file mode 100644
index 2ffe64fd27c..00000000000
--- a/libjava/classpath/lib/java/nio/channels/ServerSocketChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/SocketChannel.class b/libjava/classpath/lib/java/nio/channels/SocketChannel.class
deleted file mode 100644
index e53b0c337dc..00000000000
--- a/libjava/classpath/lib/java/nio/channels/SocketChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/UnresolvedAddressException.class b/libjava/classpath/lib/java/nio/channels/UnresolvedAddressException.class
deleted file mode 100644
index a53bb06cac8..00000000000
--- a/libjava/classpath/lib/java/nio/channels/UnresolvedAddressException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/UnsupportedAddressTypeException.class b/libjava/classpath/lib/java/nio/channels/UnsupportedAddressTypeException.class
deleted file mode 100644
index 5ca872ec7a2..00000000000
--- a/libjava/classpath/lib/java/nio/channels/UnsupportedAddressTypeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/VMChannels.class b/libjava/classpath/lib/java/nio/channels/VMChannels.class
deleted file mode 100644
index 2a265123265..00000000000
--- a/libjava/classpath/lib/java/nio/channels/VMChannels.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/WritableByteChannel.class b/libjava/classpath/lib/java/nio/channels/WritableByteChannel.class
deleted file mode 100644
index 94c77798954..00000000000
--- a/libjava/classpath/lib/java/nio/channels/WritableByteChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/spi/AbstractInterruptibleChannel.class b/libjava/classpath/lib/java/nio/channels/spi/AbstractInterruptibleChannel.class
deleted file mode 100644
index 37005d8c83f..00000000000
--- a/libjava/classpath/lib/java/nio/channels/spi/AbstractInterruptibleChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/spi/AbstractSelectableChannel.class b/libjava/classpath/lib/java/nio/channels/spi/AbstractSelectableChannel.class
deleted file mode 100644
index 50292a1becb..00000000000
--- a/libjava/classpath/lib/java/nio/channels/spi/AbstractSelectableChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/spi/AbstractSelectionKey.class b/libjava/classpath/lib/java/nio/channels/spi/AbstractSelectionKey.class
deleted file mode 100644
index a30204155e0..00000000000
--- a/libjava/classpath/lib/java/nio/channels/spi/AbstractSelectionKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/spi/AbstractSelector.class b/libjava/classpath/lib/java/nio/channels/spi/AbstractSelector.class
deleted file mode 100644
index 6a8140211b6..00000000000
--- a/libjava/classpath/lib/java/nio/channels/spi/AbstractSelector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/channels/spi/SelectorProvider.class b/libjava/classpath/lib/java/nio/channels/spi/SelectorProvider.class
deleted file mode 100644
index cb10488e150..00000000000
--- a/libjava/classpath/lib/java/nio/channels/spi/SelectorProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/CharacterCodingException.class b/libjava/classpath/lib/java/nio/charset/CharacterCodingException.class
deleted file mode 100644
index 28858ad1841..00000000000
--- a/libjava/classpath/lib/java/nio/charset/CharacterCodingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/Charset.class b/libjava/classpath/lib/java/nio/charset/Charset.class
deleted file mode 100644
index ae2b1191065..00000000000
--- a/libjava/classpath/lib/java/nio/charset/Charset.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/CharsetDecoder.class b/libjava/classpath/lib/java/nio/charset/CharsetDecoder.class
deleted file mode 100644
index 62f768df009..00000000000
--- a/libjava/classpath/lib/java/nio/charset/CharsetDecoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/CharsetEncoder.class b/libjava/classpath/lib/java/nio/charset/CharsetEncoder.class
deleted file mode 100644
index dec97fb1788..00000000000
--- a/libjava/classpath/lib/java/nio/charset/CharsetEncoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/CoderMalfunctionError.class b/libjava/classpath/lib/java/nio/charset/CoderMalfunctionError.class
deleted file mode 100644
index 5c980951590..00000000000
--- a/libjava/classpath/lib/java/nio/charset/CoderMalfunctionError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/CoderResult$1.class b/libjava/classpath/lib/java/nio/charset/CoderResult$1.class
deleted file mode 100644
index 687298887bf..00000000000
--- a/libjava/classpath/lib/java/nio/charset/CoderResult$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/CoderResult$2.class b/libjava/classpath/lib/java/nio/charset/CoderResult$2.class
deleted file mode 100644
index 84d8dae7af3..00000000000
--- a/libjava/classpath/lib/java/nio/charset/CoderResult$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/CoderResult$Cache.class b/libjava/classpath/lib/java/nio/charset/CoderResult$Cache.class
deleted file mode 100644
index 4d885f09d59..00000000000
--- a/libjava/classpath/lib/java/nio/charset/CoderResult$Cache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/CoderResult.class b/libjava/classpath/lib/java/nio/charset/CoderResult.class
deleted file mode 100644
index f68fd67eedf..00000000000
--- a/libjava/classpath/lib/java/nio/charset/CoderResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/CodingErrorAction.class b/libjava/classpath/lib/java/nio/charset/CodingErrorAction.class
deleted file mode 100644
index 8de598968d4..00000000000
--- a/libjava/classpath/lib/java/nio/charset/CodingErrorAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/IllegalCharsetNameException.class b/libjava/classpath/lib/java/nio/charset/IllegalCharsetNameException.class
deleted file mode 100644
index d31479f7208..00000000000
--- a/libjava/classpath/lib/java/nio/charset/IllegalCharsetNameException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/MalformedInputException.class b/libjava/classpath/lib/java/nio/charset/MalformedInputException.class
deleted file mode 100644
index 4d10b6da599..00000000000
--- a/libjava/classpath/lib/java/nio/charset/MalformedInputException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/UnmappableCharacterException.class b/libjava/classpath/lib/java/nio/charset/UnmappableCharacterException.class
deleted file mode 100644
index e5a7bc2d033..00000000000
--- a/libjava/classpath/lib/java/nio/charset/UnmappableCharacterException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/UnsupportedCharsetException.class b/libjava/classpath/lib/java/nio/charset/UnsupportedCharsetException.class
deleted file mode 100644
index 3c8924b014e..00000000000
--- a/libjava/classpath/lib/java/nio/charset/UnsupportedCharsetException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/nio/charset/spi/CharsetProvider.class b/libjava/classpath/lib/java/nio/charset/spi/CharsetProvider.class
deleted file mode 100644
index cdf4cbb912a..00000000000
--- a/libjava/classpath/lib/java/nio/charset/spi/CharsetProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/AccessException.class b/libjava/classpath/lib/java/rmi/AccessException.class
deleted file mode 100644
index d0e3ccadf22..00000000000
--- a/libjava/classpath/lib/java/rmi/AccessException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/AlreadyBoundException.class b/libjava/classpath/lib/java/rmi/AlreadyBoundException.class
deleted file mode 100644
index 66d4313c4a8..00000000000
--- a/libjava/classpath/lib/java/rmi/AlreadyBoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/ConnectException.class b/libjava/classpath/lib/java/rmi/ConnectException.class
deleted file mode 100644
index 6e0019e62f3..00000000000
--- a/libjava/classpath/lib/java/rmi/ConnectException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/ConnectIOException.class b/libjava/classpath/lib/java/rmi/ConnectIOException.class
deleted file mode 100644
index d5ad7dc4775..00000000000
--- a/libjava/classpath/lib/java/rmi/ConnectIOException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/MarshalException.class b/libjava/classpath/lib/java/rmi/MarshalException.class
deleted file mode 100644
index 0ba852d8d53..00000000000
--- a/libjava/classpath/lib/java/rmi/MarshalException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/MarshalledObject.class b/libjava/classpath/lib/java/rmi/MarshalledObject.class
deleted file mode 100644
index f09c1a6156a..00000000000
--- a/libjava/classpath/lib/java/rmi/MarshalledObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/Naming.class b/libjava/classpath/lib/java/rmi/Naming.class
deleted file mode 100644
index 5d866075b78..00000000000
--- a/libjava/classpath/lib/java/rmi/Naming.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/NoSuchObjectException.class b/libjava/classpath/lib/java/rmi/NoSuchObjectException.class
deleted file mode 100644
index bf68ca4dfff..00000000000
--- a/libjava/classpath/lib/java/rmi/NoSuchObjectException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/NotBoundException.class b/libjava/classpath/lib/java/rmi/NotBoundException.class
deleted file mode 100644
index ef1cb98096e..00000000000
--- a/libjava/classpath/lib/java/rmi/NotBoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/RMISecurityException.class b/libjava/classpath/lib/java/rmi/RMISecurityException.class
deleted file mode 100644
index ff293e85385..00000000000
--- a/libjava/classpath/lib/java/rmi/RMISecurityException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/RMISecurityManager.class b/libjava/classpath/lib/java/rmi/RMISecurityManager.class
deleted file mode 100644
index 41c59e9caed..00000000000
--- a/libjava/classpath/lib/java/rmi/RMISecurityManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/Remote.class b/libjava/classpath/lib/java/rmi/Remote.class
deleted file mode 100644
index a187a4943f2..00000000000
--- a/libjava/classpath/lib/java/rmi/Remote.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/RemoteException.class b/libjava/classpath/lib/java/rmi/RemoteException.class
deleted file mode 100644
index a5fcf1d4032..00000000000
--- a/libjava/classpath/lib/java/rmi/RemoteException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/ServerError.class b/libjava/classpath/lib/java/rmi/ServerError.class
deleted file mode 100644
index c93ff61d7b8..00000000000
--- a/libjava/classpath/lib/java/rmi/ServerError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/ServerException.class b/libjava/classpath/lib/java/rmi/ServerException.class
deleted file mode 100644
index 71628173564..00000000000
--- a/libjava/classpath/lib/java/rmi/ServerException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/ServerRuntimeException.class b/libjava/classpath/lib/java/rmi/ServerRuntimeException.class
deleted file mode 100644
index 4ea3675a6b7..00000000000
--- a/libjava/classpath/lib/java/rmi/ServerRuntimeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/StubNotFoundException.class b/libjava/classpath/lib/java/rmi/StubNotFoundException.class
deleted file mode 100644
index da6dd6441db..00000000000
--- a/libjava/classpath/lib/java/rmi/StubNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/UnexpectedException.class b/libjava/classpath/lib/java/rmi/UnexpectedException.class
deleted file mode 100644
index ab4e7ca6df8..00000000000
--- a/libjava/classpath/lib/java/rmi/UnexpectedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/UnknownHostException.class b/libjava/classpath/lib/java/rmi/UnknownHostException.class
deleted file mode 100644
index 699bf69344a..00000000000
--- a/libjava/classpath/lib/java/rmi/UnknownHostException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/UnmarshalException.class b/libjava/classpath/lib/java/rmi/UnmarshalException.class
deleted file mode 100644
index 7f95ac81653..00000000000
--- a/libjava/classpath/lib/java/rmi/UnmarshalException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/Activatable.class b/libjava/classpath/lib/java/rmi/activation/Activatable.class
deleted file mode 100644
index 09eee6b76e9..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/Activatable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivateFailedException.class b/libjava/classpath/lib/java/rmi/activation/ActivateFailedException.class
deleted file mode 100644
index ebac6ba5028..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivateFailedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationDesc.class b/libjava/classpath/lib/java/rmi/activation/ActivationDesc.class
deleted file mode 100644
index c1c90dcc2dd..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationDesc.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationException.class b/libjava/classpath/lib/java/rmi/activation/ActivationException.class
deleted file mode 100644
index 95f6167ba1a..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationGroup.class b/libjava/classpath/lib/java/rmi/activation/ActivationGroup.class
deleted file mode 100644
index 26a0276563e..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationGroup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationGroupDesc$CommandEnvironment.class b/libjava/classpath/lib/java/rmi/activation/ActivationGroupDesc$CommandEnvironment.class
deleted file mode 100644
index d74b3c343cd..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationGroupDesc$CommandEnvironment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationGroupDesc.class b/libjava/classpath/lib/java/rmi/activation/ActivationGroupDesc.class
deleted file mode 100644
index 7800656e70a..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationGroupDesc.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationGroupID.class b/libjava/classpath/lib/java/rmi/activation/ActivationGroupID.class
deleted file mode 100644
index d1d0cc9c5bc..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationGroupID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationGroup_Stub.class b/libjava/classpath/lib/java/rmi/activation/ActivationGroup_Stub.class
deleted file mode 100644
index e56edd93b2b..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationGroup_Stub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationID.class b/libjava/classpath/lib/java/rmi/activation/ActivationID.class
deleted file mode 100644
index 84e0e5cb494..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationInstantiator.class b/libjava/classpath/lib/java/rmi/activation/ActivationInstantiator.class
deleted file mode 100644
index d3e9f4dc9cd..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationInstantiator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationMonitor.class b/libjava/classpath/lib/java/rmi/activation/ActivationMonitor.class
deleted file mode 100644
index 28e35559397..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationMonitor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/ActivationSystem.class b/libjava/classpath/lib/java/rmi/activation/ActivationSystem.class
deleted file mode 100644
index 17eeee7cd33..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/ActivationSystem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/Activator.class b/libjava/classpath/lib/java/rmi/activation/Activator.class
deleted file mode 100644
index 1610b115818..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/Activator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/UnknownGroupException.class b/libjava/classpath/lib/java/rmi/activation/UnknownGroupException.class
deleted file mode 100644
index 4d6cbbc81ad..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/UnknownGroupException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/activation/UnknownObjectException.class b/libjava/classpath/lib/java/rmi/activation/UnknownObjectException.class
deleted file mode 100644
index 25bbb15a163..00000000000
--- a/libjava/classpath/lib/java/rmi/activation/UnknownObjectException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/dgc/DGC.class b/libjava/classpath/lib/java/rmi/dgc/DGC.class
deleted file mode 100644
index f3096baf027..00000000000
--- a/libjava/classpath/lib/java/rmi/dgc/DGC.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/dgc/Lease.class b/libjava/classpath/lib/java/rmi/dgc/Lease.class
deleted file mode 100644
index 56b39780385..00000000000
--- a/libjava/classpath/lib/java/rmi/dgc/Lease.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/dgc/VMID.class b/libjava/classpath/lib/java/rmi/dgc/VMID.class
deleted file mode 100644
index 35a992d8d27..00000000000
--- a/libjava/classpath/lib/java/rmi/dgc/VMID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/registry/LocateRegistry.class b/libjava/classpath/lib/java/rmi/registry/LocateRegistry.class
deleted file mode 100644
index 66d13c4585c..00000000000
--- a/libjava/classpath/lib/java/rmi/registry/LocateRegistry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/registry/Registry.class b/libjava/classpath/lib/java/rmi/registry/Registry.class
deleted file mode 100644
index 95dd4f7068c..00000000000
--- a/libjava/classpath/lib/java/rmi/registry/Registry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/registry/RegistryHandler.class b/libjava/classpath/lib/java/rmi/registry/RegistryHandler.class
deleted file mode 100644
index 91076eb3a48..00000000000
--- a/libjava/classpath/lib/java/rmi/registry/RegistryHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/ExportException.class b/libjava/classpath/lib/java/rmi/server/ExportException.class
deleted file mode 100644
index fd025685325..00000000000
--- a/libjava/classpath/lib/java/rmi/server/ExportException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/LoaderHandler.class b/libjava/classpath/lib/java/rmi/server/LoaderHandler.class
deleted file mode 100644
index 0ebf6708ad4..00000000000
--- a/libjava/classpath/lib/java/rmi/server/LoaderHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/LogStream.class b/libjava/classpath/lib/java/rmi/server/LogStream.class
deleted file mode 100644
index ca93a877978..00000000000
--- a/libjava/classpath/lib/java/rmi/server/LogStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/ObjID.class b/libjava/classpath/lib/java/rmi/server/ObjID.class
deleted file mode 100644
index 9fcf58ed959..00000000000
--- a/libjava/classpath/lib/java/rmi/server/ObjID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/Operation.class b/libjava/classpath/lib/java/rmi/server/Operation.class
deleted file mode 100644
index d3b96a52d96..00000000000
--- a/libjava/classpath/lib/java/rmi/server/Operation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RMIClassLoader.class b/libjava/classpath/lib/java/rmi/server/RMIClassLoader.class
deleted file mode 100644
index 91061b9c452..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RMIClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RMIClassLoaderSpi.class b/libjava/classpath/lib/java/rmi/server/RMIClassLoaderSpi.class
deleted file mode 100644
index 2a767f3430c..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RMIClassLoaderSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RMIClientSocketFactory.class b/libjava/classpath/lib/java/rmi/server/RMIClientSocketFactory.class
deleted file mode 100644
index f8cf43dbb86..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RMIClientSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RMIFailureHandler.class b/libjava/classpath/lib/java/rmi/server/RMIFailureHandler.class
deleted file mode 100644
index 6e067199edf..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RMIFailureHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RMIServerSocketFactory.class b/libjava/classpath/lib/java/rmi/server/RMIServerSocketFactory.class
deleted file mode 100644
index a27ab7a4f7e..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RMIServerSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RMISocketFactory.class b/libjava/classpath/lib/java/rmi/server/RMISocketFactory.class
deleted file mode 100644
index e854a29b8d7..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RMISocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RemoteCall.class b/libjava/classpath/lib/java/rmi/server/RemoteCall.class
deleted file mode 100644
index d80635ef0e3..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RemoteCall.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RemoteObject.class b/libjava/classpath/lib/java/rmi/server/RemoteObject.class
deleted file mode 100644
index 87dba3d9050..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RemoteObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RemoteObjectInvocationHandler.class b/libjava/classpath/lib/java/rmi/server/RemoteObjectInvocationHandler.class
deleted file mode 100644
index 107de960a5f..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RemoteObjectInvocationHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RemoteRef.class b/libjava/classpath/lib/java/rmi/server/RemoteRef.class
deleted file mode 100644
index 37fc8b9fa03..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RemoteRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RemoteServer.class b/libjava/classpath/lib/java/rmi/server/RemoteServer.class
deleted file mode 100644
index e656db2bbcb..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RemoteServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/RemoteStub.class b/libjava/classpath/lib/java/rmi/server/RemoteStub.class
deleted file mode 100644
index 3c560b3e73e..00000000000
--- a/libjava/classpath/lib/java/rmi/server/RemoteStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/ServerCloneException.class b/libjava/classpath/lib/java/rmi/server/ServerCloneException.class
deleted file mode 100644
index 393449a4016..00000000000
--- a/libjava/classpath/lib/java/rmi/server/ServerCloneException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/ServerNotActiveException.class b/libjava/classpath/lib/java/rmi/server/ServerNotActiveException.class
deleted file mode 100644
index a8c77d5c3c0..00000000000
--- a/libjava/classpath/lib/java/rmi/server/ServerNotActiveException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/ServerRef.class b/libjava/classpath/lib/java/rmi/server/ServerRef.class
deleted file mode 100644
index 455cf310afc..00000000000
--- a/libjava/classpath/lib/java/rmi/server/ServerRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/Skeleton.class b/libjava/classpath/lib/java/rmi/server/Skeleton.class
deleted file mode 100644
index 4c90847b396..00000000000
--- a/libjava/classpath/lib/java/rmi/server/Skeleton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/SkeletonMismatchException.class b/libjava/classpath/lib/java/rmi/server/SkeletonMismatchException.class
deleted file mode 100644
index 04cf9194b82..00000000000
--- a/libjava/classpath/lib/java/rmi/server/SkeletonMismatchException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/SkeletonNotFoundException.class b/libjava/classpath/lib/java/rmi/server/SkeletonNotFoundException.class
deleted file mode 100644
index 3b433cd1e12..00000000000
--- a/libjava/classpath/lib/java/rmi/server/SkeletonNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/SocketSecurityException.class b/libjava/classpath/lib/java/rmi/server/SocketSecurityException.class
deleted file mode 100644
index df031c60aad..00000000000
--- a/libjava/classpath/lib/java/rmi/server/SocketSecurityException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/UID.class b/libjava/classpath/lib/java/rmi/server/UID.class
deleted file mode 100644
index dcddb18e86e..00000000000
--- a/libjava/classpath/lib/java/rmi/server/UID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/UnicastRemoteObject.class b/libjava/classpath/lib/java/rmi/server/UnicastRemoteObject.class
deleted file mode 100644
index 0798f7264f8..00000000000
--- a/libjava/classpath/lib/java/rmi/server/UnicastRemoteObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/rmi/server/Unreferenced.class b/libjava/classpath/lib/java/rmi/server/Unreferenced.class
deleted file mode 100644
index 20ae1569249..00000000000
--- a/libjava/classpath/lib/java/rmi/server/Unreferenced.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/AccessControlContext.class b/libjava/classpath/lib/java/security/AccessControlContext.class
deleted file mode 100644
index 8088ee91d04..00000000000
--- a/libjava/classpath/lib/java/security/AccessControlContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/AccessControlException.class b/libjava/classpath/lib/java/security/AccessControlException.class
deleted file mode 100644
index ea2ade7e89a..00000000000
--- a/libjava/classpath/lib/java/security/AccessControlException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/AccessController.class b/libjava/classpath/lib/java/security/AccessController.class
deleted file mode 100644
index 7d2ff3379cb..00000000000
--- a/libjava/classpath/lib/java/security/AccessController.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/AlgorithmParameterGenerator.class b/libjava/classpath/lib/java/security/AlgorithmParameterGenerator.class
deleted file mode 100644
index 7810eafc93a..00000000000
--- a/libjava/classpath/lib/java/security/AlgorithmParameterGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/AlgorithmParameterGeneratorSpi.class b/libjava/classpath/lib/java/security/AlgorithmParameterGeneratorSpi.class
deleted file mode 100644
index c92e585cf42..00000000000
--- a/libjava/classpath/lib/java/security/AlgorithmParameterGeneratorSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/AlgorithmParameters.class b/libjava/classpath/lib/java/security/AlgorithmParameters.class
deleted file mode 100644
index a9d77c910bf..00000000000
--- a/libjava/classpath/lib/java/security/AlgorithmParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/AlgorithmParametersSpi.class b/libjava/classpath/lib/java/security/AlgorithmParametersSpi.class
deleted file mode 100644
index a094e3523c0..00000000000
--- a/libjava/classpath/lib/java/security/AlgorithmParametersSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/AllPermission$AllPermissionCollection.class b/libjava/classpath/lib/java/security/AllPermission$AllPermissionCollection.class
deleted file mode 100644
index 49e969e5ca0..00000000000
--- a/libjava/classpath/lib/java/security/AllPermission$AllPermissionCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/AllPermission.class b/libjava/classpath/lib/java/security/AllPermission.class
deleted file mode 100644
index 616e7a5e7bd..00000000000
--- a/libjava/classpath/lib/java/security/AllPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/BasicPermission$BasicPermissionCollection.class b/libjava/classpath/lib/java/security/BasicPermission$BasicPermissionCollection.class
deleted file mode 100644
index 23065c3eb65..00000000000
--- a/libjava/classpath/lib/java/security/BasicPermission$BasicPermissionCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/BasicPermission.class b/libjava/classpath/lib/java/security/BasicPermission.class
deleted file mode 100644
index 00b2d169aa3..00000000000
--- a/libjava/classpath/lib/java/security/BasicPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Certificate.class b/libjava/classpath/lib/java/security/Certificate.class
deleted file mode 100644
index 5e9236053d1..00000000000
--- a/libjava/classpath/lib/java/security/Certificate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/CodeSource.class b/libjava/classpath/lib/java/security/CodeSource.class
deleted file mode 100644
index 733d14d841c..00000000000
--- a/libjava/classpath/lib/java/security/CodeSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/DigestException.class b/libjava/classpath/lib/java/security/DigestException.class
deleted file mode 100644
index 26356144103..00000000000
--- a/libjava/classpath/lib/java/security/DigestException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/DigestInputStream.class b/libjava/classpath/lib/java/security/DigestInputStream.class
deleted file mode 100644
index bcfefac2176..00000000000
--- a/libjava/classpath/lib/java/security/DigestInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/DigestOutputStream.class b/libjava/classpath/lib/java/security/DigestOutputStream.class
deleted file mode 100644
index 44a74b6420c..00000000000
--- a/libjava/classpath/lib/java/security/DigestOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/DomainCombiner.class b/libjava/classpath/lib/java/security/DomainCombiner.class
deleted file mode 100644
index 6cf02d079cb..00000000000
--- a/libjava/classpath/lib/java/security/DomainCombiner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/DummyKeyPairGenerator.class b/libjava/classpath/lib/java/security/DummyKeyPairGenerator.class
deleted file mode 100644
index 4933178fa18..00000000000
--- a/libjava/classpath/lib/java/security/DummyKeyPairGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/DummyMessageDigest.class b/libjava/classpath/lib/java/security/DummyMessageDigest.class
deleted file mode 100644
index f83915d9949..00000000000
--- a/libjava/classpath/lib/java/security/DummyMessageDigest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/DummySignature.class b/libjava/classpath/lib/java/security/DummySignature.class
deleted file mode 100644
index 712cc0340da..00000000000
--- a/libjava/classpath/lib/java/security/DummySignature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/GeneralSecurityException.class b/libjava/classpath/lib/java/security/GeneralSecurityException.class
deleted file mode 100644
index 77dca62f2d5..00000000000
--- a/libjava/classpath/lib/java/security/GeneralSecurityException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Guard.class b/libjava/classpath/lib/java/security/Guard.class
deleted file mode 100644
index a52f428e2b6..00000000000
--- a/libjava/classpath/lib/java/security/Guard.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/GuardedObject.class b/libjava/classpath/lib/java/security/GuardedObject.class
deleted file mode 100644
index 2b3b188850f..00000000000
--- a/libjava/classpath/lib/java/security/GuardedObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Identity.class b/libjava/classpath/lib/java/security/Identity.class
deleted file mode 100644
index a2de474e5b4..00000000000
--- a/libjava/classpath/lib/java/security/Identity.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/IdentityScope.class b/libjava/classpath/lib/java/security/IdentityScope.class
deleted file mode 100644
index 8b1480e4f7e..00000000000
--- a/libjava/classpath/lib/java/security/IdentityScope.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/IntersectingDomainCombiner.class b/libjava/classpath/lib/java/security/IntersectingDomainCombiner.class
deleted file mode 100644
index 6fe8af79b82..00000000000
--- a/libjava/classpath/lib/java/security/IntersectingDomainCombiner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/InvalidAlgorithmParameterException.class b/libjava/classpath/lib/java/security/InvalidAlgorithmParameterException.class
deleted file mode 100644
index cec2e2c1e0c..00000000000
--- a/libjava/classpath/lib/java/security/InvalidAlgorithmParameterException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/InvalidKeyException.class b/libjava/classpath/lib/java/security/InvalidKeyException.class
deleted file mode 100644
index 520793c9974..00000000000
--- a/libjava/classpath/lib/java/security/InvalidKeyException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/InvalidParameterException.class b/libjava/classpath/lib/java/security/InvalidParameterException.class
deleted file mode 100644
index ff473f72e4d..00000000000
--- a/libjava/classpath/lib/java/security/InvalidParameterException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Key.class b/libjava/classpath/lib/java/security/Key.class
deleted file mode 100644
index e8ce277d1a2..00000000000
--- a/libjava/classpath/lib/java/security/Key.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/KeyException.class b/libjava/classpath/lib/java/security/KeyException.class
deleted file mode 100644
index 03912d819e6..00000000000
--- a/libjava/classpath/lib/java/security/KeyException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/KeyFactory.class b/libjava/classpath/lib/java/security/KeyFactory.class
deleted file mode 100644
index 42a4c971625..00000000000
--- a/libjava/classpath/lib/java/security/KeyFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/KeyFactorySpi.class b/libjava/classpath/lib/java/security/KeyFactorySpi.class
deleted file mode 100644
index a8183aa11a1..00000000000
--- a/libjava/classpath/lib/java/security/KeyFactorySpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/KeyManagementException.class b/libjava/classpath/lib/java/security/KeyManagementException.class
deleted file mode 100644
index 173f42ca4e6..00000000000
--- a/libjava/classpath/lib/java/security/KeyManagementException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/KeyPair.class b/libjava/classpath/lib/java/security/KeyPair.class
deleted file mode 100644
index 9b47427c0af..00000000000
--- a/libjava/classpath/lib/java/security/KeyPair.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/KeyPairGenerator.class b/libjava/classpath/lib/java/security/KeyPairGenerator.class
deleted file mode 100644
index ad30b19d38b..00000000000
--- a/libjava/classpath/lib/java/security/KeyPairGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/KeyPairGeneratorSpi.class b/libjava/classpath/lib/java/security/KeyPairGeneratorSpi.class
deleted file mode 100644
index c136552de6a..00000000000
--- a/libjava/classpath/lib/java/security/KeyPairGeneratorSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/KeyStore.class b/libjava/classpath/lib/java/security/KeyStore.class
deleted file mode 100644
index 73563ee6d7a..00000000000
--- a/libjava/classpath/lib/java/security/KeyStore.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/KeyStoreException.class b/libjava/classpath/lib/java/security/KeyStoreException.class
deleted file mode 100644
index 8a7c1bcd1ca..00000000000
--- a/libjava/classpath/lib/java/security/KeyStoreException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/KeyStoreSpi.class b/libjava/classpath/lib/java/security/KeyStoreSpi.class
deleted file mode 100644
index 12a36ebc2ec..00000000000
--- a/libjava/classpath/lib/java/security/KeyStoreSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/MessageDigest.class b/libjava/classpath/lib/java/security/MessageDigest.class
deleted file mode 100644
index b2c9e734ea7..00000000000
--- a/libjava/classpath/lib/java/security/MessageDigest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/MessageDigestSpi.class b/libjava/classpath/lib/java/security/MessageDigestSpi.class
deleted file mode 100644
index f04ecf852b7..00000000000
--- a/libjava/classpath/lib/java/security/MessageDigestSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/NoSuchAlgorithmException.class b/libjava/classpath/lib/java/security/NoSuchAlgorithmException.class
deleted file mode 100644
index 931fffd411f..00000000000
--- a/libjava/classpath/lib/java/security/NoSuchAlgorithmException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/NoSuchProviderException.class b/libjava/classpath/lib/java/security/NoSuchProviderException.class
deleted file mode 100644
index 9f46364d393..00000000000
--- a/libjava/classpath/lib/java/security/NoSuchProviderException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Permission.class b/libjava/classpath/lib/java/security/Permission.class
deleted file mode 100644
index d9db3fae009..00000000000
--- a/libjava/classpath/lib/java/security/Permission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/PermissionCollection.class b/libjava/classpath/lib/java/security/PermissionCollection.class
deleted file mode 100644
index bb61795ca6c..00000000000
--- a/libjava/classpath/lib/java/security/PermissionCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Permissions$1.class b/libjava/classpath/lib/java/security/Permissions$1.class
deleted file mode 100644
index c118bb9a1ce..00000000000
--- a/libjava/classpath/lib/java/security/Permissions$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Permissions$PermissionsHash.class b/libjava/classpath/lib/java/security/Permissions$PermissionsHash.class
deleted file mode 100644
index b011dc1af4b..00000000000
--- a/libjava/classpath/lib/java/security/Permissions$PermissionsHash.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Permissions.class b/libjava/classpath/lib/java/security/Permissions.class
deleted file mode 100644
index 17b6636d6d6..00000000000
--- a/libjava/classpath/lib/java/security/Permissions.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Policy.class b/libjava/classpath/lib/java/security/Policy.class
deleted file mode 100644
index 4bc47cf4306..00000000000
--- a/libjava/classpath/lib/java/security/Policy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Principal.class b/libjava/classpath/lib/java/security/Principal.class
deleted file mode 100644
index b151339a4a2..00000000000
--- a/libjava/classpath/lib/java/security/Principal.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/PrivateKey.class b/libjava/classpath/lib/java/security/PrivateKey.class
deleted file mode 100644
index 1e24970535d..00000000000
--- a/libjava/classpath/lib/java/security/PrivateKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/PrivilegedAction.class b/libjava/classpath/lib/java/security/PrivilegedAction.class
deleted file mode 100644
index 027abc8b819..00000000000
--- a/libjava/classpath/lib/java/security/PrivilegedAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/PrivilegedActionException.class b/libjava/classpath/lib/java/security/PrivilegedActionException.class
deleted file mode 100644
index 55ce31ebbf0..00000000000
--- a/libjava/classpath/lib/java/security/PrivilegedActionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/PrivilegedExceptionAction.class b/libjava/classpath/lib/java/security/PrivilegedExceptionAction.class
deleted file mode 100644
index 473f9c6bd2c..00000000000
--- a/libjava/classpath/lib/java/security/PrivilegedExceptionAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/ProtectionDomain.class b/libjava/classpath/lib/java/security/ProtectionDomain.class
deleted file mode 100644
index cfac87e6aea..00000000000
--- a/libjava/classpath/lib/java/security/ProtectionDomain.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Provider.class b/libjava/classpath/lib/java/security/Provider.class
deleted file mode 100644
index 05a05bd6b21..00000000000
--- a/libjava/classpath/lib/java/security/Provider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/ProviderException.class b/libjava/classpath/lib/java/security/ProviderException.class
deleted file mode 100644
index 040f714e733..00000000000
--- a/libjava/classpath/lib/java/security/ProviderException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/PublicKey.class b/libjava/classpath/lib/java/security/PublicKey.class
deleted file mode 100644
index 8220d30a3dd..00000000000
--- a/libjava/classpath/lib/java/security/PublicKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/SecureClassLoader.class b/libjava/classpath/lib/java/security/SecureClassLoader.class
deleted file mode 100644
index 62736c8b066..00000000000
--- a/libjava/classpath/lib/java/security/SecureClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/SecureRandom.class b/libjava/classpath/lib/java/security/SecureRandom.class
deleted file mode 100644
index 78bdc63f9fe..00000000000
--- a/libjava/classpath/lib/java/security/SecureRandom.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/SecureRandomSpi.class b/libjava/classpath/lib/java/security/SecureRandomSpi.class
deleted file mode 100644
index b0c6d5edf76..00000000000
--- a/libjava/classpath/lib/java/security/SecureRandomSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Security.class b/libjava/classpath/lib/java/security/Security.class
deleted file mode 100644
index 33419eb80c5..00000000000
--- a/libjava/classpath/lib/java/security/Security.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/SecurityPermission.class b/libjava/classpath/lib/java/security/SecurityPermission.class
deleted file mode 100644
index b7bdffc4426..00000000000
--- a/libjava/classpath/lib/java/security/SecurityPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Signature.class b/libjava/classpath/lib/java/security/Signature.class
deleted file mode 100644
index eed75c19d44..00000000000
--- a/libjava/classpath/lib/java/security/Signature.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/SignatureException.class b/libjava/classpath/lib/java/security/SignatureException.class
deleted file mode 100644
index c6d97ff886b..00000000000
--- a/libjava/classpath/lib/java/security/SignatureException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/SignatureSpi.class b/libjava/classpath/lib/java/security/SignatureSpi.class
deleted file mode 100644
index 426f987a9f3..00000000000
--- a/libjava/classpath/lib/java/security/SignatureSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/SignedObject.class b/libjava/classpath/lib/java/security/SignedObject.class
deleted file mode 100644
index 3f3cd5318ec..00000000000
--- a/libjava/classpath/lib/java/security/SignedObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/Signer.class b/libjava/classpath/lib/java/security/Signer.class
deleted file mode 100644
index 61d61658962..00000000000
--- a/libjava/classpath/lib/java/security/Signer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/UnrecoverableKeyException.class b/libjava/classpath/lib/java/security/UnrecoverableKeyException.class
deleted file mode 100644
index 3976d41690d..00000000000
--- a/libjava/classpath/lib/java/security/UnrecoverableKeyException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/UnresolvedPermission.class b/libjava/classpath/lib/java/security/UnresolvedPermission.class
deleted file mode 100644
index 8304a0c2ff6..00000000000
--- a/libjava/classpath/lib/java/security/UnresolvedPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/UnresolvedPermissionCollection$1.class b/libjava/classpath/lib/java/security/UnresolvedPermissionCollection$1.class
deleted file mode 100644
index cded8e7fb56..00000000000
--- a/libjava/classpath/lib/java/security/UnresolvedPermissionCollection$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/UnresolvedPermissionCollection.class b/libjava/classpath/lib/java/security/UnresolvedPermissionCollection.class
deleted file mode 100644
index ab046caca79..00000000000
--- a/libjava/classpath/lib/java/security/UnresolvedPermissionCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/VMAccessControlState.class b/libjava/classpath/lib/java/security/VMAccessControlState.class
deleted file mode 100644
index a960fa9461d..00000000000
--- a/libjava/classpath/lib/java/security/VMAccessControlState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/VMAccessController.class b/libjava/classpath/lib/java/security/VMAccessController.class
deleted file mode 100644
index d05cd9c8456..00000000000
--- a/libjava/classpath/lib/java/security/VMAccessController.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/VMSecureRandom$Spinner.class b/libjava/classpath/lib/java/security/VMSecureRandom$Spinner.class
deleted file mode 100644
index 955a1f3db72..00000000000
--- a/libjava/classpath/lib/java/security/VMSecureRandom$Spinner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/VMSecureRandom.class b/libjava/classpath/lib/java/security/VMSecureRandom.class
deleted file mode 100644
index 08a44d63f80..00000000000
--- a/libjava/classpath/lib/java/security/VMSecureRandom.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/acl/Acl.class b/libjava/classpath/lib/java/security/acl/Acl.class
deleted file mode 100644
index 250e3f47f33..00000000000
--- a/libjava/classpath/lib/java/security/acl/Acl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/acl/AclEntry.class b/libjava/classpath/lib/java/security/acl/AclEntry.class
deleted file mode 100644
index 586a36e8165..00000000000
--- a/libjava/classpath/lib/java/security/acl/AclEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/acl/AclNotFoundException.class b/libjava/classpath/lib/java/security/acl/AclNotFoundException.class
deleted file mode 100644
index 55cd695dc8f..00000000000
--- a/libjava/classpath/lib/java/security/acl/AclNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/acl/Group.class b/libjava/classpath/lib/java/security/acl/Group.class
deleted file mode 100644
index b0d5a2c55c8..00000000000
--- a/libjava/classpath/lib/java/security/acl/Group.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/acl/LastOwnerException.class b/libjava/classpath/lib/java/security/acl/LastOwnerException.class
deleted file mode 100644
index e3bbdeea7f0..00000000000
--- a/libjava/classpath/lib/java/security/acl/LastOwnerException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/acl/NotOwnerException.class b/libjava/classpath/lib/java/security/acl/NotOwnerException.class
deleted file mode 100644
index f11740fa345..00000000000
--- a/libjava/classpath/lib/java/security/acl/NotOwnerException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/acl/Owner.class b/libjava/classpath/lib/java/security/acl/Owner.class
deleted file mode 100644
index 0144a74e964..00000000000
--- a/libjava/classpath/lib/java/security/acl/Owner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/acl/Permission.class b/libjava/classpath/lib/java/security/acl/Permission.class
deleted file mode 100644
index f304848cb2f..00000000000
--- a/libjava/classpath/lib/java/security/acl/Permission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CRL.class b/libjava/classpath/lib/java/security/cert/CRL.class
deleted file mode 100644
index bda9c3e7dc9..00000000000
--- a/libjava/classpath/lib/java/security/cert/CRL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CRLException.class b/libjava/classpath/lib/java/security/cert/CRLException.class
deleted file mode 100644
index ab089611fd2..00000000000
--- a/libjava/classpath/lib/java/security/cert/CRLException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CRLSelector.class b/libjava/classpath/lib/java/security/cert/CRLSelector.class
deleted file mode 100644
index 2fc15051ccf..00000000000
--- a/libjava/classpath/lib/java/security/cert/CRLSelector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPath$CertPathRep.class b/libjava/classpath/lib/java/security/cert/CertPath$CertPathRep.class
deleted file mode 100644
index 58cd7b03bcc..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPath$CertPathRep.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPath.class b/libjava/classpath/lib/java/security/cert/CertPath.class
deleted file mode 100644
index b16f484e059..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPath.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPathBuilder.class b/libjava/classpath/lib/java/security/cert/CertPathBuilder.class
deleted file mode 100644
index fba37d76618..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPathBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPathBuilderException.class b/libjava/classpath/lib/java/security/cert/CertPathBuilderException.class
deleted file mode 100644
index a6b3c8c185b..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPathBuilderException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPathBuilderResult.class b/libjava/classpath/lib/java/security/cert/CertPathBuilderResult.class
deleted file mode 100644
index 3abb577210a..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPathBuilderResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPathBuilderSpi.class b/libjava/classpath/lib/java/security/cert/CertPathBuilderSpi.class
deleted file mode 100644
index eea07821c45..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPathBuilderSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPathParameters.class b/libjava/classpath/lib/java/security/cert/CertPathParameters.class
deleted file mode 100644
index bfb72c44caa..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPathParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPathValidator$1.class b/libjava/classpath/lib/java/security/cert/CertPathValidator$1.class
deleted file mode 100644
index 5d058c21969..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPathValidator$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPathValidator.class b/libjava/classpath/lib/java/security/cert/CertPathValidator.class
deleted file mode 100644
index eb2b70d85fc..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPathValidator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPathValidatorException.class b/libjava/classpath/lib/java/security/cert/CertPathValidatorException.class
deleted file mode 100644
index 367c1cf0a80..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPathValidatorException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPathValidatorResult.class b/libjava/classpath/lib/java/security/cert/CertPathValidatorResult.class
deleted file mode 100644
index 4aaf63c12c4..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPathValidatorResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertPathValidatorSpi.class b/libjava/classpath/lib/java/security/cert/CertPathValidatorSpi.class
deleted file mode 100644
index adba53b0100..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertPathValidatorSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertSelector.class b/libjava/classpath/lib/java/security/cert/CertSelector.class
deleted file mode 100644
index 84105e7efa5..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertSelector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertStore$1.class b/libjava/classpath/lib/java/security/cert/CertStore$1.class
deleted file mode 100644
index 19e537aa332..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertStore$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertStore.class b/libjava/classpath/lib/java/security/cert/CertStore.class
deleted file mode 100644
index 7901487477c..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertStore.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertStoreException.class b/libjava/classpath/lib/java/security/cert/CertStoreException.class
deleted file mode 100644
index c779edd8747..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertStoreException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertStoreParameters.class b/libjava/classpath/lib/java/security/cert/CertStoreParameters.class
deleted file mode 100644
index 2ce983a70a0..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertStoreParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertStoreSpi.class b/libjava/classpath/lib/java/security/cert/CertStoreSpi.class
deleted file mode 100644
index ddc8407e1a2..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertStoreSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/Certificate$CertificateRep.class b/libjava/classpath/lib/java/security/cert/Certificate$CertificateRep.class
deleted file mode 100644
index bd1da5fae2c..00000000000
--- a/libjava/classpath/lib/java/security/cert/Certificate$CertificateRep.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/Certificate.class b/libjava/classpath/lib/java/security/cert/Certificate.class
deleted file mode 100644
index c97a9678c66..00000000000
--- a/libjava/classpath/lib/java/security/cert/Certificate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertificateEncodingException.class b/libjava/classpath/lib/java/security/cert/CertificateEncodingException.class
deleted file mode 100644
index 1bb15a73e7c..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertificateEncodingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertificateException.class b/libjava/classpath/lib/java/security/cert/CertificateException.class
deleted file mode 100644
index a453eda0913..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertificateException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertificateExpiredException.class b/libjava/classpath/lib/java/security/cert/CertificateExpiredException.class
deleted file mode 100644
index 4d0007db4b1..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertificateExpiredException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertificateFactory.class b/libjava/classpath/lib/java/security/cert/CertificateFactory.class
deleted file mode 100644
index 8b0973e2b73..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertificateFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertificateFactorySpi.class b/libjava/classpath/lib/java/security/cert/CertificateFactorySpi.class
deleted file mode 100644
index 76ee2efbe64..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertificateFactorySpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertificateNotYetValidException.class b/libjava/classpath/lib/java/security/cert/CertificateNotYetValidException.class
deleted file mode 100644
index ffc55718528..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertificateNotYetValidException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CertificateParsingException.class b/libjava/classpath/lib/java/security/cert/CertificateParsingException.class
deleted file mode 100644
index f0e078a1f22..00000000000
--- a/libjava/classpath/lib/java/security/cert/CertificateParsingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/CollectionCertStoreParameters.class b/libjava/classpath/lib/java/security/cert/CollectionCertStoreParameters.class
deleted file mode 100644
index d9c59abda40..00000000000
--- a/libjava/classpath/lib/java/security/cert/CollectionCertStoreParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/LDAPCertStoreParameters.class b/libjava/classpath/lib/java/security/cert/LDAPCertStoreParameters.class
deleted file mode 100644
index a9c8d581684..00000000000
--- a/libjava/classpath/lib/java/security/cert/LDAPCertStoreParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/PKIXBuilderParameters.class b/libjava/classpath/lib/java/security/cert/PKIXBuilderParameters.class
deleted file mode 100644
index b6b14258956..00000000000
--- a/libjava/classpath/lib/java/security/cert/PKIXBuilderParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/PKIXCertPathBuilderResult.class b/libjava/classpath/lib/java/security/cert/PKIXCertPathBuilderResult.class
deleted file mode 100644
index 383ea72a9bd..00000000000
--- a/libjava/classpath/lib/java/security/cert/PKIXCertPathBuilderResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/PKIXCertPathChecker.class b/libjava/classpath/lib/java/security/cert/PKIXCertPathChecker.class
deleted file mode 100644
index eec2ae93c02..00000000000
--- a/libjava/classpath/lib/java/security/cert/PKIXCertPathChecker.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/PKIXCertPathValidatorResult.class b/libjava/classpath/lib/java/security/cert/PKIXCertPathValidatorResult.class
deleted file mode 100644
index 55b8c60d051..00000000000
--- a/libjava/classpath/lib/java/security/cert/PKIXCertPathValidatorResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/PKIXParameters.class b/libjava/classpath/lib/java/security/cert/PKIXParameters.class
deleted file mode 100644
index 07605e54d92..00000000000
--- a/libjava/classpath/lib/java/security/cert/PKIXParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/PolicyNode.class b/libjava/classpath/lib/java/security/cert/PolicyNode.class
deleted file mode 100644
index 82179432d0d..00000000000
--- a/libjava/classpath/lib/java/security/cert/PolicyNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/PolicyQualifierInfo.class b/libjava/classpath/lib/java/security/cert/PolicyQualifierInfo.class
deleted file mode 100644
index 5cbd3cabd84..00000000000
--- a/libjava/classpath/lib/java/security/cert/PolicyQualifierInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/TrustAnchor.class b/libjava/classpath/lib/java/security/cert/TrustAnchor.class
deleted file mode 100644
index f0139dcf516..00000000000
--- a/libjava/classpath/lib/java/security/cert/TrustAnchor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/X509CRL.class b/libjava/classpath/lib/java/security/cert/X509CRL.class
deleted file mode 100644
index 51c1cb66617..00000000000
--- a/libjava/classpath/lib/java/security/cert/X509CRL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/X509CRLEntry.class b/libjava/classpath/lib/java/security/cert/X509CRLEntry.class
deleted file mode 100644
index 06890e56c09..00000000000
--- a/libjava/classpath/lib/java/security/cert/X509CRLEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/X509CRLSelector.class b/libjava/classpath/lib/java/security/cert/X509CRLSelector.class
deleted file mode 100644
index 7e1f08ca9a2..00000000000
--- a/libjava/classpath/lib/java/security/cert/X509CRLSelector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/X509CertSelector.class b/libjava/classpath/lib/java/security/cert/X509CertSelector.class
deleted file mode 100644
index 0cad7da01ab..00000000000
--- a/libjava/classpath/lib/java/security/cert/X509CertSelector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/X509Certificate.class b/libjava/classpath/lib/java/security/cert/X509Certificate.class
deleted file mode 100644
index b8ccb1279b0..00000000000
--- a/libjava/classpath/lib/java/security/cert/X509Certificate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/cert/X509Extension.class b/libjava/classpath/lib/java/security/cert/X509Extension.class
deleted file mode 100644
index bb174624a0e..00000000000
--- a/libjava/classpath/lib/java/security/cert/X509Extension.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/interfaces/DSAKey.class b/libjava/classpath/lib/java/security/interfaces/DSAKey.class
deleted file mode 100644
index e81b49ba714..00000000000
--- a/libjava/classpath/lib/java/security/interfaces/DSAKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/interfaces/DSAKeyPairGenerator.class b/libjava/classpath/lib/java/security/interfaces/DSAKeyPairGenerator.class
deleted file mode 100644
index bf5dfb4a840..00000000000
--- a/libjava/classpath/lib/java/security/interfaces/DSAKeyPairGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/interfaces/DSAParams.class b/libjava/classpath/lib/java/security/interfaces/DSAParams.class
deleted file mode 100644
index 31c5d5c893a..00000000000
--- a/libjava/classpath/lib/java/security/interfaces/DSAParams.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/interfaces/DSAPrivateKey.class b/libjava/classpath/lib/java/security/interfaces/DSAPrivateKey.class
deleted file mode 100644
index eb1ce05a860..00000000000
--- a/libjava/classpath/lib/java/security/interfaces/DSAPrivateKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/interfaces/DSAPublicKey.class b/libjava/classpath/lib/java/security/interfaces/DSAPublicKey.class
deleted file mode 100644
index be3e820de3e..00000000000
--- a/libjava/classpath/lib/java/security/interfaces/DSAPublicKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/interfaces/RSAKey.class b/libjava/classpath/lib/java/security/interfaces/RSAKey.class
deleted file mode 100644
index 2951abe650b..00000000000
--- a/libjava/classpath/lib/java/security/interfaces/RSAKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/interfaces/RSAMultiPrimePrivateCrtKey.class b/libjava/classpath/lib/java/security/interfaces/RSAMultiPrimePrivateCrtKey.class
deleted file mode 100644
index 203f43c8818..00000000000
--- a/libjava/classpath/lib/java/security/interfaces/RSAMultiPrimePrivateCrtKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/interfaces/RSAPrivateCrtKey.class b/libjava/classpath/lib/java/security/interfaces/RSAPrivateCrtKey.class
deleted file mode 100644
index 457c4cc6a26..00000000000
--- a/libjava/classpath/lib/java/security/interfaces/RSAPrivateCrtKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/interfaces/RSAPrivateKey.class b/libjava/classpath/lib/java/security/interfaces/RSAPrivateKey.class
deleted file mode 100644
index a1784672486..00000000000
--- a/libjava/classpath/lib/java/security/interfaces/RSAPrivateKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/interfaces/RSAPublicKey.class b/libjava/classpath/lib/java/security/interfaces/RSAPublicKey.class
deleted file mode 100644
index 2339eaf8b4c..00000000000
--- a/libjava/classpath/lib/java/security/interfaces/RSAPublicKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/AlgorithmParameterSpec.class b/libjava/classpath/lib/java/security/spec/AlgorithmParameterSpec.class
deleted file mode 100644
index db65a888ef9..00000000000
--- a/libjava/classpath/lib/java/security/spec/AlgorithmParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/DSAParameterSpec.class b/libjava/classpath/lib/java/security/spec/DSAParameterSpec.class
deleted file mode 100644
index f6283440487..00000000000
--- a/libjava/classpath/lib/java/security/spec/DSAParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/DSAPrivateKeySpec.class b/libjava/classpath/lib/java/security/spec/DSAPrivateKeySpec.class
deleted file mode 100644
index 80a9d7bc15b..00000000000
--- a/libjava/classpath/lib/java/security/spec/DSAPrivateKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/DSAPublicKeySpec.class b/libjava/classpath/lib/java/security/spec/DSAPublicKeySpec.class
deleted file mode 100644
index 1dd26716dd7..00000000000
--- a/libjava/classpath/lib/java/security/spec/DSAPublicKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/EncodedKeySpec.class b/libjava/classpath/lib/java/security/spec/EncodedKeySpec.class
deleted file mode 100644
index ec198d11d06..00000000000
--- a/libjava/classpath/lib/java/security/spec/EncodedKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/InvalidKeySpecException.class b/libjava/classpath/lib/java/security/spec/InvalidKeySpecException.class
deleted file mode 100644
index b751f37fa22..00000000000
--- a/libjava/classpath/lib/java/security/spec/InvalidKeySpecException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/InvalidParameterSpecException.class b/libjava/classpath/lib/java/security/spec/InvalidParameterSpecException.class
deleted file mode 100644
index 155b3e971f1..00000000000
--- a/libjava/classpath/lib/java/security/spec/InvalidParameterSpecException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/KeySpec.class b/libjava/classpath/lib/java/security/spec/KeySpec.class
deleted file mode 100644
index ef85d4b0819..00000000000
--- a/libjava/classpath/lib/java/security/spec/KeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/PKCS8EncodedKeySpec.class b/libjava/classpath/lib/java/security/spec/PKCS8EncodedKeySpec.class
deleted file mode 100644
index 238c8b9dcf9..00000000000
--- a/libjava/classpath/lib/java/security/spec/PKCS8EncodedKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/PSSParameterSpec.class b/libjava/classpath/lib/java/security/spec/PSSParameterSpec.class
deleted file mode 100644
index 04755ddfdd1..00000000000
--- a/libjava/classpath/lib/java/security/spec/PSSParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/RSAKeyGenParameterSpec.class b/libjava/classpath/lib/java/security/spec/RSAKeyGenParameterSpec.class
deleted file mode 100644
index 302add6f2c6..00000000000
--- a/libjava/classpath/lib/java/security/spec/RSAKeyGenParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.class b/libjava/classpath/lib/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.class
deleted file mode 100644
index c5fb8c65243..00000000000
--- a/libjava/classpath/lib/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/RSAOtherPrimeInfo.class b/libjava/classpath/lib/java/security/spec/RSAOtherPrimeInfo.class
deleted file mode 100644
index 537da042c00..00000000000
--- a/libjava/classpath/lib/java/security/spec/RSAOtherPrimeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/RSAPrivateCrtKeySpec.class b/libjava/classpath/lib/java/security/spec/RSAPrivateCrtKeySpec.class
deleted file mode 100644
index 7553f6f5493..00000000000
--- a/libjava/classpath/lib/java/security/spec/RSAPrivateCrtKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/RSAPrivateKeySpec.class b/libjava/classpath/lib/java/security/spec/RSAPrivateKeySpec.class
deleted file mode 100644
index f1084e17139..00000000000
--- a/libjava/classpath/lib/java/security/spec/RSAPrivateKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/RSAPublicKeySpec.class b/libjava/classpath/lib/java/security/spec/RSAPublicKeySpec.class
deleted file mode 100644
index d170ebecf62..00000000000
--- a/libjava/classpath/lib/java/security/spec/RSAPublicKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/security/spec/X509EncodedKeySpec.class b/libjava/classpath/lib/java/security/spec/X509EncodedKeySpec.class
deleted file mode 100644
index 8b4a83261d9..00000000000
--- a/libjava/classpath/lib/java/security/spec/X509EncodedKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Array.class b/libjava/classpath/lib/java/sql/Array.class
deleted file mode 100644
index 8ebf014ee40..00000000000
--- a/libjava/classpath/lib/java/sql/Array.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/BatchUpdateException.class b/libjava/classpath/lib/java/sql/BatchUpdateException.class
deleted file mode 100644
index 6a011822402..00000000000
--- a/libjava/classpath/lib/java/sql/BatchUpdateException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Blob.class b/libjava/classpath/lib/java/sql/Blob.class
deleted file mode 100644
index c5d78cf1140..00000000000
--- a/libjava/classpath/lib/java/sql/Blob.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/CallableStatement.class b/libjava/classpath/lib/java/sql/CallableStatement.class
deleted file mode 100644
index 107a156c480..00000000000
--- a/libjava/classpath/lib/java/sql/CallableStatement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Clob.class b/libjava/classpath/lib/java/sql/Clob.class
deleted file mode 100644
index 937207f9cc6..00000000000
--- a/libjava/classpath/lib/java/sql/Clob.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Connection.class b/libjava/classpath/lib/java/sql/Connection.class
deleted file mode 100644
index d9adc68489a..00000000000
--- a/libjava/classpath/lib/java/sql/Connection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/DataTruncation.class b/libjava/classpath/lib/java/sql/DataTruncation.class
deleted file mode 100644
index 79ba9faf317..00000000000
--- a/libjava/classpath/lib/java/sql/DataTruncation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/DatabaseMetaData.class b/libjava/classpath/lib/java/sql/DatabaseMetaData.class
deleted file mode 100644
index 5fc91e8506d..00000000000
--- a/libjava/classpath/lib/java/sql/DatabaseMetaData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Date.class b/libjava/classpath/lib/java/sql/Date.class
deleted file mode 100644
index 5d82204f637..00000000000
--- a/libjava/classpath/lib/java/sql/Date.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Driver.class b/libjava/classpath/lib/java/sql/Driver.class
deleted file mode 100644
index 8b7b6f2aa64..00000000000
--- a/libjava/classpath/lib/java/sql/Driver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/DriverManager.class b/libjava/classpath/lib/java/sql/DriverManager.class
deleted file mode 100644
index 09bc56907b7..00000000000
--- a/libjava/classpath/lib/java/sql/DriverManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/DriverPropertyInfo.class b/libjava/classpath/lib/java/sql/DriverPropertyInfo.class
deleted file mode 100644
index 86e7830417d..00000000000
--- a/libjava/classpath/lib/java/sql/DriverPropertyInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/ParameterMetaData.class b/libjava/classpath/lib/java/sql/ParameterMetaData.class
deleted file mode 100644
index 1d990a0e159..00000000000
--- a/libjava/classpath/lib/java/sql/ParameterMetaData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/PreparedStatement.class b/libjava/classpath/lib/java/sql/PreparedStatement.class
deleted file mode 100644
index dda2c70e68c..00000000000
--- a/libjava/classpath/lib/java/sql/PreparedStatement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Ref.class b/libjava/classpath/lib/java/sql/Ref.class
deleted file mode 100644
index 870e337e5ea..00000000000
--- a/libjava/classpath/lib/java/sql/Ref.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/ResultSet.class b/libjava/classpath/lib/java/sql/ResultSet.class
deleted file mode 100644
index 7f08c392dbb..00000000000
--- a/libjava/classpath/lib/java/sql/ResultSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/ResultSetMetaData.class b/libjava/classpath/lib/java/sql/ResultSetMetaData.class
deleted file mode 100644
index 9f7e08050aa..00000000000
--- a/libjava/classpath/lib/java/sql/ResultSetMetaData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/SQLData.class b/libjava/classpath/lib/java/sql/SQLData.class
deleted file mode 100644
index 85a205f71d1..00000000000
--- a/libjava/classpath/lib/java/sql/SQLData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/SQLException.class b/libjava/classpath/lib/java/sql/SQLException.class
deleted file mode 100644
index 94cb2761b6b..00000000000
--- a/libjava/classpath/lib/java/sql/SQLException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/SQLInput.class b/libjava/classpath/lib/java/sql/SQLInput.class
deleted file mode 100644
index 0f7d735b585..00000000000
--- a/libjava/classpath/lib/java/sql/SQLInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/SQLOutput.class b/libjava/classpath/lib/java/sql/SQLOutput.class
deleted file mode 100644
index 021bdf44989..00000000000
--- a/libjava/classpath/lib/java/sql/SQLOutput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/SQLPermission.class b/libjava/classpath/lib/java/sql/SQLPermission.class
deleted file mode 100644
index d59957bddd7..00000000000
--- a/libjava/classpath/lib/java/sql/SQLPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/SQLWarning.class b/libjava/classpath/lib/java/sql/SQLWarning.class
deleted file mode 100644
index ee6d7dc29e2..00000000000
--- a/libjava/classpath/lib/java/sql/SQLWarning.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Savepoint.class b/libjava/classpath/lib/java/sql/Savepoint.class
deleted file mode 100644
index 3628fe120fd..00000000000
--- a/libjava/classpath/lib/java/sql/Savepoint.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Statement.class b/libjava/classpath/lib/java/sql/Statement.class
deleted file mode 100644
index c383f68f691..00000000000
--- a/libjava/classpath/lib/java/sql/Statement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Struct.class b/libjava/classpath/lib/java/sql/Struct.class
deleted file mode 100644
index 89b43104c62..00000000000
--- a/libjava/classpath/lib/java/sql/Struct.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Time.class b/libjava/classpath/lib/java/sql/Time.class
deleted file mode 100644
index 888edfc806e..00000000000
--- a/libjava/classpath/lib/java/sql/Time.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Timestamp.class b/libjava/classpath/lib/java/sql/Timestamp.class
deleted file mode 100644
index bfbac9d0617..00000000000
--- a/libjava/classpath/lib/java/sql/Timestamp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/sql/Types.class b/libjava/classpath/lib/java/sql/Types.class
deleted file mode 100644
index 5974e9cbbce..00000000000
--- a/libjava/classpath/lib/java/sql/Types.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/Annotation.class b/libjava/classpath/lib/java/text/Annotation.class
deleted file mode 100644
index 7af7955e747..00000000000
--- a/libjava/classpath/lib/java/text/Annotation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/AttributedCharacterIterator$Attribute.class b/libjava/classpath/lib/java/text/AttributedCharacterIterator$Attribute.class
deleted file mode 100644
index ddbbd52df23..00000000000
--- a/libjava/classpath/lib/java/text/AttributedCharacterIterator$Attribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/AttributedCharacterIterator.class b/libjava/classpath/lib/java/text/AttributedCharacterIterator.class
deleted file mode 100644
index 2fb36a2bbdd..00000000000
--- a/libjava/classpath/lib/java/text/AttributedCharacterIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/AttributedString$AttributeRange.class b/libjava/classpath/lib/java/text/AttributedString$AttributeRange.class
deleted file mode 100644
index f9419962f09..00000000000
--- a/libjava/classpath/lib/java/text/AttributedString$AttributeRange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/AttributedString.class b/libjava/classpath/lib/java/text/AttributedString.class
deleted file mode 100644
index 10bf0d721ac..00000000000
--- a/libjava/classpath/lib/java/text/AttributedString.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/AttributedStringIterator.class b/libjava/classpath/lib/java/text/AttributedStringIterator.class
deleted file mode 100644
index 0d2a79733dd..00000000000
--- a/libjava/classpath/lib/java/text/AttributedStringIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/Bidi.class b/libjava/classpath/lib/java/text/Bidi.class
deleted file mode 100644
index 4e61cb80f8f..00000000000
--- a/libjava/classpath/lib/java/text/Bidi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/BreakIterator.class b/libjava/classpath/lib/java/text/BreakIterator.class
deleted file mode 100644
index c49e8f40fc7..00000000000
--- a/libjava/classpath/lib/java/text/BreakIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/CharacterIterator.class b/libjava/classpath/lib/java/text/CharacterIterator.class
deleted file mode 100644
index 862cfd47702..00000000000
--- a/libjava/classpath/lib/java/text/CharacterIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/ChoiceFormat.class b/libjava/classpath/lib/java/text/ChoiceFormat.class
deleted file mode 100644
index 68a81e5eb4b..00000000000
--- a/libjava/classpath/lib/java/text/ChoiceFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/CollationElementIterator.class b/libjava/classpath/lib/java/text/CollationElementIterator.class
deleted file mode 100644
index 3c3176d8b22..00000000000
--- a/libjava/classpath/lib/java/text/CollationElementIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/CollationKey.class b/libjava/classpath/lib/java/text/CollationKey.class
deleted file mode 100644
index da44773045f..00000000000
--- a/libjava/classpath/lib/java/text/CollationKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/Collator.class b/libjava/classpath/lib/java/text/Collator.class
deleted file mode 100644
index a997460fbe9..00000000000
--- a/libjava/classpath/lib/java/text/Collator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/DateFormat$Field.class b/libjava/classpath/lib/java/text/DateFormat$Field.class
deleted file mode 100644
index 0c681874a3c..00000000000
--- a/libjava/classpath/lib/java/text/DateFormat$Field.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/DateFormat.class b/libjava/classpath/lib/java/text/DateFormat.class
deleted file mode 100644
index ac98f50c4d1..00000000000
--- a/libjava/classpath/lib/java/text/DateFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/DateFormatSymbols.class b/libjava/classpath/lib/java/text/DateFormatSymbols.class
deleted file mode 100644
index 72c3fdfa4da..00000000000
--- a/libjava/classpath/lib/java/text/DateFormatSymbols.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/DecimalFormat.class b/libjava/classpath/lib/java/text/DecimalFormat.class
deleted file mode 100644
index 41efb165bfa..00000000000
--- a/libjava/classpath/lib/java/text/DecimalFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/DecimalFormatSymbols.class b/libjava/classpath/lib/java/text/DecimalFormatSymbols.class
deleted file mode 100644
index a88226feba5..00000000000
--- a/libjava/classpath/lib/java/text/DecimalFormatSymbols.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/FieldPosition.class b/libjava/classpath/lib/java/text/FieldPosition.class
deleted file mode 100644
index 5c8e962dae1..00000000000
--- a/libjava/classpath/lib/java/text/FieldPosition.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/Format$Field.class b/libjava/classpath/lib/java/text/Format$Field.class
deleted file mode 100644
index 72c598b2fb9..00000000000
--- a/libjava/classpath/lib/java/text/Format$Field.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/Format.class b/libjava/classpath/lib/java/text/Format.class
deleted file mode 100644
index 8dae54e1b90..00000000000
--- a/libjava/classpath/lib/java/text/Format.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/MessageFormat$Field.class b/libjava/classpath/lib/java/text/MessageFormat$Field.class
deleted file mode 100644
index a020190401d..00000000000
--- a/libjava/classpath/lib/java/text/MessageFormat$Field.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/MessageFormat$MessageFormatElement.class b/libjava/classpath/lib/java/text/MessageFormat$MessageFormatElement.class
deleted file mode 100644
index 30579ea40bc..00000000000
--- a/libjava/classpath/lib/java/text/MessageFormat$MessageFormatElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/MessageFormat.class b/libjava/classpath/lib/java/text/MessageFormat.class
deleted file mode 100644
index 96041451fe5..00000000000
--- a/libjava/classpath/lib/java/text/MessageFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/NumberFormat$Field.class b/libjava/classpath/lib/java/text/NumberFormat$Field.class
deleted file mode 100644
index bc2baf09a70..00000000000
--- a/libjava/classpath/lib/java/text/NumberFormat$Field.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/NumberFormat.class b/libjava/classpath/lib/java/text/NumberFormat.class
deleted file mode 100644
index 937e291e867..00000000000
--- a/libjava/classpath/lib/java/text/NumberFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/ParseException.class b/libjava/classpath/lib/java/text/ParseException.class
deleted file mode 100644
index 01bfb0af89d..00000000000
--- a/libjava/classpath/lib/java/text/ParseException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/ParsePosition.class b/libjava/classpath/lib/java/text/ParsePosition.class
deleted file mode 100644
index 6ab897dee9c..00000000000
--- a/libjava/classpath/lib/java/text/ParsePosition.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/RuleBasedCollator$CollationElement.class b/libjava/classpath/lib/java/text/RuleBasedCollator$CollationElement.class
deleted file mode 100644
index 6a46c8d25de..00000000000
--- a/libjava/classpath/lib/java/text/RuleBasedCollator$CollationElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/RuleBasedCollator$CollationSorter.class b/libjava/classpath/lib/java/text/RuleBasedCollator$CollationSorter.class
deleted file mode 100644
index f70f2a9b234..00000000000
--- a/libjava/classpath/lib/java/text/RuleBasedCollator$CollationSorter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/RuleBasedCollator.class b/libjava/classpath/lib/java/text/RuleBasedCollator.class
deleted file mode 100644
index e15199eefb3..00000000000
--- a/libjava/classpath/lib/java/text/RuleBasedCollator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/SimpleDateFormat$CompiledField.class b/libjava/classpath/lib/java/text/SimpleDateFormat$CompiledField.class
deleted file mode 100644
index 559c5ce9dfe..00000000000
--- a/libjava/classpath/lib/java/text/SimpleDateFormat$CompiledField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/SimpleDateFormat.class b/libjava/classpath/lib/java/text/SimpleDateFormat.class
deleted file mode 100644
index 7ddd8faaafb..00000000000
--- a/libjava/classpath/lib/java/text/SimpleDateFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/text/StringCharacterIterator.class b/libjava/classpath/lib/java/text/StringCharacterIterator.class
deleted file mode 100644
index 698696b285d..00000000000
--- a/libjava/classpath/lib/java/text/StringCharacterIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractCollection.class b/libjava/classpath/lib/java/util/AbstractCollection.class
deleted file mode 100644
index 439e2f88c2d..00000000000
--- a/libjava/classpath/lib/java/util/AbstractCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractList$1.class b/libjava/classpath/lib/java/util/AbstractList$1.class
deleted file mode 100644
index a3cc154b39f..00000000000
--- a/libjava/classpath/lib/java/util/AbstractList$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractList$2.class b/libjava/classpath/lib/java/util/AbstractList$2.class
deleted file mode 100644
index 3f7f650e714..00000000000
--- a/libjava/classpath/lib/java/util/AbstractList$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractList$3.class b/libjava/classpath/lib/java/util/AbstractList$3.class
deleted file mode 100644
index 063c1462f3e..00000000000
--- a/libjava/classpath/lib/java/util/AbstractList$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractList$RandomAccessSubList.class b/libjava/classpath/lib/java/util/AbstractList$RandomAccessSubList.class
deleted file mode 100644
index 138fade89eb..00000000000
--- a/libjava/classpath/lib/java/util/AbstractList$RandomAccessSubList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractList$SubList.class b/libjava/classpath/lib/java/util/AbstractList$SubList.class
deleted file mode 100644
index 532527f9954..00000000000
--- a/libjava/classpath/lib/java/util/AbstractList$SubList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractList.class b/libjava/classpath/lib/java/util/AbstractList.class
deleted file mode 100644
index 5632eeb83f9..00000000000
--- a/libjava/classpath/lib/java/util/AbstractList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractMap$1.class b/libjava/classpath/lib/java/util/AbstractMap$1.class
deleted file mode 100644
index d851f1eae65..00000000000
--- a/libjava/classpath/lib/java/util/AbstractMap$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractMap$2.class b/libjava/classpath/lib/java/util/AbstractMap$2.class
deleted file mode 100644
index 5f73e7ab586..00000000000
--- a/libjava/classpath/lib/java/util/AbstractMap$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractMap$3.class b/libjava/classpath/lib/java/util/AbstractMap$3.class
deleted file mode 100644
index 2511aba3f2e..00000000000
--- a/libjava/classpath/lib/java/util/AbstractMap$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractMap$4.class b/libjava/classpath/lib/java/util/AbstractMap$4.class
deleted file mode 100644
index 973ec3ec0ac..00000000000
--- a/libjava/classpath/lib/java/util/AbstractMap$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractMap$SimpleEntry.class b/libjava/classpath/lib/java/util/AbstractMap$SimpleEntry.class
deleted file mode 100644
index edabfd84331..00000000000
--- a/libjava/classpath/lib/java/util/AbstractMap$SimpleEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractMap$SimpleImmutableEntry.class b/libjava/classpath/lib/java/util/AbstractMap$SimpleImmutableEntry.class
deleted file mode 100644
index 92d54d7cbdb..00000000000
--- a/libjava/classpath/lib/java/util/AbstractMap$SimpleImmutableEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractMap.class b/libjava/classpath/lib/java/util/AbstractMap.class
deleted file mode 100644
index b81d99e3cea..00000000000
--- a/libjava/classpath/lib/java/util/AbstractMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractQueue.class b/libjava/classpath/lib/java/util/AbstractQueue.class
deleted file mode 100644
index 65a84617690..00000000000
--- a/libjava/classpath/lib/java/util/AbstractQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractSequentialList.class b/libjava/classpath/lib/java/util/AbstractSequentialList.class
deleted file mode 100644
index ff16cbbbe58..00000000000
--- a/libjava/classpath/lib/java/util/AbstractSequentialList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/AbstractSet.class b/libjava/classpath/lib/java/util/AbstractSet.class
deleted file mode 100644
index 7730cf62bf9..00000000000
--- a/libjava/classpath/lib/java/util/AbstractSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/ArrayDeque$DeqIterator.class b/libjava/classpath/lib/java/util/ArrayDeque$DeqIterator.class
deleted file mode 100644
index 7c3a8a8a36c..00000000000
--- a/libjava/classpath/lib/java/util/ArrayDeque$DeqIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/ArrayDeque$DescendingIterator.class b/libjava/classpath/lib/java/util/ArrayDeque$DescendingIterator.class
deleted file mode 100644
index a21477b4355..00000000000
--- a/libjava/classpath/lib/java/util/ArrayDeque$DescendingIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/ArrayDeque.class b/libjava/classpath/lib/java/util/ArrayDeque.class
deleted file mode 100644
index bd164b570a7..00000000000
--- a/libjava/classpath/lib/java/util/ArrayDeque.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/ArrayList.class b/libjava/classpath/lib/java/util/ArrayList.class
deleted file mode 100644
index e61f4d4094e..00000000000
--- a/libjava/classpath/lib/java/util/ArrayList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Arrays$ArrayList.class b/libjava/classpath/lib/java/util/Arrays$ArrayList.class
deleted file mode 100644
index bd2e14ab1bc..00000000000
--- a/libjava/classpath/lib/java/util/Arrays$ArrayList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Arrays.class b/libjava/classpath/lib/java/util/Arrays.class
deleted file mode 100644
index 6b86decd3e3..00000000000
--- a/libjava/classpath/lib/java/util/Arrays.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/BitSet.class b/libjava/classpath/lib/java/util/BitSet.class
deleted file mode 100644
index fb3ddb45d24..00000000000
--- a/libjava/classpath/lib/java/util/BitSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Calendar.class b/libjava/classpath/lib/java/util/Calendar.class
deleted file mode 100644
index f6d96a901ed..00000000000
--- a/libjava/classpath/lib/java/util/Calendar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collection.class b/libjava/classpath/lib/java/util/Collection.class
deleted file mode 100644
index 9ecadba5644..00000000000
--- a/libjava/classpath/lib/java/util/Collection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$1$SynchronizedMapEntry.class b/libjava/classpath/lib/java/util/Collections$1$SynchronizedMapEntry.class
deleted file mode 100644
index a89df2e9dbd..00000000000
--- a/libjava/classpath/lib/java/util/Collections$1$SynchronizedMapEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$1.class b/libjava/classpath/lib/java/util/Collections$1.class
deleted file mode 100644
index 05f7a9d776a..00000000000
--- a/libjava/classpath/lib/java/util/Collections$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$2.class b/libjava/classpath/lib/java/util/Collections$2.class
deleted file mode 100644
index 250ef65e9e9..00000000000
--- a/libjava/classpath/lib/java/util/Collections$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$3.class b/libjava/classpath/lib/java/util/Collections$3.class
deleted file mode 100644
index b4b47469a4b..00000000000
--- a/libjava/classpath/lib/java/util/Collections$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$4.class b/libjava/classpath/lib/java/util/Collections$4.class
deleted file mode 100644
index da444283677..00000000000
--- a/libjava/classpath/lib/java/util/Collections$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$5.class b/libjava/classpath/lib/java/util/Collections$5.class
deleted file mode 100644
index 8555537723d..00000000000
--- a/libjava/classpath/lib/java/util/Collections$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$6.class b/libjava/classpath/lib/java/util/Collections$6.class
deleted file mode 100644
index 054c9112751..00000000000
--- a/libjava/classpath/lib/java/util/Collections$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$7.class b/libjava/classpath/lib/java/util/Collections$7.class
deleted file mode 100644
index 9085dd5fd4d..00000000000
--- a/libjava/classpath/lib/java/util/Collections$7.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$8.class b/libjava/classpath/lib/java/util/Collections$8.class
deleted file mode 100644
index fb009cb9f7f..00000000000
--- a/libjava/classpath/lib/java/util/Collections$8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$9.class b/libjava/classpath/lib/java/util/Collections$9.class
deleted file mode 100644
index c1d9438dfb4..00000000000
--- a/libjava/classpath/lib/java/util/Collections$9.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CheckedCollection.class b/libjava/classpath/lib/java/util/Collections$CheckedCollection.class
deleted file mode 100644
index 466d1fd3548..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CheckedCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CheckedIterator.class b/libjava/classpath/lib/java/util/Collections$CheckedIterator.class
deleted file mode 100644
index e7b49bccd06..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CheckedIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CheckedList.class b/libjava/classpath/lib/java/util/Collections$CheckedList.class
deleted file mode 100644
index c2ffb7c7e71..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CheckedList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CheckedListIterator.class b/libjava/classpath/lib/java/util/Collections$CheckedListIterator.class
deleted file mode 100644
index ef7b4901627..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CheckedListIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CheckedMap$CheckedEntrySet.class b/libjava/classpath/lib/java/util/Collections$CheckedMap$CheckedEntrySet.class
deleted file mode 100644
index d402ad1063b..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CheckedMap$CheckedEntrySet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CheckedMap.class b/libjava/classpath/lib/java/util/Collections$CheckedMap.class
deleted file mode 100644
index 0a0dfd454dc..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CheckedMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CheckedRandomAccessList.class b/libjava/classpath/lib/java/util/Collections$CheckedRandomAccessList.class
deleted file mode 100644
index 205831a072f..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CheckedRandomAccessList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CheckedSet.class b/libjava/classpath/lib/java/util/Collections$CheckedSet.class
deleted file mode 100644
index b30b3e602eb..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CheckedSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CheckedSortedMap.class b/libjava/classpath/lib/java/util/Collections$CheckedSortedMap.class
deleted file mode 100644
index abe198c261f..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CheckedSortedMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CheckedSortedSet.class b/libjava/classpath/lib/java/util/Collections$CheckedSortedSet.class
deleted file mode 100644
index dc233e2ac83..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CheckedSortedSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$CopiesList.class b/libjava/classpath/lib/java/util/Collections$CopiesList.class
deleted file mode 100644
index 237af598d9c..00000000000
--- a/libjava/classpath/lib/java/util/Collections$CopiesList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$EmptyList.class b/libjava/classpath/lib/java/util/Collections$EmptyList.class
deleted file mode 100644
index 5a72df5e753..00000000000
--- a/libjava/classpath/lib/java/util/Collections$EmptyList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$EmptyMap.class b/libjava/classpath/lib/java/util/Collections$EmptyMap.class
deleted file mode 100644
index 2d727b7b764..00000000000
--- a/libjava/classpath/lib/java/util/Collections$EmptyMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$EmptySet.class b/libjava/classpath/lib/java/util/Collections$EmptySet.class
deleted file mode 100644
index c993f151567..00000000000
--- a/libjava/classpath/lib/java/util/Collections$EmptySet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$ReverseComparator.class b/libjava/classpath/lib/java/util/Collections$ReverseComparator.class
deleted file mode 100644
index a043cf0d721..00000000000
--- a/libjava/classpath/lib/java/util/Collections$ReverseComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SingletonList.class b/libjava/classpath/lib/java/util/Collections$SingletonList.class
deleted file mode 100644
index a0ea2078b4a..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SingletonList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SingletonMap.class b/libjava/classpath/lib/java/util/Collections$SingletonMap.class
deleted file mode 100644
index 9cb211fd62f..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SingletonMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SingletonSet.class b/libjava/classpath/lib/java/util/Collections$SingletonSet.class
deleted file mode 100644
index a4892de90c0..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SingletonSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SynchronizedCollection.class b/libjava/classpath/lib/java/util/Collections$SynchronizedCollection.class
deleted file mode 100644
index af78e3b1b29..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SynchronizedCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SynchronizedIterator.class b/libjava/classpath/lib/java/util/Collections$SynchronizedIterator.class
deleted file mode 100644
index d5ae321e571..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SynchronizedIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SynchronizedList.class b/libjava/classpath/lib/java/util/Collections$SynchronizedList.class
deleted file mode 100644
index 3ce19d4cedf..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SynchronizedList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SynchronizedListIterator.class b/libjava/classpath/lib/java/util/Collections$SynchronizedListIterator.class
deleted file mode 100644
index c0e64a69837..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SynchronizedListIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SynchronizedMap.class b/libjava/classpath/lib/java/util/Collections$SynchronizedMap.class
deleted file mode 100644
index a50be837f6f..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SynchronizedMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SynchronizedRandomAccessList.class b/libjava/classpath/lib/java/util/Collections$SynchronizedRandomAccessList.class
deleted file mode 100644
index e3e4e1e408f..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SynchronizedRandomAccessList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SynchronizedSet.class b/libjava/classpath/lib/java/util/Collections$SynchronizedSet.class
deleted file mode 100644
index fd1dd495afa..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SynchronizedSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SynchronizedSortedMap.class b/libjava/classpath/lib/java/util/Collections$SynchronizedSortedMap.class
deleted file mode 100644
index 9e35d212bde..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SynchronizedSortedMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$SynchronizedSortedSet.class b/libjava/classpath/lib/java/util/Collections$SynchronizedSortedSet.class
deleted file mode 100644
index e8b69fcf7aa..00000000000
--- a/libjava/classpath/lib/java/util/Collections$SynchronizedSortedSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableCollection.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableCollection.class
deleted file mode 100644
index b6a9ec47fea..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableIterator.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableIterator.class
deleted file mode 100644
index 43eadbaf8eb..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableList.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableList.class
deleted file mode 100644
index 5d76cd2ee03..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableListIterator.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableListIterator.class
deleted file mode 100644
index 1795dcca995..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableListIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry.class
deleted file mode 100644
index 58db3dbd71d..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class
deleted file mode 100644
index 4b9f103aecf..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableMap.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableMap.class
deleted file mode 100644
index e6b60056ed0..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableRandomAccessList.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableRandomAccessList.class
deleted file mode 100644
index 0563ff3cdaa..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableRandomAccessList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableSet.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableSet.class
deleted file mode 100644
index caf7d34c937..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableSortedMap.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableSortedMap.class
deleted file mode 100644
index 75d4635b80a..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableSortedMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableSortedSet.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableSortedSet.class
deleted file mode 100644
index d4c72daa5a7..00000000000
--- a/libjava/classpath/lib/java/util/Collections$UnmodifiableSortedSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Collections.class b/libjava/classpath/lib/java/util/Collections.class
deleted file mode 100644
index 9572ce591b0..00000000000
--- a/libjava/classpath/lib/java/util/Collections.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Comparator.class b/libjava/classpath/lib/java/util/Comparator.class
deleted file mode 100644
index 383c9ce2499..00000000000
--- a/libjava/classpath/lib/java/util/Comparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/ConcurrentModificationException.class b/libjava/classpath/lib/java/util/ConcurrentModificationException.class
deleted file mode 100644
index af324dcdc8f..00000000000
--- a/libjava/classpath/lib/java/util/ConcurrentModificationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Currency.class b/libjava/classpath/lib/java/util/Currency.class
deleted file mode 100644
index 147415ca1e9..00000000000
--- a/libjava/classpath/lib/java/util/Currency.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Date.class b/libjava/classpath/lib/java/util/Date.class
deleted file mode 100644
index 2ff812bb8b1..00000000000
--- a/libjava/classpath/lib/java/util/Date.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Deque.class b/libjava/classpath/lib/java/util/Deque.class
deleted file mode 100644
index f45e3eff305..00000000000
--- a/libjava/classpath/lib/java/util/Deque.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Dictionary.class b/libjava/classpath/lib/java/util/Dictionary.class
deleted file mode 100644
index 1f57252efd2..00000000000
--- a/libjava/classpath/lib/java/util/Dictionary.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/DuplicateFormatFlagsException.class b/libjava/classpath/lib/java/util/DuplicateFormatFlagsException.class
deleted file mode 100644
index 9387ef70d49..00000000000
--- a/libjava/classpath/lib/java/util/DuplicateFormatFlagsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EmptyStackException.class b/libjava/classpath/lib/java/util/EmptyStackException.class
deleted file mode 100644
index 4169a8be330..00000000000
--- a/libjava/classpath/lib/java/util/EmptyStackException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EnumMap$1.class b/libjava/classpath/lib/java/util/EnumMap$1.class
deleted file mode 100644
index c544880ffd7..00000000000
--- a/libjava/classpath/lib/java/util/EnumMap$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EnumMap$2.class b/libjava/classpath/lib/java/util/EnumMap$2.class
deleted file mode 100644
index 048e6c3bc00..00000000000
--- a/libjava/classpath/lib/java/util/EnumMap$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EnumMap$3.class b/libjava/classpath/lib/java/util/EnumMap$3.class
deleted file mode 100644
index d4b4b6f8cc0..00000000000
--- a/libjava/classpath/lib/java/util/EnumMap$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EnumMap$4.class b/libjava/classpath/lib/java/util/EnumMap$4.class
deleted file mode 100644
index 01952a957f5..00000000000
--- a/libjava/classpath/lib/java/util/EnumMap$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EnumMap$5.class b/libjava/classpath/lib/java/util/EnumMap$5.class
deleted file mode 100644
index 216c7a62c6a..00000000000
--- a/libjava/classpath/lib/java/util/EnumMap$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EnumMap$6.class b/libjava/classpath/lib/java/util/EnumMap$6.class
deleted file mode 100644
index a57a5d4a457..00000000000
--- a/libjava/classpath/lib/java/util/EnumMap$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EnumMap$7.class b/libjava/classpath/lib/java/util/EnumMap$7.class
deleted file mode 100644
index eaf8913e466..00000000000
--- a/libjava/classpath/lib/java/util/EnumMap$7.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EnumMap.class b/libjava/classpath/lib/java/util/EnumMap.class
deleted file mode 100644
index d345b6baaf3..00000000000
--- a/libjava/classpath/lib/java/util/EnumMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EnumSet$1.class b/libjava/classpath/lib/java/util/EnumSet$1.class
deleted file mode 100644
index 750d7200ced..00000000000
--- a/libjava/classpath/lib/java/util/EnumSet$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EnumSet.class b/libjava/classpath/lib/java/util/EnumSet.class
deleted file mode 100644
index b3a728b8191..00000000000
--- a/libjava/classpath/lib/java/util/EnumSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Enumeration.class b/libjava/classpath/lib/java/util/Enumeration.class
deleted file mode 100644
index 5791585d193..00000000000
--- a/libjava/classpath/lib/java/util/Enumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EventListener.class b/libjava/classpath/lib/java/util/EventListener.class
deleted file mode 100644
index 23dbfb8c861..00000000000
--- a/libjava/classpath/lib/java/util/EventListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EventListenerProxy.class b/libjava/classpath/lib/java/util/EventListenerProxy.class
deleted file mode 100644
index fb3eaead1c1..00000000000
--- a/libjava/classpath/lib/java/util/EventListenerProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/EventObject.class b/libjava/classpath/lib/java/util/EventObject.class
deleted file mode 100644
index 0e97ead8287..00000000000
--- a/libjava/classpath/lib/java/util/EventObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/FormatFlagsConversionMismatchException.class b/libjava/classpath/lib/java/util/FormatFlagsConversionMismatchException.class
deleted file mode 100644
index fac05d4ead8..00000000000
--- a/libjava/classpath/lib/java/util/FormatFlagsConversionMismatchException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Formattable.class b/libjava/classpath/lib/java/util/Formattable.class
deleted file mode 100644
index ad80eaf3b65..00000000000
--- a/libjava/classpath/lib/java/util/Formattable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/FormattableFlags.class b/libjava/classpath/lib/java/util/FormattableFlags.class
deleted file mode 100644
index a19cd5d6106..00000000000
--- a/libjava/classpath/lib/java/util/FormattableFlags.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Formatter$BigDecimalLayoutForm.class b/libjava/classpath/lib/java/util/Formatter$BigDecimalLayoutForm.class
deleted file mode 100644
index d8cb5810412..00000000000
--- a/libjava/classpath/lib/java/util/Formatter$BigDecimalLayoutForm.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Formatter.class b/libjava/classpath/lib/java/util/Formatter.class
deleted file mode 100644
index 44bda981046..00000000000
--- a/libjava/classpath/lib/java/util/Formatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/FormatterClosedException.class b/libjava/classpath/lib/java/util/FormatterClosedException.class
deleted file mode 100644
index 1de6d1bbb22..00000000000
--- a/libjava/classpath/lib/java/util/FormatterClosedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/GregorianCalendar.class b/libjava/classpath/lib/java/util/GregorianCalendar.class
deleted file mode 100644
index 00022634a16..00000000000
--- a/libjava/classpath/lib/java/util/GregorianCalendar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/HashMap$1.class b/libjava/classpath/lib/java/util/HashMap$1.class
deleted file mode 100644
index cb5fe463ad8..00000000000
--- a/libjava/classpath/lib/java/util/HashMap$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/HashMap$2.class b/libjava/classpath/lib/java/util/HashMap$2.class
deleted file mode 100644
index 663a1352804..00000000000
--- a/libjava/classpath/lib/java/util/HashMap$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/HashMap$3.class b/libjava/classpath/lib/java/util/HashMap$3.class
deleted file mode 100644
index 9129a0cd9d3..00000000000
--- a/libjava/classpath/lib/java/util/HashMap$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/HashMap$HashEntry.class b/libjava/classpath/lib/java/util/HashMap$HashEntry.class
deleted file mode 100644
index 4890b63dd5b..00000000000
--- a/libjava/classpath/lib/java/util/HashMap$HashEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/HashMap$HashIterator.class b/libjava/classpath/lib/java/util/HashMap$HashIterator.class
deleted file mode 100644
index 26b8b695958..00000000000
--- a/libjava/classpath/lib/java/util/HashMap$HashIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/HashMap.class b/libjava/classpath/lib/java/util/HashMap.class
deleted file mode 100644
index 9b0dd1c02dc..00000000000
--- a/libjava/classpath/lib/java/util/HashMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/HashSet.class b/libjava/classpath/lib/java/util/HashSet.class
deleted file mode 100644
index dc57e6058c3..00000000000
--- a/libjava/classpath/lib/java/util/HashSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable$1.class b/libjava/classpath/lib/java/util/Hashtable$1.class
deleted file mode 100644
index ba860884126..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable$2.class b/libjava/classpath/lib/java/util/Hashtable$2.class
deleted file mode 100644
index bc131702c8c..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable$3.class b/libjava/classpath/lib/java/util/Hashtable$3.class
deleted file mode 100644
index d8eaac5cecb..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable$EntryEnumerator.class b/libjava/classpath/lib/java/util/Hashtable$EntryEnumerator.class
deleted file mode 100644
index 2a725d7b00b..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable$EntryEnumerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable$EntryIterator.class b/libjava/classpath/lib/java/util/Hashtable$EntryIterator.class
deleted file mode 100644
index dc026b72ecb..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable$EntryIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable$HashEntry.class b/libjava/classpath/lib/java/util/Hashtable$HashEntry.class
deleted file mode 100644
index a189fc772ef..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable$HashEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable$KeyEnumerator.class b/libjava/classpath/lib/java/util/Hashtable$KeyEnumerator.class
deleted file mode 100644
index 06640f181cb..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable$KeyEnumerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable$KeyIterator.class b/libjava/classpath/lib/java/util/Hashtable$KeyIterator.class
deleted file mode 100644
index eb6773b7ee9..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable$KeyIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable$ValueEnumerator.class b/libjava/classpath/lib/java/util/Hashtable$ValueEnumerator.class
deleted file mode 100644
index 053860b29c9..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable$ValueEnumerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable$ValueIterator.class b/libjava/classpath/lib/java/util/Hashtable$ValueIterator.class
deleted file mode 100644
index 234afd5b349..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable$ValueIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Hashtable.class b/libjava/classpath/lib/java/util/Hashtable.class
deleted file mode 100644
index 2bc8ff66345..00000000000
--- a/libjava/classpath/lib/java/util/Hashtable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IdentityHashMap$1.class b/libjava/classpath/lib/java/util/IdentityHashMap$1.class
deleted file mode 100644
index ce61a897032..00000000000
--- a/libjava/classpath/lib/java/util/IdentityHashMap$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IdentityHashMap$2.class b/libjava/classpath/lib/java/util/IdentityHashMap$2.class
deleted file mode 100644
index 602c07c705c..00000000000
--- a/libjava/classpath/lib/java/util/IdentityHashMap$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IdentityHashMap$3.class b/libjava/classpath/lib/java/util/IdentityHashMap$3.class
deleted file mode 100644
index bf9677531e1..00000000000
--- a/libjava/classpath/lib/java/util/IdentityHashMap$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IdentityHashMap$IdentityEntry.class b/libjava/classpath/lib/java/util/IdentityHashMap$IdentityEntry.class
deleted file mode 100644
index 55da9bb65bc..00000000000
--- a/libjava/classpath/lib/java/util/IdentityHashMap$IdentityEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IdentityHashMap$IdentityIterator.class b/libjava/classpath/lib/java/util/IdentityHashMap$IdentityIterator.class
deleted file mode 100644
index 94ce525e316..00000000000
--- a/libjava/classpath/lib/java/util/IdentityHashMap$IdentityIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IdentityHashMap.class b/libjava/classpath/lib/java/util/IdentityHashMap.class
deleted file mode 100644
index cbcbfd8395c..00000000000
--- a/libjava/classpath/lib/java/util/IdentityHashMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IllegalFormatCodePointException.class b/libjava/classpath/lib/java/util/IllegalFormatCodePointException.class
deleted file mode 100644
index da60018aff4..00000000000
--- a/libjava/classpath/lib/java/util/IllegalFormatCodePointException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IllegalFormatConversionException.class b/libjava/classpath/lib/java/util/IllegalFormatConversionException.class
deleted file mode 100644
index 360e8833a62..00000000000
--- a/libjava/classpath/lib/java/util/IllegalFormatConversionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IllegalFormatException.class b/libjava/classpath/lib/java/util/IllegalFormatException.class
deleted file mode 100644
index 31d0c040f41..00000000000
--- a/libjava/classpath/lib/java/util/IllegalFormatException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IllegalFormatFlagsException.class b/libjava/classpath/lib/java/util/IllegalFormatFlagsException.class
deleted file mode 100644
index e00e72df7ac..00000000000
--- a/libjava/classpath/lib/java/util/IllegalFormatFlagsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IllegalFormatPrecisionException.class b/libjava/classpath/lib/java/util/IllegalFormatPrecisionException.class
deleted file mode 100644
index 262d90434d8..00000000000
--- a/libjava/classpath/lib/java/util/IllegalFormatPrecisionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/IllegalFormatWidthException.class b/libjava/classpath/lib/java/util/IllegalFormatWidthException.class
deleted file mode 100644
index 9c5edc893ed..00000000000
--- a/libjava/classpath/lib/java/util/IllegalFormatWidthException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/InputMismatchException.class b/libjava/classpath/lib/java/util/InputMismatchException.class
deleted file mode 100644
index 907991adeee..00000000000
--- a/libjava/classpath/lib/java/util/InputMismatchException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/InvalidPropertiesFormatException.class b/libjava/classpath/lib/java/util/InvalidPropertiesFormatException.class
deleted file mode 100644
index 54d6c7ee9d7..00000000000
--- a/libjava/classpath/lib/java/util/InvalidPropertiesFormatException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Iterator.class b/libjava/classpath/lib/java/util/Iterator.class
deleted file mode 100644
index 968d125f413..00000000000
--- a/libjava/classpath/lib/java/util/Iterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/LinkedHashMap$1.class b/libjava/classpath/lib/java/util/LinkedHashMap$1.class
deleted file mode 100644
index 4236600ebf1..00000000000
--- a/libjava/classpath/lib/java/util/LinkedHashMap$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/LinkedHashMap$LinkedHashEntry.class b/libjava/classpath/lib/java/util/LinkedHashMap$LinkedHashEntry.class
deleted file mode 100644
index 2cc9b02751f..00000000000
--- a/libjava/classpath/lib/java/util/LinkedHashMap$LinkedHashEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/LinkedHashMap.class b/libjava/classpath/lib/java/util/LinkedHashMap.class
deleted file mode 100644
index a0fa4813702..00000000000
--- a/libjava/classpath/lib/java/util/LinkedHashMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/LinkedHashSet.class b/libjava/classpath/lib/java/util/LinkedHashSet.class
deleted file mode 100644
index 4e1e3335d6e..00000000000
--- a/libjava/classpath/lib/java/util/LinkedHashSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/LinkedList$Entry.class b/libjava/classpath/lib/java/util/LinkedList$Entry.class
deleted file mode 100644
index 8ba88eac5e1..00000000000
--- a/libjava/classpath/lib/java/util/LinkedList$Entry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/LinkedList$LinkedListItr.class b/libjava/classpath/lib/java/util/LinkedList$LinkedListItr.class
deleted file mode 100644
index 2ae4fd4146d..00000000000
--- a/libjava/classpath/lib/java/util/LinkedList$LinkedListItr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/LinkedList.class b/libjava/classpath/lib/java/util/LinkedList.class
deleted file mode 100644
index cf4b687bcbc..00000000000
--- a/libjava/classpath/lib/java/util/LinkedList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/List.class b/libjava/classpath/lib/java/util/List.class
deleted file mode 100644
index e7628961dac..00000000000
--- a/libjava/classpath/lib/java/util/List.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/ListIterator.class b/libjava/classpath/lib/java/util/ListIterator.class
deleted file mode 100644
index 8b0be20e25f..00000000000
--- a/libjava/classpath/lib/java/util/ListIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/ListResourceBundle.class b/libjava/classpath/lib/java/util/ListResourceBundle.class
deleted file mode 100644
index dbb833eb69d..00000000000
--- a/libjava/classpath/lib/java/util/ListResourceBundle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Locale.class b/libjava/classpath/lib/java/util/Locale.class
deleted file mode 100644
index a095ba8e211..00000000000
--- a/libjava/classpath/lib/java/util/Locale.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Map$Entry.class b/libjava/classpath/lib/java/util/Map$Entry.class
deleted file mode 100644
index c2abbac57e4..00000000000
--- a/libjava/classpath/lib/java/util/Map$Entry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Map.class b/libjava/classpath/lib/java/util/Map.class
deleted file mode 100644
index 27285a3f2b8..00000000000
--- a/libjava/classpath/lib/java/util/Map.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/MissingFormatArgumentException.class b/libjava/classpath/lib/java/util/MissingFormatArgumentException.class
deleted file mode 100644
index 94bf0670981..00000000000
--- a/libjava/classpath/lib/java/util/MissingFormatArgumentException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/MissingFormatWidthException.class b/libjava/classpath/lib/java/util/MissingFormatWidthException.class
deleted file mode 100644
index 6d292cfea81..00000000000
--- a/libjava/classpath/lib/java/util/MissingFormatWidthException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/MissingResourceException.class b/libjava/classpath/lib/java/util/MissingResourceException.class
deleted file mode 100644
index a8e0e27a915..00000000000
--- a/libjava/classpath/lib/java/util/MissingResourceException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/NavigableMap.class b/libjava/classpath/lib/java/util/NavigableMap.class
deleted file mode 100644
index 68c6a269e4f..00000000000
--- a/libjava/classpath/lib/java/util/NavigableMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/NavigableSet.class b/libjava/classpath/lib/java/util/NavigableSet.class
deleted file mode 100644
index 72a65c50a60..00000000000
--- a/libjava/classpath/lib/java/util/NavigableSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/NoSuchElementException.class b/libjava/classpath/lib/java/util/NoSuchElementException.class
deleted file mode 100644
index 79dae1aadd8..00000000000
--- a/libjava/classpath/lib/java/util/NoSuchElementException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Observable.class b/libjava/classpath/lib/java/util/Observable.class
deleted file mode 100644
index 7987b00421e..00000000000
--- a/libjava/classpath/lib/java/util/Observable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Observer.class b/libjava/classpath/lib/java/util/Observer.class
deleted file mode 100644
index 0ed0f59caaa..00000000000
--- a/libjava/classpath/lib/java/util/Observer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/PriorityQueue$1.class b/libjava/classpath/lib/java/util/PriorityQueue$1.class
deleted file mode 100644
index 3fe7f98518a..00000000000
--- a/libjava/classpath/lib/java/util/PriorityQueue$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/PriorityQueue.class b/libjava/classpath/lib/java/util/PriorityQueue.class
deleted file mode 100644
index 7ec78c17297..00000000000
--- a/libjava/classpath/lib/java/util/PriorityQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Properties.class b/libjava/classpath/lib/java/util/Properties.class
deleted file mode 100644
index 708973306ae..00000000000
--- a/libjava/classpath/lib/java/util/Properties.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/PropertyPermission.class b/libjava/classpath/lib/java/util/PropertyPermission.class
deleted file mode 100644
index ca564617da9..00000000000
--- a/libjava/classpath/lib/java/util/PropertyPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/PropertyPermissionCollection.class b/libjava/classpath/lib/java/util/PropertyPermissionCollection.class
deleted file mode 100644
index 10123c26b52..00000000000
--- a/libjava/classpath/lib/java/util/PropertyPermissionCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/PropertyResourceBundle.class b/libjava/classpath/lib/java/util/PropertyResourceBundle.class
deleted file mode 100644
index f47155d1ceb..00000000000
--- a/libjava/classpath/lib/java/util/PropertyResourceBundle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Queue.class b/libjava/classpath/lib/java/util/Queue.class
deleted file mode 100644
index 37f4e93fc61..00000000000
--- a/libjava/classpath/lib/java/util/Queue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Random.class b/libjava/classpath/lib/java/util/Random.class
deleted file mode 100644
index 9af54208312..00000000000
--- a/libjava/classpath/lib/java/util/Random.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/RandomAccess.class b/libjava/classpath/lib/java/util/RandomAccess.class
deleted file mode 100644
index bba9b034d59..00000000000
--- a/libjava/classpath/lib/java/util/RandomAccess.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/ResourceBundle$1.class b/libjava/classpath/lib/java/util/ResourceBundle$1.class
deleted file mode 100644
index 3dda2d717f9..00000000000
--- a/libjava/classpath/lib/java/util/ResourceBundle$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/ResourceBundle$BundleKey.class b/libjava/classpath/lib/java/util/ResourceBundle$BundleKey.class
deleted file mode 100644
index db9c41cc3fd..00000000000
--- a/libjava/classpath/lib/java/util/ResourceBundle$BundleKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/ResourceBundle.class b/libjava/classpath/lib/java/util/ResourceBundle.class
deleted file mode 100644
index e78dd748d3a..00000000000
--- a/libjava/classpath/lib/java/util/ResourceBundle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Set.class b/libjava/classpath/lib/java/util/Set.class
deleted file mode 100644
index 3a26c1fd40c..00000000000
--- a/libjava/classpath/lib/java/util/Set.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/SimpleTimeZone.class b/libjava/classpath/lib/java/util/SimpleTimeZone.class
deleted file mode 100644
index 7009b48ce9b..00000000000
--- a/libjava/classpath/lib/java/util/SimpleTimeZone.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/SortedMap.class b/libjava/classpath/lib/java/util/SortedMap.class
deleted file mode 100644
index 2421a067517..00000000000
--- a/libjava/classpath/lib/java/util/SortedMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/SortedSet.class b/libjava/classpath/lib/java/util/SortedSet.class
deleted file mode 100644
index 6cb2646e0d1..00000000000
--- a/libjava/classpath/lib/java/util/SortedSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Stack.class b/libjava/classpath/lib/java/util/Stack.class
deleted file mode 100644
index 9f511234476..00000000000
--- a/libjava/classpath/lib/java/util/Stack.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/StringTokenizer.class b/libjava/classpath/lib/java/util/StringTokenizer.class
deleted file mode 100644
index d68abe7072e..00000000000
--- a/libjava/classpath/lib/java/util/StringTokenizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TimeZone$1.class b/libjava/classpath/lib/java/util/TimeZone$1.class
deleted file mode 100644
index fdc1c6149b5..00000000000
--- a/libjava/classpath/lib/java/util/TimeZone$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TimeZone.class b/libjava/classpath/lib/java/util/TimeZone.class
deleted file mode 100644
index b319aa78861..00000000000
--- a/libjava/classpath/lib/java/util/TimeZone.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Timer$Scheduler.class b/libjava/classpath/lib/java/util/Timer$Scheduler.class
deleted file mode 100644
index 2a108b55ba4..00000000000
--- a/libjava/classpath/lib/java/util/Timer$Scheduler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Timer$TaskQueue.class b/libjava/classpath/lib/java/util/Timer$TaskQueue.class
deleted file mode 100644
index 9d1786b483a..00000000000
--- a/libjava/classpath/lib/java/util/Timer$TaskQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Timer.class b/libjava/classpath/lib/java/util/Timer.class
deleted file mode 100644
index 00be67abe8e..00000000000
--- a/libjava/classpath/lib/java/util/Timer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TimerTask.class b/libjava/classpath/lib/java/util/TimerTask.class
deleted file mode 100644
index 879170e4ab9..00000000000
--- a/libjava/classpath/lib/java/util/TimerTask.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TooManyListenersException.class b/libjava/classpath/lib/java/util/TooManyListenersException.class
deleted file mode 100644
index c09c5948d55..00000000000
--- a/libjava/classpath/lib/java/util/TooManyListenersException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeMap$1.class b/libjava/classpath/lib/java/util/TreeMap$1.class
deleted file mode 100644
index 7b987c3f13a..00000000000
--- a/libjava/classpath/lib/java/util/TreeMap$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeMap$2.class b/libjava/classpath/lib/java/util/TreeMap$2.class
deleted file mode 100644
index 33e2fe776ab..00000000000
--- a/libjava/classpath/lib/java/util/TreeMap$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeMap$3.class b/libjava/classpath/lib/java/util/TreeMap$3.class
deleted file mode 100644
index bb58f20661b..00000000000
--- a/libjava/classpath/lib/java/util/TreeMap$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeMap$4.class b/libjava/classpath/lib/java/util/TreeMap$4.class
deleted file mode 100644
index eb51c9a5e24..00000000000
--- a/libjava/classpath/lib/java/util/TreeMap$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeMap$5.class b/libjava/classpath/lib/java/util/TreeMap$5.class
deleted file mode 100644
index 6fb5ff26535..00000000000
--- a/libjava/classpath/lib/java/util/TreeMap$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeMap$6.class b/libjava/classpath/lib/java/util/TreeMap$6.class
deleted file mode 100644
index 40db18b2c16..00000000000
--- a/libjava/classpath/lib/java/util/TreeMap$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeMap$Node.class b/libjava/classpath/lib/java/util/TreeMap$Node.class
deleted file mode 100644
index ac2641db35b..00000000000
--- a/libjava/classpath/lib/java/util/TreeMap$Node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeMap$SubMap.class b/libjava/classpath/lib/java/util/TreeMap$SubMap.class
deleted file mode 100644
index a50e686d5e4..00000000000
--- a/libjava/classpath/lib/java/util/TreeMap$SubMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeMap$TreeIterator.class b/libjava/classpath/lib/java/util/TreeMap$TreeIterator.class
deleted file mode 100644
index 34a4d3998dd..00000000000
--- a/libjava/classpath/lib/java/util/TreeMap$TreeIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeMap.class b/libjava/classpath/lib/java/util/TreeMap.class
deleted file mode 100644
index b7200153556..00000000000
--- a/libjava/classpath/lib/java/util/TreeMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/TreeSet.class b/libjava/classpath/lib/java/util/TreeSet.class
deleted file mode 100644
index 4ee139a625b..00000000000
--- a/libjava/classpath/lib/java/util/TreeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/UUID.class b/libjava/classpath/lib/java/util/UUID.class
deleted file mode 100644
index 3dd44c7a07b..00000000000
--- a/libjava/classpath/lib/java/util/UUID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/UnknownFormatConversionException.class b/libjava/classpath/lib/java/util/UnknownFormatConversionException.class
deleted file mode 100644
index 5ed847ab2fb..00000000000
--- a/libjava/classpath/lib/java/util/UnknownFormatConversionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/UnknownFormatFlagsException.class b/libjava/classpath/lib/java/util/UnknownFormatFlagsException.class
deleted file mode 100644
index 03a94ece9e7..00000000000
--- a/libjava/classpath/lib/java/util/UnknownFormatFlagsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/VMTimeZone.class b/libjava/classpath/lib/java/util/VMTimeZone.class
deleted file mode 100644
index 351461d5ab7..00000000000
--- a/libjava/classpath/lib/java/util/VMTimeZone.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Vector$1.class b/libjava/classpath/lib/java/util/Vector$1.class
deleted file mode 100644
index 28cbc58120f..00000000000
--- a/libjava/classpath/lib/java/util/Vector$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/Vector.class b/libjava/classpath/lib/java/util/Vector.class
deleted file mode 100644
index 7fd06aeb7ba..00000000000
--- a/libjava/classpath/lib/java/util/Vector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/WeakHashMap$1.class b/libjava/classpath/lib/java/util/WeakHashMap$1.class
deleted file mode 100644
index cc3e25f4183..00000000000
--- a/libjava/classpath/lib/java/util/WeakHashMap$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/WeakHashMap$2.class b/libjava/classpath/lib/java/util/WeakHashMap$2.class
deleted file mode 100644
index 8690612995f..00000000000
--- a/libjava/classpath/lib/java/util/WeakHashMap$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/WeakHashMap$WeakBucket$WeakEntry.class b/libjava/classpath/lib/java/util/WeakHashMap$WeakBucket$WeakEntry.class
deleted file mode 100644
index 4d676465744..00000000000
--- a/libjava/classpath/lib/java/util/WeakHashMap$WeakBucket$WeakEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/WeakHashMap$WeakBucket.class b/libjava/classpath/lib/java/util/WeakHashMap$WeakBucket.class
deleted file mode 100644
index fb4a59c3a89..00000000000
--- a/libjava/classpath/lib/java/util/WeakHashMap$WeakBucket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/WeakHashMap$WeakEntrySet.class b/libjava/classpath/lib/java/util/WeakHashMap$WeakEntrySet.class
deleted file mode 100644
index 8cc0ada10db..00000000000
--- a/libjava/classpath/lib/java/util/WeakHashMap$WeakEntrySet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/WeakHashMap.class b/libjava/classpath/lib/java/util/WeakHashMap.class
deleted file mode 100644
index 5f7f75bda70..00000000000
--- a/libjava/classpath/lib/java/util/WeakHashMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/AbstractExecutorService.class b/libjava/classpath/lib/java/util/concurrent/AbstractExecutorService.class
deleted file mode 100644
index a69ed7f1802..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/AbstractExecutorService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ArrayBlockingQueue$Itr.class b/libjava/classpath/lib/java/util/concurrent/ArrayBlockingQueue$Itr.class
deleted file mode 100644
index 34448ad781f..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ArrayBlockingQueue$Itr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ArrayBlockingQueue.class b/libjava/classpath/lib/java/util/concurrent/ArrayBlockingQueue.class
deleted file mode 100644
index 4e9a1fccaa5..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ArrayBlockingQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/BlockingDeque.class b/libjava/classpath/lib/java/util/concurrent/BlockingDeque.class
deleted file mode 100644
index 35619689722..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/BlockingDeque.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/BlockingQueue.class b/libjava/classpath/lib/java/util/concurrent/BlockingQueue.class
deleted file mode 100644
index 338b6ea0692..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/BlockingQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/BrokenBarrierException.class b/libjava/classpath/lib/java/util/concurrent/BrokenBarrierException.class
deleted file mode 100644
index 136818101df..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/BrokenBarrierException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Callable.class b/libjava/classpath/lib/java/util/concurrent/Callable.class
deleted file mode 100644
index 26e4dc2b1d5..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Callable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/CancellationException.class b/libjava/classpath/lib/java/util/concurrent/CancellationException.class
deleted file mode 100644
index 93b8b04e070..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/CancellationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/CompletionService.class b/libjava/classpath/lib/java/util/concurrent/CompletionService.class
deleted file mode 100644
index bcce3cc7230..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/CompletionService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$EntryIterator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$EntryIterator.class
deleted file mode 100644
index 94d83ba4fda..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$EntryIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$EntrySet.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$EntrySet.class
deleted file mode 100644
index f664cb31a98..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$EntrySet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$HashEntry.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$HashEntry.class
deleted file mode 100644
index 008edb97cc0..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$HashEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$HashIterator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$HashIterator.class
deleted file mode 100644
index f839fe1e943..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$HashIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$KeyIterator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$KeyIterator.class
deleted file mode 100644
index 930b0c4803e..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$KeyIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$KeySet.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$KeySet.class
deleted file mode 100644
index 48d0d953fa8..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$KeySet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$Segment.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$Segment.class
deleted file mode 100644
index 72ce7d378ff..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$Segment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$ValueIterator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$ValueIterator.class
deleted file mode 100644
index 9a1193be9c2..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$ValueIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$Values.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$Values.class
deleted file mode 100644
index 8342fe8ac70..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$Values.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$WriteThroughEntry.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$WriteThroughEntry.class
deleted file mode 100644
index f173a6a1104..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap$WriteThroughEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap.class
deleted file mode 100644
index 4bae5273d71..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentHashMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentLinkedQueue$Itr.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentLinkedQueue$Itr.class
deleted file mode 100644
index 7bac7bf4c33..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentLinkedQueue$Itr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentLinkedQueue$Node.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentLinkedQueue$Node.class
deleted file mode 100644
index 44fca278cae..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentLinkedQueue$Node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentLinkedQueue.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentLinkedQueue.class
deleted file mode 100644
index 1333e0fa891..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentLinkedQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentMap.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentMap.class
deleted file mode 100644
index 5159f3ebc5e..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentNavigableMap.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentNavigableMap.class
deleted file mode 100644
index 3df542cdf20..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentNavigableMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$ComparableUsingComparator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$ComparableUsingComparator.class
deleted file mode 100644
index bd1678b24c6..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$ComparableUsingComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.class
deleted file mode 100644
index 127267ceda4..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$EntrySet.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$EntrySet.class
deleted file mode 100644
index ddd5e390895..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$EntrySet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$HeadIndex.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$HeadIndex.class
deleted file mode 100644
index 6a7317f4f43..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$HeadIndex.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Index.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Index.class
deleted file mode 100644
index 131f1521ce1..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Index.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Iter.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Iter.class
deleted file mode 100644
index ff829b70c02..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Iter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$KeyIterator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$KeyIterator.class
deleted file mode 100644
index 3a681f758c4..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$KeyIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$KeySet.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$KeySet.class
deleted file mode 100644
index 45ec44cd570..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$KeySet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Node.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Node.class
deleted file mode 100644
index 7932e012edd..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.class
deleted file mode 100644
index d822acfb7e5..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapIter.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapIter.class
deleted file mode 100644
index f8029d104b0..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapIter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapKeyIterator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapKeyIterator.class
deleted file mode 100644
index 167f856d393..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapKeyIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapValueIterator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapValueIterator.class
deleted file mode 100644
index 6f4fe850850..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapValueIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap.class
deleted file mode 100644
index 0df084c891e..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$SubMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$ValueIterator.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$ValueIterator.class
deleted file mode 100644
index 090424a6d7f..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$ValueIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Values.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Values.class
deleted file mode 100644
index c41c1364338..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap$Values.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap.class
deleted file mode 100644
index 0f97e2d1949..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListSet.class b/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListSet.class
deleted file mode 100644
index 0d0436c2e3a..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ConcurrentSkipListSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class
deleted file mode 100644
index 872141fd91e..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArraySet.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArraySet.class
deleted file mode 100644
index 39a19098a5e..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArraySet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/CountDownLatch$Sync.class b/libjava/classpath/lib/java/util/concurrent/CountDownLatch$Sync.class
deleted file mode 100644
index 3361dcf06e5..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/CountDownLatch$Sync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/CountDownLatch.class b/libjava/classpath/lib/java/util/concurrent/CountDownLatch.class
deleted file mode 100644
index c53b629526d..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/CountDownLatch.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/CyclicBarrier$Generation.class b/libjava/classpath/lib/java/util/concurrent/CyclicBarrier$Generation.class
deleted file mode 100644
index 79eba5bda57..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/CyclicBarrier$Generation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/CyclicBarrier.class b/libjava/classpath/lib/java/util/concurrent/CyclicBarrier.class
deleted file mode 100644
index 1d696dac898..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/CyclicBarrier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/DelayQueue$Itr.class b/libjava/classpath/lib/java/util/concurrent/DelayQueue$Itr.class
deleted file mode 100644
index 69cc1be2720..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/DelayQueue$Itr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/DelayQueue.class b/libjava/classpath/lib/java/util/concurrent/DelayQueue.class
deleted file mode 100644
index 1cde5a1ebd9..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/DelayQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Delayed.class b/libjava/classpath/lib/java/util/concurrent/Delayed.class
deleted file mode 100644
index b0d8f02946b..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Delayed.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Exchanger$Node.class b/libjava/classpath/lib/java/util/concurrent/Exchanger$Node.class
deleted file mode 100644
index 9a09064198d..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Exchanger$Node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Exchanger$Slot.class b/libjava/classpath/lib/java/util/concurrent/Exchanger$Slot.class
deleted file mode 100644
index 3cad8cba03a..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Exchanger$Slot.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Exchanger.class b/libjava/classpath/lib/java/util/concurrent/Exchanger.class
deleted file mode 100644
index b09da8fe292..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Exchanger.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ExecutionException.class b/libjava/classpath/lib/java/util/concurrent/ExecutionException.class
deleted file mode 100644
index 2e96d9e1f3e..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ExecutionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executor.class b/libjava/classpath/lib/java/util/concurrent/Executor.class
deleted file mode 100644
index 1825342ee4b..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ExecutorCompletionService$QueueingFuture.class b/libjava/classpath/lib/java/util/concurrent/ExecutorCompletionService$QueueingFuture.class
deleted file mode 100644
index ff161bcf09d..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ExecutorCompletionService$QueueingFuture.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ExecutorCompletionService.class b/libjava/classpath/lib/java/util/concurrent/ExecutorCompletionService.class
deleted file mode 100644
index 29a85f23714..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ExecutorCompletionService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ExecutorService.class b/libjava/classpath/lib/java/util/concurrent/ExecutorService.class
deleted file mode 100644
index 715688e7c2c..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ExecutorService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$1.class b/libjava/classpath/lib/java/util/concurrent/Executors$1.class
deleted file mode 100644
index 160a59976c5..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$2.class b/libjava/classpath/lib/java/util/concurrent/Executors$2.class
deleted file mode 100644
index 1ba9e058c66..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$3.class b/libjava/classpath/lib/java/util/concurrent/Executors$3.class
deleted file mode 100644
index ac883943174..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$4.class b/libjava/classpath/lib/java/util/concurrent/Executors$4.class
deleted file mode 100644
index 3710ff4a51d..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$5.class b/libjava/classpath/lib/java/util/concurrent/Executors$5.class
deleted file mode 100644
index 0e68c05ebeb..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$6.class b/libjava/classpath/lib/java/util/concurrent/Executors$6.class
deleted file mode 100644
index 513629eaf2d..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$DefaultThreadFactory.class b/libjava/classpath/lib/java/util/concurrent/Executors$DefaultThreadFactory.class
deleted file mode 100644
index bdd1e9d6207..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$DefaultThreadFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$DelegatedExecutorService.class b/libjava/classpath/lib/java/util/concurrent/Executors$DelegatedExecutorService.class
deleted file mode 100644
index 9e1743058a9..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$DelegatedExecutorService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$DelegatedScheduledExecutorService.class b/libjava/classpath/lib/java/util/concurrent/Executors$DelegatedScheduledExecutorService.class
deleted file mode 100644
index df0646e8f91..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$DelegatedScheduledExecutorService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$FinalizableDelegatedExecutorService.class b/libjava/classpath/lib/java/util/concurrent/Executors$FinalizableDelegatedExecutorService.class
deleted file mode 100644
index 25c94828b63..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$FinalizableDelegatedExecutorService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$PrivilegedCallable.class b/libjava/classpath/lib/java/util/concurrent/Executors$PrivilegedCallable.class
deleted file mode 100644
index 4493b4361b2..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$PrivilegedCallable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$PrivilegedCallableUsingCurrentClassLoader.class b/libjava/classpath/lib/java/util/concurrent/Executors$PrivilegedCallableUsingCurrentClassLoader.class
deleted file mode 100644
index 9fb1beeae7d..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$PrivilegedCallableUsingCurrentClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$PrivilegedThreadFactory.class b/libjava/classpath/lib/java/util/concurrent/Executors$PrivilegedThreadFactory.class
deleted file mode 100644
index 4b9d5843db2..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$PrivilegedThreadFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors$RunnableAdapter.class b/libjava/classpath/lib/java/util/concurrent/Executors$RunnableAdapter.class
deleted file mode 100644
index 107b0dede3a..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors$RunnableAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Executors.class b/libjava/classpath/lib/java/util/concurrent/Executors.class
deleted file mode 100644
index d9fda7804ce..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Executors.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Future.class b/libjava/classpath/lib/java/util/concurrent/Future.class
deleted file mode 100644
index c274956b924..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Future.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/FutureTask$Sync.class b/libjava/classpath/lib/java/util/concurrent/FutureTask$Sync.class
deleted file mode 100644
index 923c93cfc37..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/FutureTask$Sync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/FutureTask.class b/libjava/classpath/lib/java/util/concurrent/FutureTask.class
deleted file mode 100644
index 17fe0cc7df2..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/FutureTask.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$AbstractItr.class b/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$AbstractItr.class
deleted file mode 100644
index 58a725789e6..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$AbstractItr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$DescendingItr.class b/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$DescendingItr.class
deleted file mode 100644
index d6b87259a43..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$DescendingItr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$Itr.class b/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$Itr.class
deleted file mode 100644
index 3436e467785..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$Itr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$Node.class b/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$Node.class
deleted file mode 100644
index a8cf1938902..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque$Node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque.class b/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque.class
deleted file mode 100644
index cd8bb1c18d2..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingDeque.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingQueue$Itr.class b/libjava/classpath/lib/java/util/concurrent/LinkedBlockingQueue$Itr.class
deleted file mode 100644
index 4870d6a3306..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingQueue$Itr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingQueue$Node.class b/libjava/classpath/lib/java/util/concurrent/LinkedBlockingQueue$Node.class
deleted file mode 100644
index 2d591b479ae..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingQueue$Node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingQueue.class b/libjava/classpath/lib/java/util/concurrent/LinkedBlockingQueue.class
deleted file mode 100644
index bf0851c3e80..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/LinkedBlockingQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/PriorityBlockingQueue$Itr.class b/libjava/classpath/lib/java/util/concurrent/PriorityBlockingQueue$Itr.class
deleted file mode 100644
index 48da2c113c7..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/PriorityBlockingQueue$Itr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/PriorityBlockingQueue.class b/libjava/classpath/lib/java/util/concurrent/PriorityBlockingQueue.class
deleted file mode 100644
index 5184f2c139f..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/PriorityBlockingQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/RejectedExecutionException.class b/libjava/classpath/lib/java/util/concurrent/RejectedExecutionException.class
deleted file mode 100644
index 57f1c1a401e..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/RejectedExecutionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/RejectedExecutionHandler.class b/libjava/classpath/lib/java/util/concurrent/RejectedExecutionHandler.class
deleted file mode 100644
index 05e10edd111..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/RejectedExecutionHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/RunnableFuture.class b/libjava/classpath/lib/java/util/concurrent/RunnableFuture.class
deleted file mode 100644
index bde8429163f..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/RunnableFuture.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/RunnableScheduledFuture.class b/libjava/classpath/lib/java/util/concurrent/RunnableScheduledFuture.class
deleted file mode 100644
index 79895789f04..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/RunnableScheduledFuture.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ScheduledExecutorService.class b/libjava/classpath/lib/java/util/concurrent/ScheduledExecutorService.class
deleted file mode 100644
index 0266970951a..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ScheduledExecutorService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ScheduledFuture.class b/libjava/classpath/lib/java/util/concurrent/ScheduledFuture.class
deleted file mode 100644
index 31ef0bcb3da..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ScheduledFuture.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor$1.class b/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor$1.class
deleted file mode 100644
index 6aef91f7047..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.class b/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.class
deleted file mode 100644
index 424908fa899..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.class b/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.class
deleted file mode 100644
index 1870955841c..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor.class b/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor.class
deleted file mode 100644
index af4be7284dc..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ScheduledThreadPoolExecutor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Semaphore$FairSync.class b/libjava/classpath/lib/java/util/concurrent/Semaphore$FairSync.class
deleted file mode 100644
index 8a216087fe3..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Semaphore$FairSync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Semaphore$NonfairSync.class b/libjava/classpath/lib/java/util/concurrent/Semaphore$NonfairSync.class
deleted file mode 100644
index 60b43e7318e..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Semaphore$NonfairSync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Semaphore$Sync.class b/libjava/classpath/lib/java/util/concurrent/Semaphore$Sync.class
deleted file mode 100644
index d5d17a761e8..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Semaphore$Sync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/Semaphore.class b/libjava/classpath/lib/java/util/concurrent/Semaphore.class
deleted file mode 100644
index f8ede27ed36..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/Semaphore.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$EmptyIterator.class b/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$EmptyIterator.class
deleted file mode 100644
index 30927f1d8a4..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$EmptyIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$FifoWaitQueue.class b/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$FifoWaitQueue.class
deleted file mode 100644
index 017a009958e..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$FifoWaitQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$LifoWaitQueue.class b/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$LifoWaitQueue.class
deleted file mode 100644
index 65229c5c414..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$LifoWaitQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.class b/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.class
deleted file mode 100644
index 8ad18e5da0c..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferQueue.class b/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferQueue.class
deleted file mode 100644
index ad5ce500523..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferStack$SNode.class b/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferStack$SNode.class
deleted file mode 100644
index ff35ef69fe7..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferStack$SNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferStack.class b/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferStack.class
deleted file mode 100644
index 596ee4ed48b..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$TransferStack.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$Transferer.class b/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$Transferer.class
deleted file mode 100644
index 683dbd0e2fd..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$Transferer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$WaitQueue.class b/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$WaitQueue.class
deleted file mode 100644
index 4376857a648..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue$WaitQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue.class b/libjava/classpath/lib/java/util/concurrent/SynchronousQueue.class
deleted file mode 100644
index e588a6a6c34..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/SynchronousQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ThreadFactory.class b/libjava/classpath/lib/java/util/concurrent/ThreadFactory.class
deleted file mode 100644
index 4c7b03d82e9..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ThreadFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$AbortPolicy.class b/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$AbortPolicy.class
deleted file mode 100644
index 1ac78c63b24..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$AbortPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$CallerRunsPolicy.class b/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$CallerRunsPolicy.class
deleted file mode 100644
index 36fca630afd..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$CallerRunsPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$DiscardOldestPolicy.class b/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$DiscardOldestPolicy.class
deleted file mode 100644
index a824a2cde1b..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$DiscardOldestPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$DiscardPolicy.class b/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$DiscardPolicy.class
deleted file mode 100644
index 2158069a62a..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$DiscardPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$Worker.class b/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$Worker.class
deleted file mode 100644
index b903f8aaf82..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor$Worker.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor.class b/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor.class
deleted file mode 100644
index f76017d3116..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/ThreadPoolExecutor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/TimeUnit$1.class b/libjava/classpath/lib/java/util/concurrent/TimeUnit$1.class
deleted file mode 100644
index 8218f2613d3..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/TimeUnit$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/TimeUnit$2.class b/libjava/classpath/lib/java/util/concurrent/TimeUnit$2.class
deleted file mode 100644
index 405fe63c28b..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/TimeUnit$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/TimeUnit$3.class b/libjava/classpath/lib/java/util/concurrent/TimeUnit$3.class
deleted file mode 100644
index 6e94184b3c3..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/TimeUnit$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/TimeUnit$4.class b/libjava/classpath/lib/java/util/concurrent/TimeUnit$4.class
deleted file mode 100644
index 079bfb010c2..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/TimeUnit$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/TimeUnit$5.class b/libjava/classpath/lib/java/util/concurrent/TimeUnit$5.class
deleted file mode 100644
index 50d5a6059fe..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/TimeUnit$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/TimeUnit$6.class b/libjava/classpath/lib/java/util/concurrent/TimeUnit$6.class
deleted file mode 100644
index a2232a58b68..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/TimeUnit$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/TimeUnit$7.class b/libjava/classpath/lib/java/util/concurrent/TimeUnit$7.class
deleted file mode 100644
index 81d600f26c5..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/TimeUnit$7.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/TimeUnit.class b/libjava/classpath/lib/java/util/concurrent/TimeUnit.class
deleted file mode 100644
index cd4b852a2d9..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/TimeUnit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/TimeoutException.class b/libjava/classpath/lib/java/util/concurrent/TimeoutException.class
deleted file mode 100644
index 7438a73743f..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/TimeoutException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicBoolean.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicBoolean.class
deleted file mode 100644
index 15962486e10..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicBoolean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicInteger.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicInteger.class
deleted file mode 100644
index 4130c91f22b..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicInteger.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicIntegerArray.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicIntegerArray.class
deleted file mode 100644
index dd17939ab6c..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicIntegerArray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl.class
deleted file mode 100644
index 53e2016bd69..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.class
deleted file mode 100644
index 8d308e62cb8..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLong.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLong.class
deleted file mode 100644
index 09ff7f24edc..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLong.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongArray.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongArray.class
deleted file mode 100644
index c9bd82218ea..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongArray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongFieldUpdater$CASUpdater.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongFieldUpdater$CASUpdater.class
deleted file mode 100644
index d7a74744bd0..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongFieldUpdater$CASUpdater.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongFieldUpdater$LockedUpdater.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongFieldUpdater$LockedUpdater.class
deleted file mode 100644
index fcb0248ba87..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongFieldUpdater$LockedUpdater.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongFieldUpdater.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongFieldUpdater.class
deleted file mode 100644
index 210ad225bc3..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicLongFieldUpdater.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicMarkableReference$ReferenceBooleanPair.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicMarkableReference$ReferenceBooleanPair.class
deleted file mode 100644
index edbf9a91a9b..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicMarkableReference$ReferenceBooleanPair.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicMarkableReference.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicMarkableReference.class
deleted file mode 100644
index ec9b2541af9..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicMarkableReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReference.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReference.class
deleted file mode 100644
index 88235268362..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReferenceArray.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReferenceArray.class
deleted file mode 100644
index 01351e4713e..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReferenceArray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl.class
deleted file mode 100644
index 8b08736f736..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.class
deleted file mode 100644
index 52637d075c4..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicStampedReference$ReferenceIntegerPair.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicStampedReference$ReferenceIntegerPair.class
deleted file mode 100644
index 748d36df8c7..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicStampedReference$ReferenceIntegerPair.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicStampedReference.class b/libjava/classpath/lib/java/util/concurrent/atomic/AtomicStampedReference.class
deleted file mode 100644
index 0976ccb8dc4..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/atomic/AtomicStampedReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/AbstractOwnableSynchronizer.class b/libjava/classpath/lib/java/util/concurrent/locks/AbstractOwnableSynchronizer.class
deleted file mode 100644
index 571f6d143da..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/AbstractOwnableSynchronizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.class b/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.class
deleted file mode 100644
index 4154702abd5..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.class b/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.class
deleted file mode 100644
index 9990a3177c0..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.class b/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.class
deleted file mode 100644
index 0bad6f58f33..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.class b/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.class
deleted file mode 100644
index 3d9ff37cd98..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.class b/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.class
deleted file mode 100644
index caf62dd3855..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedSynchronizer.class b/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedSynchronizer.class
deleted file mode 100644
index f350fdaa9b5..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/AbstractQueuedSynchronizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/Condition.class b/libjava/classpath/lib/java/util/concurrent/locks/Condition.class
deleted file mode 100644
index 94057fe7727..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/Condition.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/Lock.class b/libjava/classpath/lib/java/util/concurrent/locks/Lock.class
deleted file mode 100644
index 52097e97ecf..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/Lock.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/LockSupport.class b/libjava/classpath/lib/java/util/concurrent/locks/LockSupport.class
deleted file mode 100644
index 86b2ae0e38d..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/LockSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReadWriteLock.class b/libjava/classpath/lib/java/util/concurrent/locks/ReadWriteLock.class
deleted file mode 100644
index e216ab413c9..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReadWriteLock.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock$FairSync.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock$FairSync.class
deleted file mode 100644
index 981d4c0593a..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock$FairSync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock$NonfairSync.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock$NonfairSync.class
deleted file mode 100644
index de58e12e64b..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock$NonfairSync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock$Sync.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock$Sync.class
deleted file mode 100644
index e2e8a063bd6..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock$Sync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock.class
deleted file mode 100644
index 99eb8178bab..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantLock.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$FairSync.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$FairSync.class
deleted file mode 100644
index 42bf02b2477..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$FairSync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$NonfairSync.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$NonfairSync.class
deleted file mode 100644
index 7ade70dcdd3..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$NonfairSync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$ReadLock.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$ReadLock.class
deleted file mode 100644
index 902ae0f419d..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$ReadLock.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$HoldCounter.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$HoldCounter.class
deleted file mode 100644
index 11ae1ecd371..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$HoldCounter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.class
deleted file mode 100644
index 992969a4787..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$Sync.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$Sync.class
deleted file mode 100644
index dfec8fcec0a..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$Sync.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock.class
deleted file mode 100644
index 09b514b71aa..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock.class b/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock.class
deleted file mode 100644
index 221e7097e2b..00000000000
--- a/libjava/classpath/lib/java/util/concurrent/locks/ReentrantReadWriteLock.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/jar/Attributes$Name.class b/libjava/classpath/lib/java/util/jar/Attributes$Name.class
deleted file mode 100644
index c91f94f3f54..00000000000
--- a/libjava/classpath/lib/java/util/jar/Attributes$Name.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/jar/Attributes.class b/libjava/classpath/lib/java/util/jar/Attributes.class
deleted file mode 100644
index a7e7569f52f..00000000000
--- a/libjava/classpath/lib/java/util/jar/Attributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/jar/JarEntry.class b/libjava/classpath/lib/java/util/jar/JarEntry.class
deleted file mode 100644
index 0ae4b9728b7..00000000000
--- a/libjava/classpath/lib/java/util/jar/JarEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/jar/JarException.class b/libjava/classpath/lib/java/util/jar/JarException.class
deleted file mode 100644
index 7c42b7b1a16..00000000000
--- a/libjava/classpath/lib/java/util/jar/JarException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/jar/JarFile$EntryInputStream.class b/libjava/classpath/lib/java/util/jar/JarFile$EntryInputStream.class
deleted file mode 100644
index 77805bda356..00000000000
--- a/libjava/classpath/lib/java/util/jar/JarFile$EntryInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/jar/JarFile$JarEnumeration.class b/libjava/classpath/lib/java/util/jar/JarFile$JarEnumeration.class
deleted file mode 100644
index 871be671067..00000000000
--- a/libjava/classpath/lib/java/util/jar/JarFile$JarEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/jar/JarFile.class b/libjava/classpath/lib/java/util/jar/JarFile.class
deleted file mode 100644
index 0ab0c3293be..00000000000
--- a/libjava/classpath/lib/java/util/jar/JarFile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/jar/JarInputStream.class b/libjava/classpath/lib/java/util/jar/JarInputStream.class
deleted file mode 100644
index 5646f3d67cc..00000000000
--- a/libjava/classpath/lib/java/util/jar/JarInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/jar/JarOutputStream.class b/libjava/classpath/lib/java/util/jar/JarOutputStream.class
deleted file mode 100644
index fc5cd4efbe8..00000000000
--- a/libjava/classpath/lib/java/util/jar/JarOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/jar/Manifest.class b/libjava/classpath/lib/java/util/jar/Manifest.class
deleted file mode 100644
index 0f95a3a02ce..00000000000
--- a/libjava/classpath/lib/java/util/jar/Manifest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/ConsoleHandler.class b/libjava/classpath/lib/java/util/logging/ConsoleHandler.class
deleted file mode 100644
index c1016c61ddc..00000000000
--- a/libjava/classpath/lib/java/util/logging/ConsoleHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/ErrorManager.class b/libjava/classpath/lib/java/util/logging/ErrorManager.class
deleted file mode 100644
index a61eb2e4e60..00000000000
--- a/libjava/classpath/lib/java/util/logging/ErrorManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/FileHandler$ostr.class b/libjava/classpath/lib/java/util/logging/FileHandler$ostr.class
deleted file mode 100644
index b89bb0edc3d..00000000000
--- a/libjava/classpath/lib/java/util/logging/FileHandler$ostr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/FileHandler.class b/libjava/classpath/lib/java/util/logging/FileHandler.class
deleted file mode 100644
index 7cb9151e1d5..00000000000
--- a/libjava/classpath/lib/java/util/logging/FileHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/Filter.class b/libjava/classpath/lib/java/util/logging/Filter.class
deleted file mode 100644
index 4f1182c5e5a..00000000000
--- a/libjava/classpath/lib/java/util/logging/Filter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/Formatter.class b/libjava/classpath/lib/java/util/logging/Formatter.class
deleted file mode 100644
index f2179df367d..00000000000
--- a/libjava/classpath/lib/java/util/logging/Formatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/Handler.class b/libjava/classpath/lib/java/util/logging/Handler.class
deleted file mode 100644
index 791448fd41f..00000000000
--- a/libjava/classpath/lib/java/util/logging/Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/Level.class b/libjava/classpath/lib/java/util/logging/Level.class
deleted file mode 100644
index 63159fcfe51..00000000000
--- a/libjava/classpath/lib/java/util/logging/Level.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/LogManager$1.class b/libjava/classpath/lib/java/util/logging/LogManager$1.class
deleted file mode 100644
index 39d0992a0ab..00000000000
--- a/libjava/classpath/lib/java/util/logging/LogManager$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/LogManager.class b/libjava/classpath/lib/java/util/logging/LogManager.class
deleted file mode 100644
index 7f93b8af931..00000000000
--- a/libjava/classpath/lib/java/util/logging/LogManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/LogRecord.class b/libjava/classpath/lib/java/util/logging/LogRecord.class
deleted file mode 100644
index 35fba9e9c25..00000000000
--- a/libjava/classpath/lib/java/util/logging/LogRecord.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/Logger$1.class b/libjava/classpath/lib/java/util/logging/Logger$1.class
deleted file mode 100644
index 75e2200420c..00000000000
--- a/libjava/classpath/lib/java/util/logging/Logger$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/Logger.class b/libjava/classpath/lib/java/util/logging/Logger.class
deleted file mode 100644
index ab5acbc9ea3..00000000000
--- a/libjava/classpath/lib/java/util/logging/Logger.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/LoggingMXBean.class b/libjava/classpath/lib/java/util/logging/LoggingMXBean.class
deleted file mode 100644
index 07e36eea48b..00000000000
--- a/libjava/classpath/lib/java/util/logging/LoggingMXBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/LoggingPermission.class b/libjava/classpath/lib/java/util/logging/LoggingPermission.class
deleted file mode 100644
index e6d4caf8eb5..00000000000
--- a/libjava/classpath/lib/java/util/logging/LoggingPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/MemoryHandler.class b/libjava/classpath/lib/java/util/logging/MemoryHandler.class
deleted file mode 100644
index 80e0099c73c..00000000000
--- a/libjava/classpath/lib/java/util/logging/MemoryHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/SimpleFormatter.class b/libjava/classpath/lib/java/util/logging/SimpleFormatter.class
deleted file mode 100644
index b484f73937d..00000000000
--- a/libjava/classpath/lib/java/util/logging/SimpleFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/SocketHandler.class b/libjava/classpath/lib/java/util/logging/SocketHandler.class
deleted file mode 100644
index fa90dee6f7e..00000000000
--- a/libjava/classpath/lib/java/util/logging/SocketHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/StreamHandler.class b/libjava/classpath/lib/java/util/logging/StreamHandler.class
deleted file mode 100644
index daeda91edb3..00000000000
--- a/libjava/classpath/lib/java/util/logging/StreamHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/logging/XMLFormatter.class b/libjava/classpath/lib/java/util/logging/XMLFormatter.class
deleted file mode 100644
index fd47a7d08c3..00000000000
--- a/libjava/classpath/lib/java/util/logging/XMLFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/AbstractPreferences$1.class b/libjava/classpath/lib/java/util/prefs/AbstractPreferences$1.class
deleted file mode 100644
index 0f2ec9517e2..00000000000
--- a/libjava/classpath/lib/java/util/prefs/AbstractPreferences$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/AbstractPreferences$2.class b/libjava/classpath/lib/java/util/prefs/AbstractPreferences$2.class
deleted file mode 100644
index 596a22a8895..00000000000
--- a/libjava/classpath/lib/java/util/prefs/AbstractPreferences$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/AbstractPreferences.class b/libjava/classpath/lib/java/util/prefs/AbstractPreferences.class
deleted file mode 100644
index b8537d1745a..00000000000
--- a/libjava/classpath/lib/java/util/prefs/AbstractPreferences.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/BackingStoreException.class b/libjava/classpath/lib/java/util/prefs/BackingStoreException.class
deleted file mode 100644
index 70fc6df4e47..00000000000
--- a/libjava/classpath/lib/java/util/prefs/BackingStoreException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/InvalidPreferencesFormatException.class b/libjava/classpath/lib/java/util/prefs/InvalidPreferencesFormatException.class
deleted file mode 100644
index 5ac6f879942..00000000000
--- a/libjava/classpath/lib/java/util/prefs/InvalidPreferencesFormatException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/NodeChangeEvent.class b/libjava/classpath/lib/java/util/prefs/NodeChangeEvent.class
deleted file mode 100644
index dff7ba5c7ad..00000000000
--- a/libjava/classpath/lib/java/util/prefs/NodeChangeEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/NodeChangeListener.class b/libjava/classpath/lib/java/util/prefs/NodeChangeListener.class
deleted file mode 100644
index 698f176aaea..00000000000
--- a/libjava/classpath/lib/java/util/prefs/NodeChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/PreferenceChangeEvent.class b/libjava/classpath/lib/java/util/prefs/PreferenceChangeEvent.class
deleted file mode 100644
index 6f4bc424e47..00000000000
--- a/libjava/classpath/lib/java/util/prefs/PreferenceChangeEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/PreferenceChangeListener.class b/libjava/classpath/lib/java/util/prefs/PreferenceChangeListener.class
deleted file mode 100644
index ffcbb0207bc..00000000000
--- a/libjava/classpath/lib/java/util/prefs/PreferenceChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/Preferences$1.class b/libjava/classpath/lib/java/util/prefs/Preferences$1.class
deleted file mode 100644
index 00f0be17c23..00000000000
--- a/libjava/classpath/lib/java/util/prefs/Preferences$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/Preferences.class b/libjava/classpath/lib/java/util/prefs/Preferences.class
deleted file mode 100644
index bf687b05cc0..00000000000
--- a/libjava/classpath/lib/java/util/prefs/Preferences.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/prefs/PreferencesFactory.class b/libjava/classpath/lib/java/util/prefs/PreferencesFactory.class
deleted file mode 100644
index 2243ca51597..00000000000
--- a/libjava/classpath/lib/java/util/prefs/PreferencesFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/regex/MatchResult.class b/libjava/classpath/lib/java/util/regex/MatchResult.class
deleted file mode 100644
index 064c64a293a..00000000000
--- a/libjava/classpath/lib/java/util/regex/MatchResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/regex/Matcher.class b/libjava/classpath/lib/java/util/regex/Matcher.class
deleted file mode 100644
index 6cb429c6fb8..00000000000
--- a/libjava/classpath/lib/java/util/regex/Matcher.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/regex/Pattern.class b/libjava/classpath/lib/java/util/regex/Pattern.class
deleted file mode 100644
index 47e212b2226..00000000000
--- a/libjava/classpath/lib/java/util/regex/Pattern.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/regex/PatternSyntaxException.class b/libjava/classpath/lib/java/util/regex/PatternSyntaxException.class
deleted file mode 100644
index 39d83b676e3..00000000000
--- a/libjava/classpath/lib/java/util/regex/PatternSyntaxException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/Adler32.class b/libjava/classpath/lib/java/util/zip/Adler32.class
deleted file mode 100644
index 442ff469b1e..00000000000
--- a/libjava/classpath/lib/java/util/zip/Adler32.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/CRC32.class b/libjava/classpath/lib/java/util/zip/CRC32.class
deleted file mode 100644
index 648d071d88b..00000000000
--- a/libjava/classpath/lib/java/util/zip/CRC32.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/CheckedInputStream.class b/libjava/classpath/lib/java/util/zip/CheckedInputStream.class
deleted file mode 100644
index ebc47507816..00000000000
--- a/libjava/classpath/lib/java/util/zip/CheckedInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/CheckedOutputStream.class b/libjava/classpath/lib/java/util/zip/CheckedOutputStream.class
deleted file mode 100644
index c1cb1101af1..00000000000
--- a/libjava/classpath/lib/java/util/zip/CheckedOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/Checksum.class b/libjava/classpath/lib/java/util/zip/Checksum.class
deleted file mode 100644
index f30eab3a199..00000000000
--- a/libjava/classpath/lib/java/util/zip/Checksum.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/DataFormatException.class b/libjava/classpath/lib/java/util/zip/DataFormatException.class
deleted file mode 100644
index 2cc399771e3..00000000000
--- a/libjava/classpath/lib/java/util/zip/DataFormatException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/Deflater.class b/libjava/classpath/lib/java/util/zip/Deflater.class
deleted file mode 100644
index 7082243dd88..00000000000
--- a/libjava/classpath/lib/java/util/zip/Deflater.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/DeflaterOutputStream.class b/libjava/classpath/lib/java/util/zip/DeflaterOutputStream.class
deleted file mode 100644
index 7dc0cab62c4..00000000000
--- a/libjava/classpath/lib/java/util/zip/DeflaterOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/GZIPInputStream.class b/libjava/classpath/lib/java/util/zip/GZIPInputStream.class
deleted file mode 100644
index a6509e756f8..00000000000
--- a/libjava/classpath/lib/java/util/zip/GZIPInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/GZIPOutputStream.class b/libjava/classpath/lib/java/util/zip/GZIPOutputStream.class
deleted file mode 100644
index debc1c134e9..00000000000
--- a/libjava/classpath/lib/java/util/zip/GZIPOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/Inflater.class b/libjava/classpath/lib/java/util/zip/Inflater.class
deleted file mode 100644
index ec1bc7f84bc..00000000000
--- a/libjava/classpath/lib/java/util/zip/Inflater.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/InflaterInputStream.class b/libjava/classpath/lib/java/util/zip/InflaterInputStream.class
deleted file mode 100644
index d0f6de8fcf7..00000000000
--- a/libjava/classpath/lib/java/util/zip/InflaterInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/ZipConstants.class b/libjava/classpath/lib/java/util/zip/ZipConstants.class
deleted file mode 100644
index 485b7dac58f..00000000000
--- a/libjava/classpath/lib/java/util/zip/ZipConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/ZipEntry.class b/libjava/classpath/lib/java/util/zip/ZipEntry.class
deleted file mode 100644
index dc9b197e812..00000000000
--- a/libjava/classpath/lib/java/util/zip/ZipEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/ZipException.class b/libjava/classpath/lib/java/util/zip/ZipException.class
deleted file mode 100644
index dcc54826f05..00000000000
--- a/libjava/classpath/lib/java/util/zip/ZipException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/ZipFile$1.class b/libjava/classpath/lib/java/util/zip/ZipFile$1.class
deleted file mode 100644
index f37b498a13d..00000000000
--- a/libjava/classpath/lib/java/util/zip/ZipFile$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/ZipFile$PartialInputStream.class b/libjava/classpath/lib/java/util/zip/ZipFile$PartialInputStream.class
deleted file mode 100644
index cc7dcd68600..00000000000
--- a/libjava/classpath/lib/java/util/zip/ZipFile$PartialInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/ZipFile$ZipEntryEnumeration.class b/libjava/classpath/lib/java/util/zip/ZipFile$ZipEntryEnumeration.class
deleted file mode 100644
index 85c08376104..00000000000
--- a/libjava/classpath/lib/java/util/zip/ZipFile$ZipEntryEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/ZipFile.class b/libjava/classpath/lib/java/util/zip/ZipFile.class
deleted file mode 100644
index c73ebec6e4a..00000000000
--- a/libjava/classpath/lib/java/util/zip/ZipFile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/ZipInputStream.class b/libjava/classpath/lib/java/util/zip/ZipInputStream.class
deleted file mode 100644
index 3865420d226..00000000000
--- a/libjava/classpath/lib/java/util/zip/ZipInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/java/util/zip/ZipOutputStream.class b/libjava/classpath/lib/java/util/zip/ZipOutputStream.class
deleted file mode 100644
index 616b27120a9..00000000000
--- a/libjava/classpath/lib/java/util/zip/ZipOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/Accessible.class b/libjava/classpath/lib/javax/accessibility/Accessible.class
deleted file mode 100644
index fe2199fd14a..00000000000
--- a/libjava/classpath/lib/javax/accessibility/Accessible.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleAction.class b/libjava/classpath/lib/javax/accessibility/AccessibleAction.class
deleted file mode 100644
index 149eef17101..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleAttributeSequence.class b/libjava/classpath/lib/javax/accessibility/AccessibleAttributeSequence.class
deleted file mode 100644
index 2bd35220370..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleAttributeSequence.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleBundle.class b/libjava/classpath/lib/javax/accessibility/AccessibleBundle.class
deleted file mode 100644
index a99befe6fe3..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleBundle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleComponent.class b/libjava/classpath/lib/javax/accessibility/AccessibleComponent.class
deleted file mode 100644
index 73707b7a63c..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleContext.class b/libjava/classpath/lib/javax/accessibility/AccessibleContext.class
deleted file mode 100644
index 5452cfac4d6..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleEditableText.class b/libjava/classpath/lib/javax/accessibility/AccessibleEditableText.class
deleted file mode 100644
index 8b3df93fcc4..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleEditableText.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleExtendedComponent.class b/libjava/classpath/lib/javax/accessibility/AccessibleExtendedComponent.class
deleted file mode 100644
index 65f698c6fe7..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleExtendedComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleExtendedTable.class b/libjava/classpath/lib/javax/accessibility/AccessibleExtendedTable.class
deleted file mode 100644
index 8f5c69c1f4c..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleExtendedTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleExtendedText.class b/libjava/classpath/lib/javax/accessibility/AccessibleExtendedText.class
deleted file mode 100644
index a88e57ff2f9..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleExtendedText.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleHyperlink.class b/libjava/classpath/lib/javax/accessibility/AccessibleHyperlink.class
deleted file mode 100644
index 2704bc4708b..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleHyperlink.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleHypertext.class b/libjava/classpath/lib/javax/accessibility/AccessibleHypertext.class
deleted file mode 100644
index c51f9b7de51..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleHypertext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleIcon.class b/libjava/classpath/lib/javax/accessibility/AccessibleIcon.class
deleted file mode 100644
index 6057d36ec03..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleKeyBinding.class b/libjava/classpath/lib/javax/accessibility/AccessibleKeyBinding.class
deleted file mode 100644
index fe9b740151b..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleKeyBinding.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleRelation.class b/libjava/classpath/lib/javax/accessibility/AccessibleRelation.class
deleted file mode 100644
index 944cfb427da..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleRelation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleRelationSet.class b/libjava/classpath/lib/javax/accessibility/AccessibleRelationSet.class
deleted file mode 100644
index 43fb3c7b5de..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleRelationSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleResourceBundle.class b/libjava/classpath/lib/javax/accessibility/AccessibleResourceBundle.class
deleted file mode 100644
index 63deb244e15..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleResourceBundle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleRole.class b/libjava/classpath/lib/javax/accessibility/AccessibleRole.class
deleted file mode 100644
index d05eefb9166..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleRole.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleSelection.class b/libjava/classpath/lib/javax/accessibility/AccessibleSelection.class
deleted file mode 100644
index 254cd3fb28c..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleSelection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleState.class b/libjava/classpath/lib/javax/accessibility/AccessibleState.class
deleted file mode 100644
index 513cebedf08..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleStateSet.class b/libjava/classpath/lib/javax/accessibility/AccessibleStateSet.class
deleted file mode 100644
index 68fbea36061..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleStateSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleStreamable.class b/libjava/classpath/lib/javax/accessibility/AccessibleStreamable.class
deleted file mode 100644
index c133956ab7c..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleStreamable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleTable.class b/libjava/classpath/lib/javax/accessibility/AccessibleTable.class
deleted file mode 100644
index 68263adba35..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleTableModelChange.class b/libjava/classpath/lib/javax/accessibility/AccessibleTableModelChange.class
deleted file mode 100644
index a45d84a143b..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleTableModelChange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleText.class b/libjava/classpath/lib/javax/accessibility/AccessibleText.class
deleted file mode 100644
index d67789427ba..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleText.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleTextSequence.class b/libjava/classpath/lib/javax/accessibility/AccessibleTextSequence.class
deleted file mode 100644
index b0fd35da23e..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleTextSequence.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/accessibility/AccessibleValue.class b/libjava/classpath/lib/javax/accessibility/AccessibleValue.class
deleted file mode 100644
index a44fc858760..00000000000
--- a/libjava/classpath/lib/javax/accessibility/AccessibleValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/BadPaddingException.class b/libjava/classpath/lib/javax/crypto/BadPaddingException.class
deleted file mode 100644
index 57c28489f14..00000000000
--- a/libjava/classpath/lib/javax/crypto/BadPaddingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/Cipher.class b/libjava/classpath/lib/javax/crypto/Cipher.class
deleted file mode 100644
index 4d7b5a63913..00000000000
--- a/libjava/classpath/lib/javax/crypto/Cipher.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/CipherInputStream.class b/libjava/classpath/lib/javax/crypto/CipherInputStream.class
deleted file mode 100644
index 112cdecf4d9..00000000000
--- a/libjava/classpath/lib/javax/crypto/CipherInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/CipherOutputStream.class b/libjava/classpath/lib/javax/crypto/CipherOutputStream.class
deleted file mode 100644
index d2d61e23bf1..00000000000
--- a/libjava/classpath/lib/javax/crypto/CipherOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/CipherSpi.class b/libjava/classpath/lib/javax/crypto/CipherSpi.class
deleted file mode 100644
index c1d63cf7d10..00000000000
--- a/libjava/classpath/lib/javax/crypto/CipherSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/EncryptedPrivateKeyInfo.class b/libjava/classpath/lib/javax/crypto/EncryptedPrivateKeyInfo.class
deleted file mode 100644
index 60255e20619..00000000000
--- a/libjava/classpath/lib/javax/crypto/EncryptedPrivateKeyInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/ExemptionMechanism.class b/libjava/classpath/lib/javax/crypto/ExemptionMechanism.class
deleted file mode 100644
index 55bf46537bf..00000000000
--- a/libjava/classpath/lib/javax/crypto/ExemptionMechanism.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/ExemptionMechanismException.class b/libjava/classpath/lib/javax/crypto/ExemptionMechanismException.class
deleted file mode 100644
index 8a46deba0e6..00000000000
--- a/libjava/classpath/lib/javax/crypto/ExemptionMechanismException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/ExemptionMechanismSpi.class b/libjava/classpath/lib/javax/crypto/ExemptionMechanismSpi.class
deleted file mode 100644
index dd1c33fe585..00000000000
--- a/libjava/classpath/lib/javax/crypto/ExemptionMechanismSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/IllegalBlockSizeException.class b/libjava/classpath/lib/javax/crypto/IllegalBlockSizeException.class
deleted file mode 100644
index 9878806420b..00000000000
--- a/libjava/classpath/lib/javax/crypto/IllegalBlockSizeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/KeyAgreement.class b/libjava/classpath/lib/javax/crypto/KeyAgreement.class
deleted file mode 100644
index 52d8fc45a00..00000000000
--- a/libjava/classpath/lib/javax/crypto/KeyAgreement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/KeyAgreementSpi.class b/libjava/classpath/lib/javax/crypto/KeyAgreementSpi.class
deleted file mode 100644
index 95abcb69217..00000000000
--- a/libjava/classpath/lib/javax/crypto/KeyAgreementSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/KeyGenerator.class b/libjava/classpath/lib/javax/crypto/KeyGenerator.class
deleted file mode 100644
index e508065d134..00000000000
--- a/libjava/classpath/lib/javax/crypto/KeyGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/KeyGeneratorSpi.class b/libjava/classpath/lib/javax/crypto/KeyGeneratorSpi.class
deleted file mode 100644
index 4cc1464740a..00000000000
--- a/libjava/classpath/lib/javax/crypto/KeyGeneratorSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/Mac.class b/libjava/classpath/lib/javax/crypto/Mac.class
deleted file mode 100644
index 2a1ffec0790..00000000000
--- a/libjava/classpath/lib/javax/crypto/Mac.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/MacSpi.class b/libjava/classpath/lib/javax/crypto/MacSpi.class
deleted file mode 100644
index 358a03fec1f..00000000000
--- a/libjava/classpath/lib/javax/crypto/MacSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/NoSuchPaddingException.class b/libjava/classpath/lib/javax/crypto/NoSuchPaddingException.class
deleted file mode 100644
index 633fc1ebffc..00000000000
--- a/libjava/classpath/lib/javax/crypto/NoSuchPaddingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/NullCipher.class b/libjava/classpath/lib/javax/crypto/NullCipher.class
deleted file mode 100644
index 2cb9e01273b..00000000000
--- a/libjava/classpath/lib/javax/crypto/NullCipher.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/NullCipherImpl.class b/libjava/classpath/lib/javax/crypto/NullCipherImpl.class
deleted file mode 100644
index fe9d2eff44b..00000000000
--- a/libjava/classpath/lib/javax/crypto/NullCipherImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/SealedObject.class b/libjava/classpath/lib/javax/crypto/SealedObject.class
deleted file mode 100644
index fcf03fbb799..00000000000
--- a/libjava/classpath/lib/javax/crypto/SealedObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/SecretKey.class b/libjava/classpath/lib/javax/crypto/SecretKey.class
deleted file mode 100644
index 64e8d59657a..00000000000
--- a/libjava/classpath/lib/javax/crypto/SecretKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/SecretKeyFactory.class b/libjava/classpath/lib/javax/crypto/SecretKeyFactory.class
deleted file mode 100644
index e457f1c3c58..00000000000
--- a/libjava/classpath/lib/javax/crypto/SecretKeyFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/SecretKeyFactorySpi.class b/libjava/classpath/lib/javax/crypto/SecretKeyFactorySpi.class
deleted file mode 100644
index b92dad3dc8d..00000000000
--- a/libjava/classpath/lib/javax/crypto/SecretKeyFactorySpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/ShortBufferException.class b/libjava/classpath/lib/javax/crypto/ShortBufferException.class
deleted file mode 100644
index 1e8ba487328..00000000000
--- a/libjava/classpath/lib/javax/crypto/ShortBufferException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/interfaces/DHKey.class b/libjava/classpath/lib/javax/crypto/interfaces/DHKey.class
deleted file mode 100644
index d370d21de21..00000000000
--- a/libjava/classpath/lib/javax/crypto/interfaces/DHKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/interfaces/DHPrivateKey.class b/libjava/classpath/lib/javax/crypto/interfaces/DHPrivateKey.class
deleted file mode 100644
index 57e0a02160c..00000000000
--- a/libjava/classpath/lib/javax/crypto/interfaces/DHPrivateKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/interfaces/DHPublicKey.class b/libjava/classpath/lib/javax/crypto/interfaces/DHPublicKey.class
deleted file mode 100644
index 498a26c35ea..00000000000
--- a/libjava/classpath/lib/javax/crypto/interfaces/DHPublicKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/interfaces/PBEKey.class b/libjava/classpath/lib/javax/crypto/interfaces/PBEKey.class
deleted file mode 100644
index 6871ebd2914..00000000000
--- a/libjava/classpath/lib/javax/crypto/interfaces/PBEKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/DESKeySpec.class b/libjava/classpath/lib/javax/crypto/spec/DESKeySpec.class
deleted file mode 100644
index c95a112ef16..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/DESKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/DESedeKeySpec.class b/libjava/classpath/lib/javax/crypto/spec/DESedeKeySpec.class
deleted file mode 100644
index d70c28fc310..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/DESedeKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/DHGenParameterSpec.class b/libjava/classpath/lib/javax/crypto/spec/DHGenParameterSpec.class
deleted file mode 100644
index f47669432db..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/DHGenParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/DHParameterSpec.class b/libjava/classpath/lib/javax/crypto/spec/DHParameterSpec.class
deleted file mode 100644
index 25b8df6db1e..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/DHParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/DHPrivateKeySpec.class b/libjava/classpath/lib/javax/crypto/spec/DHPrivateKeySpec.class
deleted file mode 100644
index 2c717e1f20b..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/DHPrivateKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/DHPublicKeySpec.class b/libjava/classpath/lib/javax/crypto/spec/DHPublicKeySpec.class
deleted file mode 100644
index fa0d95e3f11..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/DHPublicKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/IvParameterSpec.class b/libjava/classpath/lib/javax/crypto/spec/IvParameterSpec.class
deleted file mode 100644
index 9ad1e895b9c..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/IvParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/PBEKeySpec.class b/libjava/classpath/lib/javax/crypto/spec/PBEKeySpec.class
deleted file mode 100644
index c9e2ee820f3..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/PBEKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/PBEParameterSpec.class b/libjava/classpath/lib/javax/crypto/spec/PBEParameterSpec.class
deleted file mode 100644
index 5b586d236ce..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/PBEParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/RC2ParameterSpec.class b/libjava/classpath/lib/javax/crypto/spec/RC2ParameterSpec.class
deleted file mode 100644
index 4c58c84102d..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/RC2ParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/RC5ParameterSpec.class b/libjava/classpath/lib/javax/crypto/spec/RC5ParameterSpec.class
deleted file mode 100644
index 6acc9437818..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/RC5ParameterSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/crypto/spec/SecretKeySpec.class b/libjava/classpath/lib/javax/crypto/spec/SecretKeySpec.class
deleted file mode 100644
index a68b9352d93..00000000000
--- a/libjava/classpath/lib/javax/crypto/spec/SecretKeySpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/IIOException.class b/libjava/classpath/lib/javax/imageio/IIOException.class
deleted file mode 100644
index d71f8c283a0..00000000000
--- a/libjava/classpath/lib/javax/imageio/IIOException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/IIOImage.class b/libjava/classpath/lib/javax/imageio/IIOImage.class
deleted file mode 100644
index 5dea6c5fb0d..00000000000
--- a/libjava/classpath/lib/javax/imageio/IIOImage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/IIOParam.class b/libjava/classpath/lib/javax/imageio/IIOParam.class
deleted file mode 100644
index 3964639b694..00000000000
--- a/libjava/classpath/lib/javax/imageio/IIOParam.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/IIOParamController.class b/libjava/classpath/lib/javax/imageio/IIOParamController.class
deleted file mode 100644
index bc138b67507..00000000000
--- a/libjava/classpath/lib/javax/imageio/IIOParamController.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$1.class b/libjava/classpath/lib/javax/imageio/ImageIO$1.class
deleted file mode 100644
index aecb7d8db73..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$ImageReaderIterator.class b/libjava/classpath/lib/javax/imageio/ImageIO$ImageReaderIterator.class
deleted file mode 100644
index 0f0891053f9..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$ImageReaderIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$ImageWriterIterator.class b/libjava/classpath/lib/javax/imageio/ImageIO$ImageWriterIterator.class
deleted file mode 100644
index 1637f289d4a..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$ImageWriterIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$ReaderFormatFilter.class b/libjava/classpath/lib/javax/imageio/ImageIO$ReaderFormatFilter.class
deleted file mode 100644
index 5155bca7667..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$ReaderFormatFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$ReaderMIMETypeFilter.class b/libjava/classpath/lib/javax/imageio/ImageIO$ReaderMIMETypeFilter.class
deleted file mode 100644
index aa88c00f26f..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$ReaderMIMETypeFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$ReaderObjectFilter.class b/libjava/classpath/lib/javax/imageio/ImageIO$ReaderObjectFilter.class
deleted file mode 100644
index 51b2f1e52cf..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$ReaderObjectFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$ReaderSuffixFilter.class b/libjava/classpath/lib/javax/imageio/ImageIO$ReaderSuffixFilter.class
deleted file mode 100644
index a4250bf5257..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$ReaderSuffixFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$TranscoderFilter.class b/libjava/classpath/lib/javax/imageio/ImageIO$TranscoderFilter.class
deleted file mode 100644
index 8e4fe3cdcbc..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$TranscoderFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$WriterFormatFilter.class b/libjava/classpath/lib/javax/imageio/ImageIO$WriterFormatFilter.class
deleted file mode 100644
index a1fcd80fc56..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$WriterFormatFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$WriterMIMETypeFilter.class b/libjava/classpath/lib/javax/imageio/ImageIO$WriterMIMETypeFilter.class
deleted file mode 100644
index 64f5bd49fc6..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$WriterMIMETypeFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$WriterObjectFilter.class b/libjava/classpath/lib/javax/imageio/ImageIO$WriterObjectFilter.class
deleted file mode 100644
index 1304c7f9388..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$WriterObjectFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO$WriterSuffixFilter.class b/libjava/classpath/lib/javax/imageio/ImageIO$WriterSuffixFilter.class
deleted file mode 100644
index 9ff7d63bb1b..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO$WriterSuffixFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageIO.class b/libjava/classpath/lib/javax/imageio/ImageIO.class
deleted file mode 100644
index 14c24cb382d..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageIO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageReadParam.class b/libjava/classpath/lib/javax/imageio/ImageReadParam.class
deleted file mode 100644
index 67cff3a68a9..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageReadParam.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageReader.class b/libjava/classpath/lib/javax/imageio/ImageReader.class
deleted file mode 100644
index 85979dac171..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageTranscoder.class b/libjava/classpath/lib/javax/imageio/ImageTranscoder.class
deleted file mode 100644
index 2e5cb4a40a5..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageTranscoder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageTypeSpecifier.class b/libjava/classpath/lib/javax/imageio/ImageTypeSpecifier.class
deleted file mode 100644
index 17e94e7630f..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageTypeSpecifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageWriteParam.class b/libjava/classpath/lib/javax/imageio/ImageWriteParam.class
deleted file mode 100644
index 942348b55b8..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageWriteParam.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/ImageWriter.class b/libjava/classpath/lib/javax/imageio/ImageWriter.class
deleted file mode 100644
index 57e29cf5b6f..00000000000
--- a/libjava/classpath/lib/javax/imageio/ImageWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/event/IIOReadProgressListener.class b/libjava/classpath/lib/javax/imageio/event/IIOReadProgressListener.class
deleted file mode 100644
index 2728ff5eea0..00000000000
--- a/libjava/classpath/lib/javax/imageio/event/IIOReadProgressListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/event/IIOReadUpdateListener.class b/libjava/classpath/lib/javax/imageio/event/IIOReadUpdateListener.class
deleted file mode 100644
index 26b3560fee3..00000000000
--- a/libjava/classpath/lib/javax/imageio/event/IIOReadUpdateListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/event/IIOReadWarningListener.class b/libjava/classpath/lib/javax/imageio/event/IIOReadWarningListener.class
deleted file mode 100644
index ecd17180544..00000000000
--- a/libjava/classpath/lib/javax/imageio/event/IIOReadWarningListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/event/IIOWriteProgressListener.class b/libjava/classpath/lib/javax/imageio/event/IIOWriteProgressListener.class
deleted file mode 100644
index af4114f6b89..00000000000
--- a/libjava/classpath/lib/javax/imageio/event/IIOWriteProgressListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/event/IIOWriteWarningListener.class b/libjava/classpath/lib/javax/imageio/event/IIOWriteWarningListener.class
deleted file mode 100644
index afede8bf4c4..00000000000
--- a/libjava/classpath/lib/javax/imageio/event/IIOWriteWarningListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOInvalidTreeException.class b/libjava/classpath/lib/javax/imageio/metadata/IIOInvalidTreeException.class
deleted file mode 100644
index e2150693617..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOInvalidTreeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadata.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadata.class
deleted file mode 100644
index 46f34c55403..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadata.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataController.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataController.class
deleted file mode 100644
index f90f96d1287..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataController.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormat.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormat.class
deleted file mode 100644
index 299f194e3eb..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$1.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$1.class
deleted file mode 100644
index e6b32672048..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.class
deleted file mode 100644
index 8da0e36d9cf..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded.class
deleted file mode 100644
index f70d44e42ad..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated.class
deleted file mode 100644
index 6e9c99c5837..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrList.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrList.class
deleted file mode 100644
index 3139d38fe53..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.class
deleted file mode 100644
index c6ddf8ed845..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectArray.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectArray.class
deleted file mode 100644
index 507733cb086..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectArray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectBounded.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectBounded.class
deleted file mode 100644
index b36a4835394..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectBounded.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectEnumerated.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectEnumerated.class
deleted file mode 100644
index 3b7e3b4c44f..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectEnumerated.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl.class
deleted file mode 100644
index eebc68bb4a6..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataFormatImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataNode$IIONamedNodeMap.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataNode$IIONamedNodeMap.class
deleted file mode 100644
index a8e43ee3f3f..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataNode$IIONamedNodeMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataNode$IIONodeList.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataNode$IIONodeList.class
deleted file mode 100644
index cf8c8f501a5..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataNode$IIONodeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataNode.class b/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataNode.class
deleted file mode 100644
index 001f1ff7db2..00000000000
--- a/libjava/classpath/lib/javax/imageio/metadata/IIOMetadataNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/plugins/bmp/BMPImageWriteParam.class b/libjava/classpath/lib/javax/imageio/plugins/bmp/BMPImageWriteParam.class
deleted file mode 100644
index 7701cf88b71..00000000000
--- a/libjava/classpath/lib/javax/imageio/plugins/bmp/BMPImageWriteParam.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGHuffmanTable.class b/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGHuffmanTable.class
deleted file mode 100644
index deac559a02a..00000000000
--- a/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGHuffmanTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGImageReadParam.class b/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGImageReadParam.class
deleted file mode 100644
index ba2a146aa6e..00000000000
--- a/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGImageReadParam.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGImageWriteParam.class b/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGImageWriteParam.class
deleted file mode 100644
index c734fcb59c4..00000000000
--- a/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGImageWriteParam.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGQTable.class b/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGQTable.class
deleted file mode 100644
index 6f6d57646a1..00000000000
--- a/libjava/classpath/lib/javax/imageio/plugins/jpeg/JPEGQTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/IIORegistry.class b/libjava/classpath/lib/javax/imageio/spi/IIORegistry.class
deleted file mode 100644
index 45073b1d67e..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/IIORegistry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/IIOServiceProvider.class b/libjava/classpath/lib/javax/imageio/spi/IIOServiceProvider.class
deleted file mode 100644
index 0d39087a442..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/IIOServiceProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/ImageInputStreamSpi.class b/libjava/classpath/lib/javax/imageio/spi/ImageInputStreamSpi.class
deleted file mode 100644
index 32ba8ebfc73..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/ImageInputStreamSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/ImageOutputStreamSpi.class b/libjava/classpath/lib/javax/imageio/spi/ImageOutputStreamSpi.class
deleted file mode 100644
index fedcfb430cc..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/ImageOutputStreamSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/ImageReaderSpi.class b/libjava/classpath/lib/javax/imageio/spi/ImageReaderSpi.class
deleted file mode 100644
index 4dc323ad9be..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/ImageReaderSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/ImageReaderWriterSpi.class b/libjava/classpath/lib/javax/imageio/spi/ImageReaderWriterSpi.class
deleted file mode 100644
index 60acc54c65b..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/ImageReaderWriterSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/ImageTranscoderSpi.class b/libjava/classpath/lib/javax/imageio/spi/ImageTranscoderSpi.class
deleted file mode 100644
index 7eee7996bf8..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/ImageTranscoderSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/ImageWriterSpi.class b/libjava/classpath/lib/javax/imageio/spi/ImageWriterSpi.class
deleted file mode 100644
index 2c17ba4d7c4..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/ImageWriterSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/RegisterableService.class b/libjava/classpath/lib/javax/imageio/spi/RegisterableService.class
deleted file mode 100644
index 15fec31a076..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/RegisterableService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry$1.class b/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry$1.class
deleted file mode 100644
index 3cf058c554e..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry$2.class b/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry$2.class
deleted file mode 100644
index bec3d35381a..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry$Filter.class b/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry$Filter.class
deleted file mode 100644
index e4a7a55a6e5..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry$Filter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry.class b/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry.class
deleted file mode 100644
index dddf6f4f268..00000000000
--- a/libjava/classpath/lib/javax/imageio/spi/ServiceRegistry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/FileCacheImageInputStream.class b/libjava/classpath/lib/javax/imageio/stream/FileCacheImageInputStream.class
deleted file mode 100644
index b82fdb238a1..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/FileCacheImageInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/FileCacheImageOutputStream.class b/libjava/classpath/lib/javax/imageio/stream/FileCacheImageOutputStream.class
deleted file mode 100644
index 2bb32b78c71..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/FileCacheImageOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/FileImageInputStream.class b/libjava/classpath/lib/javax/imageio/stream/FileImageInputStream.class
deleted file mode 100644
index 2c152b1bff8..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/FileImageInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/FileImageOutputStream.class b/libjava/classpath/lib/javax/imageio/stream/FileImageOutputStream.class
deleted file mode 100644
index a2d425acf49..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/FileImageOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/IIOByteBuffer.class b/libjava/classpath/lib/javax/imageio/stream/IIOByteBuffer.class
deleted file mode 100644
index 204cbc83ef4..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/IIOByteBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/ImageInputStream.class b/libjava/classpath/lib/javax/imageio/stream/ImageInputStream.class
deleted file mode 100644
index 40ddeaade68..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/ImageInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/ImageInputStreamImpl.class b/libjava/classpath/lib/javax/imageio/stream/ImageInputStreamImpl.class
deleted file mode 100644
index ae7a2ba72cb..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/ImageInputStreamImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/ImageOutputStream.class b/libjava/classpath/lib/javax/imageio/stream/ImageOutputStream.class
deleted file mode 100644
index 391b332fae0..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/ImageOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/ImageOutputStreamImpl.class b/libjava/classpath/lib/javax/imageio/stream/ImageOutputStreamImpl.class
deleted file mode 100644
index dccf1f36f54..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/ImageOutputStreamImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/MemoryCacheImageInputStream.class b/libjava/classpath/lib/javax/imageio/stream/MemoryCacheImageInputStream.class
deleted file mode 100644
index 57dc68de425..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/MemoryCacheImageInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/imageio/stream/MemoryCacheImageOutputStream.class b/libjava/classpath/lib/javax/imageio/stream/MemoryCacheImageOutputStream.class
deleted file mode 100644
index 803f2fbed63..00000000000
--- a/libjava/classpath/lib/javax/imageio/stream/MemoryCacheImageOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/Attribute.class b/libjava/classpath/lib/javax/management/Attribute.class
deleted file mode 100644
index a0f23785227..00000000000
--- a/libjava/classpath/lib/javax/management/Attribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/AttributeList.class b/libjava/classpath/lib/javax/management/AttributeList.class
deleted file mode 100644
index 528918c72bf..00000000000
--- a/libjava/classpath/lib/javax/management/AttributeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/AttributeNotFoundException.class b/libjava/classpath/lib/javax/management/AttributeNotFoundException.class
deleted file mode 100644
index d9b80fd651d..00000000000
--- a/libjava/classpath/lib/javax/management/AttributeNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/BadAttributeValueExpException.class b/libjava/classpath/lib/javax/management/BadAttributeValueExpException.class
deleted file mode 100644
index 976da8c0b64..00000000000
--- a/libjava/classpath/lib/javax/management/BadAttributeValueExpException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/BadBinaryOpValueExpException.class b/libjava/classpath/lib/javax/management/BadBinaryOpValueExpException.class
deleted file mode 100644
index 3955b88fc4f..00000000000
--- a/libjava/classpath/lib/javax/management/BadBinaryOpValueExpException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/BadStringOperationException.class b/libjava/classpath/lib/javax/management/BadStringOperationException.class
deleted file mode 100644
index 859d5a05384..00000000000
--- a/libjava/classpath/lib/javax/management/BadStringOperationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/DynamicMBean.class b/libjava/classpath/lib/javax/management/DynamicMBean.class
deleted file mode 100644
index e4925e8ac22..00000000000
--- a/libjava/classpath/lib/javax/management/DynamicMBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/InstanceAlreadyExistsException.class b/libjava/classpath/lib/javax/management/InstanceAlreadyExistsException.class
deleted file mode 100644
index 98027dce75a..00000000000
--- a/libjava/classpath/lib/javax/management/InstanceAlreadyExistsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/InstanceNotFoundException.class b/libjava/classpath/lib/javax/management/InstanceNotFoundException.class
deleted file mode 100644
index 1eb9c9bf5ee..00000000000
--- a/libjava/classpath/lib/javax/management/InstanceNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/IntrospectionException.class b/libjava/classpath/lib/javax/management/IntrospectionException.class
deleted file mode 100644
index 8c17c2519a2..00000000000
--- a/libjava/classpath/lib/javax/management/IntrospectionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/InvalidApplicationException.class b/libjava/classpath/lib/javax/management/InvalidApplicationException.class
deleted file mode 100644
index f860adebc4e..00000000000
--- a/libjava/classpath/lib/javax/management/InvalidApplicationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/InvalidAttributeValueException.class b/libjava/classpath/lib/javax/management/InvalidAttributeValueException.class
deleted file mode 100644
index fad97385897..00000000000
--- a/libjava/classpath/lib/javax/management/InvalidAttributeValueException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/JMException.class b/libjava/classpath/lib/javax/management/JMException.class
deleted file mode 100644
index 3a39a421acf..00000000000
--- a/libjava/classpath/lib/javax/management/JMException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/JMRuntimeException.class b/libjava/classpath/lib/javax/management/JMRuntimeException.class
deleted file mode 100644
index a9eacfda8c1..00000000000
--- a/libjava/classpath/lib/javax/management/JMRuntimeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/ListenerNotFoundException.class b/libjava/classpath/lib/javax/management/ListenerNotFoundException.class
deleted file mode 100644
index e66803ae19c..00000000000
--- a/libjava/classpath/lib/javax/management/ListenerNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanAttributeInfo.class b/libjava/classpath/lib/javax/management/MBeanAttributeInfo.class
deleted file mode 100644
index a5626b8a963..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanAttributeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanConstructorInfo.class b/libjava/classpath/lib/javax/management/MBeanConstructorInfo.class
deleted file mode 100644
index 4933f493244..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanConstructorInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanException.class b/libjava/classpath/lib/javax/management/MBeanException.class
deleted file mode 100644
index 02d6dd6acdd..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanFeatureInfo.class b/libjava/classpath/lib/javax/management/MBeanFeatureInfo.class
deleted file mode 100644
index 2c240dc4050..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanFeatureInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanInfo.class b/libjava/classpath/lib/javax/management/MBeanInfo.class
deleted file mode 100644
index 9af29328708..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanNotificationInfo.class b/libjava/classpath/lib/javax/management/MBeanNotificationInfo.class
deleted file mode 100644
index af9c8cb3311..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanNotificationInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanOperationInfo.class b/libjava/classpath/lib/javax/management/MBeanOperationInfo.class
deleted file mode 100644
index 522a1c0c1f5..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanOperationInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanParameterInfo.class b/libjava/classpath/lib/javax/management/MBeanParameterInfo.class
deleted file mode 100644
index 59c7b922145..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanParameterInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanPermission$NameHolder.class b/libjava/classpath/lib/javax/management/MBeanPermission$NameHolder.class
deleted file mode 100644
index 4610dca6635..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanPermission$NameHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanPermission.class b/libjava/classpath/lib/javax/management/MBeanPermission.class
deleted file mode 100644
index 15151ce5108..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanRegistration.class b/libjava/classpath/lib/javax/management/MBeanRegistration.class
deleted file mode 100644
index 8c07efc3c59..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanRegistration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanRegistrationException.class b/libjava/classpath/lib/javax/management/MBeanRegistrationException.class
deleted file mode 100644
index bb7a8a763d9..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanRegistrationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanServer.class b/libjava/classpath/lib/javax/management/MBeanServer.class
deleted file mode 100644
index 11945828739..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanServerBuilder.class b/libjava/classpath/lib/javax/management/MBeanServerBuilder.class
deleted file mode 100644
index efb5e6c958b..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanServerBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanServerConnection.class b/libjava/classpath/lib/javax/management/MBeanServerConnection.class
deleted file mode 100644
index 2ca079e125e..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanServerConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanServerDelegate.class b/libjava/classpath/lib/javax/management/MBeanServerDelegate.class
deleted file mode 100644
index 325af96c49c..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanServerDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanServerDelegateMBean.class b/libjava/classpath/lib/javax/management/MBeanServerDelegateMBean.class
deleted file mode 100644
index c607f165048..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanServerDelegateMBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanServerFactory.class b/libjava/classpath/lib/javax/management/MBeanServerFactory.class
deleted file mode 100644
index a0c655b84d0..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanServerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanServerNotification.class b/libjava/classpath/lib/javax/management/MBeanServerNotification.class
deleted file mode 100644
index ca952560dbc..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanServerNotification.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration.class b/libjava/classpath/lib/javax/management/MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration.class
deleted file mode 100644
index 9d6fed42a07..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanServerPermission$MBeanServerPermissionCollection.class b/libjava/classpath/lib/javax/management/MBeanServerPermission$MBeanServerPermissionCollection.class
deleted file mode 100644
index 272e8d375ad..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanServerPermission$MBeanServerPermissionCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanServerPermission.class b/libjava/classpath/lib/javax/management/MBeanServerPermission.class
deleted file mode 100644
index e69173d14d8..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanServerPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MBeanTrustPermission.class b/libjava/classpath/lib/javax/management/MBeanTrustPermission.class
deleted file mode 100644
index e5d22c9677b..00000000000
--- a/libjava/classpath/lib/javax/management/MBeanTrustPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/MalformedObjectNameException.class b/libjava/classpath/lib/javax/management/MalformedObjectNameException.class
deleted file mode 100644
index d8e56b667ee..00000000000
--- a/libjava/classpath/lib/javax/management/MalformedObjectNameException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/NotCompliantMBeanException.class b/libjava/classpath/lib/javax/management/NotCompliantMBeanException.class
deleted file mode 100644
index 385f6b147da..00000000000
--- a/libjava/classpath/lib/javax/management/NotCompliantMBeanException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/Notification.class b/libjava/classpath/lib/javax/management/Notification.class
deleted file mode 100644
index 1518fdcbed9..00000000000
--- a/libjava/classpath/lib/javax/management/Notification.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/NotificationBroadcaster.class b/libjava/classpath/lib/javax/management/NotificationBroadcaster.class
deleted file mode 100644
index 8127d65562e..00000000000
--- a/libjava/classpath/lib/javax/management/NotificationBroadcaster.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/NotificationEmitter.class b/libjava/classpath/lib/javax/management/NotificationEmitter.class
deleted file mode 100644
index b062f01fd59..00000000000
--- a/libjava/classpath/lib/javax/management/NotificationEmitter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/NotificationFilter.class b/libjava/classpath/lib/javax/management/NotificationFilter.class
deleted file mode 100644
index 9474e578153..00000000000
--- a/libjava/classpath/lib/javax/management/NotificationFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/NotificationListener.class b/libjava/classpath/lib/javax/management/NotificationListener.class
deleted file mode 100644
index cbe2f1f58b3..00000000000
--- a/libjava/classpath/lib/javax/management/NotificationListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/ObjectInstance.class b/libjava/classpath/lib/javax/management/ObjectInstance.class
deleted file mode 100644
index 5ab7cb91930..00000000000
--- a/libjava/classpath/lib/javax/management/ObjectInstance.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/ObjectName.class b/libjava/classpath/lib/javax/management/ObjectName.class
deleted file mode 100644
index 9a94089fc8d..00000000000
--- a/libjava/classpath/lib/javax/management/ObjectName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/OperationsException.class b/libjava/classpath/lib/javax/management/OperationsException.class
deleted file mode 100644
index 09e6c442154..00000000000
--- a/libjava/classpath/lib/javax/management/OperationsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/QueryExp.class b/libjava/classpath/lib/javax/management/QueryExp.class
deleted file mode 100644
index b999c482151..00000000000
--- a/libjava/classpath/lib/javax/management/QueryExp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/ReflectionException.class b/libjava/classpath/lib/javax/management/ReflectionException.class
deleted file mode 100644
index 141b664e1e5..00000000000
--- a/libjava/classpath/lib/javax/management/ReflectionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/RuntimeErrorException.class b/libjava/classpath/lib/javax/management/RuntimeErrorException.class
deleted file mode 100644
index 35c82a6c747..00000000000
--- a/libjava/classpath/lib/javax/management/RuntimeErrorException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/RuntimeMBeanException.class b/libjava/classpath/lib/javax/management/RuntimeMBeanException.class
deleted file mode 100644
index a141ad87a00..00000000000
--- a/libjava/classpath/lib/javax/management/RuntimeMBeanException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/RuntimeOperationsException.class b/libjava/classpath/lib/javax/management/RuntimeOperationsException.class
deleted file mode 100644
index ffa48a77523..00000000000
--- a/libjava/classpath/lib/javax/management/RuntimeOperationsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/ServiceNotFoundException.class b/libjava/classpath/lib/javax/management/ServiceNotFoundException.class
deleted file mode 100644
index 25c4b5cb304..00000000000
--- a/libjava/classpath/lib/javax/management/ServiceNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/StandardMBean.class b/libjava/classpath/lib/javax/management/StandardMBean.class
deleted file mode 100644
index 7657a32b757..00000000000
--- a/libjava/classpath/lib/javax/management/StandardMBean.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/ValueExp.class b/libjava/classpath/lib/javax/management/ValueExp.class
deleted file mode 100644
index d90e781cc44..00000000000
--- a/libjava/classpath/lib/javax/management/ValueExp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/loading/ClassLoaderRepository.class b/libjava/classpath/lib/javax/management/loading/ClassLoaderRepository.class
deleted file mode 100644
index 493e9d2f9ff..00000000000
--- a/libjava/classpath/lib/javax/management/loading/ClassLoaderRepository.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/ArrayType.class b/libjava/classpath/lib/javax/management/openmbean/ArrayType.class
deleted file mode 100644
index 888874a904d..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/ArrayType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/CompositeData.class b/libjava/classpath/lib/javax/management/openmbean/CompositeData.class
deleted file mode 100644
index 8cd4c3c633d..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/CompositeData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/CompositeDataSupport.class b/libjava/classpath/lib/javax/management/openmbean/CompositeDataSupport.class
deleted file mode 100644
index c5e4d5f922f..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/CompositeDataSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/CompositeType.class b/libjava/classpath/lib/javax/management/openmbean/CompositeType.class
deleted file mode 100644
index 3ed4d991f08..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/CompositeType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/InvalidKeyException.class b/libjava/classpath/lib/javax/management/openmbean/InvalidKeyException.class
deleted file mode 100644
index 6b0b1fec5e8..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/InvalidKeyException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/InvalidOpenTypeException.class b/libjava/classpath/lib/javax/management/openmbean/InvalidOpenTypeException.class
deleted file mode 100644
index 4fba7ac4312..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/InvalidOpenTypeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/KeyAlreadyExistsException.class b/libjava/classpath/lib/javax/management/openmbean/KeyAlreadyExistsException.class
deleted file mode 100644
index 7ec6ca7868f..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/KeyAlreadyExistsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenDataException.class b/libjava/classpath/lib/javax/management/openmbean/OpenDataException.class
deleted file mode 100644
index 076ed20e9f2..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenDataException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanAttributeInfo.class b/libjava/classpath/lib/javax/management/openmbean/OpenMBeanAttributeInfo.class
deleted file mode 100644
index 0ac220955a7..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanAttributeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanAttributeInfoSupport.class b/libjava/classpath/lib/javax/management/openmbean/OpenMBeanAttributeInfoSupport.class
deleted file mode 100644
index 8aec0490a78..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanAttributeInfoSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanConstructorInfo.class b/libjava/classpath/lib/javax/management/openmbean/OpenMBeanConstructorInfo.class
deleted file mode 100644
index 2a6a6265073..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanConstructorInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanConstructorInfoSupport.class b/libjava/classpath/lib/javax/management/openmbean/OpenMBeanConstructorInfoSupport.class
deleted file mode 100644
index 75bdacc524e..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanConstructorInfoSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanInfo.class b/libjava/classpath/lib/javax/management/openmbean/OpenMBeanInfo.class
deleted file mode 100644
index 8d04a395e0f..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanInfoSupport.class b/libjava/classpath/lib/javax/management/openmbean/OpenMBeanInfoSupport.class
deleted file mode 100644
index 7e4265d3d42..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanInfoSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanOperationInfo.class b/libjava/classpath/lib/javax/management/openmbean/OpenMBeanOperationInfo.class
deleted file mode 100644
index 5e6fd06fb23..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanOperationInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanOperationInfoSupport.class b/libjava/classpath/lib/javax/management/openmbean/OpenMBeanOperationInfoSupport.class
deleted file mode 100644
index 93ed4002ab6..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanOperationInfoSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanParameterInfo.class b/libjava/classpath/lib/javax/management/openmbean/OpenMBeanParameterInfo.class
deleted file mode 100644
index b360ed8fe52..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanParameterInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanParameterInfoSupport.class b/libjava/classpath/lib/javax/management/openmbean/OpenMBeanParameterInfoSupport.class
deleted file mode 100644
index 59ef03786b2..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenMBeanParameterInfoSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/OpenType.class b/libjava/classpath/lib/javax/management/openmbean/OpenType.class
deleted file mode 100644
index 689f1ccf631..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/OpenType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/SimpleType.class b/libjava/classpath/lib/javax/management/openmbean/SimpleType.class
deleted file mode 100644
index c33e9089c81..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/SimpleType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/TabularData.class b/libjava/classpath/lib/javax/management/openmbean/TabularData.class
deleted file mode 100644
index c6a70eaf474..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/TabularData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/TabularDataSupport.class b/libjava/classpath/lib/javax/management/openmbean/TabularDataSupport.class
deleted file mode 100644
index c940083ba28..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/TabularDataSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/management/openmbean/TabularType.class b/libjava/classpath/lib/javax/management/openmbean/TabularType.class
deleted file mode 100644
index c287c124107..00000000000
--- a/libjava/classpath/lib/javax/management/openmbean/TabularType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/AuthenticationException.class b/libjava/classpath/lib/javax/naming/AuthenticationException.class
deleted file mode 100644
index 84033a0442a..00000000000
--- a/libjava/classpath/lib/javax/naming/AuthenticationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/AuthenticationNotSupportedException.class b/libjava/classpath/lib/javax/naming/AuthenticationNotSupportedException.class
deleted file mode 100644
index 99f2374a131..00000000000
--- a/libjava/classpath/lib/javax/naming/AuthenticationNotSupportedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/BinaryRefAddr.class b/libjava/classpath/lib/javax/naming/BinaryRefAddr.class
deleted file mode 100644
index 8856b981f0b..00000000000
--- a/libjava/classpath/lib/javax/naming/BinaryRefAddr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/Binding.class b/libjava/classpath/lib/javax/naming/Binding.class
deleted file mode 100644
index 9ae8c3128fe..00000000000
--- a/libjava/classpath/lib/javax/naming/Binding.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/CannotProceedException.class b/libjava/classpath/lib/javax/naming/CannotProceedException.class
deleted file mode 100644
index 8c66162cf75..00000000000
--- a/libjava/classpath/lib/javax/naming/CannotProceedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/CommunicationException.class b/libjava/classpath/lib/javax/naming/CommunicationException.class
deleted file mode 100644
index 6f1a73dbe33..00000000000
--- a/libjava/classpath/lib/javax/naming/CommunicationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/CompositeName.class b/libjava/classpath/lib/javax/naming/CompositeName.class
deleted file mode 100644
index 2a19869ac0d..00000000000
--- a/libjava/classpath/lib/javax/naming/CompositeName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/CompoundName.class b/libjava/classpath/lib/javax/naming/CompoundName.class
deleted file mode 100644
index 39592b0d194..00000000000
--- a/libjava/classpath/lib/javax/naming/CompoundName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ConfigurationException.class b/libjava/classpath/lib/javax/naming/ConfigurationException.class
deleted file mode 100644
index 56516219b70..00000000000
--- a/libjava/classpath/lib/javax/naming/ConfigurationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/Context.class b/libjava/classpath/lib/javax/naming/Context.class
deleted file mode 100644
index be82e6fecac..00000000000
--- a/libjava/classpath/lib/javax/naming/Context.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ContextNotEmptyException.class b/libjava/classpath/lib/javax/naming/ContextNotEmptyException.class
deleted file mode 100644
index 3cd3d5e501e..00000000000
--- a/libjava/classpath/lib/javax/naming/ContextNotEmptyException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/InitialContext.class b/libjava/classpath/lib/javax/naming/InitialContext.class
deleted file mode 100644
index a21349cc727..00000000000
--- a/libjava/classpath/lib/javax/naming/InitialContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/InsufficientResourcesException.class b/libjava/classpath/lib/javax/naming/InsufficientResourcesException.class
deleted file mode 100644
index 7f89a0e9908..00000000000
--- a/libjava/classpath/lib/javax/naming/InsufficientResourcesException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/InterruptedNamingException.class b/libjava/classpath/lib/javax/naming/InterruptedNamingException.class
deleted file mode 100644
index b793d470767..00000000000
--- a/libjava/classpath/lib/javax/naming/InterruptedNamingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/InvalidNameException.class b/libjava/classpath/lib/javax/naming/InvalidNameException.class
deleted file mode 100644
index f7e94ba0c91..00000000000
--- a/libjava/classpath/lib/javax/naming/InvalidNameException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/LimitExceededException.class b/libjava/classpath/lib/javax/naming/LimitExceededException.class
deleted file mode 100644
index 6134203cde4..00000000000
--- a/libjava/classpath/lib/javax/naming/LimitExceededException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/LinkException.class b/libjava/classpath/lib/javax/naming/LinkException.class
deleted file mode 100644
index f95ae0fed58..00000000000
--- a/libjava/classpath/lib/javax/naming/LinkException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/LinkLoopException.class b/libjava/classpath/lib/javax/naming/LinkLoopException.class
deleted file mode 100644
index b7ff39f8a47..00000000000
--- a/libjava/classpath/lib/javax/naming/LinkLoopException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/LinkRef.class b/libjava/classpath/lib/javax/naming/LinkRef.class
deleted file mode 100644
index 05641654973..00000000000
--- a/libjava/classpath/lib/javax/naming/LinkRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/MalformedLinkException.class b/libjava/classpath/lib/javax/naming/MalformedLinkException.class
deleted file mode 100644
index 3456233271d..00000000000
--- a/libjava/classpath/lib/javax/naming/MalformedLinkException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/Name.class b/libjava/classpath/lib/javax/naming/Name.class
deleted file mode 100644
index ef74c5e0b48..00000000000
--- a/libjava/classpath/lib/javax/naming/Name.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/NameAlreadyBoundException.class b/libjava/classpath/lib/javax/naming/NameAlreadyBoundException.class
deleted file mode 100644
index e3a8722e016..00000000000
--- a/libjava/classpath/lib/javax/naming/NameAlreadyBoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/NameClassPair.class b/libjava/classpath/lib/javax/naming/NameClassPair.class
deleted file mode 100644
index faae87c5e78..00000000000
--- a/libjava/classpath/lib/javax/naming/NameClassPair.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/NameNotFoundException.class b/libjava/classpath/lib/javax/naming/NameNotFoundException.class
deleted file mode 100644
index b8df4897ffa..00000000000
--- a/libjava/classpath/lib/javax/naming/NameNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/NameParser.class b/libjava/classpath/lib/javax/naming/NameParser.class
deleted file mode 100644
index f01ed0b438a..00000000000
--- a/libjava/classpath/lib/javax/naming/NameParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/NamingEnumeration.class b/libjava/classpath/lib/javax/naming/NamingEnumeration.class
deleted file mode 100644
index 98b80ceac0b..00000000000
--- a/libjava/classpath/lib/javax/naming/NamingEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/NamingException.class b/libjava/classpath/lib/javax/naming/NamingException.class
deleted file mode 100644
index 52bdc3ef577..00000000000
--- a/libjava/classpath/lib/javax/naming/NamingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/NamingSecurityException.class b/libjava/classpath/lib/javax/naming/NamingSecurityException.class
deleted file mode 100644
index f5f6930d8eb..00000000000
--- a/libjava/classpath/lib/javax/naming/NamingSecurityException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/NoInitialContextException.class b/libjava/classpath/lib/javax/naming/NoInitialContextException.class
deleted file mode 100644
index db9a945b47f..00000000000
--- a/libjava/classpath/lib/javax/naming/NoInitialContextException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/NoPermissionException.class b/libjava/classpath/lib/javax/naming/NoPermissionException.class
deleted file mode 100644
index 25283ea4c50..00000000000
--- a/libjava/classpath/lib/javax/naming/NoPermissionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/NotContextException.class b/libjava/classpath/lib/javax/naming/NotContextException.class
deleted file mode 100644
index 80de75b5ee0..00000000000
--- a/libjava/classpath/lib/javax/naming/NotContextException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/OperationNotSupportedException.class b/libjava/classpath/lib/javax/naming/OperationNotSupportedException.class
deleted file mode 100644
index 96d5ccde381..00000000000
--- a/libjava/classpath/lib/javax/naming/OperationNotSupportedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/PartialResultException.class b/libjava/classpath/lib/javax/naming/PartialResultException.class
deleted file mode 100644
index 291861fed24..00000000000
--- a/libjava/classpath/lib/javax/naming/PartialResultException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/RefAddr.class b/libjava/classpath/lib/javax/naming/RefAddr.class
deleted file mode 100644
index b85b848d497..00000000000
--- a/libjava/classpath/lib/javax/naming/RefAddr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/Reference.class b/libjava/classpath/lib/javax/naming/Reference.class
deleted file mode 100644
index 9f0c298dd86..00000000000
--- a/libjava/classpath/lib/javax/naming/Reference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/Referenceable.class b/libjava/classpath/lib/javax/naming/Referenceable.class
deleted file mode 100644
index abee698e4d8..00000000000
--- a/libjava/classpath/lib/javax/naming/Referenceable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ReferralException.class b/libjava/classpath/lib/javax/naming/ReferralException.class
deleted file mode 100644
index 83c91264e3e..00000000000
--- a/libjava/classpath/lib/javax/naming/ReferralException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ServiceUnavailableException.class b/libjava/classpath/lib/javax/naming/ServiceUnavailableException.class
deleted file mode 100644
index 10fca7100f3..00000000000
--- a/libjava/classpath/lib/javax/naming/ServiceUnavailableException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/SizeLimitExceededException.class b/libjava/classpath/lib/javax/naming/SizeLimitExceededException.class
deleted file mode 100644
index e5e027437a4..00000000000
--- a/libjava/classpath/lib/javax/naming/SizeLimitExceededException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/StringRefAddr.class b/libjava/classpath/lib/javax/naming/StringRefAddr.class
deleted file mode 100644
index 86f8f80dd61..00000000000
--- a/libjava/classpath/lib/javax/naming/StringRefAddr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/TimeLimitExceededException.class b/libjava/classpath/lib/javax/naming/TimeLimitExceededException.class
deleted file mode 100644
index 9d9db128301..00000000000
--- a/libjava/classpath/lib/javax/naming/TimeLimitExceededException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/Attribute.class b/libjava/classpath/lib/javax/naming/directory/Attribute.class
deleted file mode 100644
index 4ea25b876b6..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/Attribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/AttributeInUseException.class b/libjava/classpath/lib/javax/naming/directory/AttributeInUseException.class
deleted file mode 100644
index c7cae1e8a13..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/AttributeInUseException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/AttributeModificationException.class b/libjava/classpath/lib/javax/naming/directory/AttributeModificationException.class
deleted file mode 100644
index eb8b7052da5..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/AttributeModificationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/Attributes.class b/libjava/classpath/lib/javax/naming/directory/Attributes.class
deleted file mode 100644
index 737594d3351..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/Attributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.class b/libjava/classpath/lib/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.class
deleted file mode 100644
index 7238d60114d..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/BasicAttribute.class b/libjava/classpath/lib/javax/naming/directory/BasicAttribute.class
deleted file mode 100644
index 15edbd82cf0..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/BasicAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.class b/libjava/classpath/lib/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.class
deleted file mode 100644
index 58864679714..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/BasicAttributes.class b/libjava/classpath/lib/javax/naming/directory/BasicAttributes.class
deleted file mode 100644
index 20e9428e614..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/BasicAttributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/DirContext.class b/libjava/classpath/lib/javax/naming/directory/DirContext.class
deleted file mode 100644
index fdfc3bdc023..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/DirContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/InitialDirContext.class b/libjava/classpath/lib/javax/naming/directory/InitialDirContext.class
deleted file mode 100644
index cbf5f511a11..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/InitialDirContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/InvalidAttributeIdentifierException.class b/libjava/classpath/lib/javax/naming/directory/InvalidAttributeIdentifierException.class
deleted file mode 100644
index 611da11bace..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/InvalidAttributeIdentifierException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/InvalidAttributeValueException.class b/libjava/classpath/lib/javax/naming/directory/InvalidAttributeValueException.class
deleted file mode 100644
index 8b1f9e5314b..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/InvalidAttributeValueException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/InvalidAttributesException.class b/libjava/classpath/lib/javax/naming/directory/InvalidAttributesException.class
deleted file mode 100644
index 21c061caa99..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/InvalidAttributesException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/InvalidSearchControlsException.class b/libjava/classpath/lib/javax/naming/directory/InvalidSearchControlsException.class
deleted file mode 100644
index 8047bb0cbc0..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/InvalidSearchControlsException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/InvalidSearchFilterException.class b/libjava/classpath/lib/javax/naming/directory/InvalidSearchFilterException.class
deleted file mode 100644
index 7bc6065d111..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/InvalidSearchFilterException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/ModificationItem.class b/libjava/classpath/lib/javax/naming/directory/ModificationItem.class
deleted file mode 100644
index 0ac083b06df..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/ModificationItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/NoSuchAttributeException.class b/libjava/classpath/lib/javax/naming/directory/NoSuchAttributeException.class
deleted file mode 100644
index 108c9ca19d9..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/NoSuchAttributeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/SchemaViolationException.class b/libjava/classpath/lib/javax/naming/directory/SchemaViolationException.class
deleted file mode 100644
index 9c766a1ee5c..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/SchemaViolationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/SearchControls.class b/libjava/classpath/lib/javax/naming/directory/SearchControls.class
deleted file mode 100644
index 7df5cffd843..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/SearchControls.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/directory/SearchResult.class b/libjava/classpath/lib/javax/naming/directory/SearchResult.class
deleted file mode 100644
index 54e75caeaf7..00000000000
--- a/libjava/classpath/lib/javax/naming/directory/SearchResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/event/EventContext.class b/libjava/classpath/lib/javax/naming/event/EventContext.class
deleted file mode 100644
index 8585af593f0..00000000000
--- a/libjava/classpath/lib/javax/naming/event/EventContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/event/EventDirContext.class b/libjava/classpath/lib/javax/naming/event/EventDirContext.class
deleted file mode 100644
index 751d5089715..00000000000
--- a/libjava/classpath/lib/javax/naming/event/EventDirContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/event/NamespaceChangeListener.class b/libjava/classpath/lib/javax/naming/event/NamespaceChangeListener.class
deleted file mode 100644
index 607ab9c49d9..00000000000
--- a/libjava/classpath/lib/javax/naming/event/NamespaceChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/event/NamingEvent.class b/libjava/classpath/lib/javax/naming/event/NamingEvent.class
deleted file mode 100644
index e1204e83d8d..00000000000
--- a/libjava/classpath/lib/javax/naming/event/NamingEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/event/NamingExceptionEvent.class b/libjava/classpath/lib/javax/naming/event/NamingExceptionEvent.class
deleted file mode 100644
index 0f61df4e1d8..00000000000
--- a/libjava/classpath/lib/javax/naming/event/NamingExceptionEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/event/NamingListener.class b/libjava/classpath/lib/javax/naming/event/NamingListener.class
deleted file mode 100644
index 894376def0c..00000000000
--- a/libjava/classpath/lib/javax/naming/event/NamingListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/event/ObjectChangeListener.class b/libjava/classpath/lib/javax/naming/event/ObjectChangeListener.class
deleted file mode 100644
index 533600d2627..00000000000
--- a/libjava/classpath/lib/javax/naming/event/ObjectChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/Control.class b/libjava/classpath/lib/javax/naming/ldap/Control.class
deleted file mode 100644
index 7f96c9d5eed..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/Control.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/ControlFactory.class b/libjava/classpath/lib/javax/naming/ldap/ControlFactory.class
deleted file mode 100644
index 7248b9932ae..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/ControlFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/ExtendedRequest.class b/libjava/classpath/lib/javax/naming/ldap/ExtendedRequest.class
deleted file mode 100644
index e7d13c72e32..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/ExtendedRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/ExtendedResponse.class b/libjava/classpath/lib/javax/naming/ldap/ExtendedResponse.class
deleted file mode 100644
index 4abf7ff7864..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/ExtendedResponse.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/HasControls.class b/libjava/classpath/lib/javax/naming/ldap/HasControls.class
deleted file mode 100644
index 2037b418b84..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/HasControls.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/InitialLdapContext.class b/libjava/classpath/lib/javax/naming/ldap/InitialLdapContext.class
deleted file mode 100644
index 413245204b3..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/InitialLdapContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/LdapContext.class b/libjava/classpath/lib/javax/naming/ldap/LdapContext.class
deleted file mode 100644
index 0507a8ec0b9..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/LdapContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/LdapReferralException.class b/libjava/classpath/lib/javax/naming/ldap/LdapReferralException.class
deleted file mode 100644
index 2d53ba7e92d..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/LdapReferralException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/StartTlsRequest.class b/libjava/classpath/lib/javax/naming/ldap/StartTlsRequest.class
deleted file mode 100644
index 028f72bb899..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/StartTlsRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/StartTlsResponse.class b/libjava/classpath/lib/javax/naming/ldap/StartTlsResponse.class
deleted file mode 100644
index 1c62677bdb2..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/StartTlsResponse.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/UnsolicitedNotification.class b/libjava/classpath/lib/javax/naming/ldap/UnsolicitedNotification.class
deleted file mode 100644
index b329c2bf9a5..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/UnsolicitedNotification.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/UnsolicitedNotificationEvent.class b/libjava/classpath/lib/javax/naming/ldap/UnsolicitedNotificationEvent.class
deleted file mode 100644
index 893585b45e2..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/UnsolicitedNotificationEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/ldap/UnsolicitedNotificationListener.class b/libjava/classpath/lib/javax/naming/ldap/UnsolicitedNotificationListener.class
deleted file mode 100644
index 19234b50e91..00000000000
--- a/libjava/classpath/lib/javax/naming/ldap/UnsolicitedNotificationListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/DirObjectFactory.class b/libjava/classpath/lib/javax/naming/spi/DirObjectFactory.class
deleted file mode 100644
index f81cb27190e..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/DirObjectFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/DirStateFactory$Result.class b/libjava/classpath/lib/javax/naming/spi/DirStateFactory$Result.class
deleted file mode 100644
index 94051c10e69..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/DirStateFactory$Result.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/DirStateFactory.class b/libjava/classpath/lib/javax/naming/spi/DirStateFactory.class
deleted file mode 100644
index 98be8730539..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/DirStateFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/DirectoryManager.class b/libjava/classpath/lib/javax/naming/spi/DirectoryManager.class
deleted file mode 100644
index 22690420c96..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/DirectoryManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/InitialContextFactory.class b/libjava/classpath/lib/javax/naming/spi/InitialContextFactory.class
deleted file mode 100644
index 643c2803e80..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/InitialContextFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/InitialContextFactoryBuilder.class b/libjava/classpath/lib/javax/naming/spi/InitialContextFactoryBuilder.class
deleted file mode 100644
index fd2b6a77296..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/InitialContextFactoryBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/NamingManager.class b/libjava/classpath/lib/javax/naming/spi/NamingManager.class
deleted file mode 100644
index d0da69412ac..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/NamingManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/ObjectFactory.class b/libjava/classpath/lib/javax/naming/spi/ObjectFactory.class
deleted file mode 100644
index c51bf4fa211..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/ObjectFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/ObjectFactoryBuilder.class b/libjava/classpath/lib/javax/naming/spi/ObjectFactoryBuilder.class
deleted file mode 100644
index 0204736c061..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/ObjectFactoryBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/ResolveResult.class b/libjava/classpath/lib/javax/naming/spi/ResolveResult.class
deleted file mode 100644
index c0782d68221..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/ResolveResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/Resolver.class b/libjava/classpath/lib/javax/naming/spi/Resolver.class
deleted file mode 100644
index ffe96db71ff..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/Resolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/naming/spi/StateFactory.class b/libjava/classpath/lib/javax/naming/spi/StateFactory.class
deleted file mode 100644
index 0ce19e91b59..00000000000
--- a/libjava/classpath/lib/javax/naming/spi/StateFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ServerSocketFactory.class b/libjava/classpath/lib/javax/net/ServerSocketFactory.class
deleted file mode 100644
index e568d1ada6c..00000000000
--- a/libjava/classpath/lib/javax/net/ServerSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/SocketFactory.class b/libjava/classpath/lib/javax/net/SocketFactory.class
deleted file mode 100644
index 968ce789554..00000000000
--- a/libjava/classpath/lib/javax/net/SocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/VanillaServerSocketFactory.class b/libjava/classpath/lib/javax/net/VanillaServerSocketFactory.class
deleted file mode 100644
index 13e4e43ba89..00000000000
--- a/libjava/classpath/lib/javax/net/VanillaServerSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/VanillaSocketFactory.class b/libjava/classpath/lib/javax/net/VanillaSocketFactory.class
deleted file mode 100644
index 5f82c3c3b8f..00000000000
--- a/libjava/classpath/lib/javax/net/VanillaSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/CertPathTrustManagerParameters.class b/libjava/classpath/lib/javax/net/ssl/CertPathTrustManagerParameters.class
deleted file mode 100644
index 08009ef6259..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/CertPathTrustManagerParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/HandshakeCompletedEvent.class b/libjava/classpath/lib/javax/net/ssl/HandshakeCompletedEvent.class
deleted file mode 100644
index c368229263d..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/HandshakeCompletedEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/HandshakeCompletedListener.class b/libjava/classpath/lib/javax/net/ssl/HandshakeCompletedListener.class
deleted file mode 100644
index 629e4e835a9..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/HandshakeCompletedListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/HostnameVerifier.class b/libjava/classpath/lib/javax/net/ssl/HostnameVerifier.class
deleted file mode 100644
index 409d9047b4f..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/HostnameVerifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/HttpsURLConnection.class b/libjava/classpath/lib/javax/net/ssl/HttpsURLConnection.class
deleted file mode 100644
index d531508bb79..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/HttpsURLConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/KeyManager.class b/libjava/classpath/lib/javax/net/ssl/KeyManager.class
deleted file mode 100644
index 1a31080d6ee..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/KeyManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/KeyManagerFactory$1.class b/libjava/classpath/lib/javax/net/ssl/KeyManagerFactory$1.class
deleted file mode 100644
index e67cc75e87a..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/KeyManagerFactory$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/KeyManagerFactory.class b/libjava/classpath/lib/javax/net/ssl/KeyManagerFactory.class
deleted file mode 100644
index 7eb16a275da..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/KeyManagerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/KeyManagerFactorySpi.class b/libjava/classpath/lib/javax/net/ssl/KeyManagerFactorySpi.class
deleted file mode 100644
index bbb4bb73245..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/KeyManagerFactorySpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/KeyStoreBuilderParameters.class b/libjava/classpath/lib/javax/net/ssl/KeyStoreBuilderParameters.class
deleted file mode 100644
index 79faa07759c..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/KeyStoreBuilderParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/ManagerFactoryParameters.class b/libjava/classpath/lib/javax/net/ssl/ManagerFactoryParameters.class
deleted file mode 100644
index 8cc323af71d..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/ManagerFactoryParameters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLContext.class b/libjava/classpath/lib/javax/net/ssl/SSLContext.class
deleted file mode 100644
index e6d4030e129..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLContextSpi.class b/libjava/classpath/lib/javax/net/ssl/SSLContextSpi.class
deleted file mode 100644
index 26f362ee778..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLContextSpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLEngine.class b/libjava/classpath/lib/javax/net/ssl/SSLEngine.class
deleted file mode 100644
index 6ffe9e8153d..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLEngine.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLEngineResult$HandshakeStatus.class b/libjava/classpath/lib/javax/net/ssl/SSLEngineResult$HandshakeStatus.class
deleted file mode 100644
index 7b64db75c37..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLEngineResult$HandshakeStatus.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLEngineResult$Status.class b/libjava/classpath/lib/javax/net/ssl/SSLEngineResult$Status.class
deleted file mode 100644
index 312b09813a5..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLEngineResult$Status.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLEngineResult.class b/libjava/classpath/lib/javax/net/ssl/SSLEngineResult.class
deleted file mode 100644
index d905e82797d..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLEngineResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLException.class b/libjava/classpath/lib/javax/net/ssl/SSLException.class
deleted file mode 100644
index f8dacf19db0..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLHandshakeException.class b/libjava/classpath/lib/javax/net/ssl/SSLHandshakeException.class
deleted file mode 100644
index 2006a223fce..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLHandshakeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLKeyException.class b/libjava/classpath/lib/javax/net/ssl/SSLKeyException.class
deleted file mode 100644
index 213166ab461..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLKeyException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLPeerUnverifiedException.class b/libjava/classpath/lib/javax/net/ssl/SSLPeerUnverifiedException.class
deleted file mode 100644
index 75e0c883626..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLPeerUnverifiedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLPermission.class b/libjava/classpath/lib/javax/net/ssl/SSLPermission.class
deleted file mode 100644
index 73354cfb2c1..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLProtocolException.class b/libjava/classpath/lib/javax/net/ssl/SSLProtocolException.class
deleted file mode 100644
index 0b5d7c4142f..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLProtocolException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLServerSocket.class b/libjava/classpath/lib/javax/net/ssl/SSLServerSocket.class
deleted file mode 100644
index a802a511459..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLServerSocket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLServerSocketFactory.class b/libjava/classpath/lib/javax/net/ssl/SSLServerSocketFactory.class
deleted file mode 100644
index 4db450aec78..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLServerSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLSession.class b/libjava/classpath/lib/javax/net/ssl/SSLSession.class
deleted file mode 100644
index 3276a462848..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLSession.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLSessionBindingEvent.class b/libjava/classpath/lib/javax/net/ssl/SSLSessionBindingEvent.class
deleted file mode 100644
index 7b03ca83714..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLSessionBindingEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLSessionBindingListener.class b/libjava/classpath/lib/javax/net/ssl/SSLSessionBindingListener.class
deleted file mode 100644
index d3683dd7def..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLSessionBindingListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLSessionContext.class b/libjava/classpath/lib/javax/net/ssl/SSLSessionContext.class
deleted file mode 100644
index 7121b99cdab..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLSessionContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLSocket.class b/libjava/classpath/lib/javax/net/ssl/SSLSocket.class
deleted file mode 100644
index f00becbcde5..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLSocket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/SSLSocketFactory.class b/libjava/classpath/lib/javax/net/ssl/SSLSocketFactory.class
deleted file mode 100644
index ef49a9996d8..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/SSLSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/TrivialHostnameVerifier.class b/libjava/classpath/lib/javax/net/ssl/TrivialHostnameVerifier.class
deleted file mode 100644
index d03d64e9e73..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/TrivialHostnameVerifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/TrustManager.class b/libjava/classpath/lib/javax/net/ssl/TrustManager.class
deleted file mode 100644
index 237f8ae654d..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/TrustManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/TrustManagerFactory$1.class b/libjava/classpath/lib/javax/net/ssl/TrustManagerFactory$1.class
deleted file mode 100644
index 023245c4955..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/TrustManagerFactory$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/TrustManagerFactory.class b/libjava/classpath/lib/javax/net/ssl/TrustManagerFactory.class
deleted file mode 100644
index f7cf2695ee0..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/TrustManagerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/TrustManagerFactorySpi.class b/libjava/classpath/lib/javax/net/ssl/TrustManagerFactorySpi.class
deleted file mode 100644
index 1d8612cba9b..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/TrustManagerFactorySpi.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/X509ExtendedKeyManager.class b/libjava/classpath/lib/javax/net/ssl/X509ExtendedKeyManager.class
deleted file mode 100644
index 9d89fd6167b..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/X509ExtendedKeyManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/X509KeyManager.class b/libjava/classpath/lib/javax/net/ssl/X509KeyManager.class
deleted file mode 100644
index c13f1ea1f33..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/X509KeyManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/net/ssl/X509TrustManager.class b/libjava/classpath/lib/javax/net/ssl/X509TrustManager.class
deleted file mode 100644
index a01e85003b9..00000000000
--- a/libjava/classpath/lib/javax/net/ssl/X509TrustManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/AttributeException.class b/libjava/classpath/lib/javax/print/AttributeException.class
deleted file mode 100644
index d5278db3139..00000000000
--- a/libjava/classpath/lib/javax/print/AttributeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/CancelablePrintJob.class b/libjava/classpath/lib/javax/print/CancelablePrintJob.class
deleted file mode 100644
index 08ae422bf03..00000000000
--- a/libjava/classpath/lib/javax/print/CancelablePrintJob.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/Doc.class b/libjava/classpath/lib/javax/print/Doc.class
deleted file mode 100644
index a8cbecdbe79..00000000000
--- a/libjava/classpath/lib/javax/print/Doc.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/DocFlavor$BYTE_ARRAY.class b/libjava/classpath/lib/javax/print/DocFlavor$BYTE_ARRAY.class
deleted file mode 100644
index 4e168694528..00000000000
--- a/libjava/classpath/lib/javax/print/DocFlavor$BYTE_ARRAY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/DocFlavor$CHAR_ARRAY.class b/libjava/classpath/lib/javax/print/DocFlavor$CHAR_ARRAY.class
deleted file mode 100644
index ffa7a661384..00000000000
--- a/libjava/classpath/lib/javax/print/DocFlavor$CHAR_ARRAY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/DocFlavor$INPUT_STREAM.class b/libjava/classpath/lib/javax/print/DocFlavor$INPUT_STREAM.class
deleted file mode 100644
index 64bebbd33de..00000000000
--- a/libjava/classpath/lib/javax/print/DocFlavor$INPUT_STREAM.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/DocFlavor$READER.class b/libjava/classpath/lib/javax/print/DocFlavor$READER.class
deleted file mode 100644
index c16b57949ec..00000000000
--- a/libjava/classpath/lib/javax/print/DocFlavor$READER.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/DocFlavor$SERVICE_FORMATTED.class b/libjava/classpath/lib/javax/print/DocFlavor$SERVICE_FORMATTED.class
deleted file mode 100644
index 4af2c7aba66..00000000000
--- a/libjava/classpath/lib/javax/print/DocFlavor$SERVICE_FORMATTED.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/DocFlavor$STRING.class b/libjava/classpath/lib/javax/print/DocFlavor$STRING.class
deleted file mode 100644
index 58c114b0761..00000000000
--- a/libjava/classpath/lib/javax/print/DocFlavor$STRING.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/DocFlavor$URL.class b/libjava/classpath/lib/javax/print/DocFlavor$URL.class
deleted file mode 100644
index 230dce90726..00000000000
--- a/libjava/classpath/lib/javax/print/DocFlavor$URL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/DocFlavor.class b/libjava/classpath/lib/javax/print/DocFlavor.class
deleted file mode 100644
index 4edf51019ee..00000000000
--- a/libjava/classpath/lib/javax/print/DocFlavor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/DocPrintJob.class b/libjava/classpath/lib/javax/print/DocPrintJob.class
deleted file mode 100644
index a409bde0b35..00000000000
--- a/libjava/classpath/lib/javax/print/DocPrintJob.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/FlavorException.class b/libjava/classpath/lib/javax/print/FlavorException.class
deleted file mode 100644
index 1963fefb6bc..00000000000
--- a/libjava/classpath/lib/javax/print/FlavorException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/MultiDoc.class b/libjava/classpath/lib/javax/print/MultiDoc.class
deleted file mode 100644
index 56b380b36f7..00000000000
--- a/libjava/classpath/lib/javax/print/MultiDoc.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/MultiDocPrintJob.class b/libjava/classpath/lib/javax/print/MultiDocPrintJob.class
deleted file mode 100644
index 4e3fae46108..00000000000
--- a/libjava/classpath/lib/javax/print/MultiDocPrintJob.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/MultiDocPrintService.class b/libjava/classpath/lib/javax/print/MultiDocPrintService.class
deleted file mode 100644
index 43d52b63a1f..00000000000
--- a/libjava/classpath/lib/javax/print/MultiDocPrintService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/PrintException.class b/libjava/classpath/lib/javax/print/PrintException.class
deleted file mode 100644
index 73a3056d765..00000000000
--- a/libjava/classpath/lib/javax/print/PrintException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/PrintService.class b/libjava/classpath/lib/javax/print/PrintService.class
deleted file mode 100644
index 3eb58635966..00000000000
--- a/libjava/classpath/lib/javax/print/PrintService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/PrintServiceLookup.class b/libjava/classpath/lib/javax/print/PrintServiceLookup.class
deleted file mode 100644
index a8c931f310f..00000000000
--- a/libjava/classpath/lib/javax/print/PrintServiceLookup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/ServiceUI.class b/libjava/classpath/lib/javax/print/ServiceUI.class
deleted file mode 100644
index 0c047da7b81..00000000000
--- a/libjava/classpath/lib/javax/print/ServiceUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/ServiceUIFactory.class b/libjava/classpath/lib/javax/print/ServiceUIFactory.class
deleted file mode 100644
index b0e7b876233..00000000000
--- a/libjava/classpath/lib/javax/print/ServiceUIFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/SimpleDoc.class b/libjava/classpath/lib/javax/print/SimpleDoc.class
deleted file mode 100644
index 2f0976e909d..00000000000
--- a/libjava/classpath/lib/javax/print/SimpleDoc.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/StreamPrintService.class b/libjava/classpath/lib/javax/print/StreamPrintService.class
deleted file mode 100644
index ea5c7826d5b..00000000000
--- a/libjava/classpath/lib/javax/print/StreamPrintService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/StreamPrintServiceFactory.class b/libjava/classpath/lib/javax/print/StreamPrintServiceFactory.class
deleted file mode 100644
index 9d7ebe38ed3..00000000000
--- a/libjava/classpath/lib/javax/print/StreamPrintServiceFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/URIException.class b/libjava/classpath/lib/javax/print/URIException.class
deleted file mode 100644
index e6ea533072e..00000000000
--- a/libjava/classpath/lib/javax/print/URIException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/Attribute.class b/libjava/classpath/lib/javax/print/attribute/Attribute.class
deleted file mode 100644
index 3dca6f70248..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/Attribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSet.class
deleted file mode 100644
index a54b72b3dbe..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.class
deleted file mode 100644
index 4cd7fa90e3d..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.class
deleted file mode 100644
index 95e45307a4a..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.class
deleted file mode 100644
index fab5c6fc274..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.class
deleted file mode 100644
index 37ebb16acd6..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.class
deleted file mode 100644
index 4cc539d39a6..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.class
deleted file mode 100644
index 2024d152698..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.class
deleted file mode 100644
index 6e83f7e560e..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.class
deleted file mode 100644
index 0f973e1c157..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.class
deleted file mode 100644
index 5bfa550f965..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.class
deleted file mode 100644
index 43c2682da88..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities.class b/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities.class
deleted file mode 100644
index 6ee0b8f8c42..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/AttributeSetUtilities.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/DateTimeSyntax.class b/libjava/classpath/lib/javax/print/attribute/DateTimeSyntax.class
deleted file mode 100644
index 6702a30d56d..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/DateTimeSyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/DocAttribute.class b/libjava/classpath/lib/javax/print/attribute/DocAttribute.class
deleted file mode 100644
index a9367005110..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/DocAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/DocAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/DocAttributeSet.class
deleted file mode 100644
index 43967044299..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/DocAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/EnumSyntax.class b/libjava/classpath/lib/javax/print/attribute/EnumSyntax.class
deleted file mode 100644
index b5bf3aa663b..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/EnumSyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/HashAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/HashAttributeSet.class
deleted file mode 100644
index c077322f818..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/HashAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/HashDocAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/HashDocAttributeSet.class
deleted file mode 100644
index 9f30b0ffbde..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/HashDocAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/HashPrintJobAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/HashPrintJobAttributeSet.class
deleted file mode 100644
index d0da1564d57..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/HashPrintJobAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/HashPrintRequestAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/HashPrintRequestAttributeSet.class
deleted file mode 100644
index 83bb36a64f4..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/HashPrintRequestAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/HashPrintServiceAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/HashPrintServiceAttributeSet.class
deleted file mode 100644
index 18701413dae..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/HashPrintServiceAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/IntegerSyntax.class b/libjava/classpath/lib/javax/print/attribute/IntegerSyntax.class
deleted file mode 100644
index d0adb1acbfb..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/IntegerSyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/PrintJobAttribute.class b/libjava/classpath/lib/javax/print/attribute/PrintJobAttribute.class
deleted file mode 100644
index f415ad880a4..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/PrintJobAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/PrintJobAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/PrintJobAttributeSet.class
deleted file mode 100644
index 3e35094df08..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/PrintJobAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/PrintRequestAttribute.class b/libjava/classpath/lib/javax/print/attribute/PrintRequestAttribute.class
deleted file mode 100644
index 37098131e88..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/PrintRequestAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/PrintRequestAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/PrintRequestAttributeSet.class
deleted file mode 100644
index 869a4d59b46..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/PrintRequestAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/PrintServiceAttribute.class b/libjava/classpath/lib/javax/print/attribute/PrintServiceAttribute.class
deleted file mode 100644
index 326ee06c926..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/PrintServiceAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/PrintServiceAttributeSet.class b/libjava/classpath/lib/javax/print/attribute/PrintServiceAttributeSet.class
deleted file mode 100644
index 97a51ec72d9..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/PrintServiceAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/ResolutionSyntax.class b/libjava/classpath/lib/javax/print/attribute/ResolutionSyntax.class
deleted file mode 100644
index 74e84545627..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/ResolutionSyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/SetOfIntegerSyntax$1.class b/libjava/classpath/lib/javax/print/attribute/SetOfIntegerSyntax$1.class
deleted file mode 100644
index 9dde40793b7..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/SetOfIntegerSyntax$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/SetOfIntegerSyntax.class b/libjava/classpath/lib/javax/print/attribute/SetOfIntegerSyntax.class
deleted file mode 100644
index f25096bb24f..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/SetOfIntegerSyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/Size2DSyntax.class b/libjava/classpath/lib/javax/print/attribute/Size2DSyntax.class
deleted file mode 100644
index d26205fd844..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/Size2DSyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/SupportedValuesAttribute.class b/libjava/classpath/lib/javax/print/attribute/SupportedValuesAttribute.class
deleted file mode 100644
index 957bc1f1bde..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/SupportedValuesAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/TextSyntax.class b/libjava/classpath/lib/javax/print/attribute/TextSyntax.class
deleted file mode 100644
index 1ebb5f99e85..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/TextSyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/URISyntax.class b/libjava/classpath/lib/javax/print/attribute/URISyntax.class
deleted file mode 100644
index eb36d72e996..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/URISyntax.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/UnmodifiableSetException.class b/libjava/classpath/lib/javax/print/attribute/UnmodifiableSetException.class
deleted file mode 100644
index ba0bdb50ef0..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/UnmodifiableSetException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/Chromaticity.class b/libjava/classpath/lib/javax/print/attribute/standard/Chromaticity.class
deleted file mode 100644
index 603f64508e9..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/Chromaticity.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/ColorSupported.class b/libjava/classpath/lib/javax/print/attribute/standard/ColorSupported.class
deleted file mode 100644
index 07ddc1e58e9..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/ColorSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/Compression.class b/libjava/classpath/lib/javax/print/attribute/standard/Compression.class
deleted file mode 100644
index 939a2f3076b..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/Compression.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/Copies.class b/libjava/classpath/lib/javax/print/attribute/standard/Copies.class
deleted file mode 100644
index a4396ac206e..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/Copies.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/CopiesSupported.class b/libjava/classpath/lib/javax/print/attribute/standard/CopiesSupported.class
deleted file mode 100644
index ab31fac3aa4..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/CopiesSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/DateTimeAtCompleted.class b/libjava/classpath/lib/javax/print/attribute/standard/DateTimeAtCompleted.class
deleted file mode 100644
index fc0358e0e8c..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/DateTimeAtCompleted.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/DateTimeAtCreation.class b/libjava/classpath/lib/javax/print/attribute/standard/DateTimeAtCreation.class
deleted file mode 100644
index c271f6b2b83..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/DateTimeAtCreation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/DateTimeAtProcessing.class b/libjava/classpath/lib/javax/print/attribute/standard/DateTimeAtProcessing.class
deleted file mode 100644
index 05e1adf2685..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/DateTimeAtProcessing.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/Destination.class b/libjava/classpath/lib/javax/print/attribute/standard/Destination.class
deleted file mode 100644
index 42854c064ff..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/Destination.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/DocumentName.class b/libjava/classpath/lib/javax/print/attribute/standard/DocumentName.class
deleted file mode 100644
index f55b821572d..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/DocumentName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/Fidelity.class b/libjava/classpath/lib/javax/print/attribute/standard/Fidelity.class
deleted file mode 100644
index 735ca849113..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/Fidelity.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/Finishings.class b/libjava/classpath/lib/javax/print/attribute/standard/Finishings.class
deleted file mode 100644
index b53435d2eac..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/Finishings.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobHoldUntil.class b/libjava/classpath/lib/javax/print/attribute/standard/JobHoldUntil.class
deleted file mode 100644
index a2079e70685..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobHoldUntil.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobImpressions.class b/libjava/classpath/lib/javax/print/attribute/standard/JobImpressions.class
deleted file mode 100644
index 6bac9fa619c..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobImpressions.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobImpressionsCompleted.class b/libjava/classpath/lib/javax/print/attribute/standard/JobImpressionsCompleted.class
deleted file mode 100644
index 83d489cf1b9..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobImpressionsCompleted.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobImpressionsSupported.class b/libjava/classpath/lib/javax/print/attribute/standard/JobImpressionsSupported.class
deleted file mode 100644
index 7eef5dcaac5..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobImpressionsSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobKOctets.class b/libjava/classpath/lib/javax/print/attribute/standard/JobKOctets.class
deleted file mode 100644
index ff7742995ea..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobKOctets.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobKOctetsProcessed.class b/libjava/classpath/lib/javax/print/attribute/standard/JobKOctetsProcessed.class
deleted file mode 100644
index 560307e27ae..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobKOctetsProcessed.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobKOctetsSupported.class b/libjava/classpath/lib/javax/print/attribute/standard/JobKOctetsSupported.class
deleted file mode 100644
index 8b10d859d5a..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobKOctetsSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobMediaSheets.class b/libjava/classpath/lib/javax/print/attribute/standard/JobMediaSheets.class
deleted file mode 100644
index adc2d36b1ef..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobMediaSheets.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobMediaSheetsCompleted.class b/libjava/classpath/lib/javax/print/attribute/standard/JobMediaSheetsCompleted.class
deleted file mode 100644
index 84373399de7..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobMediaSheetsCompleted.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobMediaSheetsSupported.class b/libjava/classpath/lib/javax/print/attribute/standard/JobMediaSheetsSupported.class
deleted file mode 100644
index d631ebbea56..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobMediaSheetsSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobMessageFromOperator.class b/libjava/classpath/lib/javax/print/attribute/standard/JobMessageFromOperator.class
deleted file mode 100644
index b8d92b9ffeb..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobMessageFromOperator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobName.class b/libjava/classpath/lib/javax/print/attribute/standard/JobName.class
deleted file mode 100644
index 51ad2c12594..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobOriginatingUserName.class b/libjava/classpath/lib/javax/print/attribute/standard/JobOriginatingUserName.class
deleted file mode 100644
index 6ce758cb64d..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobOriginatingUserName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobPriority.class b/libjava/classpath/lib/javax/print/attribute/standard/JobPriority.class
deleted file mode 100644
index f40b9e1af9a..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobPriority.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobPrioritySupported.class b/libjava/classpath/lib/javax/print/attribute/standard/JobPrioritySupported.class
deleted file mode 100644
index 7263fc7d99d..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobPrioritySupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobSheets.class b/libjava/classpath/lib/javax/print/attribute/standard/JobSheets.class
deleted file mode 100644
index 61a52d8b767..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobSheets.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobState.class b/libjava/classpath/lib/javax/print/attribute/standard/JobState.class
deleted file mode 100644
index 31a09d87a0d..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobStateReason.class b/libjava/classpath/lib/javax/print/attribute/standard/JobStateReason.class
deleted file mode 100644
index 12a340af795..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobStateReason.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class b/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class
deleted file mode 100644
index 9098cf72a79..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/Media.class b/libjava/classpath/lib/javax/print/attribute/standard/Media.class
deleted file mode 100644
index 1d085f90a01..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/Media.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MediaName.class b/libjava/classpath/lib/javax/print/attribute/standard/MediaName.class
deleted file mode 100644
index 6a5c6e6956b..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MediaName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MediaPrintableArea.class b/libjava/classpath/lib/javax/print/attribute/standard/MediaPrintableArea.class
deleted file mode 100644
index 99c1c1d685d..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MediaPrintableArea.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$Engineering.class b/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$Engineering.class
deleted file mode 100644
index abebeb6c64f..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$Engineering.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$ISO.class b/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$ISO.class
deleted file mode 100644
index 7598b9dc31f..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$ISO.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$JIS.class b/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$JIS.class
deleted file mode 100644
index 98cd1417e06..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$JIS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$NA.class b/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$NA.class
deleted file mode 100644
index 755264937f7..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$NA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$Other.class b/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$Other.class
deleted file mode 100644
index 3f1464a1681..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize$Other.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize.class b/libjava/classpath/lib/javax/print/attribute/standard/MediaSize.class
deleted file mode 100644
index 7e1f36fee9d..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MediaSize.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MediaSizeName.class b/libjava/classpath/lib/javax/print/attribute/standard/MediaSizeName.class
deleted file mode 100644
index 91d14427556..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MediaSizeName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MediaTray.class b/libjava/classpath/lib/javax/print/attribute/standard/MediaTray.class
deleted file mode 100644
index fcd0a827f66..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MediaTray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/MultipleDocumentHandling.class b/libjava/classpath/lib/javax/print/attribute/standard/MultipleDocumentHandling.class
deleted file mode 100644
index b951129f100..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/MultipleDocumentHandling.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/NumberOfDocuments.class b/libjava/classpath/lib/javax/print/attribute/standard/NumberOfDocuments.class
deleted file mode 100644
index a4adaf1153f..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/NumberOfDocuments.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/NumberOfInterveningJobs.class b/libjava/classpath/lib/javax/print/attribute/standard/NumberOfInterveningJobs.class
deleted file mode 100644
index 759f0caee5f..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/NumberOfInterveningJobs.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/NumberUp.class b/libjava/classpath/lib/javax/print/attribute/standard/NumberUp.class
deleted file mode 100644
index 5456684b938..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/NumberUp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/NumberUpSupported.class b/libjava/classpath/lib/javax/print/attribute/standard/NumberUpSupported.class
deleted file mode 100644
index fb9e4c8c453..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/NumberUpSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/OrientationRequested.class b/libjava/classpath/lib/javax/print/attribute/standard/OrientationRequested.class
deleted file mode 100644
index eac890a0288..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/OrientationRequested.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/OutputDeviceAssigned.class b/libjava/classpath/lib/javax/print/attribute/standard/OutputDeviceAssigned.class
deleted file mode 100644
index 900479306d3..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/OutputDeviceAssigned.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PDLOverrideSupported.class b/libjava/classpath/lib/javax/print/attribute/standard/PDLOverrideSupported.class
deleted file mode 100644
index 8b0b9495c94..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PDLOverrideSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PageRanges.class b/libjava/classpath/lib/javax/print/attribute/standard/PageRanges.class
deleted file mode 100644
index 917e9ba1b6a..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PageRanges.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PagesPerMinute.class b/libjava/classpath/lib/javax/print/attribute/standard/PagesPerMinute.class
deleted file mode 100644
index ab7150429b7..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PagesPerMinute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PagesPerMinuteColor.class b/libjava/classpath/lib/javax/print/attribute/standard/PagesPerMinuteColor.class
deleted file mode 100644
index 8402bbd857f..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PagesPerMinuteColor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PresentationDirection.class b/libjava/classpath/lib/javax/print/attribute/standard/PresentationDirection.class
deleted file mode 100644
index 108401b1351..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PresentationDirection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrintQuality.class b/libjava/classpath/lib/javax/print/attribute/standard/PrintQuality.class
deleted file mode 100644
index 38511ca1ecc..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrintQuality.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterInfo.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterInfo.class
deleted file mode 100644
index 9d4dfec8858..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterIsAcceptingJobs.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterIsAcceptingJobs.class
deleted file mode 100644
index b5645608771..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterIsAcceptingJobs.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterLocation.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterLocation.class
deleted file mode 100644
index 3dc10226179..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterLocation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterMakeAndModel.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterMakeAndModel.class
deleted file mode 100644
index 5035742c4d9..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterMakeAndModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterMessageFromOperator.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterMessageFromOperator.class
deleted file mode 100644
index 0b9065b7fe2..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterMessageFromOperator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterMoreInfo.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterMoreInfo.class
deleted file mode 100644
index e8a4635d39f..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterMoreInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterMoreInfoManufacturer.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterMoreInfoManufacturer.class
deleted file mode 100644
index df7de3b6506..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterMoreInfoManufacturer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterName.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterName.class
deleted file mode 100644
index d94bfc0c34f..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterResolution.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterResolution.class
deleted file mode 100644
index 5e24460c8a2..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterResolution.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterState.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterState.class
deleted file mode 100644
index 11d67db360a..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterStateReason.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterStateReason.class
deleted file mode 100644
index 0ace3664a35..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterStateReason.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterStateReasons.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterStateReasons.class
deleted file mode 100644
index 2b2bbdde29e..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterStateReasons.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/PrinterURI.class b/libjava/classpath/lib/javax/print/attribute/standard/PrinterURI.class
deleted file mode 100644
index 28124f05e7c..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/PrinterURI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/QueuedJobCount.class b/libjava/classpath/lib/javax/print/attribute/standard/QueuedJobCount.class
deleted file mode 100644
index 21e93f63a3e..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/QueuedJobCount.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/ReferenceUriSchemesSupported.class b/libjava/classpath/lib/javax/print/attribute/standard/ReferenceUriSchemesSupported.class
deleted file mode 100644
index 6ec639def58..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/ReferenceUriSchemesSupported.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/RequestingUserName.class b/libjava/classpath/lib/javax/print/attribute/standard/RequestingUserName.class
deleted file mode 100644
index eaf96608a93..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/RequestingUserName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/Severity.class b/libjava/classpath/lib/javax/print/attribute/standard/Severity.class
deleted file mode 100644
index d7959b0e4f1..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/Severity.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/SheetCollate.class b/libjava/classpath/lib/javax/print/attribute/standard/SheetCollate.class
deleted file mode 100644
index 6e202fc7a97..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/SheetCollate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/attribute/standard/Sides.class b/libjava/classpath/lib/javax/print/attribute/standard/Sides.class
deleted file mode 100644
index ccc9789518d..00000000000
--- a/libjava/classpath/lib/javax/print/attribute/standard/Sides.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/event/PrintEvent.class b/libjava/classpath/lib/javax/print/event/PrintEvent.class
deleted file mode 100644
index 589436ae042..00000000000
--- a/libjava/classpath/lib/javax/print/event/PrintEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/event/PrintJobAdapter.class b/libjava/classpath/lib/javax/print/event/PrintJobAdapter.class
deleted file mode 100644
index 28559645c6e..00000000000
--- a/libjava/classpath/lib/javax/print/event/PrintJobAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/event/PrintJobAttributeEvent.class b/libjava/classpath/lib/javax/print/event/PrintJobAttributeEvent.class
deleted file mode 100644
index dc6834fb7a9..00000000000
--- a/libjava/classpath/lib/javax/print/event/PrintJobAttributeEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/event/PrintJobAttributeListener.class b/libjava/classpath/lib/javax/print/event/PrintJobAttributeListener.class
deleted file mode 100644
index 3404e303d3b..00000000000
--- a/libjava/classpath/lib/javax/print/event/PrintJobAttributeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/event/PrintJobEvent.class b/libjava/classpath/lib/javax/print/event/PrintJobEvent.class
deleted file mode 100644
index 77ff6656b6a..00000000000
--- a/libjava/classpath/lib/javax/print/event/PrintJobEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/event/PrintJobListener.class b/libjava/classpath/lib/javax/print/event/PrintJobListener.class
deleted file mode 100644
index 86549e6dc3b..00000000000
--- a/libjava/classpath/lib/javax/print/event/PrintJobListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/event/PrintServiceAttributeEvent.class b/libjava/classpath/lib/javax/print/event/PrintServiceAttributeEvent.class
deleted file mode 100644
index 4a5c9c898af..00000000000
--- a/libjava/classpath/lib/javax/print/event/PrintServiceAttributeEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/print/event/PrintServiceAttributeListener.class b/libjava/classpath/lib/javax/print/event/PrintServiceAttributeListener.class
deleted file mode 100644
index 029a5b932f9..00000000000
--- a/libjava/classpath/lib/javax/print/event/PrintServiceAttributeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/CORBA/ClassDesc.class b/libjava/classpath/lib/javax/rmi/CORBA/ClassDesc.class
deleted file mode 100644
index 96fa9d591b1..00000000000
--- a/libjava/classpath/lib/javax/rmi/CORBA/ClassDesc.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/CORBA/PortableRemoteObjectDelegate.class b/libjava/classpath/lib/javax/rmi/CORBA/PortableRemoteObjectDelegate.class
deleted file mode 100644
index 432269bffd0..00000000000
--- a/libjava/classpath/lib/javax/rmi/CORBA/PortableRemoteObjectDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/CORBA/Stub.class b/libjava/classpath/lib/javax/rmi/CORBA/Stub.class
deleted file mode 100644
index 1c0d21cbfe0..00000000000
--- a/libjava/classpath/lib/javax/rmi/CORBA/Stub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/CORBA/StubDelegate.class b/libjava/classpath/lib/javax/rmi/CORBA/StubDelegate.class
deleted file mode 100644
index 77f1aac0a77..00000000000
--- a/libjava/classpath/lib/javax/rmi/CORBA/StubDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/CORBA/Tie.class b/libjava/classpath/lib/javax/rmi/CORBA/Tie.class
deleted file mode 100644
index c4c3b82e359..00000000000
--- a/libjava/classpath/lib/javax/rmi/CORBA/Tie.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/CORBA/Util.class b/libjava/classpath/lib/javax/rmi/CORBA/Util.class
deleted file mode 100644
index 1175824b71c..00000000000
--- a/libjava/classpath/lib/javax/rmi/CORBA/Util.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/CORBA/UtilDelegate.class b/libjava/classpath/lib/javax/rmi/CORBA/UtilDelegate.class
deleted file mode 100644
index 65077c71ac3..00000000000
--- a/libjava/classpath/lib/javax/rmi/CORBA/UtilDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/CORBA/ValueHandler.class b/libjava/classpath/lib/javax/rmi/CORBA/ValueHandler.class
deleted file mode 100644
index 29ee23f36c5..00000000000
--- a/libjava/classpath/lib/javax/rmi/CORBA/ValueHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/CORBA/ValueHandlerMultiFormat.class b/libjava/classpath/lib/javax/rmi/CORBA/ValueHandlerMultiFormat.class
deleted file mode 100644
index 6b2d632a8e7..00000000000
--- a/libjava/classpath/lib/javax/rmi/CORBA/ValueHandlerMultiFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/PortableRemoteObject.class b/libjava/classpath/lib/javax/rmi/PortableRemoteObject.class
deleted file mode 100644
index b74d1450c8e..00000000000
--- a/libjava/classpath/lib/javax/rmi/PortableRemoteObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/ssl/SslRMIClientSocketFactory.class b/libjava/classpath/lib/javax/rmi/ssl/SslRMIClientSocketFactory.class
deleted file mode 100644
index 4ba2d6fa060..00000000000
--- a/libjava/classpath/lib/javax/rmi/ssl/SslRMIClientSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/rmi/ssl/SslRMIServerSocketFactory.class b/libjava/classpath/lib/javax/rmi/ssl/SslRMIServerSocketFactory.class
deleted file mode 100644
index 9df26d505ed..00000000000
--- a/libjava/classpath/lib/javax/rmi/ssl/SslRMIServerSocketFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/AuthPermission.class b/libjava/classpath/lib/javax/security/auth/AuthPermission.class
deleted file mode 100644
index 54e75dcede2..00000000000
--- a/libjava/classpath/lib/javax/security/auth/AuthPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/DestroyFailedException.class b/libjava/classpath/lib/javax/security/auth/DestroyFailedException.class
deleted file mode 100644
index 7944f18966c..00000000000
--- a/libjava/classpath/lib/javax/security/auth/DestroyFailedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/Destroyable.class b/libjava/classpath/lib/javax/security/auth/Destroyable.class
deleted file mode 100644
index fbb944150eb..00000000000
--- a/libjava/classpath/lib/javax/security/auth/Destroyable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/Policy.class b/libjava/classpath/lib/javax/security/auth/Policy.class
deleted file mode 100644
index 50a7e6fd9b2..00000000000
--- a/libjava/classpath/lib/javax/security/auth/Policy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/PrivateCredentialPermission$CredOwner.class b/libjava/classpath/lib/javax/security/auth/PrivateCredentialPermission$CredOwner.class
deleted file mode 100644
index 46678c4444b..00000000000
--- a/libjava/classpath/lib/javax/security/auth/PrivateCredentialPermission$CredOwner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/PrivateCredentialPermission.class b/libjava/classpath/lib/javax/security/auth/PrivateCredentialPermission.class
deleted file mode 100644
index 0143ee8e8b0..00000000000
--- a/libjava/classpath/lib/javax/security/auth/PrivateCredentialPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/RefreshFailedException.class b/libjava/classpath/lib/javax/security/auth/RefreshFailedException.class
deleted file mode 100644
index 4968d0d82aa..00000000000
--- a/libjava/classpath/lib/javax/security/auth/RefreshFailedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/Refreshable.class b/libjava/classpath/lib/javax/security/auth/Refreshable.class
deleted file mode 100644
index 3005e5c2f47..00000000000
--- a/libjava/classpath/lib/javax/security/auth/Refreshable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/Subject$SecureSet.class b/libjava/classpath/lib/javax/security/auth/Subject$SecureSet.class
deleted file mode 100644
index 682125eeef6..00000000000
--- a/libjava/classpath/lib/javax/security/auth/Subject$SecureSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/Subject.class b/libjava/classpath/lib/javax/security/auth/Subject.class
deleted file mode 100644
index 9c64e0c9714..00000000000
--- a/libjava/classpath/lib/javax/security/auth/Subject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/SubjectDomainCombiner.class b/libjava/classpath/lib/javax/security/auth/SubjectDomainCombiner.class
deleted file mode 100644
index 737a678b6ae..00000000000
--- a/libjava/classpath/lib/javax/security/auth/SubjectDomainCombiner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/callback/Callback.class b/libjava/classpath/lib/javax/security/auth/callback/Callback.class
deleted file mode 100644
index 6e3a344b7bd..00000000000
--- a/libjava/classpath/lib/javax/security/auth/callback/Callback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/callback/CallbackHandler.class b/libjava/classpath/lib/javax/security/auth/callback/CallbackHandler.class
deleted file mode 100644
index b3b4d1f8193..00000000000
--- a/libjava/classpath/lib/javax/security/auth/callback/CallbackHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/callback/ChoiceCallback.class b/libjava/classpath/lib/javax/security/auth/callback/ChoiceCallback.class
deleted file mode 100644
index 17f5201ec03..00000000000
--- a/libjava/classpath/lib/javax/security/auth/callback/ChoiceCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/callback/ConfirmationCallback.class b/libjava/classpath/lib/javax/security/auth/callback/ConfirmationCallback.class
deleted file mode 100644
index 2110442cb11..00000000000
--- a/libjava/classpath/lib/javax/security/auth/callback/ConfirmationCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/callback/LanguageCallback.class b/libjava/classpath/lib/javax/security/auth/callback/LanguageCallback.class
deleted file mode 100644
index 683e182573a..00000000000
--- a/libjava/classpath/lib/javax/security/auth/callback/LanguageCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/callback/NameCallback.class b/libjava/classpath/lib/javax/security/auth/callback/NameCallback.class
deleted file mode 100644
index b71dd8ad83a..00000000000
--- a/libjava/classpath/lib/javax/security/auth/callback/NameCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/callback/PasswordCallback.class b/libjava/classpath/lib/javax/security/auth/callback/PasswordCallback.class
deleted file mode 100644
index 5096aa3d912..00000000000
--- a/libjava/classpath/lib/javax/security/auth/callback/PasswordCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/callback/TextInputCallback.class b/libjava/classpath/lib/javax/security/auth/callback/TextInputCallback.class
deleted file mode 100644
index 9ec60ddfac0..00000000000
--- a/libjava/classpath/lib/javax/security/auth/callback/TextInputCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/callback/TextOutputCallback.class b/libjava/classpath/lib/javax/security/auth/callback/TextOutputCallback.class
deleted file mode 100644
index 84800e6656c..00000000000
--- a/libjava/classpath/lib/javax/security/auth/callback/TextOutputCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/callback/UnsupportedCallbackException.class b/libjava/classpath/lib/javax/security/auth/callback/UnsupportedCallbackException.class
deleted file mode 100644
index 5863eb6ea66..00000000000
--- a/libjava/classpath/lib/javax/security/auth/callback/UnsupportedCallbackException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/kerberos/DelegationPermission$1.class b/libjava/classpath/lib/javax/security/auth/kerberos/DelegationPermission$1.class
deleted file mode 100644
index 17b73dd3a06..00000000000
--- a/libjava/classpath/lib/javax/security/auth/kerberos/DelegationPermission$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/kerberos/DelegationPermission.class b/libjava/classpath/lib/javax/security/auth/kerberos/DelegationPermission.class
deleted file mode 100644
index a5a555a3bbd..00000000000
--- a/libjava/classpath/lib/javax/security/auth/kerberos/DelegationPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/kerberos/KerberosKey.class b/libjava/classpath/lib/javax/security/auth/kerberos/KerberosKey.class
deleted file mode 100644
index 89081783c30..00000000000
--- a/libjava/classpath/lib/javax/security/auth/kerberos/KerberosKey.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/kerberos/KerberosPrincipal.class b/libjava/classpath/lib/javax/security/auth/kerberos/KerberosPrincipal.class
deleted file mode 100644
index 1804ee09100..00000000000
--- a/libjava/classpath/lib/javax/security/auth/kerberos/KerberosPrincipal.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/kerberos/KerberosTicket.class b/libjava/classpath/lib/javax/security/auth/kerberos/KerberosTicket.class
deleted file mode 100644
index 2b61c570d8e..00000000000
--- a/libjava/classpath/lib/javax/security/auth/kerberos/KerberosTicket.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/kerberos/KeyImpl.class b/libjava/classpath/lib/javax/security/auth/kerberos/KeyImpl.class
deleted file mode 100644
index 4e6b58739b4..00000000000
--- a/libjava/classpath/lib/javax/security/auth/kerberos/KeyImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/kerberos/ServicePermission$1.class b/libjava/classpath/lib/javax/security/auth/kerberos/ServicePermission$1.class
deleted file mode 100644
index f8d7e1e2a8e..00000000000
--- a/libjava/classpath/lib/javax/security/auth/kerberos/ServicePermission$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/kerberos/ServicePermission.class b/libjava/classpath/lib/javax/security/auth/kerberos/ServicePermission.class
deleted file mode 100644
index 567a1dd3abf..00000000000
--- a/libjava/classpath/lib/javax/security/auth/kerberos/ServicePermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/AccountException.class b/libjava/classpath/lib/javax/security/auth/login/AccountException.class
deleted file mode 100644
index 5e7b900b8db..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/AccountException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/AccountExpiredException.class b/libjava/classpath/lib/javax/security/auth/login/AccountExpiredException.class
deleted file mode 100644
index aa1bf7df2c7..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/AccountExpiredException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/AccountLockedException.class b/libjava/classpath/lib/javax/security/auth/login/AccountLockedException.class
deleted file mode 100644
index ba3576e1778..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/AccountLockedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/AccountNotFoundException.class b/libjava/classpath/lib/javax/security/auth/login/AccountNotFoundException.class
deleted file mode 100644
index f06c1599824..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/AccountNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/AppConfigurationEntry$LoginModuleControlFlag.class b/libjava/classpath/lib/javax/security/auth/login/AppConfigurationEntry$LoginModuleControlFlag.class
deleted file mode 100644
index db80cbfb648..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/AppConfigurationEntry$LoginModuleControlFlag.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/AppConfigurationEntry.class b/libjava/classpath/lib/javax/security/auth/login/AppConfigurationEntry.class
deleted file mode 100644
index 5307843c287..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/AppConfigurationEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/Configuration$1.class b/libjava/classpath/lib/javax/security/auth/login/Configuration$1.class
deleted file mode 100644
index cfbe1eed07a..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/Configuration$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/Configuration.class b/libjava/classpath/lib/javax/security/auth/login/Configuration.class
deleted file mode 100644
index bd233be10df..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/Configuration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/CredentialException.class b/libjava/classpath/lib/javax/security/auth/login/CredentialException.class
deleted file mode 100644
index 82ad8b84e0f..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/CredentialException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/CredentialExpiredException.class b/libjava/classpath/lib/javax/security/auth/login/CredentialExpiredException.class
deleted file mode 100644
index e313d9d8f75..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/CredentialExpiredException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/CredentialNotFoundException.class b/libjava/classpath/lib/javax/security/auth/login/CredentialNotFoundException.class
deleted file mode 100644
index c4bdb4eb8be..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/CredentialNotFoundException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/FailedLoginException.class b/libjava/classpath/lib/javax/security/auth/login/FailedLoginException.class
deleted file mode 100644
index 475f605ade3..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/FailedLoginException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/LoginContext.class b/libjava/classpath/lib/javax/security/auth/login/LoginContext.class
deleted file mode 100644
index 72a220ca94e..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/LoginContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/LoginException.class b/libjava/classpath/lib/javax/security/auth/login/LoginException.class
deleted file mode 100644
index 92a141422fc..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/LoginException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/login/NullConfiguration.class b/libjava/classpath/lib/javax/security/auth/login/NullConfiguration.class
deleted file mode 100644
index 2fb42c31936..00000000000
--- a/libjava/classpath/lib/javax/security/auth/login/NullConfiguration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/spi/LoginModule.class b/libjava/classpath/lib/javax/security/auth/spi/LoginModule.class
deleted file mode 100644
index 395adacbc08..00000000000
--- a/libjava/classpath/lib/javax/security/auth/spi/LoginModule.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/x500/X500Principal.class b/libjava/classpath/lib/javax/security/auth/x500/X500Principal.class
deleted file mode 100644
index 8b8b10bfe22..00000000000
--- a/libjava/classpath/lib/javax/security/auth/x500/X500Principal.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/auth/x500/X500PrivateCredential.class b/libjava/classpath/lib/javax/security/auth/x500/X500PrivateCredential.class
deleted file mode 100644
index 9ceb6eebf0e..00000000000
--- a/libjava/classpath/lib/javax/security/auth/x500/X500PrivateCredential.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/cert/Certificate.class b/libjava/classpath/lib/javax/security/cert/Certificate.class
deleted file mode 100644
index 19e849833e6..00000000000
--- a/libjava/classpath/lib/javax/security/cert/Certificate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/cert/CertificateEncodingException.class b/libjava/classpath/lib/javax/security/cert/CertificateEncodingException.class
deleted file mode 100644
index 7355f636d3a..00000000000
--- a/libjava/classpath/lib/javax/security/cert/CertificateEncodingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/cert/CertificateException.class b/libjava/classpath/lib/javax/security/cert/CertificateException.class
deleted file mode 100644
index 2682adc4315..00000000000
--- a/libjava/classpath/lib/javax/security/cert/CertificateException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/cert/CertificateExpiredException.class b/libjava/classpath/lib/javax/security/cert/CertificateExpiredException.class
deleted file mode 100644
index 405b021ef70..00000000000
--- a/libjava/classpath/lib/javax/security/cert/CertificateExpiredException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/cert/CertificateNotYetValidException.class b/libjava/classpath/lib/javax/security/cert/CertificateNotYetValidException.class
deleted file mode 100644
index 0abee4f8022..00000000000
--- a/libjava/classpath/lib/javax/security/cert/CertificateNotYetValidException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/cert/CertificateParsingException.class b/libjava/classpath/lib/javax/security/cert/CertificateParsingException.class
deleted file mode 100644
index 232946f9dce..00000000000
--- a/libjava/classpath/lib/javax/security/cert/CertificateParsingException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/cert/X509CertBridge.class b/libjava/classpath/lib/javax/security/cert/X509CertBridge.class
deleted file mode 100644
index 30f73b590e8..00000000000
--- a/libjava/classpath/lib/javax/security/cert/X509CertBridge.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/cert/X509Certificate.class b/libjava/classpath/lib/javax/security/cert/X509Certificate.class
deleted file mode 100644
index 07f0f3902c1..00000000000
--- a/libjava/classpath/lib/javax/security/cert/X509Certificate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/sasl/AuthenticationException.class b/libjava/classpath/lib/javax/security/sasl/AuthenticationException.class
deleted file mode 100644
index 0469cc5186e..00000000000
--- a/libjava/classpath/lib/javax/security/sasl/AuthenticationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/sasl/AuthorizeCallback.class b/libjava/classpath/lib/javax/security/sasl/AuthorizeCallback.class
deleted file mode 100644
index bb976ec1c37..00000000000
--- a/libjava/classpath/lib/javax/security/sasl/AuthorizeCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/sasl/RealmCallback.class b/libjava/classpath/lib/javax/security/sasl/RealmCallback.class
deleted file mode 100644
index 683a99b11ba..00000000000
--- a/libjava/classpath/lib/javax/security/sasl/RealmCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/sasl/RealmChoiceCallback.class b/libjava/classpath/lib/javax/security/sasl/RealmChoiceCallback.class
deleted file mode 100644
index 3f36f2b7303..00000000000
--- a/libjava/classpath/lib/javax/security/sasl/RealmChoiceCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/sasl/Sasl.class b/libjava/classpath/lib/javax/security/sasl/Sasl.class
deleted file mode 100644
index f730d3191f4..00000000000
--- a/libjava/classpath/lib/javax/security/sasl/Sasl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/sasl/SaslClient.class b/libjava/classpath/lib/javax/security/sasl/SaslClient.class
deleted file mode 100644
index 670745bb65b..00000000000
--- a/libjava/classpath/lib/javax/security/sasl/SaslClient.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/sasl/SaslClientFactory.class b/libjava/classpath/lib/javax/security/sasl/SaslClientFactory.class
deleted file mode 100644
index 4e0aacdfc69..00000000000
--- a/libjava/classpath/lib/javax/security/sasl/SaslClientFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/sasl/SaslException.class b/libjava/classpath/lib/javax/security/sasl/SaslException.class
deleted file mode 100644
index 2121acee357..00000000000
--- a/libjava/classpath/lib/javax/security/sasl/SaslException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/sasl/SaslServer.class b/libjava/classpath/lib/javax/security/sasl/SaslServer.class
deleted file mode 100644
index 5170e56c69e..00000000000
--- a/libjava/classpath/lib/javax/security/sasl/SaslServer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/security/sasl/SaslServerFactory.class b/libjava/classpath/lib/javax/security/sasl/SaslServerFactory.class
deleted file mode 100644
index 8769c08450d..00000000000
--- a/libjava/classpath/lib/javax/security/sasl/SaslServerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/ControllerEventListener.class b/libjava/classpath/lib/javax/sound/midi/ControllerEventListener.class
deleted file mode 100644
index da0c409846d..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/ControllerEventListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/Instrument.class b/libjava/classpath/lib/javax/sound/midi/Instrument.class
deleted file mode 100644
index 98fff9ed2aa..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/Instrument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/InvalidMidiDataException.class b/libjava/classpath/lib/javax/sound/midi/InvalidMidiDataException.class
deleted file mode 100644
index 0a4b24cfc3e..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/InvalidMidiDataException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/MetaEventListener.class b/libjava/classpath/lib/javax/sound/midi/MetaEventListener.class
deleted file mode 100644
index aad406108f7..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/MetaEventListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/MetaMessage.class b/libjava/classpath/lib/javax/sound/midi/MetaMessage.class
deleted file mode 100644
index 8ac24605748..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/MetaMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/MidiChannel.class b/libjava/classpath/lib/javax/sound/midi/MidiChannel.class
deleted file mode 100644
index 341a9bb2eb8..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/MidiChannel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/MidiDevice$Info.class b/libjava/classpath/lib/javax/sound/midi/MidiDevice$Info.class
deleted file mode 100644
index 773d8316752..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/MidiDevice$Info.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/MidiDevice.class b/libjava/classpath/lib/javax/sound/midi/MidiDevice.class
deleted file mode 100644
index a299aa94f4e..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/MidiDevice.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/MidiEvent.class b/libjava/classpath/lib/javax/sound/midi/MidiEvent.class
deleted file mode 100644
index 0bc17e6595b..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/MidiEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/MidiFileFormat.class b/libjava/classpath/lib/javax/sound/midi/MidiFileFormat.class
deleted file mode 100644
index b6e2ce4482c..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/MidiFileFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/MidiMessage.class b/libjava/classpath/lib/javax/sound/midi/MidiMessage.class
deleted file mode 100644
index 8ddb8aab286..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/MidiMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/MidiSystem.class b/libjava/classpath/lib/javax/sound/midi/MidiSystem.class
deleted file mode 100644
index b25a832b35f..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/MidiSystem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/MidiUnavailableException.class b/libjava/classpath/lib/javax/sound/midi/MidiUnavailableException.class
deleted file mode 100644
index 13a292367dd..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/MidiUnavailableException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/Patch.class b/libjava/classpath/lib/javax/sound/midi/Patch.class
deleted file mode 100644
index d633eedff32..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/Patch.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/Receiver.class b/libjava/classpath/lib/javax/sound/midi/Receiver.class
deleted file mode 100644
index 965bd62c370..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/Receiver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/Sequence.class b/libjava/classpath/lib/javax/sound/midi/Sequence.class
deleted file mode 100644
index 5538228dea7..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/Sequence.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/Sequencer$SyncMode.class b/libjava/classpath/lib/javax/sound/midi/Sequencer$SyncMode.class
deleted file mode 100644
index 5a38235843b..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/Sequencer$SyncMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/Sequencer.class b/libjava/classpath/lib/javax/sound/midi/Sequencer.class
deleted file mode 100644
index ae2a2d5e020..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/Sequencer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/ShortMessage.class b/libjava/classpath/lib/javax/sound/midi/ShortMessage.class
deleted file mode 100644
index 58a4653bab7..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/ShortMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/Soundbank.class b/libjava/classpath/lib/javax/sound/midi/Soundbank.class
deleted file mode 100644
index d6cb8af2c24..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/Soundbank.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/SoundbankResource.class b/libjava/classpath/lib/javax/sound/midi/SoundbankResource.class
deleted file mode 100644
index 9d6077963fd..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/SoundbankResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/Synthesizer.class b/libjava/classpath/lib/javax/sound/midi/Synthesizer.class
deleted file mode 100644
index bb4465a0cc3..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/Synthesizer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/SysexMessage.class b/libjava/classpath/lib/javax/sound/midi/SysexMessage.class
deleted file mode 100644
index 98b6f6a3f90..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/SysexMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/Track.class b/libjava/classpath/lib/javax/sound/midi/Track.class
deleted file mode 100644
index 48f61a4f035..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/Track.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/Transmitter.class b/libjava/classpath/lib/javax/sound/midi/Transmitter.class
deleted file mode 100644
index 41b968b49ff..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/Transmitter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/VoiceStatus.class b/libjava/classpath/lib/javax/sound/midi/VoiceStatus.class
deleted file mode 100644
index 23d64373016..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/VoiceStatus.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/spi/MidiDeviceProvider.class b/libjava/classpath/lib/javax/sound/midi/spi/MidiDeviceProvider.class
deleted file mode 100644
index 9bd4b0c2f73..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/spi/MidiDeviceProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/spi/MidiFileReader.class b/libjava/classpath/lib/javax/sound/midi/spi/MidiFileReader.class
deleted file mode 100644
index c85f4969508..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/spi/MidiFileReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/spi/MidiFileWriter.class b/libjava/classpath/lib/javax/sound/midi/spi/MidiFileWriter.class
deleted file mode 100644
index a1edb6663c0..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/spi/MidiFileWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/midi/spi/SoundbankReader.class b/libjava/classpath/lib/javax/sound/midi/spi/SoundbankReader.class
deleted file mode 100644
index d2c63aba084..00000000000
--- a/libjava/classpath/lib/javax/sound/midi/spi/SoundbankReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/AudioFileFormat$Type.class b/libjava/classpath/lib/javax/sound/sampled/AudioFileFormat$Type.class
deleted file mode 100644
index f3087e7ee45..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/AudioFileFormat$Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/AudioFileFormat.class b/libjava/classpath/lib/javax/sound/sampled/AudioFileFormat.class
deleted file mode 100644
index 9080a541521..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/AudioFileFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/AudioFormat$Encoding.class b/libjava/classpath/lib/javax/sound/sampled/AudioFormat$Encoding.class
deleted file mode 100644
index e76624cd29e..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/AudioFormat$Encoding.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/AudioFormat.class b/libjava/classpath/lib/javax/sound/sampled/AudioFormat.class
deleted file mode 100644
index 2d7d4ec3c49..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/AudioFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/AudioInputStream$TargetInputStream.class b/libjava/classpath/lib/javax/sound/sampled/AudioInputStream$TargetInputStream.class
deleted file mode 100644
index 24ad3615721..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/AudioInputStream$TargetInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/AudioInputStream.class b/libjava/classpath/lib/javax/sound/sampled/AudioInputStream.class
deleted file mode 100644
index 7653aede88e..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/AudioInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/AudioPermission.class b/libjava/classpath/lib/javax/sound/sampled/AudioPermission.class
deleted file mode 100644
index b6838116775..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/AudioPermission.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/AudioSystem.class b/libjava/classpath/lib/javax/sound/sampled/AudioSystem.class
deleted file mode 100644
index d2f9df90375..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/AudioSystem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/BooleanControl$Type.class b/libjava/classpath/lib/javax/sound/sampled/BooleanControl$Type.class
deleted file mode 100644
index 2b34f328453..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/BooleanControl$Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/BooleanControl.class b/libjava/classpath/lib/javax/sound/sampled/BooleanControl.class
deleted file mode 100644
index 66638a9a34c..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/BooleanControl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/Clip.class b/libjava/classpath/lib/javax/sound/sampled/Clip.class
deleted file mode 100644
index fbf12f30eb0..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/Clip.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/CompoundControl$Type.class b/libjava/classpath/lib/javax/sound/sampled/CompoundControl$Type.class
deleted file mode 100644
index e3cd87ceec0..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/CompoundControl$Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/CompoundControl.class b/libjava/classpath/lib/javax/sound/sampled/CompoundControl.class
deleted file mode 100644
index b7257a2c97f..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/CompoundControl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/Control$Type.class b/libjava/classpath/lib/javax/sound/sampled/Control$Type.class
deleted file mode 100644
index fde49fabef5..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/Control$Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/Control.class b/libjava/classpath/lib/javax/sound/sampled/Control.class
deleted file mode 100644
index 5dfef019310..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/Control.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/DataLine$Info.class b/libjava/classpath/lib/javax/sound/sampled/DataLine$Info.class
deleted file mode 100644
index fd9cc41a248..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/DataLine$Info.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/DataLine.class b/libjava/classpath/lib/javax/sound/sampled/DataLine.class
deleted file mode 100644
index 06e2775e63e..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/DataLine.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/EnumControl$Type.class b/libjava/classpath/lib/javax/sound/sampled/EnumControl$Type.class
deleted file mode 100644
index a3c7e7cd779..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/EnumControl$Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/EnumControl.class b/libjava/classpath/lib/javax/sound/sampled/EnumControl.class
deleted file mode 100644
index 9a14b3b41f0..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/EnumControl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/FloatControl$Type.class b/libjava/classpath/lib/javax/sound/sampled/FloatControl$Type.class
deleted file mode 100644
index 31ab6794646..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/FloatControl$Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/FloatControl.class b/libjava/classpath/lib/javax/sound/sampled/FloatControl.class
deleted file mode 100644
index 342f907f3c8..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/FloatControl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/Line$Info.class b/libjava/classpath/lib/javax/sound/sampled/Line$Info.class
deleted file mode 100644
index 209f4f95589..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/Line$Info.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/Line.class b/libjava/classpath/lib/javax/sound/sampled/Line.class
deleted file mode 100644
index 61cf116efcb..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/Line.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/LineEvent$Type.class b/libjava/classpath/lib/javax/sound/sampled/LineEvent$Type.class
deleted file mode 100644
index a4125ba4a65..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/LineEvent$Type.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/LineEvent.class b/libjava/classpath/lib/javax/sound/sampled/LineEvent.class
deleted file mode 100644
index cb25c30d8ca..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/LineEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/LineListener.class b/libjava/classpath/lib/javax/sound/sampled/LineListener.class
deleted file mode 100644
index 1f88506b0cb..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/LineListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/LineUnavailableException.class b/libjava/classpath/lib/javax/sound/sampled/LineUnavailableException.class
deleted file mode 100644
index b234d582c83..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/LineUnavailableException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/Mixer$Info.class b/libjava/classpath/lib/javax/sound/sampled/Mixer$Info.class
deleted file mode 100644
index 930c42d7543..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/Mixer$Info.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/Mixer.class b/libjava/classpath/lib/javax/sound/sampled/Mixer.class
deleted file mode 100644
index a079741b7db..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/Mixer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/Port$Info.class b/libjava/classpath/lib/javax/sound/sampled/Port$Info.class
deleted file mode 100644
index e8a1cdd4f2c..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/Port$Info.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/Port.class b/libjava/classpath/lib/javax/sound/sampled/Port.class
deleted file mode 100644
index 24788902b60..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/Port.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/ReverbType.class b/libjava/classpath/lib/javax/sound/sampled/ReverbType.class
deleted file mode 100644
index 63525a1845a..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/ReverbType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/SourceDataLine.class b/libjava/classpath/lib/javax/sound/sampled/SourceDataLine.class
deleted file mode 100644
index 1c8c0c87fbe..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/SourceDataLine.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/TargetDataLine.class b/libjava/classpath/lib/javax/sound/sampled/TargetDataLine.class
deleted file mode 100644
index 7ce66777227..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/TargetDataLine.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/UnsupportedAudioFileException.class b/libjava/classpath/lib/javax/sound/sampled/UnsupportedAudioFileException.class
deleted file mode 100644
index c6ae28916fa..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/UnsupportedAudioFileException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/spi/AudioFileReader.class b/libjava/classpath/lib/javax/sound/sampled/spi/AudioFileReader.class
deleted file mode 100644
index 4e2e4e5edd6..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/spi/AudioFileReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/spi/AudioFileWriter.class b/libjava/classpath/lib/javax/sound/sampled/spi/AudioFileWriter.class
deleted file mode 100644
index cf5d8e438dd..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/spi/AudioFileWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/spi/FormatConversionProvider.class b/libjava/classpath/lib/javax/sound/sampled/spi/FormatConversionProvider.class
deleted file mode 100644
index 6ecb4404113..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/spi/FormatConversionProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sound/sampled/spi/MixerProvider.class b/libjava/classpath/lib/javax/sound/sampled/spi/MixerProvider.class
deleted file mode 100644
index aee30946f1b..00000000000
--- a/libjava/classpath/lib/javax/sound/sampled/spi/MixerProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/ConnectionEvent.class b/libjava/classpath/lib/javax/sql/ConnectionEvent.class
deleted file mode 100644
index 8345645c27c..00000000000
--- a/libjava/classpath/lib/javax/sql/ConnectionEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/ConnectionEventListener.class b/libjava/classpath/lib/javax/sql/ConnectionEventListener.class
deleted file mode 100644
index 48e29c20124..00000000000
--- a/libjava/classpath/lib/javax/sql/ConnectionEventListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/ConnectionPoolDataSource.class b/libjava/classpath/lib/javax/sql/ConnectionPoolDataSource.class
deleted file mode 100644
index 6955eba58d5..00000000000
--- a/libjava/classpath/lib/javax/sql/ConnectionPoolDataSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/DataSource.class b/libjava/classpath/lib/javax/sql/DataSource.class
deleted file mode 100644
index 1c9f7ced2d9..00000000000
--- a/libjava/classpath/lib/javax/sql/DataSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/PooledConnection.class b/libjava/classpath/lib/javax/sql/PooledConnection.class
deleted file mode 100644
index fcf55c69f18..00000000000
--- a/libjava/classpath/lib/javax/sql/PooledConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/RowSet.class b/libjava/classpath/lib/javax/sql/RowSet.class
deleted file mode 100644
index 9300a983b94..00000000000
--- a/libjava/classpath/lib/javax/sql/RowSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/RowSetEvent.class b/libjava/classpath/lib/javax/sql/RowSetEvent.class
deleted file mode 100644
index 695fe118019..00000000000
--- a/libjava/classpath/lib/javax/sql/RowSetEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/RowSetInternal.class b/libjava/classpath/lib/javax/sql/RowSetInternal.class
deleted file mode 100644
index 1cde9fc7d31..00000000000
--- a/libjava/classpath/lib/javax/sql/RowSetInternal.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/RowSetListener.class b/libjava/classpath/lib/javax/sql/RowSetListener.class
deleted file mode 100644
index 6a5dc97043e..00000000000
--- a/libjava/classpath/lib/javax/sql/RowSetListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/RowSetMetaData.class b/libjava/classpath/lib/javax/sql/RowSetMetaData.class
deleted file mode 100644
index 0ba95bb1518..00000000000
--- a/libjava/classpath/lib/javax/sql/RowSetMetaData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/RowSetReader.class b/libjava/classpath/lib/javax/sql/RowSetReader.class
deleted file mode 100644
index f2a4b51cb70..00000000000
--- a/libjava/classpath/lib/javax/sql/RowSetReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/RowSetWriter.class b/libjava/classpath/lib/javax/sql/RowSetWriter.class
deleted file mode 100644
index 206000904ff..00000000000
--- a/libjava/classpath/lib/javax/sql/RowSetWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/XAConnection.class b/libjava/classpath/lib/javax/sql/XAConnection.class
deleted file mode 100644
index 86ab2c5f81c..00000000000
--- a/libjava/classpath/lib/javax/sql/XAConnection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/sql/XADataSource.class b/libjava/classpath/lib/javax/sql/XADataSource.class
deleted file mode 100644
index 611cabecc73..00000000000
--- a/libjava/classpath/lib/javax/sql/XADataSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/AbstractAction.class b/libjava/classpath/lib/javax/swing/AbstractAction.class
deleted file mode 100644
index 8d2cdaf6759..00000000000
--- a/libjava/classpath/lib/javax/swing/AbstractAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/AbstractButton$1.class b/libjava/classpath/lib/javax/swing/AbstractButton$1.class
deleted file mode 100644
index 1d5de118bef..00000000000
--- a/libjava/classpath/lib/javax/swing/AbstractButton$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/AbstractButton$AccessibleAbstractButton.class b/libjava/classpath/lib/javax/swing/AbstractButton$AccessibleAbstractButton.class
deleted file mode 100644
index 8e07d370ed2..00000000000
--- a/libjava/classpath/lib/javax/swing/AbstractButton$AccessibleAbstractButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/AbstractButton$ButtonChangeListener.class b/libjava/classpath/lib/javax/swing/AbstractButton$ButtonChangeListener.class
deleted file mode 100644
index 540f0116e60..00000000000
--- a/libjava/classpath/lib/javax/swing/AbstractButton$ButtonChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/AbstractButton$EventHandler.class b/libjava/classpath/lib/javax/swing/AbstractButton$EventHandler.class
deleted file mode 100644
index 370e7d3cebe..00000000000
--- a/libjava/classpath/lib/javax/swing/AbstractButton$EventHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/AbstractButton.class b/libjava/classpath/lib/javax/swing/AbstractButton.class
deleted file mode 100644
index cfbd15b15a9..00000000000
--- a/libjava/classpath/lib/javax/swing/AbstractButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/AbstractCellEditor.class b/libjava/classpath/lib/javax/swing/AbstractCellEditor.class
deleted file mode 100644
index d33c2300bff..00000000000
--- a/libjava/classpath/lib/javax/swing/AbstractCellEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/AbstractListModel.class b/libjava/classpath/lib/javax/swing/AbstractListModel.class
deleted file mode 100644
index e569d3970a5..00000000000
--- a/libjava/classpath/lib/javax/swing/AbstractListModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/AbstractSpinnerModel.class b/libjava/classpath/lib/javax/swing/AbstractSpinnerModel.class
deleted file mode 100644
index 9af9510cbd6..00000000000
--- a/libjava/classpath/lib/javax/swing/AbstractSpinnerModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Action.class b/libjava/classpath/lib/javax/swing/Action.class
deleted file mode 100644
index 19dd930f971..00000000000
--- a/libjava/classpath/lib/javax/swing/Action.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ActionMap.class b/libjava/classpath/lib/javax/swing/ActionMap.class
deleted file mode 100644
index e77f7d59c6a..00000000000
--- a/libjava/classpath/lib/javax/swing/ActionMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/BorderFactory.class b/libjava/classpath/lib/javax/swing/BorderFactory.class
deleted file mode 100644
index 899b235ceed..00000000000
--- a/libjava/classpath/lib/javax/swing/BorderFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/BoundedRangeModel.class b/libjava/classpath/lib/javax/swing/BoundedRangeModel.class
deleted file mode 100644
index 25718220140..00000000000
--- a/libjava/classpath/lib/javax/swing/BoundedRangeModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Box$AccessibleBox.class b/libjava/classpath/lib/javax/swing/Box$AccessibleBox.class
deleted file mode 100644
index ad22919f878..00000000000
--- a/libjava/classpath/lib/javax/swing/Box$AccessibleBox.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Box$Filler$AccessibleBoxFiller.class b/libjava/classpath/lib/javax/swing/Box$Filler$AccessibleBoxFiller.class
deleted file mode 100644
index a45d6ff0c2e..00000000000
--- a/libjava/classpath/lib/javax/swing/Box$Filler$AccessibleBoxFiller.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Box$Filler.class b/libjava/classpath/lib/javax/swing/Box$Filler.class
deleted file mode 100644
index b1337ef11e8..00000000000
--- a/libjava/classpath/lib/javax/swing/Box$Filler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Box.class b/libjava/classpath/lib/javax/swing/Box.class
deleted file mode 100644
index 83d2ebda7af..00000000000
--- a/libjava/classpath/lib/javax/swing/Box.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/BoxLayout.class b/libjava/classpath/lib/javax/swing/BoxLayout.class
deleted file mode 100644
index ae04a89ca00..00000000000
--- a/libjava/classpath/lib/javax/swing/BoxLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ButtonGroup.class b/libjava/classpath/lib/javax/swing/ButtonGroup.class
deleted file mode 100644
index 075241032ef..00000000000
--- a/libjava/classpath/lib/javax/swing/ButtonGroup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ButtonModel.class b/libjava/classpath/lib/javax/swing/ButtonModel.class
deleted file mode 100644
index 475947322ce..00000000000
--- a/libjava/classpath/lib/javax/swing/ButtonModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/CellEditor.class b/libjava/classpath/lib/javax/swing/CellEditor.class
deleted file mode 100644
index 96007a35b3d..00000000000
--- a/libjava/classpath/lib/javax/swing/CellEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/CellRendererPane$AccessibleCellRendererPane.class b/libjava/classpath/lib/javax/swing/CellRendererPane$AccessibleCellRendererPane.class
deleted file mode 100644
index 2896e8d18e1..00000000000
--- a/libjava/classpath/lib/javax/swing/CellRendererPane$AccessibleCellRendererPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/CellRendererPane.class b/libjava/classpath/lib/javax/swing/CellRendererPane.class
deleted file mode 100644
index 08492c9bdd7..00000000000
--- a/libjava/classpath/lib/javax/swing/CellRendererPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ComboBoxEditor.class b/libjava/classpath/lib/javax/swing/ComboBoxEditor.class
deleted file mode 100644
index 85bd49e825d..00000000000
--- a/libjava/classpath/lib/javax/swing/ComboBoxEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ComboBoxModel.class b/libjava/classpath/lib/javax/swing/ComboBoxModel.class
deleted file mode 100644
index b71063fad98..00000000000
--- a/libjava/classpath/lib/javax/swing/ComboBoxModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/CompatibilityFocusTraversalPolicy.class b/libjava/classpath/lib/javax/swing/CompatibilityFocusTraversalPolicy.class
deleted file mode 100644
index ddfc8d650dd..00000000000
--- a/libjava/classpath/lib/javax/swing/CompatibilityFocusTraversalPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ComponentInputMap.class b/libjava/classpath/lib/javax/swing/ComponentInputMap.class
deleted file mode 100644
index d096b1281bd..00000000000
--- a/libjava/classpath/lib/javax/swing/ComponentInputMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DebugGraphics.class b/libjava/classpath/lib/javax/swing/DebugGraphics.class
deleted file mode 100644
index 9534faf8694..00000000000
--- a/libjava/classpath/lib/javax/swing/DebugGraphics.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultBoundedRangeModel.class b/libjava/classpath/lib/javax/swing/DefaultBoundedRangeModel.class
deleted file mode 100644
index a24281d3802..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultBoundedRangeModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultButtonModel.class b/libjava/classpath/lib/javax/swing/DefaultButtonModel.class
deleted file mode 100644
index dca5b10f024..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultButtonModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultCellEditor$EditorDelegate.class b/libjava/classpath/lib/javax/swing/DefaultCellEditor$EditorDelegate.class
deleted file mode 100644
index 626f1fdf787..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultCellEditor$EditorDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultCellEditor$JCheckBoxDelegate.class b/libjava/classpath/lib/javax/swing/DefaultCellEditor$JCheckBoxDelegate.class
deleted file mode 100644
index db05a1f026a..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultCellEditor$JCheckBoxDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultCellEditor$JComboBoxDelegate.class b/libjava/classpath/lib/javax/swing/DefaultCellEditor$JComboBoxDelegate.class
deleted file mode 100644
index db5727c3aec..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultCellEditor$JComboBoxDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultCellEditor$JTextFieldDelegate.class b/libjava/classpath/lib/javax/swing/DefaultCellEditor$JTextFieldDelegate.class
deleted file mode 100644
index 55ba84034ed..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultCellEditor$JTextFieldDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultCellEditor.class b/libjava/classpath/lib/javax/swing/DefaultCellEditor.class
deleted file mode 100644
index 3c842bc6af1..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultCellEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultComboBoxModel.class b/libjava/classpath/lib/javax/swing/DefaultComboBoxModel.class
deleted file mode 100644
index 5c9277d2c79..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultComboBoxModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultDesktopManager.class b/libjava/classpath/lib/javax/swing/DefaultDesktopManager.class
deleted file mode 100644
index c5202be5dca..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultDesktopManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultFocusManager.class b/libjava/classpath/lib/javax/swing/DefaultFocusManager.class
deleted file mode 100644
index 95670804cd5..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultFocusManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultListCellRenderer$UIResource.class b/libjava/classpath/lib/javax/swing/DefaultListCellRenderer$UIResource.class
deleted file mode 100644
index 9ef635ccad8..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultListCellRenderer$UIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultListCellRenderer.class b/libjava/classpath/lib/javax/swing/DefaultListCellRenderer.class
deleted file mode 100644
index 83f1ad19534..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultListCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultListModel.class b/libjava/classpath/lib/javax/swing/DefaultListModel.class
deleted file mode 100644
index 54dc30cc4ec..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultListModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultListSelectionModel.class b/libjava/classpath/lib/javax/swing/DefaultListSelectionModel.class
deleted file mode 100644
index 00e889a2343..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultListSelectionModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DefaultSingleSelectionModel.class b/libjava/classpath/lib/javax/swing/DefaultSingleSelectionModel.class
deleted file mode 100644
index bb97ffc6050..00000000000
--- a/libjava/classpath/lib/javax/swing/DefaultSingleSelectionModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/DesktopManager.class b/libjava/classpath/lib/javax/swing/DesktopManager.class
deleted file mode 100644
index 683d8ef5f0e..00000000000
--- a/libjava/classpath/lib/javax/swing/DesktopManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/FocusManager$WrappingFocusManager.class b/libjava/classpath/lib/javax/swing/FocusManager$WrappingFocusManager.class
deleted file mode 100644
index ec7de01f39e..00000000000
--- a/libjava/classpath/lib/javax/swing/FocusManager$WrappingFocusManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/FocusManager.class b/libjava/classpath/lib/javax/swing/FocusManager.class
deleted file mode 100644
index b7488db7fa6..00000000000
--- a/libjava/classpath/lib/javax/swing/FocusManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/GrayFilter.class b/libjava/classpath/lib/javax/swing/GrayFilter.class
deleted file mode 100644
index 0aaa03ba9b3..00000000000
--- a/libjava/classpath/lib/javax/swing/GrayFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Icon.class b/libjava/classpath/lib/javax/swing/Icon.class
deleted file mode 100644
index 8386bf820d8..00000000000
--- a/libjava/classpath/lib/javax/swing/Icon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ImageIcon$1.class b/libjava/classpath/lib/javax/swing/ImageIcon$1.class
deleted file mode 100644
index 96518d938e6..00000000000
--- a/libjava/classpath/lib/javax/swing/ImageIcon$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ImageIcon$AccessibleImageIcon.class b/libjava/classpath/lib/javax/swing/ImageIcon$AccessibleImageIcon.class
deleted file mode 100644
index e4cb57cf0af..00000000000
--- a/libjava/classpath/lib/javax/swing/ImageIcon$AccessibleImageIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ImageIcon.class b/libjava/classpath/lib/javax/swing/ImageIcon.class
deleted file mode 100644
index 337e4046424..00000000000
--- a/libjava/classpath/lib/javax/swing/ImageIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/InputMap.class b/libjava/classpath/lib/javax/swing/InputMap.class
deleted file mode 100644
index 96dbcbf3559..00000000000
--- a/libjava/classpath/lib/javax/swing/InputMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/InputVerifier.class b/libjava/classpath/lib/javax/swing/InputVerifier.class
deleted file mode 100644
index c870f7361c4..00000000000
--- a/libjava/classpath/lib/javax/swing/InputVerifier.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/InternalFrameFocusTraversalPolicy.class b/libjava/classpath/lib/javax/swing/InternalFrameFocusTraversalPolicy.class
deleted file mode 100644
index 7bef033ee96..00000000000
--- a/libjava/classpath/lib/javax/swing/InternalFrameFocusTraversalPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JApplet$AccessibleJApplet.class b/libjava/classpath/lib/javax/swing/JApplet$AccessibleJApplet.class
deleted file mode 100644
index cce1a78a3a7..00000000000
--- a/libjava/classpath/lib/javax/swing/JApplet$AccessibleJApplet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JApplet.class b/libjava/classpath/lib/javax/swing/JApplet.class
deleted file mode 100644
index dedd9a3f43a..00000000000
--- a/libjava/classpath/lib/javax/swing/JApplet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JButton$AccessibleJButton.class b/libjava/classpath/lib/javax/swing/JButton$AccessibleJButton.class
deleted file mode 100644
index 1a4d39ed305..00000000000
--- a/libjava/classpath/lib/javax/swing/JButton$AccessibleJButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JButton.class b/libjava/classpath/lib/javax/swing/JButton.class
deleted file mode 100644
index e58fa255390..00000000000
--- a/libjava/classpath/lib/javax/swing/JButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JCheckBox$AccessibleJCheckBox.class b/libjava/classpath/lib/javax/swing/JCheckBox$AccessibleJCheckBox.class
deleted file mode 100644
index 12a30d9b03c..00000000000
--- a/libjava/classpath/lib/javax/swing/JCheckBox$AccessibleJCheckBox.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JCheckBox.class b/libjava/classpath/lib/javax/swing/JCheckBox.class
deleted file mode 100644
index f1e5047c61f..00000000000
--- a/libjava/classpath/lib/javax/swing/JCheckBox.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.class b/libjava/classpath/lib/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.class
deleted file mode 100644
index cff8ca29dc0..00000000000
--- a/libjava/classpath/lib/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JCheckBoxMenuItem.class b/libjava/classpath/lib/javax/swing/JCheckBoxMenuItem.class
deleted file mode 100644
index 61aa5dac733..00000000000
--- a/libjava/classpath/lib/javax/swing/JCheckBoxMenuItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JColorChooser$AccessibleJColorChooser.class b/libjava/classpath/lib/javax/swing/JColorChooser$AccessibleJColorChooser.class
deleted file mode 100644
index f99ba9800c5..00000000000
--- a/libjava/classpath/lib/javax/swing/JColorChooser$AccessibleJColorChooser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JColorChooser$DefaultOKCancelListener.class b/libjava/classpath/lib/javax/swing/JColorChooser$DefaultOKCancelListener.class
deleted file mode 100644
index dfb2da1521d..00000000000
--- a/libjava/classpath/lib/javax/swing/JColorChooser$DefaultOKCancelListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JColorChooser$DefaultResetListener.class b/libjava/classpath/lib/javax/swing/JColorChooser$DefaultResetListener.class
deleted file mode 100644
index 046775252a8..00000000000
--- a/libjava/classpath/lib/javax/swing/JColorChooser$DefaultResetListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JColorChooser.class b/libjava/classpath/lib/javax/swing/JColorChooser.class
deleted file mode 100644
index 671cfca567e..00000000000
--- a/libjava/classpath/lib/javax/swing/JColorChooser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComboBox$1.class b/libjava/classpath/lib/javax/swing/JComboBox$1.class
deleted file mode 100644
index bf89068bc0c..00000000000
--- a/libjava/classpath/lib/javax/swing/JComboBox$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComboBox$AccessibleJComboBox.class b/libjava/classpath/lib/javax/swing/JComboBox$AccessibleJComboBox.class
deleted file mode 100644
index a5dadd997d4..00000000000
--- a/libjava/classpath/lib/javax/swing/JComboBox$AccessibleJComboBox.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComboBox$DefaultKeySelectionManager.class b/libjava/classpath/lib/javax/swing/JComboBox$DefaultKeySelectionManager.class
deleted file mode 100644
index 6e3691d137b..00000000000
--- a/libjava/classpath/lib/javax/swing/JComboBox$DefaultKeySelectionManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComboBox$KeySelectionManager.class b/libjava/classpath/lib/javax/swing/JComboBox$KeySelectionManager.class
deleted file mode 100644
index d0cc93a6898..00000000000
--- a/libjava/classpath/lib/javax/swing/JComboBox$KeySelectionManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComboBox.class b/libjava/classpath/lib/javax/swing/JComboBox.class
deleted file mode 100644
index 503032ee53d..00000000000
--- a/libjava/classpath/lib/javax/swing/JComboBox.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComponent$1.class b/libjava/classpath/lib/javax/swing/JComponent$1.class
deleted file mode 100644
index 93aa102eee7..00000000000
--- a/libjava/classpath/lib/javax/swing/JComponent$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.class b/libjava/classpath/lib/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.class
deleted file mode 100644
index e3ff2403e64..00000000000
--- a/libjava/classpath/lib/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.class b/libjava/classpath/lib/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.class
deleted file mode 100644
index 04ef17a8bd7..00000000000
--- a/libjava/classpath/lib/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComponent$AccessibleJComponent.class b/libjava/classpath/lib/javax/swing/JComponent$AccessibleJComponent.class
deleted file mode 100644
index 3369abda0da..00000000000
--- a/libjava/classpath/lib/javax/swing/JComponent$AccessibleJComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComponent$ActionListenerProxy.class b/libjava/classpath/lib/javax/swing/JComponent$ActionListenerProxy.class
deleted file mode 100644
index de03869e5a5..00000000000
--- a/libjava/classpath/lib/javax/swing/JComponent$ActionListenerProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JComponent.class b/libjava/classpath/lib/javax/swing/JComponent.class
deleted file mode 100644
index 38faa58d43d..00000000000
--- a/libjava/classpath/lib/javax/swing/JComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JDesktopPane$AccessibleJDesktopPane.class b/libjava/classpath/lib/javax/swing/JDesktopPane$AccessibleJDesktopPane.class
deleted file mode 100644
index 1e391c98412..00000000000
--- a/libjava/classpath/lib/javax/swing/JDesktopPane$AccessibleJDesktopPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JDesktopPane.class b/libjava/classpath/lib/javax/swing/JDesktopPane.class
deleted file mode 100644
index 1796754c8aa..00000000000
--- a/libjava/classpath/lib/javax/swing/JDesktopPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JDialog$AccessibleJDialog.class b/libjava/classpath/lib/javax/swing/JDialog$AccessibleJDialog.class
deleted file mode 100644
index ff7f96fd0b6..00000000000
--- a/libjava/classpath/lib/javax/swing/JDialog$AccessibleJDialog.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JDialog.class b/libjava/classpath/lib/javax/swing/JDialog.class
deleted file mode 100644
index 6490589814b..00000000000
--- a/libjava/classpath/lib/javax/swing/JDialog.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane$1.class b/libjava/classpath/lib/javax/swing/JEditorPane$1.class
deleted file mode 100644
index f4e5adaa8d8..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane$2.class b/libjava/classpath/lib/javax/swing/JEditorPane$2.class
deleted file mode 100644
index 6e31c329939..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane$AccessibleJEditorPane.class b/libjava/classpath/lib/javax/swing/JEditorPane$AccessibleJEditorPane.class
deleted file mode 100644
index 9136bf06ded..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane$AccessibleJEditorPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.class b/libjava/classpath/lib/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.class
deleted file mode 100644
index bad4a42ed97..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane$EditorKitMapping.class b/libjava/classpath/lib/javax/swing/JEditorPane$EditorKitMapping.class
deleted file mode 100644
index 16a82e06934..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane$EditorKitMapping.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.class b/libjava/classpath/lib/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.class
deleted file mode 100644
index 92dbe6c6db0..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.class b/libjava/classpath/lib/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.class
deleted file mode 100644
index d1fdba2ad82..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane$PageLoader.class b/libjava/classpath/lib/javax/swing/JEditorPane$PageLoader.class
deleted file mode 100644
index 46e86e003e5..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane$PageLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane$PageStream.class b/libjava/classpath/lib/javax/swing/JEditorPane$PageStream.class
deleted file mode 100644
index cc7abeff0a3..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane$PageStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane$PlainEditorKit.class b/libjava/classpath/lib/javax/swing/JEditorPane$PlainEditorKit.class
deleted file mode 100644
index 52a08bda450..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane$PlainEditorKit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JEditorPane.class b/libjava/classpath/lib/javax/swing/JEditorPane.class
deleted file mode 100644
index 3bb05c84787..00000000000
--- a/libjava/classpath/lib/javax/swing/JEditorPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JFileChooser$1.class b/libjava/classpath/lib/javax/swing/JFileChooser$1.class
deleted file mode 100644
index c6035233224..00000000000
--- a/libjava/classpath/lib/javax/swing/JFileChooser$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JFileChooser$AccessibleJFileChooser.class b/libjava/classpath/lib/javax/swing/JFileChooser$AccessibleJFileChooser.class
deleted file mode 100644
index 8c821aa49be..00000000000
--- a/libjava/classpath/lib/javax/swing/JFileChooser$AccessibleJFileChooser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JFileChooser.class b/libjava/classpath/lib/javax/swing/JFileChooser.class
deleted file mode 100644
index 4725b19dbb1..00000000000
--- a/libjava/classpath/lib/javax/swing/JFileChooser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JFormattedTextField$AbstractFormatter.class b/libjava/classpath/lib/javax/swing/JFormattedTextField$AbstractFormatter.class
deleted file mode 100644
index 6745dda7b57..00000000000
--- a/libjava/classpath/lib/javax/swing/JFormattedTextField$AbstractFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JFormattedTextField$AbstractFormatterFactory.class b/libjava/classpath/lib/javax/swing/JFormattedTextField$AbstractFormatterFactory.class
deleted file mode 100644
index 8dc1d25b7f9..00000000000
--- a/libjava/classpath/lib/javax/swing/JFormattedTextField$AbstractFormatterFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JFormattedTextField.class b/libjava/classpath/lib/javax/swing/JFormattedTextField.class
deleted file mode 100644
index fb73ee2f557..00000000000
--- a/libjava/classpath/lib/javax/swing/JFormattedTextField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JFrame$AccessibleJFrame.class b/libjava/classpath/lib/javax/swing/JFrame$AccessibleJFrame.class
deleted file mode 100644
index cc23e67728c..00000000000
--- a/libjava/classpath/lib/javax/swing/JFrame$AccessibleJFrame.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JFrame.class b/libjava/classpath/lib/javax/swing/JFrame.class
deleted file mode 100644
index 828e84b040a..00000000000
--- a/libjava/classpath/lib/javax/swing/JFrame.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JInternalFrame$AccessibleJInternalFrame.class b/libjava/classpath/lib/javax/swing/JInternalFrame$AccessibleJInternalFrame.class
deleted file mode 100644
index ca22355cc5e..00000000000
--- a/libjava/classpath/lib/javax/swing/JInternalFrame$AccessibleJInternalFrame.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.class b/libjava/classpath/lib/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.class
deleted file mode 100644
index b449e93a5fc..00000000000
--- a/libjava/classpath/lib/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JInternalFrame$JDesktopIcon.class b/libjava/classpath/lib/javax/swing/JInternalFrame$JDesktopIcon.class
deleted file mode 100644
index 8fac3b0791b..00000000000
--- a/libjava/classpath/lib/javax/swing/JInternalFrame$JDesktopIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JInternalFrame.class b/libjava/classpath/lib/javax/swing/JInternalFrame.class
deleted file mode 100644
index 34e6d3e18dc..00000000000
--- a/libjava/classpath/lib/javax/swing/JInternalFrame.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JLabel$AccessibleJLabel.class b/libjava/classpath/lib/javax/swing/JLabel$AccessibleJLabel.class
deleted file mode 100644
index 8946b03f8ec..00000000000
--- a/libjava/classpath/lib/javax/swing/JLabel$AccessibleJLabel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JLabel.class b/libjava/classpath/lib/javax/swing/JLabel.class
deleted file mode 100644
index 20256d03cd8..00000000000
--- a/libjava/classpath/lib/javax/swing/JLabel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JLayeredPane$AccessibleJLayeredPane.class b/libjava/classpath/lib/javax/swing/JLayeredPane$AccessibleJLayeredPane.class
deleted file mode 100644
index 1e46eb03c81..00000000000
--- a/libjava/classpath/lib/javax/swing/JLayeredPane$AccessibleJLayeredPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JLayeredPane.class b/libjava/classpath/lib/javax/swing/JLayeredPane.class
deleted file mode 100644
index 6580cd0ded9..00000000000
--- a/libjava/classpath/lib/javax/swing/JLayeredPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JList$1.class b/libjava/classpath/lib/javax/swing/JList$1.class
deleted file mode 100644
index 42fb0c50324..00000000000
--- a/libjava/classpath/lib/javax/swing/JList$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JList$2.class b/libjava/classpath/lib/javax/swing/JList$2.class
deleted file mode 100644
index ab9936f9b34..00000000000
--- a/libjava/classpath/lib/javax/swing/JList$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JList$3.class b/libjava/classpath/lib/javax/swing/JList$3.class
deleted file mode 100644
index 26127d16446..00000000000
--- a/libjava/classpath/lib/javax/swing/JList$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JList$AccessibleJList$AccessibleJListChild.class b/libjava/classpath/lib/javax/swing/JList$AccessibleJList$AccessibleJListChild.class
deleted file mode 100644
index 31d2c948003..00000000000
--- a/libjava/classpath/lib/javax/swing/JList$AccessibleJList$AccessibleJListChild.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JList$AccessibleJList.class b/libjava/classpath/lib/javax/swing/JList$AccessibleJList.class
deleted file mode 100644
index c59bd511a0b..00000000000
--- a/libjava/classpath/lib/javax/swing/JList$AccessibleJList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JList$ListListener.class b/libjava/classpath/lib/javax/swing/JList$ListListener.class
deleted file mode 100644
index 3a77f552318..00000000000
--- a/libjava/classpath/lib/javax/swing/JList$ListListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JList.class b/libjava/classpath/lib/javax/swing/JList.class
deleted file mode 100644
index c2bfb22c23d..00000000000
--- a/libjava/classpath/lib/javax/swing/JList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JMenu$AccessibleJMenu.class b/libjava/classpath/lib/javax/swing/JMenu$AccessibleJMenu.class
deleted file mode 100644
index ed7ce854701..00000000000
--- a/libjava/classpath/lib/javax/swing/JMenu$AccessibleJMenu.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JMenu$ActionChangedListener.class b/libjava/classpath/lib/javax/swing/JMenu$ActionChangedListener.class
deleted file mode 100644
index c26366f2e5c..00000000000
--- a/libjava/classpath/lib/javax/swing/JMenu$ActionChangedListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JMenu$MenuChangeListener.class b/libjava/classpath/lib/javax/swing/JMenu$MenuChangeListener.class
deleted file mode 100644
index 87bc69e1f72..00000000000
--- a/libjava/classpath/lib/javax/swing/JMenu$MenuChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JMenu$WinListener.class b/libjava/classpath/lib/javax/swing/JMenu$WinListener.class
deleted file mode 100644
index 9165f7253c7..00000000000
--- a/libjava/classpath/lib/javax/swing/JMenu$WinListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JMenu.class b/libjava/classpath/lib/javax/swing/JMenu.class
deleted file mode 100644
index a9048b4d7a9..00000000000
--- a/libjava/classpath/lib/javax/swing/JMenu.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JMenuBar$AccessibleJMenuBar.class b/libjava/classpath/lib/javax/swing/JMenuBar$AccessibleJMenuBar.class
deleted file mode 100644
index e18ea98b571..00000000000
--- a/libjava/classpath/lib/javax/swing/JMenuBar$AccessibleJMenuBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JMenuBar.class b/libjava/classpath/lib/javax/swing/JMenuBar.class
deleted file mode 100644
index 92fb6702672..00000000000
--- a/libjava/classpath/lib/javax/swing/JMenuBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JMenuItem$1.class b/libjava/classpath/lib/javax/swing/JMenuItem$1.class
deleted file mode 100644
index bdbf0198d2d..00000000000
--- a/libjava/classpath/lib/javax/swing/JMenuItem$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JMenuItem$AccessibleJMenuItem.class b/libjava/classpath/lib/javax/swing/JMenuItem$AccessibleJMenuItem.class
deleted file mode 100644
index 53d942cc2d5..00000000000
--- a/libjava/classpath/lib/javax/swing/JMenuItem$AccessibleJMenuItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JMenuItem.class b/libjava/classpath/lib/javax/swing/JMenuItem.class
deleted file mode 100644
index 40ea604e64d..00000000000
--- a/libjava/classpath/lib/javax/swing/JMenuItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JOptionPane$1.class b/libjava/classpath/lib/javax/swing/JOptionPane$1.class
deleted file mode 100644
index ab081131f05..00000000000
--- a/libjava/classpath/lib/javax/swing/JOptionPane$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JOptionPane$2.class b/libjava/classpath/lib/javax/swing/JOptionPane$2.class
deleted file mode 100644
index 0e91f40a8c3..00000000000
--- a/libjava/classpath/lib/javax/swing/JOptionPane$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JOptionPane$AccessibleJOptionPane.class b/libjava/classpath/lib/javax/swing/JOptionPane$AccessibleJOptionPane.class
deleted file mode 100644
index 862460639ce..00000000000
--- a/libjava/classpath/lib/javax/swing/JOptionPane$AccessibleJOptionPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JOptionPane$ValuePropertyHandler.class b/libjava/classpath/lib/javax/swing/JOptionPane$ValuePropertyHandler.class
deleted file mode 100644
index 1204e5cc638..00000000000
--- a/libjava/classpath/lib/javax/swing/JOptionPane$ValuePropertyHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JOptionPane.class b/libjava/classpath/lib/javax/swing/JOptionPane.class
deleted file mode 100644
index 1361ece20f8..00000000000
--- a/libjava/classpath/lib/javax/swing/JOptionPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JPanel$AccessibleJPanel.class b/libjava/classpath/lib/javax/swing/JPanel$AccessibleJPanel.class
deleted file mode 100644
index bf150651cb7..00000000000
--- a/libjava/classpath/lib/javax/swing/JPanel$AccessibleJPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JPanel.class b/libjava/classpath/lib/javax/swing/JPanel.class
deleted file mode 100644
index 3327f966c07..00000000000
--- a/libjava/classpath/lib/javax/swing/JPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JPasswordField$AccessibleJPasswordField.class b/libjava/classpath/lib/javax/swing/JPasswordField$AccessibleJPasswordField.class
deleted file mode 100644
index ed73312d512..00000000000
--- a/libjava/classpath/lib/javax/swing/JPasswordField$AccessibleJPasswordField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JPasswordField.class b/libjava/classpath/lib/javax/swing/JPasswordField.class
deleted file mode 100644
index 98f7e241bd3..00000000000
--- a/libjava/classpath/lib/javax/swing/JPasswordField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JPopupMenu$1.class b/libjava/classpath/lib/javax/swing/JPopupMenu$1.class
deleted file mode 100644
index f1856f1b860..00000000000
--- a/libjava/classpath/lib/javax/swing/JPopupMenu$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JPopupMenu$2.class b/libjava/classpath/lib/javax/swing/JPopupMenu$2.class
deleted file mode 100644
index 4aae7a1c3ae..00000000000
--- a/libjava/classpath/lib/javax/swing/JPopupMenu$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JPopupMenu$AccessibleJPopupMenu.class b/libjava/classpath/lib/javax/swing/JPopupMenu$AccessibleJPopupMenu.class
deleted file mode 100644
index c54d3c7531a..00000000000
--- a/libjava/classpath/lib/javax/swing/JPopupMenu$AccessibleJPopupMenu.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JPopupMenu$ActionChangeListener.class b/libjava/classpath/lib/javax/swing/JPopupMenu$ActionChangeListener.class
deleted file mode 100644
index 0699c204b9c..00000000000
--- a/libjava/classpath/lib/javax/swing/JPopupMenu$ActionChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JPopupMenu$Separator.class b/libjava/classpath/lib/javax/swing/JPopupMenu$Separator.class
deleted file mode 100644
index 30e53542570..00000000000
--- a/libjava/classpath/lib/javax/swing/JPopupMenu$Separator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JPopupMenu.class b/libjava/classpath/lib/javax/swing/JPopupMenu.class
deleted file mode 100644
index 37103a576a8..00000000000
--- a/libjava/classpath/lib/javax/swing/JPopupMenu.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JProgressBar$1.class b/libjava/classpath/lib/javax/swing/JProgressBar$1.class
deleted file mode 100644
index cb2dd14d1a9..00000000000
--- a/libjava/classpath/lib/javax/swing/JProgressBar$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JProgressBar$AccessibleJProgressBar.class b/libjava/classpath/lib/javax/swing/JProgressBar$AccessibleJProgressBar.class
deleted file mode 100644
index f6b14bd6e7e..00000000000
--- a/libjava/classpath/lib/javax/swing/JProgressBar$AccessibleJProgressBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JProgressBar.class b/libjava/classpath/lib/javax/swing/JProgressBar.class
deleted file mode 100644
index 2ccf5e6bb7f..00000000000
--- a/libjava/classpath/lib/javax/swing/JProgressBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JRadioButton$AccessibleJRadioButton.class b/libjava/classpath/lib/javax/swing/JRadioButton$AccessibleJRadioButton.class
deleted file mode 100644
index 00524ec2e5c..00000000000
--- a/libjava/classpath/lib/javax/swing/JRadioButton$AccessibleJRadioButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JRadioButton.class b/libjava/classpath/lib/javax/swing/JRadioButton.class
deleted file mode 100644
index 027ac9eeedb..00000000000
--- a/libjava/classpath/lib/javax/swing/JRadioButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.class b/libjava/classpath/lib/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.class
deleted file mode 100644
index ff2f31ef7c5..00000000000
--- a/libjava/classpath/lib/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JRadioButtonMenuItem.class b/libjava/classpath/lib/javax/swing/JRadioButtonMenuItem.class
deleted file mode 100644
index db31f6240d0..00000000000
--- a/libjava/classpath/lib/javax/swing/JRadioButtonMenuItem.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JRootPane$AccessibleJRootPane.class b/libjava/classpath/lib/javax/swing/JRootPane$AccessibleJRootPane.class
deleted file mode 100644
index d6aec0e9edf..00000000000
--- a/libjava/classpath/lib/javax/swing/JRootPane$AccessibleJRootPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JRootPane$RootLayout.class b/libjava/classpath/lib/javax/swing/JRootPane$RootLayout.class
deleted file mode 100644
index 380fda2cf75..00000000000
--- a/libjava/classpath/lib/javax/swing/JRootPane$RootLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JRootPane.class b/libjava/classpath/lib/javax/swing/JRootPane.class
deleted file mode 100644
index c1d0917111d..00000000000
--- a/libjava/classpath/lib/javax/swing/JRootPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JScrollBar$AccessibleJScrollBar.class b/libjava/classpath/lib/javax/swing/JScrollBar$AccessibleJScrollBar.class
deleted file mode 100644
index c5d0e5522fc..00000000000
--- a/libjava/classpath/lib/javax/swing/JScrollBar$AccessibleJScrollBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JScrollBar$ScrollBarChangeListener.class b/libjava/classpath/lib/javax/swing/JScrollBar$ScrollBarChangeListener.class
deleted file mode 100644
index e102fcbbd7b..00000000000
--- a/libjava/classpath/lib/javax/swing/JScrollBar$ScrollBarChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JScrollBar.class b/libjava/classpath/lib/javax/swing/JScrollBar.class
deleted file mode 100644
index 050a5d2619f..00000000000
--- a/libjava/classpath/lib/javax/swing/JScrollBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JScrollPane$AccessibleJScrollPane.class b/libjava/classpath/lib/javax/swing/JScrollPane$AccessibleJScrollPane.class
deleted file mode 100644
index 98f6a303b70..00000000000
--- a/libjava/classpath/lib/javax/swing/JScrollPane$AccessibleJScrollPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JScrollPane$ScrollBar.class b/libjava/classpath/lib/javax/swing/JScrollPane$ScrollBar.class
deleted file mode 100644
index 572bdb0a178..00000000000
--- a/libjava/classpath/lib/javax/swing/JScrollPane$ScrollBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JScrollPane.class b/libjava/classpath/lib/javax/swing/JScrollPane.class
deleted file mode 100644
index 6bd9efaa866..00000000000
--- a/libjava/classpath/lib/javax/swing/JScrollPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSeparator$AccessibleJSeparator.class b/libjava/classpath/lib/javax/swing/JSeparator$AccessibleJSeparator.class
deleted file mode 100644
index a1cf17fecfb..00000000000
--- a/libjava/classpath/lib/javax/swing/JSeparator$AccessibleJSeparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSeparator.class b/libjava/classpath/lib/javax/swing/JSeparator.class
deleted file mode 100644
index 31e7ffbfc8c..00000000000
--- a/libjava/classpath/lib/javax/swing/JSeparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSlider$1.class b/libjava/classpath/lib/javax/swing/JSlider$1.class
deleted file mode 100644
index 18fdf59abbf..00000000000
--- a/libjava/classpath/lib/javax/swing/JSlider$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSlider$AccessibleJSlider.class b/libjava/classpath/lib/javax/swing/JSlider$AccessibleJSlider.class
deleted file mode 100644
index fe64eba7ba0..00000000000
--- a/libjava/classpath/lib/javax/swing/JSlider$AccessibleJSlider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSlider$LabelUIResource.class b/libjava/classpath/lib/javax/swing/JSlider$LabelUIResource.class
deleted file mode 100644
index 7019accc2c7..00000000000
--- a/libjava/classpath/lib/javax/swing/JSlider$LabelUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSlider.class b/libjava/classpath/lib/javax/swing/JSlider.class
deleted file mode 100644
index 81904b2f71c..00000000000
--- a/libjava/classpath/lib/javax/swing/JSlider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSpinner$DateEditor.class b/libjava/classpath/lib/javax/swing/JSpinner$DateEditor.class
deleted file mode 100644
index f0f5617206a..00000000000
--- a/libjava/classpath/lib/javax/swing/JSpinner$DateEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSpinner$DateEditorFormatter.class b/libjava/classpath/lib/javax/swing/JSpinner$DateEditorFormatter.class
deleted file mode 100644
index 52508b0d909..00000000000
--- a/libjava/classpath/lib/javax/swing/JSpinner$DateEditorFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSpinner$DefaultEditor.class b/libjava/classpath/lib/javax/swing/JSpinner$DefaultEditor.class
deleted file mode 100644
index e3b9c503c71..00000000000
--- a/libjava/classpath/lib/javax/swing/JSpinner$DefaultEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSpinner$ListEditor.class b/libjava/classpath/lib/javax/swing/JSpinner$ListEditor.class
deleted file mode 100644
index 677b39c25dc..00000000000
--- a/libjava/classpath/lib/javax/swing/JSpinner$ListEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSpinner$ModelListener.class b/libjava/classpath/lib/javax/swing/JSpinner$ModelListener.class
deleted file mode 100644
index 4689a7f67a8..00000000000
--- a/libjava/classpath/lib/javax/swing/JSpinner$ModelListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSpinner$NumberEditor.class b/libjava/classpath/lib/javax/swing/JSpinner$NumberEditor.class
deleted file mode 100644
index 4d9733fcda7..00000000000
--- a/libjava/classpath/lib/javax/swing/JSpinner$NumberEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSpinner$NumberEditorFormatter.class b/libjava/classpath/lib/javax/swing/JSpinner$NumberEditorFormatter.class
deleted file mode 100644
index 279d6ca751f..00000000000
--- a/libjava/classpath/lib/javax/swing/JSpinner$NumberEditorFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSpinner.class b/libjava/classpath/lib/javax/swing/JSpinner.class
deleted file mode 100644
index ac2ecb6c5f3..00000000000
--- a/libjava/classpath/lib/javax/swing/JSpinner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSplitPane$AccessibleJSplitPane.class b/libjava/classpath/lib/javax/swing/JSplitPane$AccessibleJSplitPane.class
deleted file mode 100644
index 3e37bf659e3..00000000000
--- a/libjava/classpath/lib/javax/swing/JSplitPane$AccessibleJSplitPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JSplitPane.class b/libjava/classpath/lib/javax/swing/JSplitPane.class
deleted file mode 100644
index 2e9fff044f6..00000000000
--- a/libjava/classpath/lib/javax/swing/JSplitPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTabbedPane$AccessibleJTabbedPane.class b/libjava/classpath/lib/javax/swing/JTabbedPane$AccessibleJTabbedPane.class
deleted file mode 100644
index 4ea0de1df13..00000000000
--- a/libjava/classpath/lib/javax/swing/JTabbedPane$AccessibleJTabbedPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTabbedPane$ModelListener.class b/libjava/classpath/lib/javax/swing/JTabbedPane$ModelListener.class
deleted file mode 100644
index 5b8d73e5151..00000000000
--- a/libjava/classpath/lib/javax/swing/JTabbedPane$ModelListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTabbedPane$Page.class b/libjava/classpath/lib/javax/swing/JTabbedPane$Page.class
deleted file mode 100644
index e28c57d62a9..00000000000
--- a/libjava/classpath/lib/javax/swing/JTabbedPane$Page.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTabbedPane.class b/libjava/classpath/lib/javax/swing/JTabbedPane.class
deleted file mode 100644
index efd54431204..00000000000
--- a/libjava/classpath/lib/javax/swing/JTabbedPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.class b/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.class
deleted file mode 100644
index 25959aadd64..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.class b/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.class
deleted file mode 100644
index 97ff047d2a4..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.class b/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.class
deleted file mode 100644
index b6c6dc1803c..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.class b/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.class
deleted file mode 100644
index 7448b71d771..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable.class b/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable.class
deleted file mode 100644
index 399752fdb0f..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$AccessibleJTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$BooleanCellRenderer.class b/libjava/classpath/lib/javax/swing/JTable$BooleanCellRenderer.class
deleted file mode 100644
index 5ec5ad8710e..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$BooleanCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$DateCellRenderer.class b/libjava/classpath/lib/javax/swing/JTable$DateCellRenderer.class
deleted file mode 100644
index d9c191ee6b3..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$DateCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$DoubleCellRenderer.class b/libjava/classpath/lib/javax/swing/JTable$DoubleCellRenderer.class
deleted file mode 100644
index 396d1d6ee23..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$DoubleCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$FloatCellRenderer.class b/libjava/classpath/lib/javax/swing/JTable$FloatCellRenderer.class
deleted file mode 100644
index fe32e21431c..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$FloatCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$IconCellRenderer.class b/libjava/classpath/lib/javax/swing/JTable$IconCellRenderer.class
deleted file mode 100644
index 40cf73d5976..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$IconCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$NumberCellRenderer.class b/libjava/classpath/lib/javax/swing/JTable$NumberCellRenderer.class
deleted file mode 100644
index d1897beeb1d..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$NumberCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$TableColumnPropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/JTable$TableColumnPropertyChangeHandler.class
deleted file mode 100644
index 644cb82cf98..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$TableColumnPropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable$TableTextField.class b/libjava/classpath/lib/javax/swing/JTable$TableTextField.class
deleted file mode 100644
index cf5a5f50eb8..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable$TableTextField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTable.class b/libjava/classpath/lib/javax/swing/JTable.class
deleted file mode 100644
index 315e368ff14..00000000000
--- a/libjava/classpath/lib/javax/swing/JTable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTextArea$AccessibleJTextArea.class b/libjava/classpath/lib/javax/swing/JTextArea$AccessibleJTextArea.class
deleted file mode 100644
index eb2cea250c6..00000000000
--- a/libjava/classpath/lib/javax/swing/JTextArea$AccessibleJTextArea.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTextArea.class b/libjava/classpath/lib/javax/swing/JTextArea.class
deleted file mode 100644
index 6ae5aff328f..00000000000
--- a/libjava/classpath/lib/javax/swing/JTextArea.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTextField$1.class b/libjava/classpath/lib/javax/swing/JTextField$1.class
deleted file mode 100644
index e1779a187cc..00000000000
--- a/libjava/classpath/lib/javax/swing/JTextField$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTextField$2.class b/libjava/classpath/lib/javax/swing/JTextField$2.class
deleted file mode 100644
index cc4895b1696..00000000000
--- a/libjava/classpath/lib/javax/swing/JTextField$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTextField$AccessibleJTextField.class b/libjava/classpath/lib/javax/swing/JTextField$AccessibleJTextField.class
deleted file mode 100644
index 82f6f680d3f..00000000000
--- a/libjava/classpath/lib/javax/swing/JTextField$AccessibleJTextField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTextField.class b/libjava/classpath/lib/javax/swing/JTextField.class
deleted file mode 100644
index 70f42e6ff56..00000000000
--- a/libjava/classpath/lib/javax/swing/JTextField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTextPane.class b/libjava/classpath/lib/javax/swing/JTextPane.class
deleted file mode 100644
index d033c8d99ac..00000000000
--- a/libjava/classpath/lib/javax/swing/JTextPane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JToggleButton$AccessibleJToggleButton.class b/libjava/classpath/lib/javax/swing/JToggleButton$AccessibleJToggleButton.class
deleted file mode 100644
index 481d5bd7975..00000000000
--- a/libjava/classpath/lib/javax/swing/JToggleButton$AccessibleJToggleButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JToggleButton$ToggleButtonModel.class b/libjava/classpath/lib/javax/swing/JToggleButton$ToggleButtonModel.class
deleted file mode 100644
index a6c50d9d931..00000000000
--- a/libjava/classpath/lib/javax/swing/JToggleButton$ToggleButtonModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JToggleButton.class b/libjava/classpath/lib/javax/swing/JToggleButton.class
deleted file mode 100644
index 93fc984edf0..00000000000
--- a/libjava/classpath/lib/javax/swing/JToggleButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JToolBar$AccessibleJToolBar.class b/libjava/classpath/lib/javax/swing/JToolBar$AccessibleJToolBar.class
deleted file mode 100644
index 774d4642a9c..00000000000
--- a/libjava/classpath/lib/javax/swing/JToolBar$AccessibleJToolBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JToolBar$DefaultToolBarLayout.class b/libjava/classpath/lib/javax/swing/JToolBar$DefaultToolBarLayout.class
deleted file mode 100644
index 59f1e071601..00000000000
--- a/libjava/classpath/lib/javax/swing/JToolBar$DefaultToolBarLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JToolBar$Separator.class b/libjava/classpath/lib/javax/swing/JToolBar$Separator.class
deleted file mode 100644
index f046b5f0f18..00000000000
--- a/libjava/classpath/lib/javax/swing/JToolBar$Separator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JToolBar.class b/libjava/classpath/lib/javax/swing/JToolBar.class
deleted file mode 100644
index 6a6953bf300..00000000000
--- a/libjava/classpath/lib/javax/swing/JToolBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JToolTip$AccessibleJToolTip.class b/libjava/classpath/lib/javax/swing/JToolTip$AccessibleJToolTip.class
deleted file mode 100644
index 95de6b2b6ec..00000000000
--- a/libjava/classpath/lib/javax/swing/JToolTip$AccessibleJToolTip.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JToolTip.class b/libjava/classpath/lib/javax/swing/JToolTip.class
deleted file mode 100644
index 116ed28ce08..00000000000
--- a/libjava/classpath/lib/javax/swing/JToolTip.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.class b/libjava/classpath/lib/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.class
deleted file mode 100644
index c8135e7a931..00000000000
--- a/libjava/classpath/lib/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTree$AccessibleJTree.class b/libjava/classpath/lib/javax/swing/JTree$AccessibleJTree.class
deleted file mode 100644
index 3422e491fc7..00000000000
--- a/libjava/classpath/lib/javax/swing/JTree$AccessibleJTree.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTree$DynamicUtilTreeNode.class b/libjava/classpath/lib/javax/swing/JTree$DynamicUtilTreeNode.class
deleted file mode 100644
index 07a5163062f..00000000000
--- a/libjava/classpath/lib/javax/swing/JTree$DynamicUtilTreeNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTree$EmptySelectionModel.class b/libjava/classpath/lib/javax/swing/JTree$EmptySelectionModel.class
deleted file mode 100644
index d6f42a94ea2..00000000000
--- a/libjava/classpath/lib/javax/swing/JTree$EmptySelectionModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTree$TreeModelHandler.class b/libjava/classpath/lib/javax/swing/JTree$TreeModelHandler.class
deleted file mode 100644
index b9f253a06ab..00000000000
--- a/libjava/classpath/lib/javax/swing/JTree$TreeModelHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTree$TreeSelectionRedirector.class b/libjava/classpath/lib/javax/swing/JTree$TreeSelectionRedirector.class
deleted file mode 100644
index 282a983d60d..00000000000
--- a/libjava/classpath/lib/javax/swing/JTree$TreeSelectionRedirector.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JTree.class b/libjava/classpath/lib/javax/swing/JTree.class
deleted file mode 100644
index 2570745c895..00000000000
--- a/libjava/classpath/lib/javax/swing/JTree.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JViewport$AccessibleJViewport.class b/libjava/classpath/lib/javax/swing/JViewport$AccessibleJViewport.class
deleted file mode 100644
index 0a8b5376ff6..00000000000
--- a/libjava/classpath/lib/javax/swing/JViewport$AccessibleJViewport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JViewport$ViewListener.class b/libjava/classpath/lib/javax/swing/JViewport$ViewListener.class
deleted file mode 100644
index f00e1d9dbcf..00000000000
--- a/libjava/classpath/lib/javax/swing/JViewport$ViewListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JViewport.class b/libjava/classpath/lib/javax/swing/JViewport.class
deleted file mode 100644
index 9d7a62b6d46..00000000000
--- a/libjava/classpath/lib/javax/swing/JViewport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JWindow$AccessibleJWindow.class b/libjava/classpath/lib/javax/swing/JWindow$AccessibleJWindow.class
deleted file mode 100644
index 02c1613da11..00000000000
--- a/libjava/classpath/lib/javax/swing/JWindow$AccessibleJWindow.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/JWindow.class b/libjava/classpath/lib/javax/swing/JWindow.class
deleted file mode 100644
index c1f07bc37d0..00000000000
--- a/libjava/classpath/lib/javax/swing/JWindow.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/KeyStroke.class b/libjava/classpath/lib/javax/swing/KeyStroke.class
deleted file mode 100644
index 36bea814788..00000000000
--- a/libjava/classpath/lib/javax/swing/KeyStroke.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/KeyboardManager.class b/libjava/classpath/lib/javax/swing/KeyboardManager.class
deleted file mode 100644
index c7605026eb7..00000000000
--- a/libjava/classpath/lib/javax/swing/KeyboardManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.class b/libjava/classpath/lib/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.class
deleted file mode 100644
index 06f7b389c85..00000000000
--- a/libjava/classpath/lib/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/LayoutFocusTraversalPolicy.class b/libjava/classpath/lib/javax/swing/LayoutFocusTraversalPolicy.class
deleted file mode 100644
index 3260ce6e40f..00000000000
--- a/libjava/classpath/lib/javax/swing/LayoutFocusTraversalPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ListCellRenderer.class b/libjava/classpath/lib/javax/swing/ListCellRenderer.class
deleted file mode 100644
index 360e23d39e2..00000000000
--- a/libjava/classpath/lib/javax/swing/ListCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ListModel.class b/libjava/classpath/lib/javax/swing/ListModel.class
deleted file mode 100644
index 63e4dd88fb7..00000000000
--- a/libjava/classpath/lib/javax/swing/ListModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ListSelectionModel.class b/libjava/classpath/lib/javax/swing/ListSelectionModel.class
deleted file mode 100644
index 646ce27b5d1..00000000000
--- a/libjava/classpath/lib/javax/swing/ListSelectionModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/LookAndFeel$1.class b/libjava/classpath/lib/javax/swing/LookAndFeel$1.class
deleted file mode 100644
index ea75ce9c974..00000000000
--- a/libjava/classpath/lib/javax/swing/LookAndFeel$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/LookAndFeel.class b/libjava/classpath/lib/javax/swing/LookAndFeel.class
deleted file mode 100644
index a6324bdc5a5..00000000000
--- a/libjava/classpath/lib/javax/swing/LookAndFeel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/MenuElement.class b/libjava/classpath/lib/javax/swing/MenuElement.class
deleted file mode 100644
index a1f74ae881e..00000000000
--- a/libjava/classpath/lib/javax/swing/MenuElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/MenuSelectionManager.class b/libjava/classpath/lib/javax/swing/MenuSelectionManager.class
deleted file mode 100644
index dd19ae966df..00000000000
--- a/libjava/classpath/lib/javax/swing/MenuSelectionManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/MutableComboBoxModel.class b/libjava/classpath/lib/javax/swing/MutableComboBoxModel.class
deleted file mode 100644
index 9bd0834ce47..00000000000
--- a/libjava/classpath/lib/javax/swing/MutableComboBoxModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/OverlayLayout.class b/libjava/classpath/lib/javax/swing/OverlayLayout.class
deleted file mode 100644
index 36a5ef7bed5..00000000000
--- a/libjava/classpath/lib/javax/swing/OverlayLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Popup$JWindowPopup.class b/libjava/classpath/lib/javax/swing/Popup$JWindowPopup.class
deleted file mode 100644
index 3da22354b67..00000000000
--- a/libjava/classpath/lib/javax/swing/Popup$JWindowPopup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Popup$LightweightPopup.class b/libjava/classpath/lib/javax/swing/Popup$LightweightPopup.class
deleted file mode 100644
index 2b63a0a4280..00000000000
--- a/libjava/classpath/lib/javax/swing/Popup$LightweightPopup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Popup.class b/libjava/classpath/lib/javax/swing/Popup.class
deleted file mode 100644
index f81002f448c..00000000000
--- a/libjava/classpath/lib/javax/swing/Popup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/PopupFactory.class b/libjava/classpath/lib/javax/swing/PopupFactory.class
deleted file mode 100644
index 9058adaec1a..00000000000
--- a/libjava/classpath/lib/javax/swing/PopupFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ProgressMonitor$1.class b/libjava/classpath/lib/javax/swing/ProgressMonitor$1.class
deleted file mode 100644
index 555ce792bef..00000000000
--- a/libjava/classpath/lib/javax/swing/ProgressMonitor$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ProgressMonitor$TimerListener.class b/libjava/classpath/lib/javax/swing/ProgressMonitor$TimerListener.class
deleted file mode 100644
index 7452e05d3f1..00000000000
--- a/libjava/classpath/lib/javax/swing/ProgressMonitor$TimerListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ProgressMonitor.class b/libjava/classpath/lib/javax/swing/ProgressMonitor.class
deleted file mode 100644
index 391ae29249f..00000000000
--- a/libjava/classpath/lib/javax/swing/ProgressMonitor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ProgressMonitorInputStream.class b/libjava/classpath/lib/javax/swing/ProgressMonitorInputStream.class
deleted file mode 100644
index 4eea734ba66..00000000000
--- a/libjava/classpath/lib/javax/swing/ProgressMonitorInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Renderer.class b/libjava/classpath/lib/javax/swing/Renderer.class
deleted file mode 100644
index ab10de9420a..00000000000
--- a/libjava/classpath/lib/javax/swing/Renderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/RepaintManager$RepaintWorker.class b/libjava/classpath/lib/javax/swing/RepaintManager$RepaintWorker.class
deleted file mode 100644
index 25387601917..00000000000
--- a/libjava/classpath/lib/javax/swing/RepaintManager$RepaintWorker.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/RepaintManager$RepaintWorkerEvent.class b/libjava/classpath/lib/javax/swing/RepaintManager$RepaintWorkerEvent.class
deleted file mode 100644
index 17ccff4f009..00000000000
--- a/libjava/classpath/lib/javax/swing/RepaintManager$RepaintWorkerEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/RepaintManager.class b/libjava/classpath/lib/javax/swing/RepaintManager.class
deleted file mode 100644
index d9925f314f9..00000000000
--- a/libjava/classpath/lib/javax/swing/RepaintManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/RootPaneContainer.class b/libjava/classpath/lib/javax/swing/RootPaneContainer.class
deleted file mode 100644
index 86c957ee002..00000000000
--- a/libjava/classpath/lib/javax/swing/RootPaneContainer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ScrollPaneConstants.class b/libjava/classpath/lib/javax/swing/ScrollPaneConstants.class
deleted file mode 100644
index 5d291ad0acd..00000000000
--- a/libjava/classpath/lib/javax/swing/ScrollPaneConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ScrollPaneLayout$UIResource.class b/libjava/classpath/lib/javax/swing/ScrollPaneLayout$UIResource.class
deleted file mode 100644
index de7b6a92838..00000000000
--- a/libjava/classpath/lib/javax/swing/ScrollPaneLayout$UIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ScrollPaneLayout.class b/libjava/classpath/lib/javax/swing/ScrollPaneLayout.class
deleted file mode 100644
index de8d24f263a..00000000000
--- a/libjava/classpath/lib/javax/swing/ScrollPaneLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Scrollable.class b/libjava/classpath/lib/javax/swing/Scrollable.class
deleted file mode 100644
index abfd535f14d..00000000000
--- a/libjava/classpath/lib/javax/swing/Scrollable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SingleSelectionModel.class b/libjava/classpath/lib/javax/swing/SingleSelectionModel.class
deleted file mode 100644
index 4d13386a675..00000000000
--- a/libjava/classpath/lib/javax/swing/SingleSelectionModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SizeRequirements.class b/libjava/classpath/lib/javax/swing/SizeRequirements.class
deleted file mode 100644
index 8c0e5c834f4..00000000000
--- a/libjava/classpath/lib/javax/swing/SizeRequirements.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SizeSequence.class b/libjava/classpath/lib/javax/swing/SizeSequence.class
deleted file mode 100644
index 934e9faaa80..00000000000
--- a/libjava/classpath/lib/javax/swing/SizeSequence.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SortingFocusTraversalPolicy.class b/libjava/classpath/lib/javax/swing/SortingFocusTraversalPolicy.class
deleted file mode 100644
index 1c620d97c20..00000000000
--- a/libjava/classpath/lib/javax/swing/SortingFocusTraversalPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SpinnerDateModel.class b/libjava/classpath/lib/javax/swing/SpinnerDateModel.class
deleted file mode 100644
index c4c8a655ad1..00000000000
--- a/libjava/classpath/lib/javax/swing/SpinnerDateModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SpinnerListModel.class b/libjava/classpath/lib/javax/swing/SpinnerListModel.class
deleted file mode 100644
index 3f686f5be03..00000000000
--- a/libjava/classpath/lib/javax/swing/SpinnerListModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SpinnerModel.class b/libjava/classpath/lib/javax/swing/SpinnerModel.class
deleted file mode 100644
index 57431dc00c8..00000000000
--- a/libjava/classpath/lib/javax/swing/SpinnerModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SpinnerNumberModel.class b/libjava/classpath/lib/javax/swing/SpinnerNumberModel.class
deleted file mode 100644
index aa5e0fc15a3..00000000000
--- a/libjava/classpath/lib/javax/swing/SpinnerNumberModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Spring$1.class b/libjava/classpath/lib/javax/swing/Spring$1.class
deleted file mode 100644
index ad8aedc1619..00000000000
--- a/libjava/classpath/lib/javax/swing/Spring$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Spring$2.class b/libjava/classpath/lib/javax/swing/Spring$2.class
deleted file mode 100644
index f15a83d2911..00000000000
--- a/libjava/classpath/lib/javax/swing/Spring$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Spring$3.class b/libjava/classpath/lib/javax/swing/Spring$3.class
deleted file mode 100644
index 4dd892a5779..00000000000
--- a/libjava/classpath/lib/javax/swing/Spring$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Spring$AddSpring.class b/libjava/classpath/lib/javax/swing/Spring$AddSpring.class
deleted file mode 100644
index f1502eab240..00000000000
--- a/libjava/classpath/lib/javax/swing/Spring$AddSpring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Spring$MaxSpring.class b/libjava/classpath/lib/javax/swing/Spring$MaxSpring.class
deleted file mode 100644
index 9984c511c81..00000000000
--- a/libjava/classpath/lib/javax/swing/Spring$MaxSpring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Spring$MinusSpring.class b/libjava/classpath/lib/javax/swing/Spring$MinusSpring.class
deleted file mode 100644
index 4e0a694841a..00000000000
--- a/libjava/classpath/lib/javax/swing/Spring$MinusSpring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Spring$SimpleSpring.class b/libjava/classpath/lib/javax/swing/Spring$SimpleSpring.class
deleted file mode 100644
index 15cf67f7dfa..00000000000
--- a/libjava/classpath/lib/javax/swing/Spring$SimpleSpring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Spring.class b/libjava/classpath/lib/javax/swing/Spring.class
deleted file mode 100644
index 14b09ee65b9..00000000000
--- a/libjava/classpath/lib/javax/swing/Spring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SpringLayout$Constraints.class b/libjava/classpath/lib/javax/swing/SpringLayout$Constraints.class
deleted file mode 100644
index 39fd462f3bb..00000000000
--- a/libjava/classpath/lib/javax/swing/SpringLayout$Constraints.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SpringLayout$DeferredDimension.class b/libjava/classpath/lib/javax/swing/SpringLayout$DeferredDimension.class
deleted file mode 100644
index 61075d7fc14..00000000000
--- a/libjava/classpath/lib/javax/swing/SpringLayout$DeferredDimension.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SpringLayout$DeferredHeight.class b/libjava/classpath/lib/javax/swing/SpringLayout$DeferredHeight.class
deleted file mode 100644
index 1a1ce923f6b..00000000000
--- a/libjava/classpath/lib/javax/swing/SpringLayout$DeferredHeight.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SpringLayout$DeferredSpring.class b/libjava/classpath/lib/javax/swing/SpringLayout$DeferredSpring.class
deleted file mode 100644
index 882868515cb..00000000000
--- a/libjava/classpath/lib/javax/swing/SpringLayout$DeferredSpring.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SpringLayout$DeferredWidth.class b/libjava/classpath/lib/javax/swing/SpringLayout$DeferredWidth.class
deleted file mode 100644
index 7aa03dbc142..00000000000
--- a/libjava/classpath/lib/javax/swing/SpringLayout$DeferredWidth.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SpringLayout.class b/libjava/classpath/lib/javax/swing/SpringLayout.class
deleted file mode 100644
index 0a6b9880e22..00000000000
--- a/libjava/classpath/lib/javax/swing/SpringLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SwingConstants.class b/libjava/classpath/lib/javax/swing/SwingConstants.class
deleted file mode 100644
index f4dc6706207..00000000000
--- a/libjava/classpath/lib/javax/swing/SwingConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SwingUtilities$OwnerFrame.class b/libjava/classpath/lib/javax/swing/SwingUtilities$OwnerFrame.class
deleted file mode 100644
index 71c8e039550..00000000000
--- a/libjava/classpath/lib/javax/swing/SwingUtilities$OwnerFrame.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/SwingUtilities.class b/libjava/classpath/lib/javax/swing/SwingUtilities.class
deleted file mode 100644
index 756f001dad2..00000000000
--- a/libjava/classpath/lib/javax/swing/SwingUtilities.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Timer$1.class b/libjava/classpath/lib/javax/swing/Timer$1.class
deleted file mode 100644
index e72b779b008..00000000000
--- a/libjava/classpath/lib/javax/swing/Timer$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Timer$Task.class b/libjava/classpath/lib/javax/swing/Timer$Task.class
deleted file mode 100644
index 7924b004b48..00000000000
--- a/libjava/classpath/lib/javax/swing/Timer$Task.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/Timer.class b/libjava/classpath/lib/javax/swing/Timer.class
deleted file mode 100644
index 60201c69dc1..00000000000
--- a/libjava/classpath/lib/javax/swing/Timer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ToolTipManager$insideTimerAction.class b/libjava/classpath/lib/javax/swing/ToolTipManager$insideTimerAction.class
deleted file mode 100644
index 4a034e94610..00000000000
--- a/libjava/classpath/lib/javax/swing/ToolTipManager$insideTimerAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ToolTipManager$outsideTimerAction.class b/libjava/classpath/lib/javax/swing/ToolTipManager$outsideTimerAction.class
deleted file mode 100644
index afff9965983..00000000000
--- a/libjava/classpath/lib/javax/swing/ToolTipManager$outsideTimerAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ToolTipManager$stillInsideTimerAction.class b/libjava/classpath/lib/javax/swing/ToolTipManager$stillInsideTimerAction.class
deleted file mode 100644
index 4ea6dd045c3..00000000000
--- a/libjava/classpath/lib/javax/swing/ToolTipManager$stillInsideTimerAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ToolTipManager.class b/libjava/classpath/lib/javax/swing/ToolTipManager.class
deleted file mode 100644
index 1f1ee99cfe7..00000000000
--- a/libjava/classpath/lib/javax/swing/ToolTipManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/TransferHandler$PropertyTransferable.class b/libjava/classpath/lib/javax/swing/TransferHandler$PropertyTransferable.class
deleted file mode 100644
index 358f741a0cf..00000000000
--- a/libjava/classpath/lib/javax/swing/TransferHandler$PropertyTransferable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/TransferHandler$TransferAction.class b/libjava/classpath/lib/javax/swing/TransferHandler$TransferAction.class
deleted file mode 100644
index 74cf8d1805d..00000000000
--- a/libjava/classpath/lib/javax/swing/TransferHandler$TransferAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/TransferHandler.class b/libjava/classpath/lib/javax/swing/TransferHandler.class
deleted file mode 100644
index edfe4ded48d..00000000000
--- a/libjava/classpath/lib/javax/swing/TransferHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIDefaults$1.class b/libjava/classpath/lib/javax/swing/UIDefaults$1.class
deleted file mode 100644
index 32dea19aa83..00000000000
--- a/libjava/classpath/lib/javax/swing/UIDefaults$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIDefaults$2.class b/libjava/classpath/lib/javax/swing/UIDefaults$2.class
deleted file mode 100644
index 9b29d3d0199..00000000000
--- a/libjava/classpath/lib/javax/swing/UIDefaults$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIDefaults$3.class b/libjava/classpath/lib/javax/swing/UIDefaults$3.class
deleted file mode 100644
index 1179015a6da..00000000000
--- a/libjava/classpath/lib/javax/swing/UIDefaults$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIDefaults$4.class b/libjava/classpath/lib/javax/swing/UIDefaults$4.class
deleted file mode 100644
index 6d6462f7959..00000000000
--- a/libjava/classpath/lib/javax/swing/UIDefaults$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIDefaults$ActiveValue.class b/libjava/classpath/lib/javax/swing/UIDefaults$ActiveValue.class
deleted file mode 100644
index 2decb357fbc..00000000000
--- a/libjava/classpath/lib/javax/swing/UIDefaults$ActiveValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIDefaults$LazyInputMap.class b/libjava/classpath/lib/javax/swing/UIDefaults$LazyInputMap.class
deleted file mode 100644
index 53000f252ad..00000000000
--- a/libjava/classpath/lib/javax/swing/UIDefaults$LazyInputMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIDefaults$LazyValue.class b/libjava/classpath/lib/javax/swing/UIDefaults$LazyValue.class
deleted file mode 100644
index c32e7cdad12..00000000000
--- a/libjava/classpath/lib/javax/swing/UIDefaults$LazyValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIDefaults$ProxyLazyValue.class b/libjava/classpath/lib/javax/swing/UIDefaults$ProxyLazyValue.class
deleted file mode 100644
index 2a054b69942..00000000000
--- a/libjava/classpath/lib/javax/swing/UIDefaults$ProxyLazyValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIDefaults.class b/libjava/classpath/lib/javax/swing/UIDefaults.class
deleted file mode 100644
index e98ebb0aee7..00000000000
--- a/libjava/classpath/lib/javax/swing/UIDefaults.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIManager$LookAndFeelInfo.class b/libjava/classpath/lib/javax/swing/UIManager$LookAndFeelInfo.class
deleted file mode 100644
index e5c53185d6a..00000000000
--- a/libjava/classpath/lib/javax/swing/UIManager$LookAndFeelInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.class b/libjava/classpath/lib/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.class
deleted file mode 100644
index b5d3a363b2e..00000000000
--- a/libjava/classpath/lib/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIManager$MultiplexUIDefaults.class b/libjava/classpath/lib/javax/swing/UIManager$MultiplexUIDefaults.class
deleted file mode 100644
index 287c124b8e9..00000000000
--- a/libjava/classpath/lib/javax/swing/UIManager$MultiplexUIDefaults.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UIManager.class b/libjava/classpath/lib/javax/swing/UIManager.class
deleted file mode 100644
index 2cfeef71fcd..00000000000
--- a/libjava/classpath/lib/javax/swing/UIManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/UnsupportedLookAndFeelException.class b/libjava/classpath/lib/javax/swing/UnsupportedLookAndFeelException.class
deleted file mode 100644
index e449f1fdbae..00000000000
--- a/libjava/classpath/lib/javax/swing/UnsupportedLookAndFeelException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/ViewportLayout.class b/libjava/classpath/lib/javax/swing/ViewportLayout.class
deleted file mode 100644
index 62302458a17..00000000000
--- a/libjava/classpath/lib/javax/swing/ViewportLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/WindowConstants.class b/libjava/classpath/lib/javax/swing/WindowConstants.class
deleted file mode 100644
index 618deb3e545..00000000000
--- a/libjava/classpath/lib/javax/swing/WindowConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/border/AbstractBorder.class b/libjava/classpath/lib/javax/swing/border/AbstractBorder.class
deleted file mode 100644
index 9efcb3d3d33..00000000000
--- a/libjava/classpath/lib/javax/swing/border/AbstractBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/border/BevelBorder.class b/libjava/classpath/lib/javax/swing/border/BevelBorder.class
deleted file mode 100644
index d2aed282c18..00000000000
--- a/libjava/classpath/lib/javax/swing/border/BevelBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/border/Border.class b/libjava/classpath/lib/javax/swing/border/Border.class
deleted file mode 100644
index 8b4d2481f05..00000000000
--- a/libjava/classpath/lib/javax/swing/border/Border.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/border/CompoundBorder.class b/libjava/classpath/lib/javax/swing/border/CompoundBorder.class
deleted file mode 100644
index 82217a91221..00000000000
--- a/libjava/classpath/lib/javax/swing/border/CompoundBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/border/EmptyBorder.class b/libjava/classpath/lib/javax/swing/border/EmptyBorder.class
deleted file mode 100644
index a52e69bcca7..00000000000
--- a/libjava/classpath/lib/javax/swing/border/EmptyBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/border/EtchedBorder.class b/libjava/classpath/lib/javax/swing/border/EtchedBorder.class
deleted file mode 100644
index 8d8546a6028..00000000000
--- a/libjava/classpath/lib/javax/swing/border/EtchedBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/border/LineBorder.class b/libjava/classpath/lib/javax/swing/border/LineBorder.class
deleted file mode 100644
index 795532e5fcd..00000000000
--- a/libjava/classpath/lib/javax/swing/border/LineBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/border/MatteBorder.class b/libjava/classpath/lib/javax/swing/border/MatteBorder.class
deleted file mode 100644
index 5164f1d4bfa..00000000000
--- a/libjava/classpath/lib/javax/swing/border/MatteBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/border/SoftBevelBorder.class b/libjava/classpath/lib/javax/swing/border/SoftBevelBorder.class
deleted file mode 100644
index 7fddbd92369..00000000000
--- a/libjava/classpath/lib/javax/swing/border/SoftBevelBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/border/TitledBorder.class b/libjava/classpath/lib/javax/swing/border/TitledBorder.class
deleted file mode 100644
index 6dc69c08eae..00000000000
--- a/libjava/classpath/lib/javax/swing/border/TitledBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/AbstractColorChooserPanel.class b/libjava/classpath/lib/javax/swing/colorchooser/AbstractColorChooserPanel.class
deleted file mode 100644
index 3fa69f6d7aa..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/AbstractColorChooserPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/ColorChooserComponentFactory.class b/libjava/classpath/lib/javax/swing/colorchooser/ColorChooserComponentFactory.class
deleted file mode 100644
index 5bb8a500df2..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/ColorChooserComponentFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/ColorSelectionModel.class b/libjava/classpath/lib/javax/swing/colorchooser/ColorSelectionModel.class
deleted file mode 100644
index c94ff4992ae..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/ColorSelectionModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultColorSelectionModel.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultColorSelectionModel.class
deleted file mode 100644
index f17a4561ecf..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultColorSelectionModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$1.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$1.class
deleted file mode 100644
index 573204b82d0..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$2.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$2.class
deleted file mode 100644
index 9c3a41fec20..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.class
deleted file mode 100644
index 0d4856f6b82..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.class
deleted file mode 100644
index ce9f6d8f3e8..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.class
deleted file mode 100644
index d492677e53a..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.class
deleted file mode 100644
index 67df592db64..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel.class
deleted file mode 100644
index 98f5b2af8d8..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultHSBChooserPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.class
deleted file mode 100644
index eda8457f94a..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultPreviewPanel.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultPreviewPanel.class
deleted file mode 100644
index 34aef0e5a6f..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultPreviewPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.class
deleted file mode 100644
index 872e5bc8a49..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.class
deleted file mode 100644
index fcc40908952..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultRGBChooserPanel.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultRGBChooserPanel.class
deleted file mode 100644
index 9d217335d72..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultRGBChooserPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.class
deleted file mode 100644
index 156c2e8ca60..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.class
deleted file mode 100644
index 717173ea7a9..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.class
deleted file mode 100644
index 45720185a81..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.class
deleted file mode 100644
index 11a2bad17ae..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.class
deleted file mode 100644
index 313df8e8da9..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.class
deleted file mode 100644
index 897baa18b40..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel.class b/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel.class
deleted file mode 100644
index 3b0537db801..00000000000
--- a/libjava/classpath/lib/javax/swing/colorchooser/DefaultSwatchChooserPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/AncestorEvent.class b/libjava/classpath/lib/javax/swing/event/AncestorEvent.class
deleted file mode 100644
index 3f46cc76c02..00000000000
--- a/libjava/classpath/lib/javax/swing/event/AncestorEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/AncestorListener.class b/libjava/classpath/lib/javax/swing/event/AncestorListener.class
deleted file mode 100644
index b9ca69323a3..00000000000
--- a/libjava/classpath/lib/javax/swing/event/AncestorListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/CaretEvent.class b/libjava/classpath/lib/javax/swing/event/CaretEvent.class
deleted file mode 100644
index 5396a896b99..00000000000
--- a/libjava/classpath/lib/javax/swing/event/CaretEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/CaretListener.class b/libjava/classpath/lib/javax/swing/event/CaretListener.class
deleted file mode 100644
index 73e6ddc5e9e..00000000000
--- a/libjava/classpath/lib/javax/swing/event/CaretListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/CellEditorListener.class b/libjava/classpath/lib/javax/swing/event/CellEditorListener.class
deleted file mode 100644
index 3a7e3fa7542..00000000000
--- a/libjava/classpath/lib/javax/swing/event/CellEditorListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/ChangeEvent.class b/libjava/classpath/lib/javax/swing/event/ChangeEvent.class
deleted file mode 100644
index e1abba568fa..00000000000
--- a/libjava/classpath/lib/javax/swing/event/ChangeEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/ChangeListener.class b/libjava/classpath/lib/javax/swing/event/ChangeListener.class
deleted file mode 100644
index 2f69ff18e38..00000000000
--- a/libjava/classpath/lib/javax/swing/event/ChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/DocumentEvent$ElementChange.class b/libjava/classpath/lib/javax/swing/event/DocumentEvent$ElementChange.class
deleted file mode 100644
index 40efd183841..00000000000
--- a/libjava/classpath/lib/javax/swing/event/DocumentEvent$ElementChange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/DocumentEvent$EventType.class b/libjava/classpath/lib/javax/swing/event/DocumentEvent$EventType.class
deleted file mode 100644
index 456d077abf8..00000000000
--- a/libjava/classpath/lib/javax/swing/event/DocumentEvent$EventType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/DocumentEvent.class b/libjava/classpath/lib/javax/swing/event/DocumentEvent.class
deleted file mode 100644
index 53ef89f83a6..00000000000
--- a/libjava/classpath/lib/javax/swing/event/DocumentEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/DocumentListener.class b/libjava/classpath/lib/javax/swing/event/DocumentListener.class
deleted file mode 100644
index 88438b9613c..00000000000
--- a/libjava/classpath/lib/javax/swing/event/DocumentListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/EventListenerList.class b/libjava/classpath/lib/javax/swing/event/EventListenerList.class
deleted file mode 100644
index d51511eefcc..00000000000
--- a/libjava/classpath/lib/javax/swing/event/EventListenerList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/HyperlinkEvent$EventType.class b/libjava/classpath/lib/javax/swing/event/HyperlinkEvent$EventType.class
deleted file mode 100644
index acfdd0cdc2d..00000000000
--- a/libjava/classpath/lib/javax/swing/event/HyperlinkEvent$EventType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/HyperlinkEvent.class b/libjava/classpath/lib/javax/swing/event/HyperlinkEvent.class
deleted file mode 100644
index c6d30c902f1..00000000000
--- a/libjava/classpath/lib/javax/swing/event/HyperlinkEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/HyperlinkListener.class b/libjava/classpath/lib/javax/swing/event/HyperlinkListener.class
deleted file mode 100644
index 5c988af764e..00000000000
--- a/libjava/classpath/lib/javax/swing/event/HyperlinkListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/InternalFrameAdapter.class b/libjava/classpath/lib/javax/swing/event/InternalFrameAdapter.class
deleted file mode 100644
index cc302960c30..00000000000
--- a/libjava/classpath/lib/javax/swing/event/InternalFrameAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/InternalFrameEvent.class b/libjava/classpath/lib/javax/swing/event/InternalFrameEvent.class
deleted file mode 100644
index 3517e0859b0..00000000000
--- a/libjava/classpath/lib/javax/swing/event/InternalFrameEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/InternalFrameListener.class b/libjava/classpath/lib/javax/swing/event/InternalFrameListener.class
deleted file mode 100644
index c77ebab5671..00000000000
--- a/libjava/classpath/lib/javax/swing/event/InternalFrameListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/ListDataEvent.class b/libjava/classpath/lib/javax/swing/event/ListDataEvent.class
deleted file mode 100644
index f1d5f9bfc6d..00000000000
--- a/libjava/classpath/lib/javax/swing/event/ListDataEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/ListDataListener.class b/libjava/classpath/lib/javax/swing/event/ListDataListener.class
deleted file mode 100644
index 0058a239952..00000000000
--- a/libjava/classpath/lib/javax/swing/event/ListDataListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/ListSelectionEvent.class b/libjava/classpath/lib/javax/swing/event/ListSelectionEvent.class
deleted file mode 100644
index 1804b5bae5a..00000000000
--- a/libjava/classpath/lib/javax/swing/event/ListSelectionEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/ListSelectionListener.class b/libjava/classpath/lib/javax/swing/event/ListSelectionListener.class
deleted file mode 100644
index 95e4f6c6cd5..00000000000
--- a/libjava/classpath/lib/javax/swing/event/ListSelectionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/MenuDragMouseEvent.class b/libjava/classpath/lib/javax/swing/event/MenuDragMouseEvent.class
deleted file mode 100644
index bec6295bbbb..00000000000
--- a/libjava/classpath/lib/javax/swing/event/MenuDragMouseEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/MenuDragMouseListener.class b/libjava/classpath/lib/javax/swing/event/MenuDragMouseListener.class
deleted file mode 100644
index 430e55d7945..00000000000
--- a/libjava/classpath/lib/javax/swing/event/MenuDragMouseListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/MenuEvent.class b/libjava/classpath/lib/javax/swing/event/MenuEvent.class
deleted file mode 100644
index 821bb5a3e56..00000000000
--- a/libjava/classpath/lib/javax/swing/event/MenuEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/MenuKeyEvent.class b/libjava/classpath/lib/javax/swing/event/MenuKeyEvent.class
deleted file mode 100644
index 3967f676fd1..00000000000
--- a/libjava/classpath/lib/javax/swing/event/MenuKeyEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/MenuKeyListener.class b/libjava/classpath/lib/javax/swing/event/MenuKeyListener.class
deleted file mode 100644
index a81b3b79cb4..00000000000
--- a/libjava/classpath/lib/javax/swing/event/MenuKeyListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/MenuListener.class b/libjava/classpath/lib/javax/swing/event/MenuListener.class
deleted file mode 100644
index c38bc23497d..00000000000
--- a/libjava/classpath/lib/javax/swing/event/MenuListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/MouseInputAdapter.class b/libjava/classpath/lib/javax/swing/event/MouseInputAdapter.class
deleted file mode 100644
index 81730354313..00000000000
--- a/libjava/classpath/lib/javax/swing/event/MouseInputAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/MouseInputListener.class b/libjava/classpath/lib/javax/swing/event/MouseInputListener.class
deleted file mode 100644
index 44194745f83..00000000000
--- a/libjava/classpath/lib/javax/swing/event/MouseInputListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/PopupMenuEvent.class b/libjava/classpath/lib/javax/swing/event/PopupMenuEvent.class
deleted file mode 100644
index b9984f96fb0..00000000000
--- a/libjava/classpath/lib/javax/swing/event/PopupMenuEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/PopupMenuListener.class b/libjava/classpath/lib/javax/swing/event/PopupMenuListener.class
deleted file mode 100644
index 54b71aeb285..00000000000
--- a/libjava/classpath/lib/javax/swing/event/PopupMenuListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/SwingPropertyChangeSupport.class b/libjava/classpath/lib/javax/swing/event/SwingPropertyChangeSupport.class
deleted file mode 100644
index cd403b88466..00000000000
--- a/libjava/classpath/lib/javax/swing/event/SwingPropertyChangeSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TableColumnModelEvent.class b/libjava/classpath/lib/javax/swing/event/TableColumnModelEvent.class
deleted file mode 100644
index 4fb4495e568..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TableColumnModelEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TableColumnModelListener.class b/libjava/classpath/lib/javax/swing/event/TableColumnModelListener.class
deleted file mode 100644
index 74c798dfdbf..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TableColumnModelListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TableModelEvent.class b/libjava/classpath/lib/javax/swing/event/TableModelEvent.class
deleted file mode 100644
index c5fa2eefb30..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TableModelEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TableModelListener.class b/libjava/classpath/lib/javax/swing/event/TableModelListener.class
deleted file mode 100644
index 544a0159da8..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TableModelListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TreeExpansionEvent.class b/libjava/classpath/lib/javax/swing/event/TreeExpansionEvent.class
deleted file mode 100644
index 8d73138e867..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TreeExpansionEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TreeExpansionListener.class b/libjava/classpath/lib/javax/swing/event/TreeExpansionListener.class
deleted file mode 100644
index 094ccf36e0e..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TreeExpansionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TreeModelEvent.class b/libjava/classpath/lib/javax/swing/event/TreeModelEvent.class
deleted file mode 100644
index be213ad4529..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TreeModelEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TreeModelListener.class b/libjava/classpath/lib/javax/swing/event/TreeModelListener.class
deleted file mode 100644
index d3578cffe6b..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TreeModelListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TreeSelectionEvent.class b/libjava/classpath/lib/javax/swing/event/TreeSelectionEvent.class
deleted file mode 100644
index ff70bc2582e..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TreeSelectionEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TreeSelectionListener.class b/libjava/classpath/lib/javax/swing/event/TreeSelectionListener.class
deleted file mode 100644
index 38d1382c088..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TreeSelectionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/TreeWillExpandListener.class b/libjava/classpath/lib/javax/swing/event/TreeWillExpandListener.class
deleted file mode 100644
index 30496d93e3a..00000000000
--- a/libjava/classpath/lib/javax/swing/event/TreeWillExpandListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/UndoableEditEvent.class b/libjava/classpath/lib/javax/swing/event/UndoableEditEvent.class
deleted file mode 100644
index 64ca87a9f6f..00000000000
--- a/libjava/classpath/lib/javax/swing/event/UndoableEditEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/event/UndoableEditListener.class b/libjava/classpath/lib/javax/swing/event/UndoableEditListener.class
deleted file mode 100644
index a7cd8486367..00000000000
--- a/libjava/classpath/lib/javax/swing/event/UndoableEditListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/filechooser/FileFilter.class b/libjava/classpath/lib/javax/swing/filechooser/FileFilter.class
deleted file mode 100644
index ae1e44fd288..00000000000
--- a/libjava/classpath/lib/javax/swing/filechooser/FileFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/filechooser/FileSystemView.class b/libjava/classpath/lib/javax/swing/filechooser/FileSystemView.class
deleted file mode 100644
index 93ffd025c04..00000000000
--- a/libjava/classpath/lib/javax/swing/filechooser/FileSystemView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/filechooser/FileView.class b/libjava/classpath/lib/javax/swing/filechooser/FileView.class
deleted file mode 100644
index be08e4701f4..00000000000
--- a/libjava/classpath/lib/javax/swing/filechooser/FileView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/filechooser/UnixFileSystemView.class b/libjava/classpath/lib/javax/swing/filechooser/UnixFileSystemView.class
deleted file mode 100644
index 95e4ca18742..00000000000
--- a/libjava/classpath/lib/javax/swing/filechooser/UnixFileSystemView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ActionMapUIResource.class b/libjava/classpath/lib/javax/swing/plaf/ActionMapUIResource.class
deleted file mode 100644
index db7b6648f14..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ActionMapUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.class b/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.class
deleted file mode 100644
index 44a0d4ccff2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.class b/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.class
deleted file mode 100644
index 0a6576f37ad..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.class b/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.class
deleted file mode 100644
index f458c000345..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.class b/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.class
deleted file mode 100644
index de5aa20b4ec..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$LineBorderUIResource.class b/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$LineBorderUIResource.class
deleted file mode 100644
index 8167c2992a0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$LineBorderUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.class b/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.class
deleted file mode 100644
index bdfcf949f30..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.class b/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.class
deleted file mode 100644
index 08f4ec9e084..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource.class b/libjava/classpath/lib/javax/swing/plaf/BorderUIResource.class
deleted file mode 100644
index 1d6fa8dedb2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/BorderUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ButtonUI.class b/libjava/classpath/lib/javax/swing/plaf/ButtonUI.class
deleted file mode 100644
index 6cf64bd5fc4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ButtonUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ColorChooserUI.class b/libjava/classpath/lib/javax/swing/plaf/ColorChooserUI.class
deleted file mode 100644
index 38759f44153..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ColorChooserUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ColorUIResource.class b/libjava/classpath/lib/javax/swing/plaf/ColorUIResource.class
deleted file mode 100644
index 3a2e13134b1..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ColorUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ComboBoxUI.class b/libjava/classpath/lib/javax/swing/plaf/ComboBoxUI.class
deleted file mode 100644
index e77c6a3ec0c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ComboBoxUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ComponentInputMapUIResource.class b/libjava/classpath/lib/javax/swing/plaf/ComponentInputMapUIResource.class
deleted file mode 100644
index e505fb1cde0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ComponentInputMapUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ComponentUI.class b/libjava/classpath/lib/javax/swing/plaf/ComponentUI.class
deleted file mode 100644
index 0b708025a65..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ComponentUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/DesktopIconUI.class b/libjava/classpath/lib/javax/swing/plaf/DesktopIconUI.class
deleted file mode 100644
index 9165b28c514..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/DesktopIconUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/DesktopPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/DesktopPaneUI.class
deleted file mode 100644
index a044d2b2510..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/DesktopPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/DimensionUIResource.class b/libjava/classpath/lib/javax/swing/plaf/DimensionUIResource.class
deleted file mode 100644
index b79a912db39..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/DimensionUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/FileChooserUI.class b/libjava/classpath/lib/javax/swing/plaf/FileChooserUI.class
deleted file mode 100644
index 64c74274734..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/FileChooserUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/FontUIResource.class b/libjava/classpath/lib/javax/swing/plaf/FontUIResource.class
deleted file mode 100644
index 8ac86b06a94..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/FontUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/IconUIResource.class b/libjava/classpath/lib/javax/swing/plaf/IconUIResource.class
deleted file mode 100644
index 2961df89e34..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/IconUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/InputMapUIResource.class b/libjava/classpath/lib/javax/swing/plaf/InputMapUIResource.class
deleted file mode 100644
index d90c81e4782..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/InputMapUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/InsetsUIResource.class b/libjava/classpath/lib/javax/swing/plaf/InsetsUIResource.class
deleted file mode 100644
index ecc8b8bce80..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/InsetsUIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/InternalFrameUI.class b/libjava/classpath/lib/javax/swing/plaf/InternalFrameUI.class
deleted file mode 100644
index ba683834782..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/InternalFrameUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/LabelUI.class b/libjava/classpath/lib/javax/swing/plaf/LabelUI.class
deleted file mode 100644
index fe823cbfae9..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/LabelUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ListUI.class b/libjava/classpath/lib/javax/swing/plaf/ListUI.class
deleted file mode 100644
index e0ae0e6f1a6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ListUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/MenuBarUI.class b/libjava/classpath/lib/javax/swing/plaf/MenuBarUI.class
deleted file mode 100644
index b4215420151..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/MenuBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/MenuItemUI.class b/libjava/classpath/lib/javax/swing/plaf/MenuItemUI.class
deleted file mode 100644
index f5d1fc6ce97..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/MenuItemUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/OptionPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/OptionPaneUI.class
deleted file mode 100644
index c19b39974fd..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/OptionPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/PanelUI.class b/libjava/classpath/lib/javax/swing/plaf/PanelUI.class
deleted file mode 100644
index a188ac34b48..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/PanelUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/PopupMenuUI.class b/libjava/classpath/lib/javax/swing/plaf/PopupMenuUI.class
deleted file mode 100644
index 9aae8db64df..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/PopupMenuUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ProgressBarUI.class b/libjava/classpath/lib/javax/swing/plaf/ProgressBarUI.class
deleted file mode 100644
index c4b108225b0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ProgressBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/RootPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/RootPaneUI.class
deleted file mode 100644
index 426484ea4f9..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/RootPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ScrollBarUI.class b/libjava/classpath/lib/javax/swing/plaf/ScrollBarUI.class
deleted file mode 100644
index ed1b3f8d953..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ScrollBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ScrollPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/ScrollPaneUI.class
deleted file mode 100644
index 4496630e7e8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ScrollPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/SeparatorUI.class b/libjava/classpath/lib/javax/swing/plaf/SeparatorUI.class
deleted file mode 100644
index 56cb1063da7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/SeparatorUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/SliderUI.class b/libjava/classpath/lib/javax/swing/plaf/SliderUI.class
deleted file mode 100644
index 40e7c5eb639..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/SliderUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/SpinnerUI.class b/libjava/classpath/lib/javax/swing/plaf/SpinnerUI.class
deleted file mode 100644
index 30db423d676..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/SpinnerUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/SplitPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/SplitPaneUI.class
deleted file mode 100644
index a62a5f48d56..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/SplitPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/TabbedPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/TabbedPaneUI.class
deleted file mode 100644
index 75425e9b068..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/TabbedPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/TableHeaderUI.class b/libjava/classpath/lib/javax/swing/plaf/TableHeaderUI.class
deleted file mode 100644
index 77712f6f564..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/TableHeaderUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/TableUI.class b/libjava/classpath/lib/javax/swing/plaf/TableUI.class
deleted file mode 100644
index de0a647c395..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/TableUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/TextUI.class b/libjava/classpath/lib/javax/swing/plaf/TextUI.class
deleted file mode 100644
index 637fa12c0e2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/TextUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ToolBarUI.class b/libjava/classpath/lib/javax/swing/plaf/ToolBarUI.class
deleted file mode 100644
index cb097cda3b3..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ToolBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ToolTipUI.class b/libjava/classpath/lib/javax/swing/plaf/ToolTipUI.class
deleted file mode 100644
index 92d495a82a4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ToolTipUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/TreeUI.class b/libjava/classpath/lib/javax/swing/plaf/TreeUI.class
deleted file mode 100644
index 99f36338d40..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/TreeUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/UIResource.class b/libjava/classpath/lib/javax/swing/plaf/UIResource.class
deleted file mode 100644
index d37b8c59c96..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/UIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/ViewportUI.class b/libjava/classpath/lib/javax/swing/plaf/ViewportUI.class
deleted file mode 100644
index e9d51c32f10..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/ViewportUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicArrowButton.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicArrowButton.class
deleted file mode 100644
index 24f3c0a2144..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicArrowButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$ButtonBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$ButtonBorder.class
deleted file mode 100644
index 7a7443d87f0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$ButtonBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$FieldBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$FieldBorder.class
deleted file mode 100644
index fe3838d9497..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$FieldBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$MarginBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$MarginBorder.class
deleted file mode 100644
index 10039500dbb..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$MarginBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.class
deleted file mode 100644
index dd96406486a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.class
deleted file mode 100644
index dc76747778c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.class
deleted file mode 100644
index 27b85ba5dcd..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.class
deleted file mode 100644
index 2988ff6c102..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.class
deleted file mode 100644
index 94ac0efd9cb..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.class
deleted file mode 100644
index 8ae464a7ef8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders.class
deleted file mode 100644
index 1e76161a5b7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicBorders.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener$1.class
deleted file mode 100644
index 012492bf577..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener$2.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener$2.class
deleted file mode 100644
index 348f244e45f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.class
deleted file mode 100644
index b97493de590..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener.class
deleted file mode 100644
index a736218c084..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonUI.class
deleted file mode 100644
index 621c20fb6e0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicButtonUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.class
deleted file mode 100644
index a4b2f0741dc..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicCheckBoxUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicCheckBoxUI.class
deleted file mode 100644
index 6b8fe29fc52..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicCheckBoxUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$1.class
deleted file mode 100644
index a7c88e5ecf6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.class
deleted file mode 100644
index 051f2ba14a8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.class
deleted file mode 100644
index c60cb86d95d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.class
deleted file mode 100644
index 877a1ca960b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI.class
deleted file mode 100644
index d1e89b6ac6c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicColorChooserUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.class
deleted file mode 100644
index 65068f5d0f9..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxEditor.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxEditor.class
deleted file mode 100644
index 584f3f57f0d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.class
deleted file mode 100644
index 87a2825e4db..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxRenderer.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxRenderer.class
deleted file mode 100644
index 3c568c4cb46..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.class
deleted file mode 100644
index 5af949dc7e4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.class
deleted file mode 100644
index 9d34b1658ec..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.class
deleted file mode 100644
index 5a2febd575d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.class
deleted file mode 100644
index a72e5670331..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.class
deleted file mode 100644
index 09385669bb8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.class
deleted file mode 100644
index 645929dd485..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI.class
deleted file mode 100644
index eac5c881cbf..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboBoxUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.class
deleted file mode 100644
index d1f23b8696c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.class
deleted file mode 100644
index 4d063ab39ae..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.class
deleted file mode 100644
index 25c3f53991d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.class
deleted file mode 100644
index e19deb97eb2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.class
deleted file mode 100644
index 0ac8de04144..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.class
deleted file mode 100644
index 2580330d0df..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.class
deleted file mode 100644
index f84670fd7f1..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.class
deleted file mode 100644
index ef5371338e3..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.class
deleted file mode 100644
index 77991f8c688..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup.class
deleted file mode 100644
index eb13f2e5a9c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicComboPopup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$1.class
deleted file mode 100644
index 1009fe75a58..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$2.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$2.class
deleted file mode 100644
index 8c76fe274ba..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.class
deleted file mode 100644
index 49922ae5395..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.class
deleted file mode 100644
index 60bf7d28619..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.class
deleted file mode 100644
index bbf96a2e1a6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.class
deleted file mode 100644
index fec723e71cf..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI.class
deleted file mode 100644
index 368c162fc75..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopIconUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.class
deleted file mode 100644
index 96da80278d5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.class
deleted file mode 100644
index 98ad067b4e7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.class
deleted file mode 100644
index b44728a6c4e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.class
deleted file mode 100644
index da6c8026210..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.class
deleted file mode 100644
index b05290de919..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI.class
deleted file mode 100644
index 5a380927810..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDesktopPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel$1.class
deleted file mode 100644
index 55cc400c8c1..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.class
deleted file mode 100644
index 4a5483b66d1..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.class
deleted file mode 100644
index b36b60abfb6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel.class
deleted file mode 100644
index 39ad875dda9..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicDirectoryModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicEditorPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicEditorPaneUI.class
deleted file mode 100644
index 6eb2235ca14..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicEditorPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.class
deleted file mode 100644
index 8ca7e20f85f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.class
deleted file mode 100644
index 73241f21572..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.class
deleted file mode 100644
index 094561bacda..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.class
deleted file mode 100644
index f62de1736c9..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.class
deleted file mode 100644
index 1634c3b5eb3..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.class
deleted file mode 100644
index 058f9488e75..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.class
deleted file mode 100644
index ea8ebb0c309..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.class
deleted file mode 100644
index 1e87303914e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.class
deleted file mode 100644
index ddfb4358996..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.class
deleted file mode 100644
index ac37a3c03d5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI.class
deleted file mode 100644
index 3b622d5c679..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFileChooserUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFormattedTextFieldUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicFormattedTextFieldUI.class
deleted file mode 100644
index cdfdbbaf517..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicFormattedTextFieldUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicGraphicsUtils.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicGraphicsUtils.class
deleted file mode 100644
index 5c66a8c79db..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicGraphicsUtils.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicHTML$HTMLRootView.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicHTML$HTMLRootView.class
deleted file mode 100644
index 2db9cf40556..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicHTML$HTMLRootView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicHTML.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicHTML.class
deleted file mode 100644
index 5acae515c24..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicHTML.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$1.class
deleted file mode 100644
index 289de2fd2e6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$2.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$2.class
deleted file mode 100644
index 2e6833a9ad4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.class
deleted file mode 100644
index 4586a830462..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.class
deleted file mode 100644
index bd03ae40dd1..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.class
deleted file mode 100644
index a35dd8af544..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.class
deleted file mode 100644
index 67c3d0b5f2c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory.class
deleted file mode 100644
index 2c53736ef7d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicIconFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.class
deleted file mode 100644
index fa6b2d54b7c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.class
deleted file mode 100644
index 0b296f1d51e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.class
deleted file mode 100644
index 996f4f7bcc2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.class
deleted file mode 100644
index d8895501827..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.class
deleted file mode 100644
index 5b275c073b8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.class
deleted file mode 100644
index ccbf313610d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.class
deleted file mode 100644
index 183d434f0db..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.class
deleted file mode 100644
index fce1d0f49c2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.class
deleted file mode 100644
index 70d2c57de6a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.class
deleted file mode 100644
index fc559188ffd..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane.class
deleted file mode 100644
index 24863c2573e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameTitlePane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.class
deleted file mode 100644
index 9d397cc1a46..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.class
deleted file mode 100644
index 75ef5baea6d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.class
deleted file mode 100644
index 0e3371a2ff7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.class
deleted file mode 100644
index bb0d894420a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.class
deleted file mode 100644
index dd3545d37e6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.class
deleted file mode 100644
index 8a27d60ed90..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.class
deleted file mode 100644
index d67c05aaa42..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.class
deleted file mode 100644
index fffccb6f930..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI.class
deleted file mode 100644
index 50427df1be8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicInternalFrameUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLabelUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLabelUI$1.class
deleted file mode 100644
index 7d7f0934010..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLabelUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLabelUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLabelUI.class
deleted file mode 100644
index 442a8dc0bfd..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLabelUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.class
deleted file mode 100644
index 93d816ab3fa..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$FocusHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$FocusHandler.class
deleted file mode 100644
index 319ebbb5448..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$FocusHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ListAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ListAction.class
deleted file mode 100644
index a621d9e9ebf..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ListAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ListDataHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ListDataHandler.class
deleted file mode 100644
index 076e91ecebf..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ListDataHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.class
deleted file mode 100644
index 53948408fdd..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.class
deleted file mode 100644
index 27d3a557c87..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.class
deleted file mode 100644
index 84fe813e4e0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI.class
deleted file mode 100644
index 3b01beb12bf..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicListUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$1.class
deleted file mode 100644
index 5d65f475d7a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$2.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$2.class
deleted file mode 100644
index f1e83643af3..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$3.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$3.class
deleted file mode 100644
index c33c131193c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$4.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$4.class
deleted file mode 100644
index 4b0ee923fbb..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$5.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$5.class
deleted file mode 100644
index 8fee22cb714..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$6.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$6.class
deleted file mode 100644
index bc464c04884..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$7.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$7.class
deleted file mode 100644
index 118d59b91d8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$7.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.class
deleted file mode 100644
index 7e42900f2c8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.class
deleted file mode 100644
index 33b363ef1cc..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel.class
deleted file mode 100644
index 9a866a547b2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicLookAndFeel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.class
deleted file mode 100644
index 719b2f72d04..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.class
deleted file mode 100644
index 26290e1ef19..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.class
deleted file mode 100644
index 530bb04bf07..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.class
deleted file mode 100644
index c9fa547948d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.class
deleted file mode 100644
index 006dd5642c1..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI.class
deleted file mode 100644
index 631dbab64d8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.class
deleted file mode 100644
index 2b12cc01a2a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.class
deleted file mode 100644
index 97810c0e411..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.class
deleted file mode 100644
index 1874c677fb8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.class
deleted file mode 100644
index ea17e2dd281..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.class
deleted file mode 100644
index 3f7a708be4b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.class
deleted file mode 100644
index 4399c92f1c0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI.class
deleted file mode 100644
index 80809fd55ea..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuItemUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.class
deleted file mode 100644
index df186efe287..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.class
deleted file mode 100644
index 96204b5d9e4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.class
deleted file mode 100644
index f43058ef142..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.class
deleted file mode 100644
index fa570080996..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.class
deleted file mode 100644
index d5d9207097e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.class
deleted file mode 100644
index 523ab53d102..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI.class
deleted file mode 100644
index 4ebf02b3557..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicMenuUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$1.class
deleted file mode 100644
index e2fdfbf5ec2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$2.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$2.class
deleted file mode 100644
index b829634fa12..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$3.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$3.class
deleted file mode 100644
index 739bf32ff02..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$4.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$4.class
deleted file mode 100644
index 004c25063cf..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.class
deleted file mode 100644
index 8f7fce47507..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.class
deleted file mode 100644
index e3c1beb7131..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.class
deleted file mode 100644
index 42727bdb711..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.class
deleted file mode 100644
index 0db21e4a23c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.class
deleted file mode 100644
index 625d036f4b9..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI.class
deleted file mode 100644
index 3cccaa7ed00..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicOptionPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPanelUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicPanelUI.class
deleted file mode 100644
index 899fbeaeb45..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPanelUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPasswordFieldUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicPasswordFieldUI.class
deleted file mode 100644
index ee3247166ec..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPasswordFieldUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.class
deleted file mode 100644
index db1675d3690..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.class
deleted file mode 100644
index 46a97d0027f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.class
deleted file mode 100644
index f5cbd4e705f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.class
deleted file mode 100644
index a1f6381d864..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.class
deleted file mode 100644
index e6ac311fbc6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI.class
deleted file mode 100644
index 9487aefacaa..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicPopupMenuUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.class
deleted file mode 100644
index 4afc274a609..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$Animator.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$Animator.class
deleted file mode 100644
index 865f6e60f60..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$Animator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.class
deleted file mode 100644
index dd22e230608..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.class
deleted file mode 100644
index d417d225101..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.class
deleted file mode 100644
index 2f4640fcb28..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI.class
deleted file mode 100644
index f428c5e34ef..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicProgressBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.class
deleted file mode 100644
index 8bc1dcd2f1d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicRadioButtonUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicRadioButtonUI.class
deleted file mode 100644
index eb5d3d1c589..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicRadioButtonUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.class
deleted file mode 100644
index d3c9ab033b5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.class
deleted file mode 100644
index 77a3c72cebc..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicRootPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicRootPaneUI.class
deleted file mode 100644
index c52b0c7d70d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicRootPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$1.class
deleted file mode 100644
index 9a5b36b5519..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$2.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$2.class
deleted file mode 100644
index c2dbcbf5333..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$3.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$3.class
deleted file mode 100644
index 90e07e71ae1..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$4.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$4.class
deleted file mode 100644
index 8ce627da62a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$5.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$5.class
deleted file mode 100644
index a0646f3b816..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$6.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$6.class
deleted file mode 100644
index af7dd323e0f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.class
deleted file mode 100644
index 7081759b67e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.class
deleted file mode 100644
index e4d2945cd85..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.class
deleted file mode 100644
index f1466a6b2d3..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.class
deleted file mode 100644
index 6416310df57..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.class
deleted file mode 100644
index 3b4d8ae247a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI.class
deleted file mode 100644
index f0ec5c4744d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$1.class
deleted file mode 100644
index 9d2c615c512..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$10.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$10.class
deleted file mode 100644
index 58ad2057d0b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$10.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$2.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$2.class
deleted file mode 100644
index e7eb3681302..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$3.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$3.class
deleted file mode 100644
index 82159aed60c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$4.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$4.class
deleted file mode 100644
index 74544cd51a3..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$5.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$5.class
deleted file mode 100644
index 539992025b8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$6.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$6.class
deleted file mode 100644
index 6bfadf29333..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$7.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$7.class
deleted file mode 100644
index 750471ed79f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$7.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$8.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$8.class
deleted file mode 100644
index 5bf0bed7f95..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$9.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$9.class
deleted file mode 100644
index f5156aeb042..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$9.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.class
deleted file mode 100644
index 3b40bfda649..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.class
deleted file mode 100644
index 1485b952e40..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.class
deleted file mode 100644
index 073955092a4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.class
deleted file mode 100644
index af23e05fba4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.class
deleted file mode 100644
index 1b6a7291aa3..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.class
deleted file mode 100644
index 0134ead63fa..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI.class
deleted file mode 100644
index 35c71e2ffef..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicScrollPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSeparatorUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSeparatorUI.class
deleted file mode 100644
index 5c8c9138766..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSeparatorUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$1.class
deleted file mode 100644
index 27bb9f6b590..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$2.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$2.class
deleted file mode 100644
index b0941f4c826..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$3.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$3.class
deleted file mode 100644
index 0a9d63bcbf4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$4.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$4.class
deleted file mode 100644
index 1bcdb96da85..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$5.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$5.class
deleted file mode 100644
index 4de2aee76e4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$6.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$6.class
deleted file mode 100644
index 4724dfc1c70..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.class
deleted file mode 100644
index 50966e9a5b5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.class
deleted file mode 100644
index 707b9646c30..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.class
deleted file mode 100644
index f12ca7c11b0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.class
deleted file mode 100644
index 49f71ee9ebc..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.class
deleted file mode 100644
index 7689cb38f05..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.class
deleted file mode 100644
index 4d868f9d099..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$TrackListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$TrackListener.class
deleted file mode 100644
index 5624a4a5306..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI$TrackListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI.class
deleted file mode 100644
index 93fef654deb..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSliderUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$1.class
deleted file mode 100644
index a81f3909171..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$2.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$2.class
deleted file mode 100644
index 8dae834040c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$3.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$3.class
deleted file mode 100644
index 2a822f94549..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$4.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$4.class
deleted file mode 100644
index 8a681f1eb9f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$5.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$5.class
deleted file mode 100644
index b79ee535134..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.class
deleted file mode 100644
index 163e6d8a49b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI.class
deleted file mode 100644
index fa01bcec69b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSpinnerUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.class
deleted file mode 100644
index e0a721549b7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.class
deleted file mode 100644
index 8334c392eeb..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.class
deleted file mode 100644
index eff8b334010..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.class
deleted file mode 100644
index f3574e07c34..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.class
deleted file mode 100644
index 45873b58848..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.class
deleted file mode 100644
index e60a5d995a7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider.class
deleted file mode 100644
index f4ae0683908..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneDivider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$1.class
deleted file mode 100644
index 7cda0e04837..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$2.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$2.class
deleted file mode 100644
index 42a1f7053a8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$3.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$3.class
deleted file mode 100644
index ab26c8307be..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$4.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$4.class
deleted file mode 100644
index aa0fd723367..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$5.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$5.class
deleted file mode 100644
index 616981193a0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$5.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$6.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$6.class
deleted file mode 100644
index 3c771c1614a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$6.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$7.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$7.class
deleted file mode 100644
index df61f281927..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$7.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$8.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$8.class
deleted file mode 100644
index 8cb8c2a8bf6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$8.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.class
deleted file mode 100644
index 82248171e09..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.class
deleted file mode 100644
index 7bfafb47034..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.class
deleted file mode 100644
index d5ecc0d1fa6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.class
deleted file mode 100644
index 7da3e02ae2c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.class
deleted file mode 100644
index ff8cab1273a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.class
deleted file mode 100644
index efc2f798486..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.class
deleted file mode 100644
index eb859af714f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.class
deleted file mode 100644
index 8b712d69949..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.class
deleted file mode 100644
index 7b2c4296bba..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI.class
deleted file mode 100644
index 1b365ff2a6b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicSplitPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.class
deleted file mode 100644
index fb13c4f0b16..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.class
deleted file mode 100644
index 71d6174c163..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.class
deleted file mode 100644
index fe868cd97df..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.class
deleted file mode 100644
index 7505ade3880..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.class
deleted file mode 100644
index 53ef74f1912..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.class
deleted file mode 100644
index 67a9404726d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.class
deleted file mode 100644
index ff7576be6bf..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.class
deleted file mode 100644
index 71d43596106..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.class
deleted file mode 100644
index a0e33cdfda8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.class
deleted file mode 100644
index 0fc7b07b6af..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.class
deleted file mode 100644
index b244abe2d3d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.class
deleted file mode 100644
index 11182ffd0f6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.class
deleted file mode 100644
index af70ea982d6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.class
deleted file mode 100644
index b6746e74db9..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.class
deleted file mode 100644
index 85a4b91aced..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI.class
deleted file mode 100644
index f4a5e76c3d1..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTabbedPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableHeaderUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableHeaderUI$1.class
deleted file mode 100644
index db96992ccd8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableHeaderUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.class
deleted file mode 100644
index 3ec79a6ac00..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableHeaderUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableHeaderUI.class
deleted file mode 100644
index 5ad0945bc15..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableHeaderUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$FocusHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$FocusHandler.class
deleted file mode 100644
index 18c4100eb39..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$FocusHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$KeyHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$KeyHandler.class
deleted file mode 100644
index 65475db210f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$KeyHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.class
deleted file mode 100644
index 9ef5b9951d6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.class
deleted file mode 100644
index def45a1866b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$TableAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$TableAction.class
deleted file mode 100644
index 94be7170dc6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI$TableAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI.class
deleted file mode 100644
index b0822d66e8b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTableUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextAreaUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextAreaUI.class
deleted file mode 100644
index 0ec9c66f8e6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextAreaUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextFieldUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextFieldUI.class
deleted file mode 100644
index 90b8bf77a03..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextFieldUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextPaneUI.class
deleted file mode 100644
index 539115faf93..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$BasicCaret.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$BasicCaret.class
deleted file mode 100644
index 7284598e04d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$BasicCaret.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.class
deleted file mode 100644
index c0473e17fa0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$FocusHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$FocusHandler.class
deleted file mode 100644
index 12f7f465162..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$FocusHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$Handler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$Handler.class
deleted file mode 100644
index d574a9624ca..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$Handler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$RootView.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$RootView.class
deleted file mode 100644
index 3b2834c17fc..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI$RootView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI.class
deleted file mode 100644
index d2a6452b4c0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTextUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToggleButtonUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToggleButtonUI.class
deleted file mode 100644
index 828356f3fe8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToggleButtonUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarSeparatorUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarSeparatorUI.class
deleted file mode 100644
index 1b59fd39898..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarSeparatorUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.class
deleted file mode 100644
index c0c73a659bc..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.class
deleted file mode 100644
index 4eef745d21a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.class
deleted file mode 100644
index 4f00f40143b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.class
deleted file mode 100644
index 6c256c9da74..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.class
deleted file mode 100644
index b66785c3b5b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.class
deleted file mode 100644
index 9a85d145a57..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.class
deleted file mode 100644
index 041113523d3..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.class
deleted file mode 100644
index 6d709ddbfa7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.class
deleted file mode 100644
index ce3221c6514..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI.class
deleted file mode 100644
index 4eefae595bd..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.class
deleted file mode 100644
index 5c57e7d3241..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolTipUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolTipUI.class
deleted file mode 100644
index 54812b35a28..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicToolTipUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$1.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$1.class
deleted file mode 100644
index 0c9f340b943..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.class
deleted file mode 100644
index a396b4ad2e5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.class
deleted file mode 100644
index ea7b7f4181b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.class
deleted file mode 100644
index 78ea5ad8ec4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.class
deleted file mode 100644
index 8ff4e3b040d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.class
deleted file mode 100644
index c3a396a76df..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.class
deleted file mode 100644
index ee78f86aa92..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.class
deleted file mode 100644
index 782d88746d5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.class
deleted file mode 100644
index 16cb402eb8d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.class
deleted file mode 100644
index 18e4350dbcb..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.class
deleted file mode 100644
index 92170ea3411..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.class
deleted file mode 100644
index 7f06636f520..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.class
deleted file mode 100644
index dd367b56bc4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.class
deleted file mode 100644
index a5af1b98b54..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.class
deleted file mode 100644
index 91c428336db..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.class
deleted file mode 100644
index 5c71ab6cb10..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.class
deleted file mode 100644
index f714a625cee..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.class
deleted file mode 100644
index 19b3d14b96e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.class
deleted file mode 100644
index 19530ef625e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.class
deleted file mode 100644
index f9de62e54fa..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI.class
deleted file mode 100644
index 6ca853bf960..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicTreeUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/BasicViewportUI.class b/libjava/classpath/lib/javax/swing/plaf/basic/BasicViewportUI.class
deleted file mode 100644
index 6053ba65ac4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/BasicViewportUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/ComboPopup.class b/libjava/classpath/lib/javax/swing/plaf/basic/ComboPopup.class
deleted file mode 100644
index e9af3d4ad49..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/ComboPopup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/DefaultMenuLayout.class b/libjava/classpath/lib/javax/swing/plaf/basic/DefaultMenuLayout.class
deleted file mode 100644
index 04306b42120..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/DefaultMenuLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/basic/SharedUIDefaults.class b/libjava/classpath/lib/javax/swing/plaf/basic/SharedUIDefaults.class
deleted file mode 100644
index 551e604207b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/basic/SharedUIDefaults.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/DefaultMetalTheme.class b/libjava/classpath/lib/javax/swing/plaf/metal/DefaultMetalTheme.class
deleted file mode 100644
index 8c91d728a8d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/DefaultMetalTheme.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ButtonBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ButtonBorder.class
deleted file mode 100644
index caacd83b81c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ButtonBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.class
deleted file mode 100644
index 02ce3e1ae05..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.class
deleted file mode 100644
index e184e997abe..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.class
deleted file mode 100644
index 9472c02b542..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.class
deleted file mode 100644
index d58e9bd495e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.class
deleted file mode 100644
index be1273ee1bf..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.class
deleted file mode 100644
index 60809b63213..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$PaletteBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$PaletteBorder.class
deleted file mode 100644
index 8c16cafbc87..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$PaletteBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.class
deleted file mode 100644
index 0fa010c86ed..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.class
deleted file mode 100644
index b9836bb4b4d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.class
deleted file mode 100644
index bd2d3689ff4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.class
deleted file mode 100644
index b3f20be757f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.class
deleted file mode 100644
index d65caaaafae..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.class
deleted file mode 100644
index e5758fcd734..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.class
deleted file mode 100644
index 9a73598fd4f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.class
deleted file mode 100644
index 6cc65db10b0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders.class
deleted file mode 100644
index 355eb063b22..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalBorders.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalButtonListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalButtonListener.class
deleted file mode 100644
index ecea49d9ab4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalButtonListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalButtonUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalButtonUI.class
deleted file mode 100644
index aa93c284e40..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalButtonUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalCheckBoxIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalCheckBoxIcon.class
deleted file mode 100644
index 86d28441a0a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalCheckBoxIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalCheckBoxUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalCheckBoxUI.class
deleted file mode 100644
index 5e5617b966d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalCheckBoxUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxButton.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxButton.class
deleted file mode 100644
index b7e43a5495f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.class
deleted file mode 100644
index ec2fa0e09fa..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.class
deleted file mode 100644
index b6b37439e3e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.class
deleted file mode 100644
index 635ecb7eec5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor.class
deleted file mode 100644
index 1ddca3bd4db..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxIcon.class
deleted file mode 100644
index 65cfdb08cc1..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.class
deleted file mode 100644
index 61720f764b5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.class
deleted file mode 100644
index db870fa5667..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.class
deleted file mode 100644
index a6ff5bdd827..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI.class
deleted file mode 100644
index d14dcb63688..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalComboBoxUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalDesktopIconUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalDesktopIconUI.class
deleted file mode 100644
index f523996d951..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalDesktopIconUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.class
deleted file mode 100644
index 5812e80e6bf..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.class
deleted file mode 100644
index 347cf8f277c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.class
deleted file mode 100644
index 9762645920c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.class
deleted file mode 100644
index ab37b07eeee..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.class
deleted file mode 100644
index cfc4c7d0b89..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.class
deleted file mode 100644
index 96734ea31a1..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.class
deleted file mode 100644
index 48b33da80f5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.class
deleted file mode 100644
index 7e67ceef572..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.class
deleted file mode 100644
index ef6f124c7e8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.class
deleted file mode 100644
index 22ca84fa642..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.class
deleted file mode 100644
index fd71ac5075e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.class
deleted file mode 100644
index 29fc30eef5a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.class
deleted file mode 100644
index a3e1ef8a0fb..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.class
deleted file mode 100644
index efc50fccbda..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.class
deleted file mode 100644
index 777f247c861..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.class
deleted file mode 100644
index 73c804100fb..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.class
deleted file mode 100644
index a67ead94011..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.class
deleted file mode 100644
index e1f36a57dad..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI.class
deleted file mode 100644
index 22634c7b06d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalFileChooserUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$1.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$1.class
deleted file mode 100644
index c90fcece004..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$2.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$2.class
deleted file mode 100644
index 764ee53161c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$3.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$3.class
deleted file mode 100644
index 28a0385ff13..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.class
deleted file mode 100644
index e88cd5f77c5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.class
deleted file mode 100644
index d72e34a2c64..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.class
deleted file mode 100644
index 1fa4f1c79f6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.class
deleted file mode 100644
index b80fc2dea17..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.class
deleted file mode 100644
index 79a93802757..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.class
deleted file mode 100644
index 4c2dfb539ea..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.class
deleted file mode 100644
index 0a5a5c8ce40..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.class
deleted file mode 100644
index 65a827a91de..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.class
deleted file mode 100644
index 9cfa561d223..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.class
deleted file mode 100644
index 168b94061f6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.class
deleted file mode 100644
index ac45a6c21bc..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.class
deleted file mode 100644
index 47972a750c0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.class
deleted file mode 100644
index ee01345496a..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.class
deleted file mode 100644
index f86ff74fd32..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.class
deleted file mode 100644
index bafc958b41e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.class
deleted file mode 100644
index 59e7310caa7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.class
deleted file mode 100644
index 0e3f35d8f39..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.class
deleted file mode 100644
index cd1d4a774ea..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.class
deleted file mode 100644
index 5101c61176b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.class
deleted file mode 100644
index 6b90be38765..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.class
deleted file mode 100644
index 520a43892a2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.class
deleted file mode 100644
index 2fe6af8056c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.class
deleted file mode 100644
index 27aabe6239c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.class
deleted file mode 100644
index cb378d422b8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory.class
deleted file mode 100644
index fdbcad09013..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalIconFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.class
deleted file mode 100644
index f966b6607a7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.class
deleted file mode 100644
index 0642de5fcf0..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameTitlePane.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameTitlePane.class
deleted file mode 100644
index 4ee98141c8f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameTitlePane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameUI$1.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameUI$1.class
deleted file mode 100644
index 7c916d365f7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameUI$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameUI.class
deleted file mode 100644
index c518ed553ca..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalInternalFrameUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalLabelUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalLabelUI.class
deleted file mode 100644
index 976afe64be7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalLabelUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalLookAndFeel$1.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalLookAndFeel$1.class
deleted file mode 100644
index 89b00a27c70..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalLookAndFeel$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalLookAndFeel.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalLookAndFeel.class
deleted file mode 100644
index 86e1c063749..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalLookAndFeel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalMenuBarUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalMenuBarUI.class
deleted file mode 100644
index 6e39160c608..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalMenuBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.class
deleted file mode 100644
index 7c8b938ecb8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalProgressBarUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalProgressBarUI.class
deleted file mode 100644
index 92f69efbceb..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalProgressBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRadioButtonUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRadioButtonUI.class
deleted file mode 100644
index b88c964eea6..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRadioButtonUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.class
deleted file mode 100644
index 5aa6ae54f29..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.class
deleted file mode 100644
index 355f39d8adc..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.class
deleted file mode 100644
index 08e5c9423e5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.class
deleted file mode 100644
index 8759cde05dd..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.class
deleted file mode 100644
index 9ae62915587..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.class
deleted file mode 100644
index edeaa27ad7b..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.class
deleted file mode 100644
index 4599854f8f3..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.class
deleted file mode 100644
index c0c0f4ccd87..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.class
deleted file mode 100644
index 20022fa7821..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI.class
deleted file mode 100644
index cfe2e72fc53..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalRootPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.class
deleted file mode 100644
index 6efbdc4d683..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollBarUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollBarUI.class
deleted file mode 100644
index 55524da4b61..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollButton.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollButton.class
deleted file mode 100644
index 84f5c6487d9..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollPaneUI.class
deleted file mode 100644
index 36adede517d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalScrollPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSeparatorUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalSeparatorUI.class
deleted file mode 100644
index 50fe535ed26..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSeparatorUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.class
deleted file mode 100644
index eec02ebd62e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSliderUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalSliderUI.class
deleted file mode 100644
index 8dd86d9d079..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSliderUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.class
deleted file mode 100644
index f98cab8036e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSplitPaneDivider.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalSplitPaneDivider.class
deleted file mode 100644
index b85c734c7df..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSplitPaneDivider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSplitPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalSplitPaneUI.class
deleted file mode 100644
index 8e7a5eeca25..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalSplitPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.class
deleted file mode 100644
index 5fb3e4aa01c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTabbedPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalTabbedPaneUI.class
deleted file mode 100644
index 7ac7cac40f5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTabbedPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTextFieldUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalTextFieldUI.class
deleted file mode 100644
index 19ffc27b416..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTextFieldUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTheme.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalTheme.class
deleted file mode 100644
index 13a569799aa..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTheme.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToggleButtonUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalToggleButtonUI.class
deleted file mode 100644
index 25ed8e10779..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToggleButtonUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.class
deleted file mode 100644
index bb84912aea2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.class
deleted file mode 100644
index 20c56d2207e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.class
deleted file mode 100644
index bea84a8e6d9..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI.class
deleted file mode 100644
index 9ca5216e701..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolTipUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolTipUI.class
deleted file mode 100644
index 5e98965c5f7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalToolTipUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.class
deleted file mode 100644
index d17db4e543c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTreeUI.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalTreeUI.class
deleted file mode 100644
index 84363d15dc9..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalTreeUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/MetalUtils.class b/libjava/classpath/lib/javax/swing/plaf/metal/MetalUtils.class
deleted file mode 100644
index 0d1dcf94eca..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/MetalUtils.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/metal/OceanTheme.class b/libjava/classpath/lib/javax/swing/plaf/metal/OceanTheme.class
deleted file mode 100644
index c596b1f8ae2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/metal/OceanTheme.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiButtonUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiButtonUI.class
deleted file mode 100644
index d417f3d90d2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiButtonUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiColorChooserUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiColorChooserUI.class
deleted file mode 100644
index 40e9a80430f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiColorChooserUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiComboBoxUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiComboBoxUI.class
deleted file mode 100644
index 5e696ac3f7d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiComboBoxUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiDesktopIconUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiDesktopIconUI.class
deleted file mode 100644
index 813ab7cd37e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiDesktopIconUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiDesktopPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiDesktopPaneUI.class
deleted file mode 100644
index c4587c3c653..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiDesktopPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiFileChooserUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiFileChooserUI.class
deleted file mode 100644
index 4f5783bd5d5..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiFileChooserUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiInternalFrameUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiInternalFrameUI.class
deleted file mode 100644
index 81c467b8825..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiInternalFrameUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiLabelUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiLabelUI.class
deleted file mode 100644
index 4b080c529c7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiLabelUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiListUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiListUI.class
deleted file mode 100644
index becf3bcd515..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiListUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiLookAndFeel.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiLookAndFeel.class
deleted file mode 100644
index 4c57c94bf75..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiLookAndFeel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiMenuBarUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiMenuBarUI.class
deleted file mode 100644
index 30646d3758c..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiMenuBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiMenuItemUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiMenuItemUI.class
deleted file mode 100644
index b98068a2e86..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiMenuItemUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiOptionPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiOptionPaneUI.class
deleted file mode 100644
index 82950b16e5f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiOptionPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiPanelUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiPanelUI.class
deleted file mode 100644
index 537e9c5f8ca..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiPanelUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiPopupMenuUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiPopupMenuUI.class
deleted file mode 100644
index 50e98eb75db..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiPopupMenuUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiProgressBarUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiProgressBarUI.class
deleted file mode 100644
index ca7322a88c2..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiProgressBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiRootPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiRootPaneUI.class
deleted file mode 100644
index 17bca451a69..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiRootPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiScrollBarUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiScrollBarUI.class
deleted file mode 100644
index d65dbc33fe4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiScrollBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiScrollPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiScrollPaneUI.class
deleted file mode 100644
index 2d824c5e31f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiScrollPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiSeparatorUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiSeparatorUI.class
deleted file mode 100644
index c7d27284438..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiSeparatorUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiSliderUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiSliderUI.class
deleted file mode 100644
index b7759489c40..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiSliderUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiSpinnerUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiSpinnerUI.class
deleted file mode 100644
index 2e646028e4e..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiSpinnerUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiSplitPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiSplitPaneUI.class
deleted file mode 100644
index 57be2358e64..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiSplitPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiTabbedPaneUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiTabbedPaneUI.class
deleted file mode 100644
index 2e48a74f600..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiTabbedPaneUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiTableHeaderUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiTableHeaderUI.class
deleted file mode 100644
index edda59cbead..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiTableHeaderUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiTableUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiTableUI.class
deleted file mode 100644
index 4e6210f1226..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiTableUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiTextUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiTextUI.class
deleted file mode 100644
index 5ffcf8b5b54..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiTextUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiToolBarUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiToolBarUI.class
deleted file mode 100644
index c17150719aa..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiToolBarUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiToolTipUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiToolTipUI.class
deleted file mode 100644
index 9a4def17df4..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiToolTipUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiTreeUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiTreeUI.class
deleted file mode 100644
index efb43fe079d..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiTreeUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/multi/MultiViewportUI.class b/libjava/classpath/lib/javax/swing/plaf/multi/MultiViewportUI.class
deleted file mode 100644
index 643fb34b546..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/multi/MultiViewportUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/synth/ColorType.class b/libjava/classpath/lib/javax/swing/plaf/synth/ColorType.class
deleted file mode 100644
index 1c2511a3677..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/synth/ColorType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/synth/Region.class b/libjava/classpath/lib/javax/swing/plaf/synth/Region.class
deleted file mode 100644
index c29c7dcc9e8..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/synth/Region.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/synth/SynthConstants.class b/libjava/classpath/lib/javax/swing/plaf/synth/SynthConstants.class
deleted file mode 100644
index 9dedcea0bc7..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/synth/SynthConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/synth/SynthContext.class b/libjava/classpath/lib/javax/swing/plaf/synth/SynthContext.class
deleted file mode 100644
index 8ef9eb61414..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/synth/SynthContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/synth/SynthGraphicsUtils.class b/libjava/classpath/lib/javax/swing/plaf/synth/SynthGraphicsUtils.class
deleted file mode 100644
index a7a6733c417..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/synth/SynthGraphicsUtils.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/synth/SynthLookAndFeel.class b/libjava/classpath/lib/javax/swing/plaf/synth/SynthLookAndFeel.class
deleted file mode 100644
index c4d0994976f..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/synth/SynthLookAndFeel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/synth/SynthPainter.class b/libjava/classpath/lib/javax/swing/plaf/synth/SynthPainter.class
deleted file mode 100644
index ad8ae277791..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/synth/SynthPainter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/synth/SynthStyle.class b/libjava/classpath/lib/javax/swing/plaf/synth/SynthStyle.class
deleted file mode 100644
index 710c129bb83..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/synth/SynthStyle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/plaf/synth/SynthStyleFactory.class b/libjava/classpath/lib/javax/swing/plaf/synth/SynthStyleFactory.class
deleted file mode 100644
index b010e039348..00000000000
--- a/libjava/classpath/lib/javax/swing/plaf/synth/SynthStyleFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/AbstractTableModel.class b/libjava/classpath/lib/javax/swing/table/AbstractTableModel.class
deleted file mode 100644
index acb354bb252..00000000000
--- a/libjava/classpath/lib/javax/swing/table/AbstractTableModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/DefaultTableCellRenderer$UIResource.class b/libjava/classpath/lib/javax/swing/table/DefaultTableCellRenderer$UIResource.class
deleted file mode 100644
index 59a68ae75c1..00000000000
--- a/libjava/classpath/lib/javax/swing/table/DefaultTableCellRenderer$UIResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/DefaultTableCellRenderer.class b/libjava/classpath/lib/javax/swing/table/DefaultTableCellRenderer.class
deleted file mode 100644
index 500f418190d..00000000000
--- a/libjava/classpath/lib/javax/swing/table/DefaultTableCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/DefaultTableColumnModel.class b/libjava/classpath/lib/javax/swing/table/DefaultTableColumnModel.class
deleted file mode 100644
index a141c6d648e..00000000000
--- a/libjava/classpath/lib/javax/swing/table/DefaultTableColumnModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/DefaultTableModel.class b/libjava/classpath/lib/javax/swing/table/DefaultTableModel.class
deleted file mode 100644
index bc27c59ca1f..00000000000
--- a/libjava/classpath/lib/javax/swing/table/DefaultTableModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.class b/libjava/classpath/lib/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.class
deleted file mode 100644
index f261bf99a8c..00000000000
--- a/libjava/classpath/lib/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/JTableHeader$AccessibleJTableHeader.class b/libjava/classpath/lib/javax/swing/table/JTableHeader$AccessibleJTableHeader.class
deleted file mode 100644
index caa7f10d8a6..00000000000
--- a/libjava/classpath/lib/javax/swing/table/JTableHeader$AccessibleJTableHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/JTableHeader.class b/libjava/classpath/lib/javax/swing/table/JTableHeader.class
deleted file mode 100644
index 7bbac17de8b..00000000000
--- a/libjava/classpath/lib/javax/swing/table/JTableHeader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/TableCellEditor.class b/libjava/classpath/lib/javax/swing/table/TableCellEditor.class
deleted file mode 100644
index efe03b2a787..00000000000
--- a/libjava/classpath/lib/javax/swing/table/TableCellEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/TableCellRenderer.class b/libjava/classpath/lib/javax/swing/table/TableCellRenderer.class
deleted file mode 100644
index 9e9dbe2966f..00000000000
--- a/libjava/classpath/lib/javax/swing/table/TableCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/TableColumn.class b/libjava/classpath/lib/javax/swing/table/TableColumn.class
deleted file mode 100644
index daf7d5dc6b6..00000000000
--- a/libjava/classpath/lib/javax/swing/table/TableColumn.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/TableColumnModel.class b/libjava/classpath/lib/javax/swing/table/TableColumnModel.class
deleted file mode 100644
index fb3c12184ba..00000000000
--- a/libjava/classpath/lib/javax/swing/table/TableColumnModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/table/TableModel.class b/libjava/classpath/lib/javax/swing/table/TableModel.class
deleted file mode 100644
index 1b5c1434250..00000000000
--- a/libjava/classpath/lib/javax/swing/table/TableModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument$AbstractElement.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument$AbstractElement.class
deleted file mode 100644
index 8085237f265..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument$AbstractElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument$AttributeContext.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument$AttributeContext.class
deleted file mode 100644
index cdf353a2eb0..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument$AttributeContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument$BidiElement.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument$BidiElement.class
deleted file mode 100644
index ce3b3c7f73c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument$BidiElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument$BidiRootElement.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument$BidiRootElement.class
deleted file mode 100644
index 02beb2f4f5b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument$BidiRootElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument$BranchElement.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument$BranchElement.class
deleted file mode 100644
index 0f3938e918c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument$BranchElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument$Bypass.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument$Bypass.class
deleted file mode 100644
index 7ab8a203315..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument$Bypass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument$Content.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument$Content.class
deleted file mode 100644
index c9bdc3f62fa..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument$Content.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument$DefaultDocumentEvent.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument$DefaultDocumentEvent.class
deleted file mode 100644
index ba8f7246bde..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument$DefaultDocumentEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument$ElementEdit.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument$ElementEdit.class
deleted file mode 100644
index e11f6c64d5f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument$ElementEdit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument$LeafElement.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument$LeafElement.class
deleted file mode 100644
index 0f13f86fa32..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument$LeafElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractDocument.class b/libjava/classpath/lib/javax/swing/text/AbstractDocument.class
deleted file mode 100644
index a3ae0b5208e..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AbstractWriter.class b/libjava/classpath/lib/javax/swing/text/AbstractWriter.class
deleted file mode 100644
index 05b7e79ba1a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AbstractWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AsyncBoxView$ChildLocator.class b/libjava/classpath/lib/javax/swing/text/AsyncBoxView$ChildLocator.class
deleted file mode 100644
index 19b477fcde0..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AsyncBoxView$ChildLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AsyncBoxView$ChildState.class b/libjava/classpath/lib/javax/swing/text/AsyncBoxView$ChildState.class
deleted file mode 100644
index 34bbdd5fc9f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AsyncBoxView$ChildState.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AsyncBoxView$FlushTask.class b/libjava/classpath/lib/javax/swing/text/AsyncBoxView$FlushTask.class
deleted file mode 100644
index 21bbf808714..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AsyncBoxView$FlushTask.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AsyncBoxView.class b/libjava/classpath/lib/javax/swing/text/AsyncBoxView.class
deleted file mode 100644
index 66149c460f3..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AsyncBoxView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AttributeSet$CharacterAttribute.class b/libjava/classpath/lib/javax/swing/text/AttributeSet$CharacterAttribute.class
deleted file mode 100644
index 359fbdc8548..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AttributeSet$CharacterAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AttributeSet$ColorAttribute.class b/libjava/classpath/lib/javax/swing/text/AttributeSet$ColorAttribute.class
deleted file mode 100644
index 7a7966af5b9..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AttributeSet$ColorAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AttributeSet$FontAttribute.class b/libjava/classpath/lib/javax/swing/text/AttributeSet$FontAttribute.class
deleted file mode 100644
index ce4337de20f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AttributeSet$FontAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AttributeSet$ParagraphAttribute.class b/libjava/classpath/lib/javax/swing/text/AttributeSet$ParagraphAttribute.class
deleted file mode 100644
index 7c982606cfa..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AttributeSet$ParagraphAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/AttributeSet.class b/libjava/classpath/lib/javax/swing/text/AttributeSet.class
deleted file mode 100644
index 7fd29c4396c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/AttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/BadLocationException.class b/libjava/classpath/lib/javax/swing/text/BadLocationException.class
deleted file mode 100644
index 98da09d6c38..00000000000
--- a/libjava/classpath/lib/javax/swing/text/BadLocationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/BoxView.class b/libjava/classpath/lib/javax/swing/text/BoxView.class
deleted file mode 100644
index 7a80c961517..00000000000
--- a/libjava/classpath/lib/javax/swing/text/BoxView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Caret.class b/libjava/classpath/lib/javax/swing/text/Caret.class
deleted file mode 100644
index ff6076d15c8..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Caret.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ChangedCharSetException.class b/libjava/classpath/lib/javax/swing/text/ChangedCharSetException.class
deleted file mode 100644
index 057a6872814..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ChangedCharSetException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ComponentView$1.class b/libjava/classpath/lib/javax/swing/text/ComponentView$1.class
deleted file mode 100644
index 33102d9ab4d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ComponentView$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ComponentView$Interceptor.class b/libjava/classpath/lib/javax/swing/text/ComponentView$Interceptor.class
deleted file mode 100644
index 809e777101b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ComponentView$Interceptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ComponentView.class b/libjava/classpath/lib/javax/swing/text/ComponentView.class
deleted file mode 100644
index 734e7cb7eb9..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ComponentView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/CompositeView.class b/libjava/classpath/lib/javax/swing/text/CompositeView.class
deleted file mode 100644
index 9f503c75dbf..00000000000
--- a/libjava/classpath/lib/javax/swing/text/CompositeView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DateFormatter.class b/libjava/classpath/lib/javax/swing/text/DateFormatter.class
deleted file mode 100644
index c457e2c9ed8..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DateFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultCaret$BlinkTimerListener.class b/libjava/classpath/lib/javax/swing/text/DefaultCaret$BlinkTimerListener.class
deleted file mode 100644
index 8ef5ff13f9c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultCaret$BlinkTimerListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultCaret$Bypass.class b/libjava/classpath/lib/javax/swing/text/DefaultCaret$Bypass.class
deleted file mode 100644
index bea4c5c1007..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultCaret$Bypass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultCaret$DocumentHandler.class b/libjava/classpath/lib/javax/swing/text/DefaultCaret$DocumentHandler.class
deleted file mode 100644
index 32bfbc44c47..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultCaret$DocumentHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultCaret$PropertyChangeHandler.class b/libjava/classpath/lib/javax/swing/text/DefaultCaret$PropertyChangeHandler.class
deleted file mode 100644
index 11497e74b4e..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultCaret$PropertyChangeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultCaret.class b/libjava/classpath/lib/javax/swing/text/DefaultCaret.class
deleted file mode 100644
index 89e12fde404..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultCaret.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BackwardAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BackwardAction.class
deleted file mode 100644
index 03db2322a64..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BackwardAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeepAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeepAction.class
deleted file mode 100644
index efb137b75f8..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeepAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeginAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeginAction.class
deleted file mode 100644
index b428801dafb..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeginAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeginLineAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeginLineAction.class
deleted file mode 100644
index a0d6cf1e1e7..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeginLineAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeginWordAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeginWordAction.class
deleted file mode 100644
index 64bd8d6ad4a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$BeginWordAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$CopyAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$CopyAction.class
deleted file mode 100644
index 93e9be5be3c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$CopyAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$CutAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$CutAction.class
deleted file mode 100644
index 80b43cb521e..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$CutAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.class
deleted file mode 100644
index 1b14036eb4e..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.class
deleted file mode 100644
index 2a74bf7f45f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.class
deleted file mode 100644
index 88c01ad519c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DownAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DownAction.class
deleted file mode 100644
index 5594f37bd42..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$DownAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$EndAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$EndAction.class
deleted file mode 100644
index a8319fac359..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$EndAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$EndLineAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$EndLineAction.class
deleted file mode 100644
index 3708263b999..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$EndLineAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$EndWordAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$EndWordAction.class
deleted file mode 100644
index 66f079ffca2..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$EndWordAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$ForwardAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$ForwardAction.class
deleted file mode 100644
index 7ab3f6fdb74..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$ForwardAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$InsertBreakAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$InsertBreakAction.class
deleted file mode 100644
index 1f7c364be4a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$InsertBreakAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$InsertContentAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$InsertContentAction.class
deleted file mode 100644
index 5701aaed52d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$InsertContentAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$InsertTabAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$InsertTabAction.class
deleted file mode 100644
index f5a64f81b6b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$InsertTabAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$NextWordAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$NextWordAction.class
deleted file mode 100644
index bbf055fbf85..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$NextWordAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$PasteAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$PasteAction.class
deleted file mode 100644
index 8ebb7f4ecf7..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$PasteAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$PreviousWordAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$PreviousWordAction.class
deleted file mode 100644
index 7d2d4b0e4fd..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$PreviousWordAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectAllAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectAllAction.class
deleted file mode 100644
index cf44390395f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectAllAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectLineAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectLineAction.class
deleted file mode 100644
index ccc5a6458bf..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectLineAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectWordAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectWordAction.class
deleted file mode 100644
index 54ed14cc54d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectWordAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.class
deleted file mode 100644
index f80454d6c82..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBeginAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBeginAction.class
deleted file mode 100644
index 4fbaf30209e..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBeginAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.class
deleted file mode 100644
index a127a5537e7..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.class
deleted file mode 100644
index c9cb13f7d71..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionDownAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionDownAction.class
deleted file mode 100644
index 354f776118c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionDownAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionEndAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionEndAction.class
deleted file mode 100644
index 29fac6c4b03..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionEndAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.class
deleted file mode 100644
index 0f6d39be3a1..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.class
deleted file mode 100644
index de30976ffee..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionForwardAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionForwardAction.class
deleted file mode 100644
index 8970a9a770a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionForwardAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.class
deleted file mode 100644
index 3422529b42a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.class
deleted file mode 100644
index ad3ace407da..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionUpAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionUpAction.class
deleted file mode 100644
index f17bba89852..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$SelectionUpAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$UpAction.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$UpAction.class
deleted file mode 100644
index 41abccfc771..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit$UpAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit.class b/libjava/classpath/lib/javax/swing/text/DefaultEditorKit.class
deleted file mode 100644
index 36d462bf592..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultEditorKit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.class b/libjava/classpath/lib/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.class
deleted file mode 100644
index f2eb6ccf61d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultFormatter.class b/libjava/classpath/lib/javax/swing/text/DefaultFormatter.class
deleted file mode 100644
index 34f31b2c3fe..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultFormatterFactory.class b/libjava/classpath/lib/javax/swing/text/DefaultFormatterFactory.class
deleted file mode 100644
index cd6c220298b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultFormatterFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.class b/libjava/classpath/lib/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.class
deleted file mode 100644
index 12a44c2fd28..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultHighlighter$HighlightEntry.class b/libjava/classpath/lib/javax/swing/text/DefaultHighlighter$HighlightEntry.class
deleted file mode 100644
index b5a07ad27d3..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultHighlighter$HighlightEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.class b/libjava/classpath/lib/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.class
deleted file mode 100644
index 6be9b03b26b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultHighlighter.class b/libjava/classpath/lib/javax/swing/text/DefaultHighlighter.class
deleted file mode 100644
index cc105ee62df..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultHighlighter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.class b/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.class
deleted file mode 100644
index 1d2bcd8ce23..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.class b/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.class
deleted file mode 100644
index f64b587d337..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$ElementBuffer.class b/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$ElementBuffer.class
deleted file mode 100644
index d9bd130e70f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$ElementBuffer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$ElementSpec.class b/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$ElementSpec.class
deleted file mode 100644
index b82e7253033..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$ElementSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$SectionElement.class b/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$SectionElement.class
deleted file mode 100644
index 277c1a82e27..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$SectionElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$StyleChangeListener.class b/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$StyleChangeListener.class
deleted file mode 100644
index bfbd3b8330c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument$StyleChangeListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument.class b/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument.class
deleted file mode 100644
index 7b337be5fd8..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultStyledDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DefaultTextUI.class b/libjava/classpath/lib/javax/swing/text/DefaultTextUI.class
deleted file mode 100644
index 49557e64000..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DefaultTextUI.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Document.class b/libjava/classpath/lib/javax/swing/text/Document.class
deleted file mode 100644
index 5ab171003b1..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Document.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DocumentFilter$FilterBypass.class b/libjava/classpath/lib/javax/swing/text/DocumentFilter$FilterBypass.class
deleted file mode 100644
index bbf919d73f9..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DocumentFilter$FilterBypass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/DocumentFilter.class b/libjava/classpath/lib/javax/swing/text/DocumentFilter.class
deleted file mode 100644
index a218a8d1773..00000000000
--- a/libjava/classpath/lib/javax/swing/text/DocumentFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/EditorKit.class b/libjava/classpath/lib/javax/swing/text/EditorKit.class
deleted file mode 100644
index 69dcec6862a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/EditorKit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Element.class b/libjava/classpath/lib/javax/swing/text/Element.class
deleted file mode 100644
index 570363d41b2..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Element.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ElementIterator$ElementRef.class b/libjava/classpath/lib/javax/swing/text/ElementIterator$ElementRef.class
deleted file mode 100644
index 577995ffe67..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ElementIterator$ElementRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ElementIterator.class b/libjava/classpath/lib/javax/swing/text/ElementIterator.class
deleted file mode 100644
index 637badf0c0c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ElementIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/EmptyAttributeSet$1.class b/libjava/classpath/lib/javax/swing/text/EmptyAttributeSet$1.class
deleted file mode 100644
index 3d7afc62a65..00000000000
--- a/libjava/classpath/lib/javax/swing/text/EmptyAttributeSet$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/EmptyAttributeSet.class b/libjava/classpath/lib/javax/swing/text/EmptyAttributeSet.class
deleted file mode 100644
index d55c939b23f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/EmptyAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/FieldView$1.class b/libjava/classpath/lib/javax/swing/text/FieldView$1.class
deleted file mode 100644
index efb6ff46a0b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/FieldView$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/FieldView.class b/libjava/classpath/lib/javax/swing/text/FieldView.class
deleted file mode 100644
index 9d418263272..00000000000
--- a/libjava/classpath/lib/javax/swing/text/FieldView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/FlowView$FlowStrategy.class b/libjava/classpath/lib/javax/swing/text/FlowView$FlowStrategy.class
deleted file mode 100644
index a0935b8c622..00000000000
--- a/libjava/classpath/lib/javax/swing/text/FlowView$FlowStrategy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/FlowView$LogicalView.class b/libjava/classpath/lib/javax/swing/text/FlowView$LogicalView.class
deleted file mode 100644
index 986ef604d1f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/FlowView$LogicalView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/FlowView.class b/libjava/classpath/lib/javax/swing/text/FlowView.class
deleted file mode 100644
index 96290080af6..00000000000
--- a/libjava/classpath/lib/javax/swing/text/FlowView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/GapContent$GapContentPosition.class b/libjava/classpath/lib/javax/swing/text/GapContent$GapContentPosition.class
deleted file mode 100644
index 30f5260fb17..00000000000
--- a/libjava/classpath/lib/javax/swing/text/GapContent$GapContentPosition.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/GapContent$InsertUndo.class b/libjava/classpath/lib/javax/swing/text/GapContent$InsertUndo.class
deleted file mode 100644
index f93ebd0b84a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/GapContent$InsertUndo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/GapContent$Mark.class b/libjava/classpath/lib/javax/swing/text/GapContent$Mark.class
deleted file mode 100644
index be06f267c50..00000000000
--- a/libjava/classpath/lib/javax/swing/text/GapContent$Mark.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/GapContent$UndoPosRef.class b/libjava/classpath/lib/javax/swing/text/GapContent$UndoPosRef.class
deleted file mode 100644
index 8e149e7648f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/GapContent$UndoPosRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/GapContent$UndoRemove.class b/libjava/classpath/lib/javax/swing/text/GapContent$UndoRemove.class
deleted file mode 100644
index 3ecf5adaa22..00000000000
--- a/libjava/classpath/lib/javax/swing/text/GapContent$UndoRemove.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/GapContent.class b/libjava/classpath/lib/javax/swing/text/GapContent.class
deleted file mode 100644
index e7049f20145..00000000000
--- a/libjava/classpath/lib/javax/swing/text/GapContent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/GlyphView$DefaultGlyphPainter.class b/libjava/classpath/lib/javax/swing/text/GlyphView$DefaultGlyphPainter.class
deleted file mode 100644
index 0d82c97bf94..00000000000
--- a/libjava/classpath/lib/javax/swing/text/GlyphView$DefaultGlyphPainter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/GlyphView$GlyphPainter.class b/libjava/classpath/lib/javax/swing/text/GlyphView$GlyphPainter.class
deleted file mode 100644
index 99cc4f7c7d9..00000000000
--- a/libjava/classpath/lib/javax/swing/text/GlyphView$GlyphPainter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/GlyphView$J2DGlyphPainter.class b/libjava/classpath/lib/javax/swing/text/GlyphView$J2DGlyphPainter.class
deleted file mode 100644
index 494252752db..00000000000
--- a/libjava/classpath/lib/javax/swing/text/GlyphView$J2DGlyphPainter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/GlyphView.class b/libjava/classpath/lib/javax/swing/text/GlyphView.class
deleted file mode 100644
index 7beb2ba0679..00000000000
--- a/libjava/classpath/lib/javax/swing/text/GlyphView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Highlighter$Highlight.class b/libjava/classpath/lib/javax/swing/text/Highlighter$Highlight.class
deleted file mode 100644
index e3a6714b0e2..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Highlighter$Highlight.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Highlighter$HighlightPainter.class b/libjava/classpath/lib/javax/swing/text/Highlighter$HighlightPainter.class
deleted file mode 100644
index e41f610f199..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Highlighter$HighlightPainter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Highlighter.class b/libjava/classpath/lib/javax/swing/text/Highlighter.class
deleted file mode 100644
index 0fbd97938f0..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Highlighter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/IconView.class b/libjava/classpath/lib/javax/swing/text/IconView.class
deleted file mode 100644
index b26039157b2..00000000000
--- a/libjava/classpath/lib/javax/swing/text/IconView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/InternationalFormatter.class b/libjava/classpath/lib/javax/swing/text/InternationalFormatter.class
deleted file mode 100644
index dbf03823c08..00000000000
--- a/libjava/classpath/lib/javax/swing/text/InternationalFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/JTextComponent$AccessibleJTextComponent.class b/libjava/classpath/lib/javax/swing/text/JTextComponent$AccessibleJTextComponent.class
deleted file mode 100644
index e1d0af2c71c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/JTextComponent$AccessibleJTextComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/JTextComponent$DefaultKeymap.class b/libjava/classpath/lib/javax/swing/text/JTextComponent$DefaultKeymap.class
deleted file mode 100644
index 997fa67a757..00000000000
--- a/libjava/classpath/lib/javax/swing/text/JTextComponent$DefaultKeymap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/JTextComponent$DefaultTransferHandler.class b/libjava/classpath/lib/javax/swing/text/JTextComponent$DefaultTransferHandler.class
deleted file mode 100644
index 8533861a6e0..00000000000
--- a/libjava/classpath/lib/javax/swing/text/JTextComponent$DefaultTransferHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/JTextComponent$KeyBinding.class b/libjava/classpath/lib/javax/swing/text/JTextComponent$KeyBinding.class
deleted file mode 100644
index bf2683d47d4..00000000000
--- a/libjava/classpath/lib/javax/swing/text/JTextComponent$KeyBinding.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/JTextComponent$KeymapActionMap.class b/libjava/classpath/lib/javax/swing/text/JTextComponent$KeymapActionMap.class
deleted file mode 100644
index 8a4084e18db..00000000000
--- a/libjava/classpath/lib/javax/swing/text/JTextComponent$KeymapActionMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/JTextComponent$KeymapWrapper.class b/libjava/classpath/lib/javax/swing/text/JTextComponent$KeymapWrapper.class
deleted file mode 100644
index 13d41ade175..00000000000
--- a/libjava/classpath/lib/javax/swing/text/JTextComponent$KeymapWrapper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/JTextComponent.class b/libjava/classpath/lib/javax/swing/text/JTextComponent.class
deleted file mode 100644
index f09c72a5884..00000000000
--- a/libjava/classpath/lib/javax/swing/text/JTextComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Keymap.class b/libjava/classpath/lib/javax/swing/text/Keymap.class
deleted file mode 100644
index 25ae0f367fe..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Keymap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/LabelView.class b/libjava/classpath/lib/javax/swing/text/LabelView.class
deleted file mode 100644
index d3c1a6dde3a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/LabelView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/LayeredHighlighter$LayerPainter.class b/libjava/classpath/lib/javax/swing/text/LayeredHighlighter$LayerPainter.class
deleted file mode 100644
index 6a0619ff47f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/LayeredHighlighter$LayerPainter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/LayeredHighlighter.class b/libjava/classpath/lib/javax/swing/text/LayeredHighlighter.class
deleted file mode 100644
index cca3bf2328a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/LayeredHighlighter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/LayoutQueue.class b/libjava/classpath/lib/javax/swing/text/LayoutQueue.class
deleted file mode 100644
index 83e7a1767d9..00000000000
--- a/libjava/classpath/lib/javax/swing/text/LayoutQueue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/MaskFormatter.class b/libjava/classpath/lib/javax/swing/text/MaskFormatter.class
deleted file mode 100644
index 559193a6692..00000000000
--- a/libjava/classpath/lib/javax/swing/text/MaskFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/MutableAttributeSet.class b/libjava/classpath/lib/javax/swing/text/MutableAttributeSet.class
deleted file mode 100644
index bd96badde5e..00000000000
--- a/libjava/classpath/lib/javax/swing/text/MutableAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/NavigationFilter$FilterBypass.class b/libjava/classpath/lib/javax/swing/text/NavigationFilter$FilterBypass.class
deleted file mode 100644
index 1ce6a3cce50..00000000000
--- a/libjava/classpath/lib/javax/swing/text/NavigationFilter$FilterBypass.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/NavigationFilter.class b/libjava/classpath/lib/javax/swing/text/NavigationFilter.class
deleted file mode 100644
index 6fec1f4d90f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/NavigationFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/NumberFormatter.class b/libjava/classpath/lib/javax/swing/text/NumberFormatter.class
deleted file mode 100644
index 1074629e649..00000000000
--- a/libjava/classpath/lib/javax/swing/text/NumberFormatter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ParagraphView$Row.class b/libjava/classpath/lib/javax/swing/text/ParagraphView$Row.class
deleted file mode 100644
index ab9c2654c5d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ParagraphView$Row.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ParagraphView.class b/libjava/classpath/lib/javax/swing/text/ParagraphView.class
deleted file mode 100644
index 5787f0dd392..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ParagraphView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/PasswordView.class b/libjava/classpath/lib/javax/swing/text/PasswordView.class
deleted file mode 100644
index 565d0122173..00000000000
--- a/libjava/classpath/lib/javax/swing/text/PasswordView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/PlainDocument.class b/libjava/classpath/lib/javax/swing/text/PlainDocument.class
deleted file mode 100644
index d368e00790f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/PlainDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/PlainView.class b/libjava/classpath/lib/javax/swing/text/PlainView.class
deleted file mode 100644
index abfdc19898d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/PlainView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Position$Bias.class b/libjava/classpath/lib/javax/swing/text/Position$Bias.class
deleted file mode 100644
index 2a0537c4407..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Position$Bias.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Position.class b/libjava/classpath/lib/javax/swing/text/Position.class
deleted file mode 100644
index f012482fff9..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Position.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Segment.class b/libjava/classpath/lib/javax/swing/text/Segment.class
deleted file mode 100644
index 05c0e8334d8..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Segment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/SimpleAttributeSet.class b/libjava/classpath/lib/javax/swing/text/SimpleAttributeSet.class
deleted file mode 100644
index 3c824ac1914..00000000000
--- a/libjava/classpath/lib/javax/swing/text/SimpleAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StringContent$InsertUndo.class b/libjava/classpath/lib/javax/swing/text/StringContent$InsertUndo.class
deleted file mode 100644
index 9d51c6520dd..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StringContent$InsertUndo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StringContent$Mark.class b/libjava/classpath/lib/javax/swing/text/StringContent$Mark.class
deleted file mode 100644
index 67d60a2a84f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StringContent$Mark.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StringContent$RemoveUndo.class b/libjava/classpath/lib/javax/swing/text/StringContent$RemoveUndo.class
deleted file mode 100644
index 4fc5da651d2..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StringContent$RemoveUndo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StringContent$StickyPosition.class b/libjava/classpath/lib/javax/swing/text/StringContent$StickyPosition.class
deleted file mode 100644
index 6059d22c681..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StringContent$StickyPosition.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StringContent$UndoPosRef.class b/libjava/classpath/lib/javax/swing/text/StringContent$UndoPosRef.class
deleted file mode 100644
index 7e2c2d44814..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StringContent$UndoPosRef.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StringContent.class b/libjava/classpath/lib/javax/swing/text/StringContent.class
deleted file mode 100644
index 702d514aefd..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StringContent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Style.class b/libjava/classpath/lib/javax/swing/text/Style.class
deleted file mode 100644
index f1a81cfb7f2..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Style.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyleConstants$CharacterConstants.class b/libjava/classpath/lib/javax/swing/text/StyleConstants$CharacterConstants.class
deleted file mode 100644
index fc27c45be26..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyleConstants$CharacterConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyleConstants$ColorConstants.class b/libjava/classpath/lib/javax/swing/text/StyleConstants$ColorConstants.class
deleted file mode 100644
index 7708186ad10..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyleConstants$ColorConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyleConstants$FontConstants.class b/libjava/classpath/lib/javax/swing/text/StyleConstants$FontConstants.class
deleted file mode 100644
index 7fd6ac1cf97..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyleConstants$FontConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyleConstants$ParagraphConstants.class b/libjava/classpath/lib/javax/swing/text/StyleConstants$ParagraphConstants.class
deleted file mode 100644
index 86b02b7853d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyleConstants$ParagraphConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyleConstants.class b/libjava/classpath/lib/javax/swing/text/StyleConstants.class
deleted file mode 100644
index 608bff99481..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyleConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyleContext$1.class b/libjava/classpath/lib/javax/swing/text/StyleContext$1.class
deleted file mode 100644
index 4cd8a5c34ee..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyleContext$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyleContext$NamedStyle.class b/libjava/classpath/lib/javax/swing/text/StyleContext$NamedStyle.class
deleted file mode 100644
index 4acf9cdb139..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyleContext$NamedStyle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyleContext$SimpleFontSpec.class b/libjava/classpath/lib/javax/swing/text/StyleContext$SimpleFontSpec.class
deleted file mode 100644
index 6f05bbdfbc2..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyleContext$SimpleFontSpec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyleContext$SmallAttributeSet.class b/libjava/classpath/lib/javax/swing/text/StyleContext$SmallAttributeSet.class
deleted file mode 100644
index a4926f9f810..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyleContext$SmallAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyleContext.class b/libjava/classpath/lib/javax/swing/text/StyleContext.class
deleted file mode 100644
index 0940dedc938..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyleContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledDocument.class b/libjava/classpath/lib/javax/swing/text/StyledDocument.class
deleted file mode 100644
index 3dc29db899b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$AlignmentAction.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit$AlignmentAction.class
deleted file mode 100644
index b07b5f9d7e6..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$AlignmentAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$BoldAction.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit$BoldAction.class
deleted file mode 100644
index 26c3dd8d3b9..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$BoldAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$CaretTracker.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit$CaretTracker.class
deleted file mode 100644
index 4e47402fb70..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$CaretTracker.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$FontFamilyAction.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit$FontFamilyAction.class
deleted file mode 100644
index 3af0af3b9ed..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$FontFamilyAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$FontSizeAction.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit$FontSizeAction.class
deleted file mode 100644
index f0040b9a786..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$FontSizeAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$ForegroundAction.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit$ForegroundAction.class
deleted file mode 100644
index c558c738823..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$ForegroundAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$ItalicAction.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit$ItalicAction.class
deleted file mode 100644
index 1ba3c954860..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$ItalicAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$StyledTextAction.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit$StyledTextAction.class
deleted file mode 100644
index 93f945cea0c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$StyledTextAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$StyledViewFactory.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit$StyledViewFactory.class
deleted file mode 100644
index 732142fa665..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$StyledViewFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$UnderlineAction.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit$UnderlineAction.class
deleted file mode 100644
index 094bd861d17..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit$UnderlineAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/StyledEditorKit.class b/libjava/classpath/lib/javax/swing/text/StyledEditorKit.class
deleted file mode 100644
index de57fff624d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/StyledEditorKit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/TabExpander.class b/libjava/classpath/lib/javax/swing/text/TabExpander.class
deleted file mode 100644
index 8ccec42d3e4..00000000000
--- a/libjava/classpath/lib/javax/swing/text/TabExpander.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/TabSet.class b/libjava/classpath/lib/javax/swing/text/TabSet.class
deleted file mode 100644
index 5f0b6405411..00000000000
--- a/libjava/classpath/lib/javax/swing/text/TabSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/TabStop.class b/libjava/classpath/lib/javax/swing/text/TabStop.class
deleted file mode 100644
index 8c1ae34f448..00000000000
--- a/libjava/classpath/lib/javax/swing/text/TabStop.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/TabableView.class b/libjava/classpath/lib/javax/swing/text/TabableView.class
deleted file mode 100644
index ff97f36977a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/TabableView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/TableView$TableCell.class b/libjava/classpath/lib/javax/swing/text/TableView$TableCell.class
deleted file mode 100644
index c34ef73e7ea..00000000000
--- a/libjava/classpath/lib/javax/swing/text/TableView$TableCell.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/TableView$TableRow.class b/libjava/classpath/lib/javax/swing/text/TableView$TableRow.class
deleted file mode 100644
index debc2f3af5f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/TableView$TableRow.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/TableView.class b/libjava/classpath/lib/javax/swing/text/TableView.class
deleted file mode 100644
index b847e01fb48..00000000000
--- a/libjava/classpath/lib/javax/swing/text/TableView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/TextAction$HorizontalMovementAction.class b/libjava/classpath/lib/javax/swing/text/TextAction$HorizontalMovementAction.class
deleted file mode 100644
index 69fb6f9eab9..00000000000
--- a/libjava/classpath/lib/javax/swing/text/TextAction$HorizontalMovementAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/TextAction$VerticalMovementAction.class b/libjava/classpath/lib/javax/swing/text/TextAction$VerticalMovementAction.class
deleted file mode 100644
index 46d5d0e7d91..00000000000
--- a/libjava/classpath/lib/javax/swing/text/TextAction$VerticalMovementAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/TextAction.class b/libjava/classpath/lib/javax/swing/text/TextAction.class
deleted file mode 100644
index 6086f9b7bad..00000000000
--- a/libjava/classpath/lib/javax/swing/text/TextAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/Utilities.class b/libjava/classpath/lib/javax/swing/text/Utilities.class
deleted file mode 100644
index 21634649389..00000000000
--- a/libjava/classpath/lib/javax/swing/text/Utilities.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/View.class b/libjava/classpath/lib/javax/swing/text/View.class
deleted file mode 100644
index 5eaa2fcc254..00000000000
--- a/libjava/classpath/lib/javax/swing/text/View.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ViewFactory.class b/libjava/classpath/lib/javax/swing/text/ViewFactory.class
deleted file mode 100644
index c7095d06114..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ViewFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/WrappedPlainView$WrappedLine.class b/libjava/classpath/lib/javax/swing/text/WrappedPlainView$WrappedLine.class
deleted file mode 100644
index 71d3cf04e1b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/WrappedPlainView$WrappedLine.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/WrappedPlainView$WrappedLineCreator.class b/libjava/classpath/lib/javax/swing/text/WrappedPlainView$WrappedLineCreator.class
deleted file mode 100644
index 4584e771cc4..00000000000
--- a/libjava/classpath/lib/javax/swing/text/WrappedPlainView$WrappedLineCreator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/WrappedPlainView.class b/libjava/classpath/lib/javax/swing/text/WrappedPlainView.class
deleted file mode 100644
index ee618df9480..00000000000
--- a/libjava/classpath/lib/javax/swing/text/WrappedPlainView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ZoneView$Zone.class b/libjava/classpath/lib/javax/swing/text/ZoneView$Zone.class
deleted file mode 100644
index 028b41630fd..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ZoneView$Zone.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/ZoneView.class b/libjava/classpath/lib/javax/swing/text/ZoneView.class
deleted file mode 100644
index 875dce6d15a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/ZoneView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/BRView.class b/libjava/classpath/lib/javax/swing/text/html/BRView.class
deleted file mode 100644
index 19fbd09ee88..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/BRView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/BlockView$PositionInfo.class b/libjava/classpath/lib/javax/swing/text/html/BlockView$PositionInfo.class
deleted file mode 100644
index 0eabccb9d11..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/BlockView$PositionInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/BlockView.class b/libjava/classpath/lib/javax/swing/text/html/BlockView.class
deleted file mode 100644
index 3fd6a862524..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/BlockView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/CSS$Attribute.class b/libjava/classpath/lib/javax/swing/text/html/CSS$Attribute.class
deleted file mode 100644
index 0779b12ac5d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/CSS$Attribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/CSS.class b/libjava/classpath/lib/javax/swing/text/html/CSS.class
deleted file mode 100644
index f280debf7f5..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/CSS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/CSSBorder.class b/libjava/classpath/lib/javax/swing/text/html/CSSBorder.class
deleted file mode 100644
index 35a0c37fe55..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/CSSBorder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/CSSParser$CSSParserCallback.class b/libjava/classpath/lib/javax/swing/text/html/CSSParser$CSSParserCallback.class
deleted file mode 100644
index 54ae9959a79..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/CSSParser$CSSParserCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/CSSParser.class b/libjava/classpath/lib/javax/swing/text/html/CSSParser.class
deleted file mode 100644
index 6d5c4bf18a2..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/CSSParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/FormSubmitEvent$MethodType.class b/libjava/classpath/lib/javax/swing/text/html/FormSubmitEvent$MethodType.class
deleted file mode 100644
index bb06e1a26e9..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/FormSubmitEvent$MethodType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/FormSubmitEvent.class b/libjava/classpath/lib/javax/swing/text/html/FormSubmitEvent.class
deleted file mode 100644
index 8d88b68492a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/FormSubmitEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/FormView$1.class b/libjava/classpath/lib/javax/swing/text/html/FormView$1.class
deleted file mode 100644
index e7150e51d57..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/FormView$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/FormView$MouseEventListener.class b/libjava/classpath/lib/javax/swing/text/html/FormView$MouseEventListener.class
deleted file mode 100644
index 36bcaf90f8e..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/FormView$MouseEventListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/FormView$SubmitThread.class b/libjava/classpath/lib/javax/swing/text/html/FormView$SubmitThread.class
deleted file mode 100644
index 0d165d5cc90..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/FormView$SubmitThread.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/FormView.class b/libjava/classpath/lib/javax/swing/text/html/FormView.class
deleted file mode 100644
index 7106e678b19..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/FormView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/FrameSetView$FrameSetRow.class b/libjava/classpath/lib/javax/swing/text/html/FrameSetView$FrameSetRow.class
deleted file mode 100644
index 3f42594ba1c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/FrameSetView$FrameSetRow.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/FrameSetView.class b/libjava/classpath/lib/javax/swing/text/html/FrameSetView.class
deleted file mode 100644
index 94563153c10..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/FrameSetView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/FrameView.class b/libjava/classpath/lib/javax/swing/text/html/FrameView.class
deleted file mode 100644
index 3647ada8616..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/FrameView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HRuleView$Beginning.class b/libjava/classpath/lib/javax/swing/text/html/HRuleView$Beginning.class
deleted file mode 100644
index 0bb2b9dd4fc..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HRuleView$Beginning.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HRuleView.class b/libjava/classpath/lib/javax/swing/text/html/HRuleView.class
deleted file mode 100644
index f46068aa2e2..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HRuleView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTML$Attribute.class b/libjava/classpath/lib/javax/swing/text/html/HTML$Attribute.class
deleted file mode 100644
index 25f00b39294..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTML$Attribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTML$Tag.class b/libjava/classpath/lib/javax/swing/text/html/HTML$Tag.class
deleted file mode 100644
index 2682132d0b5..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTML$Tag.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTML$UnknownTag.class b/libjava/classpath/lib/javax/swing/text/html/HTML$UnknownTag.class
deleted file mode 100644
index ed609566277..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTML$UnknownTag.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTML.class b/libjava/classpath/lib/javax/swing/text/html/HTML.class
deleted file mode 100644
index 26fdd6560ac..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTML.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$1.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$1.class
deleted file mode 100644
index 3d384fcacce..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$BlockElement.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$BlockElement.class
deleted file mode 100644
index f6983d22edc..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$BlockElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.class
deleted file mode 100644
index 17a861a4720..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.class
deleted file mode 100644
index cfcdfed6a10..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.class
deleted file mode 100644
index 3a80c00a3b0..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.class
deleted file mode 100644
index eac8191165e..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.class
deleted file mode 100644
index 3bd220bace5..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.class
deleted file mode 100644
index 9038189c271..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.class
deleted file mode 100644
index 6d96515e8cd..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.class
deleted file mode 100644
index 3041c702579..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.class
deleted file mode 100644
index 17488d86e2c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.class
deleted file mode 100644
index e203cc5efae..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.class
deleted file mode 100644
index 13c0d252201..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.class
deleted file mode 100644
index 81ac765d8b3..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.class
deleted file mode 100644
index dddcb3aa39e..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.class
deleted file mode 100644
index 1d59925575a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.class
deleted file mode 100644
index d7e98e8c4a4..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.class
deleted file mode 100644
index a89dee3160d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.class
deleted file mode 100644
index f8b2c596cb1..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.class
deleted file mode 100644
index aa62c081213..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.class
deleted file mode 100644
index 67d7bd79125..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader.class
deleted file mode 100644
index c44c2b487a7..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$HTMLReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$Iterator.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$Iterator.class
deleted file mode 100644
index 69a2c5f896d..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$Iterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$LeafIterator.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$LeafIterator.class
deleted file mode 100644
index 352cfc6af26..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$LeafIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$RunElement.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$RunElement.class
deleted file mode 100644
index 0ce0da0d4e4..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument$RunElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument.class b/libjava/classpath/lib/javax/swing/text/html/HTMLDocument.class
deleted file mode 100644
index ff4b4494a17..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$HTMLFactory.class b/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$HTMLFactory.class
deleted file mode 100644
index b4fb846a70f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$HTMLFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.class
deleted file mode 100644
index fb0a05c54d6..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.class b/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.class
deleted file mode 100644
index 86637748adb..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$LinkController.class b/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$LinkController.class
deleted file mode 100644
index 8d94d0ee483..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$LinkController.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$Parser.class b/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$Parser.class
deleted file mode 100644
index 0024d89ae21..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$Parser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$ParserCallback.class b/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$ParserCallback.class
deleted file mode 100644
index 881a9977f2b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit$ParserCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit.class b/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit.class
deleted file mode 100644
index 6d826cf4248..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLEditorKit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLFrameHyperlinkEvent.class b/libjava/classpath/lib/javax/swing/text/html/HTMLFrameHyperlinkEvent.class
deleted file mode 100644
index f5bf05f036c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLFrameHyperlinkEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/HTMLWriter.class b/libjava/classpath/lib/javax/swing/text/html/HTMLWriter.class
deleted file mode 100644
index 25f8193c05a..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/HTMLWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/ImageView$1.class b/libjava/classpath/lib/javax/swing/text/html/ImageView$1.class
deleted file mode 100644
index 1785831cca1..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/ImageView$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/ImageView$Observer.class b/libjava/classpath/lib/javax/swing/text/html/ImageView$Observer.class
deleted file mode 100644
index b919707dcfe..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/ImageView$Observer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/ImageView.class b/libjava/classpath/lib/javax/swing/text/html/ImageView.class
deleted file mode 100644
index dfd71640a9e..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/ImageView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/InlineView.class b/libjava/classpath/lib/javax/swing/text/html/InlineView.class
deleted file mode 100644
index b29d69cbb1f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/InlineView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/ListView.class b/libjava/classpath/lib/javax/swing/text/html/ListView.class
deleted file mode 100644
index cb6c12004e3..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/ListView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/MinimalHTMLWriter.class b/libjava/classpath/lib/javax/swing/text/html/MinimalHTMLWriter.class
deleted file mode 100644
index 864c6d2597c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/MinimalHTMLWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.class b/libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.class
deleted file mode 100644
index 8ed0c9e12dc..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet.class b/libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet.class
deleted file mode 100644
index 535ec932b08..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/MultiAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/MultiStyle.class b/libjava/classpath/lib/javax/swing/text/html/MultiStyle.class
deleted file mode 100644
index 3904a2c29c3..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/MultiStyle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/NullView.class b/libjava/classpath/lib/javax/swing/text/html/NullView.class
deleted file mode 100644
index 9974854e5e8..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/NullView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/ObjectView.class b/libjava/classpath/lib/javax/swing/text/html/ObjectView.class
deleted file mode 100644
index b2004547c1b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/ObjectView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/Option.class b/libjava/classpath/lib/javax/swing/text/html/Option.class
deleted file mode 100644
index ea2adad2814..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/Option.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/ParagraphView.class b/libjava/classpath/lib/javax/swing/text/html/ParagraphView.class
deleted file mode 100644
index 6666ae95454..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/ParagraphView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/ResetableModel.class b/libjava/classpath/lib/javax/swing/text/html/ResetableModel.class
deleted file mode 100644
index b575bf74e01..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/ResetableModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/ResetablePlainDocument.class b/libjava/classpath/lib/javax/swing/text/html/ResetablePlainDocument.class
deleted file mode 100644
index 9094df441a8..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/ResetablePlainDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/ResetableToggleButtonModel.class b/libjava/classpath/lib/javax/swing/text/html/ResetableToggleButtonModel.class
deleted file mode 100644
index 1d21f8bcf8c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/ResetableToggleButtonModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/SelectComboBoxModel.class b/libjava/classpath/lib/javax/swing/text/html/SelectComboBoxModel.class
deleted file mode 100644
index 9811870ceae..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/SelectComboBoxModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/SelectListModel.class b/libjava/classpath/lib/javax/swing/text/html/SelectListModel.class
deleted file mode 100644
index 1145a769734..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/SelectListModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/StyleSheet$BoxPainter.class b/libjava/classpath/lib/javax/swing/text/html/StyleSheet$BoxPainter.class
deleted file mode 100644
index 6541ceb6e2c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/StyleSheet$BoxPainter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/StyleSheet$CSSStyle.class b/libjava/classpath/lib/javax/swing/text/html/StyleSheet$CSSStyle.class
deleted file mode 100644
index 790a40929cd..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/StyleSheet$CSSStyle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.class b/libjava/classpath/lib/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.class
deleted file mode 100644
index fdac1951550..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/StyleSheet$ListPainter.class b/libjava/classpath/lib/javax/swing/text/html/StyleSheet$ListPainter.class
deleted file mode 100644
index fa48de61f66..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/StyleSheet$ListPainter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/StyleSheet.class b/libjava/classpath/lib/javax/swing/text/html/StyleSheet.class
deleted file mode 100644
index 10297ecac08..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/StyleSheet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/TableView$CellView.class b/libjava/classpath/lib/javax/swing/text/html/TableView$CellView.class
deleted file mode 100644
index 13eb086dd27..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/TableView$CellView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/TableView$RowView.class b/libjava/classpath/lib/javax/swing/text/html/TableView$RowView.class
deleted file mode 100644
index b16dedc8ecc..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/TableView$RowView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/TableView.class b/libjava/classpath/lib/javax/swing/text/html/TableView.class
deleted file mode 100644
index 0dfa3ef4b3f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/TableView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/ViewAttributeSet.class b/libjava/classpath/lib/javax/swing/text/html/ViewAttributeSet.class
deleted file mode 100644
index 9f6957ee6b3..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/ViewAttributeSet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/AttributeList$1.class b/libjava/classpath/lib/javax/swing/text/html/parser/AttributeList$1.class
deleted file mode 100644
index ad5c0718fc5..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/AttributeList$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/AttributeList.class b/libjava/classpath/lib/javax/swing/text/html/parser/AttributeList.class
deleted file mode 100644
index 20291190cf5..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/AttributeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/ContentModel.class b/libjava/classpath/lib/javax/swing/text/html/parser/ContentModel.class
deleted file mode 100644
index 599a5cf4070..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/ContentModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/DTD.class b/libjava/classpath/lib/javax/swing/text/html/parser/DTD.class
deleted file mode 100644
index a73805875b5..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/DTD.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/DTDConstants.class b/libjava/classpath/lib/javax/swing/text/html/parser/DTDConstants.class
deleted file mode 100644
index 8cf09fd9cad..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/DTDConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/DocumentParser$gnuParser.class b/libjava/classpath/lib/javax/swing/text/html/parser/DocumentParser$gnuParser.class
deleted file mode 100644
index 92d8752193b..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/DocumentParser$gnuParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/DocumentParser.class b/libjava/classpath/lib/javax/swing/text/html/parser/DocumentParser.class
deleted file mode 100644
index 6a70fbd5315..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/DocumentParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/Element$1.class b/libjava/classpath/lib/javax/swing/text/html/parser/Element$1.class
deleted file mode 100644
index d3f745db417..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/Element$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/Element.class b/libjava/classpath/lib/javax/swing/text/html/parser/Element.class
deleted file mode 100644
index a068f251f6c..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/Element.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/Entity$1.class b/libjava/classpath/lib/javax/swing/text/html/parser/Entity$1.class
deleted file mode 100644
index 6eeb20c28ea..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/Entity$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/Entity.class b/libjava/classpath/lib/javax/swing/text/html/parser/Entity.class
deleted file mode 100644
index 9c880cf76f6..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/Entity.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/Parser$1.class b/libjava/classpath/lib/javax/swing/text/html/parser/Parser$1.class
deleted file mode 100644
index 85e12baf8f9..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/Parser$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/Parser.class b/libjava/classpath/lib/javax/swing/text/html/parser/Parser.class
deleted file mode 100644
index 724947dffe7..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/Parser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/ParserDelegator$gnuParser.class b/libjava/classpath/lib/javax/swing/text/html/parser/ParserDelegator$gnuParser.class
deleted file mode 100644
index 004c1b2eefe..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/ParserDelegator$gnuParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/ParserDelegator.class b/libjava/classpath/lib/javax/swing/text/html/parser/ParserDelegator.class
deleted file mode 100644
index ab5aa696b32..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/ParserDelegator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/html/parser/TagElement.class b/libjava/classpath/lib/javax/swing/text/html/parser/TagElement.class
deleted file mode 100644
index 68799b24b0f..00000000000
--- a/libjava/classpath/lib/javax/swing/text/html/parser/TagElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/rtf/ControlWordToken.class b/libjava/classpath/lib/javax/swing/text/rtf/ControlWordToken.class
deleted file mode 100644
index f6a4d24e091..00000000000
--- a/libjava/classpath/lib/javax/swing/text/rtf/ControlWordToken.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/rtf/RTFEditorKit.class b/libjava/classpath/lib/javax/swing/text/rtf/RTFEditorKit.class
deleted file mode 100644
index 38637c8c306..00000000000
--- a/libjava/classpath/lib/javax/swing/text/rtf/RTFEditorKit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/rtf/RTFParseException.class b/libjava/classpath/lib/javax/swing/text/rtf/RTFParseException.class
deleted file mode 100644
index 94fb912eb68..00000000000
--- a/libjava/classpath/lib/javax/swing/text/rtf/RTFParseException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/rtf/RTFParser.class b/libjava/classpath/lib/javax/swing/text/rtf/RTFParser.class
deleted file mode 100644
index 279e1e009af..00000000000
--- a/libjava/classpath/lib/javax/swing/text/rtf/RTFParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/rtf/RTFScanner.class b/libjava/classpath/lib/javax/swing/text/rtf/RTFScanner.class
deleted file mode 100644
index f109f547ec7..00000000000
--- a/libjava/classpath/lib/javax/swing/text/rtf/RTFScanner.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/rtf/TextToken.class b/libjava/classpath/lib/javax/swing/text/rtf/TextToken.class
deleted file mode 100644
index a9de6ed97f5..00000000000
--- a/libjava/classpath/lib/javax/swing/text/rtf/TextToken.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/text/rtf/Token.class b/libjava/classpath/lib/javax/swing/text/rtf/Token.class
deleted file mode 100644
index 4d06562fcc8..00000000000
--- a/libjava/classpath/lib/javax/swing/text/rtf/Token.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/AbstractLayoutCache$NodeDimensions.class b/libjava/classpath/lib/javax/swing/tree/AbstractLayoutCache$NodeDimensions.class
deleted file mode 100644
index a0b4a990abd..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/AbstractLayoutCache$NodeDimensions.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/AbstractLayoutCache.class b/libjava/classpath/lib/javax/swing/tree/AbstractLayoutCache.class
deleted file mode 100644
index f9028637232..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/AbstractLayoutCache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.class b/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.class
deleted file mode 100644
index d07fce4d2da..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.class b/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.class
deleted file mode 100644
index 1d27efaf07c..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.class b/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.class
deleted file mode 100644
index 08e011a3845..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode.class b/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode.class
deleted file mode 100644
index 77d649278f4..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultMutableTreeNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.class b/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.class
deleted file mode 100644
index 1acaf40d587..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.class b/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.class
deleted file mode 100644
index d6d1d4d496d..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellEditor.class b/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellEditor.class
deleted file mode 100644
index 39c241a3e06..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellRenderer.class b/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellRenderer.class
deleted file mode 100644
index 2bb65379580..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultTreeCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultTreeModel.class b/libjava/classpath/lib/javax/swing/tree/DefaultTreeModel.class
deleted file mode 100644
index 5df4f0621d3..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultTreeModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.class b/libjava/classpath/lib/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.class
deleted file mode 100644
index 03813c3bda6..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/DefaultTreeSelectionModel.class b/libjava/classpath/lib/javax/swing/tree/DefaultTreeSelectionModel.class
deleted file mode 100644
index e62123a128b..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/DefaultTreeSelectionModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/ExpandVetoException.class b/libjava/classpath/lib/javax/swing/tree/ExpandVetoException.class
deleted file mode 100644
index 7a6a886c846..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/ExpandVetoException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.class b/libjava/classpath/lib/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.class
deleted file mode 100644
index cb3ea86b321..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/FixedHeightLayoutCache.class b/libjava/classpath/lib/javax/swing/tree/FixedHeightLayoutCache.class
deleted file mode 100644
index 56ffb9a9990..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/FixedHeightLayoutCache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/MutableTreeNode.class b/libjava/classpath/lib/javax/swing/tree/MutableTreeNode.class
deleted file mode 100644
index 8bef869bba2..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/MutableTreeNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/RowMapper.class b/libjava/classpath/lib/javax/swing/tree/RowMapper.class
deleted file mode 100644
index c5980b074d8..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/RowMapper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/TreeCellEditor.class b/libjava/classpath/lib/javax/swing/tree/TreeCellEditor.class
deleted file mode 100644
index 2b597797085..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/TreeCellEditor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/TreeCellRenderer.class b/libjava/classpath/lib/javax/swing/tree/TreeCellRenderer.class
deleted file mode 100644
index c321ddbc1e8..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/TreeCellRenderer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/TreeModel.class b/libjava/classpath/lib/javax/swing/tree/TreeModel.class
deleted file mode 100644
index 3c277b50ced..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/TreeModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/TreeNode.class b/libjava/classpath/lib/javax/swing/tree/TreeNode.class
deleted file mode 100644
index b7cc5f7407c..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/TreeNode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/TreePath.class b/libjava/classpath/lib/javax/swing/tree/TreePath.class
deleted file mode 100644
index ba99e3f7bd2..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/TreePath.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/TreeSelectionModel.class b/libjava/classpath/lib/javax/swing/tree/TreeSelectionModel.class
deleted file mode 100644
index 7c0b606c8b4..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/TreeSelectionModel.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.class b/libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.class
deleted file mode 100644
index 1d95a1927dd..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache.class b/libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache.class
deleted file mode 100644
index dae7a864f1c..00000000000
--- a/libjava/classpath/lib/javax/swing/tree/VariableHeightLayoutCache.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/undo/AbstractUndoableEdit.class b/libjava/classpath/lib/javax/swing/undo/AbstractUndoableEdit.class
deleted file mode 100644
index ea96c60ff9a..00000000000
--- a/libjava/classpath/lib/javax/swing/undo/AbstractUndoableEdit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/undo/CannotRedoException.class b/libjava/classpath/lib/javax/swing/undo/CannotRedoException.class
deleted file mode 100644
index 7ba3fd369b8..00000000000
--- a/libjava/classpath/lib/javax/swing/undo/CannotRedoException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/undo/CannotUndoException.class b/libjava/classpath/lib/javax/swing/undo/CannotUndoException.class
deleted file mode 100644
index dbcb3b52811..00000000000
--- a/libjava/classpath/lib/javax/swing/undo/CannotUndoException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/undo/CompoundEdit.class b/libjava/classpath/lib/javax/swing/undo/CompoundEdit.class
deleted file mode 100644
index c4f37b5a63a..00000000000
--- a/libjava/classpath/lib/javax/swing/undo/CompoundEdit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/undo/StateEdit.class b/libjava/classpath/lib/javax/swing/undo/StateEdit.class
deleted file mode 100644
index 9a5067181d7..00000000000
--- a/libjava/classpath/lib/javax/swing/undo/StateEdit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/undo/StateEditable.class b/libjava/classpath/lib/javax/swing/undo/StateEditable.class
deleted file mode 100644
index fd5180f7de1..00000000000
--- a/libjava/classpath/lib/javax/swing/undo/StateEditable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/undo/UndoManager.class b/libjava/classpath/lib/javax/swing/undo/UndoManager.class
deleted file mode 100644
index de96e03119b..00000000000
--- a/libjava/classpath/lib/javax/swing/undo/UndoManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/undo/UndoableEdit.class b/libjava/classpath/lib/javax/swing/undo/UndoableEdit.class
deleted file mode 100644
index 0a469b738df..00000000000
--- a/libjava/classpath/lib/javax/swing/undo/UndoableEdit.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/swing/undo/UndoableEditSupport.class b/libjava/classpath/lib/javax/swing/undo/UndoableEditSupport.class
deleted file mode 100644
index 494247e4249..00000000000
--- a/libjava/classpath/lib/javax/swing/undo/UndoableEditSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/HeuristicCommitException.class b/libjava/classpath/lib/javax/transaction/HeuristicCommitException.class
deleted file mode 100644
index e72dad5e052..00000000000
--- a/libjava/classpath/lib/javax/transaction/HeuristicCommitException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/HeuristicMixedException.class b/libjava/classpath/lib/javax/transaction/HeuristicMixedException.class
deleted file mode 100644
index e8e0236cafa..00000000000
--- a/libjava/classpath/lib/javax/transaction/HeuristicMixedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/HeuristicRollbackException.class b/libjava/classpath/lib/javax/transaction/HeuristicRollbackException.class
deleted file mode 100644
index b0f5ecdb384..00000000000
--- a/libjava/classpath/lib/javax/transaction/HeuristicRollbackException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/InvalidTransactionException.class b/libjava/classpath/lib/javax/transaction/InvalidTransactionException.class
deleted file mode 100644
index 9143a2ebfd9..00000000000
--- a/libjava/classpath/lib/javax/transaction/InvalidTransactionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/NotSupportedException.class b/libjava/classpath/lib/javax/transaction/NotSupportedException.class
deleted file mode 100644
index f00d45b5da8..00000000000
--- a/libjava/classpath/lib/javax/transaction/NotSupportedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/RollbackException.class b/libjava/classpath/lib/javax/transaction/RollbackException.class
deleted file mode 100644
index 71e854c1553..00000000000
--- a/libjava/classpath/lib/javax/transaction/RollbackException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/Status.class b/libjava/classpath/lib/javax/transaction/Status.class
deleted file mode 100644
index 320458e4d59..00000000000
--- a/libjava/classpath/lib/javax/transaction/Status.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/Synchronization.class b/libjava/classpath/lib/javax/transaction/Synchronization.class
deleted file mode 100644
index bf49f29ba29..00000000000
--- a/libjava/classpath/lib/javax/transaction/Synchronization.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/SystemException.class b/libjava/classpath/lib/javax/transaction/SystemException.class
deleted file mode 100644
index 5a5241dcf09..00000000000
--- a/libjava/classpath/lib/javax/transaction/SystemException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/Transaction.class b/libjava/classpath/lib/javax/transaction/Transaction.class
deleted file mode 100644
index 3950b6f2bb8..00000000000
--- a/libjava/classpath/lib/javax/transaction/Transaction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/TransactionManager.class b/libjava/classpath/lib/javax/transaction/TransactionManager.class
deleted file mode 100644
index 851953b935d..00000000000
--- a/libjava/classpath/lib/javax/transaction/TransactionManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/TransactionRequiredException.class b/libjava/classpath/lib/javax/transaction/TransactionRequiredException.class
deleted file mode 100644
index 803fbf2c4ef..00000000000
--- a/libjava/classpath/lib/javax/transaction/TransactionRequiredException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/TransactionRolledbackException.class b/libjava/classpath/lib/javax/transaction/TransactionRolledbackException.class
deleted file mode 100644
index 96f5fbd04d2..00000000000
--- a/libjava/classpath/lib/javax/transaction/TransactionRolledbackException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/UserTransaction.class b/libjava/classpath/lib/javax/transaction/UserTransaction.class
deleted file mode 100644
index c86e0b79cad..00000000000
--- a/libjava/classpath/lib/javax/transaction/UserTransaction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/xa/XAException.class b/libjava/classpath/lib/javax/transaction/xa/XAException.class
deleted file mode 100644
index b029e4a49fe..00000000000
--- a/libjava/classpath/lib/javax/transaction/xa/XAException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/xa/XAResource.class b/libjava/classpath/lib/javax/transaction/xa/XAResource.class
deleted file mode 100644
index 89e80143ccd..00000000000
--- a/libjava/classpath/lib/javax/transaction/xa/XAResource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/transaction/xa/Xid.class b/libjava/classpath/lib/javax/transaction/xa/Xid.class
deleted file mode 100644
index fbc1bb6efb7..00000000000
--- a/libjava/classpath/lib/javax/transaction/xa/Xid.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/XMLConstants.class b/libjava/classpath/lib/javax/xml/XMLConstants.class
deleted file mode 100644
index 37a98b90d9c..00000000000
--- a/libjava/classpath/lib/javax/xml/XMLConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/datatype/DatatypeConfigurationException.class b/libjava/classpath/lib/javax/xml/datatype/DatatypeConfigurationException.class
deleted file mode 100644
index 0d04b2e32fa..00000000000
--- a/libjava/classpath/lib/javax/xml/datatype/DatatypeConfigurationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/datatype/DatatypeConstants$Field.class b/libjava/classpath/lib/javax/xml/datatype/DatatypeConstants$Field.class
deleted file mode 100644
index 16608fbf6a5..00000000000
--- a/libjava/classpath/lib/javax/xml/datatype/DatatypeConstants$Field.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/datatype/DatatypeConstants.class b/libjava/classpath/lib/javax/xml/datatype/DatatypeConstants.class
deleted file mode 100644
index 41c07b9a1ad..00000000000
--- a/libjava/classpath/lib/javax/xml/datatype/DatatypeConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/datatype/DatatypeFactory.class b/libjava/classpath/lib/javax/xml/datatype/DatatypeFactory.class
deleted file mode 100644
index 00b5df1affb..00000000000
--- a/libjava/classpath/lib/javax/xml/datatype/DatatypeFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/datatype/Duration.class b/libjava/classpath/lib/javax/xml/datatype/Duration.class
deleted file mode 100644
index 2e89ae6a979..00000000000
--- a/libjava/classpath/lib/javax/xml/datatype/Duration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/datatype/XMLGregorianCalendar.class b/libjava/classpath/lib/javax/xml/datatype/XMLGregorianCalendar.class
deleted file mode 100644
index acf9b9f05b7..00000000000
--- a/libjava/classpath/lib/javax/xml/datatype/XMLGregorianCalendar.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/namespace/NamespaceContext.class b/libjava/classpath/lib/javax/xml/namespace/NamespaceContext.class
deleted file mode 100644
index 38ffeeec900..00000000000
--- a/libjava/classpath/lib/javax/xml/namespace/NamespaceContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/namespace/QName.class b/libjava/classpath/lib/javax/xml/namespace/QName.class
deleted file mode 100644
index c5f6eebc3cc..00000000000
--- a/libjava/classpath/lib/javax/xml/namespace/QName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/parsers/DocumentBuilder.class b/libjava/classpath/lib/javax/xml/parsers/DocumentBuilder.class
deleted file mode 100644
index d2c08a7c395..00000000000
--- a/libjava/classpath/lib/javax/xml/parsers/DocumentBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/parsers/DocumentBuilderFactory.class b/libjava/classpath/lib/javax/xml/parsers/DocumentBuilderFactory.class
deleted file mode 100644
index 79e8ac54944..00000000000
--- a/libjava/classpath/lib/javax/xml/parsers/DocumentBuilderFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/parsers/FactoryConfigurationError.class b/libjava/classpath/lib/javax/xml/parsers/FactoryConfigurationError.class
deleted file mode 100644
index 3d5d62f3c3a..00000000000
--- a/libjava/classpath/lib/javax/xml/parsers/FactoryConfigurationError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/parsers/ParserConfigurationException.class b/libjava/classpath/lib/javax/xml/parsers/ParserConfigurationException.class
deleted file mode 100644
index 0c3635a4e05..00000000000
--- a/libjava/classpath/lib/javax/xml/parsers/ParserConfigurationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/parsers/SAXParser.class b/libjava/classpath/lib/javax/xml/parsers/SAXParser.class
deleted file mode 100644
index 4f6bd6993ff..00000000000
--- a/libjava/classpath/lib/javax/xml/parsers/SAXParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/parsers/SAXParserFactory.class b/libjava/classpath/lib/javax/xml/parsers/SAXParserFactory.class
deleted file mode 100644
index ae7d1d26eb2..00000000000
--- a/libjava/classpath/lib/javax/xml/parsers/SAXParserFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/EventFilter.class b/libjava/classpath/lib/javax/xml/stream/EventFilter.class
deleted file mode 100644
index 4fb63d7eb4f..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/EventFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/FactoryConfigurationError.class b/libjava/classpath/lib/javax/xml/stream/FactoryConfigurationError.class
deleted file mode 100644
index 3f466f1a946..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/FactoryConfigurationError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/Location.class b/libjava/classpath/lib/javax/xml/stream/Location.class
deleted file mode 100644
index b58d446e6d3..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/Location.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/StreamFilter.class b/libjava/classpath/lib/javax/xml/stream/StreamFilter.class
deleted file mode 100644
index 6f06644c2f6..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/StreamFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLEventFactory.class b/libjava/classpath/lib/javax/xml/stream/XMLEventFactory.class
deleted file mode 100644
index 3c4fbd41581..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLEventFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLEventReader.class b/libjava/classpath/lib/javax/xml/stream/XMLEventReader.class
deleted file mode 100644
index a9c00e15a10..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLEventReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLEventWriter.class b/libjava/classpath/lib/javax/xml/stream/XMLEventWriter.class
deleted file mode 100644
index 52df63a094f..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLEventWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLInputFactory.class b/libjava/classpath/lib/javax/xml/stream/XMLInputFactory.class
deleted file mode 100644
index 66894397c53..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLInputFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLOutputFactory.class b/libjava/classpath/lib/javax/xml/stream/XMLOutputFactory.class
deleted file mode 100644
index 6917a3b48ab..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLOutputFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLReporter.class b/libjava/classpath/lib/javax/xml/stream/XMLReporter.class
deleted file mode 100644
index 3aedebbd163..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLReporter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLResolver.class b/libjava/classpath/lib/javax/xml/stream/XMLResolver.class
deleted file mode 100644
index 9c4430404e6..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLStreamConstants.class b/libjava/classpath/lib/javax/xml/stream/XMLStreamConstants.class
deleted file mode 100644
index d22089d1fd8..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLStreamConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLStreamException.class b/libjava/classpath/lib/javax/xml/stream/XMLStreamException.class
deleted file mode 100644
index 2830950292d..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLStreamException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLStreamReader.class b/libjava/classpath/lib/javax/xml/stream/XMLStreamReader.class
deleted file mode 100644
index d859604faca..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLStreamReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/XMLStreamWriter.class b/libjava/classpath/lib/javax/xml/stream/XMLStreamWriter.class
deleted file mode 100644
index ad0e75fb55b..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/XMLStreamWriter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/Attribute.class b/libjava/classpath/lib/javax/xml/stream/events/Attribute.class
deleted file mode 100644
index 58f2af2966a..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/Attribute.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/Characters.class b/libjava/classpath/lib/javax/xml/stream/events/Characters.class
deleted file mode 100644
index 462083f1c21..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/Characters.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/Comment.class b/libjava/classpath/lib/javax/xml/stream/events/Comment.class
deleted file mode 100644
index 923f1b15254..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/Comment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/DTD.class b/libjava/classpath/lib/javax/xml/stream/events/DTD.class
deleted file mode 100644
index 07b6954a904..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/DTD.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/EndDocument.class b/libjava/classpath/lib/javax/xml/stream/events/EndDocument.class
deleted file mode 100644
index d7a4aa3df7e..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/EndDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/EndElement.class b/libjava/classpath/lib/javax/xml/stream/events/EndElement.class
deleted file mode 100644
index 77dcd712dcb..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/EndElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/EntityDeclaration.class b/libjava/classpath/lib/javax/xml/stream/events/EntityDeclaration.class
deleted file mode 100644
index 3df5bb2ee27..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/EntityDeclaration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/EntityReference.class b/libjava/classpath/lib/javax/xml/stream/events/EntityReference.class
deleted file mode 100644
index 40776384bac..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/EntityReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/Namespace.class b/libjava/classpath/lib/javax/xml/stream/events/Namespace.class
deleted file mode 100644
index 9871cf6c8a0..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/Namespace.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/NotationDeclaration.class b/libjava/classpath/lib/javax/xml/stream/events/NotationDeclaration.class
deleted file mode 100644
index a55800588aa..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/NotationDeclaration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/ProcessingInstruction.class b/libjava/classpath/lib/javax/xml/stream/events/ProcessingInstruction.class
deleted file mode 100644
index 4e89067fbfe..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/ProcessingInstruction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/StartDocument.class b/libjava/classpath/lib/javax/xml/stream/events/StartDocument.class
deleted file mode 100644
index a5001129113..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/StartDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/StartElement.class b/libjava/classpath/lib/javax/xml/stream/events/StartElement.class
deleted file mode 100644
index 4a97abaec67..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/StartElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/events/XMLEvent.class b/libjava/classpath/lib/javax/xml/stream/events/XMLEvent.class
deleted file mode 100644
index 567cced337e..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/events/XMLEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/util/EventReaderDelegate.class b/libjava/classpath/lib/javax/xml/stream/util/EventReaderDelegate.class
deleted file mode 100644
index d308209e350..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/util/EventReaderDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/util/ReaderDelegate.class b/libjava/classpath/lib/javax/xml/stream/util/ReaderDelegate.class
deleted file mode 100644
index d8b79febcc4..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/util/ReaderDelegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/util/XMLEventAllocator.class b/libjava/classpath/lib/javax/xml/stream/util/XMLEventAllocator.class
deleted file mode 100644
index 0e0b8988dcb..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/util/XMLEventAllocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/stream/util/XMLEventConsumer.class b/libjava/classpath/lib/javax/xml/stream/util/XMLEventConsumer.class
deleted file mode 100644
index 6457a0ac2f7..00000000000
--- a/libjava/classpath/lib/javax/xml/stream/util/XMLEventConsumer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/ErrorListener.class b/libjava/classpath/lib/javax/xml/transform/ErrorListener.class
deleted file mode 100644
index 714ae34591e..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/ErrorListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/OutputKeys.class b/libjava/classpath/lib/javax/xml/transform/OutputKeys.class
deleted file mode 100644
index f6362257941..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/OutputKeys.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/Result.class b/libjava/classpath/lib/javax/xml/transform/Result.class
deleted file mode 100644
index a23f79eb6f0..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/Result.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/Source.class b/libjava/classpath/lib/javax/xml/transform/Source.class
deleted file mode 100644
index 7bf553eb57a..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/Source.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/SourceLocator.class b/libjava/classpath/lib/javax/xml/transform/SourceLocator.class
deleted file mode 100644
index 3e5f647817f..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/SourceLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/Templates.class b/libjava/classpath/lib/javax/xml/transform/Templates.class
deleted file mode 100644
index 01737411b8e..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/Templates.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/Transformer.class b/libjava/classpath/lib/javax/xml/transform/Transformer.class
deleted file mode 100644
index 1c1fd8cca84..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/Transformer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/TransformerConfigurationException.class b/libjava/classpath/lib/javax/xml/transform/TransformerConfigurationException.class
deleted file mode 100644
index ee92b68b1d4..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/TransformerConfigurationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/TransformerException.class b/libjava/classpath/lib/javax/xml/transform/TransformerException.class
deleted file mode 100644
index 5429f7122db..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/TransformerException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/TransformerFactory.class b/libjava/classpath/lib/javax/xml/transform/TransformerFactory.class
deleted file mode 100644
index 382869061c8..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/TransformerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/TransformerFactoryConfigurationError.class b/libjava/classpath/lib/javax/xml/transform/TransformerFactoryConfigurationError.class
deleted file mode 100644
index e59b7858fd4..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/TransformerFactoryConfigurationError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/URIResolver.class b/libjava/classpath/lib/javax/xml/transform/URIResolver.class
deleted file mode 100644
index e3edfb13261..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/URIResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/dom/DOMLocator.class b/libjava/classpath/lib/javax/xml/transform/dom/DOMLocator.class
deleted file mode 100644
index 2ce1f41d511..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/dom/DOMLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/dom/DOMResult.class b/libjava/classpath/lib/javax/xml/transform/dom/DOMResult.class
deleted file mode 100644
index 00a6e954c6a..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/dom/DOMResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/dom/DOMSource.class b/libjava/classpath/lib/javax/xml/transform/dom/DOMSource.class
deleted file mode 100644
index ac4ddc18f0f..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/dom/DOMSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/sax/SAXResult.class b/libjava/classpath/lib/javax/xml/transform/sax/SAXResult.class
deleted file mode 100644
index c1df2826b6a..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/sax/SAXResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/sax/SAXSource.class b/libjava/classpath/lib/javax/xml/transform/sax/SAXSource.class
deleted file mode 100644
index 2889f2e4b61..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/sax/SAXSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/sax/SAXTransformerFactory.class b/libjava/classpath/lib/javax/xml/transform/sax/SAXTransformerFactory.class
deleted file mode 100644
index 9a4b08f7d73..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/sax/SAXTransformerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/sax/TemplatesHandler.class b/libjava/classpath/lib/javax/xml/transform/sax/TemplatesHandler.class
deleted file mode 100644
index 50de551c522..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/sax/TemplatesHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/sax/TransformerHandler.class b/libjava/classpath/lib/javax/xml/transform/sax/TransformerHandler.class
deleted file mode 100644
index 20c1fd5e1b0..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/sax/TransformerHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/stream/StreamResult.class b/libjava/classpath/lib/javax/xml/transform/stream/StreamResult.class
deleted file mode 100644
index ce4646c4882..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/stream/StreamResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/transform/stream/StreamSource.class b/libjava/classpath/lib/javax/xml/transform/stream/StreamSource.class
deleted file mode 100644
index 9eda514eee8..00000000000
--- a/libjava/classpath/lib/javax/xml/transform/stream/StreamSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/validation/Schema.class b/libjava/classpath/lib/javax/xml/validation/Schema.class
deleted file mode 100644
index c9b0278089e..00000000000
--- a/libjava/classpath/lib/javax/xml/validation/Schema.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/validation/SchemaFactory.class b/libjava/classpath/lib/javax/xml/validation/SchemaFactory.class
deleted file mode 100644
index 3e8f620773a..00000000000
--- a/libjava/classpath/lib/javax/xml/validation/SchemaFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/validation/SchemaFactoryLoader.class b/libjava/classpath/lib/javax/xml/validation/SchemaFactoryLoader.class
deleted file mode 100644
index 6e360e4a922..00000000000
--- a/libjava/classpath/lib/javax/xml/validation/SchemaFactoryLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/validation/TypeInfoProvider.class b/libjava/classpath/lib/javax/xml/validation/TypeInfoProvider.class
deleted file mode 100644
index 35932f4b09e..00000000000
--- a/libjava/classpath/lib/javax/xml/validation/TypeInfoProvider.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/validation/Validator.class b/libjava/classpath/lib/javax/xml/validation/Validator.class
deleted file mode 100644
index 270ad037256..00000000000
--- a/libjava/classpath/lib/javax/xml/validation/Validator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/validation/ValidatorHandler.class b/libjava/classpath/lib/javax/xml/validation/ValidatorHandler.class
deleted file mode 100644
index 7784273b132..00000000000
--- a/libjava/classpath/lib/javax/xml/validation/ValidatorHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPath.class b/libjava/classpath/lib/javax/xml/xpath/XPath.class
deleted file mode 100644
index 195cc03108b..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPath.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPathConstants.class b/libjava/classpath/lib/javax/xml/xpath/XPathConstants.class
deleted file mode 100644
index 8421df32bce..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPathConstants.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPathException.class b/libjava/classpath/lib/javax/xml/xpath/XPathException.class
deleted file mode 100644
index 69b86dd4a1a..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPathException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPathExpression.class b/libjava/classpath/lib/javax/xml/xpath/XPathExpression.class
deleted file mode 100644
index 7693d7c6844..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPathExpression.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPathExpressionException.class b/libjava/classpath/lib/javax/xml/xpath/XPathExpressionException.class
deleted file mode 100644
index 9417526f01a..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPathExpressionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPathFactory.class b/libjava/classpath/lib/javax/xml/xpath/XPathFactory.class
deleted file mode 100644
index bcd8cf0dc20..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPathFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPathFactoryConfigurationException.class b/libjava/classpath/lib/javax/xml/xpath/XPathFactoryConfigurationException.class
deleted file mode 100644
index b8ea7044ccf..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPathFactoryConfigurationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPathFunction.class b/libjava/classpath/lib/javax/xml/xpath/XPathFunction.class
deleted file mode 100644
index bb3c1bfcf25..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPathFunction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPathFunctionException.class b/libjava/classpath/lib/javax/xml/xpath/XPathFunctionException.class
deleted file mode 100644
index 1d910734fe4..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPathFunctionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPathFunctionResolver.class b/libjava/classpath/lib/javax/xml/xpath/XPathFunctionResolver.class
deleted file mode 100644
index 9a2ca1782f7..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPathFunctionResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/javax/xml/xpath/XPathVariableResolver.class b/libjava/classpath/lib/javax/xml/xpath/XPathVariableResolver.class
deleted file mode 100644
index 783419cafda..00000000000
--- a/libjava/classpath/lib/javax/xml/xpath/XPathVariableResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/ietf/jgss/ChannelBinding.class b/libjava/classpath/lib/org/ietf/jgss/ChannelBinding.class
deleted file mode 100644
index 75f6b026918..00000000000
--- a/libjava/classpath/lib/org/ietf/jgss/ChannelBinding.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/ietf/jgss/GSSContext.class b/libjava/classpath/lib/org/ietf/jgss/GSSContext.class
deleted file mode 100644
index 9781403010f..00000000000
--- a/libjava/classpath/lib/org/ietf/jgss/GSSContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/ietf/jgss/GSSCredential.class b/libjava/classpath/lib/org/ietf/jgss/GSSCredential.class
deleted file mode 100644
index f25e090786e..00000000000
--- a/libjava/classpath/lib/org/ietf/jgss/GSSCredential.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/ietf/jgss/GSSException.class b/libjava/classpath/lib/org/ietf/jgss/GSSException.class
deleted file mode 100644
index 15b83a9c11e..00000000000
--- a/libjava/classpath/lib/org/ietf/jgss/GSSException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/ietf/jgss/GSSManager.class b/libjava/classpath/lib/org/ietf/jgss/GSSManager.class
deleted file mode 100644
index a30da157dbe..00000000000
--- a/libjava/classpath/lib/org/ietf/jgss/GSSManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/ietf/jgss/GSSName.class b/libjava/classpath/lib/org/ietf/jgss/GSSName.class
deleted file mode 100644
index 7cfbc570fb4..00000000000
--- a/libjava/classpath/lib/org/ietf/jgss/GSSName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/ietf/jgss/MessageProp.class b/libjava/classpath/lib/org/ietf/jgss/MessageProp.class
deleted file mode 100644
index b6db46cc1ae..00000000000
--- a/libjava/classpath/lib/org/ietf/jgss/MessageProp.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/ietf/jgss/Oid.class b/libjava/classpath/lib/org/ietf/jgss/Oid.class
deleted file mode 100644
index a9202919bc9..00000000000
--- a/libjava/classpath/lib/org/ietf/jgss/Oid.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ACTIVITY_COMPLETED.class b/libjava/classpath/lib/org/omg/CORBA/ACTIVITY_COMPLETED.class
deleted file mode 100644
index 6273c48d946..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ACTIVITY_COMPLETED.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ACTIVITY_REQUIRED.class b/libjava/classpath/lib/org/omg/CORBA/ACTIVITY_REQUIRED.class
deleted file mode 100644
index 56d40116c7c..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ACTIVITY_REQUIRED.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ARG_IN.class b/libjava/classpath/lib/org/omg/CORBA/ARG_IN.class
deleted file mode 100644
index 81eb85f17fe..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ARG_IN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ARG_INOUT.class b/libjava/classpath/lib/org/omg/CORBA/ARG_INOUT.class
deleted file mode 100644
index e7824369210..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ARG_INOUT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ARG_OUT.class b/libjava/classpath/lib/org/omg/CORBA/ARG_OUT.class
deleted file mode 100644
index 32feb6b4e95..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ARG_OUT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/Any.class b/libjava/classpath/lib/org/omg/CORBA/Any.class
deleted file mode 100644
index 241d9037cde..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/Any.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/AnyHolder.class b/libjava/classpath/lib/org/omg/CORBA/AnyHolder.class
deleted file mode 100644
index 6280babb6cc..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/AnyHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/AnySeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/AnySeqHelper.class
deleted file mode 100644
index 6e86ff43e8b..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/AnySeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/AnySeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/AnySeqHolder.class
deleted file mode 100644
index ad1716813d7..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/AnySeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BAD_CONTEXT.class b/libjava/classpath/lib/org/omg/CORBA/BAD_CONTEXT.class
deleted file mode 100644
index 36940158e93..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BAD_CONTEXT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BAD_INV_ORDER.class b/libjava/classpath/lib/org/omg/CORBA/BAD_INV_ORDER.class
deleted file mode 100644
index 29af5229e28..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BAD_INV_ORDER.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BAD_OPERATION.class b/libjava/classpath/lib/org/omg/CORBA/BAD_OPERATION.class
deleted file mode 100644
index 59d5e89b700..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BAD_OPERATION.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BAD_PARAM.class b/libjava/classpath/lib/org/omg/CORBA/BAD_PARAM.class
deleted file mode 100644
index fe6319d7220..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BAD_PARAM.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BAD_POLICY.class b/libjava/classpath/lib/org/omg/CORBA/BAD_POLICY.class
deleted file mode 100644
index 683492ca5e5..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BAD_POLICY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BAD_POLICY_TYPE.class b/libjava/classpath/lib/org/omg/CORBA/BAD_POLICY_TYPE.class
deleted file mode 100644
index aef3c3c78dd..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BAD_POLICY_TYPE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BAD_POLICY_VALUE.class b/libjava/classpath/lib/org/omg/CORBA/BAD_POLICY_VALUE.class
deleted file mode 100644
index b796febb361..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BAD_POLICY_VALUE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BAD_QOS.class b/libjava/classpath/lib/org/omg/CORBA/BAD_QOS.class
deleted file mode 100644
index 733126a4e22..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BAD_QOS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BAD_TYPECODE.class b/libjava/classpath/lib/org/omg/CORBA/BAD_TYPECODE.class
deleted file mode 100644
index ea7dc21e8e5..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BAD_TYPECODE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BooleanHolder.class b/libjava/classpath/lib/org/omg/CORBA/BooleanHolder.class
deleted file mode 100644
index c02b7bd9753..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BooleanHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BooleanSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/BooleanSeqHelper.class
deleted file mode 100644
index 9bbafe13a44..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BooleanSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/BooleanSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/BooleanSeqHolder.class
deleted file mode 100644
index 894048b4782..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/BooleanSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/Bounds.class b/libjava/classpath/lib/org/omg/CORBA/Bounds.class
deleted file mode 100644
index d3fddac0caf..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/Bounds.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ByteHolder.class b/libjava/classpath/lib/org/omg/CORBA/ByteHolder.class
deleted file mode 100644
index ec454370631..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ByteHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CODESET_INCOMPATIBLE.class b/libjava/classpath/lib/org/omg/CORBA/CODESET_INCOMPATIBLE.class
deleted file mode 100644
index 4c8429fc9f3..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CODESET_INCOMPATIBLE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/COMM_FAILURE.class b/libjava/classpath/lib/org/omg/CORBA/COMM_FAILURE.class
deleted file mode 100644
index b290135f469..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/COMM_FAILURE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CTX_RESTRICT_SCOPE.class b/libjava/classpath/lib/org/omg/CORBA/CTX_RESTRICT_SCOPE.class
deleted file mode 100644
index 279f1c31ed6..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CTX_RESTRICT_SCOPE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CharHolder.class b/libjava/classpath/lib/org/omg/CORBA/CharHolder.class
deleted file mode 100644
index c24adb8cac8..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CharHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CharSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/CharSeqHelper.class
deleted file mode 100644
index bdeee597f2a..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CharSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CharSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/CharSeqHolder.class
deleted file mode 100644
index 308a92667f9..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CharSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CompletionStatus.class b/libjava/classpath/lib/org/omg/CORBA/CompletionStatus.class
deleted file mode 100644
index 1ff0902f75d..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CompletionStatus.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CompletionStatusHelper.class b/libjava/classpath/lib/org/omg/CORBA/CompletionStatusHelper.class
deleted file mode 100644
index dc612821244..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CompletionStatusHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/Context.class b/libjava/classpath/lib/org/omg/CORBA/Context.class
deleted file mode 100644
index 6ceb2a9dd26..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/Context.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ContextList.class b/libjava/classpath/lib/org/omg/CORBA/ContextList.class
deleted file mode 100644
index 7aa694f06af..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ContextList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/Current.class b/libjava/classpath/lib/org/omg/CORBA/Current.class
deleted file mode 100644
index 59062f75d15..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/Current.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CurrentHelper$_CurrentStub.class b/libjava/classpath/lib/org/omg/CORBA/CurrentHelper$_CurrentStub.class
deleted file mode 100644
index 6a24ac2351e..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CurrentHelper$_CurrentStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CurrentHelper.class b/libjava/classpath/lib/org/omg/CORBA/CurrentHelper.class
deleted file mode 100644
index b08abfc7a7e..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CurrentHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CurrentHolder.class b/libjava/classpath/lib/org/omg/CORBA/CurrentHolder.class
deleted file mode 100644
index 04b399deb89..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CurrentHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CurrentOperations.class b/libjava/classpath/lib/org/omg/CORBA/CurrentOperations.class
deleted file mode 100644
index d9c71534320..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CurrentOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CustomMarshal.class b/libjava/classpath/lib/org/omg/CORBA/CustomMarshal.class
deleted file mode 100644
index c8ccce25d49..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CustomMarshal.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/CustomValue.class b/libjava/classpath/lib/org/omg/CORBA/CustomValue.class
deleted file mode 100644
index 7e775ec43ff..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/CustomValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DATA_CONVERSION.class b/libjava/classpath/lib/org/omg/CORBA/DATA_CONVERSION.class
deleted file mode 100644
index 9f3cbe2eb16..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DATA_CONVERSION.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DataInputStream.class b/libjava/classpath/lib/org/omg/CORBA/DataInputStream.class
deleted file mode 100644
index 7d5e2716678..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DataInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DataOutputStream.class b/libjava/classpath/lib/org/omg/CORBA/DataOutputStream.class
deleted file mode 100644
index f685386b9df..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DataOutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DefinitionKind.class b/libjava/classpath/lib/org/omg/CORBA/DefinitionKind.class
deleted file mode 100644
index 59cc3b23006..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DefinitionKind.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DefinitionKindHelper.class b/libjava/classpath/lib/org/omg/CORBA/DefinitionKindHelper.class
deleted file mode 100644
index 4f7cc619f31..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DefinitionKindHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DomainManager.class b/libjava/classpath/lib/org/omg/CORBA/DomainManager.class
deleted file mode 100644
index 3fd23b98a0e..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DomainManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DomainManagerOperations.class b/libjava/classpath/lib/org/omg/CORBA/DomainManagerOperations.class
deleted file mode 100644
index a605b00d883..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DomainManagerOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DoubleHolder.class b/libjava/classpath/lib/org/omg/CORBA/DoubleHolder.class
deleted file mode 100644
index 38bfcf152b7..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DoubleHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DoubleSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/DoubleSeqHelper.class
deleted file mode 100644
index 3d6509ae921..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DoubleSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DoubleSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/DoubleSeqHolder.class
deleted file mode 100644
index adfa0dd621a..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DoubleSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynAny.class b/libjava/classpath/lib/org/omg/CORBA/DynAny.class
deleted file mode 100644
index aec6c140456..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynAny.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/Invalid.class b/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/Invalid.class
deleted file mode 100644
index 21c81153234..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/Invalid.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/InvalidSeq.class b/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/InvalidSeq.class
deleted file mode 100644
index 60ca4c45088..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/InvalidSeq.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/InvalidValue.class b/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/InvalidValue.class
deleted file mode 100644
index 877b4e14db2..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/InvalidValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/TypeMismatch.class b/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/TypeMismatch.class
deleted file mode 100644
index e704f658422..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynAnyPackage/TypeMismatch.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynArray.class b/libjava/classpath/lib/org/omg/CORBA/DynArray.class
deleted file mode 100644
index 6ed14fbb095..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynArray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynEnum.class b/libjava/classpath/lib/org/omg/CORBA/DynEnum.class
deleted file mode 100644
index fc31a3ece1d..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynEnum.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynFixed.class b/libjava/classpath/lib/org/omg/CORBA/DynFixed.class
deleted file mode 100644
index 4e07360689c..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynFixed.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynSequence.class b/libjava/classpath/lib/org/omg/CORBA/DynSequence.class
deleted file mode 100644
index 9f78322ef00..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynSequence.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynStruct.class b/libjava/classpath/lib/org/omg/CORBA/DynStruct.class
deleted file mode 100644
index db555c38b6b..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynStruct.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynUnion.class b/libjava/classpath/lib/org/omg/CORBA/DynUnion.class
deleted file mode 100644
index 0d7705f6658..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynUnion.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynValue.class b/libjava/classpath/lib/org/omg/CORBA/DynValue.class
deleted file mode 100644
index b88d8c9b4e2..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/DynamicImplementation.class b/libjava/classpath/lib/org/omg/CORBA/DynamicImplementation.class
deleted file mode 100644
index fa2902535ac..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/DynamicImplementation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/Environment.class b/libjava/classpath/lib/org/omg/CORBA/Environment.class
deleted file mode 100644
index e9a2c4fe597..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/Environment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ExceptionList.class b/libjava/classpath/lib/org/omg/CORBA/ExceptionList.class
deleted file mode 100644
index 11175909a62..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ExceptionList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/FREE_MEM.class b/libjava/classpath/lib/org/omg/CORBA/FREE_MEM.class
deleted file mode 100644
index f8238569b1f..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/FREE_MEM.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/FieldNameHelper.class b/libjava/classpath/lib/org/omg/CORBA/FieldNameHelper.class
deleted file mode 100644
index 3d6c77446a0..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/FieldNameHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/FixedHolder.class b/libjava/classpath/lib/org/omg/CORBA/FixedHolder.class
deleted file mode 100644
index b06aad6c32c..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/FixedHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/FloatHolder.class b/libjava/classpath/lib/org/omg/CORBA/FloatHolder.class
deleted file mode 100644
index 6eb06bc47d5..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/FloatHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/FloatSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/FloatSeqHelper.class
deleted file mode 100644
index 396ed94414e..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/FloatSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/FloatSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/FloatSeqHolder.class
deleted file mode 100644
index 35f1612f120..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/FloatSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/IDLType.class b/libjava/classpath/lib/org/omg/CORBA/IDLType.class
deleted file mode 100644
index 8c5ed030e18..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/IDLType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/IDLTypeHelper.class b/libjava/classpath/lib/org/omg/CORBA/IDLTypeHelper.class
deleted file mode 100644
index 0fc9e7d1305..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/IDLTypeHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/IDLTypeOperations.class b/libjava/classpath/lib/org/omg/CORBA/IDLTypeOperations.class
deleted file mode 100644
index 64d8b18900a..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/IDLTypeOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/IMP_LIMIT.class b/libjava/classpath/lib/org/omg/CORBA/IMP_LIMIT.class
deleted file mode 100644
index 0194e473882..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/IMP_LIMIT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/INITIALIZE.class b/libjava/classpath/lib/org/omg/CORBA/INITIALIZE.class
deleted file mode 100644
index 156ba25006d..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/INITIALIZE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/INTERNAL.class b/libjava/classpath/lib/org/omg/CORBA/INTERNAL.class
deleted file mode 100644
index bb0867fc0d1..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/INTERNAL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/INTF_REPOS.class b/libjava/classpath/lib/org/omg/CORBA/INTF_REPOS.class
deleted file mode 100644
index 404572b2f36..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/INTF_REPOS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/INVALID_ACTIVITY.class b/libjava/classpath/lib/org/omg/CORBA/INVALID_ACTIVITY.class
deleted file mode 100644
index 7b6b898433a..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/INVALID_ACTIVITY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/INVALID_TRANSACTION.class b/libjava/classpath/lib/org/omg/CORBA/INVALID_TRANSACTION.class
deleted file mode 100644
index 5f61141d4b1..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/INVALID_TRANSACTION.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/INV_FLAG.class b/libjava/classpath/lib/org/omg/CORBA/INV_FLAG.class
deleted file mode 100644
index 04a21b792d7..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/INV_FLAG.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/INV_IDENT.class b/libjava/classpath/lib/org/omg/CORBA/INV_IDENT.class
deleted file mode 100644
index 97b0dbbe0e9..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/INV_IDENT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/INV_OBJREF.class b/libjava/classpath/lib/org/omg/CORBA/INV_OBJREF.class
deleted file mode 100644
index 4132a243d37..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/INV_OBJREF.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/INV_POLICY.class b/libjava/classpath/lib/org/omg/CORBA/INV_POLICY.class
deleted file mode 100644
index 82ea67b358d..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/INV_POLICY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/IRObject.class b/libjava/classpath/lib/org/omg/CORBA/IRObject.class
deleted file mode 100644
index 7f43483982d..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/IRObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/IRObjectOperations.class b/libjava/classpath/lib/org/omg/CORBA/IRObjectOperations.class
deleted file mode 100644
index 5b2554c5bc9..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/IRObjectOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/IdentifierHelper.class b/libjava/classpath/lib/org/omg/CORBA/IdentifierHelper.class
deleted file mode 100644
index 17ba7e2fecf..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/IdentifierHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/IntHolder.class b/libjava/classpath/lib/org/omg/CORBA/IntHolder.class
deleted file mode 100644
index 775f9947967..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/IntHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/LocalObject.class b/libjava/classpath/lib/org/omg/CORBA/LocalObject.class
deleted file mode 100644
index f666fb8fc32..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/LocalObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/LongHolder.class b/libjava/classpath/lib/org/omg/CORBA/LongHolder.class
deleted file mode 100644
index 1620deacb60..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/LongHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/LongLongSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/LongLongSeqHelper.class
deleted file mode 100644
index 3cef2568d0c..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/LongLongSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/LongLongSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/LongLongSeqHolder.class
deleted file mode 100644
index b086be5c6a3..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/LongLongSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/LongSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/LongSeqHelper.class
deleted file mode 100644
index adbc98874b0..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/LongSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/LongSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/LongSeqHolder.class
deleted file mode 100644
index c599b9bbfac..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/LongSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/MARSHAL.class b/libjava/classpath/lib/org/omg/CORBA/MARSHAL.class
deleted file mode 100644
index 90b1b6119ca..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/MARSHAL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/NO_IMPLEMENT.class b/libjava/classpath/lib/org/omg/CORBA/NO_IMPLEMENT.class
deleted file mode 100644
index 75de0f307e6..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/NO_IMPLEMENT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/NO_MEMORY.class b/libjava/classpath/lib/org/omg/CORBA/NO_MEMORY.class
deleted file mode 100644
index 5ab11c43740..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/NO_MEMORY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/NO_PERMISSION.class b/libjava/classpath/lib/org/omg/CORBA/NO_PERMISSION.class
deleted file mode 100644
index c094264d35e..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/NO_PERMISSION.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/NO_RESOURCES.class b/libjava/classpath/lib/org/omg/CORBA/NO_RESOURCES.class
deleted file mode 100644
index b3160694b8a..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/NO_RESOURCES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/NO_RESPONSE.class b/libjava/classpath/lib/org/omg/CORBA/NO_RESPONSE.class
deleted file mode 100644
index db37168d746..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/NO_RESPONSE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/NVList.class b/libjava/classpath/lib/org/omg/CORBA/NVList.class
deleted file mode 100644
index 98268674730..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/NVList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/NameValuePair.class b/libjava/classpath/lib/org/omg/CORBA/NameValuePair.class
deleted file mode 100644
index 1b9aeb7a4fa..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/NameValuePair.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/NameValuePairHelper.class b/libjava/classpath/lib/org/omg/CORBA/NameValuePairHelper.class
deleted file mode 100644
index e286a1f360c..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/NameValuePairHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/NamedValue.class b/libjava/classpath/lib/org/omg/CORBA/NamedValue.class
deleted file mode 100644
index eb23677914a..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/NamedValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/OBJECT_NOT_EXIST.class b/libjava/classpath/lib/org/omg/CORBA/OBJECT_NOT_EXIST.class
deleted file mode 100644
index 607b364f7ff..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/OBJECT_NOT_EXIST.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/OBJ_ADAPTER.class b/libjava/classpath/lib/org/omg/CORBA/OBJ_ADAPTER.class
deleted file mode 100644
index 5f8c0a5947b..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/OBJ_ADAPTER.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/OMGVMCID.class b/libjava/classpath/lib/org/omg/CORBA/OMGVMCID.class
deleted file mode 100644
index fe0fc4196b7..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/OMGVMCID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ORB.class b/libjava/classpath/lib/org/omg/CORBA/ORB.class
deleted file mode 100644
index 4dfd8539189..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ORB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ORBPackage/InconsistentTypeCode.class b/libjava/classpath/lib/org/omg/CORBA/ORBPackage/InconsistentTypeCode.class
deleted file mode 100644
index 737416bc7f6..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ORBPackage/InconsistentTypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ORBPackage/InvalidName.class b/libjava/classpath/lib/org/omg/CORBA/ORBPackage/InvalidName.class
deleted file mode 100644
index 5f37a2c7e74..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ORBPackage/InvalidName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/Object.class b/libjava/classpath/lib/org/omg/CORBA/Object.class
deleted file mode 100644
index dd1a6cf6d93..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/Object.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ObjectHelper.class b/libjava/classpath/lib/org/omg/CORBA/ObjectHelper.class
deleted file mode 100644
index b288d39071a..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ObjectHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ObjectHolder.class b/libjava/classpath/lib/org/omg/CORBA/ObjectHolder.class
deleted file mode 100644
index 7ae35d266b8..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ObjectHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/OctetSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/OctetSeqHelper.class
deleted file mode 100644
index 92c230905c2..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/OctetSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/OctetSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/OctetSeqHolder.class
deleted file mode 100644
index 40e881b0555..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/OctetSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PERSIST_STORE.class b/libjava/classpath/lib/org/omg/CORBA/PERSIST_STORE.class
deleted file mode 100644
index e1c3bcdbc5b..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PERSIST_STORE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PRIVATE_MEMBER.class b/libjava/classpath/lib/org/omg/CORBA/PRIVATE_MEMBER.class
deleted file mode 100644
index 85b6c53030a..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PRIVATE_MEMBER.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PUBLIC_MEMBER.class b/libjava/classpath/lib/org/omg/CORBA/PUBLIC_MEMBER.class
deleted file mode 100644
index fa240e5a8f1..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PUBLIC_MEMBER.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ParameterMode.class b/libjava/classpath/lib/org/omg/CORBA/ParameterMode.class
deleted file mode 100644
index e287d827552..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ParameterMode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ParameterModeHelper.class b/libjava/classpath/lib/org/omg/CORBA/ParameterModeHelper.class
deleted file mode 100644
index cc64f658952..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ParameterModeHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ParameterModeHolder.class b/libjava/classpath/lib/org/omg/CORBA/ParameterModeHolder.class
deleted file mode 100644
index 07b0e3b3050..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ParameterModeHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/Policy.class b/libjava/classpath/lib/org/omg/CORBA/Policy.class
deleted file mode 100644
index 1f9eaa7fdfb..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/Policy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PolicyError.class b/libjava/classpath/lib/org/omg/CORBA/PolicyError.class
deleted file mode 100644
index 23dd44b513f..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PolicyError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PolicyErrorCodeHelper.class b/libjava/classpath/lib/org/omg/CORBA/PolicyErrorCodeHelper.class
deleted file mode 100644
index 08c11441329..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PolicyErrorCodeHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PolicyErrorHelper.class b/libjava/classpath/lib/org/omg/CORBA/PolicyErrorHelper.class
deleted file mode 100644
index f92d197722a..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PolicyErrorHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PolicyErrorHolder.class b/libjava/classpath/lib/org/omg/CORBA/PolicyErrorHolder.class
deleted file mode 100644
index d4b90f3f2af..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PolicyErrorHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PolicyHelper.class b/libjava/classpath/lib/org/omg/CORBA/PolicyHelper.class
deleted file mode 100644
index 25393cdb4db..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PolicyHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PolicyHolder.class b/libjava/classpath/lib/org/omg/CORBA/PolicyHolder.class
deleted file mode 100644
index 9bcec0e27bb..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PolicyHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PolicyListHelper.class b/libjava/classpath/lib/org/omg/CORBA/PolicyListHelper.class
deleted file mode 100644
index d86ee5c83e7..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PolicyListHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PolicyListHolder.class b/libjava/classpath/lib/org/omg/CORBA/PolicyListHolder.class
deleted file mode 100644
index 684d1b430a3..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PolicyListHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PolicyOperations.class b/libjava/classpath/lib/org/omg/CORBA/PolicyOperations.class
deleted file mode 100644
index a843bfdf950..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PolicyOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PolicyTypeHelper.class b/libjava/classpath/lib/org/omg/CORBA/PolicyTypeHelper.class
deleted file mode 100644
index 005457b1560..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PolicyTypeHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/Principal.class b/libjava/classpath/lib/org/omg/CORBA/Principal.class
deleted file mode 100644
index af77c83aefe..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/Principal.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/PrincipalHolder.class b/libjava/classpath/lib/org/omg/CORBA/PrincipalHolder.class
deleted file mode 100644
index 253b7e1f706..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/PrincipalHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/REBIND.class b/libjava/classpath/lib/org/omg/CORBA/REBIND.class
deleted file mode 100644
index 96b5717614f..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/REBIND.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/RepositoryIdHelper.class b/libjava/classpath/lib/org/omg/CORBA/RepositoryIdHelper.class
deleted file mode 100644
index 62dc935d93e..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/RepositoryIdHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/Request.class b/libjava/classpath/lib/org/omg/CORBA/Request.class
deleted file mode 100644
index fe550783922..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/Request.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ServerRequest.class b/libjava/classpath/lib/org/omg/CORBA/ServerRequest.class
deleted file mode 100644
index 62a4b47b485..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ServerRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ServiceDetail.class b/libjava/classpath/lib/org/omg/CORBA/ServiceDetail.class
deleted file mode 100644
index fc239d3ce12..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ServiceDetail.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ServiceDetailHelper.class b/libjava/classpath/lib/org/omg/CORBA/ServiceDetailHelper.class
deleted file mode 100644
index 75358eb949e..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ServiceDetailHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ServiceInformation.class b/libjava/classpath/lib/org/omg/CORBA/ServiceInformation.class
deleted file mode 100644
index ce2d5376a1f..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ServiceInformation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ServiceInformationHelper.class b/libjava/classpath/lib/org/omg/CORBA/ServiceInformationHelper.class
deleted file mode 100644
index bfaf1196889..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ServiceInformationHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ServiceInformationHolder.class b/libjava/classpath/lib/org/omg/CORBA/ServiceInformationHolder.class
deleted file mode 100644
index 1c7d2d241a2..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ServiceInformationHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/SetOverrideType.class b/libjava/classpath/lib/org/omg/CORBA/SetOverrideType.class
deleted file mode 100644
index bc56a6f95a8..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/SetOverrideType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/SetOverrideTypeHelper.class b/libjava/classpath/lib/org/omg/CORBA/SetOverrideTypeHelper.class
deleted file mode 100644
index b043621ebb6..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/SetOverrideTypeHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ShortHolder.class b/libjava/classpath/lib/org/omg/CORBA/ShortHolder.class
deleted file mode 100644
index c8fd60130d9..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ShortHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ShortSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/ShortSeqHelper.class
deleted file mode 100644
index 02fce8f1028..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ShortSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ShortSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/ShortSeqHolder.class
deleted file mode 100644
index 47d73c5b3e8..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ShortSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/StringHolder.class b/libjava/classpath/lib/org/omg/CORBA/StringHolder.class
deleted file mode 100644
index 18ba01a6154..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/StringHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/StringSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/StringSeqHelper.class
deleted file mode 100644
index 416407b552c..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/StringSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/StringSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/StringSeqHolder.class
deleted file mode 100644
index 5c89f8ec2c0..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/StringSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/StringValueHelper.class b/libjava/classpath/lib/org/omg/CORBA/StringValueHelper.class
deleted file mode 100644
index 9912113e8cf..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/StringValueHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/StructMember.class b/libjava/classpath/lib/org/omg/CORBA/StructMember.class
deleted file mode 100644
index 3d77b2a2c4d..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/StructMember.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/StructMemberHelper.class b/libjava/classpath/lib/org/omg/CORBA/StructMemberHelper.class
deleted file mode 100644
index 5c5a0e2c7bd..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/StructMemberHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/SystemException.class b/libjava/classpath/lib/org/omg/CORBA/SystemException.class
deleted file mode 100644
index 940f7991325..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/SystemException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TCKind.class b/libjava/classpath/lib/org/omg/CORBA/TCKind.class
deleted file mode 100644
index 0cdaf690431..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TCKind.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TIMEOUT.class b/libjava/classpath/lib/org/omg/CORBA/TIMEOUT.class
deleted file mode 100644
index bd13b9fa526..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TIMEOUT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_MODE.class b/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_MODE.class
deleted file mode 100644
index 3e80be97c88..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_MODE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_REQUIRED.class b/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_REQUIRED.class
deleted file mode 100644
index 41c83de81a7..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_REQUIRED.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_ROLLEDBACK.class b/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_ROLLEDBACK.class
deleted file mode 100644
index 005c4c262bf..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_ROLLEDBACK.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_UNAVAILABLE.class b/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_UNAVAILABLE.class
deleted file mode 100644
index 35c4ac1c6ea..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TRANSACTION_UNAVAILABLE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TRANSIENT.class b/libjava/classpath/lib/org/omg/CORBA/TRANSIENT.class
deleted file mode 100644
index e6e2c933c27..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TRANSIENT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TypeCode.class b/libjava/classpath/lib/org/omg/CORBA/TypeCode.class
deleted file mode 100644
index a226a13c580..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TypeCodeHolder.class b/libjava/classpath/lib/org/omg/CORBA/TypeCodeHolder.class
deleted file mode 100644
index eec7eb74029..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TypeCodeHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TypeCodePackage/BadKind.class b/libjava/classpath/lib/org/omg/CORBA/TypeCodePackage/BadKind.class
deleted file mode 100644
index 1cb6527aa16..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TypeCodePackage/BadKind.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/TypeCodePackage/Bounds.class b/libjava/classpath/lib/org/omg/CORBA/TypeCodePackage/Bounds.class
deleted file mode 100644
index c24c5125210..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/TypeCodePackage/Bounds.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ULongLongSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/ULongLongSeqHelper.class
deleted file mode 100644
index e48ca17d626..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ULongLongSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ULongLongSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/ULongLongSeqHolder.class
deleted file mode 100644
index 3e9759fb91e..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ULongLongSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ULongSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/ULongSeqHelper.class
deleted file mode 100644
index 055547ad555..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ULongSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ULongSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/ULongSeqHolder.class
deleted file mode 100644
index de8c0a3b6b5..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ULongSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UNKNOWN.class b/libjava/classpath/lib/org/omg/CORBA/UNKNOWN.class
deleted file mode 100644
index 1a67fcbe4e7..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UNKNOWN.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UNSUPPORTED_POLICY.class b/libjava/classpath/lib/org/omg/CORBA/UNSUPPORTED_POLICY.class
deleted file mode 100644
index 165aec3b785..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UNSUPPORTED_POLICY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.class b/libjava/classpath/lib/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.class
deleted file mode 100644
index 77991d4cf18..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UShortSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/UShortSeqHelper.class
deleted file mode 100644
index 462900f9b60..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UShortSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UShortSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/UShortSeqHolder.class
deleted file mode 100644
index a134da240e6..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UShortSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UnionMember.class b/libjava/classpath/lib/org/omg/CORBA/UnionMember.class
deleted file mode 100644
index 7d83156b793..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UnionMember.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UnionMemberHelper.class b/libjava/classpath/lib/org/omg/CORBA/UnionMemberHelper.class
deleted file mode 100644
index d696e43bcba..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UnionMemberHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UnknownUserException.class b/libjava/classpath/lib/org/omg/CORBA/UnknownUserException.class
deleted file mode 100644
index f4b6615d6f8..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UnknownUserException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UnknownUserExceptionHelper.class b/libjava/classpath/lib/org/omg/CORBA/UnknownUserExceptionHelper.class
deleted file mode 100644
index 04fd69a47fc..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UnknownUserExceptionHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UnknownUserExceptionHolder.class b/libjava/classpath/lib/org/omg/CORBA/UnknownUserExceptionHolder.class
deleted file mode 100644
index 0c7bcb87506..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UnknownUserExceptionHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/UserException.class b/libjava/classpath/lib/org/omg/CORBA/UserException.class
deleted file mode 100644
index ed8baba4407..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/UserException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/VM_ABSTRACT.class b/libjava/classpath/lib/org/omg/CORBA/VM_ABSTRACT.class
deleted file mode 100644
index 28cc567c331..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/VM_ABSTRACT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/VM_CUSTOM.class b/libjava/classpath/lib/org/omg/CORBA/VM_CUSTOM.class
deleted file mode 100644
index fe8503c4ad1..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/VM_CUSTOM.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/VM_NONE.class b/libjava/classpath/lib/org/omg/CORBA/VM_NONE.class
deleted file mode 100644
index 3793c8251f8..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/VM_NONE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/VM_TRUNCATABLE.class b/libjava/classpath/lib/org/omg/CORBA/VM_TRUNCATABLE.class
deleted file mode 100644
index c17ba788056..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/VM_TRUNCATABLE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ValueBaseHelper.class b/libjava/classpath/lib/org/omg/CORBA/ValueBaseHelper.class
deleted file mode 100644
index 5e72f38c939..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ValueBaseHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ValueBaseHolder.class b/libjava/classpath/lib/org/omg/CORBA/ValueBaseHolder.class
deleted file mode 100644
index 7976f5e3e88..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ValueBaseHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ValueMember.class b/libjava/classpath/lib/org/omg/CORBA/ValueMember.class
deleted file mode 100644
index c317aaafbd8..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ValueMember.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/ValueMemberHelper.class b/libjava/classpath/lib/org/omg/CORBA/ValueMemberHelper.class
deleted file mode 100644
index 6dd4e17aa03..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/ValueMemberHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/VersionSpecHelper.class b/libjava/classpath/lib/org/omg/CORBA/VersionSpecHelper.class
deleted file mode 100644
index 9718810626b..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/VersionSpecHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/VisibilityHelper.class b/libjava/classpath/lib/org/omg/CORBA/VisibilityHelper.class
deleted file mode 100644
index 5f9b920ab04..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/VisibilityHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/WCharSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/WCharSeqHelper.class
deleted file mode 100644
index 42dd65a9b97..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/WCharSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/WCharSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/WCharSeqHolder.class
deleted file mode 100644
index 4b2fa2f452b..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/WCharSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/WStringSeqHelper.class b/libjava/classpath/lib/org/omg/CORBA/WStringSeqHelper.class
deleted file mode 100644
index 434cf45029f..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/WStringSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/WStringSeqHolder.class b/libjava/classpath/lib/org/omg/CORBA/WStringSeqHolder.class
deleted file mode 100644
index db4be911e9d..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/WStringSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/WStringValueHelper.class b/libjava/classpath/lib/org/omg/CORBA/WStringValueHelper.class
deleted file mode 100644
index 6141425c7f6..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/WStringValueHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/WrongTransaction.class b/libjava/classpath/lib/org/omg/CORBA/WrongTransaction.class
deleted file mode 100644
index 8bf2b631be4..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/WrongTransaction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/WrongTransactionHelper.class b/libjava/classpath/lib/org/omg/CORBA/WrongTransactionHelper.class
deleted file mode 100644
index 9c8fd658086..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/WrongTransactionHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/WrongTransactionHolder.class b/libjava/classpath/lib/org/omg/CORBA/WrongTransactionHolder.class
deleted file mode 100644
index fa842cf547e..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/WrongTransactionHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/_IDLTypeStub.class b/libjava/classpath/lib/org/omg/CORBA/_IDLTypeStub.class
deleted file mode 100644
index 1089845a36e..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/_IDLTypeStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/_PolicyStub.class b/libjava/classpath/lib/org/omg/CORBA/_PolicyStub.class
deleted file mode 100644
index 5e9267a9fd6..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/_PolicyStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/ApplicationException.class b/libjava/classpath/lib/org/omg/CORBA/portable/ApplicationException.class
deleted file mode 100644
index 528ebbb2a15..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/ApplicationException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/BoxedValueHelper.class b/libjava/classpath/lib/org/omg/CORBA/portable/BoxedValueHelper.class
deleted file mode 100644
index 43ea1b1d0c1..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/BoxedValueHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/CustomValue.class b/libjava/classpath/lib/org/omg/CORBA/portable/CustomValue.class
deleted file mode 100644
index a06f1dfb473..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/CustomValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/Delegate.class b/libjava/classpath/lib/org/omg/CORBA/portable/Delegate.class
deleted file mode 100644
index d4900bef027..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/Delegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/IDLEntity.class b/libjava/classpath/lib/org/omg/CORBA/portable/IDLEntity.class
deleted file mode 100644
index c4f232e3a26..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/IDLEntity.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/IndirectionException.class b/libjava/classpath/lib/org/omg/CORBA/portable/IndirectionException.class
deleted file mode 100644
index 3e94ecc0796..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/IndirectionException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/InputStream.class b/libjava/classpath/lib/org/omg/CORBA/portable/InputStream.class
deleted file mode 100644
index a60458485e8..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/InputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/InvokeHandler.class b/libjava/classpath/lib/org/omg/CORBA/portable/InvokeHandler.class
deleted file mode 100644
index 4ba4c20fe4f..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/InvokeHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/ObjectImpl.class b/libjava/classpath/lib/org/omg/CORBA/portable/ObjectImpl.class
deleted file mode 100644
index 3c4203072c4..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/ObjectImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/OutputStream.class b/libjava/classpath/lib/org/omg/CORBA/portable/OutputStream.class
deleted file mode 100644
index 6c8a629b4ee..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/OutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/RemarshalException.class b/libjava/classpath/lib/org/omg/CORBA/portable/RemarshalException.class
deleted file mode 100644
index 36d24fa1d73..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/RemarshalException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/ResponseHandler.class b/libjava/classpath/lib/org/omg/CORBA/portable/ResponseHandler.class
deleted file mode 100644
index 9d4456bde52..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/ResponseHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/ServantObject.class b/libjava/classpath/lib/org/omg/CORBA/portable/ServantObject.class
deleted file mode 100644
index 79efe34094d..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/ServantObject.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/Streamable.class b/libjava/classpath/lib/org/omg/CORBA/portable/Streamable.class
deleted file mode 100644
index 4a965ae21ec..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/Streamable.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/StreamableValue.class b/libjava/classpath/lib/org/omg/CORBA/portable/StreamableValue.class
deleted file mode 100644
index aac801248d2..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/StreamableValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/UnknownException.class b/libjava/classpath/lib/org/omg/CORBA/portable/UnknownException.class
deleted file mode 100644
index 7d1451f060c..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/UnknownException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/ValueBase.class b/libjava/classpath/lib/org/omg/CORBA/portable/ValueBase.class
deleted file mode 100644
index 18a59c5ade0..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/ValueBase.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA/portable/ValueFactory.class b/libjava/classpath/lib/org/omg/CORBA/portable/ValueFactory.class
deleted file mode 100644
index ca077674d49..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA/portable/ValueFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA_2_3/ORB.class b/libjava/classpath/lib/org/omg/CORBA_2_3/ORB.class
deleted file mode 100644
index fea1383b731..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA_2_3/ORB.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA_2_3/portable/Delegate.class b/libjava/classpath/lib/org/omg/CORBA_2_3/portable/Delegate.class
deleted file mode 100644
index b3f57ec556c..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA_2_3/portable/Delegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA_2_3/portable/InputStream.class b/libjava/classpath/lib/org/omg/CORBA_2_3/portable/InputStream.class
deleted file mode 100644
index 707fdbe5f3b..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA_2_3/portable/InputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA_2_3/portable/ObjectImpl.class b/libjava/classpath/lib/org/omg/CORBA_2_3/portable/ObjectImpl.class
deleted file mode 100644
index ef1fb4b4ec5..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA_2_3/portable/ObjectImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CORBA_2_3/portable/OutputStream.class b/libjava/classpath/lib/org/omg/CORBA_2_3/portable/OutputStream.class
deleted file mode 100644
index 7dd148569c1..00000000000
--- a/libjava/classpath/lib/org/omg/CORBA_2_3/portable/OutputStream.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/Binding.class b/libjava/classpath/lib/org/omg/CosNaming/Binding.class
deleted file mode 100644
index d70850fe8bf..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/Binding.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingHelper.class b/libjava/classpath/lib/org/omg/CosNaming/BindingHelper.class
deleted file mode 100644
index 4638acc1cea..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingHolder.class b/libjava/classpath/lib/org/omg/CosNaming/BindingHolder.class
deleted file mode 100644
index 02a9ebd176e..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingIterator.class b/libjava/classpath/lib/org/omg/CosNaming/BindingIterator.class
deleted file mode 100644
index 9bceec81737..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorHelper.class b/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorHelper.class
deleted file mode 100644
index 6f4bbf5dfc7..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorHolder.class b/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorHolder.class
deleted file mode 100644
index 6b3a4c97fa6..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorOperations.class b/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorOperations.class
deleted file mode 100644
index 87e7ca41eb0..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorPOA.class b/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorPOA.class
deleted file mode 100644
index e48edfa0133..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingIteratorPOA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingListHelper.class b/libjava/classpath/lib/org/omg/CosNaming/BindingListHelper.class
deleted file mode 100644
index ea612c8ad38..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingListHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingListHolder.class b/libjava/classpath/lib/org/omg/CosNaming/BindingListHolder.class
deleted file mode 100644
index 20367814575..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingListHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingType.class b/libjava/classpath/lib/org/omg/CosNaming/BindingType.class
deleted file mode 100644
index 8e4b93f1bc2..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingTypeHelper.class b/libjava/classpath/lib/org/omg/CosNaming/BindingTypeHelper.class
deleted file mode 100644
index 49be7fbfa5b..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingTypeHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/BindingTypeHolder.class b/libjava/classpath/lib/org/omg/CosNaming/BindingTypeHolder.class
deleted file mode 100644
index 4457b08cf67..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/BindingTypeHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/IstringHelper.class b/libjava/classpath/lib/org/omg/CosNaming/IstringHelper.class
deleted file mode 100644
index 995487831fe..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/IstringHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NameComponent.class b/libjava/classpath/lib/org/omg/CosNaming/NameComponent.class
deleted file mode 100644
index 0911b99bae5..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NameComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NameComponentHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NameComponentHelper.class
deleted file mode 100644
index 465313d11c0..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NameComponentHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NameComponentHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NameComponentHolder.class
deleted file mode 100644
index 8d25d8407de..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NameComponentHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NameHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NameHelper.class
deleted file mode 100644
index 236803e4c25..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NameHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NameHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NameHolder.class
deleted file mode 100644
index 8ebabc09ec3..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NameHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContext.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContext.class
deleted file mode 100644
index 81dac3a898a..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExt.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExt.class
deleted file mode 100644
index e15c49c8c58..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExt.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtHelper.class
deleted file mode 100644
index ba2e73e7869..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtHolder.class
deleted file mode 100644
index 557d34868b0..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtOperations.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtOperations.class
deleted file mode 100644
index 15d24fda36a..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPOA.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPOA.class
deleted file mode 100644
index 4232306c61b..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPOA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.class
deleted file mode 100644
index 27c1454b638..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.class
deleted file mode 100644
index d139ec4edaf..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.class
deleted file mode 100644
index b9a73dfd5ec..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.class
deleted file mode 100644
index cc79954250c..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.class
deleted file mode 100644
index fc6cbae5d1c..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.class
deleted file mode 100644
index d01dea9f807..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextHelper.class
deleted file mode 100644
index 1dd0d29f7c1..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextHolder.class
deleted file mode 100644
index 62e5e554afc..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextOperations.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextOperations.class
deleted file mode 100644
index 25c86bfaa46..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPOA.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPOA.class
deleted file mode 100644
index 27760f42c4b..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPOA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/AlreadyBound.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/AlreadyBound.class
deleted file mode 100644
index dc87560a094..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/AlreadyBound.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.class
deleted file mode 100644
index 8c1dced9797..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.class
deleted file mode 100644
index 0a818278425..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/CannotProceed.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/CannotProceed.class
deleted file mode 100644
index 55d09f18ca5..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/CannotProceed.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.class
deleted file mode 100644
index 5a84c0138f1..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.class
deleted file mode 100644
index f9c6a20e5f7..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/InvalidName.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/InvalidName.class
deleted file mode 100644
index e61c917ad0a..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/InvalidName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.class
deleted file mode 100644
index 75296619cae..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.class
deleted file mode 100644
index 1f46ccfd5a9..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotEmpty.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotEmpty.class
deleted file mode 100644
index 800fd5348cd..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotEmpty.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.class
deleted file mode 100644
index 813858b497e..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.class
deleted file mode 100644
index d791bd5bf69..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFound.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFound.class
deleted file mode 100644
index 29c48e20bf6..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFound.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.class
deleted file mode 100644
index 1190bd77509..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundHolder.class
deleted file mode 100644
index 502132e6385..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundReason.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundReason.class
deleted file mode 100644
index 80e7d0e3c92..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundReason.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.class
deleted file mode 100644
index 729fb72d709..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.class b/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.class
deleted file mode 100644
index 772b53b3add..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/_BindingIteratorImplBase.class b/libjava/classpath/lib/org/omg/CosNaming/_BindingIteratorImplBase.class
deleted file mode 100644
index 2bc4a1a33f0..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/_BindingIteratorImplBase.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/_BindingIteratorStub.class b/libjava/classpath/lib/org/omg/CosNaming/_BindingIteratorStub.class
deleted file mode 100644
index d631bf3f467..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/_BindingIteratorStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/_NamingContextExtImplBase.class b/libjava/classpath/lib/org/omg/CosNaming/_NamingContextExtImplBase.class
deleted file mode 100644
index 964365935e7..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/_NamingContextExtImplBase.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/_NamingContextExtStub.class b/libjava/classpath/lib/org/omg/CosNaming/_NamingContextExtStub.class
deleted file mode 100644
index 00551d8035b..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/_NamingContextExtStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/_NamingContextImplBase.class b/libjava/classpath/lib/org/omg/CosNaming/_NamingContextImplBase.class
deleted file mode 100644
index 696990a037b..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/_NamingContextImplBase.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/CosNaming/_NamingContextStub.class b/libjava/classpath/lib/org/omg/CosNaming/_NamingContextStub.class
deleted file mode 100644
index 043b6f7605b..00000000000
--- a/libjava/classpath/lib/org/omg/CosNaming/_NamingContextStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/Dynamic/Parameter.class b/libjava/classpath/lib/org/omg/Dynamic/Parameter.class
deleted file mode 100644
index fed50ce0515..00000000000
--- a/libjava/classpath/lib/org/omg/Dynamic/Parameter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/AnySeqHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/AnySeqHelper.class
deleted file mode 100644
index 2abdf2bb613..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/AnySeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAny.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAny.class
deleted file mode 100644
index 458677f46af..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAny.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactory.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactory.class
deleted file mode 100644
index 3bbc3ce7ebf..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryHelper.class
deleted file mode 100644
index 6e78d70466d..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryOperations.class
deleted file mode 100644
index 86b8be5dabd..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.class
deleted file mode 100644
index 503b319155e..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.class
deleted file mode 100644
index 509fdb24154..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyHelper.class
deleted file mode 100644
index 91d5a91e7bf..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyOperations.class
deleted file mode 100644
index 5581d354753..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/InvalidValue.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/InvalidValue.class
deleted file mode 100644
index 1ba3db81e72..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/InvalidValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.class
deleted file mode 100644
index 9a2fa22671b..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.class
deleted file mode 100644
index a0a376fe0c7..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.class
deleted file mode 100644
index 4eb8cf692c4..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynAnySeqHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynAnySeqHelper.class
deleted file mode 100644
index 0d20bc3b567..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynAnySeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynArray.class b/libjava/classpath/lib/org/omg/DynamicAny/DynArray.class
deleted file mode 100644
index 5020891f99e..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynArray.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynArrayHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynArrayHelper.class
deleted file mode 100644
index c207376dab4..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynArrayHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynArrayOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynArrayOperations.class
deleted file mode 100644
index 5a8f1bae917..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynArrayOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynEnum.class b/libjava/classpath/lib/org/omg/DynamicAny/DynEnum.class
deleted file mode 100644
index 89403af1002..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynEnum.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynEnumHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynEnumHelper.class
deleted file mode 100644
index df78cb05975..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynEnumHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynEnumOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynEnumOperations.class
deleted file mode 100644
index 485707f004b..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynEnumOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynFixed.class b/libjava/classpath/lib/org/omg/DynamicAny/DynFixed.class
deleted file mode 100644
index 4b7959709a8..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynFixed.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynFixedHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynFixedHelper.class
deleted file mode 100644
index d13af0faf22..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynFixedHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynFixedOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynFixedOperations.class
deleted file mode 100644
index 028007c3bde..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynFixedOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynSequence.class b/libjava/classpath/lib/org/omg/DynamicAny/DynSequence.class
deleted file mode 100644
index 96b8ef7c37f..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynSequence.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynSequenceHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynSequenceHelper.class
deleted file mode 100644
index c64da94523b..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynSequenceHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynSequenceOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynSequenceOperations.class
deleted file mode 100644
index 66bdd7aa134..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynSequenceOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynStruct.class b/libjava/classpath/lib/org/omg/DynamicAny/DynStruct.class
deleted file mode 100644
index a0875fd2d00..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynStruct.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynStructHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynStructHelper.class
deleted file mode 100644
index 2a3e6520ff1..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynStructHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynStructOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynStructOperations.class
deleted file mode 100644
index 8a03e810bf0..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynStructOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynUnion.class b/libjava/classpath/lib/org/omg/DynamicAny/DynUnion.class
deleted file mode 100644
index f97d7beeb57..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynUnion.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynUnionHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynUnionHelper.class
deleted file mode 100644
index f624ea49059..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynUnionHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynUnionOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynUnionOperations.class
deleted file mode 100644
index 04ac9ea406c..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynUnionOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynValue.class b/libjava/classpath/lib/org/omg/DynamicAny/DynValue.class
deleted file mode 100644
index 2a3ac74ee54..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynValueBox.class b/libjava/classpath/lib/org/omg/DynamicAny/DynValueBox.class
deleted file mode 100644
index e86fe0ca649..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynValueBox.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynValueBoxOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynValueBoxOperations.class
deleted file mode 100644
index 05ce9023410..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynValueBoxOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynValueCommon.class b/libjava/classpath/lib/org/omg/DynamicAny/DynValueCommon.class
deleted file mode 100644
index 7bd8a4e4ea4..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynValueCommon.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynValueCommonOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynValueCommonOperations.class
deleted file mode 100644
index 55e9c058b97..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynValueCommonOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynValueHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/DynValueHelper.class
deleted file mode 100644
index feeab365be7..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynValueHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/DynValueOperations.class b/libjava/classpath/lib/org/omg/DynamicAny/DynValueOperations.class
deleted file mode 100644
index 26a6dad8604..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/DynValueOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/FieldNameHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/FieldNameHelper.class
deleted file mode 100644
index 75c617c2ce9..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/FieldNameHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/NameDynAnyPair.class b/libjava/classpath/lib/org/omg/DynamicAny/NameDynAnyPair.class
deleted file mode 100644
index cf7e0025b90..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/NameDynAnyPair.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/NameDynAnyPairHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/NameDynAnyPairHelper.class
deleted file mode 100644
index b83246e4c2d..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/NameDynAnyPairHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/NameDynAnyPairSeqHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/NameDynAnyPairSeqHelper.class
deleted file mode 100644
index dcf5a77ecd0..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/NameDynAnyPairSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/NameValuePair.class b/libjava/classpath/lib/org/omg/DynamicAny/NameValuePair.class
deleted file mode 100644
index 92a43f4296f..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/NameValuePair.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/NameValuePairHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/NameValuePairHelper.class
deleted file mode 100644
index 3425c4f4150..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/NameValuePairHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/NameValuePairSeqHelper.class b/libjava/classpath/lib/org/omg/DynamicAny/NameValuePairSeqHelper.class
deleted file mode 100644
index 6f5a36b2cfb..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/NameValuePairSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynAnyFactoryStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynAnyFactoryStub.class
deleted file mode 100644
index f86463f4847..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/_DynAnyFactoryStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynAnyStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynAnyStub.class
deleted file mode 100644
index 5e1fafded16..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/_DynAnyStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynArrayStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynArrayStub.class
deleted file mode 100644
index 4d3a705dd74..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/_DynArrayStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynEnumStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynEnumStub.class
deleted file mode 100644
index c005cef95e1..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/_DynEnumStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynFixedStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynFixedStub.class
deleted file mode 100644
index 9a6d99cd331..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/_DynFixedStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynSequenceStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynSequenceStub.class
deleted file mode 100644
index 6fe1051030b..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/_DynSequenceStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynStructStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynStructStub.class
deleted file mode 100644
index 2cf9fa60d60..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/_DynStructStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynUnionStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynUnionStub.class
deleted file mode 100644
index c1428a3d7e4..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/_DynUnionStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/DynamicAny/_DynValueStub.class b/libjava/classpath/lib/org/omg/DynamicAny/_DynValueStub.class
deleted file mode 100644
index a6f9e5d0718..00000000000
--- a/libjava/classpath/lib/org/omg/DynamicAny/_DynValueStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodeSets.class b/libjava/classpath/lib/org/omg/IOP/CodeSets.class
deleted file mode 100644
index 6109b883143..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodeSets.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/Codec.class b/libjava/classpath/lib/org/omg/IOP/Codec.class
deleted file mode 100644
index e42906370dd..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/Codec.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecFactory.class b/libjava/classpath/lib/org/omg/IOP/CodecFactory.class
deleted file mode 100644
index 2e41db477f6..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecFactoryHelper.class b/libjava/classpath/lib/org/omg/IOP/CodecFactoryHelper.class
deleted file mode 100644
index 6d6d88623cc..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecFactoryHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecFactoryOperations.class b/libjava/classpath/lib/org/omg/IOP/CodecFactoryOperations.class
deleted file mode 100644
index c33c151e99c..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecFactoryOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.class b/libjava/classpath/lib/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.class
deleted file mode 100644
index 0e25aa501b6..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.class b/libjava/classpath/lib/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.class
deleted file mode 100644
index c058507929d..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecOperations.class b/libjava/classpath/lib/org/omg/IOP/CodecOperations.class
deleted file mode 100644
index de771ce7a3f..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecPackage/FormatMismatch.class b/libjava/classpath/lib/org/omg/IOP/CodecPackage/FormatMismatch.class
deleted file mode 100644
index 95b341617b8..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecPackage/FormatMismatch.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecPackage/FormatMismatchHelper.class b/libjava/classpath/lib/org/omg/IOP/CodecPackage/FormatMismatchHelper.class
deleted file mode 100644
index 68d86602f73..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecPackage/FormatMismatchHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.class b/libjava/classpath/lib/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.class
deleted file mode 100644
index 108645b425a..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.class b/libjava/classpath/lib/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.class
deleted file mode 100644
index c66c4f4641b..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecPackage/TypeMismatch.class b/libjava/classpath/lib/org/omg/IOP/CodecPackage/TypeMismatch.class
deleted file mode 100644
index b77ba837875..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecPackage/TypeMismatch.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/CodecPackage/TypeMismatchHelper.class b/libjava/classpath/lib/org/omg/IOP/CodecPackage/TypeMismatchHelper.class
deleted file mode 100644
index a22d353b1fc..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/CodecPackage/TypeMismatchHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/ComponentIdHelper.class b/libjava/classpath/lib/org/omg/IOP/ComponentIdHelper.class
deleted file mode 100644
index e728dd272a6..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/ComponentIdHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/ENCODING_CDR_ENCAPS.class b/libjava/classpath/lib/org/omg/IOP/ENCODING_CDR_ENCAPS.class
deleted file mode 100644
index 978fce2d311..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/ENCODING_CDR_ENCAPS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/Encoding.class b/libjava/classpath/lib/org/omg/IOP/Encoding.class
deleted file mode 100644
index 7556fb37337..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/Encoding.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/ExceptionDetailMessage.class b/libjava/classpath/lib/org/omg/IOP/ExceptionDetailMessage.class
deleted file mode 100644
index 68b7635be9e..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/ExceptionDetailMessage.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/IOR.class b/libjava/classpath/lib/org/omg/IOP/IOR.class
deleted file mode 100644
index bcd7eeeb11f..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/IOR.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/IORHelper.class b/libjava/classpath/lib/org/omg/IOP/IORHelper.class
deleted file mode 100644
index fd40ff58064..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/IORHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/IORHolder.class b/libjava/classpath/lib/org/omg/IOP/IORHolder.class
deleted file mode 100644
index 5f6f159d7b6..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/IORHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/MultipleComponentProfileHelper.class b/libjava/classpath/lib/org/omg/IOP/MultipleComponentProfileHelper.class
deleted file mode 100644
index 90a55f4873b..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/MultipleComponentProfileHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/MultipleComponentProfileHolder.class b/libjava/classpath/lib/org/omg/IOP/MultipleComponentProfileHolder.class
deleted file mode 100644
index 3e155593708..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/MultipleComponentProfileHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/ProfileIdHelper.class b/libjava/classpath/lib/org/omg/IOP/ProfileIdHelper.class
deleted file mode 100644
index 53d42b3969a..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/ProfileIdHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/RMICustomMaxStreamFormat.class b/libjava/classpath/lib/org/omg/IOP/RMICustomMaxStreamFormat.class
deleted file mode 100644
index c148217e591..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/RMICustomMaxStreamFormat.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/ServiceContext.class b/libjava/classpath/lib/org/omg/IOP/ServiceContext.class
deleted file mode 100644
index ce87e0d96ce..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/ServiceContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/ServiceContextHelper.class b/libjava/classpath/lib/org/omg/IOP/ServiceContextHelper.class
deleted file mode 100644
index e89d8b70826..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/ServiceContextHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/ServiceContextHolder.class b/libjava/classpath/lib/org/omg/IOP/ServiceContextHolder.class
deleted file mode 100644
index 6a4f900a9e2..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/ServiceContextHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/ServiceContextListHelper.class b/libjava/classpath/lib/org/omg/IOP/ServiceContextListHelper.class
deleted file mode 100644
index bbb4931dda4..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/ServiceContextListHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/ServiceContextListHolder.class b/libjava/classpath/lib/org/omg/IOP/ServiceContextListHolder.class
deleted file mode 100644
index 9d8c1c99160..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/ServiceContextListHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/ServiceIdHelper.class b/libjava/classpath/lib/org/omg/IOP/ServiceIdHelper.class
deleted file mode 100644
index 6184d2d1994..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/ServiceIdHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.class b/libjava/classpath/lib/org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.class
deleted file mode 100644
index 0e25b921311..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TAG_CODE_SETS.class b/libjava/classpath/lib/org/omg/IOP/TAG_CODE_SETS.class
deleted file mode 100644
index ec11356314b..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TAG_CODE_SETS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TAG_INTERNET_IOP.class b/libjava/classpath/lib/org/omg/IOP/TAG_INTERNET_IOP.class
deleted file mode 100644
index d91405894b1..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TAG_INTERNET_IOP.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TAG_JAVA_CODEBASE.class b/libjava/classpath/lib/org/omg/IOP/TAG_JAVA_CODEBASE.class
deleted file mode 100644
index 4ad70a03c55..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TAG_JAVA_CODEBASE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TAG_MULTIPLE_COMPONENTS.class b/libjava/classpath/lib/org/omg/IOP/TAG_MULTIPLE_COMPONENTS.class
deleted file mode 100644
index 9e382231c52..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TAG_MULTIPLE_COMPONENTS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TAG_ORB_TYPE.class b/libjava/classpath/lib/org/omg/IOP/TAG_ORB_TYPE.class
deleted file mode 100644
index d22683e21cd..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TAG_ORB_TYPE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TAG_POLICIES.class b/libjava/classpath/lib/org/omg/IOP/TAG_POLICIES.class
deleted file mode 100644
index 011cf550e58..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TAG_POLICIES.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.class b/libjava/classpath/lib/org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.class
deleted file mode 100644
index 509b595a269..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TaggedComponent.class b/libjava/classpath/lib/org/omg/IOP/TaggedComponent.class
deleted file mode 100644
index ac20714f739..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TaggedComponent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TaggedComponentHelper.class b/libjava/classpath/lib/org/omg/IOP/TaggedComponentHelper.class
deleted file mode 100644
index cc440c77942..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TaggedComponentHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TaggedComponentHolder.class b/libjava/classpath/lib/org/omg/IOP/TaggedComponentHolder.class
deleted file mode 100644
index f204f615b77..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TaggedComponentHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TaggedProfile.class b/libjava/classpath/lib/org/omg/IOP/TaggedProfile.class
deleted file mode 100644
index d5b79013613..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TaggedProfile.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TaggedProfileHelper.class b/libjava/classpath/lib/org/omg/IOP/TaggedProfileHelper.class
deleted file mode 100644
index 17061d4a1d6..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TaggedProfileHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TaggedProfileHolder.class b/libjava/classpath/lib/org/omg/IOP/TaggedProfileHolder.class
deleted file mode 100644
index db3eb5f8683..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TaggedProfileHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/IOP/TransactionService.class b/libjava/classpath/lib/org/omg/IOP/TransactionService.class
deleted file mode 100644
index 2ae3b468276..00000000000
--- a/libjava/classpath/lib/org/omg/IOP/TransactionService.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/Messaging/SYNC_WITH_TRANSPORT.class b/libjava/classpath/lib/org/omg/Messaging/SYNC_WITH_TRANSPORT.class
deleted file mode 100644
index e9d0ea24f3c..00000000000
--- a/libjava/classpath/lib/org/omg/Messaging/SYNC_WITH_TRANSPORT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/Messaging/SyncScopeHelper.class b/libjava/classpath/lib/org/omg/Messaging/SyncScopeHelper.class
deleted file mode 100644
index c1da57963e6..00000000000
--- a/libjava/classpath/lib/org/omg/Messaging/SyncScopeHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ACTIVE.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ACTIVE.class
deleted file mode 100644
index f62c2bb64c5..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ACTIVE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/AdapterManagerIdHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/AdapterManagerIdHelper.class
deleted file mode 100644
index 05fef01eb52..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/AdapterManagerIdHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/AdapterNameHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/AdapterNameHelper.class
deleted file mode 100644
index e78eff0b72e..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/AdapterNameHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/AdapterStateHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/AdapterStateHelper.class
deleted file mode 100644
index 31b3082dfb7..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/AdapterStateHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInfo.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInfo.class
deleted file mode 100644
index fa6d2cb5423..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInfoOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInfoOperations.class
deleted file mode 100644
index 21f579a9fac..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInfoOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInterceptor.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInterceptor.class
deleted file mode 100644
index a0da5d6c11a..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInterceptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.class
deleted file mode 100644
index 3f488761446..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/Current.class b/libjava/classpath/lib/org/omg/PortableInterceptor/Current.class
deleted file mode 100644
index 5bb5ae13fa5..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/Current.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/CurrentHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/CurrentHelper.class
deleted file mode 100644
index d705e2bc298..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/CurrentHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/CurrentOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/CurrentOperations.class
deleted file mode 100644
index f277404f840..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/CurrentOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/DISCARDING.class b/libjava/classpath/lib/org/omg/PortableInterceptor/DISCARDING.class
deleted file mode 100644
index a17951ffdca..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/DISCARDING.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ForwardRequest.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ForwardRequest.class
deleted file mode 100644
index 75dc5b3e8ea..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ForwardRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ForwardRequestHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ForwardRequestHelper.class
deleted file mode 100644
index 1586cf72764..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ForwardRequestHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/HOLDING.class b/libjava/classpath/lib/org/omg/PortableInterceptor/HOLDING.class
deleted file mode 100644
index d8523871132..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/HOLDING.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/INACTIVE.class b/libjava/classpath/lib/org/omg/PortableInterceptor/INACTIVE.class
deleted file mode 100644
index d9c8c70396c..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/INACTIVE.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInfo.class b/libjava/classpath/lib/org/omg/PortableInterceptor/IORInfo.class
deleted file mode 100644
index 3993e938c90..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInfoOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/IORInfoOperations.class
deleted file mode 100644
index 72e5ab20d76..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInfoOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor.class b/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor.class
deleted file mode 100644
index d00eb2eded8..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptorOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptorOperations.class
deleted file mode 100644
index da1fc220df4..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptorOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0.class b/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0.class
deleted file mode 100644
index 8c05d479de6..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.class
deleted file mode 100644
index 9ea358d095a..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.class b/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.class
deleted file mode 100644
index c5f0a77c16b..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.class
deleted file mode 100644
index 63fa9892a4f..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/Interceptor.class b/libjava/classpath/lib/org/omg/PortableInterceptor/Interceptor.class
deleted file mode 100644
index 4984c4d3972..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/Interceptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/InterceptorOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/InterceptorOperations.class
deleted file mode 100644
index 8a4984a9c77..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/InterceptorOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/InvalidSlot.class b/libjava/classpath/lib/org/omg/PortableInterceptor/InvalidSlot.class
deleted file mode 100644
index dead3abd784..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/InvalidSlot.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/InvalidSlotHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/InvalidSlotHelper.class
deleted file mode 100644
index f697ce5166a..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/InvalidSlotHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/LOCATION_FORWARD.class b/libjava/classpath/lib/org/omg/PortableInterceptor/LOCATION_FORWARD.class
deleted file mode 100644
index ed8d473c31e..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/LOCATION_FORWARD.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/NON_EXISTENT.class b/libjava/classpath/lib/org/omg/PortableInterceptor/NON_EXISTENT.class
deleted file mode 100644
index aa3216ccdd7..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/NON_EXISTENT.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBIdHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ORBIdHelper.class
deleted file mode 100644
index e2c94b8412b..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBIdHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfo.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfo.class
deleted file mode 100644
index 92e62b1e80e..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoOperations.class
deleted file mode 100644
index f12f9228ea6..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.class
deleted file mode 100644
index f872a4b568a..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.class
deleted file mode 100644
index bb483a9ab5f..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.class
deleted file mode 100644
index 7e90bc1737a..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.class
deleted file mode 100644
index 06a006b5f2f..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.class
deleted file mode 100644
index 34ecdd04823..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitializer.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitializer.class
deleted file mode 100644
index 271a7d4f6b0..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitializer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitializerOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitializerOperations.class
deleted file mode 100644
index 6c5788eeae9..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ORBInitializerOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectIdHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectIdHelper.class
deleted file mode 100644
index 4cfc9cfad5b..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectIdHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceFactory.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceFactory.class
deleted file mode 100644
index f5c1114155f..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.class
deleted file mode 100644
index 77b24e7a2d7..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.class
deleted file mode 100644
index c1c714ee147..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplate.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplate.class
deleted file mode 100644
index 02bf2fbfb45..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.class
deleted file mode 100644
index 964b46c59c9..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.class
deleted file mode 100644
index 92c3659c5cd..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.class
deleted file mode 100644
index fb600584341..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.class
deleted file mode 100644
index adaad2dcb39..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/PolicyFactory.class b/libjava/classpath/lib/org/omg/PortableInterceptor/PolicyFactory.class
deleted file mode 100644
index 3cfdecdc716..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/PolicyFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/PolicyFactoryOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/PolicyFactoryOperations.class
deleted file mode 100644
index 980d6d27270..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/PolicyFactoryOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/RequestInfo.class b/libjava/classpath/lib/org/omg/PortableInterceptor/RequestInfo.class
deleted file mode 100644
index 279254ebb54..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/RequestInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/RequestInfoOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/RequestInfoOperations.class
deleted file mode 100644
index ce12749a858..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/RequestInfoOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/SUCCESSFUL.class b/libjava/classpath/lib/org/omg/PortableInterceptor/SUCCESSFUL.class
deleted file mode 100644
index 1e9ce342eed..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/SUCCESSFUL.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.class b/libjava/classpath/lib/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.class
deleted file mode 100644
index 50894b2059c..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ServerIdHelper.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ServerIdHelper.class
deleted file mode 100644
index 5c85fbc7d9f..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ServerIdHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInfo.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInfo.class
deleted file mode 100644
index a04f5930074..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInfoOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInfoOperations.class
deleted file mode 100644
index 52366e313e3..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInfoOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInterceptor.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInterceptor.class
deleted file mode 100644
index 6cbd3de0cc2..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInterceptor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.class b/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.class
deleted file mode 100644
index 54b98bd5318..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/TRANSPORT_RETRY.class b/libjava/classpath/lib/org/omg/PortableInterceptor/TRANSPORT_RETRY.class
deleted file mode 100644
index 41eb816e0be..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/TRANSPORT_RETRY.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/USER_EXCEPTION.class b/libjava/classpath/lib/org/omg/PortableInterceptor/USER_EXCEPTION.class
deleted file mode 100644
index ccde42904f9..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/USER_EXCEPTION.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.class b/libjava/classpath/lib/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.class
deleted file mode 100644
index c7d97cb2258..00000000000
--- a/libjava/classpath/lib/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/AdapterActivator.class b/libjava/classpath/lib/org/omg/PortableServer/AdapterActivator.class
deleted file mode 100644
index 3386cb87895..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/AdapterActivator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/AdapterActivatorOperations.class b/libjava/classpath/lib/org/omg/PortableServer/AdapterActivatorOperations.class
deleted file mode 100644
index 522d77f99d1..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/AdapterActivatorOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/Current.class b/libjava/classpath/lib/org/omg/PortableServer/Current.class
deleted file mode 100644
index 314ba8fc81e..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/Current.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/CurrentHelper.class b/libjava/classpath/lib/org/omg/PortableServer/CurrentHelper.class
deleted file mode 100644
index 3a79035c1c0..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/CurrentHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/CurrentOperations.class b/libjava/classpath/lib/org/omg/PortableServer/CurrentOperations.class
deleted file mode 100644
index 992a9a1a6a9..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/CurrentOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/CurrentPackage/NoContext.class b/libjava/classpath/lib/org/omg/PortableServer/CurrentPackage/NoContext.class
deleted file mode 100644
index 65cc6667c7e..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/CurrentPackage/NoContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/CurrentPackage/NoContextHelper.class b/libjava/classpath/lib/org/omg/PortableServer/CurrentPackage/NoContextHelper.class
deleted file mode 100644
index 2a84b31a0b9..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/CurrentPackage/NoContextHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/DynamicImplementation.class b/libjava/classpath/lib/org/omg/PortableServer/DynamicImplementation.class
deleted file mode 100644
index 181dafec033..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/DynamicImplementation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ForwardRequest.class b/libjava/classpath/lib/org/omg/PortableServer/ForwardRequest.class
deleted file mode 100644
index 9d2fc9ce146..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ForwardRequest.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ForwardRequestHelper.class b/libjava/classpath/lib/org/omg/PortableServer/ForwardRequestHelper.class
deleted file mode 100644
index f2759d58568..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ForwardRequestHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.class b/libjava/classpath/lib/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.class
deleted file mode 100644
index 412e80bef69..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.class b/libjava/classpath/lib/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.class
deleted file mode 100644
index 9152545a5bf..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.class b/libjava/classpath/lib/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.class
deleted file mode 100644
index f293f42156b..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/IdAssignmentPolicy.class b/libjava/classpath/lib/org/omg/PortableServer/IdAssignmentPolicy.class
deleted file mode 100644
index 1ea60bb3ac1..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/IdAssignmentPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/IdAssignmentPolicyOperations.class b/libjava/classpath/lib/org/omg/PortableServer/IdAssignmentPolicyOperations.class
deleted file mode 100644
index 8ca64c3eb7f..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/IdAssignmentPolicyOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/IdAssignmentPolicyValue.class b/libjava/classpath/lib/org/omg/PortableServer/IdAssignmentPolicyValue.class
deleted file mode 100644
index 5f28c46dd47..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/IdAssignmentPolicyValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/IdUniquenessPolicy.class b/libjava/classpath/lib/org/omg/PortableServer/IdUniquenessPolicy.class
deleted file mode 100644
index 05e41ed83f0..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/IdUniquenessPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/IdUniquenessPolicyOperations.class b/libjava/classpath/lib/org/omg/PortableServer/IdUniquenessPolicyOperations.class
deleted file mode 100644
index f1d2686e811..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/IdUniquenessPolicyOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/IdUniquenessPolicyValue.class b/libjava/classpath/lib/org/omg/PortableServer/IdUniquenessPolicyValue.class
deleted file mode 100644
index be1654aa132..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/IdUniquenessPolicyValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ImplicitActivationPolicy.class b/libjava/classpath/lib/org/omg/PortableServer/ImplicitActivationPolicy.class
deleted file mode 100644
index 6ca99987849..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ImplicitActivationPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ImplicitActivationPolicyOperations.class b/libjava/classpath/lib/org/omg/PortableServer/ImplicitActivationPolicyOperations.class
deleted file mode 100644
index 0b56ff4f1ad..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ImplicitActivationPolicyOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ImplicitActivationPolicyValue.class b/libjava/classpath/lib/org/omg/PortableServer/ImplicitActivationPolicyValue.class
deleted file mode 100644
index 6a947d402da..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ImplicitActivationPolicyValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/LIFESPAN_POLICY_ID.class b/libjava/classpath/lib/org/omg/PortableServer/LIFESPAN_POLICY_ID.class
deleted file mode 100644
index 37d54b993a4..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/LIFESPAN_POLICY_ID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/LifespanPolicy.class b/libjava/classpath/lib/org/omg/PortableServer/LifespanPolicy.class
deleted file mode 100644
index 3e91a61edb8..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/LifespanPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/LifespanPolicyOperations.class b/libjava/classpath/lib/org/omg/PortableServer/LifespanPolicyOperations.class
deleted file mode 100644
index 846b5d5c70e..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/LifespanPolicyOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/LifespanPolicyValue.class b/libjava/classpath/lib/org/omg/PortableServer/LifespanPolicyValue.class
deleted file mode 100644
index 368b9e4b786..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/LifespanPolicyValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POA.class b/libjava/classpath/lib/org/omg/PortableServer/POA.class
deleted file mode 100644
index a6efbc9d0e2..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAHelper.class
deleted file mode 100644
index e66809f7f9d..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAManager.class b/libjava/classpath/lib/org/omg/PortableServer/POAManager.class
deleted file mode 100644
index 7b87924561c..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAManagerOperations.class b/libjava/classpath/lib/org/omg/PortableServer/POAManagerOperations.class
deleted file mode 100644
index 91ed0cd09d1..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAManagerOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAManagerPackage/AdapterInactive.class b/libjava/classpath/lib/org/omg/PortableServer/POAManagerPackage/AdapterInactive.class
deleted file mode 100644
index c0ea5bd5c4b..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAManagerPackage/AdapterInactive.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.class
deleted file mode 100644
index 6e79f378b85..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAManagerPackage/State.class b/libjava/classpath/lib/org/omg/PortableServer/POAManagerPackage/State.class
deleted file mode 100644
index 76a3b3b6908..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAManagerPackage/State.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAOperations.class b/libjava/classpath/lib/org/omg/PortableServer/POAOperations.class
deleted file mode 100644
index 478941c0dc1..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.class
deleted file mode 100644
index 5e9ffe5b944..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.class
deleted file mode 100644
index 2dfc3a1e33e..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterNonExistent.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterNonExistent.class
deleted file mode 100644
index b09e0f48834..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterNonExistent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.class
deleted file mode 100644
index 5de0e15b986..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/InvalidPolicy.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/InvalidPolicy.class
deleted file mode 100644
index 62e0779fc74..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/InvalidPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.class
deleted file mode 100644
index f37dd6c52e6..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/NoServant.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/NoServant.class
deleted file mode 100644
index b34ae168a1a..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/NoServant.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/NoServantHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/NoServantHelper.class
deleted file mode 100644
index aceb6f39005..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/NoServantHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.class
deleted file mode 100644
index 735333ac4f8..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.class
deleted file mode 100644
index e3c87092904..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectNotActive.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectNotActive.class
deleted file mode 100644
index 12158c15c5b..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectNotActive.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.class
deleted file mode 100644
index 35c98fa61c8..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantAlreadyActive.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantAlreadyActive.class
deleted file mode 100644
index 05311dab760..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantAlreadyActive.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.class
deleted file mode 100644
index e21d26b912c..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantNotActive.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantNotActive.class
deleted file mode 100644
index 9bb2d41298a..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantNotActive.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.class
deleted file mode 100644
index 21a32d107ca..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongAdapter.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongAdapter.class
deleted file mode 100644
index 435f57c7b1b..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongAdapterHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongAdapterHelper.class
deleted file mode 100644
index 098b707e3ae..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongAdapterHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongPolicy.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongPolicy.class
deleted file mode 100644
index 378e7cdb464..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongPolicyHelper.class b/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongPolicyHelper.class
deleted file mode 100644
index 9419d796495..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/POAPackage/WrongPolicyHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.class b/libjava/classpath/lib/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.class
deleted file mode 100644
index 5d33c123cf5..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/RequestProcessingPolicy.class b/libjava/classpath/lib/org/omg/PortableServer/RequestProcessingPolicy.class
deleted file mode 100644
index 69f179430e7..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/RequestProcessingPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/RequestProcessingPolicyOperations.class b/libjava/classpath/lib/org/omg/PortableServer/RequestProcessingPolicyOperations.class
deleted file mode 100644
index f9c6bdf1a2f..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/RequestProcessingPolicyOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/RequestProcessingPolicyValue.class b/libjava/classpath/lib/org/omg/PortableServer/RequestProcessingPolicyValue.class
deleted file mode 100644
index cf9025528a4..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/RequestProcessingPolicyValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.class b/libjava/classpath/lib/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.class
deleted file mode 100644
index 99eac73fb47..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/Servant.class b/libjava/classpath/lib/org/omg/PortableServer/Servant.class
deleted file mode 100644
index 7baf1f12726..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/Servant.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantActivator.class b/libjava/classpath/lib/org/omg/PortableServer/ServantActivator.class
deleted file mode 100644
index 2e31cdcd3bb..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantActivator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorHelper.class b/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorHelper.class
deleted file mode 100644
index 8fe337b3834..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorOperations.class b/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorOperations.class
deleted file mode 100644
index 6e5433d72d7..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorPOA$delegator.class b/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorPOA$delegator.class
deleted file mode 100644
index b6f0ca67762..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorPOA$delegator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorPOA.class b/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorPOA.class
deleted file mode 100644
index 1d584195e83..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantActivatorPOA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantLocator.class b/libjava/classpath/lib/org/omg/PortableServer/ServantLocator.class
deleted file mode 100644
index 10ae566e4ce..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorHelper.class b/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorHelper.class
deleted file mode 100644
index e85bcd71bcc..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorHelper.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorOperations.class b/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorOperations.class
deleted file mode 100644
index 1a9b35a3112..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorPOA$delegator.class b/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorPOA$delegator.class
deleted file mode 100644
index 77b49fe8abe..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorPOA$delegator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorPOA.class b/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorPOA.class
deleted file mode 100644
index 7963edeab3a..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorPOA.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.class b/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.class
deleted file mode 100644
index 808ffdff07d..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantManager.class b/libjava/classpath/lib/org/omg/PortableServer/ServantManager.class
deleted file mode 100644
index 6fc2ead96d1..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantManager.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantManagerOperations.class b/libjava/classpath/lib/org/omg/PortableServer/ServantManagerOperations.class
deleted file mode 100644
index e24e934d968..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantManagerOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantRetentionPolicy.class b/libjava/classpath/lib/org/omg/PortableServer/ServantRetentionPolicy.class
deleted file mode 100644
index 33265730d15..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantRetentionPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantRetentionPolicyOperations.class b/libjava/classpath/lib/org/omg/PortableServer/ServantRetentionPolicyOperations.class
deleted file mode 100644
index 7cac545db30..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantRetentionPolicyOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ServantRetentionPolicyValue.class b/libjava/classpath/lib/org/omg/PortableServer/ServantRetentionPolicyValue.class
deleted file mode 100644
index 1b04d669955..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ServantRetentionPolicyValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/THREAD_POLICY_ID.class b/libjava/classpath/lib/org/omg/PortableServer/THREAD_POLICY_ID.class
deleted file mode 100644
index 616b5c884c4..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/THREAD_POLICY_ID.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ThreadPolicy.class b/libjava/classpath/lib/org/omg/PortableServer/ThreadPolicy.class
deleted file mode 100644
index 0d67177a924..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ThreadPolicy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ThreadPolicyOperations.class b/libjava/classpath/lib/org/omg/PortableServer/ThreadPolicyOperations.class
deleted file mode 100644
index a290f224f85..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ThreadPolicyOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/ThreadPolicyValue.class b/libjava/classpath/lib/org/omg/PortableServer/ThreadPolicyValue.class
deleted file mode 100644
index f810fd1d47a..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/ThreadPolicyValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/_ServantActivatorStub.class b/libjava/classpath/lib/org/omg/PortableServer/_ServantActivatorStub.class
deleted file mode 100644
index 51fbbae24d6..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/_ServantActivatorStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/_ServantLocatorStub.class b/libjava/classpath/lib/org/omg/PortableServer/_ServantLocatorStub.class
deleted file mode 100644
index 24aa49d5e78..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/_ServantLocatorStub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/PortableServer/portable/Delegate.class b/libjava/classpath/lib/org/omg/PortableServer/portable/Delegate.class
deleted file mode 100644
index 6ceb6e0daa3..00000000000
--- a/libjava/classpath/lib/org/omg/PortableServer/portable/Delegate.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/SendingContext/RunTime.class b/libjava/classpath/lib/org/omg/SendingContext/RunTime.class
deleted file mode 100644
index 55fbc575e50..00000000000
--- a/libjava/classpath/lib/org/omg/SendingContext/RunTime.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/SendingContext/RunTimeOperations.class b/libjava/classpath/lib/org/omg/SendingContext/RunTimeOperations.class
deleted file mode 100644
index c1ef821014c..00000000000
--- a/libjava/classpath/lib/org/omg/SendingContext/RunTimeOperations.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/omg/stub/java/rmi/_Remote_Stub.class b/libjava/classpath/lib/org/omg/stub/java/rmi/_Remote_Stub.class
deleted file mode 100644
index 021fbde7d53..00000000000
--- a/libjava/classpath/lib/org/omg/stub/java/rmi/_Remote_Stub.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/Datatype.class b/libjava/classpath/lib/org/relaxng/datatype/Datatype.class
deleted file mode 100644
index 727dadd61b5..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/Datatype.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/DatatypeBuilder.class b/libjava/classpath/lib/org/relaxng/datatype/DatatypeBuilder.class
deleted file mode 100644
index 0842ac94c34..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/DatatypeBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/DatatypeException.class b/libjava/classpath/lib/org/relaxng/datatype/DatatypeException.class
deleted file mode 100644
index 05bf9ed8141..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/DatatypeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/DatatypeLibrary.class b/libjava/classpath/lib/org/relaxng/datatype/DatatypeLibrary.class
deleted file mode 100644
index ac751295384..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/DatatypeLibrary.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/DatatypeLibraryFactory.class b/libjava/classpath/lib/org/relaxng/datatype/DatatypeLibraryFactory.class
deleted file mode 100644
index 1ea738d6556..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/DatatypeLibraryFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/DatatypeStreamingValidator.class b/libjava/classpath/lib/org/relaxng/datatype/DatatypeStreamingValidator.class
deleted file mode 100644
index bf48191b22e..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/DatatypeStreamingValidator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/ValidationContext.class b/libjava/classpath/lib/org/relaxng/datatype/ValidationContext.class
deleted file mode 100644
index f60648d5a96..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/ValidationContext.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader.class b/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader.class
deleted file mode 100644
index 20f833b7e16..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader2.class b/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader2.class
deleted file mode 100644
index 08e660a92ce..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$ProviderEnumeration.class b/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$ProviderEnumeration.class
deleted file mode 100644
index 6b39f8064c5..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$ProviderEnumeration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Singleton.class b/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Singleton.class
deleted file mode 100644
index 64b8cc09988..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Singleton.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service.class b/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service.class
deleted file mode 100644
index 72fbfc32fa0..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader.class b/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader.class
deleted file mode 100644
index 9662f62cdec..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/helpers/DatatypeLibraryLoader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.class b/libjava/classpath/lib/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.class
deleted file mode 100644
index 18ebd721f5e..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/relaxng/datatype/helpers/StreamingValidatorImpl.class b/libjava/classpath/lib/org/relaxng/datatype/helpers/StreamingValidatorImpl.class
deleted file mode 100644
index 39a497d2d74..00000000000
--- a/libjava/classpath/lib/org/relaxng/datatype/helpers/StreamingValidatorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/Attr.class b/libjava/classpath/lib/org/w3c/dom/Attr.class
deleted file mode 100644
index 1ff7f985b79..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/Attr.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/CDATASection.class b/libjava/classpath/lib/org/w3c/dom/CDATASection.class
deleted file mode 100644
index 349b07a9f48..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/CDATASection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/CharacterData.class b/libjava/classpath/lib/org/w3c/dom/CharacterData.class
deleted file mode 100644
index 94a4a68ef65..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/CharacterData.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/Comment.class b/libjava/classpath/lib/org/w3c/dom/Comment.class
deleted file mode 100644
index 88657114f26..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/Comment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DOMConfiguration.class b/libjava/classpath/lib/org/w3c/dom/DOMConfiguration.class
deleted file mode 100644
index d74b669757a..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DOMConfiguration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DOMError.class b/libjava/classpath/lib/org/w3c/dom/DOMError.class
deleted file mode 100644
index 703971cf49e..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DOMError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DOMErrorHandler.class b/libjava/classpath/lib/org/w3c/dom/DOMErrorHandler.class
deleted file mode 100644
index 07d3c23a13c..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DOMErrorHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DOMException.class b/libjava/classpath/lib/org/w3c/dom/DOMException.class
deleted file mode 100644
index b6ad41d6c56..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DOMException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DOMImplementation.class b/libjava/classpath/lib/org/w3c/dom/DOMImplementation.class
deleted file mode 100644
index 140b96dae03..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DOMImplementation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DOMImplementationList.class b/libjava/classpath/lib/org/w3c/dom/DOMImplementationList.class
deleted file mode 100644
index 2673fc36fbd..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DOMImplementationList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DOMImplementationSource.class b/libjava/classpath/lib/org/w3c/dom/DOMImplementationSource.class
deleted file mode 100644
index 02389cb27e2..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DOMImplementationSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DOMLocator.class b/libjava/classpath/lib/org/w3c/dom/DOMLocator.class
deleted file mode 100644
index a73d8ce1aec..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DOMLocator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DOMStringList.class b/libjava/classpath/lib/org/w3c/dom/DOMStringList.class
deleted file mode 100644
index d30c4eb087f..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DOMStringList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/Document.class b/libjava/classpath/lib/org/w3c/dom/Document.class
deleted file mode 100644
index 8537d9d1a62..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/Document.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DocumentFragment.class b/libjava/classpath/lib/org/w3c/dom/DocumentFragment.class
deleted file mode 100644
index 8c5f4ac3574..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DocumentFragment.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/DocumentType.class b/libjava/classpath/lib/org/w3c/dom/DocumentType.class
deleted file mode 100644
index f825c1523dd..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/DocumentType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/Element.class b/libjava/classpath/lib/org/w3c/dom/Element.class
deleted file mode 100644
index a7a3997fd4e..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/Element.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/Entity.class b/libjava/classpath/lib/org/w3c/dom/Entity.class
deleted file mode 100644
index 08e290b0ff3..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/Entity.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/EntityReference.class b/libjava/classpath/lib/org/w3c/dom/EntityReference.class
deleted file mode 100644
index 05337119a5d..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/EntityReference.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/NameList.class b/libjava/classpath/lib/org/w3c/dom/NameList.class
deleted file mode 100644
index 79f3c255de2..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/NameList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/NamedNodeMap.class b/libjava/classpath/lib/org/w3c/dom/NamedNodeMap.class
deleted file mode 100644
index e90bfc641be..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/NamedNodeMap.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/Node.class b/libjava/classpath/lib/org/w3c/dom/Node.class
deleted file mode 100644
index 5684f2520ea..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/Node.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/NodeList.class b/libjava/classpath/lib/org/w3c/dom/NodeList.class
deleted file mode 100644
index 65e13f68f62..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/NodeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/Notation.class b/libjava/classpath/lib/org/w3c/dom/Notation.class
deleted file mode 100644
index 003e5740c68..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/Notation.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ProcessingInstruction.class b/libjava/classpath/lib/org/w3c/dom/ProcessingInstruction.class
deleted file mode 100644
index 48a7bf07232..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ProcessingInstruction.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/Text.class b/libjava/classpath/lib/org/w3c/dom/Text.class
deleted file mode 100644
index fd5bf5bfee7..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/Text.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/TypeInfo.class b/libjava/classpath/lib/org/w3c/dom/TypeInfo.class
deleted file mode 100644
index b8f34b721a6..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/TypeInfo.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/UserDataHandler.class b/libjava/classpath/lib/org/w3c/dom/UserDataHandler.class
deleted file mode 100644
index 09ebf03cccf..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/UserDataHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$1.class b/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$1.class
deleted file mode 100644
index c6cc33659b7..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$1.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$2.class b/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$2.class
deleted file mode 100644
index 6b7def77001..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$3.class b/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$3.class
deleted file mode 100644
index d36762500e9..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$3.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$4.class b/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$4.class
deleted file mode 100644
index 4e6b46fb869..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry$4.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry.class b/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry.class
deleted file mode 100644
index 8c24a81a58d..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/bootstrap/DOMImplementationRegistry.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSS2Properties.class b/libjava/classpath/lib/org/w3c/dom/css/CSS2Properties.class
deleted file mode 100644
index 0bff07ee668..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSS2Properties.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSCharsetRule.class b/libjava/classpath/lib/org/w3c/dom/css/CSSCharsetRule.class
deleted file mode 100644
index e00dd474043..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSCharsetRule.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSFontFaceRule.class b/libjava/classpath/lib/org/w3c/dom/css/CSSFontFaceRule.class
deleted file mode 100644
index baca5f88371..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSFontFaceRule.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSImportRule.class b/libjava/classpath/lib/org/w3c/dom/css/CSSImportRule.class
deleted file mode 100644
index 885b973b061..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSImportRule.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSMediaRule.class b/libjava/classpath/lib/org/w3c/dom/css/CSSMediaRule.class
deleted file mode 100644
index 2670322ed4f..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSMediaRule.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSPageRule.class b/libjava/classpath/lib/org/w3c/dom/css/CSSPageRule.class
deleted file mode 100644
index b65d865a6c1..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSPageRule.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSPrimitiveValue.class b/libjava/classpath/lib/org/w3c/dom/css/CSSPrimitiveValue.class
deleted file mode 100644
index 0caa85ef512..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSPrimitiveValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSRule.class b/libjava/classpath/lib/org/w3c/dom/css/CSSRule.class
deleted file mode 100644
index 239b88c0ee5..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSRule.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSRuleList.class b/libjava/classpath/lib/org/w3c/dom/css/CSSRuleList.class
deleted file mode 100644
index 4a79b00e584..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSRuleList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSStyleDeclaration.class b/libjava/classpath/lib/org/w3c/dom/css/CSSStyleDeclaration.class
deleted file mode 100644
index 2756453e944..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSStyleDeclaration.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSStyleRule.class b/libjava/classpath/lib/org/w3c/dom/css/CSSStyleRule.class
deleted file mode 100644
index 7527c9fe278..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSStyleRule.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSStyleSheet.class b/libjava/classpath/lib/org/w3c/dom/css/CSSStyleSheet.class
deleted file mode 100644
index 297c66f0fb1..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSStyleSheet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSUnknownRule.class b/libjava/classpath/lib/org/w3c/dom/css/CSSUnknownRule.class
deleted file mode 100644
index 329979cc22d..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSUnknownRule.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSValue.class b/libjava/classpath/lib/org/w3c/dom/css/CSSValue.class
deleted file mode 100644
index e5e1789809f..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSValue.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/CSSValueList.class b/libjava/classpath/lib/org/w3c/dom/css/CSSValueList.class
deleted file mode 100644
index 7b98111dbfd..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/CSSValueList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/Counter.class b/libjava/classpath/lib/org/w3c/dom/css/Counter.class
deleted file mode 100644
index be680c49c4b..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/Counter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/DOMImplementationCSS.class b/libjava/classpath/lib/org/w3c/dom/css/DOMImplementationCSS.class
deleted file mode 100644
index 73c918f1c3c..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/DOMImplementationCSS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/DocumentCSS.class b/libjava/classpath/lib/org/w3c/dom/css/DocumentCSS.class
deleted file mode 100644
index c8a76c602c3..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/DocumentCSS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/ElementCSSInlineStyle.class b/libjava/classpath/lib/org/w3c/dom/css/ElementCSSInlineStyle.class
deleted file mode 100644
index b077d0d223b..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/ElementCSSInlineStyle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/RGBColor.class b/libjava/classpath/lib/org/w3c/dom/css/RGBColor.class
deleted file mode 100644
index e2b399d11c6..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/RGBColor.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/Rect.class b/libjava/classpath/lib/org/w3c/dom/css/Rect.class
deleted file mode 100644
index 9bb8cbd7b51..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/Rect.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/css/ViewCSS.class b/libjava/classpath/lib/org/w3c/dom/css/ViewCSS.class
deleted file mode 100644
index 74b7a997d6f..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/css/ViewCSS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/events/DocumentEvent.class b/libjava/classpath/lib/org/w3c/dom/events/DocumentEvent.class
deleted file mode 100644
index 8466c9b74db..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/events/DocumentEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/events/Event.class b/libjava/classpath/lib/org/w3c/dom/events/Event.class
deleted file mode 100644
index 7d906cacc71..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/events/Event.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/events/EventException.class b/libjava/classpath/lib/org/w3c/dom/events/EventException.class
deleted file mode 100644
index c1edb4ba3cd..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/events/EventException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/events/EventListener.class b/libjava/classpath/lib/org/w3c/dom/events/EventListener.class
deleted file mode 100644
index 6630f8e6f1d..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/events/EventListener.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/events/EventTarget.class b/libjava/classpath/lib/org/w3c/dom/events/EventTarget.class
deleted file mode 100644
index 8eab3078bea..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/events/EventTarget.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/events/MouseEvent.class b/libjava/classpath/lib/org/w3c/dom/events/MouseEvent.class
deleted file mode 100644
index 53e18a10bce..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/events/MouseEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/events/MutationEvent.class b/libjava/classpath/lib/org/w3c/dom/events/MutationEvent.class
deleted file mode 100644
index 1c7d925c426..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/events/MutationEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/events/UIEvent.class b/libjava/classpath/lib/org/w3c/dom/events/UIEvent.class
deleted file mode 100644
index edbc0b9d287..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/events/UIEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLAnchorElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLAnchorElement.class
deleted file mode 100644
index d97d1a34d2d..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLAnchorElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLAppletElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLAppletElement.class
deleted file mode 100644
index 902fc0375b0..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLAppletElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLAreaElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLAreaElement.class
deleted file mode 100644
index e98ef6caf7a..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLAreaElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLBRElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLBRElement.class
deleted file mode 100644
index 4f79f902c23..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLBRElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLBaseElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLBaseElement.class
deleted file mode 100644
index 4d88a303efc..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLBaseElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLBaseFontElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLBaseFontElement.class
deleted file mode 100644
index 9425db7d5c0..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLBaseFontElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLBodyElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLBodyElement.class
deleted file mode 100644
index c24b897867a..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLBodyElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLButtonElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLButtonElement.class
deleted file mode 100644
index 82cd95c7236..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLButtonElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLCollection.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLCollection.class
deleted file mode 100644
index 198818a5ff0..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLDListElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLDListElement.class
deleted file mode 100644
index d119b0bbde1..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLDListElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLDirectoryElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLDirectoryElement.class
deleted file mode 100644
index 8ac3813dd35..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLDirectoryElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLDivElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLDivElement.class
deleted file mode 100644
index b793b122f4d..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLDivElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLDocument.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLDocument.class
deleted file mode 100644
index 6ab518cf259..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLDocument.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLElement.class
deleted file mode 100644
index 5c685949e20..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLFieldSetElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLFieldSetElement.class
deleted file mode 100644
index 60c8e114261..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLFieldSetElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLFontElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLFontElement.class
deleted file mode 100644
index 041d133f901..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLFontElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLFormElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLFormElement.class
deleted file mode 100644
index 6f0fc70f010..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLFormElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLFrameElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLFrameElement.class
deleted file mode 100644
index 98027df47a8..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLFrameElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLFrameSetElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLFrameSetElement.class
deleted file mode 100644
index acb6eea3050..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLFrameSetElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLHRElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLHRElement.class
deleted file mode 100644
index cb369464934..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLHRElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLHeadElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLHeadElement.class
deleted file mode 100644
index 4d1d9d27ef2..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLHeadElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLHeadingElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLHeadingElement.class
deleted file mode 100644
index 7dec3e97ba1..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLHeadingElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLHtmlElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLHtmlElement.class
deleted file mode 100644
index b0d9f0b2b97..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLHtmlElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLIFrameElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLIFrameElement.class
deleted file mode 100644
index ad1f0ba2094..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLIFrameElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLImageElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLImageElement.class
deleted file mode 100644
index db3786aee06..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLImageElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLInputElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLInputElement.class
deleted file mode 100644
index 45b2f2ab942..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLInputElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLIsIndexElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLIsIndexElement.class
deleted file mode 100644
index 306ee6392e7..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLIsIndexElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLLIElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLLIElement.class
deleted file mode 100644
index e309abc009b..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLLIElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLLabelElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLLabelElement.class
deleted file mode 100644
index 478882a400d..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLLabelElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLLegendElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLLegendElement.class
deleted file mode 100644
index ead0f416bd3..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLLegendElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLLinkElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLLinkElement.class
deleted file mode 100644
index 58bc1f2181b..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLLinkElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLMapElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLMapElement.class
deleted file mode 100644
index dc90e7d09ca..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLMapElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLMenuElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLMenuElement.class
deleted file mode 100644
index 72fff70987d..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLMenuElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLMetaElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLMetaElement.class
deleted file mode 100644
index 303de700863..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLMetaElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLModElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLModElement.class
deleted file mode 100644
index ed36efb33ad..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLModElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLOListElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLOListElement.class
deleted file mode 100644
index a3d4e02ef6a..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLOListElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLObjectElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLObjectElement.class
deleted file mode 100644
index 5e598bb3ed0..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLObjectElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLOptGroupElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLOptGroupElement.class
deleted file mode 100644
index f761f41e011..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLOptGroupElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLOptionElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLOptionElement.class
deleted file mode 100644
index c63938392e5..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLOptionElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLOptionsCollection.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLOptionsCollection.class
deleted file mode 100644
index ab3364ceb22..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLOptionsCollection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLParagraphElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLParagraphElement.class
deleted file mode 100644
index 4332a69860b..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLParagraphElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLParamElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLParamElement.class
deleted file mode 100644
index de95836211a..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLParamElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLPreElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLPreElement.class
deleted file mode 100644
index df42293b04a..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLPreElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLQuoteElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLQuoteElement.class
deleted file mode 100644
index 5eb553fdb65..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLQuoteElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLScriptElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLScriptElement.class
deleted file mode 100644
index f7b8cab2bcc..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLScriptElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLSelectElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLSelectElement.class
deleted file mode 100644
index 1e5820d0782..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLSelectElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLStyleElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLStyleElement.class
deleted file mode 100644
index 4d63090ba30..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLStyleElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableCaptionElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableCaptionElement.class
deleted file mode 100644
index 675127efb96..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableCaptionElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableCellElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableCellElement.class
deleted file mode 100644
index 2dc70df30c5..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableCellElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableColElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableColElement.class
deleted file mode 100644
index 56a2f824438..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableColElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableElement.class
deleted file mode 100644
index ffdb2320cf7..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableRowElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableRowElement.class
deleted file mode 100644
index 37e60fcf2ce..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableRowElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableSectionElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableSectionElement.class
deleted file mode 100644
index 0777a90b216..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTableSectionElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTextAreaElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLTextAreaElement.class
deleted file mode 100644
index 0b11d084e1e..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTextAreaElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTitleElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLTitleElement.class
deleted file mode 100644
index 19898ab8645..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLTitleElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/html2/HTMLUListElement.class b/libjava/classpath/lib/org/w3c/dom/html2/HTMLUListElement.class
deleted file mode 100644
index 4b02b5f4738..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/html2/HTMLUListElement.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/DOMImplementationLS.class b/libjava/classpath/lib/org/w3c/dom/ls/DOMImplementationLS.class
deleted file mode 100644
index 2b5479c87e3..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/DOMImplementationLS.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/LSException.class b/libjava/classpath/lib/org/w3c/dom/ls/LSException.class
deleted file mode 100644
index 7f64d601cb8..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/LSException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/LSInput.class b/libjava/classpath/lib/org/w3c/dom/ls/LSInput.class
deleted file mode 100644
index b778c121062..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/LSInput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/LSLoadEvent.class b/libjava/classpath/lib/org/w3c/dom/ls/LSLoadEvent.class
deleted file mode 100644
index ae45f85c154..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/LSLoadEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/LSOutput.class b/libjava/classpath/lib/org/w3c/dom/ls/LSOutput.class
deleted file mode 100644
index 2fb4be066c1..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/LSOutput.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/LSParser.class b/libjava/classpath/lib/org/w3c/dom/ls/LSParser.class
deleted file mode 100644
index c12315558c4..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/LSParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/LSParserFilter.class b/libjava/classpath/lib/org/w3c/dom/ls/LSParserFilter.class
deleted file mode 100644
index 28edfdcdd3f..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/LSParserFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/LSProgressEvent.class b/libjava/classpath/lib/org/w3c/dom/ls/LSProgressEvent.class
deleted file mode 100644
index 5986f976f59..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/LSProgressEvent.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/LSResourceResolver.class b/libjava/classpath/lib/org/w3c/dom/ls/LSResourceResolver.class
deleted file mode 100644
index 7b9f77b971a..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/LSResourceResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/LSSerializer.class b/libjava/classpath/lib/org/w3c/dom/ls/LSSerializer.class
deleted file mode 100644
index 05753be6055..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/LSSerializer.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ls/LSSerializerFilter.class b/libjava/classpath/lib/org/w3c/dom/ls/LSSerializerFilter.class
deleted file mode 100644
index b3aeaecdbec..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ls/LSSerializerFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ranges/DocumentRange.class b/libjava/classpath/lib/org/w3c/dom/ranges/DocumentRange.class
deleted file mode 100644
index fcf542e9b17..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ranges/DocumentRange.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ranges/Range.class b/libjava/classpath/lib/org/w3c/dom/ranges/Range.class
deleted file mode 100644
index a8604967a09..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ranges/Range.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/ranges/RangeException.class b/libjava/classpath/lib/org/w3c/dom/ranges/RangeException.class
deleted file mode 100644
index fa743a0d031..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/ranges/RangeException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/stylesheets/DocumentStyle.class b/libjava/classpath/lib/org/w3c/dom/stylesheets/DocumentStyle.class
deleted file mode 100644
index 6d13a349230..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/stylesheets/DocumentStyle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/stylesheets/LinkStyle.class b/libjava/classpath/lib/org/w3c/dom/stylesheets/LinkStyle.class
deleted file mode 100644
index 00082f811b5..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/stylesheets/LinkStyle.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/stylesheets/MediaList.class b/libjava/classpath/lib/org/w3c/dom/stylesheets/MediaList.class
deleted file mode 100644
index eb06e5d25f8..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/stylesheets/MediaList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/stylesheets/StyleSheet.class b/libjava/classpath/lib/org/w3c/dom/stylesheets/StyleSheet.class
deleted file mode 100644
index f3a6907d6b5..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/stylesheets/StyleSheet.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/stylesheets/StyleSheetList.class b/libjava/classpath/lib/org/w3c/dom/stylesheets/StyleSheetList.class
deleted file mode 100644
index f1ce31002a5..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/stylesheets/StyleSheetList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/traversal/DocumentTraversal.class b/libjava/classpath/lib/org/w3c/dom/traversal/DocumentTraversal.class
deleted file mode 100644
index fb9b6381070..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/traversal/DocumentTraversal.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/traversal/NodeFilter.class b/libjava/classpath/lib/org/w3c/dom/traversal/NodeFilter.class
deleted file mode 100644
index ae2acdab7ac..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/traversal/NodeFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/traversal/NodeIterator.class b/libjava/classpath/lib/org/w3c/dom/traversal/NodeIterator.class
deleted file mode 100644
index fa0265be9f7..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/traversal/NodeIterator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/traversal/TreeWalker.class b/libjava/classpath/lib/org/w3c/dom/traversal/TreeWalker.class
deleted file mode 100644
index 08bdbea5135..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/traversal/TreeWalker.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/views/AbstractView.class b/libjava/classpath/lib/org/w3c/dom/views/AbstractView.class
deleted file mode 100644
index fc2f1fe053c..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/views/AbstractView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/views/DocumentView.class b/libjava/classpath/lib/org/w3c/dom/views/DocumentView.class
deleted file mode 100644
index 013d1716187..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/views/DocumentView.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/xpath/XPathEvaluator.class b/libjava/classpath/lib/org/w3c/dom/xpath/XPathEvaluator.class
deleted file mode 100644
index 4999764b45b..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/xpath/XPathEvaluator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/xpath/XPathException.class b/libjava/classpath/lib/org/w3c/dom/xpath/XPathException.class
deleted file mode 100644
index 36379cb6ddf..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/xpath/XPathException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/xpath/XPathExpression.class b/libjava/classpath/lib/org/w3c/dom/xpath/XPathExpression.class
deleted file mode 100644
index 097ab47a189..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/xpath/XPathExpression.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/xpath/XPathNSResolver.class b/libjava/classpath/lib/org/w3c/dom/xpath/XPathNSResolver.class
deleted file mode 100644
index cd69c3824f5..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/xpath/XPathNSResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/xpath/XPathNamespace.class b/libjava/classpath/lib/org/w3c/dom/xpath/XPathNamespace.class
deleted file mode 100644
index b8d710461ef..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/xpath/XPathNamespace.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/w3c/dom/xpath/XPathResult.class b/libjava/classpath/lib/org/w3c/dom/xpath/XPathResult.class
deleted file mode 100644
index 4693afcf192..00000000000
--- a/libjava/classpath/lib/org/w3c/dom/xpath/XPathResult.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/AttributeList.class b/libjava/classpath/lib/org/xml/sax/AttributeList.class
deleted file mode 100644
index d91b8884d60..00000000000
--- a/libjava/classpath/lib/org/xml/sax/AttributeList.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/Attributes.class b/libjava/classpath/lib/org/xml/sax/Attributes.class
deleted file mode 100644
index 4459cfece7e..00000000000
--- a/libjava/classpath/lib/org/xml/sax/Attributes.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/ContentHandler.class b/libjava/classpath/lib/org/xml/sax/ContentHandler.class
deleted file mode 100644
index 79234c195c5..00000000000
--- a/libjava/classpath/lib/org/xml/sax/ContentHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/DTDHandler.class b/libjava/classpath/lib/org/xml/sax/DTDHandler.class
deleted file mode 100644
index fca2bbabd4a..00000000000
--- a/libjava/classpath/lib/org/xml/sax/DTDHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/DocumentHandler.class b/libjava/classpath/lib/org/xml/sax/DocumentHandler.class
deleted file mode 100644
index 9db19d0ede5..00000000000
--- a/libjava/classpath/lib/org/xml/sax/DocumentHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/EntityResolver.class b/libjava/classpath/lib/org/xml/sax/EntityResolver.class
deleted file mode 100644
index 1a9f63264aa..00000000000
--- a/libjava/classpath/lib/org/xml/sax/EntityResolver.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/ErrorHandler.class b/libjava/classpath/lib/org/xml/sax/ErrorHandler.class
deleted file mode 100644
index 5a1c6555353..00000000000
--- a/libjava/classpath/lib/org/xml/sax/ErrorHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/HandlerBase.class b/libjava/classpath/lib/org/xml/sax/HandlerBase.class
deleted file mode 100644
index 555e6c51348..00000000000
--- a/libjava/classpath/lib/org/xml/sax/HandlerBase.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/InputSource.class b/libjava/classpath/lib/org/xml/sax/InputSource.class
deleted file mode 100644
index 799b3116673..00000000000
--- a/libjava/classpath/lib/org/xml/sax/InputSource.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/Locator.class b/libjava/classpath/lib/org/xml/sax/Locator.class
deleted file mode 100644
index 2f415ee4804..00000000000
--- a/libjava/classpath/lib/org/xml/sax/Locator.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/Parser.class b/libjava/classpath/lib/org/xml/sax/Parser.class
deleted file mode 100644
index e644bf5416c..00000000000
--- a/libjava/classpath/lib/org/xml/sax/Parser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/SAXException.class b/libjava/classpath/lib/org/xml/sax/SAXException.class
deleted file mode 100644
index 282aa37a784..00000000000
--- a/libjava/classpath/lib/org/xml/sax/SAXException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/SAXNotRecognizedException.class b/libjava/classpath/lib/org/xml/sax/SAXNotRecognizedException.class
deleted file mode 100644
index 26692ef3bd7..00000000000
--- a/libjava/classpath/lib/org/xml/sax/SAXNotRecognizedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/SAXNotSupportedException.class b/libjava/classpath/lib/org/xml/sax/SAXNotSupportedException.class
deleted file mode 100644
index c6fbe767135..00000000000
--- a/libjava/classpath/lib/org/xml/sax/SAXNotSupportedException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/SAXParseException.class b/libjava/classpath/lib/org/xml/sax/SAXParseException.class
deleted file mode 100644
index 2e9400ca5bf..00000000000
--- a/libjava/classpath/lib/org/xml/sax/SAXParseException.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/XMLFilter.class b/libjava/classpath/lib/org/xml/sax/XMLFilter.class
deleted file mode 100644
index 91ce7d99acb..00000000000
--- a/libjava/classpath/lib/org/xml/sax/XMLFilter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/XMLReader.class b/libjava/classpath/lib/org/xml/sax/XMLReader.class
deleted file mode 100644
index b4c86d60780..00000000000
--- a/libjava/classpath/lib/org/xml/sax/XMLReader.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/ext/Attributes2.class b/libjava/classpath/lib/org/xml/sax/ext/Attributes2.class
deleted file mode 100644
index d531eda55f8..00000000000
--- a/libjava/classpath/lib/org/xml/sax/ext/Attributes2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/ext/Attributes2Impl.class b/libjava/classpath/lib/org/xml/sax/ext/Attributes2Impl.class
deleted file mode 100644
index 5ce82fc1584..00000000000
--- a/libjava/classpath/lib/org/xml/sax/ext/Attributes2Impl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/ext/DeclHandler.class b/libjava/classpath/lib/org/xml/sax/ext/DeclHandler.class
deleted file mode 100644
index a5d9286e847..00000000000
--- a/libjava/classpath/lib/org/xml/sax/ext/DeclHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/ext/DefaultHandler2.class b/libjava/classpath/lib/org/xml/sax/ext/DefaultHandler2.class
deleted file mode 100644
index 72cbdde85b3..00000000000
--- a/libjava/classpath/lib/org/xml/sax/ext/DefaultHandler2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/ext/EntityResolver2.class b/libjava/classpath/lib/org/xml/sax/ext/EntityResolver2.class
deleted file mode 100644
index 5b5501339ec..00000000000
--- a/libjava/classpath/lib/org/xml/sax/ext/EntityResolver2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/ext/LexicalHandler.class b/libjava/classpath/lib/org/xml/sax/ext/LexicalHandler.class
deleted file mode 100644
index a51f26074ac..00000000000
--- a/libjava/classpath/lib/org/xml/sax/ext/LexicalHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/ext/Locator2.class b/libjava/classpath/lib/org/xml/sax/ext/Locator2.class
deleted file mode 100644
index 4e64eb1482b..00000000000
--- a/libjava/classpath/lib/org/xml/sax/ext/Locator2.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/ext/Locator2Impl.class b/libjava/classpath/lib/org/xml/sax/ext/Locator2Impl.class
deleted file mode 100644
index f6cc7ae9529..00000000000
--- a/libjava/classpath/lib/org/xml/sax/ext/Locator2Impl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/AttributeListImpl.class b/libjava/classpath/lib/org/xml/sax/helpers/AttributeListImpl.class
deleted file mode 100644
index 01caf28e19d..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/AttributeListImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/AttributesImpl.class b/libjava/classpath/lib/org/xml/sax/helpers/AttributesImpl.class
deleted file mode 100644
index c67bff4b2c4..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/AttributesImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/DefaultHandler.class b/libjava/classpath/lib/org/xml/sax/helpers/DefaultHandler.class
deleted file mode 100644
index 6a4967942f9..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/DefaultHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/LocatorImpl.class b/libjava/classpath/lib/org/xml/sax/helpers/LocatorImpl.class
deleted file mode 100644
index 0f54ec0b325..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/LocatorImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/NamespaceSupport$Context.class b/libjava/classpath/lib/org/xml/sax/helpers/NamespaceSupport$Context.class
deleted file mode 100644
index f109d720624..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/NamespaceSupport$Context.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/NamespaceSupport.class b/libjava/classpath/lib/org/xml/sax/helpers/NamespaceSupport.class
deleted file mode 100644
index 3bd96a4e7f6..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/NamespaceSupport.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/NewInstance.class b/libjava/classpath/lib/org/xml/sax/helpers/NewInstance.class
deleted file mode 100644
index 9fa91f989ec..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/NewInstance.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/ParserAdapter$AttributeListAdapter.class b/libjava/classpath/lib/org/xml/sax/helpers/ParserAdapter$AttributeListAdapter.class
deleted file mode 100644
index 5bc24d02679..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/ParserAdapter$AttributeListAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/ParserAdapter.class b/libjava/classpath/lib/org/xml/sax/helpers/ParserAdapter.class
deleted file mode 100644
index cceb560dcec..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/ParserAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/ParserFactory.class b/libjava/classpath/lib/org/xml/sax/helpers/ParserFactory.class
deleted file mode 100644
index ace29cbf024..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/ParserFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/XMLFilterImpl.class b/libjava/classpath/lib/org/xml/sax/helpers/XMLFilterImpl.class
deleted file mode 100644
index 992aa341049..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/XMLFilterImpl.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderAdapter$AttributesAdapter.class b/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderAdapter$AttributesAdapter.class
deleted file mode 100644
index 5bcb439192d..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderAdapter$AttributesAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderAdapter.class b/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderAdapter.class
deleted file mode 100644
index bd879f36543..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderFactory.class b/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderFactory.class
deleted file mode 100644
index 25c986c9b91..00000000000
--- a/libjava/classpath/lib/org/xml/sax/helpers/XMLReaderFactory.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/misc/Service.class b/libjava/classpath/lib/sun/misc/Service.class
deleted file mode 100644
index 09dc5f56fc4..00000000000
--- a/libjava/classpath/lib/sun/misc/Service.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/misc/ServiceConfigurationError.class b/libjava/classpath/lib/sun/misc/ServiceConfigurationError.class
deleted file mode 100644
index 30d7fed7c49..00000000000
--- a/libjava/classpath/lib/sun/misc/ServiceConfigurationError.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/misc/Unsafe.class b/libjava/classpath/lib/sun/misc/Unsafe.class
deleted file mode 100644
index 809f9b23a7c..00000000000
--- a/libjava/classpath/lib/sun/misc/Unsafe.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/reflect/Reflection.class b/libjava/classpath/lib/sun/reflect/Reflection.class
deleted file mode 100644
index fb6c0c7206a..00000000000
--- a/libjava/classpath/lib/sun/reflect/Reflection.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/reflect/annotation/AnnotationInvocationHandler.class b/libjava/classpath/lib/sun/reflect/annotation/AnnotationInvocationHandler.class
deleted file mode 100644
index e70c2bbcd7b..00000000000
--- a/libjava/classpath/lib/sun/reflect/annotation/AnnotationInvocationHandler.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/reflect/annotation/AnnotationParser.class b/libjava/classpath/lib/sun/reflect/annotation/AnnotationParser.class
deleted file mode 100644
index b86052c9d11..00000000000
--- a/libjava/classpath/lib/sun/reflect/annotation/AnnotationParser.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/reflect/annotation/AnnotationType.class b/libjava/classpath/lib/sun/reflect/annotation/AnnotationType.class
deleted file mode 100644
index 3f7ee0bbdce..00000000000
--- a/libjava/classpath/lib/sun/reflect/annotation/AnnotationType.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.class b/libjava/classpath/lib/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.class
deleted file mode 100644
index 31adaf53825..00000000000
--- a/libjava/classpath/lib/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/reflect/annotation/ExceptionProxy.class b/libjava/classpath/lib/sun/reflect/annotation/ExceptionProxy.class
deleted file mode 100644
index 7773618aacd..00000000000
--- a/libjava/classpath/lib/sun/reflect/annotation/ExceptionProxy.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/reflect/misc/ReflectUtil$MustBeNull.class b/libjava/classpath/lib/sun/reflect/misc/ReflectUtil$MustBeNull.class
deleted file mode 100644
index a588d8ca5ec..00000000000
--- a/libjava/classpath/lib/sun/reflect/misc/ReflectUtil$MustBeNull.class
+++ /dev/null
diff --git a/libjava/classpath/lib/sun/reflect/misc/ReflectUtil.class b/libjava/classpath/lib/sun/reflect/misc/ReflectUtil.class
deleted file mode 100644
index 428a0c110cb..00000000000
--- a/libjava/classpath/lib/sun/reflect/misc/ReflectUtil.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/AnnotationVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/AnnotationVisitor.class
deleted file mode 100644
index acb0481dd17..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/AnnotationVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/AnnotationWriter.class b/libjava/classpath/tools/asm/org/objectweb/asm/AnnotationWriter.class
deleted file mode 100644
index 69dd3cf357f..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/AnnotationWriter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/Attribute.class b/libjava/classpath/tools/asm/org/objectweb/asm/Attribute.class
deleted file mode 100644
index d9bb13a7509..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/Attribute.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/ByteVector.class b/libjava/classpath/tools/asm/org/objectweb/asm/ByteVector.class
deleted file mode 100644
index a7b9ad75e6c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/ByteVector.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/ClassAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/ClassAdapter.class
deleted file mode 100644
index 81a4025992e..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/ClassAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/ClassReader.class b/libjava/classpath/tools/asm/org/objectweb/asm/ClassReader.class
deleted file mode 100644
index 5fc42a0b7c0..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/ClassReader.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/ClassVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/ClassVisitor.class
deleted file mode 100644
index f4345b3e50b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/ClassVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/ClassWriter.class b/libjava/classpath/tools/asm/org/objectweb/asm/ClassWriter.class
deleted file mode 100644
index 07de7fcc69f..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/ClassWriter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/Edge.class b/libjava/classpath/tools/asm/org/objectweb/asm/Edge.class
deleted file mode 100644
index 2cf713b4b9c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/Edge.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/FieldVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/FieldVisitor.class
deleted file mode 100644
index 5f29c7b7b73..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/FieldVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/FieldWriter.class b/libjava/classpath/tools/asm/org/objectweb/asm/FieldWriter.class
deleted file mode 100644
index b316b7be210..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/FieldWriter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/Handler.class b/libjava/classpath/tools/asm/org/objectweb/asm/Handler.class
deleted file mode 100644
index 1cbcd3ff5ee..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/Handler.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/Item.class b/libjava/classpath/tools/asm/org/objectweb/asm/Item.class
deleted file mode 100644
index 5c0a0d0d09c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/Item.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/Label.class b/libjava/classpath/tools/asm/org/objectweb/asm/Label.class
deleted file mode 100644
index 0bd982b3cdd..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/Label.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/MethodAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/MethodAdapter.class
deleted file mode 100644
index 3521003c509..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/MethodAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/MethodVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/MethodVisitor.class
deleted file mode 100644
index d4bdd8f383a..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/MethodVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/MethodWriter.class b/libjava/classpath/tools/asm/org/objectweb/asm/MethodWriter.class
deleted file mode 100644
index 9ec1d07de5e..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/MethodWriter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/Opcodes.class b/libjava/classpath/tools/asm/org/objectweb/asm/Opcodes.class
deleted file mode 100644
index 599491168d3..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/Opcodes.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/Type.class b/libjava/classpath/tools/asm/org/objectweb/asm/Type.class
deleted file mode 100644
index e96ca26ef21..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/Type.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapAttribute.class b/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapAttribute.class
deleted file mode 100644
index 20bda686302..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapFrame.class b/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapFrame.class
deleted file mode 100644
index 0305d04dc6c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapFrame.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapTableAttribute.class b/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapTableAttribute.class
deleted file mode 100644
index c1eb324568e..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapTableAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapType.class b/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapType.class
deleted file mode 100644
index ea6999b997f..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapType.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/commons/AdviceAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/commons/AdviceAdapter.class
deleted file mode 100644
index 54a93089a8c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/commons/AdviceAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/commons/EmptyVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/commons/EmptyVisitor.class
deleted file mode 100644
index 47aa4b89449..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/commons/EmptyVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/commons/GeneratorAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/commons/GeneratorAdapter.class
deleted file mode 100644
index 5c2cd66bf06..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/commons/GeneratorAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/commons/LocalVariablesSorter.class b/libjava/classpath/tools/asm/org/objectweb/asm/commons/LocalVariablesSorter.class
deleted file mode 100644
index de1a9db937a..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/commons/LocalVariablesSorter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/commons/Method.class b/libjava/classpath/tools/asm/org/objectweb/asm/commons/Method.class
deleted file mode 100644
index 508cfb5fb4f..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/commons/Method.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/commons/SerialVersionUIDAdder$Item.class b/libjava/classpath/tools/asm/org/objectweb/asm/commons/SerialVersionUIDAdder$Item.class
deleted file mode 100644
index 9048fab59ce..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/commons/SerialVersionUIDAdder$Item.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.class b/libjava/classpath/tools/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.class
deleted file mode 100644
index ae5f315b0ca..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/commons/StaticInitMerger.class b/libjava/classpath/tools/asm/org/objectweb/asm/commons/StaticInitMerger.class
deleted file mode 100644
index 53614d1f44f..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/commons/StaticInitMerger.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/commons/TableSwitchGenerator.class b/libjava/classpath/tools/asm/org/objectweb/asm/commons/TableSwitchGenerator.class
deleted file mode 100644
index 3da3b099f0c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/commons/TableSwitchGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.class
deleted file mode 100644
index ce439d21ede..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.class
deleted file mode 100644
index d04c8cd3711..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/ClassOptimizer.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/ClassOptimizer.class
deleted file mode 100644
index 86a760c78b4..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/ClassOptimizer.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/Constant.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/Constant.class
deleted file mode 100644
index c9eb21e2eee..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/Constant.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/ConstantPool.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/ConstantPool.class
deleted file mode 100644
index a23ba657075..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/ConstantPool.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.class
deleted file mode 100644
index fd910c9a68f..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/JarOptimizer.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/JarOptimizer.class
deleted file mode 100644
index 0d6c4bdb52a..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/JarOptimizer.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.class
deleted file mode 100644
index 8928af0258b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/MethodOptimizer.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/MethodOptimizer.class
deleted file mode 100644
index 0aa907283c0..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/MethodOptimizer.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/NameMapping.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/NameMapping.class
deleted file mode 100644
index 249a832f7ad..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/NameMapping.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/Shrinker$ConstantComparator.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/Shrinker$ConstantComparator.class
deleted file mode 100644
index d03748d47b5..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/Shrinker$ConstantComparator.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/Shrinker.class b/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/Shrinker.class
deleted file mode 100644
index bb87a280b7b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/optimizer/Shrinker.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/signature/SignatureReader.class b/libjava/classpath/tools/asm/org/objectweb/asm/signature/SignatureReader.class
deleted file mode 100644
index b3c4b9d3efa..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/signature/SignatureReader.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/signature/SignatureVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/signature/SignatureVisitor.class
deleted file mode 100644
index 98826f133db..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/signature/SignatureVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/signature/SignatureWriter.class b/libjava/classpath/tools/asm/org/objectweb/asm/signature/SignatureWriter.class
deleted file mode 100644
index ec5f5271046..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/signature/SignatureWriter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/AbstractInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/AbstractInsnNode.class
deleted file mode 100644
index 1fee9f6c353..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/AbstractInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/AnnotationNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/AnnotationNode.class
deleted file mode 100644
index 4eee59d47ef..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/AnnotationNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/ClassNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/ClassNode.class
deleted file mode 100644
index 463e22bc595..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/ClassNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/FieldInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/FieldInsnNode.class
deleted file mode 100644
index ef9f743bef4..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/FieldInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/FieldNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/FieldNode.class
deleted file mode 100644
index 92797f61970..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/FieldNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/IincInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/IincInsnNode.class
deleted file mode 100644
index 10428be2e84..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/IincInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/InnerClassNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/InnerClassNode.class
deleted file mode 100644
index 35008f41a02..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/InnerClassNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/InsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/InsnNode.class
deleted file mode 100644
index 0eb12d987fa..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/InsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/IntInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/IntInsnNode.class
deleted file mode 100644
index f89b8fda4ae..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/IntInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/JumpInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/JumpInsnNode.class
deleted file mode 100644
index fc6e78364a5..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/JumpInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/LabelNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/LabelNode.class
deleted file mode 100644
index 2b375e49ea1..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/LabelNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/LdcInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/LdcInsnNode.class
deleted file mode 100644
index 97a2e6d698b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/LdcInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/LineNumberNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/LineNumberNode.class
deleted file mode 100644
index 5b0abc6e224..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/LineNumberNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/LocalVariableNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/LocalVariableNode.class
deleted file mode 100644
index 7da757ccf66..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/LocalVariableNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.class
deleted file mode 100644
index 7d80188c8d0..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MemberNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/MemberNode.class
deleted file mode 100644
index 541ac8976c9..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MemberNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodInsnNode.class
deleted file mode 100644
index 900d812b12c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode$1.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode$1.class
deleted file mode 100644
index 17c75855293..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode.class
deleted file mode 100644
index d0f996e0680..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.class
deleted file mode 100644
index eff4e980c1d..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/TableSwitchInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/TableSwitchInsnNode.class
deleted file mode 100644
index 3d7edc3261e..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/TableSwitchInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/TryCatchBlockNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/TryCatchBlockNode.class
deleted file mode 100644
index ba882b3667c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/TryCatchBlockNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/TypeInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/TypeInsnNode.class
deleted file mode 100644
index 577ff0aaa8d..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/TypeInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/VarInsnNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/VarInsnNode.class
deleted file mode 100644
index a86ac05705b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/VarInsnNode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Analyzer.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Analyzer.class
deleted file mode 100644
index aa54fd6f4db..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Analyzer.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/AnalyzerException.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/AnalyzerException.class
deleted file mode 100644
index 1c0e6b13668..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/AnalyzerException.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.class
deleted file mode 100644
index cf4a4d256df..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/BasicValue.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/BasicValue.class
deleted file mode 100644
index 303e15543d6..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/BasicValue.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/BasicVerifier.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/BasicVerifier.class
deleted file mode 100644
index 6adddec004a..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/BasicVerifier.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.class
deleted file mode 100644
index c87cf330827..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/DataflowValue.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/DataflowValue.class
deleted file mode 100644
index 41bb76b983e..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/DataflowValue.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Frame.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Frame.class
deleted file mode 100644
index 297cfd50445..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Frame.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/IntMap.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/IntMap.class
deleted file mode 100644
index 467749a1f6a..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/IntMap.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Interpreter.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Interpreter.class
deleted file mode 100644
index a1afe42a012..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Interpreter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.class
deleted file mode 100644
index e7e8f053346..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/SmallSet.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/SmallSet.class
deleted file mode 100644
index be09934203c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/SmallSet.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Subroutine.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Subroutine.class
deleted file mode 100644
index 3767ead89dd..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Subroutine.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Value.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Value.class
deleted file mode 100644
index 21de3a90e02..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/analysis/Value.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.class
deleted file mode 100644
index a819e6aaa0b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.class
deleted file mode 100644
index 7fe6b7e908f..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierClassVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierClassVisitor.class
deleted file mode 100644
index 60cba834549..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierClassVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierFieldVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierFieldVisitor.class
deleted file mode 100644
index d9885149129..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierFieldVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierMethodVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierMethodVisitor.class
deleted file mode 100644
index 43b18b737b0..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/ASMifierMethodVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/AbstractVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/AbstractVisitor.class
deleted file mode 100644
index a9aff218f13..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/AbstractVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckAnnotationAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckAnnotationAdapter.class
deleted file mode 100644
index b96505315e2..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckAnnotationAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckClassAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckClassAdapter.class
deleted file mode 100644
index ef09ba998f3..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckClassAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckFieldAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckFieldAdapter.class
deleted file mode 100644
index db4b4b03bf4..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckFieldAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckMethodAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckMethodAdapter.class
deleted file mode 100644
index d07f5f2b4c1..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/CheckMethodAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceAbstractVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceAbstractVisitor.class
deleted file mode 100644
index 0f103e2aab6..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceAbstractVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceAnnotationVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceAnnotationVisitor.class
deleted file mode 100644
index 50fc265f413..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceAnnotationVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceClassVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceClassVisitor.class
deleted file mode 100644
index 65d8159b34a..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceClassVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceFieldVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceFieldVisitor.class
deleted file mode 100644
index 0035c01c0bf..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceFieldVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceMethodVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceMethodVisitor.class
deleted file mode 100644
index ffd4f263539..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceMethodVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceSignatureVisitor.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceSignatureVisitor.class
deleted file mode 100644
index b045ab556cf..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/TraceSignatureVisitor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.class
deleted file mode 100644
index ae2a692b57d..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.class
deleted file mode 100644
index f69d0d46116..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/ASMifiable.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/ASMifiable.class
deleted file mode 100644
index f1556bd52c3..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/ASMifiable.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/Traceable.class b/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/Traceable.class
deleted file mode 100644
index bfd9350a6ee..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/util/attrs/Traceable.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationDefaultRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationDefaultRule.class
deleted file mode 100644
index af595a35fe9..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationDefaultRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationParameterRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationParameterRule.class
deleted file mode 100644
index 688a8281059..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationParameterRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationRule.class
deleted file mode 100644
index 44cd0fd4d79..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueAnnotationRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueAnnotationRule.class
deleted file mode 100644
index 474ac94c17d..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueAnnotationRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueArrayRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueArrayRule.class
deleted file mode 100644
index 862a266da6b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueArrayRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueEnumRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueEnumRule.class
deleted file mode 100644
index dbbce81bbc3..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueEnumRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueRule.class
deleted file mode 100644
index bd4a2c2b516..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ClassRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ClassRule.class
deleted file mode 100644
index c0dbd395b7b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ClassRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionRule.class
deleted file mode 100644
index a4645efac7f..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionsRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionsRule.class
deleted file mode 100644
index 27e11293a99..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionsRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$FieldRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$FieldRule.class
deleted file mode 100644
index ccfe42a55ed..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$FieldRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InnerClassRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InnerClassRule.class
deleted file mode 100644
index 474e744d2be..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InnerClassRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfaceRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfaceRule.class
deleted file mode 100644
index 6be0d9c0fcb..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfaceRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfacesRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfacesRule.class
deleted file mode 100644
index b6c288bb875..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfacesRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LabelRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LabelRule.class
deleted file mode 100644
index 8c510cf4f0c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LabelRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LineNumberRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LineNumberRule.class
deleted file mode 100644
index 2bb1138a524..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LineNumberRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LocalVarRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LocalVarRule.class
deleted file mode 100644
index b26b677c802..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LocalVarRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchLabelRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchLabelRule.class
deleted file mode 100644
index 74636c3711c..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchLabelRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchRule.class
deleted file mode 100644
index 88dbc85d80b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MaxRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MaxRule.class
deleted file mode 100644
index e54e90e752e..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MaxRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MethodRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MethodRule.class
deleted file mode 100644
index 85ee199f790..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MethodRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$Opcode.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$Opcode.class
deleted file mode 100644
index 79606a85f92..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$Opcode.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OpcodeGroup.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OpcodeGroup.class
deleted file mode 100644
index 215db6cf48b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OpcodeGroup.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OpcodesRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OpcodesRule.class
deleted file mode 100644
index 1417533a75a..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OpcodesRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OuterClassRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OuterClassRule.class
deleted file mode 100644
index 52a6cc65b6a..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OuterClassRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$Rule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$Rule.class
deleted file mode 100644
index 080c1758266..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$Rule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$RuleSet.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$RuleSet.class
deleted file mode 100644
index 0b99b723f58..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$RuleSet.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$SourceRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$SourceRule.class
deleted file mode 100644
index c27ffe1b320..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$SourceRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchLabelRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchLabelRule.class
deleted file mode 100644
index 8f2d4e4ae02..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchLabelRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchRule.class
deleted file mode 100644
index c9844738e0d..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TryCatchRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TryCatchRule.class
deleted file mode 100644
index 45049a4d149..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TryCatchRule.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler.class
deleted file mode 100644
index db263e35799..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ASMContentHandlerFactory.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ASMContentHandlerFactory.class
deleted file mode 100644
index 091b66879ff..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ASMContentHandlerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ContentHandlerFactory.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ContentHandlerFactory.class
deleted file mode 100644
index db46833eb06..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ContentHandlerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$EntryElement.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$EntryElement.class
deleted file mode 100644
index 8f5d5c63cf5..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$EntryElement.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$InputSlicingHandler.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$InputSlicingHandler.class
deleted file mode 100644
index 537603fb286..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$InputSlicingHandler.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$OutputSlicingHandler.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$OutputSlicingHandler.class
deleted file mode 100644
index 99f66cc4326..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$OutputSlicingHandler.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ProtectedInputStream.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ProtectedInputStream.class
deleted file mode 100644
index 6abc9359ee7..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ProtectedInputStream.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SAXWriter.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SAXWriter.class
deleted file mode 100644
index ecf42b6621b..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SAXWriter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SAXWriterFactory.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SAXWriterFactory.class
deleted file mode 100644
index 8fe15a1968e..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SAXWriterFactory.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SingleDocElement.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SingleDocElement.class
deleted file mode 100644
index f553911ab3a..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SingleDocElement.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SubdocumentHandlerFactory.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SubdocumentHandlerFactory.class
deleted file mode 100644
index 1f469d18fd4..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SubdocumentHandlerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$TransformerHandlerFactory.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$TransformerHandlerFactory.class
deleted file mode 100644
index e1b60e17940..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$TransformerHandlerFactory.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ZipEntryElement.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ZipEntryElement.class
deleted file mode 100644
index 0ee908bf585..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ZipEntryElement.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor.class
deleted file mode 100644
index cf09fc1b949..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXAdapter.class
deleted file mode 100644
index f5347601c35..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.class
deleted file mode 100644
index ea703042661..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXClassAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXClassAdapter.class
deleted file mode 100644
index 492ee2c54ea..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXClassAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXCodeAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXCodeAdapter.class
deleted file mode 100644
index a0656a5ef67..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXCodeAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXFieldAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXFieldAdapter.class
deleted file mode 100644
index 7cdae94bb66..00000000000
--- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/SAXFieldAdapter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/AppletClassLoader.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/AppletClassLoader.class
deleted file mode 100644
index 50e61a6a9fe..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/AppletClassLoader.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/AppletSecurityManager.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/AppletSecurityManager.class
deleted file mode 100644
index cab207c3fb4..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/AppletSecurityManager.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/AppletTag.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/AppletTag.class
deleted file mode 100644
index 141d5108f1d..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/AppletTag.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/CommonAppletContext.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/CommonAppletContext.class
deleted file mode 100644
index dbc0fb5480b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/CommonAppletContext.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/CommonAppletStub.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/CommonAppletStub.class
deleted file mode 100644
index 13f91ee97e8..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/CommonAppletStub.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/ErrorApplet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/ErrorApplet.class
deleted file mode 100644
index ed7bdf61ae0..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/ErrorApplet.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class
deleted file mode 100644
index c02a09fb7d1..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class
deleted file mode 100644
index eab6a10f09a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class
deleted file mode 100644
index 7a912ded0e3..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class
deleted file mode 100644
index ce530d6f994..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class
deleted file mode 100644
index bf524e75f56..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class
deleted file mode 100644
index 013b28f1473..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class
deleted file mode 100644
index 5b0fef7ce10..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class
deleted file mode 100644
index affe0058d15..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class
deleted file mode 100644
index 0b71b1d87b3..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class
deleted file mode 100644
index e318aa38ec4..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class
deleted file mode 100644
index b9af4c6fa5e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Messages.class
deleted file mode 100644
index efc34dfc951..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletContext.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletContext.class
deleted file mode 100644
index 1511a5e9b23..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletContext.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletViewer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletViewer.class
deleted file mode 100644
index e8dc01ec5cf..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletViewer.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletWindow.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletWindow.class
deleted file mode 100644
index 3bf54aa891b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/PluginAppletWindow.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletContext.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletContext.class
deleted file mode 100644
index a307a7af4ce..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletContext.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.class
deleted file mode 100644
index 82bdc431b1a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow$1.class
deleted file mode 100644
index c8c976ffe6e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.class
deleted file mode 100644
index 24810be38a3..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/TagParser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/TagParser.class
deleted file mode 100644
index a3fdc693ecb..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/TagParser.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/CallbackUtil.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/CallbackUtil.class
deleted file mode 100644
index 970232c7ea7..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/CallbackUtil.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class
deleted file mode 100644
index 9c37fcc4337..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class
deleted file mode 100644
index cedab4a0bc0..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/Messages.class
deleted file mode 100644
index 9b3d765a117..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/Persistent$ExitTask.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/Persistent$ExitTask.class
deleted file mode 100644
index 36daccbc48b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/Persistent$ExitTask.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/Persistent.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/Persistent.class
deleted file mode 100644
index 6a1e7519db7..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/Persistent.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$1.class
deleted file mode 100644
index 042f455123c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$2.class
deleted file mode 100644
index 501720fe305..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil.class
deleted file mode 100644
index a8e0e6c3152..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/SecurityProviderInfo.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/SecurityProviderInfo.class
deleted file mode 100644
index 8715ab8d475..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/SecurityProviderInfo.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/FileArgumentCallback.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/FileArgumentCallback.class
deleted file mode 100644
index de9d9a63a5a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/FileArgumentCallback.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Messages.class
deleted file mode 100644
index f86b8f70c3b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Option.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Option.class
deleted file mode 100644
index c97800034b2..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Option.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/OptionException.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/OptionException.class
deleted file mode 100644
index 9cc6b62186e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/OptionException.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/OptionGroup.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/OptionGroup.class
deleted file mode 100644
index 2467f78167d..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/OptionGroup.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$1.class
deleted file mode 100644
index a9ac25fd997..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$2.class
deleted file mode 100644
index ccf3542324e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$3.class
deleted file mode 100644
index 373cf215c78..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser.class
deleted file mode 100644
index d5fece3859b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Action.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Action.class
deleted file mode 100644
index 513df1ca3cf..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Action.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class
deleted file mode 100644
index c8c24d231d1..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Entry.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Entry.class
deleted file mode 100644
index d030d92ddd8..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Entry.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Extractor.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Extractor.class
deleted file mode 100644
index c0d819e4c73..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Extractor.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Indexer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Indexer.class
deleted file mode 100644
index ddbaf6bc586..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Indexer.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Lister.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Lister.class
deleted file mode 100644
index 81cdaec2a65..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Lister.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class
deleted file mode 100644
index 1912cbdbdfd..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class
deleted file mode 100644
index 9bd0cbee854..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class
deleted file mode 100644
index ddbd7f53730..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class
deleted file mode 100644
index 9dfd4c5c90f..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class
deleted file mode 100644
index 8050a014e64..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class
deleted file mode 100644
index 126639456ef..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$HandleFile.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$HandleFile.class
deleted file mode 100644
index 16d4ed73859..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$HandleFile.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$JarParser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$JarParser.class
deleted file mode 100644
index 5a62fdc204d..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$JarParser.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$ModeOption.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$ModeOption.class
deleted file mode 100644
index 3630f9b3c21..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$ModeOption.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class
deleted file mode 100644
index 1c32274ee10..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Messages.class
deleted file mode 100644
index 6d26c66934a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Updater.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Updater.class
deleted file mode 100644
index 8fbd26661ad..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Updater.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/WorkSet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/WorkSet.class
deleted file mode 100644
index 4a71d615eac..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/WorkSet.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/HashUtils.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/HashUtils.class
deleted file mode 100644
index 4ece8879b1d..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/HashUtils.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/JarSigner.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/JarSigner.class
deleted file mode 100644
index 3f0e38365e1..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/JarSigner.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/JarVerifier.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/JarVerifier.class
deleted file mode 100644
index 5987cbc9756..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/JarVerifier.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$1.class
deleted file mode 100644
index c74201ccaec..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$10.class
deleted file mode 100644
index 0be4ac8b9cf..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$10.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$11.class
deleted file mode 100644
index 2666f2b4b03..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$11.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$12.class
deleted file mode 100644
index c0299c25447..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$12.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$2.class
deleted file mode 100644
index b56ebdce985..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$3.class
deleted file mode 100644
index ea4fda71ddc..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$4.class
deleted file mode 100644
index 68b4cb2357c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$5.class
deleted file mode 100644
index 5a11e01c91c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$6.class
deleted file mode 100644
index 1415524558b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$7.class
deleted file mode 100644
index a3c1d5b6dad..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$8.class
deleted file mode 100644
index a07cb626761..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$9.class
deleted file mode 100644
index 00e37fd700b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$9.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParser.class
deleted file mode 100644
index 0c0d46acc72..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParser.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParserCallback.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParserCallback.class
deleted file mode 100644
index 44284f87eaf..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParserCallback.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main.class
deleted file mode 100644
index 554f50bebcb..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Messages.class
deleted file mode 100644
index 154ff066f88..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/SFHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/SFHelper.class
deleted file mode 100644
index edfb1e1a91f..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/SFHelper.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class
deleted file mode 100644
index e759d12638c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniIncludePrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniIncludePrinter.class
deleted file mode 100644
index 13a0a99fef3..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniIncludePrinter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class
deleted file mode 100644
index 1f0d890b789..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class
deleted file mode 100644
index c3cf12dda49..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class
deleted file mode 100644
index 430344c87c7..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniHelper.class
deleted file mode 100644
index 938789b9556..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniHelper.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class
deleted file mode 100644
index 5124ee9cbab..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniPrintStream.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniPrintStream.class
deleted file mode 100644
index db0d6668438..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniPrintStream.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class
deleted file mode 100644
index 9f82c33ee84..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class
deleted file mode 100644
index 7b6b063d7db..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class
deleted file mode 100644
index ef2f2cff33e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class
deleted file mode 100644
index 6ec567c1487..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class
deleted file mode 100644
index a4a19b45b9d..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class
deleted file mode 100644
index 68e8f836405..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class
deleted file mode 100644
index ef7248bf94b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class
deleted file mode 100644
index 0bcc04437b1..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class
deleted file mode 100644
index 9b90b1e6838..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class
deleted file mode 100644
index 8d0e8b0bf47..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class
deleted file mode 100644
index ba3351cf081..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class
deleted file mode 100644
index 4f71d9ef104..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
deleted file mode 100644
index c20b0af67c8..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class
deleted file mode 100644
index 45651970054..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PackageWrapper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PackageWrapper.class
deleted file mode 100644
index 68f16fb418b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PackageWrapper.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$1.class
deleted file mode 100644
index 49e070213f7..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class
deleted file mode 100644
index a4fe014e137..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class
deleted file mode 100644
index 6786f255ac5..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class
deleted file mode 100644
index 08d44961c3e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class
deleted file mode 100644
index e8f36fc5b3e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class
deleted file mode 100644
index 41960117caa..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Printer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Printer.class
deleted file mode 100644
index 76b2cbeedab..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Printer.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Text.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Text.class
deleted file mode 100644
index e084d89a781..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Text.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$1.class
deleted file mode 100644
index 480a1c9d8b7..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$2.class
deleted file mode 100644
index ad59a9af0be..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$3.class
deleted file mode 100644
index 4884326b5ab..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$4.class
deleted file mode 100644
index a58428d8c74..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$5.class
deleted file mode 100644
index f239807a0cb..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$6.class
deleted file mode 100644
index 61a03e7b976..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd.class
deleted file mode 100644
index 35a37577d5a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$1.class
deleted file mode 100644
index ef1bbbd1283..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$10.class
deleted file mode 100644
index 67c78b1bb86..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$10.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$2.class
deleted file mode 100644
index 1cdf2a85788..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$3.class
deleted file mode 100644
index f9e702d5090..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$4.class
deleted file mode 100644
index ed8250a9cac..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$5.class
deleted file mode 100644
index 65c4affd736..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$6.class
deleted file mode 100644
index ad81c286e38..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$7.class
deleted file mode 100644
index 1400cf48ef6..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$8.class
deleted file mode 100644
index 88eea663a23..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$9.class
deleted file mode 100644
index dd012fa6956..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$9.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd.class
deleted file mode 100644
index d5a3ec029c3..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Command$ShutdownHook.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Command$ShutdownHook.class
deleted file mode 100644
index d1b0f5c3c1a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Command$ShutdownHook.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Command.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Command.class
deleted file mode 100644
index f2db6a73d15..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Command.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$1.class
deleted file mode 100644
index 6564bea183e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$2.class
deleted file mode 100644
index 2d78cdb56fe..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$3.class
deleted file mode 100644
index c81db25c076..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$4.class
deleted file mode 100644
index f37a26d9d70..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$5.class
deleted file mode 100644
index fb5a2c2af7c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$6.class
deleted file mode 100644
index d1b39a09b1e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd.class
deleted file mode 100644
index 2abbe2a651b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$1.class
deleted file mode 100644
index b51727b9e0b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$2.class
deleted file mode 100644
index d5642532f13..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$3.class
deleted file mode 100644
index 21552f81385..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$4.class
deleted file mode 100644
index 7e71fa1afea..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$5.class
deleted file mode 100644
index f4c8c50bd3f..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$6.class
deleted file mode 100644
index 28c32f2af51..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$7.class
deleted file mode 100644
index 2134fb2ae22..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$8.class
deleted file mode 100644
index 5ac0dd1471f..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd.class
deleted file mode 100644
index 2d18e798168..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$1.class
deleted file mode 100644
index ada9beb884b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$10.class
deleted file mode 100644
index 029f2172941..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$10.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$11.class
deleted file mode 100644
index 562a7304da5..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$11.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$12.class
deleted file mode 100644
index 05d69bf8129..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$12.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$2.class
deleted file mode 100644
index eeae7420b15..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$3.class
deleted file mode 100644
index 420e5dfc333..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$4.class
deleted file mode 100644
index 6fa45ba749a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$5.class
deleted file mode 100644
index 32399766819..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$6.class
deleted file mode 100644
index 6c83543c981..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$7.class
deleted file mode 100644
index 46c3a8695de..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$8.class
deleted file mode 100644
index f9049f20a69..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$9.class
deleted file mode 100644
index 67b6f737b1c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$9.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd.class
deleted file mode 100644
index 097bd1f94cc..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$1.class
deleted file mode 100644
index f8d2b79f016..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$2.class
deleted file mode 100644
index e94a186cb93..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$3.class
deleted file mode 100644
index 5d8cfdbe996..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$4.class
deleted file mode 100644
index 5ff96e7e330..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$5.class
deleted file mode 100644
index 6d6bafcf38b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$6.class
deleted file mode 100644
index d3f2e5f2815..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd.class
deleted file mode 100644
index bfc431eb604..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$1.class
deleted file mode 100644
index 0ed3a710875..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$10.class
deleted file mode 100644
index 23893d93747..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$10.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$2.class
deleted file mode 100644
index a3533a2505d..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$3.class
deleted file mode 100644
index 3aefff632e1..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$4.class
deleted file mode 100644
index c7725c60bc3..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$5.class
deleted file mode 100644
index 651d8030dcf..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$6.class
deleted file mode 100644
index 8a1be6601db..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$7.class
deleted file mode 100644
index 960686d0124..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$8.class
deleted file mode 100644
index 767c99100fe..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$9.class
deleted file mode 100644
index 64b14bc9a98..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$9.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd.class
deleted file mode 100644
index 1700c217067..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$1.class
deleted file mode 100644
index b9b83293b2a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$2.class
deleted file mode 100644
index d052102e850..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$3.class
deleted file mode 100644
index c513808caa9..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$4.class
deleted file mode 100644
index 7ec8d0cc451..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$5.class
deleted file mode 100644
index 156a5d74743..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$6.class
deleted file mode 100644
index d9d9b9d5d42..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$7.class
deleted file mode 100644
index 492ab509103..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$8.class
deleted file mode 100644
index ba86c6c7db1..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$9.class
deleted file mode 100644
index 2a7f85e20e5..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$9.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd.class
deleted file mode 100644
index 579d75e9c45..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$1.class
deleted file mode 100644
index bee57e8fa48..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$2.class
deleted file mode 100644
index 3e58af399ea..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$3.class
deleted file mode 100644
index 77ea49d164c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$4.class
deleted file mode 100644
index 6a233ce3aeb..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$5.class
deleted file mode 100644
index 461a0e693b6..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$6.class
deleted file mode 100644
index b7aabe18791..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$7.class
deleted file mode 100644
index fbe08b8617d..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$8.class
deleted file mode 100644
index 9a72fcc4109..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd.class
deleted file mode 100644
index 13329d4c31b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$1.class
deleted file mode 100644
index ec625738595..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$2.class
deleted file mode 100644
index c0b2cada66d..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$3.class
deleted file mode 100644
index a9c4006f857..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$4.class
deleted file mode 100644
index c3bdb3eee0f..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$5.class
deleted file mode 100644
index 9048e24081f..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$6.class
deleted file mode 100644
index 02364f5a3ad..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$7.class
deleted file mode 100644
index da2d5c9f35e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd.class
deleted file mode 100644
index 5cb87baf2d1..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main$NoParseOption.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main$NoParseOption.class
deleted file mode 100644
index c545200c664..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main$NoParseOption.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main$ShutdownHook.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main$ShutdownHook.class
deleted file mode 100644
index c80502410db..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main$ShutdownHook.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main.class
deleted file mode 100644
index 725ed9bede7..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Messages.class
deleted file mode 100644
index 60939a6c41e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$1.class
deleted file mode 100644
index 026e85743e8..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$2.class
deleted file mode 100644
index 120329523e8..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd.class
deleted file mode 100644
index 4bdc2e6eb96..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$1.class
deleted file mode 100644
index 32dd134b2d6..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$10.class
deleted file mode 100644
index 1a600bfc43f..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$10.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$2.class
deleted file mode 100644
index bab1439cf4b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$3.class
deleted file mode 100644
index 3b60c0e8650..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$4.class
deleted file mode 100644
index 77c008e29e5..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$5.class
deleted file mode 100644
index f19ac62642e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$6.class
deleted file mode 100644
index 066666937c3..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$7.class
deleted file mode 100644
index 59ce68b19d5..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$8.class
deleted file mode 100644
index ae973fbc564..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$9.class
deleted file mode 100644
index cb3c780c2f7..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$9.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd.class
deleted file mode 100644
index a9f5efb0f1c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$1.class
deleted file mode 100644
index 0ec7554fdb8..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$2.class
deleted file mode 100644
index d3af827e06a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$3.class
deleted file mode 100644
index 4ba08d16d7c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$4.class
deleted file mode 100644
index 56e81e0bb0c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$5.class
deleted file mode 100644
index 3ce091dd279..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$6.class
deleted file mode 100644
index cd57d388608..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd.class
deleted file mode 100644
index fcd88bf5d45..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Messages.class
deleted file mode 100644
index 8162e115bc4..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$1.class
deleted file mode 100644
index 9dfdb84bbc5..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$2.class
deleted file mode 100644
index c289b9ded84..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$HandleFile.class b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$HandleFile.class
deleted file mode 100644
index e7f6eab487c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$HandleFile.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class
deleted file mode 100644
index 231dce25a14..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class
deleted file mode 100644
index a10547aa200..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class
deleted file mode 100644
index f010e80e866..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class
deleted file mode 100644
index 948c2695b42..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class
deleted file mode 100644
index 5ae24172043..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class
deleted file mode 100644
index 1edb963da34..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class
deleted file mode 100644
index 3f402a94dd5..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Messages.class
deleted file mode 100644
index f80eceb5513..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentContext.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentContext.class
deleted file mode 100644
index fef9e8bf013..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentContext.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentContextMap.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentContextMap.class
deleted file mode 100644
index 09d84c05e2c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentContextMap.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentMap$Entry.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentMap$Entry.class
deleted file mode 100644
index c37eee13d18..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentMap$Entry.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentMap.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentMap.class
deleted file mode 100644
index 93ccfd8e1fd..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentMap.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/AbstractMethodGenerator.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/AbstractMethodGenerator.class
deleted file mode 100644
index a930096be79..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/AbstractMethodGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class
deleted file mode 100644
index 42fa516a821..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class
deleted file mode 100644
index 302b5d94075..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/CompilationError.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/CompilationError.class
deleted file mode 100644
index d18117c043d..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/CompilationError.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Generator.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Generator.class
deleted file mode 100644
index 5a5fec49ca5..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Generator.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/GiopIo.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/GiopIo.class
deleted file mode 100644
index 82784b8aad1..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/GiopIo.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/HashFinder.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/HashFinder.class
deleted file mode 100644
index a1f7eeeaa75..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/HashFinder.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class
deleted file mode 100644
index eaf143e7be1..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class
deleted file mode 100644
index 1b88292d1cd..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class
deleted file mode 100644
index 445fbce6639..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class
deleted file mode 100644
index ad7825eb9ff..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class
deleted file mode 100644
index c7d50e665b1..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class
deleted file mode 100644
index fb17a8ae4d5..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class
deleted file mode 100644
index e6d5530f8e2..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class
deleted file mode 100644
index 4c97c226d3f..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class
deleted file mode 100644
index b7a91fb5a1a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class
deleted file mode 100644
index 923c3a9d4f9..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class
deleted file mode 100644
index aa66ee3fef9..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class
deleted file mode 100644
index 4e07a58019a..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class
deleted file mode 100644
index bf5788f2cf4..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class
deleted file mode 100644
index 963faad048e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class
deleted file mode 100644
index 60254da5668..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class
deleted file mode 100644
index 0ea52dd2513..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class
deleted file mode 100644
index c0f4c2f4ee0..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class
deleted file mode 100644
index a19b9b66f22..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class
deleted file mode 100644
index a2571607744..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Messages.class
deleted file mode 100644
index 1a73827b360..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/MethodGenerator.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/MethodGenerator.class
deleted file mode 100644
index 272018323c8..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/MethodGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RMICException.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RMICException.class
deleted file mode 100644
index e3ebf5d1623..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RMICException.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmiMethodGenerator.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmiMethodGenerator.class
deleted file mode 100644
index 731f27a5da7..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmiMethodGenerator.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmicBackend.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmicBackend.class
deleted file mode 100644
index 7c08d1aa492..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/RmicBackend.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.class
deleted file mode 100644
index b66e612058c..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceRmicCompiler.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceRmicCompiler.class
deleted file mode 100644
index 1c267c9ae5e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceRmicCompiler.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Variables.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Variables.class
deleted file mode 100644
index c5a258b8202..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Variables.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/WrapUnWrapper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/WrapUnWrapper.class
deleted file mode 100644
index fe7aa9c8cae..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/WrapUnWrapper.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/ActivationSystemImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/ActivationSystemImpl.class
deleted file mode 100644
index 3633faaa8b3..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/ActivationSystemImpl.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.class
deleted file mode 100644
index 8b798b3ad38..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class
deleted file mode 100644
index 420e1a69aea..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class
deleted file mode 100644
index 9433c6c20c9..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class
deleted file mode 100644
index 0185eced0ed..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class
deleted file mode 100644
index b3a9d245181..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class
deleted file mode 100644
index 3f27513f29d..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class
deleted file mode 100644
index 7f962c511c6..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class
deleted file mode 100644
index 6675d24516b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Messages.class
deleted file mode 100644
index 0c639221cf7..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable$AdaptedReader.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable$AdaptedReader.class
deleted file mode 100644
index e45236487d7..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable$AdaptedReader.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable$WriteToDiskTask.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable$WriteToDiskTask.class
deleted file mode 100644
index d2bf71d7b83..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable$WriteToDiskTask.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable.class
deleted file mode 100644
index ea377e91407..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$1.class
deleted file mode 100644
index 52143bbcfd6..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$2.class
deleted file mode 100644
index 9c7052a21ab..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$3.class
deleted file mode 100644
index 56426d64bd9..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$4.class
deleted file mode 100644
index 7548abf4f51..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$4.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$5.class
deleted file mode 100644
index a697c94475f..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$5.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$6.class
deleted file mode 100644
index 92758c6ab85..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$6.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main.class
deleted file mode 100644
index ecd6540a28b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Messages.class
deleted file mode 100644
index b100ea71619..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/PersistentHashTable$WriteToDiskTask.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/PersistentHashTable$WriteToDiskTask.class
deleted file mode 100644
index f08619a5ee8..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/PersistentHashTable$WriteToDiskTask.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/PersistentHashTable.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/PersistentHashTable.class
deleted file mode 100644
index 92304dccb85..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/PersistentHashTable.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl.class
deleted file mode 100644
index bf6d1ced504..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.class
deleted file mode 100644
index 50d6faf3dea..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.class
deleted file mode 100644
index 19b12483e14..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/Messages.class
deleted file mode 100644
index d670a68cfc3..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/Messages.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class
deleted file mode 100644
index c8ce2a57b2b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class
deleted file mode 100644
index 18583dc1e06..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class
deleted file mode 100644
index 9a5b3a72f40..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class
deleted file mode 100644
index f564268d81b..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class
deleted file mode 100644
index bfe1d362f7e..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class
deleted file mode 100644
index 8fd28acb14f..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class
deleted file mode 100644
index 0b3d3c93e59..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class
+++ /dev/null
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Messages.class
deleted file mode 100644
index c9b9175cca0..00000000000
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Messages.class
+++ /dev/null
diff --git a/libjava/gnu/CORBA/Asynchron.h b/libjava/gnu/CORBA/Asynchron.h
deleted file mode 100644
index c1b542ad287..00000000000
--- 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 968a863f1bf..00000000000
--- 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 f619ba89f8f..00000000000
--- 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 a9c9adcf62c..00000000000
--- 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 b6d328be04a..00000000000
--- 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 c4c147f3a17..00000000000
--- 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 08ba71438f7..00000000000
--- 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 54e842019f8..00000000000
--- 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 2b889783e80..00000000000
--- 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 2da61214017..00000000000
--- 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 9feb32e9863..00000000000
--- 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 12e14d8dda2..00000000000
--- 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 373a9e2c42c..00000000000
--- 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 71a8e20b7ae..00000000000
--- 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 9b3a2d5f2d8..00000000000
--- 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 2cc8e85a5d6..00000000000
--- 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 9c97fc8169b..00000000000
--- 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 d6a9a6e05dc..00000000000
--- 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 3fb7db57c56..00000000000
--- 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 9f77414d40f..00000000000
--- 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 e8267e80df9..00000000000
--- 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 367a63d6cb4..00000000000
--- 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 f20890e435a..00000000000
--- 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:
-  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 f6e157517c7..00000000000
--- 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 b9b58638822..00000000000
--- 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 a120cba09f7..00000000000
--- 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 880cc61cdba..00000000000
--- 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 8bdc15b9cf4..00000000000
--- 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 60a47556848..00000000000
--- 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 bc4be4505a0..00000000000
--- 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 f22aa0c8e04..00000000000
--- 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 26e4cadf8b4..00000000000
--- 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 3fe423d0543..00000000000
--- 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 3853f506a28..00000000000
--- 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 04e25dc76aa..00000000000
--- 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 12346310a65..00000000000
--- 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 1222d2ada9b..00000000000
--- 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 26a6e5b4543..00000000000
--- 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 77f3f5c7486..00000000000
--- 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 dd827d6e8b4..00000000000
--- 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 3a106d61409..00000000000
--- 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 f8e0c0f3dd2..00000000000
--- 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 6bfc5d55e18..00000000000
--- 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 d14d9efc807..00000000000
--- 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 0aaebf60429..00000000000
--- 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 ced924bed17..00000000000
--- 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 cba3b1c5de0..00000000000
--- 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 76c32e28517..00000000000
--- 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 a159c8c2b59..00000000000
--- 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 852e69ca9df..00000000000
--- 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 da79ceba0b7..00000000000
--- 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 838733302a6..00000000000
--- 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 d8799999aed..00000000000
--- 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 db527896ae7..00000000000
--- 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 14aeabf01c2..00000000000
--- 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 afac0d36a24..00000000000
--- 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 b9700f871d1..00000000000
--- 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 6b3f1510dc7..00000000000
--- 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 80ec2afd52f..00000000000
--- 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 321991ab426..00000000000
--- 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 232a5b36478..00000000000
--- 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 5c10ad8967a..00000000000
--- 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 69135b39f28..00000000000
--- 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 7cde097f684..00000000000
--- 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 455da24217f..00000000000
--- 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 9c5755ed021..00000000000
--- 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 0b732776b0c..00000000000
--- 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 633c59c7559..00000000000
--- 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 368275c11ff..00000000000
--- 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 fd3d4821e5c..00000000000
--- 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 78c96d71974..00000000000
--- 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 394d8a8930c..00000000000
--- 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 e38bdc4a32c..00000000000
--- 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 93e149e03d7..00000000000
--- 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 22cb1e1db74..00000000000
--- 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 d5dc4b1ce1b..00000000000
--- 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 c58ee59986c..00000000000
--- 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 6a2a45a7538..00000000000
--- 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 8a5a3b03264..00000000000
--- 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 fb78c57b968..00000000000
--- 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 32dac2c45fb..00000000000
--- 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 65d85eb9d7c..00000000000
--- 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 8e1adcf8126..00000000000
--- 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 8164ea7233a..00000000000
--- 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 176cac068dc..00000000000
--- 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 c3fca11db19..00000000000
--- 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 b2440380831..00000000000
--- 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 e37bd4cdf7d..00000000000
--- 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 ca7a5a5de7e..00000000000
--- 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 0ffdb8704df..00000000000
--- 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 a8c14d0704a..00000000000
--- 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 4b5ef47e2a9..00000000000
--- 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 68caf386fdb..00000000000
--- 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 ec385a0b8c6..00000000000
--- 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 dbf3186fa38..00000000000
--- 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 d5bff788e3f..00000000000
--- 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 c628e17a990..00000000000
--- a/libjava/gnu/CORBA/NamingService/NameTransformer.h
+++ /dev/null
@@ -1,58 +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 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(::java::lang::StringBuffer *, ::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 6ec06279cca..00000000000
--- 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 601a891c45b..00000000000
--- 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 118f7f02618..00000000000
--- 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:
-  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 78e2b46f1a0..00000000000
--- 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 1cdfe919132..00000000000
--- 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 5d6613265b9..00000000000
--- 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 bfa0ca621b8..00000000000
--- 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 ec756ea4918..00000000000
--- 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 28a1b7ec78a..00000000000
--- 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:
-  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 eff695f189f..00000000000
--- 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:
-  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 0ea05cb9186..00000000000
--- 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 c0658968cdc..00000000000
--- 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 de005430f9d..00000000000
--- 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 5f8d51e110a..00000000000
--- 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 67ee7df990c..00000000000
--- 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 3c19649c0e9..00000000000
--- 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 54d1421227e..00000000000
--- 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 e5750aa7fff..00000000000
--- 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 5280da19d30..00000000000
--- 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 46b24050a4e..00000000000
--- 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 80b1533af91..00000000000
--- 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 4baca2ea637..00000000000
--- 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 8d78931cbe9..00000000000
--- 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 a779429ec8f..00000000000
--- 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 8e62bbe2e07..00000000000
--- 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 e5fbd569667..00000000000
--- 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 6b7f9202fa7..00000000000
--- 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 b190e4815f9..00000000000
--- 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 4609dcdd503..00000000000
--- 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 fd54bd3da5f..00000000000
--- 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 563f1e37eb8..00000000000
--- 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 229a10aa34c..00000000000
--- 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 6abc75b4221..00000000000
--- 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 b7a34b05cca..00000000000
--- 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 85af4246799..00000000000
--- 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 b94576b3c6e..00000000000
--- 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 63c88c6923b..00000000000
--- 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 661a49b28b2..00000000000
--- 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 8b5d761d1e5..00000000000
--- 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 9ac884715b3..00000000000
--- 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 a52147d923e..00000000000
--- 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 65e6d4c04bc..00000000000
--- 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 99ca581b6aa..00000000000
--- 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 23f774c195c..00000000000
--- 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 8181666a41f..00000000000
--- 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 2fd7a379569..00000000000
--- 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 40aec98c9eb..00000000000
--- 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 2efe2b84361..00000000000
--- 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 158fe4df10d..00000000000
--- 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 7afb2dad309..00000000000
--- 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 f71e4ad6d07..00000000000
--- 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 591e30fe554..00000000000
--- 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 eac0736adac..00000000000
--- 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 da2c87fd6d0..00000000000
--- 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 cadcd6159f0..00000000000
--- 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 0c8d910b9b2..00000000000
--- 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 b5a66def959..00000000000
--- 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 5d26fdaa830..00000000000
--- 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 3cd33d7d43b..00000000000
--- 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 5047b420925..00000000000
--- 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 51d52b3f511..00000000000
--- 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 4d55ac54ac7..00000000000
--- 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 914d5029c2a..00000000000
--- 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 1557180ecf2..00000000000
--- 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 dd1b138604b..00000000000
--- 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 25d5e08b6c9..00000000000
--- 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 17386a3cc82..00000000000
--- 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 821bf514e6e..00000000000
--- 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:
-  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 3b1663fdee2..00000000000
--- 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:
-  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 70ebd77b9e0..00000000000
--- 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 d26dc33bb80..00000000000
--- 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 b6c1cea3307..00000000000
--- 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 1615821829c..00000000000
--- 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 4565632d22a..00000000000
--- 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 2acd5e917d4..00000000000
--- 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 a522ad08794..00000000000
--- 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 dda2b7fc83e..00000000000
--- 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 d5de501d0da..00000000000
--- 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 be711a89ea5..00000000000
--- 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 4fcc4febadd..00000000000
--- 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 6513b3cdd33..00000000000
--- 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 03474c0da41..00000000000
--- 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/j2d/AbstractGraphicsState.h b/libjava/gnu/awt/j2d/AbstractGraphicsState.h
deleted file mode 100644
index 973d9106a1f..00000000000
--- 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/DirectRasterGraphics.h b/libjava/gnu/awt/j2d/DirectRasterGraphics.h
deleted file mode 100644
index 4cb63f7f7d3..00000000000
--- 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/Graphics2DImpl.h b/libjava/gnu/awt/j2d/Graphics2DImpl.h
deleted file mode 100644
index c7e8a8c1da0..00000000000
--- 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/IntegerGraphicsState$ScreenCoupledImage.h b/libjava/gnu/awt/j2d/IntegerGraphicsState$ScreenCoupledImage.h
deleted file mode 100644
index eaa7c93a8f6..00000000000
--- 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 9a226099355..00000000000
--- 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/MappedRaster.h b/libjava/gnu/awt/j2d/MappedRaster.h
deleted file mode 100644
index ab5a81e4b83..00000000000
--- 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/xlib/XCanvasPeer$DoMap.h b/libjava/gnu/awt/xlib/XCanvasPeer$DoMap.h
deleted file mode 100644
index 08498e179c2..00000000000
--- 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 fb01c06c2e4..00000000000
--- a/libjava/gnu/awt/xlib/XCanvasPeer.h
+++ /dev/null
@@ -1,156 +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;
-      }
-    }
-  }
-}
-
-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 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/XEventLoop.h b/libjava/gnu/awt/xlib/XEventLoop.h
deleted file mode 100644
index 0827f8aaa9a..00000000000
--- 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;
-  volatile jboolean idle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_awt_xlib_XEventLoop__
diff --git a/libjava/gnu/awt/xlib/XEventQueue.h b/libjava/gnu/awt/xlib/XEventQueue.h
deleted file mode 100644
index ca41be73e34..00000000000
--- 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/XFontMetrics.h b/libjava/gnu/awt/xlib/XFontMetrics.h
deleted file mode 100644
index 55b2189783f..00000000000
--- 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/XFontPeer.h b/libjava/gnu/awt/xlib/XFontPeer.h
deleted file mode 100644
index 7a7f6b7df1a..00000000000
--- 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 *, jchar);
-  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/XFramePeer.h b/libjava/gnu/awt/xlib/XFramePeer.h
deleted file mode 100644
index 621d2919d34..00000000000
--- a/libjava/gnu/awt/xlib/XFramePeer.h
+++ /dev/null
@@ -1,82 +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 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 void updateAlwaysOnTop();
-  virtual jboolean requestWindowFocus();
-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/XGraphics$XRaster.h b/libjava/gnu/awt/xlib/XGraphics$XRaster.h
deleted file mode 100644
index 8183599d6c2..00000000000
--- 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 4098ba44189..00000000000
--- 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/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry.h b/libjava/gnu/awt/xlib/XGraphicsConfiguration$FontMetricsCache$PerDisplayCache$CacheEntry.h
deleted file mode 100644
index 42e3c8dbf23..00000000000
--- 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 8a236d6704e..00000000000
--- 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 53935f518ca..00000000000
--- 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 b7f53eff9e9..00000000000
--- 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/XGraphicsDevice.h b/libjava/gnu/awt/xlib/XGraphicsDevice.h
deleted file mode 100644
index d5dc2f128ef..00000000000
--- 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/XGraphicsEnvironment.h b/libjava/gnu/awt/xlib/XGraphicsEnvironment.h
deleted file mode 100644
index 0f09087ae55..00000000000
--- 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/XOffScreenImage.h b/libjava/gnu/awt/xlib/XOffScreenImage.h
deleted file mode 100644
index 73ca8bfbc32..00000000000
--- 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/XPanelPeer.h b/libjava/gnu/awt/xlib/XPanelPeer.h
deleted file mode 100644
index 4fcc0c7ee57..00000000000
--- 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/XToolkit.h b/libjava/gnu/awt/xlib/XToolkit.h
deleted file mode 100644
index 7bfc61e1349..00000000000
--- a/libjava/gnu/awt/xlib/XToolkit.h
+++ /dev/null
@@ -1,209 +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 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);
-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/classpath/Configuration.h b/libjava/gnu/classpath/Configuration.h
deleted file mode 100644
index e53026bb453..00000000000
--- a/libjava/gnu/classpath/Configuration.h
+++ /dev/null
@@ -1,38 +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();
-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::Class class$;
-};
-
-#endif // __gnu_classpath_Configuration__
diff --git a/libjava/gnu/classpath/ListenerData.h b/libjava/gnu/classpath/ListenerData.h
deleted file mode 100644
index 03be1ce5d87..00000000000
--- a/libjava/gnu/classpath/ListenerData.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_ListenerData__
-#define __gnu_classpath_ListenerData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class ListenerData;
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class gnu::classpath::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_classpath_ListenerData__
diff --git a/libjava/gnu/classpath/NotImplementedException.h b/libjava/gnu/classpath/NotImplementedException.h
deleted file mode 100644
index b81e112555f..00000000000
--- 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/Pointer.h b/libjava/gnu/classpath/Pointer.h
deleted file mode 100644
index 79d0eccc719..00000000000
--- 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 d704ee02e29..00000000000
--- 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 b44950cd56a..00000000000
--- 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 a64ca4ff668..00000000000
--- a/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h
+++ /dev/null
@@ -1,55 +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 *, ::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;
-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 fddad85b14f..00000000000
--- a/libjava/gnu/classpath/ServiceFactory.h
+++ /dev/null
@@ -1,36 +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 *);
-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 d6abfe5b6fd..00000000000
--- 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 290300af8fe..00000000000
--- 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/VMStackWalker.h b/libjava/gnu/classpath/VMStackWalker.h
deleted file mode 100644
index bfe1845f810..00000000000
--- 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/debug/Component.h b/libjava/gnu/classpath/debug/Component.h
deleted file mode 100644
index b6dd87e96b7..00000000000
--- 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 14fdfdb7cf1..00000000000
--- 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 237dfac08b9..00000000000
--- 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 dc367e39107..00000000000
--- 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 293f0576388..00000000000
--- 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 24357808f4b..00000000000
--- 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 5da674baa2d..00000000000
--- 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 ee34cf0cd01..00000000000
--- 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 7de29f0690c..00000000000
--- 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:
-  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 0d851371f88..00000000000
--- a/libjava/gnu/classpath/jdwp/Jdwp.h
+++ /dev/null
@@ -1,79 +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>
-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 sendEvent(::gnu::classpath::jdwp::event::EventRequest *, ::gnu::classpath::jdwp::event::Event *);
-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 4cc150269ee..00000000000
--- 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 940ada8884f..00000000000
--- 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 0115eb22f80..00000000000
--- 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 372555093a0..00000000000
--- 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 73f215251ef..00000000000
--- 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 4d905545b8b..00000000000
--- 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 74eba427212..00000000000
--- 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 c486a61c1d7..00000000000
--- 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 07949aadca5..00000000000
--- 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 608072d09dc..00000000000
--- 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 8b406651445..00000000000
--- 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 3d9f5c4bdc9..00000000000
--- 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 dc4bd002a7c..00000000000
--- 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 60f4072c655..00000000000
--- 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 f795c3a8df3..00000000000
--- 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 3cf1f553c0c..00000000000
--- 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 603c6d1c4d5..00000000000
--- 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 a6f69331d6f..00000000000
--- 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 3dc0bf1a226..00000000000
--- 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 138a9160b5b..00000000000
--- 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 bdb501c1b01..00000000000
--- 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 bcd412b9783..00000000000
--- 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 f2f087a7a54..00000000000
--- 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 55d1b6227a1..00000000000
--- 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 abd3a2507d6..00000000000
--- 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 8facf579536..00000000000
--- 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 6c578097dfa..00000000000
--- 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 99c3df9bbaa..00000000000
--- 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 411abad0c4b..00000000000
--- 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 426d3d23c39..00000000000
--- 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 293652fab44..00000000000
--- 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 98f0b888e1e..00000000000
--- 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 5278a192c6a..00000000000
--- a/libjava/gnu/classpath/jdwp/VMFrame.h
+++ /dev/null
@@ -1,47 +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;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::VMFrame : public ::java::lang::Object
-{
-
-public:
-  VMFrame();
-  virtual ::gnu::classpath::jdwp::util::Location * getLocation();
-  virtual ::java::lang::Object * getValue(jint);
-  virtual void setValue(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * getObject();
-  virtual jlong getId();
-  static const jint SIZE = 8;
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::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/VMIdManager$IdFactory.h b/libjava/gnu/classpath/jdwp/VMIdManager$IdFactory.h
deleted file mode 100644
index f24d6b368c1..00000000000
--- 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 7acd047a6c7..00000000000
--- 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 22fc42f821c..00000000000
--- 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/VMMethod.h b/libjava/gnu/classpath/jdwp/VMMethod.h
deleted file mode 100644
index f1bf3d76cfd..00000000000
--- a/libjava/gnu/classpath/jdwp/VMMethod.h
+++ /dev/null
@@ -1,60 +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 *);
-  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/VMVirtualMachine.h b/libjava/gnu/classpath/jdwp/VMVirtualMachine.h
deleted file mode 100644
index a9a3b6df8e1..00000000000
--- a/libjava/gnu/classpath/jdwp/VMVirtualMachine.h
+++ /dev/null
@@ -1,75 +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;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-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 jint getAllLoadedClassesCount();
-  static ::java::util::Iterator * 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 *, ::java::nio::ByteBuffer *);
-  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 *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *, jboolean);
-  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);
-private:
-  static ::java::util::Hashtable * _jdwp_suspend_counts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_VMVirtualMachine__
diff --git a/libjava/gnu/classpath/jdwp/event/BreakpointEvent.h b/libjava/gnu/classpath/jdwp/event/BreakpointEvent.h
deleted file mode 100644
index 3a8bfd13fec..00000000000
--- 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 35d24ea99a4..00000000000
--- 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 35447905d43..00000000000
--- 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 19dc07847c3..00000000000
--- a/libjava/gnu/classpath/jdwp/event/Event.h
+++ /dev/null
@@ -1,56 +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>
-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;
-  virtual ::gnu::classpath::jdwp::transport::JdwpPacket * toPacket(::java::io::DataOutputStream *, ::gnu::classpath::jdwp::event::EventRequest *);
-  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 081371148ee..00000000000
--- a/libjava/gnu/classpath/jdwp/event/EventManager.h
+++ /dev/null
@@ -1,50 +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>
-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 ::gnu::classpath::jdwp::event::EventRequest * getEventRequest(::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 3a493a7c876..00000000000
--- 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 02745b63129..00000000000
--- 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 cb9c272b701..00000000000
--- 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 89b01537e9c..00000000000
--- 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 48190588836..00000000000
--- 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 b5b964eedde..00000000000
--- 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 f4f7afd6c44..00000000000
--- 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 ae0b24ec235..00000000000
--- 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 3a7db8811b9..00000000000
--- 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 7a6796417b2..00000000000
--- 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 3670c26a6ee..00000000000
--- 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 6c887abeb1a..00000000000
--- 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 23c5a14a2e8..00000000000
--- 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 c3db4aeb8b8..00000000000
--- 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 4a84d43ef6a..00000000000
--- 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 2f6d577725d..00000000000
--- 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 0723bad2d73..00000000000
--- 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 3b5aedf4b53..00000000000
--- 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 e5e0da92cc1..00000000000
--- 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 c434ae1421e..00000000000
--- 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 0c1a6eec402..00000000000
--- 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/InvalidClassException.h b/libjava/gnu/classpath/jdwp/exception/InvalidClassException.h
deleted file mode 100644
index fb6028f7943..00000000000
--- 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 201b5db3b6f..00000000000
--- 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 b5bfea3d77c..00000000000
--- 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 e5e7d129298..00000000000
--- 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 31ebf4ac148..00000000000
--- 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/InvalidLocationException.h b/libjava/gnu/classpath/jdwp/exception/InvalidLocationException.h
deleted file mode 100644
index 8d44f50bccf..00000000000
--- 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 c6d44ca5766..00000000000
--- 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 20ea14f4f9e..00000000000
--- 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/InvalidStringException.h b/libjava/gnu/classpath/jdwp/exception/InvalidStringException.h
deleted file mode 100644
index b31ef702bde..00000000000
--- 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/InvalidThreadException.h b/libjava/gnu/classpath/jdwp/exception/InvalidThreadException.h
deleted file mode 100644
index 72951401c2d..00000000000
--- 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 c95db022066..00000000000
--- 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 04869f2e48a..00000000000
--- 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 035f3973853..00000000000
--- 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 6829e26e6c4..00000000000
--- 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 4f7a55c1f3c..00000000000
--- 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 4a99592fcc2..00000000000
--- 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/VmDeadException.h b/libjava/gnu/classpath/jdwp/exception/VmDeadException.h
deleted file mode 100644
index 616f735b557..00000000000
--- 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 7e971e0bd6e..00000000000
--- 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 e52b1098fb5..00000000000
--- 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 16210026457..00000000000
--- 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 5f628a46535..00000000000
--- 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 f159722e388..00000000000
--- 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 e1f2a9179d7..00000000000
--- 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 67e8c2c5323..00000000000
--- 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/ObjectId.h b/libjava/gnu/classpath/jdwp/id/ObjectId.h
deleted file mode 100644
index 724d92103a5..00000000000
--- 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 0d8a884814d..00000000000
--- 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 901df280933..00000000000
--- 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 3f6b8f9e4eb..00000000000
--- 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 ed625920507..00000000000
--- 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/processor/ArrayReferenceCommandSet.h b/libjava/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.h
deleted file mode 100644
index 4bf187cda8f..00000000000
--- 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 6d7864aa4f9..00000000000
--- 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 3395a0eedef..00000000000
--- 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 67b4583a78d..00000000000
--- 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 6967d32d747..00000000000
--- 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 6833202dba2..00000000000
--- 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 8a86b7bc983..00000000000
--- 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 443cede87be..00000000000
--- 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 2348e7966ba..00000000000
--- 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 3dc3a67fa9b..00000000000
--- 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 74a7aaa2406..00000000000
--- 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 d2e5057e362..00000000000
--- 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 056a5ca9c05..00000000000
--- 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 be634561094..00000000000
--- 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 4904cbc0705..00000000000
--- 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 b7040d44d08..00000000000
--- 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 c3248e91323..00000000000
--- 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 c2eaf87873d..00000000000
--- 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 572b61517c2..00000000000
--- 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 6d67ad48c52..00000000000
--- 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 aa6a0272a6f..00000000000
--- 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 sendEvent(::gnu::classpath::jdwp::event::EventRequest *, ::gnu::classpath::jdwp::event::Event *);
-  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 bace85265bd..00000000000
--- 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 0235334683a..00000000000
--- 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 b5fe5c327cd..00000000000
--- 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 18c405ceb0c..00000000000
--- 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 4900baa669c..00000000000
--- 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 e3e01986b6f..00000000000
--- 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 0845ca8ce6c..00000000000
--- 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 6ca678c3a16..00000000000
--- 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 4b742748250..00000000000
--- a/libjava/gnu/classpath/jdwp/util/Location.h
+++ /dev/null
@@ -1,53 +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();
-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 c83d2c105a9..00000000000
--- a/libjava/gnu/classpath/jdwp/util/MethodResult.h
+++ /dev/null
@@ -1,43 +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;
-        }
-      }
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::MethodResult : public ::java::lang::Object
-{
-
-public:
-  MethodResult();
-  virtual ::java::lang::Object * getReturnedValue();
-  virtual void setReturnedValue(::java::lang::Object *);
-  virtual ::java::lang::Exception * getThrownException();
-  virtual void setThrownException(::java::lang::Exception *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) returnedValue;
-  ::java::lang::Exception * thrownException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_MethodResult__
diff --git a/libjava/gnu/classpath/jdwp/util/Signature.h b/libjava/gnu/classpath/jdwp/util/Signature.h
deleted file mode 100644
index 4ec84ce100a..00000000000
--- a/libjava/gnu/classpath/jdwp/util/Signature.h
+++ /dev/null
@@ -1,44 +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;
-        }
-      }
-    }
-  }
-}
-
-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(::java::lang::StringBuffer *, ::java::lang::Class *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_Signature__
diff --git a/libjava/gnu/classpath/jdwp/util/Value.h b/libjava/gnu/classpath/jdwp/util/Value.h
deleted file mode 100644
index 01dda3fa878..00000000000
--- a/libjava/gnu/classpath/jdwp/util/Value.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_util_Value__
-#define __gnu_classpath_jdwp_util_Value__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace util
-        {
-            class Value;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::Value : public ::java::lang::Object
-{
-
-public:
-  Value();
-  static void writeUntaggedValue(::java::io::DataOutputStream *, ::java::lang::Object *);
-  static void writeTaggedValue(::java::io::DataOutputStream *, ::java::lang::Object *);
-private:
-  static void writeValue(::java::io::DataOutputStream *, ::java::lang::Object *, jboolean);
-public:
-  static ::java::lang::Object * getObj(::java::nio::ByteBuffer *);
-  static ::java::lang::Object * getUntaggedObj(::java::nio::ByteBuffer *, ::java::lang::Class *);
-  static ::java::lang::Object * getUntaggedObj(::java::nio::ByteBuffer *, jbyte);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_Value__
diff --git a/libjava/gnu/classpath/jdwp/util/VariableTable.h b/libjava/gnu/classpath/jdwp/util/VariableTable.h
deleted file mode 100644
index 05b0477fed7..00000000000
--- 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:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) argCnt;
-  jlong 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/gcj/Core.h b/libjava/gnu/gcj/Core.h
deleted file mode 100644
index ba28bf11da3..00000000000
--- 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/RawData.h b/libjava/gnu/gcj/RawData.h
deleted file mode 100644
index 8cb1188d7aa..00000000000
--- 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/RawDataManaged.h b/libjava/gnu/gcj/RawDataManaged.h
deleted file mode 100644
index cb9673e2618..00000000000
--- 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/convert/BytesToCharsetAdaptor.h b/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.h
deleted file mode 100644
index f9d4a8830e8..00000000000
--- 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/BytesToUnicode.h b/libjava/gnu/gcj/convert/BytesToUnicode.h
deleted file mode 100644
index 15ff3ec55b9..00000000000
--- 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/CharsetToBytesAdaptor.h b/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.h
deleted file mode 100644
index 4115ef4907d..00000000000
--- 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/Convert.h b/libjava/gnu/gcj/convert/Convert.h
deleted file mode 100644
index 8a77702240e..00000000000
--- 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/IOConverter.h b/libjava/gnu/gcj/convert/IOConverter.h
deleted file mode 100644
index 66548598bc1..00000000000
--- 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/Input_8859_1.h b/libjava/gnu/gcj/convert/Input_8859_1.h
deleted file mode 100644
index eccb4b34c13..00000000000
--- 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_ASCII.h b/libjava/gnu/gcj/convert/Input_ASCII.h
deleted file mode 100644
index fcc8c65a367..00000000000
--- 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_EUCJIS.h b/libjava/gnu/gcj/convert/Input_EUCJIS.h
deleted file mode 100644
index 3a93c52db51..00000000000
--- 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_JavaSrc.h b/libjava/gnu/gcj/convert/Input_JavaSrc.h
deleted file mode 100644
index 4509cf64a1e..00000000000
--- 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_SJIS.h b/libjava/gnu/gcj/convert/Input_SJIS.h
deleted file mode 100644
index d2cacbe4388..00000000000
--- 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_UTF8.h b/libjava/gnu/gcj/convert/Input_UTF8.h
deleted file mode 100644
index 347513bda8f..00000000000
--- 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_UnicodeBig.h b/libjava/gnu/gcj/convert/Input_UnicodeBig.h
deleted file mode 100644
index ec834edecf8..00000000000
--- 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_UnicodeLittle.h b/libjava/gnu/gcj/convert/Input_UnicodeLittle.h
deleted file mode 100644
index ddc3c0620bd..00000000000
--- 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_iconv.h b/libjava/gnu/gcj/convert/Input_iconv.h
deleted file mode 100644
index 7fd8893f133..00000000000
--- 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/Output_8859_1.h b/libjava/gnu/gcj/convert/Output_8859_1.h
deleted file mode 100644
index 8dcd92d4548..00000000000
--- 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_ASCII.h b/libjava/gnu/gcj/convert/Output_ASCII.h
deleted file mode 100644
index 3dc551cbcb6..00000000000
--- 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_EUCJIS.h b/libjava/gnu/gcj/convert/Output_EUCJIS.h
deleted file mode 100644
index f1d925857fe..00000000000
--- 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_JavaSrc.h b/libjava/gnu/gcj/convert/Output_JavaSrc.h
deleted file mode 100644
index 8cea3739017..00000000000
--- 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_SJIS.h b/libjava/gnu/gcj/convert/Output_SJIS.h
deleted file mode 100644
index 5175d201631..00000000000
--- 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_UTF8.h b/libjava/gnu/gcj/convert/Output_UTF8.h
deleted file mode 100644
index 167b62dba7e..00000000000
--- 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_UnicodeLittleUnmarked.h b/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.h
deleted file mode 100644
index 747846bd0a9..00000000000
--- 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_iconv.h b/libjava/gnu/gcj/convert/Output_iconv.h
deleted file mode 100644
index a06f96b0d9f..00000000000
--- 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/UnicodeToBytes.h b/libjava/gnu/gcj/convert/UnicodeToBytes.h
deleted file mode 100644
index ea3a38ca507..00000000000
--- 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/io/DefaultMimeTypes.h b/libjava/gnu/gcj/io/DefaultMimeTypes.h
deleted file mode 100644
index 5c09838b685..00000000000
--- a/libjava/gnu/gcj/io/DefaultMimeTypes.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_io_DefaultMimeTypes__
-#define __gnu_gcj_io_DefaultMimeTypes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace io
-      {
-          class DefaultMimeTypes;
-      }
-    }
-  }
-}
-
-class gnu::gcj::io::DefaultMimeTypes : public ::java::lang::Object
-{
-
-public:
-  DefaultMimeTypes();
-  static JArray< ::java::lang::String * > * types;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_io_DefaultMimeTypes__
diff --git a/libjava/gnu/gcj/io/MimeTypes.h b/libjava/gnu/gcj/io/MimeTypes.h
deleted file mode 100644
index 8ff48701261..00000000000
--- a/libjava/gnu/gcj/io/MimeTypes.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_gcj_io_MimeTypes__
-#define __gnu_gcj_io_MimeTypes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace io
-      {
-          class MimeTypes;
-      }
-    }
-  }
-}
-
-class gnu::gcj::io::MimeTypes : public ::java::lang::Object
-{
-
-public:
-  MimeTypes();
-  static void fillFromFile(::java::util::Hashtable *, ::java::lang::String *);
-  static ::java::lang::String * getMimeTypeFromExtension(::java::lang::String *);
-private:
-  static ::java::util::Hashtable * mime_types;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_io_MimeTypes__
diff --git a/libjava/gnu/gcj/io/SimpleSHSStream.h b/libjava/gnu/gcj/io/SimpleSHSStream.h
deleted file mode 100644
index 3cabc4aa046..00000000000
--- 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/jvmti/Breakpoint.h b/libjava/gnu/gcj/jvmti/Breakpoint.h
deleted file mode 100644
index ebdd8555366..00000000000
--- a/libjava/gnu/gcj/jvmti/Breakpoint.h
+++ /dev/null
@@ -1,44 +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;
-      }
-    }
-  }
-}
-
-class gnu::gcj::jvmti::Breakpoint : public ::java::lang::Object
-{
-
-public:
-  Breakpoint(jlong, jlong);
-private:
-  void initialize_native();
-public:
-  virtual void install();
-  virtual void remove();
-  virtual ::gnu::gcj::RawDataManaged * getInsn();
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) method;
-  jlong location;
-  ::gnu::gcj::RawDataManaged * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_jvmti_Breakpoint__
diff --git a/libjava/gnu/gcj/jvmti/BreakpointManager.h b/libjava/gnu/gcj/jvmti/BreakpointManager.h
deleted file mode 100644
index d53be50d24b..00000000000
--- 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/Location.h b/libjava/gnu/gcj/jvmti/Location.h
deleted file mode 100644
index 7a00a2d2662..00000000000
--- 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/runtime/BootClassLoader.h b/libjava/gnu/gcj/runtime/BootClassLoader.h
deleted file mode 100644
index df9fcdbe43b..00000000000
--- a/libjava/gnu/gcj/runtime/BootClassLoader.h
+++ /dev/null
@@ -1,46 +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 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 *);
-  ::java::net::URL * bootGetResource(::java::lang::String *);
-  ::java::util::Enumeration * bootGetResources(::java::lang::String *);
-public: // actually package-private
-  static ::java::lang::Class * coreHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_gcj_runtime_BootClassLoader__
diff --git a/libjava/gnu/gcj/runtime/ExtensionClassLoader.h b/libjava/gnu/gcj/runtime/ExtensionClassLoader.h
deleted file mode 100644
index ee17c2d845c..00000000000
--- 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/FinalizerThread.h b/libjava/gnu/gcj/runtime/FinalizerThread.h
deleted file mode 100644
index 572f89d598d..00000000000
--- 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/HelperClassLoader$1.h b/libjava/gnu/gcj/runtime/HelperClassLoader$1.h
deleted file mode 100644
index 8b53b5afc4d..00000000000
--- 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:
-  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 30311d3f861..00000000000
--- 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/JNIWeakRef.h b/libjava/gnu/gcj/runtime/JNIWeakRef.h
deleted file mode 100644
index e23a59f6dbd..00000000000
--- 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/NameFinder$Addr2Line.h b/libjava/gnu/gcj/runtime/NameFinder$Addr2Line.h
deleted file mode 100644
index 7d5b5a34264..00000000000
--- 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 38fd98babe4..00000000000
--- 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/PersistentByteMap$AccessMode.h b/libjava/gnu/gcj/runtime/PersistentByteMap$AccessMode.h
deleted file mode 100644
index 2cd93fad80b..00000000000
--- 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 39cad37d302..00000000000
--- 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 65df6ceea3b..00000000000
--- 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 7cb8b63f0f9..00000000000
--- 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 1bac1d2c086..00000000000
--- 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/SharedLibHelper.h b/libjava/gnu/gcj/runtime/SharedLibHelper.h
deleted file mode 100644
index b2900b7e0df..00000000000
--- 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/SharedLibLoader.h b/libjava/gnu/gcj/runtime/SharedLibLoader.h
deleted file mode 100644
index 8a439d3d3d7..00000000000
--- 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/StringBuffer.h b/libjava/gnu/gcj/runtime/StringBuffer.h
deleted file mode 100644
index 27a3a7e30fb..00000000000
--- 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/SystemClassLoader.h b/libjava/gnu/gcj/runtime/SystemClassLoader.h
deleted file mode 100644
index 58c709659e8..00000000000
--- 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/tools/gcj_dbtool/Fileset.h b/libjava/gnu/gcj/tools/gcj_dbtool/Fileset.h
deleted file mode 100644
index fb9b2d69eed..00000000000
--- 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 4052bb34c00..00000000000
--- 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/Tokenizer.h b/libjava/gnu/gcj/tools/gcj_dbtool/Tokenizer.h
deleted file mode 100644
index 7c5c411bb94..00000000000
--- 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/util/Debug.h b/libjava/gnu/gcj/util/Debug.h
deleted file mode 100644
index 3ad59ef6d60..00000000000
--- 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/xlib/Clip.h b/libjava/gnu/gcj/xlib/Clip.h
deleted file mode 100644
index 3fe491b144c..00000000000
--- 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/Colormap.h b/libjava/gnu/gcj/xlib/Colormap.h
deleted file mode 100644
index 440766eb8fd..00000000000
--- 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/Display.h b/libjava/gnu/gcj/xlib/Display.h
deleted file mode 100644
index 78bc41d2d68..00000000000
--- 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/Drawable.h b/libjava/gnu/gcj/xlib/Drawable.h
deleted file mode 100644
index 213c361835d..00000000000
--- 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/Font.h b/libjava/gnu/gcj/xlib/Font.h
deleted file mode 100644
index 7cf50d36499..00000000000
--- 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/GC.h b/libjava/gnu/gcj/xlib/GC.h
deleted file mode 100644
index cb8bf391287..00000000000
--- 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/Pixmap.h b/libjava/gnu/gcj/xlib/Pixmap.h
deleted file mode 100644
index b73ee706371..00000000000
--- 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/Screen.h b/libjava/gnu/gcj/xlib/Screen.h
deleted file mode 100644
index 362c2e4827d..00000000000
--- 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/Visual.h b/libjava/gnu/gcj/xlib/Visual.h
deleted file mode 100644
index de3e25e3308..00000000000
--- 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/WMSizeHints.h b/libjava/gnu/gcj/xlib/WMSizeHints.h
deleted file mode 100644
index 2acd58c4597..00000000000
--- 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/Window.h b/libjava/gnu/gcj/xlib/Window.h
deleted file mode 100644
index 03ece8aeb83..00000000000
--- 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/WindowAttributes.h b/libjava/gnu/gcj/xlib/WindowAttributes.h
deleted file mode 100644
index 6c533033d77..00000000000
--- 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/XAnyEvent.h b/libjava/gnu/gcj/xlib/XAnyEvent.h
deleted file mode 100644
index 9a7096e3521..00000000000
--- 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/XButtonEvent.h b/libjava/gnu/gcj/xlib/XButtonEvent.h
deleted file mode 100644
index 7b482c44f16..00000000000
--- 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/XColor.h b/libjava/gnu/gcj/xlib/XColor.h
deleted file mode 100644
index fa2ea695837..00000000000
--- 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/XConfigureEvent.h b/libjava/gnu/gcj/xlib/XConfigureEvent.h
deleted file mode 100644
index cbc402d6c44..00000000000
--- 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/XConnectException.h b/libjava/gnu/gcj/xlib/XConnectException.h
deleted file mode 100644
index a234ec90ed0..00000000000
--- 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/XEvent.h b/libjava/gnu/gcj/xlib/XEvent.h
deleted file mode 100644
index d74a31c3ec7..00000000000
--- 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/XException.h b/libjava/gnu/gcj/xlib/XException.h
deleted file mode 100644
index de1eff0f47a..00000000000
--- 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/XExposeEvent.h b/libjava/gnu/gcj/xlib/XExposeEvent.h
deleted file mode 100644
index ac8715bd6c7..00000000000
--- 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/XID.h b/libjava/gnu/gcj/xlib/XID.h
deleted file mode 100644
index d216df65e76..00000000000
--- 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/XImage.h b/libjava/gnu/gcj/xlib/XImage.h
deleted file mode 100644
index 679c60de6b3..00000000000
--- 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/XUnmapEvent.h b/libjava/gnu/gcj/xlib/XUnmapEvent.h
deleted file mode 100644
index a4269525956..00000000000
--- 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/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.h b/libjava/gnu/java/awt/AWTUtilities$VisibleComponentList$VisibleComponentIterator.h
deleted file mode 100644
index 27344b59b04..00000000000
--- 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 53a5eb34024..00000000000
--- 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 36db9855831..00000000000
--- a/libjava/gnu/java/awt/AWTUtilities.h
+++ /dev/null
@@ -1,71 +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();
-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 5d3fd637277..00000000000
--- 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 d67d1409df4..00000000000
--- 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 25d67e74a19..00000000000
--- 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 2dd89d6e5a4..00000000000
--- 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 9456b130e36..00000000000
--- 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/ClasspathToolkit.h b/libjava/gnu/java/awt/ClasspathToolkit.h
deleted file mode 100644
index f3acd663871..00000000000
--- a/libjava/gnu/java/awt/ClasspathToolkit.h
+++ /dev/null
@@ -1,69 +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 Font;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-      namespace peer
-      {
-          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();
-  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 0db1e05798f..00000000000
--- 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 bfd6f830927..00000000000
--- 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 5a251bfd3e9..00000000000
--- 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 b6c21935f46..00000000000
--- 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 a3aacbb6a07..00000000000
--- 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 edec5345dfd..00000000000
--- 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 95419637f33..00000000000
--- 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 0b8ba5c8e14..00000000000
--- 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 b61fc84f505..00000000000
--- 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 cc3b19ff47f..00000000000
--- 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 b79d2b743a1..00000000000
--- 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 bcd8d26066c..00000000000
--- 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 bff63b79115..00000000000
--- 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 744dc78298e..00000000000
--- 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 ef9caebca8f..00000000000
--- 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 2998894b1c6..00000000000
--- 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 2debe680450..00000000000
--- 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 a464b32e6e1..00000000000
--- 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 7c0edecb4a6..00000000000
--- 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 13cf4aacee0..00000000000
--- 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 a53f91664d7..00000000000
--- 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 2ddfeb536be..00000000000
--- 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 a5797f2522e..00000000000
--- 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 202529b547a..00000000000
--- a/libjava/gnu/java/awt/font/FontDelegate.h
+++ /dev/null
@@ -1,68 +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 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) = 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 ::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 660ca220962..00000000000
--- 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 4d47e2addc2..00000000000
--- a/libjava/gnu/java/awt/font/GNUGlyphVector.h
+++ /dev/null
@@ -1,98 +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 * getGlyphOutline(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;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_GNUGlyphVector__
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 29dad47f239..00000000000
--- a/libjava/gnu/java/awt/font/autofit/AxisHints.h
+++ /dev/null
@@ -1,43 +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 Segment;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::AxisHints : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AxisHints();
-  JArray< ::gnu::java::awt::font::autofit::Segment * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) segments;
-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 ae103683e0d..00000000000
--- a/libjava/gnu/java/awt/font/autofit/Constants.h
+++ /dev/null
@@ -1,40 +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 ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_java_awt_font_autofit_Constants__
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 6a878d56c81..00000000000
--- a/libjava/gnu/java/awt/font/autofit/GlyphHints.h
+++ /dev/null
@@ -1,59 +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 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 *);
-  virtual void computeSegments(jint);
-  virtual void linkSegments(jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xScale;
-  jint xDelta;
-  jint yScale;
-  jint yDelta;
-  JArray< ::gnu::java::awt::font::autofit::AxisHints * > * axis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_GlyphHints__
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 af4c300d943..00000000000
--- a/libjava/gnu/java/awt/font/autofit/Latin.h
+++ /dev/null
@@ -1,59 +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>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class GlyphHints;
-              class Latin;
-              class LatinMetrics;
-              class ScriptMetrics;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-          }
-        }
-      }
-    }
-  }
-}
-
-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::autofit::ScriptMetrics *);
-  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 *);
-private:
-  void initWidths(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *, jchar);
-  void initBlues(::gnu::java::awt::font::autofit::LatinMetrics *, ::gnu::java::awt::font::opentype::OpenTypeFont *);
-  jint constant(::gnu::java::awt::font::autofit::LatinMetrics *, jint);
-  static const jint MAX_WIDTHS = 16;
-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 631cd794a57..00000000000
--- a/libjava/gnu/java/awt/font/autofit/LatinAxis.h
+++ /dev/null
@@ -1,47 +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 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;
-  jfloat edgeDistanceTreshold;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_LatinAxis__
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 a7a12fd4c7e..00000000000
--- a/libjava/gnu/java/awt/font/autofit/LatinMetrics.h
+++ /dev/null
@@ -1,44 +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;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::LatinMetrics : public ::gnu::java::awt::font::autofit::ScriptMetrics
-{
-
-public: // actually package-private
-  LatinMetrics();
-  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/Scaler.h b/libjava/gnu/java/awt/font/autofit/Scaler.h
deleted file mode 100644
index ffebc5a30dd..00000000000
--- a/libjava/gnu/java/awt/font/autofit/Scaler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_font_autofit_Scaler__
-#define __gnu_java_awt_font_autofit_Scaler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace font
-        {
-          namespace autofit
-          {
-              class Scaler;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Scaler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Scaler();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xScale;
-  jint xDelta;
-  jint yScale;
-  jint yDelta;
-  ::gnu::java::awt::font::opentype::OpenTypeFont * face;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Scaler__
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 5a722896a80..00000000000
--- a/libjava/gnu/java/awt/font/autofit/Script.h
+++ /dev/null
@@ -1,48 +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 Script;
-              class ScriptMetrics;
-          }
-          namespace opentype
-          {
-              class OpenTypeFont;
-          }
-        }
-      }
-    }
-  }
-}
-
-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 *) = 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::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 79ab128b5a5..00000000000
--- 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 Scaler;
-              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::Scaler * 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 4b2adef67b0..00000000000
--- a/libjava/gnu/java/awt/font/autofit/Segment.h
+++ /dev/null
@@ -1,42 +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 Segment;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::font::autofit::Segment : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Segment();
-  ::gnu::java::awt::font::autofit::Segment * __attribute__((aligned(__alignof__( ::java::lang::Object)))) link;
-  jint index;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_font_autofit_Segment__
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 23d21fe07c5..00000000000
--- a/libjava/gnu/java/awt/font/autofit/Width.h
+++ /dev/null
@@ -1,43 +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:
-  Width();
-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 a5f784d7a7c..00000000000
--- 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 0b5a45f9d99..00000000000
--- 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 d1250fcbe8b..00000000000
--- 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 30092003607..00000000000
--- 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 d5baafb7231..00000000000
--- 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 55e47902f4d..00000000000
--- 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/MacResourceFork$Resource.h b/libjava/gnu/java/awt/font/opentype/MacResourceFork$Resource.h
deleted file mode 100644
index d6ba8363450..00000000000
--- 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 76ad0a65353..00000000000
--- 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 a33ffa3ed6a..00000000000
--- 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 149337c4c8a..00000000000
--- a/libjava/gnu/java/awt/font/opentype/OpenTypeFont.h
+++ /dev/null
@@ -1,122 +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 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 *);
-  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);
-  ::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);
-  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;
-  ::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 d3562506d32..00000000000
--- 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 a9118288ba2..00000000000
--- a/libjava/gnu/java/awt/font/opentype/Scaler.h
+++ /dev/null
@@ -1,59 +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 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) = 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 e93546aca72..00000000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/Fixed.h
+++ /dev/null
@@ -1,54 +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 div(jint, jint);
-  static jint ceil(jint);
-  static jint floor(jint);
-  static jint vectorLength(jint, jint);
-  static jint intValue(jint);
-  static jfloat floatValue(jint);
-  static jdouble doubleValue(jint);
-  static jint valueOf(jfloat);
-  static jint valueOf(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 2b0dd072428..00000000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/GlyphLoader.h
+++ /dev/null
@@ -1,91 +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
-          {
-            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 *);
-  void loadGlyph(jint, ::java::awt::geom::AffineTransform *, ::gnu::java::awt::font::opentype::truetype::Zone *);
-private:
-  void loadSubGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint);
-  void loadSimpleGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, jint, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint);
-  void loadCompoundGlyph(jint, jdouble, ::java::awt::geom::AffineTransform *, jboolean, ::java::nio::ByteBuffer *, ::gnu::java::awt::font::opentype::truetype::Zone *, jint, jint);
-  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 1e06f695361..00000000000
--- 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 7489c5e4e91..00000000000
--- 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 aa93b65be1f..00000000000
--- 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 558584d4f98..00000000000
--- 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/TrueTypeScaler.h b/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h
deleted file mode 100644
index 77ae20fb3ad..00000000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.h
+++ /dev/null
@@ -1,75 +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
-          {
-            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::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 6193a6d4c93..00000000000
--- 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 b3ff4f05959..00000000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/Zone.h
+++ /dev/null
@@ -1,88 +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 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);
-  void setX(jint, jint, jboolean);
-  void setY(jint, jint, jboolean);
-  jint getY(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();
-  ::java::awt::geom::GeneralPath * getPath();
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pos;
-  JArray< jint > * origPos;
-  JArray< jbyte > * flags;
-  jint numPoints;
-  static const jint FLAG_TOUCHED_X = 1;
-  static const jint FLAG_TOUCHED_Y = 2;
-  static const jint FLAG_ON_CURVE = 4;
-  static const jint FLAG_CONTOUR_END = 8;
-public:
-  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 fe610037981..00000000000
--- a/libjava/gnu/java/awt/font/opentype/truetype/ZonePathIterator.h
+++ /dev/null
@@ -1,67 +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 *);
-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;
-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/ImageDecoder$DataInputStreamWrapper.h b/libjava/gnu/java/awt/image/ImageDecoder$DataInputStreamWrapper.h
deleted file mode 100644
index 611ead3b16e..00000000000
--- 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 69af2a54eb2..00000000000
--- 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 0d33850d1eb..00000000000
--- 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 b8933b32db9..00000000000
--- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
+++ /dev/null
@@ -1,214 +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 ShapeCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        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;
-          class Rectangle2D;
-      }
-      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();
-  virtual void rawDrawLine(jint, jint, jint, jint);
-  virtual void rawDrawRect(jint, jint, jint, jint);
-  virtual void rawDrawString(::java::lang::String *, 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);
-  void fillShapeImpl(::java::util::ArrayList *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
-public: // actually protected
-  virtual void fillScanline(::java::awt::PaintContext *, jint, jint, jint);
-private:
-  void fillShapeAntialias(::java::util::ArrayList *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
-  void fillScanlineAA(JArray< jint > *, jint, jint, jint, ::java::awt::PaintContext *, jint);
-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 *);
-  ::java::util::ArrayList * getSegments(::java::awt::Shape *, ::java::awt::geom::AffineTransform *, ::java::awt::geom::Rectangle2D *, jboolean);
-  ::gnu::java::awt::java2d::ShapeCache * getShapeCache();
-  static const jint AA_SAMPLING = 8;
-  static ::java::lang::ThreadLocal * shapeCache;
-public: // actually protected
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) transform__;
-private:
-  ::java::awt::Paint * paint;
-  ::java::awt::Color * background;
-  ::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;
-  JArray< jint > * alpha;
-  JArray< ::java::util::ArrayList * > * edgeTable;
-  jboolean isOptimized;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_AbstractGraphics2D__
diff --git a/libjava/gnu/java/awt/java2d/AlphaCompositeContext.h b/libjava/gnu/java/awt/java2d/AlphaCompositeContext.h
deleted file mode 100644
index 9c591a4d9c8..00000000000
--- 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 c7ef3b29cbc..00000000000
--- 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 b0a1d087d8a..00000000000
--- 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 e9e2ea2519d..00000000000
--- 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 50f51e04bf3..00000000000
--- 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/PolyEdge.h b/libjava/gnu/java/awt/java2d/PolyEdge.h
deleted file mode 100644
index 6698599d6ac..00000000000
--- a/libjava/gnu/java/awt/java2d/PolyEdge.h
+++ /dev/null
@@ -1,47 +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(jdouble, jdouble, jdouble, jdouble, jboolean);
-public:
-  virtual jint compareTo(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) x0;
-  jdouble y0;
-  jdouble x1;
-  jdouble y1;
-public: // actually package-private
-  jdouble slope;
-  jdouble xIntersection;
-  jboolean isClip;
-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 b27bdaf906f..00000000000
--- 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 10752415374..00000000000
--- 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 41ab8d7dceb..00000000000
--- a/libjava/gnu/java/awt/java2d/RasterGraphics.h
+++ /dev/null
@@ -1,56 +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;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfiguration;
-      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 *);
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::WritableRaster * getDestinationRaster();
-public:
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
-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/Segment.h b/libjava/gnu/java/awt/java2d/Segment.h
deleted file mode 100644
index 3e771bbbc32..00000000000
--- 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 ac7f3dacdba..00000000000
--- a/libjava/gnu/java/awt/java2d/ShapeCache.h
+++ /dev/null
@@ -1,56 +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 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;
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_java2d_ShapeCache__
diff --git a/libjava/gnu/java/awt/java2d/TexturePaintContext.h b/libjava/gnu/java/awt/java2d/TexturePaintContext.h
deleted file mode 100644
index 5074e62c16c..00000000000
--- 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/ClasspathFontPeer.h b/libjava/gnu/java/awt/peer/ClasspathFontPeer.h
deleted file mode 100644
index 80a09c17b90..00000000000
--- a/libjava/gnu/java/awt/peer/ClasspathFontPeer.h
+++ /dev/null
@@ -1,123 +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;
-        }
-      }
-    }
-  }
-  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 *, jchar) = 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;
-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 53715c43b5a..00000000000
--- a/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.h
+++ /dev/null
@@ -1,146 +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 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;
-      }
-    }
-  }
-}
-
-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 void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 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;
-  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 d9e6e58e6b1..00000000000
--- a/libjava/gnu/java/awt/peer/GLightweightPeer.h
+++ /dev/null
@@ -1,133 +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;
-      }
-    }
-  }
-}
-
-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();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_GLightweightPeer__
diff --git a/libjava/gnu/java/awt/peer/NativeEventLoopRunningEvent.h b/libjava/gnu/java/awt/peer/NativeEventLoopRunningEvent.h
deleted file mode 100644
index 48a10a74b2f..00000000000
--- 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 aa276f4e655..00000000000
--- 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 86bfeae7a1b..00000000000
--- 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 d1735ea4c4b..00000000000
--- 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 ef29b9b8060..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/BufferedImageGraphics.h
+++ /dev/null
@@ -1,104 +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;
-  jboolean locked;
-  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 a20f47212dd..00000000000
--- 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 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();
-private:
-  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);
-private:
-  void drawPixels(jlong, JArray< jint > *, jint, jint, jint, JArray< jdouble > *, jdouble, jint);
-  void setGradient(jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-  void setPaintPixels(jlong, JArray< jint > *, jint, jint, jint, jboolean, jint, jint);
-  void cairoSetMatrix(jlong, JArray< jdouble > *);
-  void cairoScale(jlong, jdouble, jdouble);
-  void cairoSetOperator(jlong, jint);
-  void cairoSetRGBAColor(jlong, jdouble, jdouble, jdouble, jdouble);
-  void cairoSetFillRule(jlong, jint);
-  void cairoSetLine(jlong, jdouble, jint, jint, jdouble);
-  void cairoSetDash(jlong, JArray< jdouble > *, jint, jdouble);
-public: // actually package-private
-  virtual void cairoDrawGlyphVector(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *, jfloat, jfloat, jint, JArray< jint > *, JArray< jfloat > *);
-private:
-  void cairoSetFont(jlong, ::gnu::java::awt::peer::gtk::GdkFontPeer *);
-  void cairoRelCurveTo(jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  void cairoRectangle(jlong, jdouble, jdouble, jdouble, jdouble);
-  void cairoArc(jlong, jdouble, jdouble, jdouble, jdouble, jdouble);
-  void cairoSave(jlong);
-  void cairoRestore(jlong);
-  void cairoNewPath(jlong);
-  void cairoClosePath(jlong);
-  void cairoMoveTo(jlong, jdouble, jdouble);
-  void cairoRelMoveTo(jlong, jdouble, jdouble);
-  void cairoLineTo(jlong, jdouble, jdouble);
-  void cairoRelLineTo(jlong, jdouble, jdouble);
-  void cairoCurveTo(jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  void cairoStroke(jlong);
-  void cairoFill(jlong, jdouble);
-  void cairoClip(jlong);
-  void cairoPreserveClip(jlong);
-  void cairoResetClip(jlong);
-  void cairoDrawLine(jlong, jdouble, jdouble, jdouble, jdouble);
-  void cairoDrawRect(jlong, jdouble, jdouble, jdouble, jdouble);
-  void cairoFillRect(jlong, jdouble, jdouble, jdouble, jdouble);
-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();
-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 *);
-  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
-  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;
-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$CairoDataBuffer.h b/libjava/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.h
deleted file mode 100644
index 3373a83bdbd..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/CairoSurface$CairoDataBuffer.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_CairoSurface$CairoDataBuffer__
-#define __gnu_java_awt_peer_gtk_CairoSurface$CairoDataBuffer__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class CairoSurface;
-              class CairoSurface$CairoDataBuffer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::CairoSurface$CairoDataBuffer : public ::java::awt::image::DataBuffer
-{
-
-public:
-  CairoSurface$CairoDataBuffer(::gnu::java::awt::peer::gtk::CairoSurface *);
-  virtual jint getElem(jint, jint);
-  virtual void setElem(jint, jint, jint);
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::CairoSurface * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_CairoSurface$CairoDataBuffer__
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 bc33bdb6391..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
+++ /dev/null
@@ -1,104 +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;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::CairoSurface : public ::java::awt::image::WritableRaster
-{
-
-  void create(jint, jint, jint);
-  void destroy(jlong, jlong);
-  jint nativeGetElem(jlong, jint);
-  void nativeSetElem(jlong, jint, jint);
-public:
-  virtual void nativeDrawSurface(jlong, jlong, JArray< jdouble > *, jdouble, jint);
-  virtual void drawSurface(jlong, JArray< jdouble > *, jdouble, jint);
-public: // actually package-private
-  virtual JArray< jint > * nativeGetPixels(jlong, jint);
-public:
-  virtual JArray< jint > * getPixels(jint);
-public: // actually package-private
-  virtual void nativeSetPixels(jlong, JArray< jint > *);
-public:
-  virtual void setPixels(JArray< jint > *);
-public: // actually package-private
-  virtual jlong getFlippedBuffer(jlong, jint);
-public:
-  CairoSurface(jint, jint);
-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();
-  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();
-public: // actually package-private
-  virtual void copyAreaNative2(jlong, jint, jint, jint, jint, jint, jint, jint);
-public:
-  virtual void copyAreaNative(jint, jint, jint, jint, jint, jint, jint);
-public: // actually protected
-  static ::java::awt::image::SampleModel * createCairoSampleModel(jint, jint);
-public: // actually package-private
-  static jint access$0(::gnu::java::awt::peer::gtk::CairoSurface *, jlong, jint);
-  static void access$1(::gnu::java::awt::peer::gtk::CairoSurface *, jlong, jint, jint);
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::WritableRaster)))) width;
-  jint height;
-  jlong surfacePointer;
-  jlong bufferPointer;
-  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 938da7be0a7..00000000000
--- 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 fbc87a85658..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
+++ /dev/null
@@ -1,128 +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>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-        class Pointer;
-    }
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              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:
-  virtual void dispose();
-private:
-  void disposeSurface(jlong);
-public: // actually protected
-  virtual jlong initFromVolatile(jlong, jint, jint);
-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 *);
-  virtual void setClip(::java::awt::Shape *);
-private:
-  jboolean drawComposite(::java::awt::geom::Rectangle2D *, ::java::awt::image::ImageObserver *);
-  void createBuffer();
-public: // actually protected
-  virtual ::java::awt::image::ColorModel * getNativeCM();
-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 7ba10f86f07..00000000000
--- 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 312e69c0076..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
+++ /dev/null
@@ -1,110 +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
-{
-
-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 *);
-  void getGlyphs();
-public:
-  virtual JArray< jint > * getGlyphs(JArray< jint > *);
-private:
-  ::java::awt::geom::Point2D * getKerning(jint, jint);
-  JArray< jdouble > * getMetricsNative(jint);
-  ::java::awt::geom::GeneralPath * getGlyphOutlineNative(jint);
-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 > *);
-  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);
-  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< ::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/GThreadMutex.h b/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h
deleted file mode 100644
index 9380a5dda27..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GThreadMutex__
-#define __gnu_java_awt_peer_gtk_GThreadMutex__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GThreadMutex;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GThreadMutex : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GThreadMutex();
-  volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) potentialLockers;
-  ::java::lang::Object * lockForPotentialLockers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GThreadMutex__
diff --git a/libjava/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.h b/libjava/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.h
deleted file mode 100644
index 803f173cf77..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__
-#define __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GThreadNativeMethodRunner;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GThreadNativeMethodRunner : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  GThreadNativeMethodRunner(jlong, jlong, jboolean);
-public:
-  virtual void run();
-private:
-  void nativeRun(jlong, jlong);
-  static jint registerThread(::java::lang::Thread *);
-public: // actually package-private
-  static jint threadToThreadID(::java::lang::Thread *);
-  static ::java::lang::Thread * threadIDToThread(jint);
-private:
-  void registerSelfJoinable();
-public: // actually package-private
-  static void deRegisterJoinable(::java::lang::Thread *);
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Thread)))) funcPtr;
-  jlong funcArg;
-  static JArray< ::java::lang::ref::WeakReference * > * threads;
-  static ::java::util::Set * joinable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.h b/libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.h
deleted file mode 100644
index 65ca7a2dea3..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GdkFontMetrics__
-#define __gnu_java_awt_peer_gtk_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 GdkFontMetrics;
-              class GdkFontPeer;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkFontMetrics : public ::java::awt::FontMetrics
-{
-
-  static ::java::awt::Font * initFont(::java::awt::Font *);
-public:
-  GdkFontMetrics(::java::awt::Font *);
-  virtual jint stringWidth(::java::lang::String *);
-  virtual jint charWidth(jchar);
-  virtual jint charsWidth(JArray< jchar > *, jint, jint);
-  virtual jint getLeading();
-  virtual jint getAscent();
-  virtual jint getMaxAscent();
-  virtual jint getDescent();
-  virtual jint getMaxDescent();
-  virtual jint getMaxAdvance();
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) font_metrics;
-public: // actually package-private
-  ::gnu::java::awt::peer::gtk::GdkFontPeer * peer;
-  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 TEXT_METRICS_X_BEARING = 0;
-  static const jint TEXT_METRICS_Y_BEARING = 1;
-  static const jint TEXT_METRICS_WIDTH = 2;
-  static const jint TEXT_METRICS_HEIGHT = 3;
-  static const jint TEXT_METRICS_X_ADVANCE = 4;
-  static const jint TEXT_METRICS_Y_ADVANCE = 5;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GdkFontMetrics__
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 508a37d8d04..00000000000
--- 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 0c9961ba311..00000000000
--- 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 903210aca3a..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
+++ /dev/null
@@ -1,142 +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 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 *, jchar);
-  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::lang::Object *);
-  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;
-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 d36580f0f58..00000000000
--- 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 8249a1e9a3e..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
+++ /dev/null
@@ -1,82 +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 <java/awt/GraphicsEnvironment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GdkGraphicsEnvironment;
-              class GdkScreenGraphicsDevice;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class GraphicsDevice;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GdkGraphicsEnvironment : public ::java::awt::GraphicsEnvironment
-{
-
-public: // actually package-private
-  static void initStaticState();
-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();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::GraphicsEnvironment)))) native_state;
-  ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * defaultDevice;
-  JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * > * devices;
-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 197639f331e..00000000000
--- 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 11816710361..00000000000
--- 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 d88b2ae8a86..00000000000
--- 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 d8ac5af3bfd..00000000000
--- 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 03316f5395e..00000000000
--- 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 8f7066551cb..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h
+++ /dev/null
@@ -1,108 +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 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;
-  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 d961df32f29..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h
+++ /dev/null
@@ -1,69 +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 *);
-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 5c27e4c255a..00000000000
--- 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 30c165f6e7e..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h
+++ /dev/null
@@ -1,97 +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 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 initStaticState();
-  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;
-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 6abd2674147..00000000000
--- 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 3808c2faebe..00000000000
--- 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 2a2f4559ca7..00000000000
--- 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 e97d21f9d63..00000000000
--- 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 632fb406335..00000000000
--- 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 24b275a7848..00000000000
--- 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 59d04d0f849..00000000000
--- 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 c556b525095..00000000000
--- 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 d29f0366f40..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
+++ /dev/null
@@ -1,198 +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;
-      }
-    }
-  }
-}
-
-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 gtkWidgetGetLocationOnScreen(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();
-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 6097fc88c7c..00000000000
--- 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 c0e63758557..00000000000
--- 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 d143f4775ad..00000000000
--- 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 6dea24e1715..00000000000
--- 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 7bf3529ce37..00000000000
--- 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 c136fa917ca..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h
+++ /dev/null
@@ -1,90 +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();
-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 6c9c87dc1ef..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h
+++ /dev/null
@@ -1,64 +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 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
-{
-
-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;
-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 4028d93f57d..00000000000
--- 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 aeccd061da2..00000000000
--- 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 c80c6f47a13..00000000000
--- 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 8d8a7a0ac37..00000000000
--- 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 159ec7838c2..00000000000
--- 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 916d6dd93ea..00000000000
--- 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 500f5a94d3f..00000000000
--- 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 e84841cc3df..00000000000
--- 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 1d1f84a90e8..00000000000
--- 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 8edc663497e..00000000000
--- 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 b4349ee5d06..00000000000
--- 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 f62b014d77c..00000000000
--- 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 051fd8334cb..00000000000
--- 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 3557d624a07..00000000000
--- 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 5ed45d00c91..00000000000
--- 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 5d4b14ee5e7..00000000000
--- 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 ddcf366aaa5..00000000000
--- 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$1.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit$1.h
deleted file mode 100644
index 94bac6c75cc..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_awt_peer_gtk_GtkToolkit$1__
-#define __gnu_java_awt_peer_gtk_GtkToolkit$1__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace gtk
-          {
-              class GtkToolkit$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::awt::peer::gtk::GtkToolkit$1 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  GtkToolkit$1(::java::lang::String *);
-public:
-  void run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_awt_peer_gtk_GtkToolkit$1__
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 c8d404bd4f2..00000000000
--- 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 e02c3b6a9ed..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
+++ /dev/null
@@ -1,235 +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 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);
-  static void gtkMain();
-  static void gtkQuit();
-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 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();
-private:
-  static ::java::awt::EventQueue * q;
-  ::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 308bc8e7df9..00000000000
--- 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 da0c32556ae..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h
+++ /dev/null
@@ -1,125 +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 Graphics;
-        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::Rectangle * getBounds();
-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 b7f0121d95a..00000000000
--- 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 fc1b98df6b7..00000000000
--- 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 d7a72173ef2..00000000000
--- a/libjava/gnu/java/awt/peer/headless/HeadlessToolkit.h
+++ /dev/null
@@ -1,188 +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 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();
-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 9d3b746356a..00000000000
--- 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 0bf62e0d3de..00000000000
--- 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 7ff6bfbcafe..00000000000
--- 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 ffc104ea67e..00000000000
--- 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 973e24c313f..00000000000
--- 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 4e74b63a6e6..00000000000
--- 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 5476a04ba60..00000000000
--- 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 1d8be8c36a6..00000000000
--- 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 f90ce36e341..00000000000
--- 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 46a12c255e6..00000000000
--- 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 733247abfec..00000000000
--- 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 90f962941d8..00000000000
--- 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 f596e809c2a..00000000000
--- a/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h
+++ /dev/null
@@ -1,189 +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;
-      }
-    }
-  }
-}
-
-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();
-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 f9e60b3cc4d..00000000000
--- 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 483aa8e51c2..00000000000
--- 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 5ee942d6f71..00000000000
--- 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 a87e72f1b6b..00000000000
--- 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 a0655f2111f..00000000000
--- 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(jchar);
-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 11ca6ccf6c6..00000000000
--- 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 *, jchar);
-  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 1b0f39e68d5..00000000000
--- a/libjava/gnu/java/awt/peer/qt/QtFramePeer.h
+++ /dev/null
@@ -1,77 +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();
-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 710248b0a44..00000000000
--- 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 ec1e0c8a2ee..00000000000
--- 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 4c921b22881..00000000000
--- 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 8c929d4f671..00000000000
--- 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 d74e3244474..00000000000
--- 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 e5adb79123d..00000000000
--- 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 af81168b4ea..00000000000
--- 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 0d4fbee97e4..00000000000
--- 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 57e6d546eec..00000000000
--- 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 3cab6458952..00000000000
--- 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 10eee1aa20c..00000000000
--- 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 79341a4fe2b..00000000000
--- 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 c0031ef50da..00000000000
--- 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 3b78bc97737..00000000000
--- 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 9cc516cda3e..00000000000
--- 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 e9d714cb68d..00000000000
--- 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 179fa09bf67..00000000000
--- 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 f9ec9e028cf..00000000000
--- 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 23877b3b51e..00000000000
--- 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 3e13597639f..00000000000
--- 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 42ee905580e..00000000000
--- 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 123d95bb220..00000000000
--- 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 471794be6c9..00000000000
--- a/libjava/gnu/java/awt/peer/qt/QtToolkit.h
+++ /dev/null
@@ -1,203 +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 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 *);
-  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 849b3b37fd4..00000000000
--- 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:
-  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 4972e9faad6..00000000000
--- 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 e451e3c6027..00000000000
--- a/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h
+++ /dev/null
@@ -1,55 +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 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();
-  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 1bc372511eb..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingButtonPeer$SwingButton.h
+++ /dev/null
@@ -1,76 +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 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();
-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 c6a6f9a0f13..00000000000
--- 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 cca199f8944..00000000000
--- 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 1fd853bb820..00000000000
--- 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/SwingComponent.h b/libjava/gnu/java/awt/peer/swing/SwingComponent.h
deleted file mode 100644
index b9777c2b13f..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingComponent.h
+++ /dev/null
@@ -1,59 +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 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;
-  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 af2d715d6b6..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingComponentPeer.h
+++ /dev/null
@@ -1,146 +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 KeyEvent;
-          class MouseEvent;
-          class PaintEvent;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-      }
-    }
-  }
-}
-
-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 *);
-public:
-  virtual ::java::awt::Component * getComponent();
-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 40d783975bb..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingContainerPeer.h
+++ /dev/null
@@ -1,83 +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>
-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 package-private
-  virtual void addHeavyweightDescendent(::java::awt::Component *);
-  virtual void removeHeavyweightDescendent(::java::awt::Component *);
-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 2822fccb36f..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingFramePeer.h
+++ /dev/null
@@ -1,77 +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;
-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 bc9eb617f78..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingLabelPeer$SwingLabel.h
+++ /dev/null
@@ -1,76 +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 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 ::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 a400853f722..00000000000
--- 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 507e1e942b9..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingListPeer$SwingList.h
+++ /dev/null
@@ -1,76 +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 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 ::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 fa6fde62453..00000000000
--- 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 4ab74e8a19c..00000000000
--- 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 35794766916..00000000000
--- 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 1aa993ba706..00000000000
--- 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 f79e2d27fcf..00000000000
--- 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 1de2beecc1c..00000000000
--- 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 988b481392c..00000000000
--- 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 3b9f61b8a94..00000000000
--- 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$SwingTextArea.h b/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h
deleted file mode 100644
index 6b283b69ef0..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer$SwingTextArea.h
+++ /dev/null
@@ -1,76 +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/JScrollPane.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-          namespace swing
-          {
-              class SwingTextAreaPeer;
-              class SwingTextAreaPeer$SwingTextArea;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingTextAreaPeer$SwingTextArea : public ::javax::swing::JScrollPane
-{
-
-public: // actually package-private
-  SwingTextAreaPeer$SwingTextArea(::gnu::java::awt::peer::swing::SwingTextAreaPeer *, ::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 ::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::SwingTextAreaPeer * __attribute__((aligned(__alignof__( ::javax::swing::JScrollPane)))) 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 a9d4b8f60f8..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextAreaPeer.h
+++ /dev/null
@@ -1,81 +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;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-        class TextArea;
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTextArea;
-    }
-  }
-}
-
-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(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 *);
-private:
-  ::javax::swing::JTextArea * __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 08ac1387f7f..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingTextFieldPeer$SwingTextField.h
+++ /dev/null
@@ -1,76 +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 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 ::java::awt::Container * getParent();
-  virtual ::java::awt::Graphics * getGraphics();
-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 43d26d5b3a2..00000000000
--- 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 c84bfe992c5..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingToolkit.h
+++ /dev/null
@@ -1,73 +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 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:
-  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 ce4e987158b..00000000000
--- a/libjava/gnu/java/awt/peer/swing/SwingWindowPeer.h
+++ /dev/null
@@ -1,49 +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 Window;
-    }
-  }
-}
-
-class gnu::java::awt::peer::swing::SwingWindowPeer : public ::gnu::java::awt::peer::swing::SwingContainerPeer
-{
-
-public:
-  SwingWindowPeer(::java::awt::Window *);
-  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 7809034719b..00000000000
--- 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 6275b13e49b..00000000000
--- 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 46011044ad2..00000000000
--- 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 a49bb14c144..00000000000
--- 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 0e1fe163e8c..00000000000
--- 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 1815fe8f19b..00000000000
--- 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 c20d5689cfe..00000000000
--- 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 095f50d476c..00000000000
--- 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 10ee9ffcd20..00000000000
--- 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 3fd0873958c..00000000000
--- 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 b9f11c393fb..00000000000
--- 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 9b3f03c2ffd..00000000000
--- 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 77f96ba47d5..00000000000
--- 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 e0abc31ed00..00000000000
--- 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 db4bee7a0d6..00000000000
--- 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 4184ed09be9..00000000000
--- 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 eeacde937bf..00000000000
--- 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 62f76f39cc4..00000000000
--- 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 575bac03f3a..00000000000
--- 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 ef77b6b77d6..00000000000
--- 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 dfd1b455a40..00000000000
--- 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 7c8ea8844aa..00000000000
--- 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 187d7408693..00000000000
--- 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 fa23e802937..00000000000
--- 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 f1b70ef5d5b..00000000000
--- 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 580b936a974..00000000000
--- 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 d8839a618ad..00000000000
--- 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 29ca81bad9f..00000000000
--- 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 75df22500cb..00000000000
--- 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 9045ec51e1b..00000000000
--- 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 e6b4a79b4e3..00000000000
--- 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 b4c3855be23..00000000000
--- 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 181020628b8..00000000000
--- 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 d79c9f54436..00000000000
--- 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 ca846310bb3..00000000000
--- 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 7039130960f..00000000000
--- 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 02e8736af84..00000000000
--- 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 9e76755e359..00000000000
--- 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 7e654036f05..00000000000
--- 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 68898f25058..00000000000
--- 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 50cecb45177..00000000000
--- 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 d877d9cd73a..00000000000
--- 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 d3ef830f6e0..00000000000
--- 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 86438880146..00000000000
--- 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 38cde4cc9e5..00000000000
--- 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 69af77b1fce..00000000000
--- 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 c78f28fab16..00000000000
--- 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 e11e994d6c9..00000000000
--- 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 a3893aef3f1..00000000000
--- 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 69e03507f41..00000000000
--- 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 7081871c6db..00000000000
--- 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 1db11b4c47c..00000000000
--- 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 4adfc87e5d6..00000000000
--- 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 f217dc46c62..00000000000
--- 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 5c9ec802af4..00000000000
--- 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 9b696b4ec3e..00000000000
--- 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 eb4017ac1a1..00000000000
--- 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 cb335b39162..00000000000
--- 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 0d5039ad233..00000000000
--- 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 189b6c8e944..00000000000
--- 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 098d8e839a3..00000000000
--- 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 9c59db0807b..00000000000
--- 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 264d0c063fd..00000000000
--- 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 73322634c0b..00000000000
--- 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 da93ed5f667..00000000000
--- 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 7921525df2a..00000000000
--- 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 38dd6fe8c02..00000000000
--- 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 d37c220c8a4..00000000000
--- 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 6d30d762f67..00000000000
--- 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 eddb16c3be5..00000000000
--- 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 daf81c5bf6f..00000000000
--- 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 3329ed709ac..00000000000
--- 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 48065824919..00000000000
--- 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 489b404b051..00000000000
--- 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 4ca1df820cb..00000000000
--- 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 99bd9dfb1c8..00000000000
--- 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 420376f3edf..00000000000
--- 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 75e54adc407..00000000000
--- 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 ef44b5c6a48..00000000000
--- 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 0c99d67b6b1..00000000000
--- 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 7447c77ce7a..00000000000
--- 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 7102811bc8f..00000000000
--- 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 b613cedba59..00000000000
--- 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 b25191fe1f6..00000000000
--- 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 08f587b87ff..00000000000
--- 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 7d5b52d3766..00000000000
--- 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 77caf12325d..00000000000
--- 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 06298b0d779..00000000000
--- 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 21ac47d5876..00000000000
--- 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 aaf8ab1189b..00000000000
--- 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 73a0dd70256..00000000000
--- 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 353d5a00dd8..00000000000
--- 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 569602c5b1a..00000000000
--- 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 5c53e7d1ed9..00000000000
--- 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 cdd65d17631..00000000000
--- 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 444fbac3611..00000000000
--- 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 884d2c85752..00000000000
--- 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 9c1dca7a2d0..00000000000
--- 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 78881858822..00000000000
--- 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 9ee28a604f4..00000000000
--- 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 1a04f344ced..00000000000
--- 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 0761cd8503b..00000000000
--- 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 982c7265439..00000000000
--- 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 01b10747022..00000000000
--- 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 e29e63cad03..00000000000
--- 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 22568f8001d..00000000000
--- 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 e2cac0b6e8e..00000000000
--- 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 d2e15e25d11..00000000000
--- 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 7ffb5bae5f8..00000000000
--- 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 2718b94e29d..00000000000
--- 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 31a5fdff918..00000000000
--- 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 93b7578f57c..00000000000
--- 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/CharData.h b/libjava/gnu/java/lang/CharData.h
deleted file mode 100644
index 0a16c891e94..00000000000
--- 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 d42070e9a00..00000000000
--- 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 675626e9b31..00000000000
--- 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 d92d04dc868..00000000000
--- a/libjava/gnu/java/lang/MainThread.h
+++ /dev/null
@@ -1,52 +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;
-  static ::java::lang::Class * Klocale;
-  static ::java::lang::Class * Kcalendar;
-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/VMInstrumentationImpl.h b/libjava/gnu/java/lang/VMInstrumentationImpl.h
deleted file mode 100644
index 1b647a3ecfe..00000000000
--- 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/management/BeanImpl.h b/libjava/gnu/java/lang/management/BeanImpl.h
deleted file mode 100644
index 56b8a050cb3..00000000000
--- a/libjava/gnu/java/lang/management/BeanImpl.h
+++ /dev/null
@@ -1,66 +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 MBeanInfo;
-        class MBeanParameterInfo;
-      namespace openmbean
-      {
-          class OpenMBeanInfo;
-          class OpenMBeanParameterInfo;
-          class OpenType;
-      }
-    }
-  }
-}
-
-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();
-public:
-  virtual ::javax::management::MBeanInfo * getMBeanInfo();
-private:
-  ::javax::management::openmbean::OpenType * getTypeFromClass(::java::lang::Class *);
-  JArray< ::javax::management::openmbean::OpenMBeanParameterInfo * > * translateSignature(JArray< ::javax::management::MBeanParameterInfo * > *);
-  ::javax::management::openmbean::OpenMBeanParameterInfo * translate(::java::lang::String *);
-  ::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 c03db232426..00000000000
--- 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 c11d3fb8389..00000000000
--- 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 cfefdb653e3..00000000000
--- 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$ListenerData.h b/libjava/gnu/java/lang/management/MemoryMXBeanImpl$ListenerData.h
deleted file mode 100644
index 0be0fe815ae..00000000000
--- a/libjava/gnu/java/lang/management/MemoryMXBeanImpl$ListenerData.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_lang_management_MemoryMXBeanImpl$ListenerData__
-#define __gnu_java_lang_management_MemoryMXBeanImpl$ListenerData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace lang
-      {
-        namespace management
-        {
-            class MemoryMXBeanImpl;
-            class MemoryMXBeanImpl$ListenerData;
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class gnu::java::lang::management::MemoryMXBeanImpl$ListenerData : public ::java::lang::Object
-{
-
-public:
-  MemoryMXBeanImpl$ListenerData(::gnu::java::lang::management::MemoryMXBeanImpl *, ::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: // actually package-private
-  ::gnu::java::lang::management::MemoryMXBeanImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_lang_management_MemoryMXBeanImpl$ListenerData__
diff --git a/libjava/gnu/java/lang/management/MemoryMXBeanImpl.h b/libjava/gnu/java/lang/management/MemoryMXBeanImpl.h
deleted file mode 100644
index 3c87a0f355b..00000000000
--- 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 2ddbf70eac1..00000000000
--- 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 ff3734d2858..00000000000
--- 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 41385fe2542..00000000000
--- a/libjava/gnu/java/lang/management/OperatingSystemMXBeanImpl.h
+++ /dev/null
@@ -1,39 +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();
-  ::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 f46f6df2c5a..00000000000
--- 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 3a8fd5f3033..00000000000
--- a/libjava/gnu/java/lang/management/ThreadMXBeanImpl.h
+++ /dev/null
@@ -1,67 +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< 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);
-  jlong getThreadUserTime(jlong);
-  jlong getTotalStartedThreadCount();
-  jboolean isCurrentThreadCpuTimeSupported();
-  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;
-  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 b381004460f..00000000000
--- 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/VMCompilationMXBeanImpl.h b/libjava/gnu/java/lang/management/VMCompilationMXBeanImpl.h
deleted file mode 100644
index 31967e13424..00000000000
--- 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/VMGarbageCollectorMXBeanImpl.h b/libjava/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.h
deleted file mode 100644
index b01f97cd8a4..00000000000
--- 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/VMMemoryMXBeanImpl.h b/libjava/gnu/java/lang/management/VMMemoryMXBeanImpl.h
deleted file mode 100644
index a31c551c36f..00000000000
--- 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/VMMemoryManagerMXBeanImpl.h b/libjava/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.h
deleted file mode 100644
index 3a174c82a8a..00000000000
--- 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/VMMemoryPoolMXBeanImpl.h b/libjava/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.h
deleted file mode 100644
index 623162ee886..00000000000
--- 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/VMRuntimeMXBeanImpl.h b/libjava/gnu/java/lang/management/VMRuntimeMXBeanImpl.h
deleted file mode 100644
index 9bd0e442250..00000000000
--- 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/VMThreadMXBeanImpl.h b/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.h
deleted file mode 100644
index 77577f7668e..00000000000
--- a/libjava/gnu/java/lang/management/VMThreadMXBeanImpl.h
+++ /dev/null
@@ -1,53 +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 > * findMonitorDeadlockedThreads();
-  static JArray< ::java::lang::Thread * > * getAllThreads();
-  static JArray< jlong > * getAllThreadIds();
-  static jlong getCurrentThreadCpuTime();
-  static jlong getCurrentThreadUserTime();
-  static jint getDaemonThreadCount();
-  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/reflect/ClassSignatureParser.h b/libjava/gnu/java/lang/reflect/ClassSignatureParser.h
deleted file mode 100644
index 10c0f4d38df..00000000000
--- 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 58b972a4381..00000000000
--- 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 25a654d7731..00000000000
--- 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 22e443b59de..00000000000
--- 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 3a684699573..00000000000
--- 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 0f43af60eb8..00000000000
--- 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 42c3f3af853..00000000000
--- 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 82260585962..00000000000
--- 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 82ac58ab82d..00000000000
--- 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 4fec000b5c0..00000000000
--- 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 b2eb19c3578..00000000000
--- 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/Calendar.h b/libjava/gnu/java/locale/Calendar.h
deleted file mode 100644
index b0d7eee75ff..00000000000
--- a/libjava/gnu/java/locale/Calendar.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_Calendar__
-#define __gnu_java_locale_Calendar__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class Calendar;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::Calendar : public ::java::util::ListResourceBundle
-{
-
-public:
-  Calendar();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-private:
-  static JArray< ::java::util::Locale * > * availableLocales;
-  static ::java::lang::String * calendarClass;
-  static ::java::lang::Integer * firstDayOfWeek;
-  static ::java::lang::Integer * minimalDaysInFirstWeek;
-  static ::java::util::Date * gregorianCutOver;
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_Calendar__
diff --git a/libjava/gnu/java/locale/Calendar_de.h b/libjava/gnu/java/locale/Calendar_de.h
deleted file mode 100644
index 77328560159..00000000000
--- a/libjava/gnu/java/locale/Calendar_de.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_Calendar_de__
-#define __gnu_java_locale_Calendar_de__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class Calendar_de;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::Calendar_de : public ::java::util::ListResourceBundle
-{
-
-public:
-  Calendar_de();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_Calendar_de__
diff --git a/libjava/gnu/java/locale/Calendar_en.h b/libjava/gnu/java/locale/Calendar_en.h
deleted file mode 100644
index 523be552ae8..00000000000
--- a/libjava/gnu/java/locale/Calendar_en.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_Calendar_en__
-#define __gnu_java_locale_Calendar_en__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class Calendar_en;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::Calendar_en : public ::java::util::ListResourceBundle
-{
-
-public:
-  Calendar_en();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_Calendar_en__
diff --git a/libjava/gnu/java/locale/Calendar_nl.h b/libjava/gnu/java/locale/Calendar_nl.h
deleted file mode 100644
index 01f75b188ff..00000000000
--- a/libjava/gnu/java/locale/Calendar_nl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_Calendar_nl__
-#define __gnu_java_locale_Calendar_nl__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class Calendar_nl;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::Calendar_nl : public ::java::util::ListResourceBundle
-{
-
-public:
-  Calendar_nl();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_Calendar_nl__
diff --git a/libjava/gnu/java/locale/LocaleData.h b/libjava/gnu/java/locale/LocaleData.h
deleted file mode 100644
index ab983a570f6..00000000000
--- 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 7a8389334ad..00000000000
--- 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::lang::String * getLocalizedString(::java::util::Locale *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-  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/locale/LocaleInformation.h b/libjava/gnu/java/locale/LocaleInformation.h
deleted file mode 100644
index b8ccfeceb36..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation__
-#define __gnu_java_locale_LocaleInformation__
-
-#pragma interface
-
-#include <gnu/java/locale/LocaleInformation_en.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation : public ::gnu::java::locale::LocaleInformation_en
-{
-
-public:
-  LocaleInformation();
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation__
diff --git a/libjava/gnu/java/locale/LocaleInformation_af_ZA.h b/libjava/gnu/java/locale/LocaleInformation_af_ZA.h
deleted file mode 100644
index 9c5e11ffcc0..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_af_ZA.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_af_ZA__
-#define __gnu_java_locale_LocaleInformation_af_ZA__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_af_ZA;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_af_ZA : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_af_ZA();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_af_ZA__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_AE.h b/libjava/gnu/java/locale/LocaleInformation_ar_AE.h
deleted file mode 100644
index a2cd814e9c7..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_AE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_AE__
-#define __gnu_java_locale_LocaleInformation_ar_AE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_AE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_AE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_AE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_AE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_BH.h b/libjava/gnu/java/locale/LocaleInformation_ar_BH.h
deleted file mode 100644
index de1d231887a..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_BH.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_BH__
-#define __gnu_java_locale_LocaleInformation_ar_BH__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_BH;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_BH : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_BH();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_BH__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_DZ.h b/libjava/gnu/java/locale/LocaleInformation_ar_DZ.h
deleted file mode 100644
index 8ffc0a4ef13..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_DZ.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_DZ__
-#define __gnu_java_locale_LocaleInformation_ar_DZ__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_DZ;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_DZ : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_DZ();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_DZ__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_EG.h b/libjava/gnu/java/locale/LocaleInformation_ar_EG.h
deleted file mode 100644
index d8d31d00e94..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_EG.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_EG__
-#define __gnu_java_locale_LocaleInformation_ar_EG__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_EG;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_EG : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_EG();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_EG__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_IN.h b/libjava/gnu/java/locale/LocaleInformation_ar_IN.h
deleted file mode 100644
index 5d0d7f6581f..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_IN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_IN__
-#define __gnu_java_locale_LocaleInformation_ar_IN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_IN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_IN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_IN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_IN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_IQ.h b/libjava/gnu/java/locale/LocaleInformation_ar_IQ.h
deleted file mode 100644
index 55c24a508e7..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_IQ.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_IQ__
-#define __gnu_java_locale_LocaleInformation_ar_IQ__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_IQ;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_IQ : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_IQ();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_IQ__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_JO.h b/libjava/gnu/java/locale/LocaleInformation_ar_JO.h
deleted file mode 100644
index c4726d0b5c1..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_JO.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_JO__
-#define __gnu_java_locale_LocaleInformation_ar_JO__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_JO;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_JO : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_JO();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_JO__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_KW.h b/libjava/gnu/java/locale/LocaleInformation_ar_KW.h
deleted file mode 100644
index 0fb530020e2..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_KW.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_KW__
-#define __gnu_java_locale_LocaleInformation_ar_KW__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_KW;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_KW : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_KW();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_KW__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_LB.h b/libjava/gnu/java/locale/LocaleInformation_ar_LB.h
deleted file mode 100644
index 11b7c54d3b9..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_LB.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_LB__
-#define __gnu_java_locale_LocaleInformation_ar_LB__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_LB;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_LB : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_LB();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_LB__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_LY.h b/libjava/gnu/java/locale/LocaleInformation_ar_LY.h
deleted file mode 100644
index 1f4c4800b64..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_LY.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_LY__
-#define __gnu_java_locale_LocaleInformation_ar_LY__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_LY;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_LY : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_LY();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_LY__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_MA.h b/libjava/gnu/java/locale/LocaleInformation_ar_MA.h
deleted file mode 100644
index df092d26d96..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_MA.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_MA__
-#define __gnu_java_locale_LocaleInformation_ar_MA__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_MA;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_MA : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_MA();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_MA__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_OM.h b/libjava/gnu/java/locale/LocaleInformation_ar_OM.h
deleted file mode 100644
index 692578c5b08..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_OM.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_OM__
-#define __gnu_java_locale_LocaleInformation_ar_OM__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_OM;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_OM : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_OM();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_OM__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_QA.h b/libjava/gnu/java/locale/LocaleInformation_ar_QA.h
deleted file mode 100644
index 9bf80ccd4f1..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_QA.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_QA__
-#define __gnu_java_locale_LocaleInformation_ar_QA__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_QA;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_QA : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_QA();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_QA__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_SD.h b/libjava/gnu/java/locale/LocaleInformation_ar_SD.h
deleted file mode 100644
index 817df472faa..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_SD.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_SD__
-#define __gnu_java_locale_LocaleInformation_ar_SD__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_SD;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_SD : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_SD();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_SD__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_SY.h b/libjava/gnu/java/locale/LocaleInformation_ar_SY.h
deleted file mode 100644
index ee0df32fdd4..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_SY.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_SY__
-#define __gnu_java_locale_LocaleInformation_ar_SY__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_SY;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_SY : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_SY();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_SY__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_TN.h b/libjava/gnu/java/locale/LocaleInformation_ar_TN.h
deleted file mode 100644
index 248ace98d46..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_TN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_TN__
-#define __gnu_java_locale_LocaleInformation_ar_TN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_TN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_TN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_TN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_TN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ar_YE.h b/libjava/gnu/java/locale/LocaleInformation_ar_YE.h
deleted file mode 100644
index 8a9dbe8fdbc..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ar_YE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ar_YE__
-#define __gnu_java_locale_LocaleInformation_ar_YE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ar_YE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ar_YE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ar_YE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ar_YE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_be_BY.h b/libjava/gnu/java/locale/LocaleInformation_be_BY.h
deleted file mode 100644
index 51a72506f64..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_be_BY.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_be_BY__
-#define __gnu_java_locale_LocaleInformation_be_BY__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_be_BY;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_be_BY : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_be_BY();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_be_BY__
diff --git a/libjava/gnu/java/locale/LocaleInformation_bn_IN.h b/libjava/gnu/java/locale/LocaleInformation_bn_IN.h
deleted file mode 100644
index 24264ea85cc..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_bn_IN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_bn_IN__
-#define __gnu_java_locale_LocaleInformation_bn_IN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_bn_IN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_bn_IN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_bn_IN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_bn_IN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_br_FR.h b/libjava/gnu/java/locale/LocaleInformation_br_FR.h
deleted file mode 100644
index 251ae2f4a10..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_br_FR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_br_FR__
-#define __gnu_java_locale_LocaleInformation_br_FR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_br_FR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_br_FR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_br_FR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_br_FR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_bs_BA.h b/libjava/gnu/java/locale/LocaleInformation_bs_BA.h
deleted file mode 100644
index a71855e8969..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_bs_BA.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_bs_BA__
-#define __gnu_java_locale_LocaleInformation_bs_BA__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_bs_BA;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_bs_BA : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_bs_BA();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_bs_BA__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ca_ES.h b/libjava/gnu/java/locale/LocaleInformation_ca_ES.h
deleted file mode 100644
index 659a2a1196b..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ca_ES.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ca_ES__
-#define __gnu_java_locale_LocaleInformation_ca_ES__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ca_ES;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ca_ES : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ca_ES();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ca_ES__
diff --git a/libjava/gnu/java/locale/LocaleInformation_cs_CZ.h b/libjava/gnu/java/locale/LocaleInformation_cs_CZ.h
deleted file mode 100644
index a871895e977..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_cs_CZ.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_cs_CZ__
-#define __gnu_java_locale_LocaleInformation_cs_CZ__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_cs_CZ;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_cs_CZ : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_cs_CZ();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_cs_CZ__
diff --git a/libjava/gnu/java/locale/LocaleInformation_cy_GB.h b/libjava/gnu/java/locale/LocaleInformation_cy_GB.h
deleted file mode 100644
index 150a1c4f14c..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_cy_GB.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_cy_GB__
-#define __gnu_java_locale_LocaleInformation_cy_GB__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_cy_GB;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_cy_GB : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_cy_GB();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_cy_GB__
diff --git a/libjava/gnu/java/locale/LocaleInformation_da_DK.h b/libjava/gnu/java/locale/LocaleInformation_da_DK.h
deleted file mode 100644
index 1f20d1bb6a1..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_da_DK.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_da_DK__
-#define __gnu_java_locale_LocaleInformation_da_DK__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_da_DK;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_da_DK : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_da_DK();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_da_DK__
diff --git a/libjava/gnu/java/locale/LocaleInformation_de.h b/libjava/gnu/java/locale/LocaleInformation_de.h
deleted file mode 100644
index ed1bde66188..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_de.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_de__
-#define __gnu_java_locale_LocaleInformation_de__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_de;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_de : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_de();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-private:
-  static ::java::lang::String * collation_rules;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * eras;
-  static JArray< JArray< ::java::lang::String * > * > * zoneStrings;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * mediumDateFormat;
-  static ::java::lang::String * longDateFormat;
-  static ::java::lang::String * fullDateFormat;
-  static ::java::lang::String * defaultDateFormat;
-  static ::java::lang::String * shortTimeFormat;
-  static ::java::lang::String * mediumTimeFormat;
-  static ::java::lang::String * longTimeFormat;
-  static ::java::lang::String * fullTimeFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * monetarySeparator;
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_de__
diff --git a/libjava/gnu/java/locale/LocaleInformation_de_AT.h b/libjava/gnu/java/locale/LocaleInformation_de_AT.h
deleted file mode 100644
index a8bdd954e9d..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_de_AT.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_de_AT__
-#define __gnu_java_locale_LocaleInformation_de_AT__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_de_AT;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_de_AT : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_de_AT();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_de_AT__
diff --git a/libjava/gnu/java/locale/LocaleInformation_de_BE.h b/libjava/gnu/java/locale/LocaleInformation_de_BE.h
deleted file mode 100644
index 1b82c400722..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_de_BE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_de_BE__
-#define __gnu_java_locale_LocaleInformation_de_BE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_de_BE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_de_BE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_de_BE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_de_BE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_de_CH.h b/libjava/gnu/java/locale/LocaleInformation_de_CH.h
deleted file mode 100644
index b1294cda235..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_de_CH.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_de_CH__
-#define __gnu_java_locale_LocaleInformation_de_CH__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_de_CH;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_de_CH : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_de_CH();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_de_CH__
diff --git a/libjava/gnu/java/locale/LocaleInformation_de_DE.h b/libjava/gnu/java/locale/LocaleInformation_de_DE.h
deleted file mode 100644
index fe3ae5e6334..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_de_DE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_de_DE__
-#define __gnu_java_locale_LocaleInformation_de_DE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_de_DE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_de_DE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_de_DE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_de_DE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_de_LU.h b/libjava/gnu/java/locale/LocaleInformation_de_LU.h
deleted file mode 100644
index 0a567655cd8..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_de_LU.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_de_LU__
-#define __gnu_java_locale_LocaleInformation_de_LU__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_de_LU;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_de_LU : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_de_LU();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_de_LU__
diff --git a/libjava/gnu/java/locale/LocaleInformation_el_GR.h b/libjava/gnu/java/locale/LocaleInformation_el_GR.h
deleted file mode 100644
index da89dd3872c..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_el_GR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_el_GR__
-#define __gnu_java_locale_LocaleInformation_el_GR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_el_GR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_el_GR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_el_GR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_el_GR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en.h b/libjava/gnu/java/locale/LocaleInformation_en.h
deleted file mode 100644
index 0aeba5a2f8c..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en__
-#define __gnu_java_locale_LocaleInformation_en__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-private:
-  static ::java::lang::String * collation_rules;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * ampms;
-  static JArray< ::java::lang::String * > * eras;
-  static JArray< JArray< ::java::lang::String * > * > * zoneStrings;
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_AU.h b/libjava/gnu/java/locale/LocaleInformation_en_AU.h
deleted file mode 100644
index 0b6267b21ea..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_AU.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_AU__
-#define __gnu_java_locale_LocaleInformation_en_AU__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_AU;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_AU : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_AU();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_AU__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_BW.h b/libjava/gnu/java/locale/LocaleInformation_en_BW.h
deleted file mode 100644
index 95cd728346d..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_BW.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_BW__
-#define __gnu_java_locale_LocaleInformation_en_BW__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_BW;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_BW : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_BW();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_BW__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_CA.h b/libjava/gnu/java/locale/LocaleInformation_en_CA.h
deleted file mode 100644
index d5d86f75d4f..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_CA.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_CA__
-#define __gnu_java_locale_LocaleInformation_en_CA__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_CA;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_CA : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_CA();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_CA__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_DK.h b/libjava/gnu/java/locale/LocaleInformation_en_DK.h
deleted file mode 100644
index 703921f29f2..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_DK.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_DK__
-#define __gnu_java_locale_LocaleInformation_en_DK__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_DK;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_DK : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_DK();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_DK__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_GB.h b/libjava/gnu/java/locale/LocaleInformation_en_GB.h
deleted file mode 100644
index 8ca4d334467..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_GB.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_GB__
-#define __gnu_java_locale_LocaleInformation_en_GB__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_GB;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_GB : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_GB();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_GB__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_HK.h b/libjava/gnu/java/locale/LocaleInformation_en_HK.h
deleted file mode 100644
index 84b99a2badd..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_HK.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_HK__
-#define __gnu_java_locale_LocaleInformation_en_HK__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_HK;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_HK : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_HK();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_HK__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_IE.h b/libjava/gnu/java/locale/LocaleInformation_en_IE.h
deleted file mode 100644
index f7aad1a9a7e..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_IE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_IE__
-#define __gnu_java_locale_LocaleInformation_en_IE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_IE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_IE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_IE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_IE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_IN.h b/libjava/gnu/java/locale/LocaleInformation_en_IN.h
deleted file mode 100644
index 9e38fb2d824..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_IN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_IN__
-#define __gnu_java_locale_LocaleInformation_en_IN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_IN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_IN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_IN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_IN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_NZ.h b/libjava/gnu/java/locale/LocaleInformation_en_NZ.h
deleted file mode 100644
index 1493f27da60..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_NZ.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_NZ__
-#define __gnu_java_locale_LocaleInformation_en_NZ__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_NZ;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_NZ : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_NZ();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_NZ__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_PH.h b/libjava/gnu/java/locale/LocaleInformation_en_PH.h
deleted file mode 100644
index e9251b117ed..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_PH.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_PH__
-#define __gnu_java_locale_LocaleInformation_en_PH__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_PH;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_PH : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_PH();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_PH__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_SG.h b/libjava/gnu/java/locale/LocaleInformation_en_SG.h
deleted file mode 100644
index 7b46bb3e07c..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_SG.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_SG__
-#define __gnu_java_locale_LocaleInformation_en_SG__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_SG;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_SG : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_SG();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_SG__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_US.h b/libjava/gnu/java/locale/LocaleInformation_en_US.h
deleted file mode 100644
index 9875c5b286f..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_US.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_US__
-#define __gnu_java_locale_LocaleInformation_en_US__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_US;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_US : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_US();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_US__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_ZA.h b/libjava/gnu/java/locale/LocaleInformation_en_ZA.h
deleted file mode 100644
index 88aef9206bc..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_ZA.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_ZA__
-#define __gnu_java_locale_LocaleInformation_en_ZA__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_ZA;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_ZA : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_ZA();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_ZA__
diff --git a/libjava/gnu/java/locale/LocaleInformation_en_ZW.h b/libjava/gnu/java/locale/LocaleInformation_en_ZW.h
deleted file mode 100644
index 05794a9a213..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_en_ZW.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_en_ZW__
-#define __gnu_java_locale_LocaleInformation_en_ZW__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_en_ZW;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_en_ZW : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_en_ZW();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_en_ZW__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_AR.h b/libjava/gnu/java/locale/LocaleInformation_es_AR.h
deleted file mode 100644
index fc665e37c23..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_AR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_AR__
-#define __gnu_java_locale_LocaleInformation_es_AR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_AR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_AR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_AR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_AR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_BO.h b/libjava/gnu/java/locale/LocaleInformation_es_BO.h
deleted file mode 100644
index 5fc8d518570..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_BO.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_BO__
-#define __gnu_java_locale_LocaleInformation_es_BO__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_BO;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_BO : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_BO();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_BO__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_CL.h b/libjava/gnu/java/locale/LocaleInformation_es_CL.h
deleted file mode 100644
index 27d5bb4c3c9..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_CL.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_CL__
-#define __gnu_java_locale_LocaleInformation_es_CL__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_CL;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_CL : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_CL();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_CL__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_CO.h b/libjava/gnu/java/locale/LocaleInformation_es_CO.h
deleted file mode 100644
index 2bcae306959..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_CO.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_CO__
-#define __gnu_java_locale_LocaleInformation_es_CO__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_CO;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_CO : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_CO();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_CO__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_CR.h b/libjava/gnu/java/locale/LocaleInformation_es_CR.h
deleted file mode 100644
index c051184dec6..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_CR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_CR__
-#define __gnu_java_locale_LocaleInformation_es_CR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_CR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_CR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_CR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_CR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_DO.h b/libjava/gnu/java/locale/LocaleInformation_es_DO.h
deleted file mode 100644
index 76e75996cfa..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_DO.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_DO__
-#define __gnu_java_locale_LocaleInformation_es_DO__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_DO;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_DO : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_DO();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_DO__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_EC.h b/libjava/gnu/java/locale/LocaleInformation_es_EC.h
deleted file mode 100644
index cda5b98034f..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_EC.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_EC__
-#define __gnu_java_locale_LocaleInformation_es_EC__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_EC;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_EC : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_EC();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_EC__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_ES.h b/libjava/gnu/java/locale/LocaleInformation_es_ES.h
deleted file mode 100644
index c3047114501..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_ES.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_ES__
-#define __gnu_java_locale_LocaleInformation_es_ES__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_ES;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_ES : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_ES();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_ES__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_GT.h b/libjava/gnu/java/locale/LocaleInformation_es_GT.h
deleted file mode 100644
index 36ed4e25f07..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_GT.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_GT__
-#define __gnu_java_locale_LocaleInformation_es_GT__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_GT;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_GT : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_GT();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_GT__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_HN.h b/libjava/gnu/java/locale/LocaleInformation_es_HN.h
deleted file mode 100644
index 11369dd85db..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_HN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_HN__
-#define __gnu_java_locale_LocaleInformation_es_HN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_HN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_HN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_HN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_HN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_MX.h b/libjava/gnu/java/locale/LocaleInformation_es_MX.h
deleted file mode 100644
index 5c944f123aa..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_MX.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_MX__
-#define __gnu_java_locale_LocaleInformation_es_MX__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_MX;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_MX : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_MX();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_MX__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_NI.h b/libjava/gnu/java/locale/LocaleInformation_es_NI.h
deleted file mode 100644
index e9733a2d3d6..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_NI.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_NI__
-#define __gnu_java_locale_LocaleInformation_es_NI__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_NI;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_NI : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_NI();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_NI__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_PA.h b/libjava/gnu/java/locale/LocaleInformation_es_PA.h
deleted file mode 100644
index 3f47027613a..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_PA.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_PA__
-#define __gnu_java_locale_LocaleInformation_es_PA__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_PA;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_PA : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_PA();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_PA__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_PE.h b/libjava/gnu/java/locale/LocaleInformation_es_PE.h
deleted file mode 100644
index e6aac1ea1c8..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_PE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_PE__
-#define __gnu_java_locale_LocaleInformation_es_PE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_PE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_PE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_PE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_PE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_PR.h b/libjava/gnu/java/locale/LocaleInformation_es_PR.h
deleted file mode 100644
index 8ee47388cd1..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_PR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_PR__
-#define __gnu_java_locale_LocaleInformation_es_PR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_PR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_PR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_PR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_PR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_PY.h b/libjava/gnu/java/locale/LocaleInformation_es_PY.h
deleted file mode 100644
index 24edae871b2..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_PY.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_PY__
-#define __gnu_java_locale_LocaleInformation_es_PY__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_PY;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_PY : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_PY();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_PY__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_SV.h b/libjava/gnu/java/locale/LocaleInformation_es_SV.h
deleted file mode 100644
index 8907f3d724a..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_SV.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_SV__
-#define __gnu_java_locale_LocaleInformation_es_SV__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_SV;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_SV : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_SV();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_SV__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_US.h b/libjava/gnu/java/locale/LocaleInformation_es_US.h
deleted file mode 100644
index ad462d97115..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_US.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_US__
-#define __gnu_java_locale_LocaleInformation_es_US__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_US;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_US : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_US();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_US__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_UY.h b/libjava/gnu/java/locale/LocaleInformation_es_UY.h
deleted file mode 100644
index 7c0a1b6dbc9..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_UY.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_UY__
-#define __gnu_java_locale_LocaleInformation_es_UY__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_UY;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_UY : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_UY();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_UY__
diff --git a/libjava/gnu/java/locale/LocaleInformation_es_VE.h b/libjava/gnu/java/locale/LocaleInformation_es_VE.h
deleted file mode 100644
index eafea044caa..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_es_VE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_es_VE__
-#define __gnu_java_locale_LocaleInformation_es_VE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_es_VE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_es_VE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_es_VE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_es_VE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_et_EE.h b/libjava/gnu/java/locale/LocaleInformation_et_EE.h
deleted file mode 100644
index a267270629e..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_et_EE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_et_EE__
-#define __gnu_java_locale_LocaleInformation_et_EE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_et_EE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_et_EE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_et_EE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_et_EE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_eu_ES.h b/libjava/gnu/java/locale/LocaleInformation_eu_ES.h
deleted file mode 100644
index 107351cfa8b..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_eu_ES.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_eu_ES__
-#define __gnu_java_locale_LocaleInformation_eu_ES__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_eu_ES;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_eu_ES : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_eu_ES();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_eu_ES__
diff --git a/libjava/gnu/java/locale/LocaleInformation_fa_IR.h b/libjava/gnu/java/locale/LocaleInformation_fa_IR.h
deleted file mode 100644
index e0f5c813300..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_fa_IR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_fa_IR__
-#define __gnu_java_locale_LocaleInformation_fa_IR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_fa_IR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_fa_IR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_fa_IR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_fa_IR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_fi_FI.h b/libjava/gnu/java/locale/LocaleInformation_fi_FI.h
deleted file mode 100644
index ec45eccaa62..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_fi_FI.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_fi_FI__
-#define __gnu_java_locale_LocaleInformation_fi_FI__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_fi_FI;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_fi_FI : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_fi_FI();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_fi_FI__
diff --git a/libjava/gnu/java/locale/LocaleInformation_fo_FO.h b/libjava/gnu/java/locale/LocaleInformation_fo_FO.h
deleted file mode 100644
index ad6afd8de37..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_fo_FO.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_fo_FO__
-#define __gnu_java_locale_LocaleInformation_fo_FO__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_fo_FO;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_fo_FO : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_fo_FO();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_fo_FO__
diff --git a/libjava/gnu/java/locale/LocaleInformation_fr_BE.h b/libjava/gnu/java/locale/LocaleInformation_fr_BE.h
deleted file mode 100644
index dd2430b6ec2..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_fr_BE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_fr_BE__
-#define __gnu_java_locale_LocaleInformation_fr_BE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_fr_BE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_fr_BE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_fr_BE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_fr_BE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_fr_CA.h b/libjava/gnu/java/locale/LocaleInformation_fr_CA.h
deleted file mode 100644
index 151f50ba0f3..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_fr_CA.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_fr_CA__
-#define __gnu_java_locale_LocaleInformation_fr_CA__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_fr_CA;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_fr_CA : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_fr_CA();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_fr_CA__
diff --git a/libjava/gnu/java/locale/LocaleInformation_fr_CH.h b/libjava/gnu/java/locale/LocaleInformation_fr_CH.h
deleted file mode 100644
index ae0c3be4899..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_fr_CH.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_fr_CH__
-#define __gnu_java_locale_LocaleInformation_fr_CH__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_fr_CH;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_fr_CH : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_fr_CH();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_fr_CH__
diff --git a/libjava/gnu/java/locale/LocaleInformation_fr_FR.h b/libjava/gnu/java/locale/LocaleInformation_fr_FR.h
deleted file mode 100644
index 71ce984ed4b..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_fr_FR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_fr_FR__
-#define __gnu_java_locale_LocaleInformation_fr_FR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_fr_FR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_fr_FR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_fr_FR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_fr_FR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_fr_LU.h b/libjava/gnu/java/locale/LocaleInformation_fr_LU.h
deleted file mode 100644
index f1a51b5260d..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_fr_LU.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_fr_LU__
-#define __gnu_java_locale_LocaleInformation_fr_LU__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_fr_LU;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_fr_LU : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_fr_LU();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_fr_LU__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ga_IE.h b/libjava/gnu/java/locale/LocaleInformation_ga_IE.h
deleted file mode 100644
index 63a0703dbb8..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ga_IE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ga_IE__
-#define __gnu_java_locale_LocaleInformation_ga_IE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ga_IE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ga_IE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ga_IE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ga_IE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_gd_GB.h b/libjava/gnu/java/locale/LocaleInformation_gd_GB.h
deleted file mode 100644
index 4ae0fd27df9..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_gd_GB.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_gd_GB__
-#define __gnu_java_locale_LocaleInformation_gd_GB__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_gd_GB;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_gd_GB : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_gd_GB();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_gd_GB__
diff --git a/libjava/gnu/java/locale/LocaleInformation_gl_ES.h b/libjava/gnu/java/locale/LocaleInformation_gl_ES.h
deleted file mode 100644
index 6daee1ba8e2..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_gl_ES.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_gl_ES__
-#define __gnu_java_locale_LocaleInformation_gl_ES__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_gl_ES;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_gl_ES : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_gl_ES();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_gl_ES__
diff --git a/libjava/gnu/java/locale/LocaleInformation_gv_GB.h b/libjava/gnu/java/locale/LocaleInformation_gv_GB.h
deleted file mode 100644
index 82b81dbbf40..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_gv_GB.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_gv_GB__
-#define __gnu_java_locale_LocaleInformation_gv_GB__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_gv_GB;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_gv_GB : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_gv_GB();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_gv_GB__
diff --git a/libjava/gnu/java/locale/LocaleInformation_he_IL.h b/libjava/gnu/java/locale/LocaleInformation_he_IL.h
deleted file mode 100644
index f53e5d47b6e..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_he_IL.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_he_IL__
-#define __gnu_java_locale_LocaleInformation_he_IL__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_he_IL;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_he_IL : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_he_IL();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_he_IL__
diff --git a/libjava/gnu/java/locale/LocaleInformation_hi_IN.h b/libjava/gnu/java/locale/LocaleInformation_hi_IN.h
deleted file mode 100644
index dcdbce454e6..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_hi_IN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_hi_IN__
-#define __gnu_java_locale_LocaleInformation_hi_IN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_hi_IN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_hi_IN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_hi_IN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_hi_IN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_hr_HR.h b/libjava/gnu/java/locale/LocaleInformation_hr_HR.h
deleted file mode 100644
index ff1fd9fdd6a..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_hr_HR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_hr_HR__
-#define __gnu_java_locale_LocaleInformation_hr_HR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_hr_HR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_hr_HR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_hr_HR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_hr_HR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_hu_HU.h b/libjava/gnu/java/locale/LocaleInformation_hu_HU.h
deleted file mode 100644
index e4521bb83eb..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_hu_HU.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_hu_HU__
-#define __gnu_java_locale_LocaleInformation_hu_HU__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_hu_HU;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_hu_HU : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_hu_HU();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_hu_HU__
diff --git a/libjava/gnu/java/locale/LocaleInformation_id_ID.h b/libjava/gnu/java/locale/LocaleInformation_id_ID.h
deleted file mode 100644
index 9cc9a6771bf..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_id_ID.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_id_ID__
-#define __gnu_java_locale_LocaleInformation_id_ID__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_id_ID;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_id_ID : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_id_ID();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_id_ID__
diff --git a/libjava/gnu/java/locale/LocaleInformation_it_CH.h b/libjava/gnu/java/locale/LocaleInformation_it_CH.h
deleted file mode 100644
index 9f4a532a70b..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_it_CH.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_it_CH__
-#define __gnu_java_locale_LocaleInformation_it_CH__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_it_CH;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_it_CH : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_it_CH();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_it_CH__
diff --git a/libjava/gnu/java/locale/LocaleInformation_it_IT.h b/libjava/gnu/java/locale/LocaleInformation_it_IT.h
deleted file mode 100644
index 9a609df670b..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_it_IT.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_it_IT__
-#define __gnu_java_locale_LocaleInformation_it_IT__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_it_IT;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_it_IT : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_it_IT();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_it_IT__
diff --git a/libjava/gnu/java/locale/LocaleInformation_iw_IL.h b/libjava/gnu/java/locale/LocaleInformation_iw_IL.h
deleted file mode 100644
index 4dffbed802e..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_iw_IL.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_iw_IL__
-#define __gnu_java_locale_LocaleInformation_iw_IL__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_iw_IL;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_iw_IL : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_iw_IL();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_iw_IL__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ja_JP.h b/libjava/gnu/java/locale/LocaleInformation_ja_JP.h
deleted file mode 100644
index 64fcc71d3dd..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ja_JP.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ja_JP__
-#define __gnu_java_locale_LocaleInformation_ja_JP__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ja_JP;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ja_JP : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ja_JP();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ja_JP__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ka_GE.h b/libjava/gnu/java/locale/LocaleInformation_ka_GE.h
deleted file mode 100644
index b897c582455..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ka_GE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ka_GE__
-#define __gnu_java_locale_LocaleInformation_ka_GE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ka_GE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ka_GE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ka_GE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ka_GE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_kl_GL.h b/libjava/gnu/java/locale/LocaleInformation_kl_GL.h
deleted file mode 100644
index 1d0301c7a1f..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_kl_GL.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_kl_GL__
-#define __gnu_java_locale_LocaleInformation_kl_GL__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_kl_GL;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_kl_GL : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_kl_GL();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_kl_GL__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ko_KR.h b/libjava/gnu/java/locale/LocaleInformation_ko_KR.h
deleted file mode 100644
index 6521be5d65b..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ko_KR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ko_KR__
-#define __gnu_java_locale_LocaleInformation_ko_KR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ko_KR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ko_KR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ko_KR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ko_KR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_kw_GB.h b/libjava/gnu/java/locale/LocaleInformation_kw_GB.h
deleted file mode 100644
index b6ee13c9136..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_kw_GB.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_kw_GB__
-#define __gnu_java_locale_LocaleInformation_kw_GB__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_kw_GB;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_kw_GB : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_kw_GB();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_kw_GB__
diff --git a/libjava/gnu/java/locale/LocaleInformation_lt_LT.h b/libjava/gnu/java/locale/LocaleInformation_lt_LT.h
deleted file mode 100644
index 2cafbe194f8..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_lt_LT.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_lt_LT__
-#define __gnu_java_locale_LocaleInformation_lt_LT__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_lt_LT;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_lt_LT : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_lt_LT();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_lt_LT__
diff --git a/libjava/gnu/java/locale/LocaleInformation_lv_LV.h b/libjava/gnu/java/locale/LocaleInformation_lv_LV.h
deleted file mode 100644
index 15cb631f4f3..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_lv_LV.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_lv_LV__
-#define __gnu_java_locale_LocaleInformation_lv_LV__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_lv_LV;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_lv_LV : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_lv_LV();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_lv_LV__
diff --git a/libjava/gnu/java/locale/LocaleInformation_mi_NZ.h b/libjava/gnu/java/locale/LocaleInformation_mi_NZ.h
deleted file mode 100644
index 1b08f9b23da..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_mi_NZ.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_mi_NZ__
-#define __gnu_java_locale_LocaleInformation_mi_NZ__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_mi_NZ;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_mi_NZ : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_mi_NZ();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_mi_NZ__
diff --git a/libjava/gnu/java/locale/LocaleInformation_mk_MK.h b/libjava/gnu/java/locale/LocaleInformation_mk_MK.h
deleted file mode 100644
index 9afa2f27a22..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_mk_MK.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_mk_MK__
-#define __gnu_java_locale_LocaleInformation_mk_MK__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_mk_MK;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_mk_MK : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_mk_MK();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_mk_MK__
diff --git a/libjava/gnu/java/locale/LocaleInformation_mr_IN.h b/libjava/gnu/java/locale/LocaleInformation_mr_IN.h
deleted file mode 100644
index 2334d894204..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_mr_IN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_mr_IN__
-#define __gnu_java_locale_LocaleInformation_mr_IN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_mr_IN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_mr_IN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_mr_IN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_mr_IN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_mt_MT.h b/libjava/gnu/java/locale/LocaleInformation_mt_MT.h
deleted file mode 100644
index b0fd5420573..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_mt_MT.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_mt_MT__
-#define __gnu_java_locale_LocaleInformation_mt_MT__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_mt_MT;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_mt_MT : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_mt_MT();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_mt_MT__
diff --git a/libjava/gnu/java/locale/LocaleInformation_nl.h b/libjava/gnu/java/locale/LocaleInformation_nl.h
deleted file mode 100644
index 3fa73ca0510..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_nl.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_nl__
-#define __gnu_java_locale_LocaleInformation_nl__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_nl;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_nl : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_nl();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-private:
-  static ::java::lang::String * collation_rules;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * ampms;
-  static JArray< ::java::lang::String * > * eras;
-  static JArray< JArray< ::java::lang::String * > * > * zoneStrings;
-  static ::java::lang::String * localPatternChars;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * mediumDateFormat;
-  static ::java::lang::String * longDateFormat;
-  static ::java::lang::String * fullDateFormat;
-  static ::java::lang::String * defaultDateFormat;
-  static ::java::lang::String * shortTimeFormat;
-  static ::java::lang::String * mediumTimeFormat;
-  static ::java::lang::String * longTimeFormat;
-  static ::java::lang::String * fullTimeFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * exponential;
-  static ::java::lang::String * digit;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * infinity;
-  static ::java::lang::String * NaN;
-  static ::java::lang::String * minusSign;
-  static ::java::lang::String * monetarySeparator;
-  static ::java::lang::String * patternSeparator;
-  static ::java::lang::String * percent;
-  static ::java::lang::String * perMill;
-  static ::java::lang::String * zeroDigit;
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_nl__
diff --git a/libjava/gnu/java/locale/LocaleInformation_nl_BE.h b/libjava/gnu/java/locale/LocaleInformation_nl_BE.h
deleted file mode 100644
index 1fa50cb5eeb..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_nl_BE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_nl_BE__
-#define __gnu_java_locale_LocaleInformation_nl_BE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_nl_BE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_nl_BE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_nl_BE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_nl_BE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_nl_NL.h b/libjava/gnu/java/locale/LocaleInformation_nl_NL.h
deleted file mode 100644
index 370855a9a78..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_nl_NL.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_nl_NL__
-#define __gnu_java_locale_LocaleInformation_nl_NL__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_nl_NL;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_nl_NL : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_nl_NL();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_nl_NL__
diff --git a/libjava/gnu/java/locale/LocaleInformation_nn_NO.h b/libjava/gnu/java/locale/LocaleInformation_nn_NO.h
deleted file mode 100644
index 752fec2eb36..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_nn_NO.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_nn_NO__
-#define __gnu_java_locale_LocaleInformation_nn_NO__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_nn_NO;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_nn_NO : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_nn_NO();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_nn_NO__
diff --git a/libjava/gnu/java/locale/LocaleInformation_no_NO.h b/libjava/gnu/java/locale/LocaleInformation_no_NO.h
deleted file mode 100644
index 5d3443d0b66..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_no_NO.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_no_NO__
-#define __gnu_java_locale_LocaleInformation_no_NO__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_no_NO;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_no_NO : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_no_NO();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_no_NO__
diff --git a/libjava/gnu/java/locale/LocaleInformation_oc_FR.h b/libjava/gnu/java/locale/LocaleInformation_oc_FR.h
deleted file mode 100644
index 62730255ed0..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_oc_FR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_oc_FR__
-#define __gnu_java_locale_LocaleInformation_oc_FR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_oc_FR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_oc_FR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_oc_FR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_oc_FR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_pl_PL.h b/libjava/gnu/java/locale/LocaleInformation_pl_PL.h
deleted file mode 100644
index 39e32732284..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_pl_PL.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_pl_PL__
-#define __gnu_java_locale_LocaleInformation_pl_PL__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_pl_PL;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_pl_PL : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_pl_PL();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_pl_PL__
diff --git a/libjava/gnu/java/locale/LocaleInformation_pt_BR.h b/libjava/gnu/java/locale/LocaleInformation_pt_BR.h
deleted file mode 100644
index 974796c0149..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_pt_BR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_pt_BR__
-#define __gnu_java_locale_LocaleInformation_pt_BR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_pt_BR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_pt_BR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_pt_BR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_pt_BR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_pt_PT.h b/libjava/gnu/java/locale/LocaleInformation_pt_PT.h
deleted file mode 100644
index 891207418c0..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_pt_PT.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_pt_PT__
-#define __gnu_java_locale_LocaleInformation_pt_PT__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_pt_PT;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_pt_PT : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_pt_PT();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_pt_PT__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ro_RO.h b/libjava/gnu/java/locale/LocaleInformation_ro_RO.h
deleted file mode 100644
index 854a9fa30dc..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ro_RO.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ro_RO__
-#define __gnu_java_locale_LocaleInformation_ro_RO__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ro_RO;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ro_RO : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ro_RO();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ro_RO__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ru_RU.h b/libjava/gnu/java/locale/LocaleInformation_ru_RU.h
deleted file mode 100644
index c57be36e44e..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ru_RU.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ru_RU__
-#define __gnu_java_locale_LocaleInformation_ru_RU__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ru_RU;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ru_RU : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ru_RU();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ru_RU__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ru_UA.h b/libjava/gnu/java/locale/LocaleInformation_ru_UA.h
deleted file mode 100644
index a4d8c03845c..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ru_UA.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ru_UA__
-#define __gnu_java_locale_LocaleInformation_ru_UA__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ru_UA;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ru_UA : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ru_UA();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ru_UA__
diff --git a/libjava/gnu/java/locale/LocaleInformation_se_NO.h b/libjava/gnu/java/locale/LocaleInformation_se_NO.h
deleted file mode 100644
index 4ca87729e63..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_se_NO.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_se_NO__
-#define __gnu_java_locale_LocaleInformation_se_NO__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_se_NO;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_se_NO : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_se_NO();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_se_NO__
diff --git a/libjava/gnu/java/locale/LocaleInformation_sk_SK.h b/libjava/gnu/java/locale/LocaleInformation_sk_SK.h
deleted file mode 100644
index c1142289e57..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_sk_SK.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_sk_SK__
-#define __gnu_java_locale_LocaleInformation_sk_SK__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_sk_SK;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_sk_SK : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_sk_SK();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_sk_SK__
diff --git a/libjava/gnu/java/locale/LocaleInformation_sl_SI.h b/libjava/gnu/java/locale/LocaleInformation_sl_SI.h
deleted file mode 100644
index 51aa0403dc5..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_sl_SI.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_sl_SI__
-#define __gnu_java_locale_LocaleInformation_sl_SI__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_sl_SI;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_sl_SI : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_sl_SI();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_sl_SI__
diff --git a/libjava/gnu/java/locale/LocaleInformation_sq_AL.h b/libjava/gnu/java/locale/LocaleInformation_sq_AL.h
deleted file mode 100644
index 493cca5518e..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_sq_AL.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_sq_AL__
-#define __gnu_java_locale_LocaleInformation_sq_AL__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_sq_AL;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_sq_AL : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_sq_AL();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_sq_AL__
diff --git a/libjava/gnu/java/locale/LocaleInformation_sr_YU.h b/libjava/gnu/java/locale/LocaleInformation_sr_YU.h
deleted file mode 100644
index 42349ca2dab..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_sr_YU.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_sr_YU__
-#define __gnu_java_locale_LocaleInformation_sr_YU__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_sr_YU;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_sr_YU : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_sr_YU();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_sr_YU__
diff --git a/libjava/gnu/java/locale/LocaleInformation_sv_FI.h b/libjava/gnu/java/locale/LocaleInformation_sv_FI.h
deleted file mode 100644
index f5df7dcba91..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_sv_FI.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_sv_FI__
-#define __gnu_java_locale_LocaleInformation_sv_FI__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_sv_FI;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_sv_FI : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_sv_FI();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_sv_FI__
diff --git a/libjava/gnu/java/locale/LocaleInformation_sv_SE.h b/libjava/gnu/java/locale/LocaleInformation_sv_SE.h
deleted file mode 100644
index 0a9e89c1db5..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_sv_SE.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_sv_SE__
-#define __gnu_java_locale_LocaleInformation_sv_SE__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_sv_SE;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_sv_SE : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_sv_SE();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_sv_SE__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ta_IN.h b/libjava/gnu/java/locale/LocaleInformation_ta_IN.h
deleted file mode 100644
index 8ec6e611dbc..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ta_IN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ta_IN__
-#define __gnu_java_locale_LocaleInformation_ta_IN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ta_IN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ta_IN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ta_IN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ta_IN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_te_IN.h b/libjava/gnu/java/locale/LocaleInformation_te_IN.h
deleted file mode 100644
index 4942cb7cd4c..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_te_IN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_te_IN__
-#define __gnu_java_locale_LocaleInformation_te_IN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_te_IN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_te_IN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_te_IN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_te_IN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_tg_TJ.h b/libjava/gnu/java/locale/LocaleInformation_tg_TJ.h
deleted file mode 100644
index ff642afcb55..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_tg_TJ.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_tg_TJ__
-#define __gnu_java_locale_LocaleInformation_tg_TJ__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_tg_TJ;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_tg_TJ : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_tg_TJ();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_tg_TJ__
diff --git a/libjava/gnu/java/locale/LocaleInformation_tl_PH.h b/libjava/gnu/java/locale/LocaleInformation_tl_PH.h
deleted file mode 100644
index e8475692964..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_tl_PH.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_tl_PH__
-#define __gnu_java_locale_LocaleInformation_tl_PH__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_tl_PH;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_tl_PH : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_tl_PH();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_tl_PH__
diff --git a/libjava/gnu/java/locale/LocaleInformation_tr_TR.h b/libjava/gnu/java/locale/LocaleInformation_tr_TR.h
deleted file mode 100644
index 19edf48cb38..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_tr_TR.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_tr_TR__
-#define __gnu_java_locale_LocaleInformation_tr_TR__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_tr_TR;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_tr_TR : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_tr_TR();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_tr_TR__
diff --git a/libjava/gnu/java/locale/LocaleInformation_uk_UA.h b/libjava/gnu/java/locale/LocaleInformation_uk_UA.h
deleted file mode 100644
index ace1c31b655..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_uk_UA.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_uk_UA__
-#define __gnu_java_locale_LocaleInformation_uk_UA__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_uk_UA;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_uk_UA : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_uk_UA();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_uk_UA__
diff --git a/libjava/gnu/java/locale/LocaleInformation_ur_PK.h b/libjava/gnu/java/locale/LocaleInformation_ur_PK.h
deleted file mode 100644
index dc7a5ccf316..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_ur_PK.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_ur_PK__
-#define __gnu_java_locale_LocaleInformation_ur_PK__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_ur_PK;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_ur_PK : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_ur_PK();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_ur_PK__
diff --git a/libjava/gnu/java/locale/LocaleInformation_uz_UZ.h b/libjava/gnu/java/locale/LocaleInformation_uz_UZ.h
deleted file mode 100644
index ec8d3fb492f..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_uz_UZ.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_uz_UZ__
-#define __gnu_java_locale_LocaleInformation_uz_UZ__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_uz_UZ;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_uz_UZ : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_uz_UZ();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_uz_UZ__
diff --git a/libjava/gnu/java/locale/LocaleInformation_vi_VN.h b/libjava/gnu/java/locale/LocaleInformation_vi_VN.h
deleted file mode 100644
index 293c03b8179..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_vi_VN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_vi_VN__
-#define __gnu_java_locale_LocaleInformation_vi_VN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_vi_VN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_vi_VN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_vi_VN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_vi_VN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_yi_US.h b/libjava/gnu/java/locale/LocaleInformation_yi_US.h
deleted file mode 100644
index 613e0b2fa23..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_yi_US.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_yi_US__
-#define __gnu_java_locale_LocaleInformation_yi_US__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_yi_US;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_yi_US : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_yi_US();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_yi_US__
diff --git a/libjava/gnu/java/locale/LocaleInformation_zh_CN.h b/libjava/gnu/java/locale/LocaleInformation_zh_CN.h
deleted file mode 100644
index cefd2446a5a..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_zh_CN.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_zh_CN__
-#define __gnu_java_locale_LocaleInformation_zh_CN__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_zh_CN;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_zh_CN : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_zh_CN();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_zh_CN__
diff --git a/libjava/gnu/java/locale/LocaleInformation_zh_HK.h b/libjava/gnu/java/locale/LocaleInformation_zh_HK.h
deleted file mode 100644
index f0e0c18a71b..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_zh_HK.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_zh_HK__
-#define __gnu_java_locale_LocaleInformation_zh_HK__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_zh_HK;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_zh_HK : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_zh_HK();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_zh_HK__
diff --git a/libjava/gnu/java/locale/LocaleInformation_zh_SG.h b/libjava/gnu/java/locale/LocaleInformation_zh_SG.h
deleted file mode 100644
index 39f28d1a823..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_zh_SG.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_zh_SG__
-#define __gnu_java_locale_LocaleInformation_zh_SG__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_zh_SG;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_zh_SG : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_zh_SG();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_zh_SG__
diff --git a/libjava/gnu/java/locale/LocaleInformation_zh_TW.h b/libjava/gnu/java/locale/LocaleInformation_zh_TW.h
deleted file mode 100644
index 32cf3db4eaf..00000000000
--- a/libjava/gnu/java/locale/LocaleInformation_zh_TW.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_locale_LocaleInformation_zh_TW__
-#define __gnu_java_locale_LocaleInformation_zh_TW__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace locale
-      {
-          class LocaleInformation_zh_TW;
-      }
-    }
-  }
-}
-
-class gnu::java::locale::LocaleInformation_zh_TW : public ::java::util::ListResourceBundle
-{
-
-public:
-  LocaleInformation_zh_TW();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-public: // actually package-private
-  static ::java::lang::String * decimalSeparator;
-  static ::java::lang::String * groupingSeparator;
-  static ::java::lang::String * numberFormat;
-  static ::java::lang::String * percentFormat;
-  static JArray< ::java::lang::String * > * weekdays;
-  static JArray< ::java::lang::String * > * shortWeekdays;
-  static JArray< ::java::lang::String * > * shortMonths;
-  static JArray< ::java::lang::String * > * months;
-  static JArray< ::java::lang::String * > * ampms;
-  static ::java::lang::String * shortDateFormat;
-  static ::java::lang::String * defaultTimeFormat;
-  static ::java::lang::String * currencySymbol;
-  static ::java::lang::String * intlCurrencySymbol;
-  static ::java::lang::String * currencyFormat;
-private:
-  static JArray< JArray< ::java::lang::Object * > * > * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_locale_LocaleInformation_zh_TW__
diff --git a/libjava/gnu/java/math/MPN.h b/libjava/gnu/java/math/MPN.h
deleted file mode 100644
index 50289abae33..00000000000
--- 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/BASE64.h b/libjava/gnu/java/net/BASE64.h
deleted file mode 100644
index 77616ba5136..00000000000
--- a/libjava/gnu/java/net/BASE64.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_net_BASE64__
-#define __gnu_java_net_BASE64__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-          class BASE64;
-      }
-    }
-  }
-}
-
-class gnu::java::net::BASE64 : public ::java::lang::Object
-{
-
-  BASE64();
-public:
-  static JArray< jbyte > * encode(JArray< jbyte > *);
-  static JArray< jbyte > * decode(JArray< jbyte > *);
-  static void main(JArray< ::java::lang::String * > *);
-private:
-  static JArray< jbyte > * src;
-  static JArray< jbyte > * dst;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_net_BASE64__
diff --git a/libjava/gnu/java/net/CRLFInputStream.h b/libjava/gnu/java/net/CRLFInputStream.h
deleted file mode 100644
index 1c4df5cccfc..00000000000
--- 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 594d7ae6fa1..00000000000
--- 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 06c3f6f5290..00000000000
--- 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 11a4fce0968..00000000000
--- 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 df08b8197fe..00000000000
--- 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 7c82e46fa71..00000000000
--- a/libjava/gnu/java/net/GetLocalHostAction.h
+++ /dev/null
@@ -1,33 +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;
-      }
-    }
-  }
-}
-
-class gnu::java::net::GetLocalHostAction : public ::java::lang::Object
-{
-
-public:
-  GetLocalHostAction();
-  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 ace66785d40..00000000000
--- 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 41aba924a7d..00000000000
--- 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 2bbeec1b32e..00000000000
--- 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 194847efc18..00000000000
--- 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 c57296fafe2..00000000000
--- 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/PlainSocketImpl$SocketInputStream.h b/libjava/gnu/java/net/PlainSocketImpl$SocketInputStream.h
deleted file mode 100644
index 83ac40cf5a3..00000000000
--- 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 852e894f29e..00000000000
--- 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 7f13ea610b6..00000000000
--- a/libjava/gnu/java/net/PlainSocketImpl.h
+++ /dev/null
@@ -1,90 +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 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();
-public: // actually protected
-  void create(jboolean);
-  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);
-  ::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;
-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/URLParseError.h b/libjava/gnu/java/net/URLParseError.h
deleted file mode 100644
index c900dc0009d..00000000000
--- 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 37f1d12cafb..00000000000
--- 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 4592f7f9a90..00000000000
--- 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 68114ab3698..00000000000
--- 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 e9fe6a63804..00000000000
--- 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 da8a2aca194..00000000000
--- 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 69d2ef5ac6f..00000000000
--- 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/RemoteResource.h b/libjava/gnu/java/net/loader/RemoteResource.h
deleted file mode 100644
index 29ccf16a651..00000000000
--- 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 2c051651b2b..00000000000
--- 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 98b626f4ab8..00000000000
--- 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 76c294b1faa..00000000000
--- 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 a41d1d982bc..00000000000
--- 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 35969bc6520..00000000000
--- 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 c33f540a268..00000000000
--- 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 ef095f61031..00000000000
--- 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 8b1de381772..00000000000
--- 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 e45600120a1..00000000000
--- 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 517d9302761..00000000000
--- 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/protocol/core/Connection.h b/libjava/gnu/java/net/protocol/core/Connection.h
deleted file mode 100644
index d09908b4c7d..00000000000
--- 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/CoreInputStream.h b/libjava/gnu/java/net/protocol/core/CoreInputStream.h
deleted file mode 100644
index d6beb396584..00000000000
--- 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/Handler.h b/libjava/gnu/java/net/protocol/core/Handler.h
deleted file mode 100644
index 364e21abb03..00000000000
--- 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/file/Connection$StaticData.h b/libjava/gnu/java/net/protocol/file/Connection$StaticData.h
deleted file mode 100644
index 46ed9ac9588..00000000000
--- 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 160f80834ea..00000000000
--- 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 f3edf9a99f5..00000000000
--- 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 4ea352a7322..00000000000
--- 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 a6c0e18bf16..00000000000
--- 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 dd712fd2afc..00000000000
--- 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 75de07ded16..00000000000
--- 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 243ac7c7a59..00000000000
--- 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 132e9020afd..00000000000
--- 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 257479948dd..00000000000
--- 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 1e59c7afbd9..00000000000
--- 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 d0b1183f910..00000000000
--- 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 b22c2f24ac3..00000000000
--- 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 b7faeb99744..00000000000
--- 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 ab8c4e0c8da..00000000000
--- 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 7cdb24cf0a2..00000000000
--- 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 a4139287e7e..00000000000
--- 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 05839d6ab20..00000000000
--- 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 01a4a8a7882..00000000000
--- 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 2a344be90aa..00000000000
--- 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 7787c3b5e35..00000000000
--- 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 9ecf032efe7..00000000000
--- 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/Handler.h b/libjava/gnu/java/net/protocol/gcjlib/Handler.h
deleted file mode 100644
index 40813aeb548..00000000000
--- 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/http/Authenticator.h b/libjava/gnu/java/net/protocol/http/Authenticator.h
deleted file mode 100644
index c2390d2b3fc..00000000000
--- 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 2d9b51957c1..00000000000
--- 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 16a27056bcb..00000000000
--- a/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h
+++ /dev/null
@@ -1,58 +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();
-private:
-  static const jbyte CR = 13;
-  static const jbyte LF = 10;
-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 3c23640600a..00000000000
--- 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 f06ac974b44..00000000000
--- 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 e877d54d998..00000000000
--- 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 727cb83aebf..00000000000
--- 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 62aaa265b23..00000000000
--- 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 e0d1c462841..00000000000
--- 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 2a305bac87c..00000000000
--- 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 1e20e4ec9e4..00000000000
--- 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:
-  ::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 460928e6b92..00000000000
--- 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 bd96f2d8b1f..00000000000
--- 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 ecf4982f09b..00000000000
--- 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 d7c485c2511..00000000000
--- a/libjava/gnu/java/net/protocol/http/Headers.h
+++ /dev/null
@@ -1,64 +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();
-public: // actually package-private
-  virtual ::java::util::Iterator * iterator();
-public:
-  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 e70bbcc039d..00000000000
--- 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 2cf4693cf25..00000000000
--- 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 1bd32bc8637..00000000000
--- 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 928b212479b..00000000000
--- 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 055c019a1fc..00000000000
--- 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 e8259a8a2cb..00000000000
--- 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::List *, ::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 ce077f08f8e..00000000000
--- 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 03744bc671c..00000000000
--- 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 5456919fbaf..00000000000
--- 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 b5fb6b66e64..00000000000
--- 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 bc43e23da5a..00000000000
--- a/libjava/gnu/java/nio/ChannelInputStream.h
+++ /dev/null
@@ -1,46 +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>
-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();
-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 7ff1b8d800a..00000000000
--- 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 337473f4fcd..00000000000
--- 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 f78d294bd7b..00000000000
--- 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 26595caa514..00000000000
--- 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/DatagramChannelSelectionKey.h b/libjava/gnu/java/nio/DatagramChannelSelectionKey.h
deleted file mode 100644
index 629eed378e2..00000000000
--- 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/EpollSelectionKeyImpl.h b/libjava/gnu/java/nio/EpollSelectionKeyImpl.h
deleted file mode 100644
index 1674815153c..00000000000
--- a/libjava/gnu/java/nio/EpollSelectionKeyImpl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_EpollSelectionKeyImpl__
-#define __gnu_java_nio_EpollSelectionKeyImpl__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectionKey.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class EpollSelectionKeyImpl;
-          class EpollSelectorImpl;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::EpollSelectionKeyImpl : public ::java::nio::channels::spi::AbstractSelectionKey
-{
-
-public: // actually package-private
-  EpollSelectionKeyImpl(::gnu::java::nio::EpollSelectorImpl *, ::java::nio::channels::SelectableChannel *, jint);
-public:
-  virtual ::java::nio::channels::SelectableChannel * channel();
-  virtual jint interestOps();
-  virtual ::java::nio::channels::SelectionKey * interestOps(jint);
-  virtual jint readyOps();
-  virtual ::java::nio::channels::Selector * selector();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::nio::channels::spi::AbstractSelectionKey)))) fd;
-private:
-  ::gnu::java::nio::EpollSelectorImpl * selector__;
-  ::java::nio::channels::SelectableChannel * channel__;
-public: // actually package-private
-  jint interestOps__;
-  jint selectedOps;
-  jint key;
-  jboolean valid;
-  jboolean cancelled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_EpollSelectionKeyImpl__
diff --git a/libjava/gnu/java/nio/FileLockImpl.h b/libjava/gnu/java/nio/FileLockImpl.h
deleted file mode 100644
index ba1668be327..00000000000
--- a/libjava/gnu/java/nio/FileLockImpl.h
+++ /dev/null
@@ -1,44 +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 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/InputStreamChannel.h b/libjava/gnu/java/nio/InputStreamChannel.h
deleted file mode 100644
index b6631695d35..00000000000
--- 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/KqueueSelectionKeyImpl.h b/libjava/gnu/java/nio/KqueueSelectionKeyImpl.h
deleted file mode 100644
index 8a501b545cd..00000000000
--- a/libjava/gnu/java/nio/KqueueSelectionKeyImpl.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_nio_KqueueSelectionKeyImpl__
-#define __gnu_java_nio_KqueueSelectionKeyImpl__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectionKey.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-          class KqueueSelectionKeyImpl;
-          class KqueueSelectorImpl;
-          class VMChannelOwner;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-      }
-    }
-  }
-}
-
-class gnu::java::nio::KqueueSelectionKeyImpl : public ::java::nio::channels::spi::AbstractSelectionKey
-{
-
-public:
-  KqueueSelectionKeyImpl(::gnu::java::nio::KqueueSelectorImpl *, ::java::nio::channels::SelectableChannel *);
-  virtual ::java::nio::channels::SelectableChannel * channel();
-  virtual jint interestOps();
-  virtual ::java::nio::channels::SelectionKey * interestOps(jint);
-  virtual jint readyOps();
-  virtual ::java::nio::channels::Selector * selector();
-  virtual ::java::lang::String * toString();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  virtual jboolean isReadActive();
-  virtual jboolean isReadInterested();
-  virtual jboolean isWriteActive();
-  virtual jboolean isWriteInterested();
-  virtual jboolean needCommitRead();
-  virtual jboolean needCommitWrite();
-  jint __attribute__((aligned(__alignof__( ::java::nio::channels::spi::AbstractSelectionKey)))) interestOps__;
-  jint readyOps__;
-  jint activeOps;
-  jint key;
-  jint fd;
-private:
-  ::gnu::java::nio::KqueueSelectorImpl * selector__;
-  ::java::nio::channels::SelectableChannel * channel__;
-  ::gnu::java::nio::VMChannelOwner * natChannel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_nio_KqueueSelectionKeyImpl__
diff --git a/libjava/gnu/java/nio/NIOConstants.h b/libjava/gnu/java/nio/NIOConstants.h
deleted file mode 100644
index a27e4286d0c..00000000000
--- 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 3e76ec9c4ae..00000000000
--- 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 908a664af76..00000000000
--- 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/NIOSocket.h b/libjava/gnu/java/nio/NIOSocket.h
deleted file mode 100644
index b987a6c9e96..00000000000
--- 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/OutputStreamChannel.h b/libjava/gnu/java/nio/OutputStreamChannel.h
deleted file mode 100644
index 3a47ab97b1a..00000000000
--- 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 648de594b8d..00000000000
--- 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 fdc744bbf7a..00000000000
--- 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 63bfafb56de..00000000000
--- 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/SelectionKeyImpl.h b/libjava/gnu/java/nio/SelectionKeyImpl.h
deleted file mode 100644
index 29e0dca2cc7..00000000000
--- 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 5db33c8aa0f..00000000000
--- 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 e2ad8e41d91..00000000000
--- 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/ServerSocketChannelImpl.h b/libjava/gnu/java/nio/ServerSocketChannelImpl.h
deleted file mode 100644
index 28f6d981127..00000000000
--- 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/ServerSocketChannelSelectionKey.h b/libjava/gnu/java/nio/ServerSocketChannelSelectionKey.h
deleted file mode 100644
index 43e35932c9a..00000000000
--- 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/SocketChannelImpl.h b/libjava/gnu/java/nio/SocketChannelImpl.h
deleted file mode 100644
index b180918d6c6..00000000000
--- 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/SocketChannelSelectionKey.h b/libjava/gnu/java/nio/SocketChannelSelectionKey.h
deleted file mode 100644
index f9d5f297f81..00000000000
--- 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/SocketChannelSelectionKeyImpl.h b/libjava/gnu/java/nio/SocketChannelSelectionKeyImpl.h
deleted file mode 100644
index b3ab4900fe5..00000000000
--- 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/VMChannel.h b/libjava/gnu/java/nio/VMChannel.h
deleted file mode 100644
index 288805137e0..00000000000
--- 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/VMChannelOwner.h b/libjava/gnu/java/nio/VMChannelOwner.h
deleted file mode 100644
index eca43b54391..00000000000
--- 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 3a94c1e38aa..00000000000
--- 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/VMSelector.h b/libjava/gnu/java/nio/VMSelector.h
deleted file mode 100644
index cc177ff9e64..00000000000
--- 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/channels/FileChannelImpl.h b/libjava/gnu/java/nio/channels/FileChannelImpl.h
deleted file mode 100644
index 34099c52ffb..00000000000
--- 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/charset/ByteCharset$Decoder.h b/libjava/gnu/java/nio/charset/ByteCharset$Decoder.h
deleted file mode 100644
index 584b15fe5ba..00000000000
--- a/libjava/gnu/java/nio/charset/ByteCharset$Decoder.h
+++ /dev/null
@@ -1,55 +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;
-        }
-      }
-    }
-  }
-  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 *);
-private:
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::nio::charset::CharsetDecoder)))) lookup;
-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 cc31ae43eec..00000000000
--- a/libjava/gnu/java/nio/charset/ByteCharset$Encoder.h
+++ /dev/null
@@ -1,58 +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;
-        }
-      }
-    }
-  }
-  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 *);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::nio::charset::CharsetEncoder)))) lookup;
-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 045e03fde28..00000000000
--- 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 * > *);
-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/Cp424.h b/libjava/gnu/java/nio/charset/Cp424.h
deleted file mode 100644
index 29ea29f6793..00000000000
--- 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 5593ff0ca6c..00000000000
--- 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 583075b7c02..00000000000
--- 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 995b7f6219d..00000000000
--- 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 e1a17dedada..00000000000
--- 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 e5ff8292d59..00000000000
--- 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 2ff372c7646..00000000000
--- 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 eba0a48a4fb..00000000000
--- 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 a93098358a8..00000000000
--- 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 04d202c7f45..00000000000
--- 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 8ddc349f5b7..00000000000
--- 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 76902574aa4..00000000000
--- 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 3f245f7ade2..00000000000
--- 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 78c43729e34..00000000000
--- 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 2c6375a9e7d..00000000000
--- 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 bc67408deed..00000000000
--- 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 590f84d7785..00000000000
--- 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 89cf7f1fe4c..00000000000
--- a/libjava/gnu/java/nio/charset/EncodingHelper.h
+++ /dev/null
@@ -1,52 +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 *);
-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$Decoder.h b/libjava/gnu/java/nio/charset/ISO_8859_1$Decoder.h
deleted file mode 100644
index 8adb8b83bcd..00000000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_1$Decoder.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$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 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 *);
-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 47d2280cbb5..00000000000
--- a/libjava/gnu/java/nio/charset/ISO_8859_1$Encoder.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$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 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 *);
-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 dc03558f989..00000000000
--- 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 dfe4240afb8..00000000000
--- 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 617e2271be8..00000000000
--- 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 e201ddc5528..00000000000
--- 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 3c468fd5228..00000000000
--- 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 f338bf002a5..00000000000
--- 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 4d626d022c2..00000000000
--- 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 0ce45f24d54..00000000000
--- 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 0c661fa92f5..00000000000
--- 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 96a255e43f6..00000000000
--- 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 a5030b7888b..00000000000
--- 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 db07f142bd2..00000000000
--- 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 c22c860b642..00000000000
--- 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 c91c915f0c5..00000000000
--- 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 8c03767f2d8..00000000000
--- 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 4190da579ce..00000000000
--- 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 05995390be0..00000000000
--- 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 df1f52fbb93..00000000000
--- 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 e8878e8ee38..00000000000
--- 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 a648b80cd4b..00000000000
--- 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 ecc89ed4fa4..00000000000
--- 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 e9ca0b1b407..00000000000
--- 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 dbf916687cf..00000000000
--- 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 077c35d2646..00000000000
--- 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 880faccf5c6..00000000000
--- a/libjava/gnu/java/nio/charset/Provider$1.h
+++ /dev/null
@@ -1,37 +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$1;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::nio::charset::Provider$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Provider$1();
-public:
-  ::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 04495ed8c73..00000000000
--- 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$Decoder.h b/libjava/gnu/java/nio/charset/US_ASCII$Decoder.h
deleted file mode 100644
index c0c09bc32f7..00000000000
--- a/libjava/gnu/java/nio/charset/US_ASCII$Decoder.h
+++ /dev/null
@@ -1,51 +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 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 *);
-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 7a30c343c6e..00000000000
--- a/libjava/gnu/java/nio/charset/US_ASCII$Encoder.h
+++ /dev/null
@@ -1,54 +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 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 *);
-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 297cf111426..00000000000
--- 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 afb0fd8faa9..00000000000
--- 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 8b2bccfed26..00000000000
--- 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 b23c3e72b96..00000000000
--- 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 9dc49948411..00000000000
--- 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 8b5ee1b3566..00000000000
--- 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 89ec73287d1..00000000000
--- 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 13745f2931e..00000000000
--- 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 0be5e400a37..00000000000
--- 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 8086fd8a64c..00000000000
--- 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 3e0bdae7e56..00000000000
--- 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 5671f5a47b6..00000000000
--- 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 f1e18a51b91..00000000000
--- 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 4c9199d6f6a..00000000000
--- 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 d14346deb95..00000000000
--- 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 e8367b4a475..00000000000
--- 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 c29502bd4a9..00000000000
--- 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 6f9c0ec4a9c..00000000000
--- 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 2c7ea3185ca..00000000000
--- 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/rmi/RMIMarshalledObjectInputStream.h b/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.h
deleted file mode 100644
index ad170da547c..00000000000
--- 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 6a1c87e367f..00000000000
--- 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 81607a34f86..00000000000
--- 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 74a78f11ade..00000000000
--- 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 2f1cb0eec97..00000000000
--- 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 457c112ede1..00000000000
--- 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 ed869a29027..00000000000
--- 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 e0f91a1990e..00000000000
--- 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 3133f2ca453..00000000000
--- 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 f37555ad924..00000000000
--- 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 7d31934041a..00000000000
--- 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 506bdcc14dd..00000000000
--- 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 d4ae0194564..00000000000
--- 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 898d8e8887d..00000000000
--- 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 89834426478..00000000000
--- 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 6a9025ae76b..00000000000
--- 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 5241331e966..00000000000
--- 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 5d4c6c9e624..00000000000
--- 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 9b98afc9e13..00000000000
--- 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;
-  volatile jboolean 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 eccfb38360b..00000000000
--- 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 d9b08e7f9df..00000000000
--- 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 4afe1703993..00000000000
--- 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 b1078ffb464..00000000000
--- a/libjava/gnu/java/rmi/server/RMIClassLoaderImpl$MyClassLoader.h
+++ /dev/null
@@ -1,52 +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 *);
-private:
-  RMIClassLoaderImpl$MyClassLoader(JArray< ::java::net::URL * > *, ::java::lang::ClassLoader *);
-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 abcb8fc6981..00000000000
--- 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 32da2951278..00000000000
--- 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 0bb00ec1159..00000000000
--- 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 5938877f22a..00000000000
--- 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 3af69a2889b..00000000000
--- 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 6f6382d94b3..00000000000
--- 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 fab4664a9d4..00000000000
--- 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 dbc2d429b05..00000000000
--- 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 98f5d0d7b14..00000000000
--- 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 cbfd5826f7c..00000000000
--- 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:
-  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 dd6b828317d..00000000000
--- 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:
-  volatile ::java::lang::Thread * 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 089b35df924..00000000000
--- 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 acf348091ca..00000000000
--- 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 7a903b64631..00000000000
--- 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 d6808a6e32e..00000000000
--- 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 14c9e5a5a3d..00000000000
--- 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 5ebf3633c9a..00000000000
--- 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 62299d9cde2..00000000000
--- 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 ea2bb7049a6..00000000000
--- 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 53447ecb370..00000000000
--- 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 40347732d08..00000000000
--- 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 22eb4898ef1..00000000000
--- 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:
-  ::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 768e3d98cb0..00000000000
--- 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 43e0b2a8609..00000000000
--- 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:
-  ::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 d28d18e9c13..00000000000
--- 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 164bb9f8ebd..00000000000
--- 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 879a873a259..00000000000
--- 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 ce401be9db8..00000000000
--- 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 * target$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 7308876d7cb..00000000000
--- 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 * target$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 312a6161691..00000000000
--- 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 ab1a66cce30..00000000000
--- 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 8eae41ecd72..00000000000
--- 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 06c0242ceb6..00000000000
--- 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 34c3e7a80cc..00000000000
--- 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 1bc7cbd60a9..00000000000
--- 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 1b59badbf3c..00000000000
--- 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 dc417bf76e0..00000000000
--- 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 7e59f85db35..00000000000
--- 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 a9572543bc5..00000000000
--- 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 a7ea52c783c..00000000000
--- 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 f2ec075509e..00000000000
--- 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 265d03a4222..00000000000
--- 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 648a293ca7f..00000000000
--- 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 044a202705f..00000000000
--- 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 f8a735a748f..00000000000
--- 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 64ea5922a62..00000000000
--- 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 8f6376efeae..00000000000
--- 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 e2d3274d9f9..00000000000
--- 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 f24e3fbd22f..00000000000
--- 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 96f261d5dd7..00000000000
--- 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 628a43af1d5..00000000000
--- 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 503da66b54d..00000000000
--- 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 764ed786904..00000000000
--- 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 93136ce9042..00000000000
--- 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 436ff6b70c2..00000000000
--- 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 71d304a0f50..00000000000
--- 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 88aeccdea71..00000000000
--- 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 0bc60f7a383..00000000000
--- 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 06e97fc9d09..00000000000
--- 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 f12d4caa22f..00000000000
--- 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 35f1979fed8..00000000000
--- 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 79f5e496064..00000000000
--- 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 d4fc3924e95..00000000000
--- 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 206ff8220ec..00000000000
--- 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 2270ffe824c..00000000000
--- 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 f193304e1af..00000000000
--- 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 42897e8a5d0..00000000000
--- 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 a8d883e9019..00000000000
--- 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 727d444e92d..00000000000
--- 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 053a305aa12..00000000000
--- 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 0f11deb53bf..00000000000
--- 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 8e5cc27f880..00000000000
--- 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 51afaea58a9..00000000000
--- 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 f590267fde4..00000000000
--- 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 71b29f7734d..00000000000
--- a/libjava/gnu/java/security/jce/prng/SecureRandomAdapter.h
+++ /dev/null
@@ -1,52 +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:
-  virtual JArray< jbyte > * engineGenerateSeed(jint);
-  virtual void engineNextBytes(JArray< jbyte > *);
-  virtual void engineSetSeed(JArray< jbyte > *);
-private:
-  ::gnu::java::security::prng::MDGenerator * __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) adaptee;
-  ::java::lang::String * mdName;
-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 dc896ab567a..00000000000
--- 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 73e676cea01..00000000000
--- 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 2f76f6903ba..00000000000
--- 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 0209fec8333..00000000000
--- 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 238685cc6ee..00000000000
--- 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/WhirlpoolRandomSpi.h b/libjava/gnu/java/security/jce/prng/WhirlpoolRandomSpi.h
deleted file mode 100644
index 4d31a5e8d40..00000000000
--- 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/sig/DSSKeyFactory.h b/libjava/gnu/java/security/jce/sig/DSSKeyFactory.h
deleted file mode 100644
index 139ee5ddf15..00000000000
--- 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 38a6a941920..00000000000
--- 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 6d6f612bdcc..00000000000
--- 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 292069400ff..00000000000
--- 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 d135b61f9b9..00000000000
--- 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 23dced6dbe8..00000000000
--- 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 9a7778408cb..00000000000
--- 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 68ae75f3230..00000000000
--- 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 919b74feafb..00000000000
--- 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 8c10a0a125b..00000000000
--- 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 97f6aced88f..00000000000
--- 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 56ad41681f0..00000000000
--- 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 fc595d46520..00000000000
--- 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 93a886c271c..00000000000
--- 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 9b736522ad8..00000000000
--- 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 db01a6e1452..00000000000
--- 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 13ea935437c..00000000000
--- 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 68fdd64cb0f..00000000000
--- 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 61a4f1849ab..00000000000
--- 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 1ae2a486190..00000000000
--- 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 e6ac55fa93e..00000000000
--- 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 4d877a3154b..00000000000
--- 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 de8ebb2500e..00000000000
--- 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 e78abe027a5..00000000000
--- 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 98813dc7103..00000000000
--- 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 cc22055d6dc..00000000000
--- 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 c56ba1cf956..00000000000
--- 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 b7816b86ac2..00000000000
--- 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 bffd46237b6..00000000000
--- 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 1b972d44843..00000000000
--- 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 77a57b0a654..00000000000
--- 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 3033418ae07..00000000000
--- 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 149a685788e..00000000000
--- 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 b59d0be30a2..00000000000
--- 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 174fea9d432..00000000000
--- 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 0715d81519d..00000000000
--- 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 53abc9e9f5d..00000000000
--- 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 5ec26a05f13..00000000000
--- 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 65b0b11e1c2..00000000000
--- 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 5a020cff7d4..00000000000
--- 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 4b20623ef84..00000000000
--- 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 8f7377ac8a4..00000000000
--- 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 54a7373f64c..00000000000
--- 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 3dede836ce9..00000000000
--- 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 d14566c8943..00000000000
--- 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 a1e3f28cd79..00000000000
--- 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 2b26396339f..00000000000
--- 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 5aef74becb3..00000000000
--- 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 947bfe5bef9..00000000000
--- 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 b2259548494..00000000000
--- 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 6bcea38e593..00000000000
--- 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:
-  ::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 78c78faa771..00000000000
--- 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 196a93a9acd..00000000000
--- 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 67fdd90676a..00000000000
--- 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 2f4ab0e9844..00000000000
--- 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 b02f28f5f3e..00000000000
--- 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 8924c122493..00000000000
--- 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 56295cbe340..00000000000
--- 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 344c34c84da..00000000000
--- 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 96781ef3d1b..00000000000
--- 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 5229cdd311a..00000000000
--- 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 d7428b37c8c..00000000000
--- 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 a0c3987ab31..00000000000
--- 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 780e29d8a6b..00000000000
--- 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 3a850323316..00000000000
--- 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 5ad5114911c..00000000000
--- 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 082229302bb..00000000000
--- 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 2fe018f9ef5..00000000000
--- 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 4e9da2abc32..00000000000
--- 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 4360889721c..00000000000
--- 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 a7efde3400f..00000000000
--- 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 c8b9b24973d..00000000000
--- 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/Base64.h b/libjava/gnu/java/security/util/Base64.h
deleted file mode 100644
index e75b6b57b06..00000000000
--- a/libjava/gnu/java/security/util/Base64.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_security_util_Base64__
-#define __gnu_java_security_util_Base64__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace util
-        {
-            class Base64;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::security::util::Base64 : public ::java::lang::Object
-{
-
-  Base64();
-public:
-  static ::java::lang::String * encode(JArray< jbyte > *);
-  static ::java::lang::String * encode(JArray< jbyte > *, jint, jint, jboolean);
-  static JArray< jbyte > * decode(::java::lang::String *);
-  static JArray< jbyte > * decode(JArray< jbyte > *, jint, jint);
-private:
-  static JArray< jbyte > * encode3to4(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  static jint decode4to3(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
-  static ::java::util::logging::Logger * log;
-  static const jint MAX_LINE_LENGTH = 76;
-  static const jbyte NEW_LINE = 10;
-  static const jbyte EQUALS_SIGN = 61;
-  static const jbyte WHITE_SPACE_ENC = -5;
-  static const jbyte EQUALS_SIGN_ENC = -1;
-  static JArray< jbyte > * ALPHABET;
-  static JArray< jbyte > * DECODABET;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_security_util_Base64__
diff --git a/libjava/gnu/java/security/util/ByteArray.h b/libjava/gnu/java/security/util/ByteArray.h
deleted file mode 100644
index 6eef185dc4f..00000000000
--- 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 cfb43d39953..00000000000
--- 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 42ec67e7e5a..00000000000
--- 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 8d39fbb7d6c..00000000000
--- 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 094dc718acb..00000000000
--- 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 019395d1999..00000000000
--- 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 8c13f14dfe1..00000000000
--- 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:
-  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 96a7b24b2fd..00000000000
--- 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 48b45d749d0..00000000000
--- 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 3dd531300d7..00000000000
--- 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 881c5ff90e5..00000000000
--- 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 dc3c1c77d84..00000000000
--- 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 5e7764e137c..00000000000
--- 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 d91dc7b03bd..00000000000
--- 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 1786e4b2acc..00000000000
--- 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 4a6d4c2f219..00000000000
--- 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 c2e94966269..00000000000
--- 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 76d5e1e3181..00000000000
--- 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 7b272f75e02..00000000000
--- 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 2fc953759ee..00000000000
--- 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 5aaadc6dcbc..00000000000
--- 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 12a12af5a4e..00000000000
--- 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 024e4031255..00000000000
--- a/libjava/gnu/java/security/x509/X509Certificate.h
+++ /dev/null
@@ -1,140 +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 ::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 71b6f602182..00000000000
--- 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 96fffb51210..00000000000
--- 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 ef56baae8ec..00000000000
--- 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 3e6724e6c46..00000000000
--- a/libjava/gnu/java/security/x509/ext/CertificatePolicies.h
+++ /dev/null
@@ -1,51 +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 * 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 61f5f1d0572..00000000000
--- 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 04f069ea5b8..00000000000
--- 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 0e660f918a8..00000000000
--- 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/GeneralNames.h b/libjava/gnu/java/security/x509/ext/GeneralNames.h
deleted file mode 100644
index 8765d18e71a..00000000000
--- a/libjava/gnu/java/security/x509/ext/GeneralNames.h
+++ /dev/null
@@ -1,54 +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();
-  static const jint OTHER_NAME = 0;
-  static const jint RFC822_NAME = 1;
-  static const jint DNS_NAME = 2;
-  static const jint X400_ADDRESS = 3;
-  static const jint DIRECTORY_NAME = 4;
-  static const jint EDI_PARTY_NAME = 5;
-  static const jint URI = 6;
-  static const jint IP_ADDRESS = 7;
-  static const jint REGISTERED_ID = 8;
-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/IssuerAlternativeNames.h b/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.h
deleted file mode 100644
index 50b3f35a687..00000000000
--- 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 4293755ad27..00000000000
--- 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/PolicyConstraint.h b/libjava/gnu/java/security/x509/ext/PolicyConstraint.h
deleted file mode 100644
index 1846d461fd6..00000000000
--- 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 2741db3fa9a..00000000000
--- 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 0d14162b786..00000000000
--- 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 03a3c454a2f..00000000000
--- 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 80e9ac05516..00000000000
--- 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 46cb0f4d6af..00000000000
--- 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 a37b3996749..00000000000
--- a/libjava/gnu/java/text/AttributedFormatBuffer.h
+++ /dev/null
@@ -1,70 +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 text
-      {
-          class AttributedFormatBuffer;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-}
-
-class gnu::java::text::AttributedFormatBuffer : public ::java::lang::Object
-{
-
-public:
-  AttributedFormatBuffer(::java::lang::StringBuffer *);
-  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 > *, JArray< ::java::util::HashMap * > *);
-  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 ::java::lang::StringBuffer * getBuffer();
-  virtual JArray< jint > * getRanges();
-  virtual JArray< ::java::util::HashMap * > * getAttributes();
-private:
-  ::java::lang::StringBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::java::util::ArrayList * ranges;
-  ::java::util::ArrayList * attributes;
-  JArray< jint > * a_ranges;
-  JArray< ::java::util::HashMap * > * a_attributes;
-  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 50998950fcc..00000000000
--- 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 39d681cbc7a..00000000000
--- 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 267cf6fb013..00000000000
--- 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 > *, JArray< ::java::util::HashMap * > *) = 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 82c7fa02e4d..00000000000
--- 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 > *, JArray< ::java::util::HashMap * > *);
-  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(JArray< ::java::util::HashMap * > *, 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::HashMap *, 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;
-  JArray< ::java::util::HashMap * > * 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 0c4c428c564..00000000000
--- 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 ae54389004a..00000000000
--- 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 9ee5bf8cb7e..00000000000
--- 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 > *, JArray< ::java::util::HashMap * > *);
-  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 bcf75bdd937..00000000000
--- 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/DoubleEnumeration.h b/libjava/gnu/java/util/DoubleEnumeration.h
deleted file mode 100644
index d1ec0ca3525..00000000000
--- 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 78ab0fc1e78..00000000000
--- 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
-{
-
-  EmptyEnumeration();
-public:
-  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/WeakIdentityHashMap$1.h b/libjava/gnu/java/util/WeakIdentityHashMap$1.h
deleted file mode 100644
index d71175c869f..00000000000
--- 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:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  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 5a7c0dda2ae..00000000000
--- 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 ec84addc698..00000000000
--- 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 136c1dec243..00000000000
--- 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 6bf3aeb7f85..00000000000
--- 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/jar/JarUtils.h b/libjava/gnu/java/util/jar/JarUtils.h
deleted file mode 100644
index 4704582d0db..00000000000
--- a/libjava/gnu/java/util/jar/JarUtils.h
+++ /dev/null
@@ -1,71 +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 *);
-  static ::java::util::logging::Logger * log;
-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/EventDispatcher.h b/libjava/gnu/java/util/prefs/EventDispatcher.h
deleted file mode 100644
index 235aabb5ccf..00000000000
--- a/libjava/gnu/java/util/prefs/EventDispatcher.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_EventDispatcher__
-#define __gnu_java_util_prefs_EventDispatcher__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class EventDispatcher;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::EventDispatcher : public ::java::lang::Thread
-{
-
-  EventDispatcher();
-public:
-  virtual void run();
-  static void dispatch(::java::lang::Runnable *);
-private:
-  static ::java::lang::Thread * dispatchThread;
-  static ::java::util::ArrayList * queue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_EventDispatcher__
diff --git a/libjava/gnu/java/util/prefs/FileBasedFactory.h b/libjava/gnu/java/util/prefs/FileBasedFactory.h
deleted file mode 100644
index 9dfcca3512b..00000000000
--- 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 279738084ad..00000000000
--- 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:
-  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 0b699989fb0..00000000000
--- 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 eca98e33c1e..00000000000
--- 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 54f9f011104..00000000000
--- 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 7eb4c3d4b19..00000000000
--- 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 5e73aa0eddd..00000000000
--- 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 e62b0237573..00000000000
--- 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 65b7380d007..00000000000
--- 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 5d0945a32dc..00000000000
--- a/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h
+++ /dev/null
@@ -1,72 +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>
-#include <gcj/array.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 *);
-  void startWatchingNode(::java::lang::String *);
-  void stopWatchingNode(::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_client_dir_exists(::java::lang::String *);
-  static void gconf_client_add_dir(::java::lang::String *);
-  static void gconf_client_remove_dir(::java::lang::String *);
-  static jboolean gconf_client_set_string(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * gconf_client_get_string(::java::lang::String *);
-  static jboolean gconf_client_unset(::java::lang::String *);
-  static void gconf_client_suggest_sync();
-  static ::java::util::List * gconf_client_all_nodes(::java::lang::String *);
-  static ::java::util::List * gconf_client_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 *);
-private:
-  static JArray< ::java::lang::Object * > * semaphore;
-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 00d9e51fc9e..00000000000
--- 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 94ab3fdd682..00000000000
--- 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 0f2687a6866..00000000000
--- 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 30e97db5561..00000000000
--- 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 f45b1460b97..00000000000
--- 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 46c8582669a..00000000000
--- 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 e250a31d8ac..00000000000
--- 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 497422bfa59..00000000000
--- 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 d39ea7bc54f..00000000000
--- 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 2ca308880e1..00000000000
--- 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 88019c2939d..00000000000
--- 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 a874f8500fa..00000000000
--- 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 539587703dc..00000000000
--- 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 4d431958915..00000000000
--- a/libjava/gnu/java/util/regex/RE.h
+++ /dev/null
@@ -1,146 +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 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, ::java::lang::StringBuffer *);
-public: // actually package-private
-  virtual ::gnu::java::util::regex::REMatch * getMatchImpl(::gnu::java::util::regex::CharIndexed *, jint, jint, ::java::lang::StringBuffer *);
-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, ::java::lang::StringBuffer *);
-  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(::java::lang::StringBuffer *);
-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 da4560b2fe8..00000000000
--- a/libjava/gnu/java/util/regex/REException.h
+++ /dev/null
@@ -1,56 +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);
-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 2bed2653615..00000000000
--- 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 363bb74a45b..00000000000
--- 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 caab8c81e2f..00000000000
--- a/libjava/gnu/java/util/regex/REMatchEnumeration.h
+++ /dev/null
@@ -1,55 +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 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(::java::lang::StringBuffer *);
-  virtual ::java::lang::Object * nextElement();
-  virtual ::gnu::java::util::regex::REMatch * nextMatch();
-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 59c8de002e9..00000000000
--- 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 49ef5aef0c7..00000000000
--- a/libjava/gnu/java/util/regex/REToken.h
+++ /dev/null
@@ -1,71 +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 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(::java::lang::StringBuffer *) = 0;
-  virtual void dumpAll(::java::lang::StringBuffer *);
-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 d50be3d64fb..00000000000
--- a/libjava/gnu/java/util/regex/RETokenAny.h
+++ /dev/null
@@ -1,48 +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 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(::java::lang::StringBuffer *);
-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 33cf3b679c2..00000000000
--- a/libjava/gnu/java/util/regex/RETokenBackRef.h
+++ /dev/null
@@ -1,43 +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 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(::java::lang::StringBuffer *);
-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 abff1cdd803..00000000000
--- a/libjava/gnu/java/util/regex/RETokenChar.h
+++ /dev/null
@@ -1,56 +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 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(::java::lang::StringBuffer *);
-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 cdcb5b06000..00000000000
--- a/libjava/gnu/java/util/regex/RETokenEnd.h
+++ /dev/null
@@ -1,50 +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 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(::java::lang::StringBuffer *);
-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 72f54647e82..00000000000
--- a/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h
+++ /dev/null
@@ -1,43 +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 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(::java::lang::StringBuffer *);
-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 50f3281cae7..00000000000
--- a/libjava/gnu/java/util/regex/RETokenEndSub.h
+++ /dev/null
@@ -1,43 +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 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(::java::lang::StringBuffer *);
-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 f13c6b3eb6c..00000000000
--- a/libjava/gnu/java/util/regex/RETokenIndependent.h
+++ /dev/null
@@ -1,44 +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 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(::java::lang::StringBuffer *);
-  ::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 64c147c530e..00000000000
--- a/libjava/gnu/java/util/regex/RETokenLookAhead.h
+++ /dev/null
@@ -1,44 +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 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(::java::lang::StringBuffer *);
-  ::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 83d9b477a23..00000000000
--- a/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h
+++ /dev/null
@@ -1,43 +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 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(::java::lang::StringBuffer *);
-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 b07cf6ccc9f..00000000000
--- a/libjava/gnu/java/util/regex/RETokenLookBehind.h
+++ /dev/null
@@ -1,44 +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 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(::java::lang::StringBuffer *);
-  ::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 3ed8949cfdb..00000000000
--- 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:
-  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 bc5efe1001c..00000000000
--- 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$POSIXHandler.h b/libjava/gnu/java/util/regex/RETokenNamedProperty$POSIXHandler.h
deleted file mode 100644
index 121acccad0d..00000000000
--- 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 c2890ed2386..00000000000
--- 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 af6c5aee0ae..00000000000
--- 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 f090dbd1ac0..00000000000
--- 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 9f610cd7ade..00000000000
--- a/libjava/gnu/java/util/regex/RETokenNamedProperty.h
+++ /dev/null
@@ -1,64 +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 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(::java::lang::StringBuffer *);
-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 dec0561b405..00000000000
--- a/libjava/gnu/java/util/regex/RETokenOneOf.h
+++ /dev/null
@@ -1,62 +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 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::Vector *, jboolean);
-  RETokenOneOf(jint, ::java::util::Vector *, ::java::util::Vector *, 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(::java::lang::StringBuffer *);
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) options;
-  jboolean negative;
-  jboolean matchesOneChar;
-  ::java::util::Vector * 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 a6a40c09ab3..00000000000
--- a/libjava/gnu/java/util/regex/RETokenPOSIX.h
+++ /dev/null
@@ -1,64 +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 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(::java::lang::StringBuffer *);
-  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 22ff21a3f03..00000000000
--- a/libjava/gnu/java/util/regex/RETokenRange.h
+++ /dev/null
@@ -1,49 +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 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(::java::lang::StringBuffer *);
-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 8b92ce52743..00000000000
--- 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 5858aeda35f..00000000000
--- 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$FindMatchControlStack.h b/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.h
deleted file mode 100644
index 11bf5c18225..00000000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_regex_RETokenRepeated$FindMatchControlStack__
-#define __gnu_java_util_regex_RETokenRepeated$FindMatchControlStack__
-
-#pragma interface
-
-#include <java/util/ArrayList.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RETokenRepeated$FindMatchControl;
-            class RETokenRepeated$FindMatchControlStack;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::regex::RETokenRepeated$FindMatchControlStack : public ::java::util::ArrayList
-{
-
-  RETokenRepeated$FindMatchControlStack();
-  void push(::gnu::java::util::regex::RETokenRepeated$FindMatchControl *);
-  ::gnu::java::util::regex::RETokenRepeated$FindMatchControl * pop();
-  jboolean empty();
-public: // actually package-private
-  RETokenRepeated$FindMatchControlStack(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *);
-  static void access$1(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *, ::gnu::java::util::regex::RETokenRepeated$FindMatchControl *);
-  static jboolean access$2(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *);
-  static ::gnu::java::util::regex::RETokenRepeated$FindMatchControl * access$3(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_regex_RETokenRepeated$FindMatchControlStack__
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 6253b64921f..00000000000
--- 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 5a6ef3b42d1..00000000000
--- 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 17de5445b1f..00000000000
--- a/libjava/gnu/java/util/regex/RETokenRepeated.h
+++ /dev/null
@@ -1,76 +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 util
-      {
-        namespace regex
-        {
-            class BacktrackStack;
-            class CharIndexed;
-            class REMatch;
-            class REToken;
-            class RETokenRepeated;
-            class RETokenRepeated$DoablesFinder;
-            class RETokenRepeated$FindMatchControlStack;
-            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 *, ::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *);
-  ::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(::java::lang::StringBuffer *);
-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 da6ad7f38bd..00000000000
--- a/libjava/gnu/java/util/regex/RETokenStart.h
+++ /dev/null
@@ -1,47 +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 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(::java::lang::StringBuffer *);
-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 1d3bb6b97c4..00000000000
--- a/libjava/gnu/java/util/regex/RETokenWordBoundary.h
+++ /dev/null
@@ -1,49 +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 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(::java::lang::StringBuffer *);
-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 23a2898891c..00000000000
--- 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/crypto/RSACipherImpl.h b/libjava/gnu/javax/crypto/RSACipherImpl.h
deleted file mode 100644
index 9f677598751..00000000000
--- 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 81c2fece1f3..00000000000
--- 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 88f82383cdb..00000000000
--- 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 b36ee47c91e..00000000000
--- 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 780d2582f7f..00000000000
--- 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 7021c177e41..00000000000
--- 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 207a55f0d5c..00000000000
--- 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 bf6ccc90ccc..00000000000
--- 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 760df956cbe..00000000000
--- 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 792a1bad5ba..00000000000
--- 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 6a16b608e11..00000000000
--- 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 799ef5e695a..00000000000
--- 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 1860d3d30dd..00000000000
--- 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 cb9e92a4f99..00000000000
--- 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 b9a40b847f0..00000000000
--- 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 bb6437df611..00000000000
--- 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 738cb373212..00000000000
--- 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 74c9087eab5..00000000000
--- 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 dac15df6ccb..00000000000
--- 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 7f1ecc0561a..00000000000
--- 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 40cebee7c72..00000000000
--- 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 97f49ea79dd..00000000000
--- 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 f25456f4d4d..00000000000
--- 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 a5830d835d1..00000000000
--- 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 662389b264c..00000000000
--- 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 35e686dda51..00000000000
--- 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 734bab28ec5..00000000000
--- 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 5199488c50e..00000000000
--- 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 2511bfe662b..00000000000
--- 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 ee098e01ab2..00000000000
--- 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 20b9a5bf779..00000000000
--- 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 cae545c19c2..00000000000
--- 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 f2602150226..00000000000
--- 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 cbe5a6c5f36..00000000000
--- 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 5c2d7cb9583..00000000000
--- 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 42d12100fa9..00000000000
--- 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 3cd0578dea9..00000000000
--- 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 2ccd2941876..00000000000
--- 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:
-  ::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 fa9cb5774f8..00000000000
--- 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 fd07c636a3e..00000000000
--- 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:
-  ::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 bf624a12a6c..00000000000
--- 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 30227d8f302..00000000000
--- 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 4d18fa3cf6b..00000000000
--- 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 b55a29dd0c7..00000000000
--- 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 2e8599cbc48..00000000000
--- 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 5bfcdf369fd..00000000000
--- 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 9e058d6d474..00000000000
--- 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 70529e146fc..00000000000
--- 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 002272c8407..00000000000
--- 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 6df181d1c0a..00000000000
--- 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 e035c279ff9..00000000000
--- 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 bb08d2a96f5..00000000000
--- 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 4ad9b2e64a5..00000000000
--- 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 97ef99b6b35..00000000000
--- 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 524f2f9b402..00000000000
--- 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 b19897b29d1..00000000000
--- 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 f8770058754..00000000000
--- 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 d20e50642d6..00000000000
--- 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 dd73ecca801..00000000000
--- 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 677f8e9b560..00000000000
--- 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 c7de4802802..00000000000
--- 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 aed783b58d7..00000000000
--- 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 dbba171aaa2..00000000000
--- 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 751abfe0158..00000000000
--- 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 59a2c919c3a..00000000000
--- 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 43a5a6e350d..00000000000
--- 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 76ace5867e1..00000000000
--- 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 62c4749c50f..00000000000
--- 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 eb6bb4cd19a..00000000000
--- 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 c90eb389985..00000000000
--- 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 c370b08db6a..00000000000
--- 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 6252b4b3488..00000000000
--- 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 57eab6c4d8e..00000000000
--- 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 cbec0119876..00000000000
--- 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 242887a8f6c..00000000000
--- 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 e81b65b1f09..00000000000
--- 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 1c4787f290f..00000000000
--- 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 42cd2c2b450..00000000000
--- 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 96473880609..00000000000
--- 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 d8dc2947015..00000000000
--- 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 777337be155..00000000000
--- 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 a4874de7a64..00000000000
--- 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 e89caead40b..00000000000
--- 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 8d1788e8ab4..00000000000
--- 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 1385a24b1a2..00000000000
--- 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 b56ce910b82..00000000000
--- 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 18b4f2646b9..00000000000
--- 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 925414bf6a9..00000000000
--- 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 1299150f977..00000000000
--- 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 50db50fa6e9..00000000000
--- 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 205e01ee0e1..00000000000
--- 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 8d03850489d..00000000000
--- 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 a5a2b230880..00000000000
--- 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 8727bc74634..00000000000
--- 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 10e3c7eea95..00000000000
--- 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 8bf6693389b..00000000000
--- 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 5c921229c63..00000000000
--- 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 a14ef595eb1..00000000000
--- 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 851eedfda1b..00000000000
--- 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 fe69d0d89ac..00000000000
--- 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 95d6018ae32..00000000000
--- 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 0e51830bcd0..00000000000
--- 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 758d607d209..00000000000
--- 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 66546b8edf2..00000000000
--- 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 cc38df76f38..00000000000
--- 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 14d6581df3d..00000000000
--- 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 1e3ee6cde38..00000000000
--- 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 2678cb2caa8..00000000000
--- 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 212cfac15a0..00000000000
--- 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 9e7feddd13f..00000000000
--- 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 59933417c0a..00000000000
--- 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 27467b8ac18..00000000000
--- 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 4accfd63e9b..00000000000
--- 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 dd5773e93ad..00000000000
--- 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 ea8859b069f..00000000000
--- 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 8874aa0f17b..00000000000
--- 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 db5b01bb8c9..00000000000
--- 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 128eb9cf3b7..00000000000
--- 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 266eb25ef9b..00000000000
--- 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 7bcacce886c..00000000000
--- 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 172cb92e228..00000000000
--- 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 77ca273c56c..00000000000
--- 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 db5652b5893..00000000000
--- 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 a5c78d3348f..00000000000
--- 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 d5fb9ee5ca2..00000000000
--- 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 72d6031130b..00000000000
--- 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 9c0119beaf7..00000000000
--- 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 37045f28930..00000000000
--- 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 e0a3b3f136a..00000000000
--- 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 e3fa0861951..00000000000
--- 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 6d820e5e446..00000000000
--- 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 40518b14719..00000000000
--- 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 f2beac4eb46..00000000000
--- 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 416db1df6cb..00000000000
--- 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 35f84425c90..00000000000
--- 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 52cbbeb0f42..00000000000
--- 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 9352b8d52b6..00000000000
--- 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 c84c600b0dd..00000000000
--- 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 2eb4abf1faa..00000000000
--- 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 9b747864077..00000000000
--- 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 c8af0ca28f5..00000000000
--- 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 a3f55daa1f2..00000000000
--- 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 3f629b2058d..00000000000
--- 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 3bda01a27c4..00000000000
--- 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 06e4c964f38..00000000000
--- 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 523bb3a63c3..00000000000
--- 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 28fa73d7aed..00000000000
--- 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 ab4b62b5913..00000000000
--- 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 a8edc0c73c0..00000000000
--- 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 4812a26ff40..00000000000
--- 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 04221e0eef8..00000000000
--- 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 69f68c5c828..00000000000
--- 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 30a4207a9d9..00000000000
--- 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 e05e6bc1bc1..00000000000
--- 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 9e8b2c632d2..00000000000
--- 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 7771d0b64d1..00000000000
--- 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 8b32b776fe5..00000000000
--- 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 6818d600def..00000000000
--- 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 80cf46574ff..00000000000
--- 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 6d8e4797c89..00000000000
--- 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 c0a597ea6b7..00000000000
--- 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 3444db06624..00000000000
--- 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 3bb0a1c43d3..00000000000
--- 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 2b8b4c31038..00000000000
--- 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 a5388f0b133..00000000000
--- 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 5b849efbadc..00000000000
--- 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 1bdf6807d6a..00000000000
--- 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 f338e2d9a36..00000000000
--- 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 1ff4f701a93..00000000000
--- 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 fada5cb87bc..00000000000
--- 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 9ecaadfb988..00000000000
--- 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 466ccf0dde4..00000000000
--- 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 f342c6938fe..00000000000
--- 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 1c393d07e2d..00000000000
--- 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 f2f5601a64f..00000000000
--- 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 14b4b15cbbc..00000000000
--- 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 d492efc2078..00000000000
--- 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 f1db51acd89..00000000000
--- 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 baa9f27c167..00000000000
--- 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 bce1ed801af..00000000000
--- 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 6e0bfe238c0..00000000000
--- 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 d171bdf1dd0..00000000000
--- 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 a6ff7997093..00000000000
--- 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 15162434d54..00000000000
--- 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 e7e49e51736..00000000000
--- 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 052f90242b5..00000000000
--- 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 3477866e273..00000000000
--- 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 b9a62a8a2bb..00000000000
--- 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 2b1ca594107..00000000000
--- 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 c2f5d6b42c2..00000000000
--- 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 c8fd00f1e94..00000000000
--- 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 03f922f236b..00000000000
--- 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 f9037b2589e..00000000000
--- 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 788ad9daba3..00000000000
--- 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 7738c886400..00000000000
--- 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 2d53d0b7cb1..00000000000
--- 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 ca4bb7f078e..00000000000
--- 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 9a58b29f207..00000000000
--- 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 8cb59ebafdc..00000000000
--- 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 d420db0ead6..00000000000
--- 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 15042c2287a..00000000000
--- 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 6d13b2b7816..00000000000
--- 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 a7934c59e0a..00000000000
--- 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 9fb25ca9c0b..00000000000
--- 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 7fcb2fdfd4e..00000000000
--- 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 fc5eb29899a..00000000000
--- 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 ff0caf6a663..00000000000
--- 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 d961e5f0246..00000000000
--- 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 98d4e3f20fb..00000000000
--- 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 28a40ee4a7f..00000000000
--- 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 d88dcde83e0..00000000000
--- 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 6dab8fe7d52..00000000000
--- 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 8f5b7b84453..00000000000
--- 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 59f82ea35f9..00000000000
--- 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 1886826e4fa..00000000000
--- 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 2521a3fc842..00000000000
--- 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 732e311b656..00000000000
--- 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 258fae3ff43..00000000000
--- 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 698a08dead2..00000000000
--- 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 f97734e7740..00000000000
--- 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 87b5e58d787..00000000000
--- 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 9658a14e878..00000000000
--- 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 e74ccf64d84..00000000000
--- 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 1d63cfafa81..00000000000
--- 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 a3a34ea372c..00000000000
--- 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 36ea771691e..00000000000
--- 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 535df833760..00000000000
--- 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 aa31ef4336b..00000000000
--- 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 13fad905af5..00000000000
--- 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 4f9b6f90e21..00000000000
--- 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 4f5af339b70..00000000000
--- 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 c584ddb5530..00000000000
--- 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 7cf2e14dc1a..00000000000
--- 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 dd54fe25784..00000000000
--- 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 195cf966779..00000000000
--- 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 43dc02640ba..00000000000
--- 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 83682077b1d..00000000000
--- 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 5ec8ab05e7a..00000000000
--- 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 2f6dbd9a8b9..00000000000
--- 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 af69a4ebb4a..00000000000
--- 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 c085185b84f..00000000000
--- 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 102ce5173b5..00000000000
--- 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 1d4cadde724..00000000000
--- 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 958181598e8..00000000000
--- 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 76e69d2ce9c..00000000000
--- 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 9308b254e18..00000000000
--- 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 614e64503bd..00000000000
--- 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 6eacd2dae8b..00000000000
--- 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 597aefae411..00000000000
--- 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 65b6f9d7995..00000000000
--- 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 e5945e4ccd3..00000000000
--- 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 e15074a3a66..00000000000
--- 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 e337ef96b24..00000000000
--- 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 8e5b0640cf4..00000000000
--- 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 0f90c75b34c..00000000000
--- 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 0b7d3d9e2fe..00000000000
--- 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 c398f3de4cc..00000000000
--- 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 fce8e1ad0d7..00000000000
--- 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 8177906460b..00000000000
--- 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 d785945f750..00000000000
--- 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 d5a2f4cfd3c..00000000000
--- 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 b7952b33e05..00000000000
--- 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 1c907e1d0f4..00000000000
--- 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 24189f07983..00000000000
--- 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 e707008740d..00000000000
--- 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 67449d49556..00000000000
--- 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 37daf31f82c..00000000000
--- 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 8a506c0cbdc..00000000000
--- 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 6d47c98e415..00000000000
--- 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 1a85bc48394..00000000000
--- 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 742d4934cdf..00000000000
--- 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 e46dee30bc8..00000000000
--- 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 c499fa86962..00000000000
--- a/libjava/gnu/javax/crypto/jce/prng/CSPRNGSpi.h
+++ /dev/null
@@ -1,57 +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;
-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 fefea283199..00000000000
--- a/libjava/gnu/javax/crypto/jce/prng/FortunaImpl.h
+++ /dev/null
@@ -1,51 +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:
-  ::gnu::javax::crypto::prng::Fortuna * __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) 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 540349362d7..00000000000
--- 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 e27425a0b20..00000000000
--- 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 99e937310eb..00000000000
--- 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 9421af83306..00000000000
--- 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 43f53fe8534..00000000000
--- 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 4c2b43b7e28..00000000000
--- 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 166ed589751..00000000000
--- 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 26fca5d09af..00000000000
--- 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 81c2c21e75b..00000000000
--- 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 20d76e63268..00000000000
--- 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 e52cd5e3ca3..00000000000
--- 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 b9a3133d675..00000000000
--- 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 4fb301943a5..00000000000
--- 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 ed3f33a57a6..00000000000
--- 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 77bc760d1ba..00000000000
--- 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 abbfd28711e..00000000000
--- 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 8f46a1e163a..00000000000
--- 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 17e0ccea0fc..00000000000
--- 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 1c5507c9849..00000000000
--- 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 a52ab8adce1..00000000000
--- 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 c592f769a74..00000000000
--- 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 56bae1b6f84..00000000000
--- 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 ff9ab29840d..00000000000
--- 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 d167c7ce122..00000000000
--- 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 cba0013d314..00000000000
--- 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 487867fd6c9..00000000000
--- 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 2d8f2922242..00000000000
--- 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 aaab2bf5167..00000000000
--- a/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h
+++ /dev/null
@@ -1,96 +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 hash
-        {
-            class Sha160;
-        }
-        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;
-  ::gnu::java::security::hash::Sha160 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sha;
-  ::java::security::SecureRandom * 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 142262255c5..00000000000
--- 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 980e7f74b13..00000000000
--- 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 36f1f46c092..00000000000
--- 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 34913f031b9..00000000000
--- 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 7479d7e68bd..00000000000
--- 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 1797415572d..00000000000
--- 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 5ac6a478e00..00000000000
--- 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 b5df35136a5..00000000000
--- 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 facb7cbb759..00000000000
--- 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 2d9f72510a5..00000000000
--- 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 534c681c8a7..00000000000
--- 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 9c4ef51890c..00000000000
--- 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 2be95fbb3a4..00000000000
--- 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 3f6f0db75b9..00000000000
--- 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 af942a1eb88..00000000000
--- 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 8b1b7b0d052..00000000000
--- 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 833bd3cb1f3..00000000000
--- 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 6d5806ea75c..00000000000
--- 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 2235f18ede5..00000000000
--- 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 67501a94fc6..00000000000
--- 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 48a4ecddf6b..00000000000
--- 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 e674b970b56..00000000000
--- 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 e45fe221eb8..00000000000
--- 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 3efab548a56..00000000000
--- 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 29bbb061f5d..00000000000
--- 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 bb3317d5ea4..00000000000
--- 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 47abbac37aa..00000000000
--- 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 a1827b31057..00000000000
--- 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 9f9cb25f607..00000000000
--- 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 06029e27770..00000000000
--- 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 569911b5c5a..00000000000
--- 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 1d07ee24035..00000000000
--- 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 a6f3e4f0fee..00000000000
--- 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 b4a539aed50..00000000000
--- 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 b05b31af7ae..00000000000
--- 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 6b81878eb49..00000000000
--- 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 16d9d0072f0..00000000000
--- 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 33f2f53335b..00000000000
--- 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 65d10a8d177..00000000000
--- 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 88d4744f65d..00000000000
--- 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 6e1528a75dd..00000000000
--- 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 34e13193163..00000000000
--- 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 56d032add60..00000000000
--- 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 b9d9039fbc2..00000000000
--- 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 ab443dbe7e4..00000000000
--- 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 5f23a70159c..00000000000
--- 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 aebe9313ed7..00000000000
--- 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 c38a9e79546..00000000000
--- 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 e32104e7a1c..00000000000
--- 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 9bed61ae238..00000000000
--- 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 141a59cf66b..00000000000
--- 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 52087df38af..00000000000
--- 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 936a59927de..00000000000
--- 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 e608c466c3b..00000000000
--- 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 9ca8a7a4fd5..00000000000
--- 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 8df86621dad..00000000000
--- 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 1971adda4c5..00000000000
--- 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 4e6b580b50b..00000000000
--- 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 0b2be15f463..00000000000
--- 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 7cec99eff13..00000000000
--- 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 25ad4aaf0c1..00000000000
--- 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 24126a67b8f..00000000000
--- 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 3931a9b2d9e..00000000000
--- 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 3bb11e64271..00000000000
--- 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 d47f07b4172..00000000000
--- 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 ddde9c777f3..00000000000
--- 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 7954ce83dba..00000000000
--- 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 ee18743e849..00000000000
--- 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 8ee59c1ff2f..00000000000
--- 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 d3f694e6628..00000000000
--- 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 04bbaece8cb..00000000000
--- 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 130b4000b08..00000000000
--- 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 67e29892452..00000000000
--- 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 2d7debaa4dd..00000000000
--- 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 b681a0fa386..00000000000
--- 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 609d4b35b3a..00000000000
--- 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 fea2a3b0906..00000000000
--- 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 1154d8ed820..00000000000
--- 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 099c05a8200..00000000000
--- 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 0f361fc517c..00000000000
--- 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 16a9b331b5e..00000000000
--- 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 097b0b367d1..00000000000
--- 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 2d589fb2739..00000000000
--- 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:
-  ::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 823b08baa52..00000000000
--- 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 305d9cac818..00000000000
--- 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 4773413e6f1..00000000000
--- 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 1507af34f88..00000000000
--- 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 aab98c709af..00000000000
--- 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 e69f6c0909e..00000000000
--- 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 4fae1c4b1ef..00000000000
--- 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 209d69523df..00000000000
--- 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 76d9e262372..00000000000
--- 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 3da98cdf862..00000000000
--- 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 39fa49b45a7..00000000000
--- 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 5431e6178f2..00000000000
--- 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 a74916a9392..00000000000
--- 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 b1bd010bec2..00000000000
--- 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 6c001933123..00000000000
--- 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 fbf8cee2988..00000000000
--- 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 7fcb4915f5b..00000000000
--- 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 0503f0d5022..00000000000
--- 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 d628f7a6503..00000000000
--- 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 5c66cb4a3cb..00000000000
--- 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 0668d16cff7..00000000000
--- 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 17bc8fc1d7b..00000000000
--- 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 40cd18911cc..00000000000
--- 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 000b367996d..00000000000
--- 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 6a5c653194e..00000000000
--- 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 8d55853bd80..00000000000
--- 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 3d043c05169..00000000000
--- 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 00ee645088b..00000000000
--- 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 4b7a196d23d..00000000000
--- 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 89622a06890..00000000000
--- 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 87aaded6f03..00000000000
--- 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 3c3b1834a2b..00000000000
--- 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 45b0873c9e9..00000000000
--- 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 3a5ae195c0b..00000000000
--- 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 b524a65a5ad..00000000000
--- 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 2858e0521b4..00000000000
--- 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 b6712fd8951..00000000000
--- 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 4e338719543..00000000000
--- 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 cb97b2fb9d0..00000000000
--- 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 2269e4870f1..00000000000
--- 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 179026d4975..00000000000
--- 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 0c3e6dd00bc..00000000000
--- 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 d141b1e717a..00000000000
--- 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 a9214a2eb20..00000000000
--- 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 0b625387f62..00000000000
--- 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 3a5e0e60d5c..00000000000
--- 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 faaa512e317..00000000000
--- 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 3862fa0c172..00000000000
--- 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 46cf7838945..00000000000
--- 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 b092d8a96c6..00000000000
--- 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 630c80efa82..00000000000
--- 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 ec13be653b6..00000000000
--- 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 22cd5d9e42f..00000000000
--- 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 b78a26bca83..00000000000
--- 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 b4b4a222e8c..00000000000
--- 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 f93429beed7..00000000000
--- 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 19203bcd06a..00000000000
--- 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 2f0cbbdd064..00000000000
--- 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 34c486a438a..00000000000
--- 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 db60ff86552..00000000000
--- 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 9a51c41ad63..00000000000
--- 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 1fe5d3f0eff..00000000000
--- 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 972124e6706..00000000000
--- 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 f7ac3a4d656..00000000000
--- 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 1fb9795af7c..00000000000
--- 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 76ca4b07d11..00000000000
--- 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 d47843f6056..00000000000
--- 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 3051f0bcc7c..00000000000
--- 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 ac4f03507b6..00000000000
--- 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 ec4acf80fda..00000000000
--- 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 da0e4dff179..00000000000
--- 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 d0b7e08ca9b..00000000000
--- 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 e8a6300fbc3..00000000000
--- 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 f70a21bfa27..00000000000
--- 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 bb23187c336..00000000000
--- 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 55f4f8296ba..00000000000
--- 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 ff3d78247c5..00000000000
--- 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 a40226c10a9..00000000000
--- 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 7d170f73fcf..00000000000
--- 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 15fe1243255..00000000000
--- 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 f01e35f764d..00000000000
--- 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 3b9c0f7d096..00000000000
--- 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 d6e6e450fb0..00000000000
--- 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 d4468b95883..00000000000
--- 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 b574276fd05..00000000000
--- 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 4fc8c7b9347..00000000000
--- 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 027faea8073..00000000000
--- 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 16636be2d54..00000000000
--- 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 794b2624da1..00000000000
--- 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 36ff5f64710..00000000000
--- 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 4eef890fe68..00000000000
--- 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 b2a9d5a6561..00000000000
--- 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 5aad0a200b1..00000000000
--- 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 19304c07de5..00000000000
--- 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 f7deeb84045..00000000000
--- 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 6cb33fea0fa..00000000000
--- 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 bbfb11e67aa..00000000000
--- 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 d7c376cf8c8..00000000000
--- 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 5023286565f..00000000000
--- 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 0d107f2bbbd..00000000000
--- 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 6111088571b..00000000000
--- 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 849b43632b5..00000000000
--- 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 16a04a2c40e..00000000000
--- 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 70e6f3944ea..00000000000
--- 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 e985ee10bae..00000000000
--- 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 d02406961d4..00000000000
--- 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 a1b5fdfb67a..00000000000
--- 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 c461f59a2d5..00000000000
--- 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 e6458f43c0c..00000000000
--- 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 190268003a9..00000000000
--- 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 1495ded5de6..00000000000
--- 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 5ef99a738a2..00000000000
--- 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 61b6b3f73f9..00000000000
--- 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 d216b1b5e03..00000000000
--- 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 fa4476de8c6..00000000000
--- 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 1e07099b1da..00000000000
--- 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/Server$ServerInfo.h b/libjava/gnu/javax/management/Server$ServerInfo.h
deleted file mode 100644
index da1eb3bb060..00000000000
--- 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 1b2bc0e76f3..00000000000
--- 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 a699261b941..00000000000
--- 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 eb396d72ad5..00000000000
--- a/libjava/gnu/javax/management/Server.h
+++ /dev/null
@@ -1,102 +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:
-  static ::javax::management::ObjectName * DELEGATE_NAME;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) beans;
-  ::java::lang::String * defaultDomain;
-  ::javax::management::MBeanServer * outer;
-  ::javax::management::loading::ClassLoaderRepository * repository;
-  ::java::util::Map * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_management_Server__
diff --git a/libjava/gnu/javax/naming/giop/ContextContinuation.h b/libjava/gnu/javax/naming/giop/ContextContinuation.h
deleted file mode 100644
index 546a2564ad0..00000000000
--- 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 cad411dab66..00000000000
--- 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 409975cec0b..00000000000
--- 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 a45a730e69d..00000000000
--- 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:
-  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 d3afb0d66a2..00000000000
--- 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 ae1544c5a79..00000000000
--- 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 325f19a1408..00000000000
--- 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 5ed2c7f9f7c..00000000000
--- 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 138c63af739..00000000000
--- 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 dd2b2d64b39..00000000000
--- 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 f1e3844c368..00000000000
--- 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 87f6699d15c..00000000000
--- 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 96b173abaf1..00000000000
--- 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 a09dc191382..00000000000
--- 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 756fa058409..00000000000
--- 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 27447c73fd0..00000000000
--- 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 732295d5f8c..00000000000
--- 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 d29e51cb9f5..00000000000
--- 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 06d145e7b77..00000000000
--- 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/Base64.h b/libjava/gnu/javax/net/ssl/Base64.h
deleted file mode 100644
index 658e1376808..00000000000
--- a/libjava/gnu/javax/net/ssl/Base64.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_Base64__
-#define __gnu_javax_net_ssl_Base64__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class Base64;
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::Base64 : public ::java::lang::Object
-{
-
-  Base64();
-public:
-  static ::java::lang::String * encode(JArray< jbyte > *, 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_javax_net_ssl_Base64__
diff --git a/libjava/gnu/javax/net/ssl/EntropySource.h b/libjava/gnu/javax/net/ssl/EntropySource.h
deleted file mode 100644
index d44398c4c03..00000000000
--- 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 519138e6e89..00000000000
--- 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 8ced9ef5341..00000000000
--- 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 5f2e23bc6d7..00000000000
--- 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 ab47f4fdd72..00000000000
--- 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 16a617bdd0c..00000000000
--- 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 740ae3bc1cc..00000000000
--- 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 de863b7030e..00000000000
--- 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 f7feac96dfd..00000000000
--- 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 f4fab150983..00000000000
--- 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 cccfb0254f3..00000000000
--- 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 1061db2260f..00000000000
--- 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 50049b7a9ad..00000000000
--- 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 ac00c815140..00000000000
--- 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 2e888342633..00000000000
--- 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:
-  ::java::lang::ClassLoader * target$run();
-  ::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 56b6f9ce2c9..00000000000
--- 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 d5f0278a7c5..00000000000
--- 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 a344f39e528..00000000000
--- 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 c0501a7da46..00000000000
--- 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 90a652672bd..00000000000
--- 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 6c31c4e5fe2..00000000000
--- 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 02a4371933c..00000000000
--- 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 bb335b873e5..00000000000
--- 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 4c6b795c71a..00000000000
--- 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 2ad08db5580..00000000000
--- 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 136fd69adba..00000000000
--- 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 b6e51c839e7..00000000000
--- 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$ClientType.h b/libjava/gnu/javax/net/ssl/provider/CertificateRequest$ClientType.h
deleted file mode 100644
index 54ace32dd92..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/CertificateRequest$ClientType.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_CertificateRequest$ClientType__
-#define __gnu_javax_net_ssl_provider_CertificateRequest$ClientType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateRequest$ClientType;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::CertificateRequest$ClientType : public ::java::lang::Object
-{
-
-  CertificateRequest$ClientType(jint);
-public: // actually package-private
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientType * read(::java::io::InputStream *);
-public:
-  JArray< jbyte > * getEncoded();
-  jint getValue();
-  ::java::lang::String * toString();
-public: // actually package-private
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientType * RSA_SIGN;
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientType * DSS_SIGN;
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientType * RSA_FIXED_DH;
-  static ::gnu::javax::net::ssl::provider::CertificateRequest$ClientType * DSS_FIXED_DH;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_CertificateRequest$ClientType__
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 08e7f193dd7..00000000000
--- 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 3be6ceac1ee..00000000000
--- 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 ce75fe69272..00000000000
--- 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 > * target$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 3d9ee96c1a3..00000000000
--- 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 fedeebe1614..00000000000
--- 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 e7cc0f62dfe..00000000000
--- 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 ea65ea44522..00000000000
--- 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 9809890d767..00000000000
--- 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 * target$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 4cc2a8e2348..00000000000
--- 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 d2eab487002..00000000000
--- 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 e130b5c4bfa..00000000000
--- 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 54395bdb678..00000000000
--- 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 511b6de6596..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/CipherSuite.h
+++ /dev/null
@@ -1,145 +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 *);
-  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 *);
-  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();
-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;
-  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 0d206f0a93e..00000000000
--- 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 target$add(::gnu::javax::net::ssl::provider::CipherSuite *);
-  virtual jboolean hasNext();
-  virtual jboolean hasPrevious();
-  virtual ::gnu::javax::net::ssl::provider::CipherSuite * target$next();
-  virtual jint nextIndex();
-  virtual ::gnu::javax::net::ssl::provider::CipherSuite * target$previous();
-  virtual jint previousIndex();
-  virtual void remove();
-  virtual void target$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 3262080aacc..00000000000
--- 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 215e4b38832..00000000000
--- 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 target$add(::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType *);
-  virtual jboolean hasNext();
-  virtual jboolean hasPrevious();
-  virtual ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * target$next();
-  virtual jint nextIndex();
-  virtual ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * target$previous();
-  virtual jint previousIndex();
-  virtual void remove();
-  virtual void target$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 975b227780f..00000000000
--- 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 bd4fd8827ce..00000000000
--- 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 77bd040bd2d..00000000000
--- 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 dc42fab4fc3..00000000000
--- 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 8f33e96dd52..00000000000
--- 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 4c4e8f18bc9..00000000000
--- 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 d1830a03bc2..00000000000
--- 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 02cde17b3e3..00000000000
--- 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 26e93469047..00000000000
--- 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 ad331b85d3a..00000000000
--- 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 a13e88264d6..00000000000
--- 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 cfc33f19bb3..00000000000
--- 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 75831abbd62..00000000000
--- 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 1ab6b2e4039..00000000000
--- 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 eb2b8f3e073..00000000000
--- 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 539743240b7..00000000000
--- 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 65314311772..00000000000
--- 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 c8a2c1e37a2..00000000000
--- 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 44519e1903e..00000000000
--- 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 target$add(::gnu::javax::net::ssl::provider::CompressionMethod *);
-  virtual jboolean hasNext();
-  virtual jboolean hasPrevious();
-  virtual ::gnu::javax::net::ssl::provider::CompressionMethod * target$next();
-  virtual jint nextIndex();
-  virtual ::gnu::javax::net::ssl::provider::CompressionMethod * target$previous();
-  virtual jint previousIndex();
-  virtual void remove();
-  virtual void target$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 5e1addba4fd..00000000000
--- 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 d5b527fc944..00000000000
--- 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 4f3067b710b..00000000000
--- 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/Context.h b/libjava/gnu/javax/net/ssl/provider/Context.h
deleted file mode 100644
index b6a838db819..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/Context.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Context__
-#define __gnu_javax_net_ssl_provider_Context__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLContextSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class SRPTrustManager;
-          namespace provider
-          {
-              class Context;
-              class SessionContext;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class SSLServerSocketFactory;
-          class SSLSessionContext;
-          class SSLSocketFactory;
-          class TrustManager;
-          class X509KeyManager;
-          class X509TrustManager;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Context : public ::javax::net::ssl::SSLContextSpi
-{
-
-public:
-  Context();
-public: // actually protected
-  ::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::X509KeyManager * defaultKeyManager();
-  ::javax::net::ssl::X509TrustManager * defaultTrustManager();
-  ::java::security::SecureRandom * defaultRandom();
-  ::gnu::javax::net::ssl::provider::SessionContext * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLContextSpi)))) clientSessions;
-  ::gnu::javax::net::ssl::provider::SessionContext * serverSessions;
-  ::javax::net::ssl::X509KeyManager * 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_Context__
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 6421a67480a..00000000000
--- 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 72debfc8a1c..00000000000
--- 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 6f85801b886..00000000000
--- 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/DigestInputStream.h b/libjava/gnu/javax/net/ssl/provider/DigestInputStream.h
deleted file mode 100644
index 15436a6a114..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/DigestInputStream.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_DigestInputStream__
-#define __gnu_javax_net_ssl_provider_DigestInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.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 DigestInputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::DigestInputStream : public ::java::io::FilterInputStream
-{
-
-public: // actually package-private
-  DigestInputStream(::java::io::InputStream *, ::gnu::java::security::hash::IMessageDigest *, ::gnu::java::security::hash::IMessageDigest *);
-  void setDigesting(jboolean);
-public:
-  jint read();
-  jint read(JArray< jbyte > *);
-  jint read(JArray< jbyte > *, jint, jint);
-private:
-  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) md5;
-  ::gnu::java::security::hash::IMessageDigest * sha;
-  jboolean digesting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_DigestInputStream__
diff --git a/libjava/gnu/javax/net/ssl/provider/DigestOutputStream.h b/libjava/gnu/javax/net/ssl/provider/DigestOutputStream.h
deleted file mode 100644
index 0b7010448b5..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/DigestOutputStream.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_DigestOutputStream__
-#define __gnu_javax_net_ssl_provider_DigestOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.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 DigestOutputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::DigestOutputStream : public ::java::io::FilterOutputStream
-{
-
-public: // actually package-private
-  DigestOutputStream(::java::io::OutputStream *, ::gnu::java::security::hash::IMessageDigest *, ::gnu::java::security::hash::IMessageDigest *);
-  void setDigesting(jboolean);
-public:
-  void write(jint);
-  void write(JArray< jbyte > *);
-  void write(JArray< jbyte > *, jint, jint);
-private:
-  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) md5;
-  ::gnu::java::security::hash::IMessageDigest * sha;
-  jboolean digesting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_DigestOutputStream__
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 5459775ab35..00000000000
--- 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 ae9382142c3..00000000000
--- 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/Enumerated.h b/libjava/gnu/javax/net/ssl/provider/Enumerated.h
deleted file mode 100644
index db5083168f4..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/Enumerated.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Enumerated__
-#define __gnu_javax_net_ssl_provider_Enumerated__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Enumerated;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Enumerated : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual jint getValue() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_net_ssl_provider_Enumerated__
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 8d3bbb8d6a4..00000000000
--- 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 dfefe3f50ff..00000000000
--- 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 f00248affd6..00000000000
--- 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 54075426166..00000000000
--- 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 94727465b17..00000000000
--- 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 * target$next();
-  ::gnu::javax::net::ssl::provider::Extension * target$previous();
-  jint nextIndex();
-  jint previousIndex();
-  void target$add(::gnu::javax::net::ssl::provider::Extension *);
-  void remove();
-  void target$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 c4235f366fa..00000000000
--- 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/Extensions.h b/libjava/gnu/javax/net/ssl/provider/Extensions.h
deleted file mode 100644
index ac8a0f16000..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/Extensions.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Extensions__
-#define __gnu_javax_net_ssl_provider_Extensions__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class CertificateType;
-              class Extension;
-              class Extensions;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Extensions : public ::java::lang::Object
-{
-
-  Extensions();
-public: // actually package-private
-  static ::java::util::List * getServerName(::gnu::javax::net::ssl::provider::Extension *);
-  static ::java::util::List * getClientCertTypes(::gnu::javax::net::ssl::provider::Extension *);
-  static ::gnu::javax::net::ssl::provider::CertificateType * getServerCertType(::gnu::javax::net::ssl::provider::Extension *);
-  static ::java::lang::Integer * getMaxFragmentLength(::gnu::javax::net::ssl::provider::Extension *);
-  static JArray< ::java::lang::Object * > * getTrustedCA(::gnu::javax::net::ssl::provider::Extension *);
-  static ::java::lang::String * getSRPUsername(::gnu::javax::net::ssl::provider::Extension *);
-private:
-  static ::java::lang::Integer * _512;
-  static ::java::lang::Integer * _1024;
-  static ::java::lang::Integer * _2048;
-  static ::java::lang::Integer * _4096;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Extensions__
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 37e01c4c7e4..00000000000
--- 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/GNUSecurityParameters.h b/libjava/gnu/javax/net/ssl/provider/GNUSecurityParameters.h
deleted file mode 100644
index b5b2bc77483..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/GNUSecurityParameters.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_GNUSecurityParameters__
-#define __gnu_javax_net_ssl_provider_GNUSecurityParameters__
-
-#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 mac
-        {
-            class IMac;
-        }
-        namespace mode
-        {
-            class IMode;
-        }
-      }
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ContentType;
-              class GNUSecurityParameters;
-              class ProtocolVersion;
-              class Session;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::GNUSecurityParameters : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GNUSecurityParameters(::gnu::javax::net::ssl::provider::Session *);
-public:
-  virtual void reset();
-  virtual ::gnu::javax::net::ssl::provider::ProtocolVersion * getVersion();
-  virtual void setVersion(::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  virtual void setInCipher(::java::lang::Object *);
-  virtual void setOutCipher(::java::lang::Object *);
-  virtual void setInMac(::java::lang::Object *);
-  virtual void setOutMac(::java::lang::Object *);
-  virtual void setDeflating(jboolean);
-  virtual void setInflating(jboolean);
-  virtual jint getFragmentLength();
-  virtual void setFragmentLength(jint);
-  virtual JArray< jbyte > * decrypt(JArray< jbyte > *, ::gnu::javax::net::ssl::provider::ProtocolVersion *, ::gnu::javax::net::ssl::provider::ContentType *);
-  virtual JArray< jbyte > * encrypt(JArray< jbyte > *, jint, jint, ::gnu::javax::net::ssl::provider::ContentType *);
-private:
-  static void transformRC4(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint, ::gnu::java::security::prng::IRandom *);
-  static const jboolean DEBUG_RECORD_LAYER = 0;
-  static ::java::io::PrintWriter * debug;
-public: // actually package-private
-  ::gnu::javax::crypto::mode::IMode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) inCipher;
-  ::gnu::javax::crypto::mode::IMode * outCipher;
-  ::gnu::java::security::prng::IRandom * inRandom;
-  ::gnu::java::security::prng::IRandom * outRandom;
-  ::gnu::javax::crypto::mac::IMac * inMac;
-  ::gnu::javax::crypto::mac::IMac * outMac;
-  jlong inSequence;
-  jlong outSequence;
-  ::gnu::javax::net::ssl::provider::Session * session;
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * version;
-  jint fragmentLength;
-private:
-  ::java::util::zip::Inflater * inflater;
-  ::java::util::zip::Deflater * deflater;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_GNUSecurityParameters__
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 8fe4e8515dc..00000000000
--- 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 1296e24621e..00000000000
--- 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$buffer.h b/libjava/gnu/javax/net/ssl/provider/Handshake$buffer.h
deleted file mode 100644
index 5ddb06e0cbd..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/Handshake$buffer.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Handshake$buffer__
-#define __gnu_javax_net_ssl_provider_Handshake$buffer__
-
-#pragma interface
-
-#include <java/lang/ThreadLocal.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Handshake$buffer;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Handshake$buffer : public ::java::lang::ThreadLocal
-{
-
-  Handshake$buffer();
-public: // actually protected
-  virtual ::java::lang::Object * initialValue();
-public: // actually package-private
-  virtual ::java::io::ByteArrayOutputStream * getBuffer();
-  Handshake$buffer(::gnu::javax::net::ssl::provider::Handshake$buffer *);
-  static const jint SIZE = 2048;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Handshake$buffer__
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 498e377c749..00000000000
--- 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 32ff951a3ac..00000000000
--- 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 2881a0f1275..00000000000
--- 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/JCESecurityParameters.h b/libjava/gnu/javax/net/ssl/provider/JCESecurityParameters.h
deleted file mode 100644
index cc12a365000..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/JCESecurityParameters.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_JCESecurityParameters__
-#define __gnu_javax_net_ssl_provider_JCESecurityParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ContentType;
-              class JCESecurityParameters;
-              class ProtocolVersion;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class Mac;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::JCESecurityParameters : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JCESecurityParameters();
-public:
-  virtual void reset();
-  virtual void setInCipher(::java::lang::Object *);
-  virtual void setOutCipher(::java::lang::Object *);
-  virtual void setInMac(::java::lang::Object *);
-  virtual void setOutMac(::java::lang::Object *);
-  virtual void setDeflating(jboolean);
-  virtual void setInflating(jboolean);
-  virtual jint getFragmentLength();
-  virtual void setFragmentLength(jint);
-  virtual ::gnu::javax::net::ssl::provider::ProtocolVersion * getVersion();
-  virtual void setVersion(::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  virtual JArray< jbyte > * decrypt(JArray< jbyte > *, ::gnu::javax::net::ssl::provider::ProtocolVersion *, ::gnu::javax::net::ssl::provider::ContentType *);
-  virtual JArray< jbyte > * encrypt(JArray< jbyte > *, jint, jint, ::gnu::javax::net::ssl::provider::ContentType *);
-private:
-  ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::lang::Object)))) inCipher;
-  ::javax::crypto::Cipher * outCipher;
-  ::javax::crypto::Mac * inMac;
-  ::javax::crypto::Mac * outMac;
-  ::java::util::zip::Inflater * inflater;
-  ::java::util::zip::Deflater * deflater;
-  jint fragmentLength;
-  jlong inSequence;
-  jlong outSequence;
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_JCESecurityParameters__
diff --git a/libjava/gnu/javax/net/ssl/provider/JDBCSessionContext.h b/libjava/gnu/javax/net/ssl/provider/JDBCSessionContext.h
deleted file mode 100644
index 3c838cfd939..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/JDBCSessionContext.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_JDBCSessionContext__
-#define __gnu_javax_net_ssl_provider_JDBCSessionContext__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/SessionContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class JDBCSessionContext;
-              class Session;
-              class Session$ID;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-    namespace sql
-    {
-        class Connection;
-        class PreparedStatement;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::JDBCSessionContext : public ::gnu::javax::net::ssl::provider::SessionContext
-{
-
-public: // actually package-private
-  JDBCSessionContext();
-public:
-  virtual ::java::util::Enumeration * getIds();
-  virtual ::javax::net::ssl::SSLSession * getSession(JArray< jbyte > *);
-public: // actually package-private
-  virtual jboolean addSession(::gnu::javax::net::ssl::provider::Session$ID *, ::gnu::javax::net::ssl::provider::Session *);
-  virtual jboolean containsSessionID(::gnu::javax::net::ssl::provider::Session$ID *);
-public: // actually protected
-  virtual jboolean removeSession(::gnu::javax::net::ssl::provider::Session$ID *);
-public: // actually package-private
-  virtual void notifyAccess(::gnu::javax::net::ssl::provider::Session *);
-private:
-  JArray< jbyte > * certs(JArray< ::java::security::cert::Certificate * > *);
-public: // actually protected
-  ::java::sql::Connection * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::SessionContext)))) connection;
-  ::java::sql::PreparedStatement * selectById;
-  ::java::sql::PreparedStatement * insert;
-  ::java::sql::PreparedStatement * selectTimestamp;
-  ::java::sql::PreparedStatement * updateTimestamp;
-  ::java::sql::PreparedStatement * deleteSession;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_JDBCSessionContext__
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 20c6576227a..00000000000
--- 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:
-  ::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 3f0cf9c7dd2..00000000000
--- 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/JessieDHPrivateKey.h b/libjava/gnu/javax/net/ssl/provider/JessieDHPrivateKey.h
deleted file mode 100644
index 3f6f8f16d6e..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/JessieDHPrivateKey.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_JessieDHPrivateKey__
-#define __gnu_javax_net_ssl_provider_JessieDHPrivateKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class JessieDHPrivateKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::JessieDHPrivateKey : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JessieDHPrivateKey(::javax::crypto::spec::DHParameterSpec *, ::java::math::BigInteger *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::String * getFormat();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::javax::crypto::spec::DHParameterSpec * getParams();
-  virtual ::java::math::BigInteger * getX();
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::crypto::spec::DHParameterSpec * __attribute__((aligned(__alignof__( ::java::lang::Object)))) params;
-  ::java::math::BigInteger * x;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_JessieDHPrivateKey__
diff --git a/libjava/gnu/javax/net/ssl/provider/JessieDHPublicKey.h b/libjava/gnu/javax/net/ssl/provider/JessieDHPublicKey.h
deleted file mode 100644
index 80f504a09c3..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/JessieDHPublicKey.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_JessieDHPublicKey__
-#define __gnu_javax_net_ssl_provider_JessieDHPublicKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class JessieDHPublicKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::JessieDHPublicKey : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JessieDHPublicKey(::javax::crypto::spec::DHParameterSpec *, ::java::math::BigInteger *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::String * getFormat();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::javax::crypto::spec::DHParameterSpec * getParams();
-  virtual ::java::math::BigInteger * getY();
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::crypto::spec::DHParameterSpec * __attribute__((aligned(__alignof__( ::java::lang::Object)))) params;
-  ::java::math::BigInteger * y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_JessieDHPublicKey__
diff --git a/libjava/gnu/javax/net/ssl/provider/JessieRSAPrivateKey.h b/libjava/gnu/javax/net/ssl/provider/JessieRSAPrivateKey.h
deleted file mode 100644
index 0c2644643f3..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/JessieRSAPrivateKey.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_JessieRSAPrivateKey__
-#define __gnu_javax_net_ssl_provider_JessieRSAPrivateKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class JessieRSAPrivateKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::JessieRSAPrivateKey : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JessieRSAPrivateKey(::java::math::BigInteger *, ::java::math::BigInteger *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::String * getFormat();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::math::BigInteger * getModulus();
-  virtual ::java::math::BigInteger * getPrivateExponent();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) modulus;
-  ::java::math::BigInteger * exponent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_JessieRSAPrivateKey__
diff --git a/libjava/gnu/javax/net/ssl/provider/JessieRSAPublicKey.h b/libjava/gnu/javax/net/ssl/provider/JessieRSAPublicKey.h
deleted file mode 100644
index 14dfea7b75f..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/JessieRSAPublicKey.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_JessieRSAPublicKey__
-#define __gnu_javax_net_ssl_provider_JessieRSAPublicKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class JessieRSAPublicKey;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::JessieRSAPublicKey : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JessieRSAPublicKey(::java::math::BigInteger *, ::java::math::BigInteger *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::String * getFormat();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::math::BigInteger * getModulus();
-  virtual ::java::math::BigInteger * getPublicExponent();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) modulus;
-  ::java::math::BigInteger * exponent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_JessieRSAPublicKey__
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 60dec2ad7af..00000000000
--- 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/KeyPool.h b/libjava/gnu/javax/net/ssl/provider/KeyPool.h
deleted file mode 100644
index 0eb8f3ccb21..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/KeyPool.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_KeyPool__
-#define __gnu_javax_net_ssl_provider_KeyPool__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class KeyPool;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class KeyPair;
-        class SecureRandom;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::KeyPool : public ::java::lang::Object
-{
-
-  KeyPool();
-public: // actually package-private
-  static ::java::security::KeyPair * generateRSAKeyPair();
-private:
-  static void nextBytes(JArray< jbyte > *);
-  static ::java::math::BigInteger * ONE;
-  static ::java::math::BigInteger * TWO;
-  static ::java::math::BigInteger * E;
-  static ::java::security::SecureRandom * RANDOM;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_KeyPool__
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 7926121855c..00000000000
--- 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 b1707eed108..00000000000
--- 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 81c1aca44f5..00000000000
--- 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 7bb774beabf..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/OutputSecurityParameters.h
+++ /dev/null
@@ -1,77 +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();
-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:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_OutputSecurityParameters__
diff --git a/libjava/gnu/javax/net/ssl/provider/OverflowException.h b/libjava/gnu/javax/net/ssl/provider/OverflowException.h
deleted file mode 100644
index 0fb5735937b..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/OverflowException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_OverflowException__
-#define __gnu_javax_net_ssl_provider_OverflowException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class OverflowException;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::OverflowException : public ::java::io::IOException
-{
-
-public: // actually package-private
-  OverflowException();
-  OverflowException(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_OverflowException__
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 7c8ceace8a8..00000000000
--- 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 4e267db7646..00000000000
--- 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 f6cc3b78d6e..00000000000
--- 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 target$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 1553624d09e..00000000000
--- 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 59f90415410..00000000000
--- 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/RecordInput.h b/libjava/gnu/javax/net/ssl/provider/RecordInput.h
deleted file mode 100644
index 964c9651929..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/RecordInput.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_RecordInput__
-#define __gnu_javax_net_ssl_provider_RecordInput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ContentType;
-              class RecordInput;
-              class Session;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::RecordInput : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RecordInput(::java::io::InputStream *, ::gnu::javax::net::ssl::provider::Session *);
-  virtual jint available(::gnu::javax::net::ssl::provider::ContentType *);
-  virtual void setSession(::gnu::javax::net::ssl::provider::Session *);
-  virtual jint read(JArray< jbyte > *, jint, jint, ::gnu::javax::net::ssl::provider::ContentType *);
-  virtual jboolean pollClose();
-private:
-  void readRecord();
-  static const jboolean DEBUG_RECORD_LAYER = 1;
-  static ::java::util::logging::Logger * logger;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) fragment;
-  jint index;
-  ::gnu::javax::net::ssl::provider::ContentType * type;
-  ::java::io::DataInputStream * in;
-  ::gnu::javax::net::ssl::provider::Session * session;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_RecordInput__
diff --git a/libjava/gnu/javax/net/ssl/provider/RecordInputStream.h b/libjava/gnu/javax/net/ssl/provider/RecordInputStream.h
deleted file mode 100644
index b78f2eb312e..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/RecordInputStream.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_RecordInputStream__
-#define __gnu_javax_net_ssl_provider_RecordInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ContentType;
-              class RecordInput;
-              class RecordInputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::RecordInputStream : public ::java::io::InputStream
-{
-
-public: // actually package-private
-  RecordInputStream(::gnu::javax::net::ssl::provider::RecordInput *, ::gnu::javax::net::ssl::provider::ContentType *);
-public:
-  virtual jint available();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::String * toString();
-private:
-  ::gnu::javax::net::ssl::provider::RecordInput * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) in;
-  ::gnu::javax::net::ssl::provider::ContentType * type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_RecordInputStream__
diff --git a/libjava/gnu/javax/net/ssl/provider/RecordOutputStream.h b/libjava/gnu/javax/net/ssl/provider/RecordOutputStream.h
deleted file mode 100644
index 427edbf6be0..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/RecordOutputStream.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_RecordOutputStream__
-#define __gnu_javax_net_ssl_provider_RecordOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ContentType;
-              class RecordOutputStream;
-              class SecurityParameters;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::RecordOutputStream : public ::java::io::FilterOutputStream
-{
-
-public: // actually package-private
-  RecordOutputStream(::java::io::OutputStream *, ::gnu::javax::net::ssl::provider::ContentType *, ::gnu::javax::net::ssl::provider::SecurityParameters *);
-public:
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-private:
-  static const jboolean DEBUG_RECORD_LAYER = 1;
-  static ::java::util::logging::Logger * logger;
-  ::gnu::javax::net::ssl::provider::ContentType * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) type;
-  ::gnu::javax::net::ssl::provider::SecurityParameters * params;
-  jboolean emitEmpty;
-  static JArray< jbyte > * ZERO;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_RecordOutputStream__
diff --git a/libjava/gnu/javax/net/ssl/provider/RecordingInputStream.h b/libjava/gnu/javax/net/ssl/provider/RecordingInputStream.h
deleted file mode 100644
index a6d912c44a7..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/RecordingInputStream.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_RecordingInputStream__
-#define __gnu_javax_net_ssl_provider_RecordingInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class RecordingInputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::RecordingInputStream : public ::java::io::FilterInputStream
-{
-
-public: // actually package-private
-  RecordingInputStream(::java::io::InputStream *);
-  RecordingInputStream(::java::io::InputStream *, ::java::io::ByteArrayOutputStream *);
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jbyte > *);
-  virtual jlong skip(jlong);
-public: // actually package-private
-  virtual JArray< jbyte > * getBytes();
-  virtual void resetSink();
-public: // actually protected
-  ::java::io::ByteArrayOutputStream * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) sink;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_RecordingInputStream__
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 9425426856c..00000000000
--- 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 a1f10fb44d2..00000000000
--- 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 bdb7e80380d..00000000000
--- 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 a2a8163b897..00000000000
--- 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 f62525cc0a5..00000000000
--- 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 7e9ad36ea6e..00000000000
--- 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/SSLRSASignature.h b/libjava/gnu/javax/net/ssl/provider/SSLRSASignature.h
deleted file mode 100644
index cef51dac37c..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLRSASignature.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLRSASignature__
-#define __gnu_javax_net_ssl_provider_SSLRSASignature__
-
-#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 SSLRSASignature;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAPrivateKey;
-          class RSAPublicKey;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLRSASignature : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SSLRSASignature();
-  SSLRSASignature(::gnu::java::security::hash::IMessageDigest *, ::gnu::java::security::hash::IMessageDigest *);
-public:
-  ::java::lang::String * name();
-  void setupVerify(::java::util::Map *);
-  void setupSign(::java::util::Map *);
-  void update(jbyte);
-  void update(JArray< jbyte > *, jint, jint);
-  ::java::lang::Object * sign();
-  jboolean verify(::java::lang::Object *);
-  ::java::lang::Object * clone();
-private:
-  ::java::security::interfaces::RSAPublicKey * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pubkey;
-  ::java::security::interfaces::RSAPrivateKey * privkey;
-  ::gnu::java::security::hash::IMessageDigest * md5;
-  ::gnu::java::security::hash::IMessageDigest * sha;
-  jboolean initVerify;
-  jboolean initSign;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLRSASignature__
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 26da5be52ed..00000000000
--- 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 1a4abf1fda5..00000000000
--- 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/SSLServerSocket.h b/libjava/gnu/javax/net/ssl/provider/SSLServerSocket.h
deleted file mode 100644
index 8877d8226e8..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLServerSocket.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLServerSocket__
-#define __gnu_javax_net_ssl_provider_SSLServerSocket__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLServerSocket.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class SRPTrustManager;
-          namespace provider
-          {
-              class SSLServerSocket;
-              class SessionContext;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-    }
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class X509KeyManager;
-          class X509TrustManager;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLServerSocket : public ::javax::net::ssl::SSLServerSocket
-{
-
-public: // actually package-private
-  SSLServerSocket();
-  SSLServerSocket(jint);
-  SSLServerSocket(jint, jint);
-  SSLServerSocket(jint, jint, ::java::net::InetAddress *);
-public:
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites();
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *);
-  virtual JArray< ::java::lang::String * > * getSupportedProtocols();
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols();
-  virtual void setEnabledProtocols(JArray< ::java::lang::String * > *);
-  virtual void setUseClientMode(jboolean);
-  virtual jboolean getUseClientMode();
-  virtual void setNeedClientAuth(jboolean);
-  virtual jboolean getNeedClientAuth();
-  virtual void setWantClientAuth(jboolean);
-  virtual jboolean getWantClientAuth();
-  virtual void setEnabledSessionCreation(jboolean);
-  virtual void setEnableSessionCreation(jboolean);
-  virtual jboolean getEnableSessionCreation();
-  virtual ::java::net::Socket * accept();
-public: // actually package-private
-  virtual void setSessionContext(::gnu::javax::net::ssl::provider::SessionContext *);
-  virtual void setKeyManager(::javax::net::ssl::X509KeyManager *);
-  virtual void setTrustManager(::javax::net::ssl::X509TrustManager *);
-  virtual void setSRPTrustManager(::gnu::javax::net::ssl::SRPTrustManager *);
-  virtual void setRandom(::java::security::SecureRandom *);
-private:
-  ::gnu::javax::net::ssl::provider::SessionContext * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLServerSocket)))) sessions;
-  ::java::util::SortedSet * enabledProtocols;
-  ::java::util::List * enabledSuites;
-  jboolean clientMode;
-  jboolean needClientAuth;
-  jboolean wantClientAuth;
-  jboolean createSessions;
-  ::gnu::javax::net::ssl::SRPTrustManager * srpTrustManager;
-  ::javax::net::ssl::X509TrustManager * trustManager;
-  ::javax::net::ssl::X509KeyManager * keyManager;
-  ::java::security::SecureRandom * random;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLServerSocket__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactory.h b/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactory.h
deleted file mode 100644
index 308a38d2d03..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactory.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLServerSocketFactory__
-#define __gnu_javax_net_ssl_provider_SSLServerSocketFactory__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLServerSocketFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class SRPTrustManager;
-          namespace provider
-          {
-              class SSLServerSocket;
-              class SSLServerSocketFactory;
-              class SessionContext;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class ServerSocket;
-    }
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class X509KeyManager;
-          class X509TrustManager;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLServerSocketFactory : public ::javax::net::ssl::SSLServerSocketFactory
-{
-
-public: // actually package-private
-  SSLServerSocketFactory(::javax::net::ssl::X509TrustManager *, ::gnu::javax::net::ssl::SRPTrustManager *, ::javax::net::ssl::X509KeyManager *, ::java::security::SecureRandom *, ::gnu::javax::net::ssl::provider::SessionContext *);
-public:
-  virtual JArray< ::java::lang::String * > * getDefaultCipherSuites();
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  virtual ::java::net::ServerSocket * createServerSocket();
-  virtual ::java::net::ServerSocket * createServerSocket(jint);
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint);
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint, ::java::net::InetAddress *);
-private:
-  void setup(::gnu::javax::net::ssl::provider::SSLServerSocket *);
-  ::gnu::javax::net::ssl::provider::SessionContext * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLServerSocketFactory)))) sessions;
-  ::javax::net::ssl::X509KeyManager * 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_SSLServerSocketFactory__
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 a775cf82c66..00000000000
--- 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 * target$createServerSocket(jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * target$createServerSocket(jint, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * target$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 4367a832bc6..00000000000
--- 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 * target$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/SSLSocket.h b/libjava/gnu/javax/net/ssl/provider/SSLSocket.h
deleted file mode 100644
index ee2ecbbe832..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocket.h
+++ /dev/null
@@ -1,240 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLSocket__
-#define __gnu_javax_net_ssl_provider_SSLSocket__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLSocket.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class IMessageDigest;
-        }
-        namespace sig
-        {
-            class ISignature;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class SRPTrustManager;
-          namespace provider
-          {
-              class Alert;
-              class CipherSuite;
-              class Finished;
-              class ProtocolVersion;
-              class RecordInput;
-              class SSLSocket;
-              class Session;
-              class SessionContext;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-        class SocketAddress;
-    }
-    namespace nio
-    {
-      namespace channels
-      {
-          class SocketChannel;
-      }
-    }
-    namespace security
-    {
-        class SecureRandom;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HandshakeCompletedListener;
-          class SSLSession;
-          class X509KeyManager;
-          class X509TrustManager;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLSocket : public ::javax::net::ssl::SSLSocket
-{
-
-public: // actually package-private
-  SSLSocket(::java::net::Socket *, ::java::lang::String *, jint, jboolean);
-  SSLSocket(::java::net::Socket *, ::java::nio::channels::SocketChannel *);
-  SSLSocket();
-  SSLSocket(::java::net::InetAddress *, jint);
-  SSLSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-  SSLSocket(::java::lang::String *, jint);
-  SSLSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-private:
-  void initialize();
-public:
-  void addHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *);
-  void removeHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *);
-  JArray< ::java::lang::String * > * getEnabledProtocols();
-  void setEnabledProtocols(JArray< ::java::lang::String * > *);
-  JArray< ::java::lang::String * > * getSupportedProtocols();
-  JArray< ::java::lang::String * > * getEnabledCipherSuites();
-  void setEnabledCipherSuites(JArray< ::java::lang::String * > *);
-  JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  ::javax::net::ssl::SSLSession * getSession();
-  jboolean getEnableSessionCreation();
-  void setEnableSessionCreation(jboolean);
-  jboolean getNeedClientAuth();
-  void setNeedClientAuth(jboolean);
-  jboolean getWantClientAuth();
-  void setWantClientAuth(jboolean);
-  jboolean getUseClientMode();
-  void setUseClientMode(jboolean);
-  void startHandshake();
-  ::java::net::InetAddress * getInetAddress();
-  ::java::net::InetAddress * getLocalAddress();
-  jint getPort();
-  jint getLocalPort();
-  ::java::io::InputStream * getInputStream();
-  ::java::io::OutputStream * getOutputStream();
-  void setTcpNoDelay(jboolean);
-  jboolean getTcpNoDelay();
-  void setSoLinger(jboolean, jint);
-  jint getSoLinger();
-  void sendUrgentData(jint);
-  void setSoTimeout(jint);
-  jint getSoTimeout();
-  void setSendBufferSize(jint);
-  jint getSendBufferSize();
-  void setReceiveBufferSize(jint);
-  jint getReceiveBufferSize();
-  void close();
-  ::java::lang::String * toString();
-  void connect(::java::net::SocketAddress *);
-  void connect(::java::net::SocketAddress *, jint);
-  void bind(::java::net::SocketAddress *);
-  ::java::net::SocketAddress * getLocalSocketAddress();
-  ::java::nio::channels::SocketChannel * getChannel();
-  jboolean isBound();
-  jboolean isClosed();
-  void setOOBInline(jboolean);
-  jboolean getOOBInline();
-  void setKeepAlive(jboolean);
-  jboolean getKeepAlive();
-  void setTrafficClass(jint);
-  jint getTrafficClass();
-  void setReuseAddress(jboolean);
-  jboolean getReuseAddress();
-  void shutdownInput();
-  void shutdownOutput();
-  jboolean isConnected();
-  jboolean isInputShutdown();
-  jboolean isOutputShutdown();
-public: // actually protected
-  void finalize();
-public: // actually package-private
-  void setSessionContext(::gnu::javax::net::ssl::provider::SessionContext *);
-  void setEnabledCipherSuites(::java::util::List *);
-  void setEnabledProtocols(::java::util::SortedSet *);
-  void setSRPTrustManager(::gnu::javax::net::ssl::SRPTrustManager *);
-  void setTrustManager(::javax::net::ssl::X509TrustManager *);
-  void setKeyManager(::javax::net::ssl::X509KeyManager *);
-  void setRandom(::java::security::SecureRandom *);
-  void sendAlert(::gnu::javax::net::ssl::provider::Alert *);
-  ::gnu::javax::net::ssl::provider::Alert * checkAlert();
-  void checkHandshakeDone();
-private:
-  void changeCipherSpec();
-  void readChangeCipherSpec();
-  void setupIO();
-  void handshakeCompleted();
-  void doClientHandshake();
-  void doServerHandshake();
-  JArray< JArray< jbyte > * > * generateKeys(JArray< jbyte > *, JArray< jbyte > *, ::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  ::gnu::javax::net::ssl::provider::Finished * generateFinished(::gnu::javax::net::ssl::provider::ProtocolVersion *, ::gnu::java::security::hash::IMessageDigest *, ::gnu::java::security::hash::IMessageDigest *, jboolean);
-  ::gnu::javax::net::ssl::provider::Alert * unexpectedMessage();
-  void throwUnexpectedMessage();
-  ::gnu::javax::net::ssl::provider::Alert * handshakeFailure();
-  void throwHandshakeFailure();
-  ::gnu::javax::net::ssl::provider::Alert * internalError();
-  void throwInternalError();
-  ::gnu::javax::net::ssl::provider::Alert * peerUnverified(JArray< ::java::security::cert::X509Certificate * > *);
-  void throwPeerUnverified(JArray< ::java::security::cert::X509Certificate * > *);
-  ::gnu::javax::net::ssl::provider::CipherSuite * selectSuite(::java::util::List *, ::gnu::javax::net::ssl::provider::ProtocolVersion *);
-  ::java::lang::String * askUserName(::java::lang::String *);
-  ::java::lang::String * askPassword(::java::lang::String *);
-  jboolean checkCertificates(JArray< ::java::security::cert::X509Certificate * > *);
-  void updateSig(::gnu::java::security::sig::ISignature *, ::java::math::BigInteger *);
-  void fatal();
-  static const jboolean DEBUG_HANDSHAKE_LAYER = 1;
-  static const jboolean DEBUG_KEY_EXCHANGE = 0;
-  static ::java::util::logging::Logger * logger;
-  ::java::net::Socket * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLSocket)))) underlyingSocket;
-  jint underlyingPort;
-  jboolean autoClose;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::SessionContext * sessionContext;
-  ::gnu::javax::net::ssl::provider::Session * session;
-  ::java::util::LinkedList * handshakeListeners;
-private:
-  jboolean clientMode;
-  jboolean wantClientAuth;
-  jboolean needClientAuth;
-  jboolean createSessions;
-  jboolean handshakeDone;
-  ::java::lang::String * remoteHost;
-  ::java::io::InputStream * socketIn;
-  ::java::io::OutputStream * socketOut;
-  ::java::io::InputStream * applicationIn;
-  ::java::io::OutputStream * applicationOut;
-  ::java::io::InputStream * handshakeIn;
-  ::java::io::OutputStream * handshakeOut;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::RecordInput * recordInput;
-private:
-  jlong handshakeTime;
-  ::java::nio::channels::SocketChannel * channel;
-public: // actually package-private
-  static ::java::util::SortedSet * supportedProtocols;
-  static ::java::util::List * supportedSuites;
-private:
-  static JArray< jbyte > * SENDER_CLIENT;
-  static JArray< jbyte > * SENDER_SERVER;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLSocket__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactory.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketFactory.h
deleted file mode 100644
index ce96e048dc9..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactory.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLSocketFactory__
-#define __gnu_javax_net_ssl_provider_SSLSocketFactory__
-
-#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 SSLSocket;
-              class SSLSocketFactory;
-              class SessionContext;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-    }
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class X509KeyManager;
-          class X509TrustManager;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLSocketFactory : public ::javax::net::ssl::SSLSocketFactory
-{
-
-public: // actually package-private
-  SSLSocketFactory(::javax::net::ssl::X509TrustManager *, ::javax::net::ssl::X509KeyManager *, ::java::security::SecureRandom *, ::gnu::javax::net::ssl::provider::SessionContext *);
-public:
-  virtual JArray< ::java::lang::String * > * getDefaultCipherSuites();
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  virtual ::java::net::Socket * createSocket(::java::net::Socket *, ::java::lang::String *, jint, jboolean);
-  virtual ::java::net::Socket * createSocket();
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint);
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint);
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-private:
-  ::gnu::javax::net::ssl::provider::SSLSocket * setup(::gnu::javax::net::ssl::provider::SSLSocket *);
-  ::javax::net::ssl::X509TrustManager * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLSocketFactory)))) trustManager;
-  ::javax::net::ssl::X509KeyManager * keyManager;
-  ::java::security::SecureRandom * random;
-  ::gnu::javax::net::ssl::provider::SessionContext * sessionContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLSocketFactory__
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 eec32a994f5..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h
+++ /dev/null
@@ -1,64 +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 * target$createSocket(::java::lang::String *, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * target$createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * target$createSocket(::java::net::InetAddress *, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * target$createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-  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 8596a2fdc43..00000000000
--- 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:
-  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 3ad9ae0da51..00000000000
--- 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 987eaf81376..00000000000
--- 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 309706bba05..00000000000
--- 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/SSLSocketInputStream.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketInputStream.h
deleted file mode 100644
index 22b8e5fa98e..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocketInputStream.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLSocketInputStream__
-#define __gnu_javax_net_ssl_provider_SSLSocketInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLSocket;
-              class SSLSocketInputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLSocketInputStream : public ::java::io::FilterInputStream
-{
-
-public: // actually package-private
-  SSLSocketInputStream(::java::io::InputStream *, ::gnu::javax::net::ssl::provider::SSLSocket *);
-  SSLSocketInputStream(::java::io::InputStream *, ::gnu::javax::net::ssl::provider::SSLSocket *, jboolean);
-public:
-  virtual jint available();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  jboolean checkAlert();
-  ::gnu::javax::net::ssl::provider::SSLSocket * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) socket;
-  jboolean checkHandshake;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLSocketInputStream__
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketOutputStream.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketOutputStream.h
deleted file mode 100644
index e62ee5dbc77..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocketOutputStream.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SSLSocketOutputStream__
-#define __gnu_javax_net_ssl_provider_SSLSocketOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SSLSocket;
-              class SSLSocketOutputStream;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SSLSocketOutputStream : public ::java::io::FilterOutputStream
-{
-
-public: // actually package-private
-  SSLSocketOutputStream(::java::io::OutputStream *, ::gnu::javax::net::ssl::provider::SSLSocket *);
-  SSLSocketOutputStream(::java::io::OutputStream *, ::gnu::javax::net::ssl::provider::SSLSocket *, jboolean);
-public:
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-private:
-  void checkAlert();
-  ::gnu::javax::net::ssl::provider::SSLSocket * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) socket;
-  jboolean checkHandshake;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SSLSocketOutputStream__
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 bdc243a427f..00000000000
--- 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 698d8803d99..00000000000
--- 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/SecurityParameters.h b/libjava/gnu/javax/net/ssl/provider/SecurityParameters.h
deleted file mode 100644
index e96e7da22de..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SecurityParameters.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SecurityParameters__
-#define __gnu_javax_net_ssl_provider_SecurityParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class ContentType;
-              class ProtocolVersion;
-              class SecurityParameters;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SecurityParameters : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * decrypt(JArray< jbyte > *, ::gnu::javax::net::ssl::provider::ProtocolVersion *, ::gnu::javax::net::ssl::provider::ContentType *) = 0;
-  virtual JArray< jbyte > * encrypt(JArray< jbyte > *, jint, jint, ::gnu::javax::net::ssl::provider::ContentType *) = 0;
-  virtual void reset() = 0;
-  virtual ::gnu::javax::net::ssl::provider::ProtocolVersion * getVersion() = 0;
-  virtual void setVersion(::gnu::javax::net::ssl::provider::ProtocolVersion *) = 0;
-  virtual void setDeflating(jboolean) = 0;
-  virtual void setInflating(jboolean) = 0;
-  virtual jint getFragmentLength() = 0;
-  virtual void setFragmentLength(jint) = 0;
-  virtual void setInCipher(::java::lang::Object *) = 0;
-  virtual void setOutCipher(::java::lang::Object *) = 0;
-  virtual void setInMac(::java::lang::Object *) = 0;
-  virtual void setOutMac(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __gnu_javax_net_ssl_provider_SecurityParameters__
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 5d35d5cd93d..00000000000
--- 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 9585ab8fa64..00000000000
--- 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 270ea850ee8..00000000000
--- 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 35b1fdc23c2..00000000000
--- 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 d3c84a735dc..00000000000
--- 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 ef5374f765d..00000000000
--- 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 b993c0873d0..00000000000
--- 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 cf32a8da695..00000000000
--- 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 a26dd829e86..00000000000
--- 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 8d55e6a1242..00000000000
--- 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 51550c72aa6..00000000000
--- 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 04ec69c5c70..00000000000
--- 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 abc1363aa32..00000000000
--- 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 4ff4d2079fb..00000000000
--- 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 6ee36ed59e9..00000000000
--- 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 * target$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 363e89f7b72..00000000000
--- 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 1aa13b41752..00000000000
--- 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 a808e0d6b91..00000000000
--- 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 bf1bc27dd11..00000000000
--- 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 21201fe25d2..00000000000
--- 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 ac7fca20f66..00000000000
--- 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/Session$ID.h b/libjava/gnu/javax/net/ssl/provider/Session$ID.h
deleted file mode 100644
index 849f94155df..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/Session$ID.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Session$ID__
-#define __gnu_javax_net_ssl_provider_Session$ID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Session$ID;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Session$ID : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Session$ID(JArray< jbyte > *);
-public:
-  JArray< jbyte > * getId();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  jint compareTo(::java::lang::Object *);
-  ::java::lang::String * toString();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Session$ID__
diff --git a/libjava/gnu/javax/net/ssl/provider/Session.h b/libjava/gnu/javax/net/ssl/provider/Session.h
deleted file mode 100644
index d1f241cc615..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/Session.h
+++ /dev/null
@@ -1,134 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_Session__
-#define __gnu_javax_net_ssl_provider_Session__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-            class SRPTrustManager;
-          namespace provider
-          {
-              class Alert;
-              class CipherSuite;
-              class ProtocolVersion;
-              class SecurityParameters;
-              class Session;
-              class Session$ID;
-              class SessionContext;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-        class SecureRandom;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLPermission;
-          class SSLSessionContext;
-          class X509KeyManager;
-          class X509TrustManager;
-      }
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::Session : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Session();
-  Session(jlong);
-public: // actually protected
-  ::java::lang::Object * clone();
-public:
-  ::java::lang::String * getCipherSuite();
-  jlong getCreationTime();
-  JArray< jbyte > * getId();
-  jlong getLastAccessedTime();
-  JArray< ::java::security::cert::Certificate * > * getLocalCertificates();
-  JArray< ::java::security::cert::Certificate * > * getPeerCertificates();
-  JArray< ::javax::security::cert::X509Certificate * > * getPeerCertificateChain();
-  ::java::lang::String * getPeerHost();
-  ::java::lang::String * getProtocol();
-  ::javax::net::ssl::SSLSessionContext * getSessionContext();
-  JArray< ::java::lang::String * > * getValueNames();
-  ::java::lang::Object * getValue(::java::lang::String *);
-  void putValue(::java::lang::String *, ::java::lang::Object *);
-  void removeValue(::java::lang::String *);
-  void invalidate();
-public: // actually package-private
-  void access();
-  void setLastAccessedTime(jlong);
-public:
-  jint getApplicationBufferSize() = 0;
-  ::java::security::Principal * getLocalPrincipal() = 0;
-  jint getPacketBufferSize() = 0;
-  jint getPeerPort() = 0;
-  ::java::security::Principal * getPeerPrincipal() = 0;
-  jboolean isValid() = 0;
-private:
-  static ::javax::net::ssl::SSLPermission * GET_SESSION_CONTEXT_PERMISSION;
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) creationTime;
-  ::java::util::Date * lastAccessedTime;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::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;
-  jboolean peerVerified;
-  ::gnu::javax::net::ssl::provider::SessionContext * context;
-  ::java::util::HashMap * values;
-  jboolean valid;
-  ::java::util::List * enabledSuites;
-  ::gnu::javax::net::ssl::provider::CipherSuite * cipherSuite;
-  ::java::util::SortedSet * enabledProtocols;
-  ::gnu::javax::net::ssl::provider::ProtocolVersion * protocol;
-  JArray< jbyte > * masterSecret;
-  ::gnu::javax::net::ssl::SRPTrustManager * srpTrustManager;
-  ::javax::net::ssl::X509TrustManager * trustManager;
-  ::javax::net::ssl::X509KeyManager * keyManager;
-  ::java::security::SecureRandom * random;
-  ::gnu::javax::net::ssl::provider::SecurityParameters * params;
-  ::gnu::javax::net::ssl::provider::Alert * currentAlert;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_Session__
diff --git a/libjava/gnu/javax/net/ssl/provider/SessionContext.h b/libjava/gnu/javax/net/ssl/provider/SessionContext.h
deleted file mode 100644
index 3dab41cd799..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SessionContext.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SessionContext__
-#define __gnu_javax_net_ssl_provider_SessionContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Session;
-              class Session$ID;
-              class SessionContext;
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SessionContext : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SessionContext();
-public:
-  virtual ::java::util::Enumeration * getIds();
-  virtual ::javax::net::ssl::SSLSession * getSession(JArray< jbyte > *);
-  virtual jint getSessionCacheSize();
-  virtual void setSessionCacheSize(jint);
-  virtual jint getSessionTimeout();
-  virtual void setSessionTimeout(jint);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual jboolean addSession(::gnu::javax::net::ssl::provider::Session$ID *, ::gnu::javax::net::ssl::provider::Session *);
-  virtual jboolean containsSessionID(::gnu::javax::net::ssl::provider::Session$ID *);
-  virtual jboolean removeSession(::gnu::javax::net::ssl::provider::Session$ID *);
-  virtual void notifyAccess(::gnu::javax::net::ssl::provider::Session *);
-public: // actually protected
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sessions;
-  jint cacheSize;
-  jint timeout;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SessionContext__
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 287944cb648..00000000000
--- 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 d3d5a07998b..00000000000
--- 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 4b87ea4afdd..00000000000
--- 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 adca3804a5a..00000000000
--- 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 7db323c28f7..00000000000
--- 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:
-  jboolean hasMoreElements();
-  ::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 68795decb98..00000000000
--- 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/SynchronizedRandom.h b/libjava/gnu/javax/net/ssl/provider/SynchronizedRandom.h
deleted file mode 100644
index a045e5308f1..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/SynchronizedRandom.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_SynchronizedRandom__
-#define __gnu_javax_net_ssl_provider_SynchronizedRandom__
-
-#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 net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class SynchronizedRandom;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::SynchronizedRandom : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SynchronizedRandom(::gnu::java::security::prng::IRandom *);
-public:
-  virtual ::java::lang::String * name();
-  virtual void init(::java::util::Map *);
-  virtual jbyte nextByte();
-  virtual void nextBytes(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::Object * clone();
-  virtual void addRandomByte(jbyte);
-  virtual void addRandomBytes(JArray< jbyte > *);
-  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
-private:
-  ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) random;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_SynchronizedRandom__
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 6948f3f0564..00000000000
--- 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 737d6c4169e..00000000000
--- 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 73b4d255857..00000000000
--- 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 4cdcf79f4bf..00000000000
--- 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 * target$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 e2b0188c07c..00000000000
--- 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 6101a829dce..00000000000
--- 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 0aeabe4c281..00000000000
--- 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 9c75dd0a847..00000000000
--- 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 076f175d11f..00000000000
--- 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:
-  ::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 606786ee862..00000000000
--- 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:
-  ::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 ad7d244f749..00000000000
--- 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 6e54af1c89e..00000000000
--- 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 f5e928014b8..00000000000
--- 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 target$add(::javax::security::auth::x500::X500Principal *);
-  virtual jboolean hasNext();
-  virtual jboolean hasPrevious();
-  virtual ::javax::security::auth::x500::X500Principal * target$next();
-  virtual jint nextIndex();
-  virtual ::javax::security::auth::x500::X500Principal * target$previous();
-  virtual jint previousIndex();
-  virtual void remove();
-  virtual void target$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 080b5e45cae..00000000000
--- 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 6455f80d0ca..00000000000
--- 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 a261c27448c..00000000000
--- 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 c34c2c5a705..00000000000
--- 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 f65c0490700..00000000000
--- 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/net/ssl/provider/XMLSessionContext$SAXHandler.h b/libjava/gnu/javax/net/ssl/provider/XMLSessionContext$SAXHandler.h
deleted file mode 100644
index 0ced1c2dd3d..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/XMLSessionContext$SAXHandler.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_XMLSessionContext$SAXHandler__
-#define __gnu_javax_net_ssl_provider_XMLSessionContext$SAXHandler__
-
-#pragma interface
-
-#include <org/xml/sax/helpers/DefaultHandler.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace crypto
-      {
-        namespace mac
-        {
-            class IMac;
-        }
-        namespace mode
-        {
-            class IMode;
-        }
-      }
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Session;
-              class SessionContext;
-              class XMLSessionContext;
-              class XMLSessionContext$SAXHandler;
-          }
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::XMLSessionContext$SAXHandler : public ::org::xml::sax::helpers::DefaultHandler
-{
-
-public: // actually package-private
-  XMLSessionContext$SAXHandler(::gnu::javax::net::ssl::provider::XMLSessionContext *, ::gnu::javax::net::ssl::provider::SessionContext *, ::gnu::java::security::prng::IRandom *);
-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 characters(JArray< jchar > *, jint, jint);
-private:
-  ::gnu::javax::net::ssl::provider::SessionContext * __attribute__((aligned(__alignof__( ::org::xml::sax::helpers::DefaultHandler)))) context;
-  ::gnu::javax::net::ssl::provider::Session * current;
-  ::gnu::java::security::prng::IRandom * pbekdf;
-  ::java::lang::StringBuffer * buf;
-  ::java::lang::String * certType;
-  jint state;
-  ::gnu::javax::crypto::mode::IMode * cipher;
-  ::java::util::HashMap * cipherAttr;
-  ::gnu::javax::crypto::mac::IMac * mac;
-  ::java::util::HashMap * macAttr;
-  JArray< jbyte > * key;
-  JArray< jbyte > * iv;
-  JArray< jbyte > * mackey;
-  static const jint START = 0;
-  static const jint SESSIONS = 1;
-  static const jint SESSION = 2;
-  static const jint PEER = 3;
-  static const jint PEER_CERTS = 4;
-  static const jint CERTS = 5;
-  static const jint SECRET = 6;
-public: // actually package-private
-  ::gnu::javax::net::ssl::provider::XMLSessionContext * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_XMLSessionContext$SAXHandler__
diff --git a/libjava/gnu/javax/net/ssl/provider/XMLSessionContext.h b/libjava/gnu/javax/net/ssl/provider/XMLSessionContext.h
deleted file mode 100644
index dfc42243c3f..00000000000
--- a/libjava/gnu/javax/net/ssl/provider/XMLSessionContext.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_net_ssl_provider_XMLSessionContext__
-#define __gnu_javax_net_ssl_provider_XMLSessionContext__
-
-#pragma interface
-
-#include <gnu/javax/net/ssl/provider/SessionContext.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace prng
-        {
-            class IRandom;
-        }
-      }
-    }
-    namespace javax
-    {
-      namespace net
-      {
-        namespace ssl
-        {
-          namespace provider
-          {
-              class Session;
-              class Session$ID;
-              class XMLSessionContext;
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-}
-
-class gnu::javax::net::ssl::provider::XMLSessionContext : public ::gnu::javax::net::ssl::provider::SessionContext
-{
-
-public: // actually package-private
-  XMLSessionContext();
-  virtual jboolean addSession(::gnu::javax::net::ssl::provider::Session$ID *, ::gnu::javax::net::ssl::provider::Session *);
-  virtual void notifyAccess(::gnu::javax::net::ssl::provider::Session *);
-  virtual jboolean removeSession(::gnu::javax::net::ssl::provider::Session$ID *);
-private:
-  void decode();
-  void encode();
-  ::java::io::File * __attribute__((aligned(__alignof__( ::gnu::javax::net::ssl::provider::SessionContext)))) file;
-  ::gnu::java::security::prng::IRandom * pbekdf;
-  jboolean compress;
-  ::java::security::SecureRandom * random;
-  jboolean encoding;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_net_ssl_provider_XMLSessionContext__
diff --git a/libjava/gnu/javax/print/CupsIppOperation.h b/libjava/gnu/javax/print/CupsIppOperation.h
deleted file mode 100644
index f328a19fe5b..00000000000
--- 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 3d5f5934f66..00000000000
--- 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 68bf4b79f2c..00000000000
--- 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 b4f983672db..00000000000
--- 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 c31d236b541..00000000000
--- 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 d1613f8d88a..00000000000
--- 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 0c16fdfda92..00000000000
--- 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 716edb88659..00000000000
--- 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 e05e7e96717..00000000000
--- 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 c5570cf0e10..00000000000
--- 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 65ca5acb4ab..00000000000
--- 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 272006401d1..00000000000
--- 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 6e77b26202c..00000000000
--- 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 4e95c93299b..00000000000
--- 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 dd9e76f3135..00000000000
--- 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 1ef5241424c..00000000000
--- 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 c4161e062f3..00000000000
--- 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 988f2243f85..00000000000
--- 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 0cfdca94972..00000000000
--- 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 3a665d5d22f..00000000000
--- 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 d87519477b4..00000000000
--- 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 4c1141129b6..00000000000
--- 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 a0d6a890aa3..00000000000
--- 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 cd8a06d3a9c..00000000000
--- 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 8e38d40c709..00000000000
--- 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 e9da502b813..00000000000
--- 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 cbe602287d4..00000000000
--- 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 515c23138cc..00000000000
--- 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 069f96423ca..00000000000
--- 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 5f7dc2fc2a4..00000000000
--- 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 468b713283a..00000000000
--- 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 dd3eb0d37cc..00000000000
--- 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 000723f666b..00000000000
--- 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 341f87c5950..00000000000
--- 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 dbe7cd8a6bb..00000000000
--- 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 bc02d4b76d2..00000000000
--- 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 25c1c013388..00000000000
--- 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 0b0be102aac..00000000000
--- 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 8a641a0a077..00000000000
--- 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 7913233b918..00000000000
--- 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 8ed5bc28c06..00000000000
--- a/libjava/gnu/javax/print/ipp/attribute/RequestedAttributes.h
+++ /dev/null
@@ -1,46 +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>
-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 *);
-  ::java::util::List * 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 b87c9800f25..00000000000
--- 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 dc6aa6550bb..00000000000
--- 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 2a0c003fb5b..00000000000
--- 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 d86ecdeaad9..00000000000
--- 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 97a6f4a8671..00000000000
--- 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 5a059dc00cb..00000000000
--- 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 22f50301397..00000000000
--- 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 d8f4cb25816..00000000000
--- 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 9825da3056e..00000000000
--- 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 9ffc184863e..00000000000
--- 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 cc4d01d6658..00000000000
--- 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 7b53cec2780..00000000000
--- 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 0c0bf5aa8a7..00000000000
--- 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 faeeb6de864..00000000000
--- 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 836ca618bfa..00000000000
--- 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 82cb55b4362..00000000000
--- 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 e69e1c8600b..00000000000
--- 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 c21c942f45b..00000000000
--- 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 9aaaf03e0c6..00000000000
--- 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 6141d51c1b6..00000000000
--- 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 61a5364c56a..00000000000
--- 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 7ac6adf305f..00000000000
--- 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 3eb3c3652ca..00000000000
--- 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 42551e00d2b..00000000000
--- 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 4d4da6823a9..00000000000
--- 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 24ed6195665..00000000000
--- 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 ecce212081f..00000000000
--- 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 4e520a500b3..00000000000
--- 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 a473cf19151..00000000000
--- 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 509573271c7..00000000000
--- 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 286c4457a92..00000000000
--- 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 4fba7e000ff..00000000000
--- 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 f9a87b58ed7..00000000000
--- 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 c3e5b8ce1a2..00000000000
--- 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 16add8c0f5a..00000000000
--- 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 ec98145255e..00000000000
--- 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 9a1c3c41758..00000000000
--- 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 058b8d19214..00000000000
--- 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 2e7e6cd8d3c..00000000000
--- 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 38ab8a7737e..00000000000
--- 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 be9ad30afb3..00000000000
--- 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 2c378c2282a..00000000000
--- 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 66920c0e2ff..00000000000
--- 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 655d7edce6e..00000000000
--- 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 bbb90a4cc28..00000000000
--- 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 3baf062c3bb..00000000000
--- 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 5f40779c3f2..00000000000
--- 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 c9784671e37..00000000000
--- 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 3c7b99d5ff2..00000000000
--- 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 dbb186c10d2..00000000000
--- 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 254a20aca99..00000000000
--- 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 32f571f9d1e..00000000000
--- 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 8467a1c0789..00000000000
--- 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 adbe74faee1..00000000000
--- 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 6234e881d2e..00000000000
--- 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 a1b449299df..00000000000
--- 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 3f2b34c89ac..00000000000
--- 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 750b4fbb20f..00000000000
--- 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 367e50eb515..00000000000
--- 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:
-  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 8602d3f5d51..00000000000
--- 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:
-  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 8dd5c60d06d..00000000000
--- 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 c8712e285c0..00000000000
--- 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 684b4e4e082..00000000000
--- 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 b4634938168..00000000000
--- 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 715322d05e1..00000000000
--- 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 76c282e2307..00000000000
--- 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 5f3bb8287d7..00000000000
--- 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 f63c02f5927..00000000000
--- 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 b416d0ca535..00000000000
--- 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 bd068a60d42..00000000000
--- 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 bd3d0dc14ed..00000000000
--- 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 1350bec6504..00000000000
--- 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:
-  ::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 d7bb1dfe6f6..00000000000
--- 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 e8d2bf220e4..00000000000
--- 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:
-  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 1fcd2ef84aa..00000000000
--- 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:
-  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 6e6f2a1bd00..00000000000
--- 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:
-  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 d49173a612a..00000000000
--- 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:
-  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 43036131faa..00000000000
--- 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:
-  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 8ba275388e2..00000000000
--- 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:
-  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 2e9a398c85e..00000000000
--- 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:
-  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 6d1f18c84de..00000000000
--- 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 7daf71bd9a9..00000000000
--- 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 56bd3954b64..00000000000
--- a/libjava/gnu/javax/security/auth/login/ConfigFileTokenizer.h
+++ /dev/null
@@ -1,62 +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 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:
-  ::java::lang::StringBuffer * 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 42177491d1f..00000000000
--- 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/midi/alsa/AlsaInputPortDevice.h b/libjava/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.h
deleted file mode 100644
index cb7291daea6..00000000000
--- 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 fb7a22385c9..00000000000
--- 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 51bab4a4093..00000000000
--- 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 c37627bbf32..00000000000
--- 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 b7c2f640095..00000000000
--- 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 f1586dfaada..00000000000
--- 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 a1d2884ed2d..00000000000
--- 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 5317a997063..00000000000
--- 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 0f7718d922e..00000000000
--- 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 8e23df85e57..00000000000
--- 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 f88cadcf117..00000000000
--- 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 351bd7099dd..00000000000
--- 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 2d477ac8ebb..00000000000
--- 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:
-  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 a5f7a82edcf..00000000000
--- a/libjava/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider$DSSIInfo.h
+++ /dev/null
@@ -1,42 +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 *, jlong);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::sound::midi::MidiDevice$Info)))) 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 3cf346a3f2a..00000000000
--- 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 48167354b76..00000000000
--- 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 733eb385716..00000000000
--- 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 dbdd3284f1e..00000000000
--- 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 4ebaffbe338..00000000000
--- 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 c4d4a619cdb..00000000000
--- 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 70a8a4c2ef2..00000000000
--- 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 00d2472849f..00000000000
--- 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 70718fc2a1a..00000000000
--- 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 823ead63702..00000000000
--- 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 15518ac73cc..00000000000
--- 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 d88744fe41b..00000000000
--- 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 94f21017bda..00000000000
--- 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 d269e765772..00000000000
--- 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 3756d5d8374..00000000000
--- 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/swing/plaf/gnu/GNULookAndFeel$CheckBoxIcon.h b/libjava/gnu/javax/swing/plaf/gnu/GNULookAndFeel$CheckBoxIcon.h
deleted file mode 100644
index cb81ed002d7..00000000000
--- 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 7bf88f4501e..00000000000
--- 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 5aacc5f6f0f..00000000000
--- 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 86f273af80a..00000000000
--- 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 72939f5fbf4..00000000000
--- 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 26a3386ff5d..00000000000
--- 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 69ed22976ab..00000000000
--- 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 b0f39ebf9e7..00000000000
--- 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 d25a5fe2983..00000000000
--- 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 3357a92cff8..00000000000
--- 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 e8efa108fad..00000000000
--- 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 ce2878788bf..00000000000
--- 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 6896930e930..00000000000
--- 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 bcacf3220c2..00000000000
--- 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 be6e19bcdd5..00000000000
--- 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:
-  void startStatement(JArray< ::gnu::javax::swing::text::html::css::Selector * > *);
-  void endStatement();
-  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 f7cb014251d..00000000000
--- 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 ce07b41e1b0..00000000000
--- 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 9be56d4f3aa..00000000000
--- 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 0e6d7c5f026..00000000000
--- 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 52c4087fa8f..00000000000
--- 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 b25be5b1ee4..00000000000
--- 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 17adbbe9553..00000000000
--- 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 0eb88bff233..00000000000
--- 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 1f7103e976e..00000000000
--- 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 * > *, JArray< ::java::util::Map * > *);
-  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 27fa3d0781d..00000000000
--- 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 1eda52a21b3..00000000000
--- 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 8ef57c70b31..00000000000
--- a/libjava/gnu/javax/swing/text/html/parser/HTML_401F.h
+++ /dev/null
@@ -1,330 +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();
-  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/HTML_401Swing.h b/libjava/gnu/javax/swing/text/html/parser/HTML_401Swing.h
deleted file mode 100644
index 621eed594f1..00000000000
--- a/libjava/gnu/javax/swing/text/html/parser/HTML_401Swing.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_javax_swing_text_html_parser_HTML_401Swing__
-#define __gnu_javax_swing_text_html_parser_HTML_401Swing__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/HTML_401F.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace parser
-            {
-                class HTML_401Swing;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-          }
-        }
-      }
-    }
-  }
-}
-
-class gnu::javax::swing::text::html::parser::HTML_401Swing : public ::gnu::javax::swing::text::html::parser::HTML_401F
-{
-
-public:
-  HTML_401Swing();
-  static ::javax::swing::text::html::parser::DTD * getInstance();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getBodyElements();
-public: // actually package-private
-  static ::gnu::javax::swing::text::html::parser::HTML_401Swing * singleton;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_javax_swing_text_html_parser_HTML_401Swing__
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 8f65e05beec..00000000000
--- 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:
-  jboolean hasMoreElements();
-  ::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 c1aedde8462..00000000000
--- 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 33642e3353a..00000000000
--- 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 7074e629381..00000000000
--- 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:
-  jboolean hasMoreElements();
-  ::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 e981c4f0294..00000000000
--- 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 eff505b40bc..00000000000
--- 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 9236c14e45a..00000000000
--- 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 b83079044f4..00000000000
--- 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 6be57a051c9..00000000000
--- 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 6ddb166d00d..00000000000
--- 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 85320f40805..00000000000
--- 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 a0b135c9a86..00000000000
--- 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 6f6470de346..00000000000
--- 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 5483b5a57ea..00000000000
--- 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:
-  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 ba78f9c73fc..00000000000
--- 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
-  void s_error(::java::lang::String *);
-  void handleSupposedEndTag(::javax::swing::text::html::parser::Element *);
-  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 3bdc172d487..00000000000
--- 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 f442305c87e..00000000000
--- 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 98ccff8c531..00000000000
--- 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 3c21390f9d7..00000000000
--- 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 4903ffe756b..00000000000
--- 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 ee0c9fcf9f9..00000000000
--- 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 615dd9cb1ea..00000000000
--- 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 189d356f018..00000000000
--- 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 f237ae43e0d..00000000000
--- 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 f113e7b1ff3..00000000000
--- 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 3010b526cef..00000000000
--- 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 664baecc92d..00000000000
--- 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 cf5117b762c..00000000000
--- 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 3d36edac71f..00000000000
--- 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 42e8e0be030..00000000000
--- 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 8bffce6c848..00000000000
--- 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 ac3cbea3a3c..00000000000
--- 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 3aca3900849..00000000000
--- 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 aca07f72775..00000000000
--- 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 4baac80e141..00000000000
--- 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 8e992e1ca1a..00000000000
--- 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 5c4701a4096..00000000000
--- 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 a91f6496f97..00000000000
--- 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 feaf39e5f92..00000000000
--- 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 baf73193b6d..00000000000
--- 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 2e8de94fe3c..00000000000
--- 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 3d0f5ed3dc3..00000000000
--- 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 fcfd53cbc39..00000000000
--- 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 fdcfafe09c5..00000000000
--- 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 611a12be4cb..00000000000
--- 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 35656bbe970..00000000000
--- 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 e14ac0f9529..00000000000
--- a/libjava/gnu/xml/dom/DomAttr.h
+++ /dev/null
@@ -1,72 +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 *);
-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 9cfb8e625bc..00000000000
--- 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 e9c2ea119be..00000000000
--- 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 7ca5f2ce563..00000000000
--- 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 99c4a70e130..00000000000
--- 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 5cb1e504d10..00000000000
--- 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 c8ee6620994..00000000000
--- 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 e11ce621b4b..00000000000
--- a/libjava/gnu/xml/dom/DomDocument.h
+++ /dev/null
@@ -1,154 +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 ::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 defaultAttributes(::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;
-  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 f45207a7324..00000000000
--- 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 a0bb85f9545..00000000000
--- 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 f628910ed0e..00000000000
--- 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 ab0b4b5e352..00000000000
--- 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 35ed33eaaa6..00000000000
--- a/libjava/gnu/xml/dom/DomElement.h
+++ /dev/null
@@ -1,85 +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 *);
-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 914c2c51062..00000000000
--- 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 22e2665ebb0..00000000000
--- 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 613938abdd9..00000000000
--- 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 2c2921a8668..00000000000
--- 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 83a2822b2dc..00000000000
--- 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 c2c88940583..00000000000
--- 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 f0515862fda..00000000000
--- 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 7e155790404..00000000000
--- 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 9405c862f97..00000000000
--- 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 c26f2af4890..00000000000
--- 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);
-  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 577a112b12d..00000000000
--- 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 f24266f53d8..00000000000
--- 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 9755d8b047b..00000000000
--- 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 1465afca22e..00000000000
--- 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 763284796a1..00000000000
--- a/libjava/gnu/xml/dom/DomNode.h
+++ /dev/null
@@ -1,174 +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);
-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 9ebe95ed4d3..00000000000
--- 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 0d26797c7a2..00000000000
--- 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 13dc4940fc5..00000000000
--- 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 *);
-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;
-public: // actually package-private
-  ::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 ed636c2097d..00000000000
--- 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 c4f07da318e..00000000000
--- 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 000fe90f011..00000000000
--- 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 40a4e977e47..00000000000
--- 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 114d7ab2d4d..00000000000
--- 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 68813a3069c..00000000000
--- 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 c24a0306efc..00000000000
--- 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 464c4659ee9..00000000000
--- 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 16b24682692..00000000000
--- 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 6df58a7579b..00000000000
--- 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 9976a0b7734..00000000000
--- 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 2ac0c3c7afd..00000000000
--- 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 555ff42cd15..00000000000
--- 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 523060ad067..00000000000
--- 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 b5586a35e15..00000000000
--- 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 8e633ba6f9c..00000000000
--- 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 50fd3b89829..00000000000
--- 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 bd116d8a974..00000000000
--- 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 2a9529059ab..00000000000
--- 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 99ea1b5b3ae..00000000000
--- 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 f20a796e23a..00000000000
--- 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 4602edec2f9..00000000000
--- 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 38dd789895d..00000000000
--- 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 4ad0d5488ae..00000000000
--- 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 7eeb5b9212f..00000000000
--- 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 ee3dfcd90cd..00000000000
--- 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 a349505c1c4..00000000000
--- 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 683185b1ab2..00000000000
--- 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 1a410a6c14d..00000000000
--- 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 acea978ac1a..00000000000
--- 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 fc83fd36534..00000000000
--- 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 5610db591b8..00000000000
--- 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 34cf12db3ab..00000000000
--- 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 71661b9a3ee..00000000000
--- 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 dd2b429d3df..00000000000
--- 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 c2d322c114d..00000000000
--- 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 85f70605fda..00000000000
--- 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 3b67d3439fa..00000000000
--- 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 6c988909ba4..00000000000
--- 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 0ca04dc5e95..00000000000
--- 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 dfcfd08b15c..00000000000
--- 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 7f396e06f82..00000000000
--- 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 17eb5740207..00000000000
--- 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 d0ae6872961..00000000000
--- 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 e2dc56929d1..00000000000
--- 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 1947ba888d7..00000000000
--- 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 173e3d06798..00000000000
--- 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 8ab137b3124..00000000000
--- 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 3a81ae1eed3..00000000000
--- 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 d681c07cab5..00000000000
--- 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 8dc30e5bdf2..00000000000
--- 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 a0acd7d5dd7..00000000000
--- 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 3e01fdcdacb..00000000000
--- 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 e74965efa7c..00000000000
--- 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 3555201655d..00000000000
--- 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 cc03a8fb6b4..00000000000
--- 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 51ea54c6bab..00000000000
--- 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 206539ff5e9..00000000000
--- 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 e9076499ce0..00000000000
--- 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 7d31e5498b2..00000000000
--- 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 ff55d970f60..00000000000
--- 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 0bc78f7cec3..00000000000
--- 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 61684a4b659..00000000000
--- 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 9abf67068ba..00000000000
--- 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 c141217d3d8..00000000000
--- 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 d660525e684..00000000000
--- 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 21ca1ad0f02..00000000000
--- 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 3fa6778a8fc..00000000000
--- 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 f47de9742b6..00000000000
--- 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 e6ba100c335..00000000000
--- 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 dd38f2b1fd0..00000000000
--- 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 90cc8655963..00000000000
--- 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 2fb867007f1..00000000000
--- 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 7fa7d937614..00000000000
--- 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 ec35c66b68e..00000000000
--- a/libjava/gnu/xml/dom/ls/SAXEventSink.h
+++ /dev/null
@@ -1,126 +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: // actually protected
-  virtual ::org::w3c::dom::Document * getDocument();
-public:
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  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;
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceAware;
-  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 5663844da6b..00000000000
--- 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 9619be9c523..00000000000
--- 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 b8c3083192f..00000000000
--- 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 93c6b31dfb6..00000000000
--- 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 211d938ab80..00000000000
--- 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 1a331eb7588..00000000000
--- 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 ba58526ff81..00000000000
--- 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 8f49b25188a..00000000000
--- 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 b71081d3afa..00000000000
--- 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 465a17f264f..00000000000
--- 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 bac97adc83e..00000000000
--- 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 d0eff62f8a6..00000000000
--- 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 b02399165ea..00000000000
--- 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 f0611ff9637..00000000000
--- 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 22cc5c7fee7..00000000000
--- 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 7dfd2aeb641..00000000000
--- 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 6f9ac92f3af..00000000000
--- 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 8ded813f6f5..00000000000
--- 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 627e09c84c7..00000000000
--- 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 c3097b9f56c..00000000000
--- 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 220052d9750..00000000000
--- 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 d775bc76d34..00000000000
--- 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 ca88b7742c2..00000000000
--- 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 5728efb69e6..00000000000
--- 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 cc2a7573b00..00000000000
--- 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 5616ce37af0..00000000000
--- 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 8697c204d04..00000000000
--- 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 0aae0b1285b..00000000000
--- 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 3c791c1b9e9..00000000000
--- 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 e27238f2886..00000000000
--- 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 bc4e872ef35..00000000000
--- 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 d015c9db7f0..00000000000
--- 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 d76438aedc0..00000000000
--- 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 823265feb7e..00000000000
--- 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 0b197fabd3c..00000000000
--- 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 6afbf3fab0c..00000000000
--- 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 b34706ec3d3..00000000000
--- 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 88df98333d3..00000000000
--- 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 2bde43e51b8..00000000000
--- 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 f0b3a6280c8..00000000000
--- 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 1ac77d38d0d..00000000000
--- 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 77f3028a95c..00000000000
--- 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 c0ea02f8672..00000000000
--- 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 d12e7aabaf0..00000000000
--- 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 131c1cc4605..00000000000
--- 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 71ab028d0b6..00000000000
--- 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 4ba4fc60897..00000000000
--- 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 b70ca18ddf2..00000000000
--- 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 ad9d15acad1..00000000000
--- 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 8895017028b..00000000000
--- 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 8de1d85805a..00000000000
--- 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 f38a80df517..00000000000
--- 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 13d99954aae..00000000000
--- 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 07a87875b83..00000000000
--- 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 57feff214c5..00000000000
--- 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 685c3604a32..00000000000
--- 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 650e75155da..00000000000
--- 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 6c69d31ae1f..00000000000
--- 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 711b5289a55..00000000000
--- 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 d15097fa656..00000000000
--- 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 eaabd0079d7..00000000000
--- 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 b628740eeaa..00000000000
--- 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 087576c3093..00000000000
--- 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 b08d025b2e6..00000000000
--- 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 2b97d47b151..00000000000
--- 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 114756ed2c6..00000000000
--- 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 21321afba10..00000000000
--- 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 988735c6eea..00000000000
--- 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 d78c6a53efc..00000000000
--- 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 *, ::javax::xml::namespace::QName *, jboolean);
-public:
-  virtual jint getEventType();
-  virtual ::javax::xml::namespace::QName * getName();
-  virtual ::java::lang::String * getValue();
-  virtual ::javax::xml::namespace::QName * 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;
-  ::javax::xml::namespace::QName * 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 0ee4018473d..00000000000
--- 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 977dd1e1727..00000000000
--- 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 9a828cd83d8..00000000000
--- 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 7e1d951df32..00000000000
--- 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 e1118230ac5..00000000000
--- 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 a7bbf05aa52..00000000000
--- 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 cc1dba81601..00000000000
--- 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 8c4180860f0..00000000000
--- 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 0f30dc87747..00000000000
--- 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 ae4da2f7076..00000000000
--- 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 77c92e8598e..00000000000
--- 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/ReaderDelegate.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::ReaderDelegate
-{
-
-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::ReaderDelegate)))) 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 136154c99a5..00000000000
--- a/libjava/gnu/xml/stream/NamespaceImpl.h
+++ /dev/null
@@ -1,52 +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 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 *);
-public:
-  virtual jint getEventType();
-  virtual ::java::lang::String * getPrefix();
-  virtual ::java::lang::String * getNamespaceURI();
-  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;
-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 c994018d8d0..00000000000
--- 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 f743902e91c..00000000000
--- 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 5624f8680af..00000000000
--- 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 c3d0c01d455..00000000000
--- 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 adb51a57fd8..00000000000
--- 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 13b1dc64679..00000000000
--- 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 456700636fc..00000000000
--- 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 36e488a6015..00000000000
--- 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/ReaderDelegate.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::ReaderDelegate
-{
-
-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::ReaderDelegate)))) 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 374c125c422..00000000000
--- 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 b8ebf0bcda5..00000000000
--- 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 46432d3506d..00000000000
--- 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 e3ce4923ffb..00000000000
--- 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 77c10a53399..00000000000
--- 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 43a2197555a..00000000000
--- 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 c5cd038b7f5..00000000000
--- 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 c5b4ea39515..00000000000
--- 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 0b2b62aa653..00000000000
--- a/libjava/gnu/xml/stream/XMLParser$Attribute.h
+++ /dev/null
@@ -1,44 +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 *);
-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 27da8e20da0..00000000000
--- 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 26d9b824ff8..00000000000
--- 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 3ac0ad187ba..00000000000
--- 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 06ba9ec6831..00000000000
--- 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 a1c745cb963..00000000000
--- 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 08ec0163003..00000000000
--- 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 037fb617e47..00000000000
--- 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 60ae69bd485..00000000000
--- 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 e7f244a1ade..00000000000
--- 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 d2b2ff0d1fe..00000000000
--- a/libjava/gnu/xml/stream/XMLParser.h
+++ /dev/null
@@ -1,296 +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 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:
-  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(::java::lang::StringBuffer *);
-  ::gnu::xml::stream::XMLParser$ContentParticle * readContentParticle(::java::lang::StringBuffer *);
-  void readAttlistDecl();
-  void readAttDef(::java::lang::String *);
-  ::java::lang::String * readAttType(::java::lang::StringBuffer *, ::java::util::HashSet *);
-  void readEnumeration(jboolean, ::java::lang::StringBuffer *, ::java::util::HashSet *);
-  void readNotationType(::java::lang::StringBuffer *, ::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;
-  jboolean lookahead;
-  ::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 ffd534947bc..00000000000
--- a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h
+++ /dev/null
@@ -1,119 +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 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 d8c2740809d..00000000000
--- a/libjava/gnu/xml/transform/AbstractNumberNode.h
+++ /dev/null
@@ -1,77 +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 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(::java::lang::StringBuffer *, 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 f9e19a61d0e..00000000000
--- 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 02f49a22b63..00000000000
--- 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 80f6d3cc3d5..00000000000
--- 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 2c92e121145..00000000000
--- 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 a54ab174e15..00000000000
--- 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 f7d32ade246..00000000000
--- 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 88574784fef..00000000000
--- 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 2f04431d0d2..00000000000
--- 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 a57c004d321..00000000000
--- 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 f33944630d6..00000000000
--- 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 dee45ec7b45..00000000000
--- 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 974654e33c1..00000000000
--- 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 a599fc44b0e..00000000000
--- 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 0d25fe354d9..00000000000
--- 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 73d0f0fb216..00000000000
--- 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 e7a4e36d7ab..00000000000
--- 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 1cb11affc92..00000000000
--- 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 417e8973805..00000000000
--- 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 b900a1b7a31..00000000000
--- 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 8b1de4a182c..00000000000
--- 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 dff1c470ace..00000000000
--- 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 8588b2ffea4..00000000000
--- 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 d9185e38020..00000000000
--- 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 056f5f1124f..00000000000
--- 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 06fda75e92e..00000000000
--- 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 c92a7c56cce..00000000000
--- 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 770387efcb6..00000000000
--- 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 c8da9666eaf..00000000000
--- 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 ecd01817185..00000000000
--- 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 6a815cfafd8..00000000000
--- a/libjava/gnu/xml/transform/ParameterNode.h
+++ /dev/null
@@ -1,70 +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::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::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint);
-public:
-  jboolean references(::javax::xml::namespace::QName *);
-  jint compareTo(::java::lang::Object *);
-  ::java::lang::String * toString();
-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 f8339159386..00000000000
--- 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 29b1f55cbd0..00000000000
--- 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 4bd3a41c930..00000000000
--- 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 b269ac894e6..00000000000
--- 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 f433dc39668..00000000000
--- a/libjava/gnu/xml/transform/SortKey.h
+++ /dev/null
@@ -1,74 +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 *);
-  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 9c10a44146c..00000000000
--- 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 6afdfa0f57c..00000000000
--- 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 c2a3f20d6db..00000000000
--- a/libjava/gnu/xml/transform/Stylesheet.h
+++ /dev/null
@@ -1,170 +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 *);
-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 dbbdc2d36f2..00000000000
--- 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 3b26715d785..00000000000
--- 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 b5ecbc81753..00000000000
--- 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 d79409b3df8..00000000000
--- a/libjava/gnu/xml/transform/TemplatesImpl.h
+++ /dev/null
@@ -1,52 +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();
-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 a78bc1cd3f0..00000000000
--- 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 ecdb46f7154..00000000000
--- 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 47c1d9a9f35..00000000000
--- 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 e5fd927dd80..00000000000
--- 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 f7cd288e1e9..00000000000
--- 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 c1b94c9466b..00000000000
--- 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 cfd13176529..00000000000
--- 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 c904902c3b6..00000000000
--- 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 c5882691aeb..00000000000
--- 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 0f99c57c86d..00000000000
--- a/libjava/gnu/xml/transform/XSLComparator.h
+++ /dev/null
@@ -1,37 +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;
-      }
-    }
-  }
-}
-
-class gnu::xml::transform::XSLComparator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XSLComparator(::java::util::List *);
-public:
-  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 a7e0aeae26e..00000000000
--- a/libjava/gnu/xml/transform/XSLURIResolver.h
+++ /dev/null
@@ -1,74 +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;
-        }
-      }
-    }
-  }
-}
-
-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();
-  ::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 3c61367dda6..00000000000
--- 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 b775f00d060..00000000000
--- 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 f64b729b5b3..00000000000
--- 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 ccafe1f2c86..00000000000
--- 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 62e4abac123..00000000000
--- 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 b1c1bb1d695..00000000000
--- 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 3764fb6c801..00000000000
--- 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 0bf4b466bb5..00000000000
--- 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 784a7235e65..00000000000
--- 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 78fdb8caaf7..00000000000
--- 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 f9415020452..00000000000
--- 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 4b727ce46f1..00000000000
--- 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 34e146afef7..00000000000
--- 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 846c85b2710..00000000000
--- 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 a0b93275dae..00000000000
--- 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 6fd702d4875..00000000000
--- 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 ea354b999f3..00000000000
--- a/libjava/gnu/xml/util/XMLWriter.h
+++ /dev/null
@@ -1,145 +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 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;
-  ::java::lang::StringBuffer * 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 b6dffa6ba9c..00000000000
--- 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 41c19275d30..00000000000
--- 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 2f9ec8d0fb6..00000000000
--- 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 1b5b22544c1..00000000000
--- 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 805e1ae5884..00000000000
--- 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 5aaec9c875b..00000000000
--- 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 7f63b39c15f..00000000000
--- 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 6b814e94b02..00000000000
--- 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 35f83ecd4f4..00000000000
--- 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 bca1354f593..00000000000
--- 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 4f9b8be07ce..00000000000
--- 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 75bad58f2a2..00000000000
--- 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 17216d72d83..00000000000
--- 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 d6c984de8ac..00000000000
--- 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 2c1e52343bc..00000000000
--- 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 c10bbfc9587..00000000000
--- 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 c3bcc2b221b..00000000000
--- 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 76ebe4ceba7..00000000000
--- 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 af22a2f2758..00000000000
--- 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 9ed33c4c9ce..00000000000
--- 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 29128fc9b64..00000000000
--- 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 4e1e3c5a23d..00000000000
--- 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 d3cb5e00719..00000000000
--- 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 40f7db1cc7d..00000000000
--- 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 af79163e115..00000000000
--- 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 cd1e7f9efcc..00000000000
--- 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 8af7484d304..00000000000
--- 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 eb6d4503199..00000000000
--- 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 1cadf8bccae..00000000000
--- 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 b5c4a768454..00000000000
--- 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 da717bec838..00000000000
--- 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 f61451f480f..00000000000
--- 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 861602b3069..00000000000
--- 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 34184818c07..00000000000
--- 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 bb1567f276a..00000000000
--- 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 04bb2748609..00000000000
--- 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 9c06c96a4db..00000000000
--- 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 5d97f0d9d49..00000000000
--- 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 b8add0fb397..00000000000
--- 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 34a4c951283..00000000000
--- 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 633547259be..00000000000
--- 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 f167e922512..00000000000
--- 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 c6e35cd22ba..00000000000
--- 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 5e364675927..00000000000
--- 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 65b614b31f8..00000000000
--- 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 57419a3df66..00000000000
--- 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 61859f0dab1..00000000000
--- 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 e6066e45496..00000000000
--- 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 39b376b5850..00000000000
--- 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 b3a0ccfedb1..00000000000
--- 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 9b780494db9..00000000000
--- 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 06f5d5e110c..00000000000
--- 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 ca41fc3e94b..00000000000
--- 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 d2a41c1cb3c..00000000000
--- 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 21c597479d3..00000000000
--- 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 78ea57b1593..00000000000
--- 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 217d0ef02ad..00000000000
--- 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 cba07a326e4..00000000000
--- 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 9c12b820ef4..00000000000
--- 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 fcdaa098c9f..00000000000
--- 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 1626166985e..00000000000
--- 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 f43d75cf88f..00000000000
--- 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 8e5f36593f2..00000000000
--- 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 087611729c5..00000000000
--- 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 4335a248f78..00000000000
--- 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 17979387cc5..00000000000
--- 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 05f66faaa1a..00000000000
--- 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 83aaa463324..00000000000
--- 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 baeba0030e7..00000000000
--- 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 b0b27daaa30..00000000000
--- 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 7eb207f5502..00000000000
--- 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 f338b56ab11..00000000000
--- 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 bb0c947a433..00000000000
--- 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 99eb7cc2946..00000000000
--- 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 3cc38a6361c..00000000000
--- 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 312a48fcdc8..00000000000
--- 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 42b38013a3e..00000000000
--- 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 dc827563106..00000000000
--- 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 85c4a2f7981..00000000000
--- 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 00bb5b55285..00000000000
--- 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 85fa679014b..00000000000
--- 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 844132ff1c4..00000000000
--- 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 ecd499be1da..00000000000
--- 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 bf53fba0542..00000000000
--- 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 a813efcc8a3..00000000000
--- 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 45ddffec984..00000000000
--- 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 37b0d017096..00000000000
--- 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 bd52ac7b375..00000000000
--- 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 02716e88570..00000000000
--- 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 78351cfb144..00000000000
--- 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 8fcdb4f42aa..00000000000
--- 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 ffa1dfb7512..00000000000
--- 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 334bf94af05..00000000000
--- 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 a65d11b2323..00000000000
--- 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 d59682bfafb..00000000000
--- 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 16241747b62..00000000000
--- 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 fd0f6d65e2c..00000000000
--- 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 65a8c0a0461..00000000000
--- 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 73728689fb8..00000000000
--- 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 b687c0723b7..00000000000
--- 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 b1f69f67488..00000000000
--- 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 10561967e85..00000000000
--- 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 4465791c0a8..00000000000
--- 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 b5c008f57d7..00000000000
--- 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 189a0757c79..00000000000
--- 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 0233bfc095a..00000000000
--- 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 c8228ba1c86..00000000000
--- 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 cdea811e7fc..00000000000
--- 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 4fec76fe9a8..00000000000
--- 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 465720c46fc..00000000000
--- 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 2d208afd61f..00000000000
--- 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 23ff8b66ae1..00000000000
--- 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 b4d45dd06c9..00000000000
--- 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 d253235f838..00000000000
--- 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 049b63af3b8..00000000000
--- 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 fbbb1963084..00000000000
--- 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 94ebcc73b7c..00000000000
--- 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 69c310d3779..00000000000
--- 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 eb7773b8ba5..00000000000
--- 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 ab54f6cd728..00000000000
--- 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 4350f310987..00000000000
--- 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 492cb12b0c5..00000000000
--- 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 51e14fed2e7..00000000000
--- 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 e33d07f995d..00000000000
--- 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 0741837949f..00000000000
--- 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 f34cb311a47..00000000000
--- a/libjava/gnu/xml/xpath/DocumentOrderComparator.h
+++ /dev/null
@@ -1,33 +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;
-      }
-    }
-  }
-}
-
-class gnu::xml::xpath::DocumentOrderComparator : public ::java::lang::Object
-{
-
-public:
-  DocumentOrderComparator();
-  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 af6c0e29088..00000000000
--- 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 e8065316b85..00000000000
--- 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 a737f95a51a..00000000000
--- 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 42df32629c1..00000000000
--- 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 1fe02545e71..00000000000
--- 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 e4d457c7cfd..00000000000
--- 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 09a4184405f..00000000000
--- 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 efe1f3e543c..00000000000
--- 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 d9c2123ff51..00000000000
--- 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 3af5ef634e7..00000000000
--- 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 3de7c9a8658..00000000000
--- 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 b321cc2ba38..00000000000
--- 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 d81cf5f5166..00000000000
--- 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 584a538e1ae..00000000000
--- 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 0838222b03f..00000000000
--- 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 bc4a176f521..00000000000
--- 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 952aee4fc9b..00000000000
--- 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 6637aec97de..00000000000
--- 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 117055bfe2a..00000000000
--- 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 bdbeafe65ec..00000000000
--- 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 8296fc686b6..00000000000
--- 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 09a5efaeb5f..00000000000
--- 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 f36b5ceffe3..00000000000
--- 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 917835eec15..00000000000
--- 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 4a06fb03a01..00000000000
--- 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 da2df353f89..00000000000
--- 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 727282e642c..00000000000
--- 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 3988c14deb7..00000000000
--- 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 6568dc13290..00000000000
--- 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 8b0495ff69b..00000000000
--- 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 34b5ff12922..00000000000
--- 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 f2802895675..00000000000
--- 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 0e2e907e7be..00000000000
--- 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 a181d292343..00000000000
--- 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 4c89a7c072d..00000000000
--- 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 97d2fd0de11..00000000000
--- 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 51a3d052c65..00000000000
--- 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 aeb7e163df6..00000000000
--- 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 2e5f77f3543..00000000000
--- 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 b2a708a19fa..00000000000
--- 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 a5958170cb5..00000000000
--- 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 1186ee27c6a..00000000000
--- 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 c1a611c55d6..00000000000
--- 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 41349bf8b9e..00000000000
--- 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 1f84db72175..00000000000
--- 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 f364f4a1ca4..00000000000
--- 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 23cd3407360..00000000000
--- 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 97d0f1be407..00000000000
--- 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 1a2e31ff82d..00000000000
--- 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 4e95f9d2bae..00000000000
--- 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 c9c0ea4918a..00000000000
--- 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 216fcff02ad..00000000000
--- 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 d1a439e48fa..00000000000
--- 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 2a129b2339c..00000000000
--- 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 2408d361a87..00000000000
--- 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 bf25adb2fa4..00000000000
--- 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 4383ddf2718..00000000000
--- 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 13c48744ff1..00000000000
--- 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 ae018906671..00000000000
--- 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 4cbf9ec141d..00000000000
--- 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__
diff --git a/libjava/java/applet/Applet$AccessibleApplet.h b/libjava/java/applet/Applet$AccessibleApplet.h
deleted file mode 100644
index 6819ecb1d49..00000000000
--- a/libjava/java/applet/Applet$AccessibleApplet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_applet_Applet$AccessibleApplet__
-#define __java_applet_Applet$AccessibleApplet__
-
-#pragma interface
-
-#include <java/awt/Panel$AccessibleAWTPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet;
-        class Applet$AccessibleApplet;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::applet::Applet$AccessibleApplet : public ::java::awt::Panel$AccessibleAWTPanel
-{
-
-public: // actually protected
-  Applet$AccessibleApplet(::java::applet::Applet *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 8127374778187708896LL;
-public: // actually package-private
-  ::java::applet::Applet * __attribute__((aligned(__alignof__( ::java::awt::Panel$AccessibleAWTPanel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_applet_Applet$AccessibleApplet__
diff --git a/libjava/java/applet/Applet$URLAudioClip.h b/libjava/java/applet/Applet$URLAudioClip.h
deleted file mode 100644
index 67449e40a62..00000000000
--- a/libjava/java/applet/Applet$URLAudioClip.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_applet_Applet$URLAudioClip__
-#define __java_applet_Applet$URLAudioClip__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet$URLAudioClip;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Clip;
-      }
-    }
-  }
-}
-
-class java::applet::Applet$URLAudioClip : public ::java::lang::Object
-{
-
-public:
-  Applet$URLAudioClip(::java::net::URL *);
-private:
-  ::javax::sound::sampled::Clip * getClip();
-public:
-  virtual void loop();
-  virtual void play();
-  virtual void stop();
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) url;
-  ::javax::sound::sampled::Clip * clip;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_applet_Applet$URLAudioClip__
diff --git a/libjava/java/applet/Applet.h b/libjava/java/applet/Applet.h
deleted file mode 100644
index 8d841737461..00000000000
--- a/libjava/java/applet/Applet.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_applet_Applet__
-#define __java_applet_Applet__
-
-#pragma interface
-
-#include <java/awt/Panel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet;
-        class AppletContext;
-        class AppletStub;
-        class AudioClip;
-    }
-    namespace awt
-    {
-        class Dimension;
-        class Image;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::applet::Applet : public ::java::awt::Panel
-{
-
-public:
-  Applet();
-  virtual void setStub(::java::applet::AppletStub *);
-  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 resize(jint, jint);
-  virtual void resize(::java::awt::Dimension *);
-  virtual void showStatus(::java::lang::String *);
-  virtual ::java::awt::Image * getImage(::java::net::URL *);
-  virtual ::java::awt::Image * getImage(::java::net::URL *, ::java::lang::String *);
-  static ::java::applet::AudioClip * newAudioClip(::java::net::URL *);
-  virtual ::java::applet::AudioClip * getAudioClip(::java::net::URL *);
-  virtual ::java::applet::AudioClip * getAudioClip(::java::net::URL *, ::java::lang::String *);
-  virtual ::java::lang::String * getAppletInfo();
-  virtual ::java::util::Locale * getLocale();
-  virtual JArray< JArray< ::java::lang::String * > * > * getParameterInfo();
-  virtual void play(::java::net::URL *);
-  virtual void play(::java::net::URL *, ::java::lang::String *);
-  virtual void init();
-  virtual void start();
-  virtual void stop();
-  virtual void destroy();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -5836846270535785031LL;
-  ::java::applet::AppletStub * __attribute__((aligned(__alignof__( ::java::awt::Panel)))) stub;
-  jint width;
-  jint height;
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_applet_Applet__
diff --git a/libjava/java/applet/AppletContext.h b/libjava/java/applet/AppletContext.h
deleted file mode 100644
index a69369fe713..00000000000
--- a/libjava/java/applet/AppletContext.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_applet_AppletContext__
-#define __java_applet_AppletContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet;
-        class AppletContext;
-        class AudioClip;
-    }
-    namespace awt
-    {
-        class Image;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class java::applet::AppletContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::applet::AudioClip * getAudioClip(::java::net::URL *) = 0;
-  virtual ::java::awt::Image * getImage(::java::net::URL *) = 0;
-  virtual ::java::applet::Applet * getApplet(::java::lang::String *) = 0;
-  virtual ::java::util::Enumeration * getApplets() = 0;
-  virtual void showDocument(::java::net::URL *) = 0;
-  virtual void showDocument(::java::net::URL *, ::java::lang::String *) = 0;
-  virtual void showStatus(::java::lang::String *) = 0;
-  virtual void setStream(::java::lang::String *, ::java::io::InputStream *) = 0;
-  virtual ::java::io::InputStream * getStream(::java::lang::String *) = 0;
-  virtual ::java::util::Iterator * getStreamKeys() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_applet_AppletContext__
diff --git a/libjava/java/applet/AppletStub.h b/libjava/java/applet/AppletStub.h
deleted file mode 100644
index 085746547f1..00000000000
--- a/libjava/java/applet/AppletStub.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_applet_AppletStub__
-#define __java_applet_AppletStub__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace applet
-    {
-        class AppletContext;
-        class AppletStub;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class java::applet::AppletStub : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isActive() = 0;
-  virtual ::java::net::URL * getDocumentBase() = 0;
-  virtual ::java::net::URL * getCodeBase() = 0;
-  virtual ::java::lang::String * getParameter(::java::lang::String *) = 0;
-  virtual ::java::applet::AppletContext * getAppletContext() = 0;
-  virtual void appletResize(jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_applet_AppletStub__
diff --git a/libjava/java/applet/AudioClip.h b/libjava/java/applet/AudioClip.h
deleted file mode 100644
index 2ee517d4d13..00000000000
--- a/libjava/java/applet/AudioClip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_applet_AudioClip__
-#define __java_applet_AudioClip__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace applet
-    {
-        class AudioClip;
-    }
-  }
-}
-
-class java::applet::AudioClip : public ::java::lang::Object
-{
-
-public:
-  virtual void play() = 0;
-  virtual void stop() = 0;
-  virtual void loop() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_applet_AudioClip__
diff --git a/libjava/java/awt/AWTError.h b/libjava/java/awt/AWTError.h
deleted file mode 100644
index bcfbd634ccb..00000000000
--- a/libjava/java/awt/AWTError.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTError__
-#define __java_awt_AWTError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTError;
-    }
-  }
-}
-
-class java::awt::AWTError : public ::java::lang::Error
-{
-
-public:
-  AWTError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1819846354050686206LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTError__
diff --git a/libjava/java/awt/AWTEvent.h b/libjava/java/awt/AWTEvent.h
deleted file mode 100644
index 94d090a9ff5..00000000000
--- a/libjava/java/awt/AWTEvent.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTEvent__
-#define __java_awt_AWTEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Event;
-    }
-  }
-}
-
-class java::awt::AWTEvent : public ::java::util::EventObject
-{
-
-public:
-  AWTEvent(::java::awt::Event *);
-  AWTEvent(::java::lang::Object *, jint);
-  virtual void setSource(::java::lang::Object *);
-  virtual jint getID();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * paramString();
-public: // actually protected
-  virtual void consume();
-  virtual jboolean isConsumed();
-public: // actually package-private
-  static jlong eventIdToMask(jint);
-private:
-  static const jlong serialVersionUID = -1825314779160409405LL;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) id;
-  jboolean consumed;
-public: // actually package-private
-  ::java::awt::AWTEvent * queueNext;
-  JArray< jbyte > * bdata;
-  jboolean isFocusManagerEvent;
-public:
-  static const jlong COMPONENT_EVENT_MASK = 1LL;
-  static const jlong CONTAINER_EVENT_MASK = 2LL;
-  static const jlong FOCUS_EVENT_MASK = 4LL;
-  static const jlong KEY_EVENT_MASK = 8LL;
-  static const jlong MOUSE_EVENT_MASK = 16LL;
-  static const jlong MOUSE_MOTION_EVENT_MASK = 32LL;
-  static const jlong WINDOW_EVENT_MASK = 64LL;
-  static const jlong ACTION_EVENT_MASK = 128LL;
-  static const jlong ADJUSTMENT_EVENT_MASK = 256LL;
-  static const jlong ITEM_EVENT_MASK = 512LL;
-  static const jlong TEXT_EVENT_MASK = 1024LL;
-  static const jlong INPUT_METHOD_EVENT_MASK = 2048LL;
-public: // actually package-private
-  static const jlong INPUT_ENABLED_EVENT_MASK = 4096LL;
-public:
-  static const jlong PAINT_EVENT_MASK = 8192LL;
-  static const jlong INVOCATION_EVENT_MASK = 16384LL;
-  static const jlong HIERARCHY_EVENT_MASK = 32768LL;
-  static const jlong HIERARCHY_BOUNDS_EVENT_MASK = 65536LL;
-  static const jlong MOUSE_WHEEL_EVENT_MASK = 131072LL;
-  static const jlong WINDOW_STATE_EVENT_MASK = 262144LL;
-  static const jlong WINDOW_FOCUS_EVENT_MASK = 524288LL;
-  static const jint RESERVED_ID_MAX = 1999;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTEvent__
diff --git a/libjava/java/awt/AWTEventMulticaster.h b/libjava/java/awt/AWTEventMulticaster.h
deleted file mode 100644
index cb5d0243ac3..00000000000
--- a/libjava/java/awt/AWTEventMulticaster.h
+++ /dev/null
@@ -1,151 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTEventMulticaster__
-#define __java_awt_AWTEventMulticaster__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEventMulticaster;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-          class AdjustmentEvent;
-          class AdjustmentListener;
-          class ComponentEvent;
-          class ComponentListener;
-          class ContainerEvent;
-          class ContainerListener;
-          class FocusEvent;
-          class FocusListener;
-          class HierarchyBoundsListener;
-          class HierarchyEvent;
-          class HierarchyListener;
-          class InputMethodEvent;
-          class InputMethodListener;
-          class ItemEvent;
-          class ItemListener;
-          class KeyEvent;
-          class KeyListener;
-          class MouseEvent;
-          class MouseListener;
-          class MouseMotionListener;
-          class MouseWheelEvent;
-          class MouseWheelListener;
-          class TextEvent;
-          class TextListener;
-          class WindowEvent;
-          class WindowFocusListener;
-          class WindowListener;
-          class WindowStateListener;
-      }
-    }
-  }
-}
-
-class java::awt::AWTEventMulticaster : public ::java::lang::Object
-{
-
-public: // actually protected
-  AWTEventMulticaster(::java::util::EventListener *, ::java::util::EventListener *);
-  virtual ::java::util::EventListener * remove(::java::util::EventListener *);
-public:
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-  virtual void componentShown(::java::awt::event::ComponentEvent *);
-  virtual void componentHidden(::java::awt::event::ComponentEvent *);
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-  virtual void keyTyped(::java::awt::event::KeyEvent *);
-  virtual void keyPressed(::java::awt::event::KeyEvent *);
-  virtual void keyReleased(::java::awt::event::KeyEvent *);
-  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 *);
-  virtual void windowOpened(::java::awt::event::WindowEvent *);
-  virtual void windowClosing(::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 *);
-  virtual void windowStateChanged(::java::awt::event::WindowEvent *);
-  virtual void windowGainedFocus(::java::awt::event::WindowEvent *);
-  virtual void windowLostFocus(::java::awt::event::WindowEvent *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-  virtual void adjustmentValueChanged(::java::awt::event::AdjustmentEvent *);
-  virtual void textValueChanged(::java::awt::event::TextEvent *);
-  virtual void inputMethodTextChanged(::java::awt::event::InputMethodEvent *);
-  virtual void caretPositionChanged(::java::awt::event::InputMethodEvent *);
-  virtual void hierarchyChanged(::java::awt::event::HierarchyEvent *);
-  virtual void ancestorMoved(::java::awt::event::HierarchyEvent *);
-  virtual void ancestorResized(::java::awt::event::HierarchyEvent *);
-  virtual void mouseWheelMoved(::java::awt::event::MouseWheelEvent *);
-  static ::java::awt::event::ComponentListener * add(::java::awt::event::ComponentListener *, ::java::awt::event::ComponentListener *);
-  static ::java::awt::event::ContainerListener * add(::java::awt::event::ContainerListener *, ::java::awt::event::ContainerListener *);
-  static ::java::awt::event::FocusListener * add(::java::awt::event::FocusListener *, ::java::awt::event::FocusListener *);
-  static ::java::awt::event::KeyListener * add(::java::awt::event::KeyListener *, ::java::awt::event::KeyListener *);
-  static ::java::awt::event::MouseListener * add(::java::awt::event::MouseListener *, ::java::awt::event::MouseListener *);
-  static ::java::awt::event::MouseMotionListener * add(::java::awt::event::MouseMotionListener *, ::java::awt::event::MouseMotionListener *);
-  static ::java::awt::event::WindowListener * add(::java::awt::event::WindowListener *, ::java::awt::event::WindowListener *);
-  static ::java::awt::event::WindowStateListener * add(::java::awt::event::WindowStateListener *, ::java::awt::event::WindowStateListener *);
-  static ::java::awt::event::WindowFocusListener * add(::java::awt::event::WindowFocusListener *, ::java::awt::event::WindowFocusListener *);
-  static ::java::awt::event::ActionListener * add(::java::awt::event::ActionListener *, ::java::awt::event::ActionListener *);
-  static ::java::awt::event::ItemListener * add(::java::awt::event::ItemListener *, ::java::awt::event::ItemListener *);
-  static ::java::awt::event::AdjustmentListener * add(::java::awt::event::AdjustmentListener *, ::java::awt::event::AdjustmentListener *);
-  static ::java::awt::event::TextListener * add(::java::awt::event::TextListener *, ::java::awt::event::TextListener *);
-  static ::java::awt::event::InputMethodListener * add(::java::awt::event::InputMethodListener *, ::java::awt::event::InputMethodListener *);
-  static ::java::awt::event::HierarchyListener * add(::java::awt::event::HierarchyListener *, ::java::awt::event::HierarchyListener *);
-  static ::java::awt::event::HierarchyBoundsListener * add(::java::awt::event::HierarchyBoundsListener *, ::java::awt::event::HierarchyBoundsListener *);
-  static ::java::awt::event::MouseWheelListener * add(::java::awt::event::MouseWheelListener *, ::java::awt::event::MouseWheelListener *);
-  static ::java::awt::event::ComponentListener * remove(::java::awt::event::ComponentListener *, ::java::awt::event::ComponentListener *);
-  static ::java::awt::event::ContainerListener * remove(::java::awt::event::ContainerListener *, ::java::awt::event::ContainerListener *);
-  static ::java::awt::event::FocusListener * remove(::java::awt::event::FocusListener *, ::java::awt::event::FocusListener *);
-  static ::java::awt::event::KeyListener * remove(::java::awt::event::KeyListener *, ::java::awt::event::KeyListener *);
-  static ::java::awt::event::MouseListener * remove(::java::awt::event::MouseListener *, ::java::awt::event::MouseListener *);
-  static ::java::awt::event::MouseMotionListener * remove(::java::awt::event::MouseMotionListener *, ::java::awt::event::MouseMotionListener *);
-  static ::java::awt::event::WindowListener * remove(::java::awt::event::WindowListener *, ::java::awt::event::WindowListener *);
-  static ::java::awt::event::WindowStateListener * remove(::java::awt::event::WindowStateListener *, ::java::awt::event::WindowStateListener *);
-  static ::java::awt::event::WindowFocusListener * remove(::java::awt::event::WindowFocusListener *, ::java::awt::event::WindowFocusListener *);
-  static ::java::awt::event::ActionListener * remove(::java::awt::event::ActionListener *, ::java::awt::event::ActionListener *);
-  static ::java::awt::event::ItemListener * remove(::java::awt::event::ItemListener *, ::java::awt::event::ItemListener *);
-  static ::java::awt::event::AdjustmentListener * remove(::java::awt::event::AdjustmentListener *, ::java::awt::event::AdjustmentListener *);
-  static ::java::awt::event::TextListener * remove(::java::awt::event::TextListener *, ::java::awt::event::TextListener *);
-  static ::java::awt::event::InputMethodListener * remove(::java::awt::event::InputMethodListener *, ::java::awt::event::InputMethodListener *);
-  static ::java::awt::event::HierarchyListener * remove(::java::awt::event::HierarchyListener *, ::java::awt::event::HierarchyListener *);
-  static ::java::awt::event::HierarchyBoundsListener * remove(::java::awt::event::HierarchyBoundsListener *, ::java::awt::event::HierarchyBoundsListener *);
-  static ::java::awt::event::MouseWheelListener * remove(::java::awt::event::MouseWheelListener *, ::java::awt::event::MouseWheelListener *);
-public: // actually protected
-  static ::java::util::EventListener * addInternal(::java::util::EventListener *, ::java::util::EventListener *);
-  static ::java::util::EventListener * removeInternal(::java::util::EventListener *, ::java::util::EventListener *);
-  virtual void saveInternal(::java::io::ObjectOutputStream *, ::java::lang::String *);
-  static void save(::java::io::ObjectOutputStream *, ::java::lang::String *, ::java::util::EventListener *);
-public:
-  static JArray< ::java::util::EventListener * > * getListeners(::java::util::EventListener *, ::java::lang::Class *);
-private:
-  void getListeners(::java::util::ArrayList *, ::java::lang::Class *);
-public: // actually protected
-  ::java::util::EventListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) a;
-  ::java::util::EventListener * b;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTEventMulticaster__
diff --git a/libjava/java/awt/AWTException.h b/libjava/java/awt/AWTException.h
deleted file mode 100644
index fdda1bde25b..00000000000
--- a/libjava/java/awt/AWTException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTException__
-#define __java_awt_AWTException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTException;
-    }
-  }
-}
-
-class java::awt::AWTException : public ::java::lang::Exception
-{
-
-public:
-  AWTException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1900414231151323879LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTException__
diff --git a/libjava/java/awt/AWTKeyStroke$1.h b/libjava/java/awt/AWTKeyStroke$1.h
deleted file mode 100644
index cb6e72fed7d..00000000000
--- a/libjava/java/awt/AWTKeyStroke$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTKeyStroke$1__
-#define __java_awt_AWTKeyStroke$1__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTKeyStroke$1;
-    }
-  }
-}
-
-class java::awt::AWTKeyStroke$1 : public ::java::util::LinkedHashMap
-{
-
-public: // actually package-private
-  AWTKeyStroke$1(jint, jfloat, jboolean);
-public: // actually protected
-  jboolean removeEldestEntry(::java::util::Map$Entry *);
-private:
-  static const jint MAX_CACHE_SIZE = 2048;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTKeyStroke$1__
diff --git a/libjava/java/awt/AWTKeyStroke$2.h b/libjava/java/awt/AWTKeyStroke$2.h
deleted file mode 100644
index d3d838053c8..00000000000
--- a/libjava/java/awt/AWTKeyStroke$2.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTKeyStroke$2__
-#define __java_awt_AWTKeyStroke$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTKeyStroke$2;
-    }
-  }
-}
-
-class java::awt::AWTKeyStroke$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AWTKeyStroke$2();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTKeyStroke$2__
diff --git a/libjava/java/awt/AWTKeyStroke$3.h b/libjava/java/awt/AWTKeyStroke$3.h
deleted file mode 100644
index f08335e03b6..00000000000
--- a/libjava/java/awt/AWTKeyStroke$3.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTKeyStroke$3__
-#define __java_awt_AWTKeyStroke$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTKeyStroke$3;
-    }
-  }
-}
-
-class java::awt::AWTKeyStroke$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AWTKeyStroke$3(::java::lang::Class *);
-public:
-  ::java::lang::Object * run();
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$subclass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTKeyStroke$3__
diff --git a/libjava/java/awt/AWTKeyStroke.h b/libjava/java/awt/AWTKeyStroke.h
deleted file mode 100644
index 0b0032dd8b0..00000000000
--- a/libjava/java/awt/AWTKeyStroke.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTKeyStroke__
-#define __java_awt_AWTKeyStroke__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTKeyStroke;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::AWTKeyStroke : public ::java::lang::Object
-{
-
-public: // actually protected
-  AWTKeyStroke();
-  AWTKeyStroke(jchar, jint, jint, jboolean);
-  static void registerSubclass(::java::lang::Class *);
-public:
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(jchar);
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(::java::lang::Character *, jint);
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(jint, jint, jboolean);
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(jint, jint);
-  static ::java::awt::AWTKeyStroke * getAWTKeyStrokeForEvent(::java::awt::event::KeyEvent *);
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(::java::lang::String *);
-  virtual jchar getKeyChar();
-  virtual jint getKeyCode();
-  virtual jint getModifiers();
-  virtual jboolean isOnKeyRelease();
-  virtual jint getKeyEventType();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual ::java::lang::Object * readResolve();
-private:
-  static ::java::awt::AWTKeyStroke * getAWTKeyStroke(jchar, jint, jint, jboolean);
-  static jint extend(jint);
-  static const jlong serialVersionUID = -6430539691155161871LL;
-  static const jint MODIFIERS_MASK = 16367;
-  static ::java::util::LinkedHashMap * cache;
-  static ::java::awt::AWTKeyStroke * recent;
-  static ::java::lang::reflect::Constructor * ctor;
-public: // actually package-private
-  static ::java::util::HashMap * vktable;
-private:
-  jchar __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyChar;
-public: // actually package-private
-  jint keyCode;
-private:
-  jint modifiers;
-  jboolean onKeyRelease;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTKeyStroke__
diff --git a/libjava/java/awt/AWTPermission.h b/libjava/java/awt/AWTPermission.h
deleted file mode 100644
index 4936c3dad27..00000000000
--- a/libjava/java/awt/AWTPermission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AWTPermission__
-#define __java_awt_AWTPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTPermission;
-    }
-  }
-}
-
-class java::awt::AWTPermission : public ::java::security::BasicPermission
-{
-
-public:
-  AWTPermission(::java::lang::String *);
-  AWTPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8890392402588814465LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AWTPermission__
diff --git a/libjava/java/awt/ActiveEvent.h b/libjava/java/awt/ActiveEvent.h
deleted file mode 100644
index a2183cfe1a9..00000000000
--- a/libjava/java/awt/ActiveEvent.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ActiveEvent__
-#define __java_awt_ActiveEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ActiveEvent;
-    }
-  }
-}
-
-class java::awt::ActiveEvent : public ::java::lang::Object
-{
-
-public:
-  virtual void dispatch() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_ActiveEvent__
diff --git a/libjava/java/awt/Adjustable.h b/libjava/java/awt/Adjustable.h
deleted file mode 100644
index 9460f529a85..00000000000
--- a/libjava/java/awt/Adjustable.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Adjustable__
-#define __java_awt_Adjustable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Adjustable;
-      namespace event
-      {
-          class AdjustmentListener;
-      }
-    }
-  }
-}
-
-class java::awt::Adjustable : public ::java::lang::Object
-{
-
-public:
-  virtual jint getOrientation() = 0;
-  virtual void setMinimum(jint) = 0;
-  virtual jint getMinimum() = 0;
-  virtual void setMaximum(jint) = 0;
-  virtual jint getMaximum() = 0;
-  virtual void setUnitIncrement(jint) = 0;
-  virtual jint getUnitIncrement() = 0;
-  virtual void setBlockIncrement(jint) = 0;
-  virtual jint getBlockIncrement() = 0;
-  virtual void setVisibleAmount(jint) = 0;
-  virtual jint getVisibleAmount() = 0;
-  virtual void setValue(jint) = 0;
-  virtual jint getValue() = 0;
-  virtual void addAdjustmentListener(::java::awt::event::AdjustmentListener *) = 0;
-  virtual void removeAdjustmentListener(::java::awt::event::AdjustmentListener *) = 0;
-  static const jint HORIZONTAL = 0;
-  static const jint VERTICAL = 1;
-  static const jint NO_ORIENTATION = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Adjustable__
diff --git a/libjava/java/awt/AlphaComposite$1.h b/libjava/java/awt/AlphaComposite$1.h
deleted file mode 100644
index 1203cc00dad..00000000000
--- a/libjava/java/awt/AlphaComposite$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AlphaComposite$1__
-#define __java_awt_AlphaComposite$1__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AlphaComposite$1;
-    }
-  }
-}
-
-class java::awt::AlphaComposite$1 : public ::java::util::LinkedHashMap
-{
-
-public: // actually package-private
-  AlphaComposite$1(jint, jfloat, jboolean);
-public: // actually protected
-  jboolean removeEldestEntry(::java::util::Map$Entry *);
-private:
-  static const jint MAX_CACHE_SIZE = 2048;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AlphaComposite$1__
diff --git a/libjava/java/awt/AlphaComposite.h b/libjava/java/awt/AlphaComposite.h
deleted file mode 100644
index a18ebbd6fde..00000000000
--- a/libjava/java/awt/AlphaComposite.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AlphaComposite__
-#define __java_awt_AlphaComposite__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AlphaComposite;
-        class CompositeContext;
-        class RenderingHints;
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::AlphaComposite : public ::java::lang::Object
-{
-
-  AlphaComposite(jint, jfloat);
-public:
-  static ::java::awt::AlphaComposite * getInstance(jint);
-  static ::java::awt::AlphaComposite * getInstance(jint, jfloat);
-  ::java::awt::CompositeContext * createContext(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::RenderingHints *);
-  jfloat getAlpha();
-  jint getRule();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-private:
-  static ::java::util::LinkedHashMap * cache;
-public:
-  static const jint CLEAR = 1;
-  static const jint SRC = 2;
-  static const jint DST = 9;
-  static const jint SRC_OVER = 3;
-  static const jint DST_OVER = 4;
-  static const jint SRC_IN = 5;
-  static const jint DST_IN = 6;
-  static const jint SRC_OUT = 7;
-  static const jint DST_OUT = 8;
-  static const jint SRC_ATOP = 10;
-  static const jint DST_ATOP = 11;
-  static const jint XOR = 12;
-  static ::java::awt::AlphaComposite * Clear;
-  static ::java::awt::AlphaComposite * Src;
-  static ::java::awt::AlphaComposite * Dst;
-  static ::java::awt::AlphaComposite * SrcOver;
-  static ::java::awt::AlphaComposite * DstOver;
-  static ::java::awt::AlphaComposite * SrcIn;
-  static ::java::awt::AlphaComposite * DstIn;
-  static ::java::awt::AlphaComposite * SrcOut;
-  static ::java::awt::AlphaComposite * DstOut;
-  static ::java::awt::AlphaComposite * SrcAtop;
-  static ::java::awt::AlphaComposite * DstAtop;
-  static ::java::awt::AlphaComposite * Xor;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) rule;
-  jfloat alpha;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AlphaComposite__
diff --git a/libjava/java/awt/AttributeValue.h b/libjava/java/awt/AttributeValue.h
deleted file mode 100644
index 36294940b7e..00000000000
--- a/libjava/java/awt/AttributeValue.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_AttributeValue__
-#define __java_awt_AttributeValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AttributeValue;
-    }
-  }
-}
-
-class java::awt::AttributeValue : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AttributeValue(jint, JArray< ::java::lang::String * > *);
-public:
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  JArray< ::java::lang::String * > * names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_AttributeValue__
diff --git a/libjava/java/awt/BasicStroke.h b/libjava/java/awt/BasicStroke.h
deleted file mode 100644
index c3a92343504..00000000000
--- a/libjava/java/awt/BasicStroke.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_BasicStroke__
-#define __java_awt_BasicStroke__
-
-#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
-    {
-        class BasicStroke;
-        class Shape;
-      namespace geom
-      {
-          class GeneralPath;
-          class PathIterator;
-          class Point2D;
-      }
-    }
-  }
-}
-
-class java::awt::BasicStroke : public ::java::lang::Object
-{
-
-public:
-  BasicStroke(jfloat, jint, jint, jfloat, JArray< jfloat > *, jfloat);
-  BasicStroke(jfloat, jint, jint, jfloat);
-  BasicStroke(jfloat, jint, jint);
-  BasicStroke(jfloat);
-  BasicStroke();
-  virtual ::java::awt::Shape * createStrokedShape(::java::awt::Shape *);
-  virtual jfloat getLineWidth();
-  virtual jint getEndCap();
-  virtual jint getLineJoin();
-  virtual jfloat getMiterLimit();
-  virtual JArray< jfloat > * getDashArray();
-  virtual jfloat getDashPhase();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  ::java::awt::Shape * solidStroke(::java::awt::geom::PathIterator *);
-  ::java::awt::Shape * dashedStroke(::java::awt::geom::PathIterator *);
-  void capEnds();
-  void convertPath(::java::awt::geom::GeneralPath *, ::gnu::java::awt::java2d::Segment *);
-  void addSegments(JArray< ::gnu::java::awt::java2d::Segment * > *);
-  void joinSegments(JArray< ::gnu::java::awt::java2d::Segment * > *);
-  void capEnd(::gnu::java::awt::java2d::Segment *, ::gnu::java::awt::java2d::Segment *);
-  ::java::awt::geom::Point2D * lineIntersection(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jboolean);
-  void joinOuterSegments(::gnu::java::awt::java2d::Segment *, ::gnu::java::awt::java2d::Segment *, ::java::awt::geom::Point2D *);
-  void joinInnerSegments(::gnu::java::awt::java2d::Segment *, ::gnu::java::awt::java2d::Segment *, ::java::awt::geom::Point2D *);
-public:
-  static const jint JOIN_MITER = 0;
-  static const jint JOIN_ROUND = 1;
-  static const jint JOIN_BEVEL = 2;
-  static const jint CAP_BUTT = 0;
-  static const jint CAP_ROUND = 1;
-  static const jint CAP_SQUARE = 2;
-private:
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) width;
-  jint cap;
-  jint join;
-  jfloat limit;
-  JArray< jfloat > * dash;
-  jfloat phase;
-  ::gnu::java::awt::java2d::Segment * start;
-  ::gnu::java::awt::java2d::Segment * end;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_BasicStroke__
diff --git a/libjava/java/awt/BorderLayout.h b/libjava/java/awt/BorderLayout.h
deleted file mode 100644
index f78e9716441..00000000000
--- a/libjava/java/awt/BorderLayout.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_BorderLayout__
-#define __java_awt_BorderLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BorderLayout;
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-}
-
-class java::awt::BorderLayout : public ::java::lang::Object
-{
-
-public:
-  BorderLayout();
-  BorderLayout(jint, jint);
-  virtual jint getHgap();
-  virtual void setHgap(jint);
-  virtual jint getVgap();
-  virtual void setVgap(jint);
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::awt::Dimension * calcCompSize(::java::awt::Component *, jint);
-  ::java::awt::Dimension * calcSize(::java::awt::Container *, jint);
-public:
-  virtual ::java::awt::Component * getLayoutComponent(::java::lang::Object *);
-  virtual ::java::awt::Component * getLayoutComponent(::java::awt::Container *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getConstraints(::java::awt::Component *);
-  static ::java::lang::String * NORTH;
-  static ::java::lang::String * SOUTH;
-  static ::java::lang::String * EAST;
-  static ::java::lang::String * WEST;
-  static ::java::lang::String * CENTER;
-  static ::java::lang::String * BEFORE_FIRST_LINE;
-  static ::java::lang::String * AFTER_LAST_LINE;
-  static ::java::lang::String * BEFORE_LINE_BEGINS;
-  static ::java::lang::String * AFTER_LINE_ENDS;
-  static ::java::lang::String * PAGE_START;
-  static ::java::lang::String * PAGE_END;
-  static ::java::lang::String * LINE_START;
-  static ::java::lang::String * LINE_END;
-private:
-  static const jlong serialVersionUID = -8658291919501921765LL;
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) north;
-  ::java::awt::Component * south;
-  ::java::awt::Component * east;
-  ::java::awt::Component * west;
-  ::java::awt::Component * center;
-  ::java::awt::Component * firstLine;
-  ::java::awt::Component * lastLine;
-  ::java::awt::Component * firstItem;
-  ::java::awt::Component * lastItem;
-  jint hgap;
-  jint vgap;
-  static const jint MIN = 0;
-  static const jint MAX = 1;
-  static const jint PREF = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_BorderLayout__
diff --git a/libjava/java/awt/BufferCapabilities$FlipContents.h b/libjava/java/awt/BufferCapabilities$FlipContents.h
deleted file mode 100644
index b5f45e4d020..00000000000
--- a/libjava/java/awt/BufferCapabilities$FlipContents.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_BufferCapabilities$FlipContents__
-#define __java_awt_BufferCapabilities$FlipContents__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities$FlipContents;
-    }
-  }
-}
-
-class java::awt::BufferCapabilities$FlipContents : public ::java::awt::AttributeValue
-{
-
-  BufferCapabilities$FlipContents(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::BufferCapabilities$FlipContents * UNDEFINED;
-  static ::java::awt::BufferCapabilities$FlipContents * BACKGROUND;
-  static ::java::awt::BufferCapabilities$FlipContents * PRIOR;
-  static ::java::awt::BufferCapabilities$FlipContents * COPIED;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_BufferCapabilities$FlipContents__
diff --git a/libjava/java/awt/BufferCapabilities.h b/libjava/java/awt/BufferCapabilities.h
deleted file mode 100644
index bda4b752c50..00000000000
--- a/libjava/java/awt/BufferCapabilities.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_BufferCapabilities__
-#define __java_awt_BufferCapabilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class ImageCapabilities;
-    }
-  }
-}
-
-class java::awt::BufferCapabilities : public ::java::lang::Object
-{
-
-public:
-  BufferCapabilities(::java::awt::ImageCapabilities *, ::java::awt::ImageCapabilities *, ::java::awt::BufferCapabilities$FlipContents *);
-  virtual ::java::awt::ImageCapabilities * getFrontBufferCapabilities();
-  virtual ::java::awt::ImageCapabilities * getBackBufferCapabilities();
-  virtual jboolean isPageFlipping();
-  virtual ::java::awt::BufferCapabilities$FlipContents * getFlipContents();
-  virtual jboolean isFullScreenRequired();
-  virtual jboolean isMultiBufferAvailable();
-  virtual ::java::lang::Object * clone();
-private:
-  ::java::awt::ImageCapabilities * __attribute__((aligned(__alignof__( ::java::lang::Object)))) front;
-  ::java::awt::ImageCapabilities * back;
-  ::java::awt::BufferCapabilities$FlipContents * flip;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_BufferCapabilities__
diff --git a/libjava/java/awt/Button$AccessibleAWTButton.h b/libjava/java/awt/Button$AccessibleAWTButton.h
deleted file mode 100644
index be1dc9a11ac..00000000000
--- a/libjava/java/awt/Button$AccessibleAWTButton.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Button$AccessibleAWTButton__
-#define __java_awt_Button$AccessibleAWTButton__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Button;
-        class Button$AccessibleAWTButton;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-        class AccessibleRole;
-        class AccessibleValue;
-    }
-  }
-}
-
-class java::awt::Button$AccessibleAWTButton : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public: // actually protected
-  Button$AccessibleAWTButton(::java::awt::Button *);
-public:
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -5932203980244017102LL;
-public: // actually package-private
-  ::java::awt::Button * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Button$AccessibleAWTButton__
diff --git a/libjava/java/awt/Button.h b/libjava/java/awt/Button.h
deleted file mode 100644
index 19636de837a..00000000000
--- a/libjava/java/awt/Button.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Button__
-#define __java_awt_Button__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Button;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Button : public ::java::awt::Component
-{
-
-public:
-  Button();
-  Button(::java::lang::String *);
-  virtual ::java::lang::String * getLabel();
-  virtual void setLabel(::java::lang::String *);
-  virtual ::java::lang::String * getActionCommand();
-  virtual void setActionCommand(::java::lang::String *);
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual void addNotify();
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processActionEvent(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = -8774683716313001058LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::Component)))) actionCommand;
-  ::java::lang::String * label;
-private:
-  ::java::awt::event::ActionListener * action_listeners;
-  static jlong next_button_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Button__
diff --git a/libjava/java/awt/Canvas$AccessibleAWTCanvas.h b/libjava/java/awt/Canvas$AccessibleAWTCanvas.h
deleted file mode 100644
index f4f6a3e37c1..00000000000
--- a/libjava/java/awt/Canvas$AccessibleAWTCanvas.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Canvas$AccessibleAWTCanvas__
-#define __java_awt_Canvas$AccessibleAWTCanvas__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-        class Canvas$AccessibleAWTCanvas;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::Canvas$AccessibleAWTCanvas : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public: // actually protected
-  Canvas$AccessibleAWTCanvas(::java::awt::Canvas *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -6325592262103146699LL;
-public: // actually package-private
-  ::java::awt::Canvas * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Canvas$AccessibleAWTCanvas__
diff --git a/libjava/java/awt/Canvas$CanvasBltBufferStrategy.h b/libjava/java/awt/Canvas$CanvasBltBufferStrategy.h
deleted file mode 100644
index f47ae70680a..00000000000
--- a/libjava/java/awt/Canvas$CanvasBltBufferStrategy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Canvas$CanvasBltBufferStrategy__
-#define __java_awt_Canvas$CanvasBltBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/Component$BltBufferStrategy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-        class Canvas$CanvasBltBufferStrategy;
-    }
-  }
-}
-
-class java::awt::Canvas$CanvasBltBufferStrategy : public ::java::awt::Component$BltBufferStrategy
-{
-
-public: // actually package-private
-  Canvas$CanvasBltBufferStrategy(::java::awt::Canvas *, jint, jboolean);
-  ::java::awt::Canvas * __attribute__((aligned(__alignof__( ::java::awt::Component$BltBufferStrategy)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Canvas$CanvasBltBufferStrategy__
diff --git a/libjava/java/awt/Canvas$CanvasFlipBufferStrategy.h b/libjava/java/awt/Canvas$CanvasFlipBufferStrategy.h
deleted file mode 100644
index 0af653f2c6d..00000000000
--- a/libjava/java/awt/Canvas$CanvasFlipBufferStrategy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Canvas$CanvasFlipBufferStrategy__
-#define __java_awt_Canvas$CanvasFlipBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/Component$FlipBufferStrategy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Canvas;
-        class Canvas$CanvasFlipBufferStrategy;
-    }
-  }
-}
-
-class java::awt::Canvas$CanvasFlipBufferStrategy : public ::java::awt::Component$FlipBufferStrategy
-{
-
-public: // actually package-private
-  Canvas$CanvasFlipBufferStrategy(::java::awt::Canvas *, jint);
-  ::java::awt::Canvas * __attribute__((aligned(__alignof__( ::java::awt::Component$FlipBufferStrategy)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Canvas$CanvasFlipBufferStrategy__
diff --git a/libjava/java/awt/Canvas.h b/libjava/java/awt/Canvas.h
deleted file mode 100644
index 97726a2c02c..00000000000
--- a/libjava/java/awt/Canvas.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Canvas__
-#define __java_awt_Canvas__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class Canvas;
-        class Graphics;
-        class GraphicsConfiguration;
-      namespace image
-      {
-          class BufferStrategy;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Canvas : public ::java::awt::Component
-{
-
-public:
-  Canvas();
-  Canvas(::java::awt::GraphicsConfiguration *);
-public: // actually package-private
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfigurationImpl();
-public:
-  virtual void addNotify();
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual void createBufferStrategy(jint);
-  virtual void createBufferStrategy(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::image::BufferStrategy * getBufferStrategy();
-  virtual void update(::java::awt::Graphics *);
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = -2284879212465893870LL;
-  static jlong next_canvas_number;
-public: // actually package-private
-  ::java::awt::GraphicsConfiguration * __attribute__((aligned(__alignof__( ::java::awt::Component)))) graphicsConfiguration;
-  ::java::awt::image::BufferStrategy * bufferStrategy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Canvas__
diff --git a/libjava/java/awt/CardLayout.h b/libjava/java/awt/CardLayout.h
deleted file mode 100644
index 9affd84fbca..00000000000
--- a/libjava/java/awt/CardLayout.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_CardLayout__
-#define __java_awt_CardLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class CardLayout;
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-}
-
-class java::awt::CardLayout : public ::java::lang::Object
-{
-
-public:
-  CardLayout();
-  CardLayout(jint, jint);
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void first(::java::awt::Container *);
-  virtual jint getHgap();
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual jint getVgap();
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void last(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void next(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void previous(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void setHgap(jint);
-  virtual void setVgap(jint);
-  virtual void show(::java::awt::Container *, ::java::lang::String *);
-  virtual ::java::lang::String * toString();
-private:
-  void gotoComponent(::java::awt::Container *, jint);
-  ::java::awt::Dimension * getSize(::java::awt::Container *, jint);
-  static const jlong serialVersionUID = -4328196481005934313LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) hgap;
-  jint vgap;
-  ::java::util::Hashtable * tab;
-  static const jint FIRST = 0;
-  static const jint LAST = 1;
-  static const jint NEXT = 2;
-  static const jint PREV = 3;
-  static const jint MIN = 0;
-  static const jint MAX = 1;
-  static const jint PREF = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_CardLayout__
diff --git a/libjava/java/awt/Checkbox$AccessibleAWTCheckbox.h b/libjava/java/awt/Checkbox$AccessibleAWTCheckbox.h
deleted file mode 100644
index 025c42a37b6..00000000000
--- a/libjava/java/awt/Checkbox$AccessibleAWTCheckbox.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Checkbox$AccessibleAWTCheckbox__
-#define __java_awt_Checkbox$AccessibleAWTCheckbox__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class Checkbox$AccessibleAWTCheckbox;
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-  }
-}
-
-class java::awt::Checkbox$AccessibleAWTCheckbox : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  Checkbox$AccessibleAWTCheckbox(::java::awt::Checkbox *);
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 7881579233144754107LL;
-public: // actually package-private
-  ::java::awt::Checkbox * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Checkbox$AccessibleAWTCheckbox__
diff --git a/libjava/java/awt/Checkbox.h b/libjava/java/awt/Checkbox.h
deleted file mode 100644
index 614f599f624..00000000000
--- a/libjava/java/awt/Checkbox.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Checkbox__
-#define __java_awt_Checkbox__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Checkbox;
-        class CheckboxGroup;
-      namespace event
-      {
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Checkbox : public ::java::awt::Component
-{
-
-public:
-  Checkbox();
-  Checkbox(::java::lang::String *);
-  Checkbox(::java::lang::String *, jboolean);
-  Checkbox(::java::lang::String *, ::java::awt::CheckboxGroup *, jboolean);
-  Checkbox(::java::lang::String *, jboolean, ::java::awt::CheckboxGroup *);
-  virtual ::java::lang::String * getLabel();
-  virtual void setLabel(::java::lang::String *);
-  virtual jboolean getState();
-  virtual void setState(jboolean);
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual ::java::awt::CheckboxGroup * getCheckboxGroup();
-  virtual void setCheckboxGroup(::java::awt::CheckboxGroup *);
-  virtual void addNotify();
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processItemEvent(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = 7270714317450821763LL;
-  ::java::awt::CheckboxGroup * __attribute__((aligned(__alignof__( ::java::awt::Component)))) group;
-  ::java::lang::String * label;
-public: // actually package-private
-  jboolean state;
-private:
-  ::java::awt::event::ItemListener * item_listeners;
-  static jlong next_checkbox_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Checkbox__
diff --git a/libjava/java/awt/CheckboxGroup.h b/libjava/java/awt/CheckboxGroup.h
deleted file mode 100644
index 80a4557b3c4..00000000000
--- a/libjava/java/awt/CheckboxGroup.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_CheckboxGroup__
-#define __java_awt_CheckboxGroup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Checkbox;
-        class CheckboxGroup;
-    }
-  }
-}
-
-class java::awt::CheckboxGroup : public ::java::lang::Object
-{
-
-public:
-  CheckboxGroup();
-  virtual ::java::awt::Checkbox * getSelectedCheckbox();
-  virtual ::java::awt::Checkbox * getCurrent();
-  virtual void setSelectedCheckbox(::java::awt::Checkbox *);
-  virtual void setCurrent(::java::awt::Checkbox *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 3729780091441768983LL;
-  ::java::awt::Checkbox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) selectedCheckbox;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_CheckboxGroup__
diff --git a/libjava/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.h b/libjava/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.h
deleted file mode 100644
index c9111835f4b..00000000000
--- a/libjava/java/awt/CheckboxMenuItem$AccessibleAWTCheckboxMenuItem.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_CheckboxMenuItem$AccessibleAWTCheckboxMenuItem__
-#define __java_awt_CheckboxMenuItem$AccessibleAWTCheckboxMenuItem__
-
-#pragma interface
-
-#include <java/awt/MenuItem$AccessibleAWTMenuItem.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class CheckboxMenuItem;
-        class CheckboxMenuItem$AccessibleAWTCheckboxMenuItem;
-    }
-  }
-}
-
-class java::awt::CheckboxMenuItem$AccessibleAWTCheckboxMenuItem : public ::java::awt::MenuItem$AccessibleAWTMenuItem
-{
-
-public: // actually protected
-  CheckboxMenuItem$AccessibleAWTCheckboxMenuItem(::java::awt::CheckboxMenuItem *);
-private:
-  static const jlong serialVersionUID = -1122642964303476LL;
-public: // actually package-private
-  ::java::awt::CheckboxMenuItem * __attribute__((aligned(__alignof__( ::java::awt::MenuItem$AccessibleAWTMenuItem)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_CheckboxMenuItem$AccessibleAWTCheckboxMenuItem__
diff --git a/libjava/java/awt/CheckboxMenuItem.h b/libjava/java/awt/CheckboxMenuItem.h
deleted file mode 100644
index 52b7223cb28..00000000000
--- a/libjava/java/awt/CheckboxMenuItem.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_CheckboxMenuItem__
-#define __java_awt_CheckboxMenuItem__
-
-#pragma interface
-
-#include <java/awt/MenuItem.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class CheckboxMenuItem;
-      namespace event
-      {
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::CheckboxMenuItem : public ::java::awt::MenuItem
-{
-
-public:
-  CheckboxMenuItem();
-  CheckboxMenuItem(::java::lang::String *);
-  CheckboxMenuItem(::java::lang::String *, jboolean);
-  virtual jboolean getState();
-  virtual void setState(jboolean);
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual void addNotify();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processItemEvent(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public:
-  virtual ::java::lang::String * paramString();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_chkmenuitem_number;
-  static const jlong serialVersionUID = 6190621106981774043LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::MenuItem)))) state;
-  ::java::awt::event::ItemListener * item_listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_CheckboxMenuItem__
diff --git a/libjava/java/awt/Choice$AccessibleAWTChoice.h b/libjava/java/awt/Choice$AccessibleAWTChoice.h
deleted file mode 100644
index 61b2d237732..00000000000
--- a/libjava/java/awt/Choice$AccessibleAWTChoice.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Choice$AccessibleAWTChoice__
-#define __java_awt_Choice$AccessibleAWTChoice__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Choice;
-        class Choice$AccessibleAWTChoice;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::Choice$AccessibleAWTChoice : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  Choice$AccessibleAWTChoice(::java::awt::Choice *);
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-private:
-  static const jlong serialVersionUID = 7175603582428509322LL;
-public: // actually package-private
-  ::java::awt::Choice * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Choice$AccessibleAWTChoice__
diff --git a/libjava/java/awt/Choice.h b/libjava/java/awt/Choice.h
deleted file mode 100644
index fc0261391a1..00000000000
--- a/libjava/java/awt/Choice.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Choice__
-#define __java_awt_Choice__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Choice;
-      namespace event
-      {
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Choice : public ::java::awt::Component
-{
-
-public:
-  Choice();
-  virtual jint getItemCount();
-  virtual jint countItems();
-  virtual ::java::lang::String * getItem(jint);
-  virtual void add(::java::lang::String *);
-  virtual void addItem(::java::lang::String *);
-  virtual void insert(::java::lang::String *, jint);
-  virtual void remove(::java::lang::String *);
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual ::java::lang::String * getSelectedItem();
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual jint getSelectedIndex();
-  virtual void select(jint);
-  virtual void select(::java::lang::String *);
-  virtual void addNotify();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void processItemEvent(::java::awt::event::ItemEvent *);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_choice_number;
-  static const jlong serialVersionUID = -4075310674757313071LL;
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::awt::Component)))) pItems;
-private:
-  jint selectedIndex;
-  ::java::awt::event::ItemListener * item_listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Choice__
diff --git a/libjava/java/awt/Color.h b/libjava/java/awt/Color.h
deleted file mode 100644
index a1bbaff49be..00000000000
--- a/libjava/java/awt/Color.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Color__
-#define __java_awt_Color__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class ColorPaintContext;
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::Color : public ::java::lang::Object
-{
-
-public:
-  Color(jint, jint, jint);
-  Color(jint, jint, jint, jint);
-  Color(jint);
-  Color(jint, jboolean);
-  Color(jfloat, jfloat, jfloat);
-  Color(jfloat, jfloat, jfloat, jfloat);
-  Color(::java::awt::color::ColorSpace *, JArray< jfloat > *, jfloat);
-  virtual jint getRed();
-  virtual jint getGreen();
-  virtual jint getBlue();
-  virtual jint getAlpha();
-  virtual jint getRGB();
-  virtual ::java::awt::Color * brighter();
-  virtual ::java::awt::Color * darker();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  static ::java::awt::Color * decode(::java::lang::String *);
-  static ::java::awt::Color * getColor(::java::lang::String *);
-  static ::java::awt::Color * getColor(::java::lang::String *, ::java::awt::Color *);
-  static ::java::awt::Color * getColor(::java::lang::String *, jint);
-  static jint HSBtoRGB(jfloat, jfloat, jfloat);
-  static JArray< jfloat > * RGBtoHSB(jint, jint, jint, JArray< jfloat > *);
-  static ::java::awt::Color * getHSBColor(jfloat, jfloat, jfloat);
-  virtual JArray< jfloat > * getRGBComponents(JArray< jfloat > *);
-  virtual JArray< jfloat > * getRGBColorComponents(JArray< jfloat > *);
-  virtual JArray< jfloat > * getComponents(JArray< jfloat > *);
-  virtual JArray< jfloat > * getColorComponents(JArray< jfloat > *);
-  virtual JArray< jfloat > * getComponents(::java::awt::color::ColorSpace *, JArray< jfloat > *);
-  virtual JArray< jfloat > * getColorComponents(::java::awt::color::ColorSpace *, JArray< jfloat > *);
-  virtual ::java::awt::color::ColorSpace * getColorSpace();
-  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();
-private:
-  static jint convert(jfloat, jfloat, jfloat, jfloat);
-  static const jlong serialVersionUID = 118526816881161077LL;
-public:
-  static ::java::awt::Color * white;
-  static ::java::awt::Color * WHITE;
-  static ::java::awt::Color * lightGray;
-  static ::java::awt::Color * LIGHT_GRAY;
-  static ::java::awt::Color * gray;
-  static ::java::awt::Color * GRAY;
-  static ::java::awt::Color * darkGray;
-  static ::java::awt::Color * DARK_GRAY;
-  static ::java::awt::Color * black;
-  static ::java::awt::Color * BLACK;
-  static ::java::awt::Color * red;
-  static ::java::awt::Color * RED;
-  static ::java::awt::Color * pink;
-  static ::java::awt::Color * PINK;
-  static ::java::awt::Color * orange;
-  static ::java::awt::Color * ORANGE;
-  static ::java::awt::Color * yellow;
-  static ::java::awt::Color * YELLOW;
-  static ::java::awt::Color * green;
-  static ::java::awt::Color * GREEN;
-  static ::java::awt::Color * magenta;
-  static ::java::awt::Color * MAGENTA;
-  static ::java::awt::Color * cyan;
-  static ::java::awt::Color * CYAN;
-  static ::java::awt::Color * blue;
-  static ::java::awt::Color * BLUE;
-private:
-  static const jint RED_MASK = 16711680;
-  static const jint GREEN_MASK = 65280;
-  static const jint BLUE_MASK = 255;
-public: // actually package-private
-  static const jint ALPHA_MASK = -16777216;
-private:
-  static jfloat BRIGHT_SCALE;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  JArray< jfloat > * frgbvalue;
-  JArray< jfloat > * fvalue;
-  jfloat falpha;
-  ::java::awt::color::ColorSpace * cs;
-public: // actually package-private
-  ::java::awt::ColorPaintContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Color__
diff --git a/libjava/java/awt/ColorPaintContext$ColorRaster.h b/libjava/java/awt/ColorPaintContext$ColorRaster.h
deleted file mode 100644
index d116f81c907..00000000000
--- a/libjava/java/awt/ColorPaintContext$ColorRaster.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ColorPaintContext$ColorRaster__
-#define __java_awt_ColorPaintContext$ColorRaster__
-
-#pragma interface
-
-#include <java/awt/image/Raster.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ColorPaintContext;
-        class ColorPaintContext$ColorRaster;
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::ColorPaintContext$ColorRaster : public ::java::awt::image::Raster
-{
-
-public: // actually package-private
-  ColorPaintContext$ColorRaster(::java::awt::ColorPaintContext *, ::java::awt::image::ColorModel *, jint, jint, jint, jint, jint);
-private:
-  ::java::lang::Object * multiplyData(::java::lang::Object *, ::java::lang::Object *, jint);
-public: // actually package-private
-  ::java::awt::ColorPaintContext * __attribute__((aligned(__alignof__( ::java::awt::image::Raster)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ColorPaintContext$ColorRaster__
diff --git a/libjava/java/awt/ColorPaintContext.h b/libjava/java/awt/ColorPaintContext.h
deleted file mode 100644
index e96fc43ff80..00000000000
--- a/libjava/java/awt/ColorPaintContext.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ColorPaintContext__
-#define __java_awt_ColorPaintContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ColorPaintContext;
-        class ColorPaintContext$ColorRaster;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-      }
-    }
-  }
-}
-
-class java::awt::ColorPaintContext : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ColorPaintContext(jint);
-  ColorPaintContext(::java::awt::image::ColorModel *, jint);
-public:
-  virtual void dispose();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getRaster(jint, jint, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) color;
-  ::java::awt::image::ColorModel * colorModel;
-private:
-  ::java::awt::ColorPaintContext$ColorRaster * cachedRaster;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ColorPaintContext__
diff --git a/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.h b/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.h
deleted file mode 100644
index 4dda12238a4..00000000000
--- a/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$AccessibleAWTComponent$AccessibleAWTComponentHandler__
-#define __java_awt_Component$AccessibleAWTComponent$AccessibleAWTComponentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component$AccessibleAWTComponent;
-        class Component$AccessibleAWTComponent$AccessibleAWTComponentHandler;
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-}
-
-class java::awt::Component$AccessibleAWTComponent$AccessibleAWTComponentHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  Component$AccessibleAWTComponent$AccessibleAWTComponentHandler(::java::awt::Component$AccessibleAWTComponent *);
-public:
-  virtual void componentHidden(::java::awt::event::ComponentEvent *);
-  virtual void componentShown(::java::awt::event::ComponentEvent *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  ::java::awt::Component$AccessibleAWTComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$AccessibleAWTComponent$AccessibleAWTComponentHandler__
diff --git a/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.h b/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.h
deleted file mode 100644
index 429c49aa7eb..00000000000
--- a/libjava/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$AccessibleAWTComponent$AccessibleAWTFocusHandler__
-#define __java_awt_Component$AccessibleAWTComponent$AccessibleAWTFocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component$AccessibleAWTComponent;
-        class Component$AccessibleAWTComponent$AccessibleAWTFocusHandler;
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-}
-
-class java::awt::Component$AccessibleAWTComponent$AccessibleAWTFocusHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  Component$AccessibleAWTComponent$AccessibleAWTFocusHandler(::java::awt::Component$AccessibleAWTComponent *);
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::java::awt::Component$AccessibleAWTComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$AccessibleAWTComponent$AccessibleAWTFocusHandler__
diff --git a/libjava/java/awt/Component$AccessibleAWTComponent.h b/libjava/java/awt/Component$AccessibleAWTComponent.h
deleted file mode 100644
index c46ecf76c12..00000000000
--- a/libjava/java/awt/Component$AccessibleAWTComponent.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$AccessibleAWTComponent__
-#define __java_awt_Component$AccessibleAWTComponent__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Component$AccessibleAWTComponent;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class ComponentListener;
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleComponent;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::Component$AccessibleAWTComponent : public ::javax::accessibility::AccessibleContext
-{
-
-public: // actually protected
-  Component$AccessibleAWTComponent(::java::awt::Component *);
-public:
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::Accessible * getAccessibleParent();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-  virtual jboolean isShowing();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jboolean isFocusTraversable();
-  virtual void requestFocus();
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-private:
-  static const jlong serialVersionUID = 642321655757800191LL;
-public: // actually protected
-  ::java::awt::event::ComponentListener * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) accessibleAWTComponentHandler;
-  ::java::awt::event::FocusListener * accessibleAWTFocusHandler;
-public: // actually package-private
-  ::java::awt::Component * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$AccessibleAWTComponent__
diff --git a/libjava/java/awt/Component$BltBufferStrategy.h b/libjava/java/awt/Component$BltBufferStrategy.h
deleted file mode 100644
index ca93face167..00000000000
--- a/libjava/java/awt/Component$BltBufferStrategy.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$BltBufferStrategy__
-#define __java_awt_Component$BltBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/image/BufferStrategy.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class Component;
-        class Component$BltBufferStrategy;
-        class Graphics;
-      namespace image
-      {
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class java::awt::Component$BltBufferStrategy : public ::java::awt::image::BufferStrategy
-{
-
-public: // actually protected
-  Component$BltBufferStrategy(::java::awt::Component *, jint, ::java::awt::BufferCapabilities *);
-  virtual void createBackBuffers(jint);
-public:
-  virtual ::java::awt::BufferCapabilities * getCapabilities();
-  virtual ::java::awt::Graphics * getDrawGraphics();
-  virtual void show();
-public: // actually protected
-  virtual void revalidate();
-public:
-  virtual jboolean contentsLost();
-  virtual jboolean contentsRestored();
-public: // actually protected
-  ::java::awt::BufferCapabilities * __attribute__((aligned(__alignof__( ::java::awt::image::BufferStrategy)))) caps;
-  JArray< ::java::awt::image::VolatileImage * > * backBuffers;
-  jboolean validatedContents;
-  jint width;
-  jint height;
-private:
-  ::java::awt::image::VolatileImage * frontBuffer;
-public: // actually package-private
-  ::java::awt::Component * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$BltBufferStrategy__
diff --git a/libjava/java/awt/Component$FlipBufferStrategy.h b/libjava/java/awt/Component$FlipBufferStrategy.h
deleted file mode 100644
index 654cfd29a3a..00000000000
--- a/libjava/java/awt/Component$FlipBufferStrategy.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$FlipBufferStrategy__
-#define __java_awt_Component$FlipBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/image/BufferStrategy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class Component;
-        class Component$FlipBufferStrategy;
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class java::awt::Component$FlipBufferStrategy : public ::java::awt::image::BufferStrategy
-{
-
-public: // actually protected
-  Component$FlipBufferStrategy(::java::awt::Component *, jint, ::java::awt::BufferCapabilities *);
-  virtual void createBuffers(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::Image * getBackBuffer();
-  virtual void flip(::java::awt::BufferCapabilities$FlipContents *);
-  virtual void destroyBuffers();
-public:
-  virtual ::java::awt::BufferCapabilities * getCapabilities();
-  virtual ::java::awt::Graphics * getDrawGraphics();
-public: // actually protected
-  virtual void revalidate();
-public:
-  virtual jboolean contentsLost();
-  virtual jboolean contentsRestored();
-  virtual void show();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::BufferStrategy)))) numBuffers;
-  ::java::awt::BufferCapabilities * caps;
-  ::java::awt::Image * drawBuffer;
-  ::java::awt::image::VolatileImage * drawVBuffer;
-  jboolean validatedContents;
-private:
-  jint width;
-  jint height;
-public: // actually package-private
-  ::java::awt::Component * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$FlipBufferStrategy__
diff --git a/libjava/java/awt/Component$HeavyweightInLightweightListener.h b/libjava/java/awt/Component$HeavyweightInLightweightListener.h
deleted file mode 100644
index 571b22dfa03..00000000000
--- a/libjava/java/awt/Component$HeavyweightInLightweightListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component$HeavyweightInLightweightListener__
-#define __java_awt_Component$HeavyweightInLightweightListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Component$HeavyweightInLightweightListener;
-        class Container;
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-}
-
-class java::awt::Component$HeavyweightInLightweightListener : public ::java::lang::Object
-{
-
-public:
-  Component$HeavyweightInLightweightListener(::java::awt::Component *, ::java::awt::Container *);
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-  virtual void componentShown(::java::awt::event::ComponentEvent *);
-  virtual void componentHidden(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component$HeavyweightInLightweightListener__
diff --git a/libjava/java/awt/Component.h b/libjava/java/awt/Component.h
deleted file mode 100644
index 4b14757911e..00000000000
--- a/libjava/java/awt/Component.h
+++ /dev/null
@@ -1,434 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Component__
-#define __java_awt_Component__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Color;
-        class Component;
-        class ComponentOrientation;
-        class Container;
-        class Cursor;
-        class Dimension;
-        class Event;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class GraphicsConfiguration;
-        class Image;
-        class ImageCapabilities;
-        class MenuComponent;
-        class Point;
-        class PopupMenu;
-        class Rectangle;
-        class Toolkit;
-      namespace dnd
-      {
-          class DropTarget;
-      }
-      namespace event
-      {
-          class ComponentEvent;
-          class ComponentListener;
-          class FocusEvent;
-          class FocusListener;
-          class HierarchyBoundsListener;
-          class HierarchyEvent;
-          class HierarchyListener;
-          class InputMethodEvent;
-          class InputMethodListener;
-          class KeyEvent;
-          class KeyListener;
-          class MouseEvent;
-          class MouseListener;
-          class MouseMotionListener;
-          class MouseWheelEvent;
-          class MouseWheelListener;
-      }
-      namespace im
-      {
-          class InputContext;
-          class InputMethodRequests;
-      }
-      namespace image
-      {
-          class BufferStrategy;
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ComponentPeer;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Component : public ::java::lang::Object
-{
-
-public: // actually protected
-  Component();
-public:
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::awt::Container * getParent();
-  virtual ::java::awt::peer::ComponentPeer * getPeer();
-  virtual void setDropTarget(::java::awt::dnd::DropTarget *);
-  virtual ::java::awt::dnd::DropTarget * getDropTarget();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-  virtual ::java::lang::Object * getTreeLock();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual jboolean isValid();
-  virtual jboolean isDisplayable();
-  virtual jboolean isVisible();
-  virtual jboolean isShowing();
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual void enable();
-  virtual void enable(jboolean);
-  virtual void disable();
-  virtual jboolean isDoubleBuffered();
-  virtual void enableInputMethods(jboolean);
-  virtual void setVisible(jboolean);
-  virtual void show();
-  virtual void show(jboolean);
-  virtual void hide();
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual jboolean isForegroundSet();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual jboolean isBackgroundSet();
-  virtual ::java::awt::Font * getFont();
-private:
-  ::java::awt::Font * getFontImpl();
-public:
-  virtual void setFont(::java::awt::Font *);
-  virtual jboolean isFontSet();
-  virtual ::java::util::Locale * getLocale();
-  virtual void setLocale(::java::util::Locale *);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::Point * getLocation();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Point * location();
-  virtual void setLocation(jint, jint);
-  virtual void move(jint, jint);
-  virtual void setLocation(::java::awt::Point *);
-  virtual ::java::awt::Dimension * getSize();
-  virtual ::java::awt::Dimension * size();
-  virtual void setSize(jint, jint);
-  virtual void resize(jint, jint);
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void resize(::java::awt::Dimension *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Rectangle * bounds();
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void reshape(jint, jint, jint, jint);
-public: // actually package-private
-  virtual void notifyReshape(jboolean, jboolean);
-public:
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual jint getX();
-  virtual jint getY();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual ::java::awt::Rectangle * getBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Dimension * getSize(::java::awt::Dimension *);
-  virtual ::java::awt::Point * getLocation(::java::awt::Point *);
-  virtual jboolean isOpaque();
-  virtual jboolean isLightweight();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setPreferredSize(::java::awt::Dimension *);
-  virtual jboolean isPreferredSizeSet();
-  virtual ::java::awt::Dimension * preferredSize();
-public: // actually package-private
-  virtual ::java::awt::Dimension * preferredSizeImpl();
-public:
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual void setMinimumSize(::java::awt::Dimension *);
-  virtual jboolean isMinimumSizeSet();
-  virtual ::java::awt::Dimension * minimumSize();
-public: // actually package-private
-  virtual ::java::awt::Dimension * minimumSizeImpl();
-public:
-  virtual ::java::awt::Dimension * getMaximumSize();
-public: // actually package-private
-  virtual ::java::awt::Dimension * maximumSizeImpl();
-public:
-  virtual void setMaximumSize(::java::awt::Dimension *);
-  virtual jboolean isMaximumSizeSet();
-  virtual jfloat getAlignmentX();
-  virtual jfloat getAlignmentY();
-  virtual void doLayout();
-  virtual void layout();
-  virtual void validate();
-  virtual void invalidate();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual jboolean isCursorSet();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void update(::java::awt::Graphics *);
-  virtual void paintAll(::java::awt::Graphics *);
-  virtual void repaint();
-  virtual void repaint(jlong);
-  virtual void repaint(jint, jint, jint, jint);
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void print(::java::awt::Graphics *);
-  virtual void printAll(::java::awt::Graphics *);
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Image * createImage(::java::awt::image::ImageProducer *);
-  virtual ::java::awt::Image * createImage(jint, jint);
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint);
-  virtual ::java::awt::image::VolatileImage * createVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
-  virtual jboolean prepareImage(::java::awt::Image *, ::java::awt::image::ImageObserver *);
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual jint checkImage(::java::awt::Image *, ::java::awt::image::ImageObserver *);
-  virtual jint checkImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
-  virtual void setIgnoreRepaint(jboolean);
-  virtual jboolean getIgnoreRepaint();
-  virtual jboolean contains(jint, jint);
-  virtual jboolean inside(jint, jint);
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::java::awt::Component * getComponentAt(jint, jint);
-  virtual ::java::awt::Component * locate(jint, jint);
-  virtual ::java::awt::Component * getComponentAt(::java::awt::Point *);
-  virtual void deliverEvent(::java::awt::Event *);
-  virtual void dispatchEvent(::java::awt::AWTEvent *);
-public: // actually package-private
-  static jboolean ignoreOldMouseEvents();
-public:
-  virtual jboolean postEvent(::java::awt::Event *);
-  virtual void addComponentListener(::java::awt::event::ComponentListener *);
-  virtual void removeComponentListener(::java::awt::event::ComponentListener *);
-  virtual JArray< ::java::awt::event::ComponentListener * > * getComponentListeners();
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-  virtual JArray< ::java::awt::event::FocusListener * > * getFocusListeners();
-  virtual void addHierarchyListener(::java::awt::event::HierarchyListener *);
-  virtual void removeHierarchyListener(::java::awt::event::HierarchyListener *);
-  virtual JArray< ::java::awt::event::HierarchyListener * > * getHierarchyListeners();
-  virtual void addHierarchyBoundsListener(::java::awt::event::HierarchyBoundsListener *);
-  virtual void removeHierarchyBoundsListener(::java::awt::event::HierarchyBoundsListener *);
-  virtual JArray< ::java::awt::event::HierarchyBoundsListener * > * getHierarchyBoundsListeners();
-public: // actually package-private
-  virtual void fireHierarchyEvent(jint, ::java::awt::Component *, ::java::awt::Container *, jlong);
-public:
-  virtual void addKeyListener(::java::awt::event::KeyListener *);
-  virtual void removeKeyListener(::java::awt::event::KeyListener *);
-  virtual JArray< ::java::awt::event::KeyListener * > * getKeyListeners();
-  virtual void addMouseListener(::java::awt::event::MouseListener *);
-  virtual void removeMouseListener(::java::awt::event::MouseListener *);
-  virtual JArray< ::java::awt::event::MouseListener * > * getMouseListeners();
-  virtual void addMouseMotionListener(::java::awt::event::MouseMotionListener *);
-  virtual void removeMouseMotionListener(::java::awt::event::MouseMotionListener *);
-  virtual JArray< ::java::awt::event::MouseMotionListener * > * getMouseMotionListeners();
-  virtual void addMouseWheelListener(::java::awt::event::MouseWheelListener *);
-  virtual void removeMouseWheelListener(::java::awt::event::MouseWheelListener *);
-  virtual JArray< ::java::awt::event::MouseWheelListener * > * getMouseWheelListeners();
-  virtual void addInputMethodListener(::java::awt::event::InputMethodListener *);
-  virtual void removeInputMethodListener(::java::awt::event::InputMethodListener *);
-  virtual JArray< ::java::awt::event::InputMethodListener * > * getInputMethodListeners();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests();
-  virtual ::java::awt::im::InputContext * getInputContext();
-public: // actually protected
-  virtual void enableEvents(jlong);
-  virtual void disableEvents(jlong);
-  virtual ::java::awt::AWTEvent * coalesceEvents(::java::awt::AWTEvent *, ::java::awt::AWTEvent *);
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processComponentEvent(::java::awt::event::ComponentEvent *);
-  virtual void processFocusEvent(::java::awt::event::FocusEvent *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void processMouseMotionEvent(::java::awt::event::MouseEvent *);
-  virtual void processMouseWheelEvent(::java::awt::event::MouseWheelEvent *);
-  virtual void processInputMethodEvent(::java::awt::event::InputMethodEvent *);
-  virtual void processHierarchyEvent(::java::awt::event::HierarchyEvent *);
-  virtual void processHierarchyBoundsEvent(::java::awt::event::HierarchyEvent *);
-public:
-  virtual jboolean handleEvent(::java::awt::Event *);
-  virtual jboolean mouseDown(::java::awt::Event *, jint, jint);
-  virtual jboolean mouseDrag(::java::awt::Event *, jint, jint);
-  virtual jboolean mouseUp(::java::awt::Event *, jint, jint);
-  virtual jboolean mouseMove(::java::awt::Event *, jint, jint);
-  virtual jboolean mouseEnter(::java::awt::Event *, jint, jint);
-  virtual jboolean mouseExit(::java::awt::Event *, jint, jint);
-  virtual jboolean keyDown(::java::awt::Event *, jint);
-  virtual jboolean keyUp(::java::awt::Event *, jint);
-  virtual jboolean action(::java::awt::Event *, ::java::lang::Object *);
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual jboolean gotFocus(::java::awt::Event *, ::java::lang::Object *);
-  virtual jboolean lostFocus(::java::awt::Event *, ::java::lang::Object *);
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isFocusable();
-  virtual void setFocusable(jboolean);
-  virtual void setFocusTraversalKeys(jint, ::java::util::Set *);
-  virtual ::java::util::Set * getFocusTraversalKeys(jint);
-  virtual jboolean areFocusTraversalKeysSet(jint);
-  virtual void setFocusTraversalKeysEnabled(jboolean);
-  virtual jboolean getFocusTraversalKeysEnabled();
-  virtual void requestFocus();
-public: // actually protected
-  virtual jboolean requestFocus(jboolean);
-public:
-  virtual jboolean requestFocusInWindow();
-public: // actually protected
-  virtual jboolean requestFocusInWindow(jboolean);
-private:
-  jboolean requestFocusImpl(jboolean, jboolean);
-public:
-  virtual void transferFocus();
-  virtual ::java::awt::Container * getFocusCycleRootAncestor();
-  virtual jboolean isFocusCycleRoot(::java::awt::Container *);
-  virtual void nextFocus();
-  virtual void transferFocusBackward();
-  virtual void transferFocusUpCycle();
-  virtual jboolean hasFocus();
-  virtual jboolean isFocusOwner();
-  virtual void add(::java::awt::PopupMenu *);
-  virtual void remove(::java::awt::MenuComponent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::java::lang::String * toString();
-  virtual void list();
-  virtual void list(::java::io::PrintStream *);
-  virtual void list(::java::io::PrintStream *, jint);
-  virtual void list(::java::io::PrintWriter *);
-  virtual void list(::java::io::PrintWriter *, jint);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners(::java::lang::String *);
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-  virtual void firePropertyChange(::java::lang::String *, jint, jint);
-public:
-  virtual void firePropertyChange(::java::lang::String *, jbyte, jbyte);
-  virtual void firePropertyChange(::java::lang::String *, jchar, jchar);
-  virtual void firePropertyChange(::java::lang::String *, jshort, jshort);
-  virtual void firePropertyChange(::java::lang::String *, jlong, jlong);
-  virtual void firePropertyChange(::java::lang::String *, jfloat, jfloat);
-  virtual void firePropertyChange(::java::lang::String *, jdouble, jdouble);
-  virtual void setComponentOrientation(::java::awt::ComponentOrientation *);
-  virtual ::java::awt::ComponentOrientation * getComponentOrientation();
-  virtual void applyComponentOrientation(::java::awt::ComponentOrientation *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-  virtual void setPeer(::java::awt::peer::ComponentPeer *);
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfigurationImpl();
-  static ::java::awt::Event * translateEvent(::java::awt::AWTEvent *);
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-  virtual jboolean eventTypeEnabled(jint);
-  virtual jboolean isHierarchyVisible();
-  virtual ::java::awt::Component * findNextFocusComponent(::java::awt::Component *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -7644114512714619750LL;
-public:
-  static jfloat TOP_ALIGNMENT;
-  static jfloat CENTER_ALIGNMENT;
-  static jfloat BOTTOM_ALIGNMENT;
-  static jfloat RIGHT_ALIGNMENT;
-  static jfloat LEFT_ALIGNMENT;
-public: // actually package-private
-  static ::java::lang::Object * treeLock;
-private:
-  static ::java::awt::Dimension * DEFAULT_MAX_SIZE;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-  jint width;
-  jint height;
-  ::java::awt::Color * foreground;
-  ::java::awt::Color * background;
-  ::java::awt::Font * font;
-  ::java::awt::Font * peerFont;
-  ::java::awt::Cursor * cursor;
-  ::java::util::Locale * locale;
-  jboolean ignoreRepaint;
-  jboolean visible;
-  jboolean enabled;
-  jboolean valid;
-  ::java::awt::dnd::DropTarget * dropTarget;
-  ::java::util::Vector * popups;
-  ::java::lang::String * name;
-  jboolean nameExplicitlySet;
-  jboolean focusable;
-  jint isFocusTraversableOverridden;
-  JArray< ::java::util::Set * > * focusTraversalKeys;
-  jboolean focusTraversalKeysEnabled;
-  ::java::awt::Dimension * minSize;
-  jboolean minSizeSet;
-  ::java::awt::Dimension * maxSize;
-  jboolean maxSizeSet;
-  ::java::awt::Dimension * prefSize;
-  jboolean prefSizeSet;
-  jboolean newEventsOnly;
-  jlong eventMask;
-  ::java::beans::PropertyChangeSupport * changeSupport;
-  jboolean isPacked;
-  jint componentSerializedDataVersion;
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-  ::java::awt::event::ComponentListener * componentListener;
-  ::java::awt::event::FocusListener * focusListener;
-  ::java::awt::event::KeyListener * keyListener;
-  ::java::awt::event::MouseListener * mouseListener;
-  ::java::awt::event::MouseMotionListener * mouseMotionListener;
-  ::java::awt::event::MouseWheelListener * mouseWheelListener;
-  ::java::awt::event::InputMethodListener * inputMethodListener;
-  ::java::awt::event::HierarchyListener * hierarchyListener;
-  ::java::awt::event::HierarchyBoundsListener * hierarchyBoundsListener;
-  ::java::awt::Container * parent;
-  ::java::awt::peer::ComponentPeer * peer;
-  ::java::awt::ComponentOrientation * componentOrientation;
-  ::java::awt::GraphicsConfiguration * graphicsConfig;
-  ::java::awt::image::BufferStrategy * bufferStrategy;
-  jint numHierarchyListeners;
-  jint numHierarchyBoundsListeners;
-private:
-  ::java::awt::event::FocusEvent * pendingFocusRequest;
-  static jboolean incrementalDraw;
-  static ::java::lang::Long * redrawRate;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Component__
diff --git a/libjava/java/awt/ComponentOrientation.h b/libjava/java/awt/ComponentOrientation.h
deleted file mode 100644
index fe3ef9c1740..00000000000
--- a/libjava/java/awt/ComponentOrientation.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ComponentOrientation__
-#define __java_awt_ComponentOrientation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ComponentOrientation;
-    }
-  }
-}
-
-class java::awt::ComponentOrientation : public ::java::lang::Object
-{
-
-  ComponentOrientation(jint);
-public:
-  jboolean isHorizontal();
-  jboolean isLeftToRight();
-  static ::java::awt::ComponentOrientation * getOrientation(::java::util::Locale *);
-  static ::java::awt::ComponentOrientation * getOrientation(::java::util::ResourceBundle *);
-private:
-  static const jlong serialVersionUID = -4113291392143563828LL;
-  static const jint UNKNOWN_ID = 1;
-  static const jint HORIZONTAL_ID = 2;
-  static const jint LEFT_TO_RIGHT_ID = 4;
-public:
-  static ::java::awt::ComponentOrientation * LEFT_TO_RIGHT;
-  static ::java::awt::ComponentOrientation * RIGHT_TO_LEFT;
-  static ::java::awt::ComponentOrientation * UNKNOWN;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) orientation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ComponentOrientation__
diff --git a/libjava/java/awt/Composite.h b/libjava/java/awt/Composite.h
deleted file mode 100644
index 1eed4bcae1a..00000000000
--- a/libjava/java/awt/Composite.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Composite__
-#define __java_awt_Composite__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Composite;
-        class CompositeContext;
-        class RenderingHints;
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::Composite : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::CompositeContext * createContext(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::RenderingHints *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Composite__
diff --git a/libjava/java/awt/CompositeContext.h b/libjava/java/awt/CompositeContext.h
deleted file mode 100644
index 83195ab8bbf..00000000000
--- a/libjava/java/awt/CompositeContext.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_CompositeContext__
-#define __java_awt_CompositeContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class CompositeContext;
-      namespace image
-      {
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::CompositeContext : public ::java::lang::Object
-{
-
-public:
-  virtual void dispose() = 0;
-  virtual void compose(::java::awt::image::Raster *, ::java::awt::image::Raster *, ::java::awt::image::WritableRaster *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_CompositeContext__
diff --git a/libjava/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.h b/libjava/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.h
deleted file mode 100644
index ae8aa684f14..00000000000
--- a/libjava/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$AccessibleAWTContainer$AccessibleContainerHandler__
-#define __java_awt_Container$AccessibleAWTContainer$AccessibleContainerHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container$AccessibleAWTContainer;
-        class Container$AccessibleAWTContainer$AccessibleContainerHandler;
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-}
-
-class java::awt::Container$AccessibleAWTContainer$AccessibleContainerHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  Container$AccessibleAWTContainer$AccessibleContainerHandler(::java::awt::Container$AccessibleAWTContainer *);
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-public: // actually package-private
-  ::java::awt::Container$AccessibleAWTContainer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$AccessibleAWTContainer$AccessibleContainerHandler__
diff --git a/libjava/java/awt/Container$AccessibleAWTContainer.h b/libjava/java/awt/Container$AccessibleAWTContainer.h
deleted file mode 100644
index fe132635d0d..00000000000
--- a/libjava/java/awt/Container$AccessibleAWTContainer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$AccessibleAWTContainer__
-#define __java_awt_Container$AccessibleAWTContainer__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Container$AccessibleAWTContainer;
-        class Point;
-      namespace event
-      {
-          class ContainerListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-  }
-}
-
-class java::awt::Container$AccessibleAWTContainer : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public: // actually protected
-  Container$AccessibleAWTContainer(::java::awt::Container *);
-public:
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-private:
-  static const jlong serialVersionUID = 5081320404842566097LL;
-public: // actually protected
-  ::java::awt::event::ContainerListener * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) accessibleContainerHandler;
-public: // actually package-private
-  ::java::awt::Container * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$AccessibleAWTContainer__
diff --git a/libjava/java/awt/Container$GfxPaintAllVisitor.h b/libjava/java/awt/Container$GfxPaintAllVisitor.h
deleted file mode 100644
index cd3e68e896f..00000000000
--- a/libjava/java/awt/Container$GfxPaintAllVisitor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$GfxPaintAllVisitor__
-#define __java_awt_Container$GfxPaintAllVisitor__
-
-#pragma interface
-
-#include <java/awt/Container$GfxVisitor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container$GfxPaintAllVisitor;
-        class Container$GfxVisitor;
-        class Graphics;
-    }
-  }
-}
-
-class java::awt::Container$GfxPaintAllVisitor : public ::java::awt::Container$GfxVisitor
-{
-
-public: // actually package-private
-  Container$GfxPaintAllVisitor();
-public:
-  virtual void visit(::java::awt::Component *, ::java::awt::Graphics *);
-  static ::java::awt::Container$GfxVisitor * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$GfxPaintAllVisitor__
diff --git a/libjava/java/awt/Container$GfxPaintVisitor.h b/libjava/java/awt/Container$GfxPaintVisitor.h
deleted file mode 100644
index c75ddd1a349..00000000000
--- a/libjava/java/awt/Container$GfxPaintVisitor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$GfxPaintVisitor__
-#define __java_awt_Container$GfxPaintVisitor__
-
-#pragma interface
-
-#include <java/awt/Container$GfxVisitor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container$GfxPaintVisitor;
-        class Container$GfxVisitor;
-        class Graphics;
-    }
-  }
-}
-
-class java::awt::Container$GfxPaintVisitor : public ::java::awt::Container$GfxVisitor
-{
-
-public: // actually package-private
-  Container$GfxPaintVisitor();
-public:
-  virtual void visit(::java::awt::Component *, ::java::awt::Graphics *);
-  static ::java::awt::Container$GfxVisitor * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$GfxPaintVisitor__
diff --git a/libjava/java/awt/Container$GfxPrintAllVisitor.h b/libjava/java/awt/Container$GfxPrintAllVisitor.h
deleted file mode 100644
index acc4a8ba491..00000000000
--- a/libjava/java/awt/Container$GfxPrintAllVisitor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$GfxPrintAllVisitor__
-#define __java_awt_Container$GfxPrintAllVisitor__
-
-#pragma interface
-
-#include <java/awt/Container$GfxVisitor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container$GfxPrintAllVisitor;
-        class Container$GfxVisitor;
-        class Graphics;
-    }
-  }
-}
-
-class java::awt::Container$GfxPrintAllVisitor : public ::java::awt::Container$GfxVisitor
-{
-
-public: // actually package-private
-  Container$GfxPrintAllVisitor();
-public:
-  virtual void visit(::java::awt::Component *, ::java::awt::Graphics *);
-  static ::java::awt::Container$GfxVisitor * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$GfxPrintAllVisitor__
diff --git a/libjava/java/awt/Container$GfxPrintVisitor.h b/libjava/java/awt/Container$GfxPrintVisitor.h
deleted file mode 100644
index 557530ba851..00000000000
--- a/libjava/java/awt/Container$GfxPrintVisitor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$GfxPrintVisitor__
-#define __java_awt_Container$GfxPrintVisitor__
-
-#pragma interface
-
-#include <java/awt/Container$GfxVisitor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container$GfxPrintVisitor;
-        class Container$GfxVisitor;
-        class Graphics;
-    }
-  }
-}
-
-class java::awt::Container$GfxPrintVisitor : public ::java::awt::Container$GfxVisitor
-{
-
-public: // actually package-private
-  Container$GfxPrintVisitor();
-public:
-  virtual void visit(::java::awt::Component *, ::java::awt::Graphics *);
-  static ::java::awt::Container$GfxVisitor * INSTANCE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$GfxPrintVisitor__
diff --git a/libjava/java/awt/Container$GfxVisitor.h b/libjava/java/awt/Container$GfxVisitor.h
deleted file mode 100644
index 97322e8d5da..00000000000
--- a/libjava/java/awt/Container$GfxVisitor.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container$GfxVisitor__
-#define __java_awt_Container$GfxVisitor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container$GfxVisitor;
-        class Graphics;
-    }
-  }
-}
-
-class java::awt::Container$GfxVisitor : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Container$GfxVisitor();
-public:
-  virtual void visit(::java::awt::Component *, ::java::awt::Graphics *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container$GfxVisitor__
diff --git a/libjava/java/awt/Container.h b/libjava/java/awt/Container.h
deleted file mode 100644
index 4a44759532a..00000000000
--- a/libjava/java/awt/Container.h
+++ /dev/null
@@ -1,164 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Container__
-#define __java_awt_Container__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-        class ComponentOrientation;
-        class Container;
-        class Container$GfxVisitor;
-        class Dimension;
-        class Event;
-        class FocusTraversalPolicy;
-        class Font;
-        class Graphics;
-        class Insets;
-        class LayoutManager;
-        class Point;
-      namespace event
-      {
-          class ContainerEvent;
-          class ContainerListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-}
-
-class java::awt::Container : public ::java::awt::Component
-{
-
-public:
-  Container();
-  virtual jint getComponentCount();
-  virtual jint countComponents();
-  virtual ::java::awt::Component * getComponent(jint);
-  virtual JArray< ::java::awt::Component * > * getComponents();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * insets();
-  virtual ::java::awt::Component * add(::java::awt::Component *);
-  virtual ::java::awt::Component * add(::java::lang::String *, ::java::awt::Component *);
-  virtual ::java::awt::Component * add(::java::awt::Component *, jint);
-  virtual void add(::java::awt::Component *, ::java::lang::Object *);
-  virtual void add(::java::awt::Component *, ::java::lang::Object *, jint);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void remove(jint);
-  virtual void remove(::java::awt::Component *);
-  virtual void removeAll();
-  virtual ::java::awt::LayoutManager * getLayout();
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void doLayout();
-  virtual void layout();
-  virtual void invalidate();
-  virtual void validate();
-private:
-  void invalidateTree();
-public: // actually protected
-  virtual void validateTree();
-public:
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual jfloat getAlignmentX();
-  virtual jfloat getAlignmentY();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void update(::java::awt::Graphics *);
-  virtual void print(::java::awt::Graphics *);
-  virtual void paintComponents(::java::awt::Graphics *);
-  virtual void printComponents(::java::awt::Graphics *);
-  virtual void addContainerListener(::java::awt::event::ContainerListener *);
-  virtual void removeContainerListener(::java::awt::event::ContainerListener *);
-  virtual JArray< ::java::awt::event::ContainerListener * > * getContainerListeners();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processContainerEvent(::java::awt::event::ContainerEvent *);
-public:
-  virtual void deliverEvent(::java::awt::Event *);
-  virtual ::java::awt::Component * getComponentAt(jint, jint);
-  virtual ::java::awt::Component * locate(jint, jint);
-  virtual ::java::awt::Component * getComponentAt(::java::awt::Point *);
-  virtual ::java::awt::Component * findComponentAt(jint, jint);
-  virtual ::java::awt::Component * findComponentAt(::java::awt::Point *);
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual jboolean isAncestorOf(::java::awt::Component *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void list(::java::io::PrintStream *, jint);
-  virtual void list(::java::io::PrintWriter *, jint);
-  virtual void setFocusTraversalKeys(jint, ::java::util::Set *);
-  virtual ::java::util::Set * getFocusTraversalKeys(jint);
-  virtual jboolean areFocusTraversalKeysSet(jint);
-  virtual jboolean isFocusCycleRoot(::java::awt::Container *);
-  virtual void setFocusTraversalPolicy(::java::awt::FocusTraversalPolicy *);
-  virtual ::java::awt::FocusTraversalPolicy * getFocusTraversalPolicy();
-  virtual jboolean isFocusTraversalPolicySet();
-  virtual void setFocusCycleRoot(jboolean);
-  virtual jboolean isFocusTraversalPolicyProvider();
-  virtual void setFocusTraversalPolicyProvider(jboolean);
-  virtual jboolean isFocusCycleRoot();
-  virtual void transferFocusDownCycle();
-  virtual void applyComponentOrientation(::java::awt::ComponentOrientation *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void setComponentZOrder(::java::awt::Component *, jint);
-  virtual jint getComponentZOrder(::java::awt::Component *);
-private:
-  void visitChildren(::java::awt::Graphics *, ::java::awt::Container$GfxVisitor *, jboolean);
-  void visitChild(::java::awt::Graphics *, ::java::awt::Container$GfxVisitor *, ::java::awt::Component *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-  virtual void dispatchNoLightweight(::java::awt::AWTEvent *);
-  virtual jboolean eventTypeEnabled(jint);
-  virtual ::java::awt::Component * findNextFocusComponent(::java::awt::Component *);
-  virtual void fireHierarchyEvent(jint, ::java::awt::Component *, ::java::awt::Container *, jlong);
-  virtual void updateHierarchyListenerCount(jlong, jint);
-  virtual void notifyReshape(jboolean, jboolean);
-private:
-  void addNotifyContainerChildren();
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 4613797578919906343LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::Component)))) ncomponents;
-  JArray< ::java::awt::Component * > * component;
-  ::java::awt::LayoutManager * layoutMgr;
-  jboolean focusCycleRoot;
-private:
-  jboolean focusTraversalPolicyProvider;
-public: // actually package-private
-  jint containerSerializedDataVersion;
-  ::java::awt::event::ContainerListener * containerListener;
-private:
-  ::java::awt::FocusTraversalPolicy * focusTraversalPolicy;
-public: // actually package-private
-  JArray< ::java::util::Set * > * focusTraversalKeys;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Container__
diff --git a/libjava/java/awt/ContainerOrderFocusTraversalPolicy.h b/libjava/java/awt/ContainerOrderFocusTraversalPolicy.h
deleted file mode 100644
index 8f0e89f9b3f..00000000000
--- a/libjava/java/awt/ContainerOrderFocusTraversalPolicy.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ContainerOrderFocusTraversalPolicy__
-#define __java_awt_ContainerOrderFocusTraversalPolicy__
-
-#pragma interface
-
-#include <java/awt/FocusTraversalPolicy.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class ContainerOrderFocusTraversalPolicy;
-    }
-  }
-}
-
-class java::awt::ContainerOrderFocusTraversalPolicy : public ::java::awt::FocusTraversalPolicy
-{
-
-public:
-  ContainerOrderFocusTraversalPolicy();
-  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
-private:
-  ::java::awt::Component * getNextAvailableComponent(JArray< ::java::awt::Component * > *, jint, jint);
-public: // actually package-private
-  virtual ::java::awt::Component * getPrevAvailableComponent(JArray< ::java::awt::Component * > *, jint, jint);
-public:
-  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getDefaultComponent(::java::awt::Container *);
-  virtual void setImplicitDownCycleTraversal(jboolean);
-  virtual jboolean getImplicitDownCycleTraversal();
-public: // actually protected
-  virtual jboolean accept(::java::awt::Component *);
-public: // actually package-private
-  static const jlong serialVersionUID = 486933713763926351LL;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::FocusTraversalPolicy)))) implicitDownCycleTraversal;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ContainerOrderFocusTraversalPolicy__
diff --git a/libjava/java/awt/Cursor.h b/libjava/java/awt/Cursor.h
deleted file mode 100644
index 3d50e634537..00000000000
--- a/libjava/java/awt/Cursor.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Cursor__
-#define __java_awt_Cursor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Cursor;
-    }
-  }
-}
-
-class java::awt::Cursor : public ::java::lang::Object
-{
-
-public:
-  Cursor(jint);
-public: // actually protected
-  Cursor(::java::lang::String *);
-public:
-  static ::java::awt::Cursor * getPredefinedCursor(jint);
-  static ::java::awt::Cursor * getSystemCustomCursor(::java::lang::String *);
-  static ::java::awt::Cursor * getDefaultCursor();
-  virtual jint getType();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = 8028237497568985504LL;
-public:
-  static const jint DEFAULT_CURSOR = 0;
-  static const jint CROSSHAIR_CURSOR = 1;
-  static const jint TEXT_CURSOR = 2;
-  static const jint WAIT_CURSOR = 3;
-  static const jint SW_RESIZE_CURSOR = 4;
-  static const jint SE_RESIZE_CURSOR = 5;
-  static const jint NW_RESIZE_CURSOR = 6;
-  static const jint NE_RESIZE_CURSOR = 7;
-  static const jint N_RESIZE_CURSOR = 8;
-  static const jint S_RESIZE_CURSOR = 9;
-  static const jint W_RESIZE_CURSOR = 10;
-  static const jint E_RESIZE_CURSOR = 11;
-  static const jint HAND_CURSOR = 12;
-  static const jint MOVE_CURSOR = 13;
-private:
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static const jint CUSTOM_CURSOR = -1;
-private:
-  static const jint PREDEFINED_COUNT = 14;
-public: // actually protected
-  static JArray< ::java::awt::Cursor * > * predefined;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public: // actually package-private
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Cursor__
diff --git a/libjava/java/awt/DefaultFocusTraversalPolicy.h b/libjava/java/awt/DefaultFocusTraversalPolicy.h
deleted file mode 100644
index d6f22987dca..00000000000
--- a/libjava/java/awt/DefaultFocusTraversalPolicy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_DefaultFocusTraversalPolicy__
-#define __java_awt_DefaultFocusTraversalPolicy__
-
-#pragma interface
-
-#include <java/awt/ContainerOrderFocusTraversalPolicy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class DefaultFocusTraversalPolicy;
-    }
-  }
-}
-
-class java::awt::DefaultFocusTraversalPolicy : public ::java::awt::ContainerOrderFocusTraversalPolicy
-{
-
-public:
-  DefaultFocusTraversalPolicy();
-public: // actually protected
-  virtual jboolean accept(::java::awt::Component *);
-private:
-  static const jlong serialVersionUID = 8876966522510157497LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_DefaultFocusTraversalPolicy__
diff --git a/libjava/java/awt/DefaultKeyboardFocusManager$EventDelayRequest.h b/libjava/java/awt/DefaultKeyboardFocusManager$EventDelayRequest.h
deleted file mode 100644
index 7061d499ec2..00000000000
--- a/libjava/java/awt/DefaultKeyboardFocusManager$EventDelayRequest.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_DefaultKeyboardFocusManager$EventDelayRequest__
-#define __java_awt_DefaultKeyboardFocusManager$EventDelayRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class DefaultKeyboardFocusManager;
-        class DefaultKeyboardFocusManager$EventDelayRequest;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::DefaultKeyboardFocusManager$EventDelayRequest : public ::java::lang::Object
-{
-
-public:
-  DefaultKeyboardFocusManager$EventDelayRequest(::java::awt::DefaultKeyboardFocusManager *, jlong, ::java::awt::Component *);
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual void enqueueEvent(::java::awt::event::KeyEvent *);
-  virtual void dispatchEvents();
-  virtual void discardEvents();
-private:
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enqueuedKeyEvents;
-public:
-  jlong timestamp;
-  ::java::awt::Component * focusedComp;
-public: // actually package-private
-  ::java::awt::DefaultKeyboardFocusManager * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_DefaultKeyboardFocusManager$EventDelayRequest__
diff --git a/libjava/java/awt/DefaultKeyboardFocusManager.h b/libjava/java/awt/DefaultKeyboardFocusManager.h
deleted file mode 100644
index ce9e4467ca5..00000000000
--- a/libjava/java/awt/DefaultKeyboardFocusManager.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_DefaultKeyboardFocusManager__
-#define __java_awt_DefaultKeyboardFocusManager__
-
-#pragma interface
-
-#include <java/awt/KeyboardFocusManager.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class AWTKeyStroke;
-        class Component;
-        class Container;
-        class DefaultKeyboardFocusManager;
-      namespace event
-      {
-          class FocusEvent;
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::DefaultKeyboardFocusManager : public ::java::awt::KeyboardFocusManager
-{
-
-public:
-  DefaultKeyboardFocusManager();
-  virtual jboolean dispatchEvent(::java::awt::AWTEvent *);
-private:
-  jboolean handleFocusGained(::java::awt::event::FocusEvent *);
-  jboolean handleFocusLost(::java::awt::event::FocusEvent *);
-  jboolean enqueueKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  virtual jboolean dispatchKeyEvent(::java::awt::event::KeyEvent *);
-  virtual jboolean postProcessKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processKeyEvent(::java::awt::Component *, ::java::awt::event::KeyEvent *);
-public: // actually protected
-  virtual void enqueueKeyEvents(jlong, ::java::awt::Component *);
-  virtual void dequeueKeyEvents(jlong, ::java::awt::Component *);
-  virtual void discardKeyEvents(::java::awt::Component *);
-public:
-  virtual void focusPreviousComponent(::java::awt::Component *);
-  virtual void focusNextComponent(::java::awt::Component *);
-  virtual void upFocusCycle(::java::awt::Component *);
-  virtual void downFocusCycle(::java::awt::Container *);
-private:
-  ::java::awt::AWTKeyStroke * __attribute__((aligned(__alignof__( ::java::awt::KeyboardFocusManager)))) waitForKeyStroke;
-  ::java::util::SortedSet * delayRequests;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_DefaultKeyboardFocusManager__
diff --git a/libjava/java/awt/Dialog$AccessibleAWTDialog.h b/libjava/java/awt/Dialog$AccessibleAWTDialog.h
deleted file mode 100644
index b8bf577db41..00000000000
--- a/libjava/java/awt/Dialog$AccessibleAWTDialog.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Dialog$AccessibleAWTDialog__
-#define __java_awt_Dialog$AccessibleAWTDialog__
-
-#pragma interface
-
-#include <java/awt/Window$AccessibleAWTWindow.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-        class Dialog$AccessibleAWTDialog;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::Dialog$AccessibleAWTDialog : public ::java::awt::Window$AccessibleAWTWindow
-{
-
-public: // actually protected
-  Dialog$AccessibleAWTDialog(::java::awt::Dialog *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 4837230331833941201LL;
-public: // actually package-private
-  ::java::awt::Dialog * __attribute__((aligned(__alignof__( ::java::awt::Window$AccessibleAWTWindow)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Dialog$AccessibleAWTDialog__
diff --git a/libjava/java/awt/Dialog.h b/libjava/java/awt/Dialog.h
deleted file mode 100644
index b1d339157e0..00000000000
--- a/libjava/java/awt/Dialog.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Dialog__
-#define __java_awt_Dialog__
-
-#pragma interface
-
-#include <java/awt/Window.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-        class EventQueue;
-        class Frame;
-        class GraphicsConfiguration;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Dialog : public ::java::awt::Window
-{
-
-public:
-  Dialog(::java::awt::Frame *);
-  Dialog(::java::awt::Frame *, jboolean);
-  Dialog(::java::awt::Frame *, ::java::lang::String *);
-  Dialog(::java::awt::Frame *, ::java::lang::String *, jboolean);
-  Dialog(::java::awt::Frame *, ::java::lang::String *, jboolean, ::java::awt::GraphicsConfiguration *);
-  Dialog(::java::awt::Dialog *);
-  Dialog(::java::awt::Dialog *, ::java::lang::String *);
-  Dialog(::java::awt::Dialog *, ::java::lang::String *, jboolean);
-  Dialog(::java::awt::Dialog *, ::java::lang::String *, jboolean, ::java::awt::GraphicsConfiguration *);
-  virtual ::java::lang::String * getTitle();
-  virtual void setTitle(::java::lang::String *);
-  virtual jboolean isModal();
-  virtual void setModal(jboolean);
-  virtual jboolean isResizable();
-  virtual void setResizable(jboolean);
-  virtual void addNotify();
-  virtual void show();
-  virtual void hide();
-  virtual void dispose();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual jboolean isUndecorated();
-  virtual void setUndecorated(jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = 5920926903803293709LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::Window)))) modal;
-  jboolean resizable;
-  ::java::lang::String * title;
-  jboolean undecorated;
-  jboolean blocked;
-  ::java::awt::EventQueue * eq2;
-  static jlong next_dialog_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Dialog__
diff --git a/libjava/java/awt/Dimension.h b/libjava/java/awt/Dimension.h
deleted file mode 100644
index 7722cabc509..00000000000
--- a/libjava/java/awt/Dimension.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Dimension__
-#define __java_awt_Dimension__
-
-#pragma interface
-
-#include <java/awt/geom/Dimension2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-}
-
-class java::awt::Dimension : public ::java::awt::geom::Dimension2D
-{
-
-public:
-  Dimension();
-  Dimension(::java::awt::Dimension *);
-  Dimension(jint, jint);
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual void setSize(jdouble, jdouble);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void setSize(jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4723952579491349524LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::awt::geom::Dimension2D)))) width;
-  jint height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Dimension__
diff --git a/libjava/java/awt/DisplayMode.h b/libjava/java/awt/DisplayMode.h
deleted file mode 100644
index 26561ca0c80..00000000000
--- a/libjava/java/awt/DisplayMode.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_DisplayMode__
-#define __java_awt_DisplayMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class DisplayMode;
-    }
-  }
-}
-
-class java::awt::DisplayMode : public ::java::lang::Object
-{
-
-public:
-  DisplayMode(jint, jint, jint, jint);
-  jint getHeight();
-  jint getWidth();
-  jint getBitDepth();
-  jint getRefreshRate();
-  jboolean equals(::java::awt::DisplayMode *);
-  jint hashCode();
-  static const jint BIT_DEPTH_MULTI = -1;
-  static const jint REFRESH_RATE_UNKNOWN = 0;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) width;
-  jint height;
-  jint bitDepth;
-  jint refreshRate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_DisplayMode__
diff --git a/libjava/java/awt/Event.h b/libjava/java/awt/Event.h
deleted file mode 100644
index a0543818dd3..00000000000
--- a/libjava/java/awt/Event.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Event__
-#define __java_awt_Event__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Event;
-    }
-  }
-}
-
-class java::awt::Event : public ::java::lang::Object
-{
-
-public:
-  Event(::java::lang::Object *, jint, ::java::lang::Object *);
-  Event(::java::lang::Object *, jlong, jint, jint, jint, jint, jint);
-  Event(::java::lang::Object *, jlong, jint, jint, jint, jint, jint, ::java::lang::Object *);
-  virtual jboolean controlDown();
-  virtual jboolean metaDown();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual jboolean shiftDown();
-  virtual ::java::lang::String * toString();
-  virtual void translate(jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = 5488922509400504703LL;
-public:
-  static const jint SHIFT_MASK = 1;
-  static const jint CTRL_MASK = 2;
-  static const jint META_MASK = 4;
-  static const jint ALT_MASK = 8;
-  static const jint ACTION_EVENT = 1001;
-  static const jint BACK_SPACE = 8;
-  static const jint CAPS_LOCK = 1022;
-  static const jint DELETE = 127;
-  static const jint DOWN = 1005;
-  static const jint END = 1001;
-  static const jint ENTER = 10;
-  static const jint ESCAPE = 27;
-  static const jint F1 = 1008;
-  static const jint F10 = 1017;
-  static const jint F11 = 1018;
-  static const jint F12 = 1019;
-  static const jint F2 = 1009;
-  static const jint F3 = 1010;
-  static const jint F4 = 1011;
-  static const jint F5 = 1012;
-  static const jint F6 = 1013;
-  static const jint F7 = 1014;
-  static const jint F8 = 1015;
-  static const jint F9 = 1016;
-  static const jint GOT_FOCUS = 1004;
-  static const jint HOME = 1000;
-  static const jint INSERT = 1025;
-  static const jint KEY_ACTION = 403;
-  static const jint KEY_ACTION_RELEASE = 404;
-  static const jint KEY_PRESS = 401;
-  static const jint KEY_RELEASE = 402;
-  static const jint LEFT = 1006;
-  static const jint LIST_DESELECT = 702;
-  static const jint LIST_SELECT = 701;
-  static const jint LOAD_FILE = 1002;
-  static const jint LOST_FOCUS = 1005;
-  static const jint MOUSE_DOWN = 501;
-  static const jint MOUSE_DRAG = 506;
-  static const jint MOUSE_ENTER = 504;
-  static const jint MOUSE_EXIT = 505;
-  static const jint MOUSE_MOVE = 503;
-  static const jint MOUSE_UP = 502;
-  static const jint NUM_LOCK = 1023;
-  static const jint PAUSE = 1024;
-  static const jint PGDN = 1003;
-  static const jint PGUP = 1002;
-  static const jint PRINT_SCREEN = 1020;
-  static const jint RIGHT = 1007;
-  static const jint SAVE_FILE = 1003;
-  static const jint SCROLL_ABSOLUTE = 605;
-  static const jint SCROLL_BEGIN = 606;
-  static const jint SCROLL_END = 607;
-  static const jint SCROLL_LINE_DOWN = 602;
-  static const jint SCROLL_LINE_UP = 601;
-  static const jint SCROLL_LOCK = 1021;
-  static const jint SCROLL_PAGE_DOWN = 604;
-  static const jint SCROLL_PAGE_UP = 603;
-  static const jint TAB = 9;
-  static const jint UP = 1004;
-  static const jint WINDOW_DEICONIFY = 204;
-  static const jint WINDOW_DESTROY = 201;
-  static const jint WINDOW_EXPOSE = 202;
-  static const jint WINDOW_ICONIFY = 203;
-  static const jint WINDOW_MOVED = 205;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) arg;
-  jint clickCount;
-public: // actually package-private
-  jboolean consumed;
-public:
-  ::java::awt::Event * evt;
-  jint id;
-  jint key;
-  jint modifiers;
-  ::java::lang::Object * target;
-  jlong when;
-  jint x;
-  jint y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Event__
diff --git a/libjava/java/awt/EventDispatchThread.h b/libjava/java/awt/EventDispatchThread.h
deleted file mode 100644
index a094bdc8a71..00000000000
--- a/libjava/java/awt/EventDispatchThread.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_EventDispatchThread__
-#define __java_awt_EventDispatchThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class EventDispatchThread;
-        class EventQueue;
-    }
-  }
-}
-
-class java::awt::EventDispatchThread : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  EventDispatchThread(::java::awt::EventQueue *);
-public:
-  virtual void run();
-private:
-  static const jint DEFAULT_PRIORITY = 6;
-  static jint dispatchThreadNum;
-  ::java::awt::EventQueue * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) queue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_EventDispatchThread__
diff --git a/libjava/java/awt/EventQueue$Queue.h b/libjava/java/awt/EventQueue$Queue.h
deleted file mode 100644
index 6504a9661ff..00000000000
--- a/libjava/java/awt/EventQueue$Queue.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_EventQueue$Queue__
-#define __java_awt_EventQueue$Queue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class EventQueue;
-        class EventQueue$Queue;
-    }
-  }
-}
-
-class java::awt::EventQueue$Queue : public ::java::lang::Object
-{
-
-  EventQueue$Queue(::java::awt::EventQueue *);
-public: // actually package-private
-  EventQueue$Queue(::java::awt::EventQueue *, ::java::awt::EventQueue$Queue *);
-  ::java::awt::AWTEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queueHead;
-  ::java::awt::AWTEvent * queueTail;
-  ::java::awt::EventQueue * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_EventQueue$Queue__
diff --git a/libjava/java/awt/EventQueue.h b/libjava/java/awt/EventQueue.h
deleted file mode 100644
index 71da1550e98..00000000000
--- a/libjava/java/awt/EventQueue.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_EventQueue__
-#define __java_awt_EventQueue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class EventDispatchThread;
-        class EventQueue;
-        class EventQueue$Queue;
-    }
-  }
-}
-
-class java::awt::EventQueue : public ::java::lang::Object
-{
-
-  jboolean isShutdown();
-public:
-  EventQueue();
-  virtual ::java::awt::AWTEvent * getNextEvent();
-private:
-  ::java::awt::AWTEvent * getNextEventImpl(jboolean);
-public:
-  virtual ::java::awt::AWTEvent * peekEvent();
-  virtual ::java::awt::AWTEvent * peekEvent(jint);
-  virtual void postEvent(::java::awt::AWTEvent *);
-private:
-  void postEventImpl(::java::awt::AWTEvent *);
-  void postEventImpl(::java::awt::AWTEvent *, jint);
-public:
-  static void invokeAndWait(::java::lang::Runnable *);
-  static void invokeLater(::java::lang::Runnable *);
-  static jboolean isDispatchThread();
-  static ::java::awt::AWTEvent * getCurrentEvent();
-  virtual void push(::java::awt::EventQueue *);
-public: // actually protected
-  virtual void pop();
-  virtual void dispatchEvent(::java::awt::AWTEvent *);
-public:
-  static jlong getMostRecentEventTime();
-private:
-  static const jint NORM_PRIORITY = 0;
-  static const jint LOW_PRIORITY = 1;
-  JArray< ::java::awt::EventQueue$Queue * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queues;
-  ::java::awt::EventQueue * next;
-  ::java::awt::EventQueue * prev;
-  ::java::awt::AWTEvent * currentEvent;
-  jlong lastWhen;
-  ::java::awt::EventDispatchThread * dispatchThread;
-  jboolean nativeLoopRunning;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_EventQueue__
diff --git a/libjava/java/awt/FileDialog.h b/libjava/java/awt/FileDialog.h
deleted file mode 100644
index b64300df00d..00000000000
--- a/libjava/java/awt/FileDialog.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_FileDialog__
-#define __java_awt_FileDialog__
-
-#pragma interface
-
-#include <java/awt/Dialog.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dialog;
-        class FileDialog;
-        class Frame;
-    }
-  }
-}
-
-class java::awt::FileDialog : public ::java::awt::Dialog
-{
-
-public:
-  FileDialog(::java::awt::Dialog *);
-  FileDialog(::java::awt::Dialog *, ::java::lang::String *);
-  FileDialog(::java::awt::Dialog *, ::java::lang::String *, jint);
-  FileDialog(::java::awt::Frame *);
-  FileDialog(::java::awt::Frame *, ::java::lang::String *);
-  FileDialog(::java::awt::Frame *, ::java::lang::String *, jint);
-  virtual jint getMode();
-  virtual void setMode(jint);
-  virtual ::java::lang::String * getDirectory();
-  virtual void setDirectory(::java::lang::String *);
-  virtual ::java::lang::String * getFile();
-  virtual void setFile(::java::lang::String *);
-  virtual ::java::io::FilenameFilter * getFilenameFilter();
-  virtual void setFilenameFilter(::java::io::FilenameFilter *);
-  virtual void addNotify();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  static const jint LOAD = 0;
-  static const jint SAVE = 1;
-private:
-  static const jlong serialVersionUID = 5035145889651310422LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::Dialog)))) dir;
-  ::java::lang::String * file;
-  ::java::io::FilenameFilter * filter;
-  jint mode;
-  static jlong next_file_dialog_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_FileDialog__
diff --git a/libjava/java/awt/FlowLayout.h b/libjava/java/awt/FlowLayout.h
deleted file mode 100644
index 202fe18bb4a..00000000000
--- a/libjava/java/awt/FlowLayout.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_FlowLayout__
-#define __java_awt_FlowLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class FlowLayout;
-    }
-  }
-}
-
-class java::awt::FlowLayout : public ::java::lang::Object
-{
-
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual jint getAlignment();
-  virtual jint getHgap();
-  virtual jint getVgap();
-  FlowLayout();
-  FlowLayout(jint);
-  FlowLayout(jint, jint, jint);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void setAlignment(jint);
-  virtual void setHgap(jint);
-  virtual void setVgap(jint);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::awt::Dimension * getSize(::java::awt::Container *, jboolean);
-public:
-  static const jint LEFT = 0;
-  static const jint CENTER = 1;
-  static const jint RIGHT = 2;
-  static const jint LEADING = 3;
-  static const jint TRAILING = 4;
-private:
-  static const jlong serialVersionUID = -7262534875583282631LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) align;
-  jint hgap;
-  jint vgap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_FlowLayout__
diff --git a/libjava/java/awt/FocusTraversalPolicy.h b/libjava/java/awt/FocusTraversalPolicy.h
deleted file mode 100644
index f4add235fca..00000000000
--- a/libjava/java/awt/FocusTraversalPolicy.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_FocusTraversalPolicy__
-#define __java_awt_FocusTraversalPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class FocusTraversalPolicy;
-        class Window;
-    }
-  }
-}
-
-class java::awt::FocusTraversalPolicy : public ::java::lang::Object
-{
-
-public:
-  FocusTraversalPolicy();
-  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *) = 0;
-  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *) = 0;
-  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *) = 0;
-  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *) = 0;
-  virtual ::java::awt::Component * getDefaultComponent(::java::awt::Container *) = 0;
-  virtual ::java::awt::Component * getInitialComponent(::java::awt::Window *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_FocusTraversalPolicy__
diff --git a/libjava/java/awt/Font.h b/libjava/java/awt/Font.h
deleted file mode 100644
index 07c651f5837..00000000000
--- a/libjava/java/awt/Font.h
+++ /dev/null
@@ -1,153 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Font__
-#define __java_awt_Font__
-
-#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;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphVector;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace peer
-      {
-          class FontPeer;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator$Attribute;
-        class CharacterIterator;
-    }
-  }
-}
-
-class java::awt::Font : public ::java::lang::Object
-{
-
-public:
-  static ::java::awt::Font * decode(::java::lang::String *);
-public: // actually package-private
-  static ::gnu::java::awt::ClasspathToolkit * tk();
-  static ::java::awt::Font * getFontFromToolkit(::java::lang::String *, ::java::util::Map *);
-  static ::gnu::java::awt::peer::ClasspathFontPeer * getPeerFromToolkit(::java::lang::String *, ::java::util::Map *);
-public:
-  static ::java::awt::Font * getFont(::java::lang::String *, ::java::awt::Font *);
-  static ::java::awt::Font * getFont(::java::lang::String *);
-  Font(::java::lang::String *, jint, jint);
-  Font(::java::util::Map *);
-public: // actually package-private
-  Font(::java::lang::String *, ::java::util::Map *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual jint getSize();
-  virtual jfloat getSize2D();
-  virtual jboolean isPlain();
-  virtual jboolean isBold();
-  virtual jboolean isItalic();
-  virtual ::java::lang::String * getFamily();
-  virtual jint getStyle();
-  virtual jboolean canDisplay(jchar);
-  virtual jint canDisplayUpTo(::java::lang::String *);
-  virtual jint canDisplayUpTo(JArray< jchar > *, jint, jint);
-  virtual jint canDisplayUpTo(::java::text::CharacterIterator *, jint, jint);
-  static ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
-  static ::java::awt::Font * createFont(jint, ::java::io::File *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::font::FontRenderContext *, ::java::lang::String *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::font::FontRenderContext *, JArray< jchar > *);
-  virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::font::FontRenderContext *, JArray< jint > *);
-  virtual ::java::awt::Font * deriveFont(jint, jfloat);
-  virtual ::java::awt::Font * deriveFont(jfloat);
-  virtual ::java::awt::Font * deriveFont(jint);
-  virtual ::java::awt::Font * deriveFont(jint, ::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::Font * deriveFont(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::Font * deriveFont(::java::util::Map *);
-  virtual ::java::util::Map * getAttributes();
-  virtual JArray< ::java::text::AttributedCharacterIterator$Attribute * > * getAvailableAttributes();
-  virtual jbyte getBaselineFor(jchar);
-  virtual ::java::lang::String * getFamily(::java::util::Locale *);
-  static ::java::awt::Font * getFont(::java::util::Map *);
-  virtual ::java::lang::String * getFontName();
-  virtual ::java::lang::String * getFontName(::java::util::Locale *);
-  virtual jfloat getItalicAngle();
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::lang::String *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(JArray< jchar > *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::font::FontRenderContext *);
-  virtual jint getMissingGlyphCode();
-  virtual jint getNumGlyphs();
-  virtual ::java::lang::String * getPSName();
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(JArray< jchar > *, jint, jint, ::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual jboolean hasUniformLineMetrics();
-  virtual jboolean isTransformed();
-  virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
-  virtual ::java::awt::peer::FontPeer * getPeer();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::lang::String *, ::java::awt::font::FontRenderContext *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  static const jint PLAIN = 0;
-  static const jint BOLD = 1;
-  static const jint ITALIC = 2;
-  static const jint ROMAN_BASELINE = 0;
-  static const jint CENTER_BASELINE = 1;
-  static const jint HANGING_BASELINE = 2;
-  static const jint TRUETYPE_FONT = 0;
-  static const jint TYPE1_FONT = 1;
-  static const jint LAYOUT_LEFT_TO_RIGHT = 0;
-  static const jint LAYOUT_RIGHT_TO_LEFT = 1;
-  static const jint LAYOUT_NO_START_CONTEXT = 2;
-  static const jint LAYOUT_NO_LIMIT_CONTEXT = 4;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jint size;
-  jfloat pointSize;
-  jint style;
-private:
-  static const jlong serialVersionUID = -4206021311591459213LL;
-  ::gnu::java::awt::peer::ClasspathFontPeer * peer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Font__
diff --git a/libjava/java/awt/FontFormatException.h b/libjava/java/awt/FontFormatException.h
deleted file mode 100644
index 9d9ffec9dd5..00000000000
--- a/libjava/java/awt/FontFormatException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_FontFormatException__
-#define __java_awt_FontFormatException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class FontFormatException;
-    }
-  }
-}
-
-class java::awt::FontFormatException : public ::java::lang::Exception
-{
-
-public:
-  FontFormatException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4481290147811361272LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_FontFormatException__
diff --git a/libjava/java/awt/FontMetrics.h b/libjava/java/awt/FontMetrics.h
deleted file mode 100644
index 67d8b6b4f39..00000000000
--- a/libjava/java/awt/FontMetrics.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_FontMetrics__
-#define __java_awt_FontMetrics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class FontMetrics;
-        class Graphics;
-      namespace font
-      {
-          class FontRenderContext;
-          class LineMetrics;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class java::awt::FontMetrics : public ::java::lang::Object
-{
-
-public: // actually protected
-  FontMetrics(::java::awt::Font *);
-public:
-  virtual ::java::awt::Font * getFont();
-  virtual jint getLeading();
-  virtual jint getAscent();
-  virtual jint getDescent();
-  virtual jint getHeight();
-  virtual jint getMaxAscent();
-  virtual jint getMaxDescent();
-  virtual jint getMaxDecent();
-  virtual jint getMaxAdvance();
-  virtual jint charWidth(jint);
-  virtual jint charWidth(jchar);
-  virtual jint stringWidth(::java::lang::String *);
-  virtual jint charsWidth(JArray< jchar > *, jint, jint);
-  virtual jint bytesWidth(JArray< jbyte > *, jint, jint);
-  virtual JArray< jint > * getWidths();
-  virtual ::java::lang::String * toString();
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::lang::String *, ::java::awt::Graphics *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::lang::String *, jint, jint, ::java::awt::Graphics *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(JArray< jchar > *, jint, jint, ::java::awt::Graphics *);
-  virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Graphics *);
-  virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::text::CharacterIterator *, jint, jint, ::java::awt::Graphics *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *, ::java::awt::Graphics *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *, jint, jint, ::java::awt::Graphics *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(JArray< jchar > *, jint, jint, ::java::awt::Graphics *);
-  virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::text::CharacterIterator *, jint, jint, ::java::awt::Graphics *);
-private:
-  ::java::awt::font::FontRenderContext * getFontRenderContext(::java::awt::Graphics *);
-public:
-  virtual jboolean hasUniformLineMetrics();
-private:
-  static const jlong serialVersionUID = 1681126225205050147LL;
-public: // actually protected
-  ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::lang::Object)))) font;
-private:
-  static ::java::awt::font::FontRenderContext * gRC;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_FontMetrics__
diff --git a/libjava/java/awt/Frame$AccessibleAWTFrame.h b/libjava/java/awt/Frame$AccessibleAWTFrame.h
deleted file mode 100644
index 62ed120a93a..00000000000
--- a/libjava/java/awt/Frame$AccessibleAWTFrame.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Frame$AccessibleAWTFrame__
-#define __java_awt_Frame$AccessibleAWTFrame__
-
-#pragma interface
-
-#include <java/awt/Window$AccessibleAWTWindow.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Frame;
-        class Frame$AccessibleAWTFrame;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::Frame$AccessibleAWTFrame : public ::java::awt::Window$AccessibleAWTWindow
-{
-
-public: // actually protected
-  Frame$AccessibleAWTFrame(::java::awt::Frame *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = -6172960752956030250LL;
-public: // actually package-private
-  ::java::awt::Frame * __attribute__((aligned(__alignof__( ::java::awt::Window$AccessibleAWTWindow)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Frame$AccessibleAWTFrame__
diff --git a/libjava/java/awt/Frame.h b/libjava/java/awt/Frame.h
deleted file mode 100644
index ffbf38d2af8..00000000000
--- a/libjava/java/awt/Frame.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Frame__
-#define __java_awt_Frame__
-
-#pragma interface
-
-#include <java/awt/Window.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Frame;
-        class GraphicsConfiguration;
-        class Image;
-        class MenuBar;
-        class MenuComponent;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Frame : public ::java::awt::Window
-{
-
-public:
-  Frame();
-  Frame(::java::lang::String *);
-  Frame(::java::awt::GraphicsConfiguration *);
-  Frame(::java::lang::String *, ::java::awt::GraphicsConfiguration *);
-  virtual ::java::lang::String * getTitle();
-  virtual void setTitle(::java::lang::String *);
-  virtual ::java::awt::Image * getIconImage();
-  virtual void setIconImage(::java::awt::Image *);
-  virtual ::java::awt::MenuBar * getMenuBar();
-  virtual void setMenuBar(::java::awt::MenuBar *);
-  virtual jboolean isResizable();
-  virtual void setResizable(jboolean);
-  virtual jint getCursorType();
-  virtual void setCursor(jint);
-  virtual void remove(::java::awt::MenuComponent *);
-  virtual void addNotify();
-  virtual void removeNotify();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-private:
-  static void noteFrame(::java::awt::Frame *);
-public:
-  static JArray< ::java::awt::Frame * > * getFrames();
-  virtual void setState(jint);
-  virtual jint getState();
-  virtual void setExtendedState(jint);
-  virtual jint getExtendedState();
-  virtual void setMaximizedBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * getMaximizedBounds();
-  virtual jboolean isUndecorated();
-  virtual void setUndecorated(jboolean);
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  static const jint DEFAULT_CURSOR = 0;
-  static const jint CROSSHAIR_CURSOR = 1;
-  static const jint TEXT_CURSOR = 2;
-  static const jint WAIT_CURSOR = 3;
-  static const jint SW_RESIZE_CURSOR = 4;
-  static const jint SE_RESIZE_CURSOR = 5;
-  static const jint NW_RESIZE_CURSOR = 6;
-  static const jint NE_RESIZE_CURSOR = 7;
-  static const jint N_RESIZE_CURSOR = 8;
-  static const jint S_RESIZE_CURSOR = 9;
-  static const jint E_RESIZE_CURSOR = 11;
-  static const jint W_RESIZE_CURSOR = 10;
-  static const jint HAND_CURSOR = 12;
-  static const jint MOVE_CURSOR = 13;
-  static const jint ICONIFIED = 1;
-  static const jint MAXIMIZED_BOTH = 6;
-  static const jint MAXIMIZED_HORIZ = 2;
-  static const jint MAXIMIZED_VERT = 4;
-  static const jint NORMAL = 0;
-private:
-  static const jlong serialVersionUID = 2673458971256075116LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::Window)))) frameSerializedDataVersion;
-  ::java::awt::Image * icon;
-  jboolean mbManagement;
-  ::java::awt::MenuBar * menuBar;
-public: // actually package-private
-  ::java::util::Vector * ownedWindows;
-private:
-  jboolean resizable;
-public: // actually package-private
-  jint state;
-private:
-  ::java::lang::String * title;
-  ::java::awt::Rectangle * maximizedBounds;
-  jboolean undecorated;
-  static jlong next_frame_number;
-  static ::java::util::ArrayList * weakFrames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Frame__
diff --git a/libjava/java/awt/GradientPaint.h b/libjava/java/awt/GradientPaint.h
deleted file mode 100644
index 075e139d669..00000000000
--- a/libjava/java/awt/GradientPaint.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GradientPaint__
-#define __java_awt_GradientPaint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class GradientPaint;
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::GradientPaint : public ::java::lang::Object
-{
-
-public:
-  GradientPaint(jfloat, jfloat, ::java::awt::Color *, jfloat, jfloat, ::java::awt::Color *);
-  GradientPaint(::java::awt::geom::Point2D *, ::java::awt::Color *, ::java::awt::geom::Point2D *, ::java::awt::Color *);
-  GradientPaint(jfloat, jfloat, ::java::awt::Color *, jfloat, jfloat, ::java::awt::Color *, jboolean);
-  GradientPaint(::java::awt::geom::Point2D *, ::java::awt::Color *, ::java::awt::geom::Point2D *, ::java::awt::Color *, jboolean);
-  virtual ::java::awt::geom::Point2D * getPoint1();
-  virtual ::java::awt::Color * getColor1();
-  virtual ::java::awt::geom::Point2D * getPoint2();
-  virtual ::java::awt::Color * getColor2();
-  virtual jboolean isCyclic();
-  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();
-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;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GradientPaint__
diff --git a/libjava/java/awt/Graphics.h b/libjava/java/awt/Graphics.h
deleted file mode 100644
index 504b30ec571..00000000000
--- a/libjava/java/awt/Graphics.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Graphics__
-#define __java_awt_Graphics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Image;
-        class Polygon;
-        class Rectangle;
-        class Shape;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class java::awt::Graphics : public ::java::lang::Object
-{
-
-public: // actually protected
-  Graphics();
-public:
-  virtual ::java::awt::Graphics * create() = 0;
-  virtual ::java::awt::Graphics * create(jint, jint, jint, jint);
-  virtual void translate(jint, jint) = 0;
-  virtual ::java::awt::Color * getColor() = 0;
-  virtual void setColor(::java::awt::Color *) = 0;
-  virtual void setPaintMode() = 0;
-  virtual void setXORMode(::java::awt::Color *) = 0;
-  virtual ::java::awt::Font * getFont() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual ::java::awt::Rectangle * getClipBounds() = 0;
-  virtual ::java::awt::Rectangle * getClipRect();
-  virtual void clipRect(jint, jint, jint, jint) = 0;
-  virtual void setClip(jint, jint, jint, jint) = 0;
-  virtual ::java::awt::Shape * getClip() = 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 fillRect(jint, jint, jint, jint) = 0;
-  virtual void drawRect(jint, jint, jint, jint);
-  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 draw3DRect(jint, jint, jint, jint, jboolean);
-  virtual void fill3DRect(jint, jint, jint, jint, jboolean);
-  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 drawPolygon(::java::awt::Polygon *);
-  virtual void fillPolygon(JArray< jint > *, JArray< jint > *, jint) = 0;
-  virtual void fillPolygon(::java::awt::Polygon *);
-  virtual void drawString(::java::lang::String *, jint, jint) = 0;
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint) = 0;
-  virtual void drawChars(JArray< jchar > *, jint, jint, jint, jint);
-  virtual void drawBytes(JArray< jbyte > *, jint, jint, jint, jint);
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::image::ImageObserver *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, jint, jint, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::image::ImageObserver *) = 0;
-  virtual void dispose() = 0;
-  virtual void finalize();
-  virtual ::java::lang::String * toString();
-  virtual jboolean hitClip(jint, jint, jint, jint);
-  virtual ::java::awt::Rectangle * getClipBounds(::java::awt::Rectangle *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Graphics__
diff --git a/libjava/java/awt/Graphics2D.h b/libjava/java/awt/Graphics2D.h
deleted file mode 100644
index 9815434cfc1..00000000000
--- a/libjava/java/awt/Graphics2D.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Graphics2D__
-#define __java_awt_Graphics2D__
-
-#pragma interface
-
-#include <java/awt/Graphics.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Composite;
-        class Graphics2D;
-        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 java::awt::Graphics2D : public ::java::awt::Graphics
-{
-
-public: // actually protected
-  Graphics2D();
-public:
-  virtual void draw3DRect(jint, jint, jint, jint, jboolean);
-  virtual void fill3DRect(jint, jint, jint, jint, jboolean);
-  virtual void draw(::java::awt::Shape *) = 0;
-  virtual jboolean drawImage(::java::awt::Image *, ::java::awt::geom::AffineTransform *, ::java::awt::image::ImageObserver *) = 0;
-  virtual void drawImage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImageOp *, jint, jint) = 0;
-  virtual void drawRenderedImage(::java::awt::image::RenderedImage *, ::java::awt::geom::AffineTransform *) = 0;
-  virtual void drawRenderableImage(::java::awt::image::renderable::RenderableImage *, ::java::awt::geom::AffineTransform *) = 0;
-  virtual void drawString(::java::lang::String *, jint, jint) = 0;
-  virtual void drawString(::java::lang::String *, jfloat, jfloat) = 0;
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint) = 0;
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jfloat, jfloat) = 0;
-  virtual void fill(::java::awt::Shape *) = 0;
-  virtual jboolean hit(::java::awt::Rectangle *, ::java::awt::Shape *, jboolean) = 0;
-  virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration() = 0;
-  virtual void setComposite(::java::awt::Composite *) = 0;
-  virtual void setPaint(::java::awt::Paint *) = 0;
-  virtual void setStroke(::java::awt::Stroke *) = 0;
-  virtual void setRenderingHint(::java::awt::RenderingHints$Key *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getRenderingHint(::java::awt::RenderingHints$Key *) = 0;
-  virtual void setRenderingHints(::java::util::Map *) = 0;
-  virtual void addRenderingHints(::java::util::Map *) = 0;
-  virtual ::java::awt::RenderingHints * getRenderingHints() = 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 void transform(::java::awt::geom::AffineTransform *) = 0;
-  virtual void setTransform(::java::awt::geom::AffineTransform *) = 0;
-  virtual ::java::awt::geom::AffineTransform * getTransform() = 0;
-  virtual ::java::awt::Paint * getPaint() = 0;
-  virtual ::java::awt::Composite * getComposite() = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual ::java::awt::Color * getBackground() = 0;
-  virtual ::java::awt::Stroke * getStroke() = 0;
-  virtual void clip(::java::awt::Shape *) = 0;
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext() = 0;
-  virtual void drawGlyphVector(::java::awt::font::GlyphVector *, jfloat, jfloat) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Graphics2D__
diff --git a/libjava/java/awt/GraphicsConfigTemplate.h b/libjava/java/awt/GraphicsConfigTemplate.h
deleted file mode 100644
index 53bbece33be..00000000000
--- a/libjava/java/awt/GraphicsConfigTemplate.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GraphicsConfigTemplate__
-#define __java_awt_GraphicsConfigTemplate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfigTemplate;
-        class GraphicsConfiguration;
-    }
-  }
-}
-
-class java::awt::GraphicsConfigTemplate : public ::java::lang::Object
-{
-
-public:
-  GraphicsConfigTemplate();
-  virtual ::java::awt::GraphicsConfiguration * getBestConfiguration(JArray< ::java::awt::GraphicsConfiguration * > *) = 0;
-  virtual jboolean isGraphicsConfigSupported(::java::awt::GraphicsConfiguration *) = 0;
-private:
-  static const jlong serialVersionUID = -8061369279557787079LL;
-public:
-  static const jint REQUIRED = 1;
-  static const jint PREFERRED = 2;
-  static const jint UNNECESSARY = 3;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GraphicsConfigTemplate__
diff --git a/libjava/java/awt/GraphicsConfiguration.h b/libjava/java/awt/GraphicsConfiguration.h
deleted file mode 100644
index 58c91221d0d..00000000000
--- a/libjava/java/awt/GraphicsConfiguration.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GraphicsConfiguration__
-#define __java_awt_GraphicsConfiguration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class GraphicsConfiguration;
-        class GraphicsDevice;
-        class ImageCapabilities;
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class java::awt::GraphicsConfiguration : public ::java::lang::Object
-{
-
-public: // actually protected
-  GraphicsConfiguration();
-public:
-  virtual ::java::awt::GraphicsDevice * getDevice() = 0;
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint) = 0;
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint) = 0;
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
-  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, jint) = 0;
-  virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint, jint) = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel(jint) = 0;
-  virtual ::java::awt::geom::AffineTransform * getDefaultTransform() = 0;
-  virtual ::java::awt::geom::AffineTransform * getNormalizingTransform() = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual ::java::awt::BufferCapabilities * getBufferCapabilities();
-  virtual ::java::awt::ImageCapabilities * getImageCapabilities();
-private:
-  ::java::awt::ImageCapabilities * __attribute__((aligned(__alignof__( ::java::lang::Object)))) imageCapabilities;
-  ::java::awt::BufferCapabilities * bufferCapabilities;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GraphicsConfiguration__
diff --git a/libjava/java/awt/GraphicsDevice.h b/libjava/java/awt/GraphicsDevice.h
deleted file mode 100644
index a10d93d8674..00000000000
--- a/libjava/java/awt/GraphicsDevice.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GraphicsDevice__
-#define __java_awt_GraphicsDevice__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class DisplayMode;
-        class GraphicsConfigTemplate;
-        class GraphicsConfiguration;
-        class GraphicsDevice;
-        class Rectangle;
-        class Window;
-    }
-  }
-}
-
-class java::awt::GraphicsDevice : public ::java::lang::Object
-{
-
-public: // actually protected
-  GraphicsDevice();
-public:
-  virtual jint getType() = 0;
-  virtual ::java::lang::String * getIDstring() = 0;
-  virtual JArray< ::java::awt::GraphicsConfiguration * > * getConfigurations() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getDefaultConfiguration() = 0;
-  virtual ::java::awt::GraphicsConfiguration * getBestConfiguration(::java::awt::GraphicsConfigTemplate *);
-  virtual jboolean isFullScreenSupported();
-  virtual void setFullScreenWindow(::java::awt::Window *);
-  virtual ::java::awt::Window * getFullScreenWindow();
-  virtual jboolean isDisplayChangeSupported();
-  virtual void setDisplayMode(::java::awt::DisplayMode *);
-  virtual ::java::awt::DisplayMode * getDisplayMode();
-  virtual JArray< ::java::awt::DisplayMode * > * getDisplayModes();
-  virtual jint getAvailableAcceleratedMemory();
-  static const jint TYPE_RASTER_SCREEN = 0;
-  static const jint TYPE_PRINTER = 1;
-  static const jint TYPE_IMAGE_BUFFER = 2;
-private:
-  ::java::awt::Window * __attribute__((aligned(__alignof__( ::java::lang::Object)))) full_screen;
-  ::java::awt::Rectangle * fullScreenOldBounds;
-  ::java::awt::DisplayMode * mode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GraphicsDevice__
diff --git a/libjava/java/awt/GraphicsEnvironment.h b/libjava/java/awt/GraphicsEnvironment.h
deleted file mode 100644
index 398e295bfca..00000000000
--- a/libjava/java/awt/GraphicsEnvironment.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GraphicsEnvironment__
-#define __java_awt_GraphicsEnvironment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class GraphicsDevice;
-        class GraphicsEnvironment;
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-}
-
-class java::awt::GraphicsEnvironment : public ::java::lang::Object
-{
-
-public: // actually protected
-  GraphicsEnvironment();
-public:
-  static ::java::awt::GraphicsEnvironment * getLocalGraphicsEnvironment();
-  static jboolean isHeadless();
-  virtual jboolean isHeadlessInstance();
-  virtual JArray< ::java::awt::GraphicsDevice * > * getScreenDevices() = 0;
-  virtual ::java::awt::GraphicsDevice * getDefaultScreenDevice() = 0;
-  virtual ::java::awt::Graphics2D * createGraphics(::java::awt::image::BufferedImage *) = 0;
-  virtual JArray< ::java::awt::Font * > * getAllFonts() = 0;
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames() = 0;
-  virtual JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *) = 0;
-  virtual ::java::awt::Point * getCenterPoint();
-  virtual ::java::awt::Rectangle * getMaximumWindowBounds();
-private:
-  static ::java::awt::GraphicsEnvironment * localGraphicsEnvironment;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GraphicsEnvironment__
diff --git a/libjava/java/awt/GridBagConstraints.h b/libjava/java/awt/GridBagConstraints.h
deleted file mode 100644
index 95d359e1946..00000000000
--- a/libjava/java/awt/GridBagConstraints.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GridBagConstraints__
-#define __java_awt_GridBagConstraints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GridBagConstraints;
-        class Insets;
-    }
-  }
-}
-
-class java::awt::GridBagConstraints : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone();
-  GridBagConstraints();
-  GridBagConstraints(jint, jint, jint, jint, jdouble, jdouble, jint, jint, ::java::awt::Insets *, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = -1000070633030801713LL;
-public:
-  static const jint NONE = 0;
-  static const jint BOTH = 1;
-  static const jint HORIZONTAL = 2;
-  static const jint VERTICAL = 3;
-  static const jint CENTER = 10;
-  static const jint NORTH = 11;
-  static const jint NORTHEAST = 12;
-  static const jint EAST = 13;
-  static const jint SOUTHEAST = 14;
-  static const jint SOUTH = 15;
-  static const jint SOUTHWEST = 16;
-  static const jint WEST = 17;
-  static const jint NORTHWEST = 18;
-  static const jint RELATIVE = -1;
-  static const jint REMAINDER = 0;
-  static const jint PAGE_START = 19;
-  static const jint PAGE_END = 20;
-  static const jint LINE_START = 21;
-  static const jint LINE_END = 22;
-  static const jint FIRST_LINE_START = 23;
-  static const jint FIRST_LINE_END = 24;
-  static const jint LAST_LINE_START = 25;
-  static const jint LAST_LINE_END = 26;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) anchor;
-  jint fill;
-  jint gridheight;
-  jint gridwidth;
-  jint gridx;
-  jint gridy;
-  ::java::awt::Insets * insets;
-  jint ipadx;
-  jint ipady;
-  jdouble weightx;
-  jdouble weighty;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GridBagConstraints__
diff --git a/libjava/java/awt/GridBagLayout.h b/libjava/java/awt/GridBagLayout.h
deleted file mode 100644
index b553aff4eb3..00000000000
--- a/libjava/java/awt/GridBagLayout.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GridBagLayout__
-#define __java_awt_GridBagLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class GridBagConstraints;
-        class GridBagLayout;
-        class GridBagLayoutInfo;
-        class Point;
-        class Rectangle;
-    }
-  }
-}
-
-class java::awt::GridBagLayout : public ::java::lang::Object
-{
-
-public:
-  GridBagLayout();
-private:
-  jint sumIntArray(JArray< jint > *, jint);
-  jint sumIntArray(JArray< jint > *);
-  jdouble sumDoubleArray(JArray< jdouble > *);
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void setConstraints(::java::awt::Component *, ::java::awt::GridBagConstraints *);
-  virtual ::java::awt::GridBagConstraints * getConstraints(::java::awt::Component *);
-public: // actually protected
-  virtual ::java::awt::GridBagConstraints * lookupConstraints(::java::awt::Component *);
-private:
-  ::java::awt::GridBagConstraints * lookupInternalConstraints(::java::awt::Component *);
-public:
-  virtual ::java::awt::Point * getLayoutOrigin();
-  virtual JArray< JArray< jint > * > * getLayoutDimensions();
-  virtual JArray< JArray< jdouble > * > * getLayoutWeights();
-  virtual ::java::awt::Point * location(jint, jint);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual void AdjustForGravity(::java::awt::GridBagConstraints *, ::java::awt::Rectangle *);
-  virtual void ArrangeGrid(::java::awt::Container *);
-  virtual ::java::awt::GridBagLayoutInfo * GetLayoutInfo(::java::awt::Container *, jint);
-  virtual ::java::awt::Dimension * GetMinSize(::java::awt::Container *, ::java::awt::GridBagLayoutInfo *);
-  virtual ::java::awt::Dimension * getMinSize(::java::awt::Container *, ::java::awt::GridBagLayoutInfo *);
-private:
-  void sortBySpan(::java::awt::Component *, jint, ::java::util::ArrayList *, jboolean);
-  void distributeSizeAndWeight(jint, jdouble, jint, jint, JArray< jint > *, JArray< jdouble > *);
-  void calcCellWeights(jdouble, JArray< jdouble > *, jint, jint);
-  void calcCellSizes(JArray< jint > *, JArray< jdouble > *, jint);
-  void dumpLayoutInfo(::java::awt::GridBagLayoutInfo *);
-  void dumpArray(JArray< jint > *);
-  void dumpArray(JArray< jdouble > *);
-public: // actually protected
-  virtual void arrangeGrid(::java::awt::Container *);
-  virtual ::java::awt::GridBagLayoutInfo * getLayoutInfo(::java::awt::Container *, jint);
-  virtual void adjustForGravity(::java::awt::GridBagConstraints *, ::java::awt::Rectangle *);
-private:
-  static const jlong serialVersionUID = 8838754796412211005LL;
-public: // actually protected
-  static const jint MINSIZE = 1;
-  static const jint PREFERREDSIZE = 2;
-  static const jint MAXGRIDSIZE = 512;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) comptable;
-private:
-  ::java::util::Hashtable * internalcomptable;
-public: // actually protected
-  ::java::awt::GridBagLayoutInfo * layoutInfo;
-  ::java::awt::GridBagConstraints * defaultConstraints;
-public:
-  JArray< jdouble > * columnWeights;
-  JArray< jint > * columnWidths;
-  JArray< jdouble > * rowWeights;
-  JArray< jint > * rowHeights;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GridBagLayout__
diff --git a/libjava/java/awt/GridBagLayoutInfo.h b/libjava/java/awt/GridBagLayoutInfo.h
deleted file mode 100644
index b83497ff9fe..00000000000
--- a/libjava/java/awt/GridBagLayoutInfo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GridBagLayoutInfo__
-#define __java_awt_GridBagLayoutInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GridBagLayoutInfo;
-    }
-  }
-}
-
-class java::awt::GridBagLayoutInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GridBagLayoutInfo(jint, jint);
-private:
-  static const jlong serialVersionUID = -4899416460737170217LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) pos_x;
-  jint pos_y;
-  jint cols;
-  jint rows;
-  JArray< jint > * colWidths;
-  JArray< jint > * rowHeights;
-  JArray< jdouble > * colWeights;
-  JArray< jdouble > * rowWeights;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GridBagLayoutInfo__
diff --git a/libjava/java/awt/GridLayout.h b/libjava/java/awt/GridLayout.h
deleted file mode 100644
index 84b01a27c7b..00000000000
--- a/libjava/java/awt/GridLayout.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_GridLayout__
-#define __java_awt_GridLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class GridLayout;
-    }
-  }
-}
-
-class java::awt::GridLayout : public ::java::lang::Object
-{
-
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual jint getColumns();
-  virtual jint getHgap();
-  virtual jint getRows();
-  virtual jint getVgap();
-  GridLayout();
-  GridLayout(jint, jint);
-  GridLayout(jint, jint, jint, jint);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void setColumns(jint);
-  virtual void setHgap(jint);
-  virtual void setRows(jint);
-  virtual void setVgap(jint);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::awt::Dimension * getSize(::java::awt::Container *, jboolean);
-public: // actually package-private
-  static const jlong serialVersionUID = -7411804673224730901LL;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) cols;
-  jint rows;
-  jint hgap;
-  jint vgap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_GridLayout__
diff --git a/libjava/java/awt/HeadlessException.h b/libjava/java/awt/HeadlessException.h
deleted file mode 100644
index f57ea63fb91..00000000000
--- a/libjava/java/awt/HeadlessException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_HeadlessException__
-#define __java_awt_HeadlessException__
-
-#pragma interface
-
-#include <java/lang/UnsupportedOperationException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class HeadlessException;
-    }
-  }
-}
-
-class java::awt::HeadlessException : public ::java::lang::UnsupportedOperationException
-{
-
-public:
-  HeadlessException();
-  HeadlessException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 167183644944358563LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_HeadlessException__
diff --git a/libjava/java/awt/IllegalComponentStateException.h b/libjava/java/awt/IllegalComponentStateException.h
deleted file mode 100644
index 9743e59f05a..00000000000
--- a/libjava/java/awt/IllegalComponentStateException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_IllegalComponentStateException__
-#define __java_awt_IllegalComponentStateException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class IllegalComponentStateException;
-    }
-  }
-}
-
-class java::awt::IllegalComponentStateException : public ::java::lang::IllegalStateException
-{
-
-public:
-  IllegalComponentStateException();
-  IllegalComponentStateException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1889339587208144238LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_IllegalComponentStateException__
diff --git a/libjava/java/awt/Image.h b/libjava/java/awt/Image.h
deleted file mode 100644
index d49664a2238..00000000000
--- a/libjava/java/awt/Image.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Image__
-#define __java_awt_Image__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Image;
-      namespace image
-      {
-          class ImageObserver;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::Image : public ::java::lang::Object
-{
-
-public:
-  Image();
-  virtual jint getWidth(::java::awt::image::ImageObserver *) = 0;
-  virtual jint getHeight(::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::image::ImageProducer * getSource() = 0;
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *) = 0;
-  virtual ::java::awt::Image * getScaledInstance(jint, jint, jint);
-  virtual void flush() = 0;
-  virtual void setAccelerationPriority(jfloat);
-  virtual jfloat getAccelerationPriority();
-  static ::java::lang::Object * UndefinedProperty;
-  static const jint SCALE_DEFAULT = 1;
-  static const jint SCALE_FAST = 2;
-  static const jint SCALE_SMOOTH = 4;
-  static const jint SCALE_REPLICATE = 8;
-  static const jint SCALE_AREA_AVERAGING = 16;
-public: // actually protected
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) accelerationPriority;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Image__
diff --git a/libjava/java/awt/ImageCapabilities.h b/libjava/java/awt/ImageCapabilities.h
deleted file mode 100644
index 8a245f39069..00000000000
--- a/libjava/java/awt/ImageCapabilities.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ImageCapabilities__
-#define __java_awt_ImageCapabilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ImageCapabilities;
-    }
-  }
-}
-
-class java::awt::ImageCapabilities : public ::java::lang::Object
-{
-
-public:
-  ImageCapabilities(jboolean);
-  virtual jboolean isAccelerated();
-  virtual jboolean isTrueVolatile();
-  virtual ::java::lang::Object * clone();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) accelerated;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ImageCapabilities__
diff --git a/libjava/java/awt/Insets.h b/libjava/java/awt/Insets.h
deleted file mode 100644
index 14d70fed5c6..00000000000
--- a/libjava/java/awt/Insets.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Insets__
-#define __java_awt_Insets__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Insets;
-    }
-  }
-}
-
-class java::awt::Insets : public ::java::lang::Object
-{
-
-public:
-  Insets(jint, jint, jint, jint);
-  virtual void set(jint, jint, jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::Object * clone();
-private:
-  static const jlong serialVersionUID = -2272572637695466749LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) top;
-  jint left;
-  jint bottom;
-  jint right;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Insets__
diff --git a/libjava/java/awt/ItemSelectable.h b/libjava/java/awt/ItemSelectable.h
deleted file mode 100644
index 3ff72d344b1..00000000000
--- a/libjava/java/awt/ItemSelectable.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ItemSelectable__
-#define __java_awt_ItemSelectable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ItemSelectable;
-      namespace event
-      {
-          class ItemListener;
-      }
-    }
-  }
-}
-
-class java::awt::ItemSelectable : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects() = 0;
-  virtual void addItemListener(::java::awt::event::ItemListener *) = 0;
-  virtual void removeItemListener(::java::awt::event::ItemListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_ItemSelectable__
diff --git a/libjava/java/awt/JobAttributes$DefaultSelectionType.h b/libjava/java/awt/JobAttributes$DefaultSelectionType.h
deleted file mode 100644
index 34779779d67..00000000000
--- a/libjava/java/awt/JobAttributes$DefaultSelectionType.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes$DefaultSelectionType__
-#define __java_awt_JobAttributes$DefaultSelectionType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes$DefaultSelectionType;
-    }
-  }
-}
-
-class java::awt::JobAttributes$DefaultSelectionType : public ::java::awt::AttributeValue
-{
-
-  JobAttributes$DefaultSelectionType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::JobAttributes$DefaultSelectionType * ALL;
-  static ::java::awt::JobAttributes$DefaultSelectionType * RANGE;
-  static ::java::awt::JobAttributes$DefaultSelectionType * SELECTION;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes$DefaultSelectionType__
diff --git a/libjava/java/awt/JobAttributes$DestinationType.h b/libjava/java/awt/JobAttributes$DestinationType.h
deleted file mode 100644
index 6c15bd59d97..00000000000
--- a/libjava/java/awt/JobAttributes$DestinationType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes$DestinationType__
-#define __java_awt_JobAttributes$DestinationType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes$DestinationType;
-    }
-  }
-}
-
-class java::awt::JobAttributes$DestinationType : public ::java::awt::AttributeValue
-{
-
-  JobAttributes$DestinationType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::JobAttributes$DestinationType * FILE;
-  static ::java::awt::JobAttributes$DestinationType * PRINTER;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes$DestinationType__
diff --git a/libjava/java/awt/JobAttributes$DialogType.h b/libjava/java/awt/JobAttributes$DialogType.h
deleted file mode 100644
index 77ae7916d8e..00000000000
--- a/libjava/java/awt/JobAttributes$DialogType.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes$DialogType__
-#define __java_awt_JobAttributes$DialogType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes$DialogType;
-    }
-  }
-}
-
-class java::awt::JobAttributes$DialogType : public ::java::awt::AttributeValue
-{
-
-  JobAttributes$DialogType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::JobAttributes$DialogType * COMMON;
-  static ::java::awt::JobAttributes$DialogType * NATIVE;
-  static ::java::awt::JobAttributes$DialogType * NONE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes$DialogType__
diff --git a/libjava/java/awt/JobAttributes$MultipleDocumentHandlingType.h b/libjava/java/awt/JobAttributes$MultipleDocumentHandlingType.h
deleted file mode 100644
index a4b13448fcb..00000000000
--- a/libjava/java/awt/JobAttributes$MultipleDocumentHandlingType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes$MultipleDocumentHandlingType__
-#define __java_awt_JobAttributes$MultipleDocumentHandlingType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes$MultipleDocumentHandlingType;
-    }
-  }
-}
-
-class java::awt::JobAttributes$MultipleDocumentHandlingType : public ::java::awt::AttributeValue
-{
-
-  JobAttributes$MultipleDocumentHandlingType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::JobAttributes$MultipleDocumentHandlingType * SEPARATE_DOCUMENTS_COLLATED_COPIES;
-  static ::java::awt::JobAttributes$MultipleDocumentHandlingType * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes$MultipleDocumentHandlingType__
diff --git a/libjava/java/awt/JobAttributes$SidesType.h b/libjava/java/awt/JobAttributes$SidesType.h
deleted file mode 100644
index 349c3c07729..00000000000
--- a/libjava/java/awt/JobAttributes$SidesType.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes$SidesType__
-#define __java_awt_JobAttributes$SidesType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes$SidesType;
-    }
-  }
-}
-
-class java::awt::JobAttributes$SidesType : public ::java::awt::AttributeValue
-{
-
-  JobAttributes$SidesType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::JobAttributes$SidesType * ONE_SIDED;
-  static ::java::awt::JobAttributes$SidesType * TWO_SIDED_LONG_EDGE;
-  static ::java::awt::JobAttributes$SidesType * TWO_SIDED_SHORT_EDGE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes$SidesType__
diff --git a/libjava/java/awt/JobAttributes.h b/libjava/java/awt/JobAttributes.h
deleted file mode 100644
index 400bbcfc5b2..00000000000
--- a/libjava/java/awt/JobAttributes.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_JobAttributes__
-#define __java_awt_JobAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class JobAttributes;
-        class JobAttributes$DefaultSelectionType;
-        class JobAttributes$DestinationType;
-        class JobAttributes$DialogType;
-        class JobAttributes$MultipleDocumentHandlingType;
-        class JobAttributes$SidesType;
-    }
-  }
-}
-
-class java::awt::JobAttributes : public ::java::lang::Object
-{
-
-public:
-  JobAttributes();
-  JobAttributes(::java::awt::JobAttributes *);
-  JobAttributes(jint, ::java::awt::JobAttributes$DefaultSelectionType *, ::java::awt::JobAttributes$DestinationType *, ::java::awt::JobAttributes$DialogType *, ::java::lang::String *, jint, jint, ::java::awt::JobAttributes$MultipleDocumentHandlingType *, JArray< JArray< jint > * > *, ::java::lang::String *, ::java::awt::JobAttributes$SidesType *);
-  ::java::lang::Object * clone();
-  void set(::java::awt::JobAttributes *);
-  jint getCopies();
-  void setCopies(jint);
-  void setCopiesToDefault();
-  ::java::awt::JobAttributes$DefaultSelectionType * getDefaultSelection();
-  void setDefaultSelection(::java::awt::JobAttributes$DefaultSelectionType *);
-  ::java::awt::JobAttributes$DestinationType * getDestination();
-  void setDestination(::java::awt::JobAttributes$DestinationType *);
-  ::java::awt::JobAttributes$DialogType * getDialog();
-  void setDialog(::java::awt::JobAttributes$DialogType *);
-  ::java::lang::String * getFileName();
-  void setFileName(::java::lang::String *);
-  jint getFromPage();
-  void setFromPage(jint);
-  jint getMaxPage();
-  void setMaxPage(jint);
-  jint getMinPage();
-  void setMinPage(jint);
-  ::java::awt::JobAttributes$MultipleDocumentHandlingType * getMultipleDocumentHandling();
-  void setMultipleDocumentHandling(::java::awt::JobAttributes$MultipleDocumentHandlingType *);
-  void setMultipleDocumentHandlingToDefault();
-  JArray< JArray< jint > * > * getPageRanges();
-  void setPageRanges(JArray< JArray< jint > * > *);
-  ::java::lang::String * getPrinter();
-  void setPrinter(::java::lang::String *);
-  ::java::awt::JobAttributes$SidesType * getSides();
-  void setSides(::java::awt::JobAttributes$SidesType *);
-  void setSidesToDefault();
-  jint getToPage();
-  void setToPage(jint);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) copies;
-  ::java::awt::JobAttributes$DefaultSelectionType * selection;
-  ::java::awt::JobAttributes$DestinationType * destination;
-  ::java::awt::JobAttributes$DialogType * dialog;
-  ::java::lang::String * filename;
-  jint maxPage;
-  jint minPage;
-  ::java::awt::JobAttributes$MultipleDocumentHandlingType * multiple;
-  JArray< JArray< jint > * > * pageRanges;
-  jint fromPage;
-  jint toPage;
-  ::java::lang::String * printer;
-  ::java::awt::JobAttributes$SidesType * sides;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_JobAttributes__
diff --git a/libjava/java/awt/KeyEventDispatcher.h b/libjava/java/awt/KeyEventDispatcher.h
deleted file mode 100644
index fdb3195d146..00000000000
--- a/libjava/java/awt/KeyEventDispatcher.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_KeyEventDispatcher__
-#define __java_awt_KeyEventDispatcher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class KeyEventDispatcher;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::KeyEventDispatcher : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean dispatchKeyEvent(::java::awt::event::KeyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_KeyEventDispatcher__
diff --git a/libjava/java/awt/KeyEventPostProcessor.h b/libjava/java/awt/KeyEventPostProcessor.h
deleted file mode 100644
index 806e1450b7c..00000000000
--- a/libjava/java/awt/KeyEventPostProcessor.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_KeyEventPostProcessor__
-#define __java_awt_KeyEventPostProcessor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class KeyEventPostProcessor;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::KeyEventPostProcessor : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean postProcessKeyEvent(::java::awt::event::KeyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_KeyEventPostProcessor__
diff --git a/libjava/java/awt/KeyboardFocusManager.h b/libjava/java/awt/KeyboardFocusManager.h
deleted file mode 100644
index 9fd045c460c..00000000000
--- a/libjava/java/awt/KeyboardFocusManager.h
+++ /dev/null
@@ -1,156 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_KeyboardFocusManager__
-#define __java_awt_KeyboardFocusManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-        class Container;
-        class FocusTraversalPolicy;
-        class KeyEventDispatcher;
-        class KeyEventPostProcessor;
-        class KeyboardFocusManager;
-        class Window;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-        class VetoableChangeListener;
-        class VetoableChangeSupport;
-    }
-  }
-}
-
-class java::awt::KeyboardFocusManager : public ::java::lang::Object
-{
-
-public:
-  KeyboardFocusManager();
-  static ::java::awt::KeyboardFocusManager * getCurrentKeyboardFocusManager();
-  static void setCurrentKeyboardFocusManager(::java::awt::KeyboardFocusManager *);
-  virtual ::java::awt::Component * getFocusOwner();
-public: // actually protected
-  virtual ::java::awt::Component * getGlobalFocusOwner();
-  virtual void setGlobalFocusOwner(::java::awt::Component *);
-public:
-  virtual void clearGlobalFocusOwner();
-  virtual ::java::awt::Component * getPermanentFocusOwner();
-public: // actually protected
-  virtual ::java::awt::Component * getGlobalPermanentFocusOwner();
-  virtual void setGlobalPermanentFocusOwner(::java::awt::Component *);
-public:
-  virtual ::java::awt::Window * getFocusedWindow();
-public: // actually protected
-  virtual ::java::awt::Window * getGlobalFocusedWindow();
-  virtual void setGlobalFocusedWindow(::java::awt::Window *);
-public:
-  virtual ::java::awt::Window * getActiveWindow();
-public: // actually protected
-  virtual ::java::awt::Window * getGlobalActiveWindow();
-  virtual void setGlobalActiveWindow(::java::awt::Window *);
-public:
-  virtual ::java::awt::FocusTraversalPolicy * getDefaultFocusTraversalPolicy();
-  virtual void setDefaultFocusTraversalPolicy(::java::awt::FocusTraversalPolicy *);
-  virtual void setDefaultFocusTraversalKeys(jint, ::java::util::Set *);
-  virtual ::java::util::Set * getDefaultFocusTraversalKeys(jint);
-  virtual ::java::awt::Container * getCurrentFocusCycleRoot();
-public: // actually protected
-  virtual ::java::awt::Container * getGlobalCurrentFocusCycleRoot();
-public:
-  virtual void setGlobalCurrentFocusCycleRoot(::java::awt::Container *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners(::java::lang::String *);
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void addVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual void removeVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners();
-  virtual void addVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual void removeVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners(::java::lang::String *);
-public: // actually protected
-  virtual void fireVetoableChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void addKeyEventDispatcher(::java::awt::KeyEventDispatcher *);
-  virtual void removeKeyEventDispatcher(::java::awt::KeyEventDispatcher *);
-public: // actually protected
-  virtual ::java::util::List * getKeyEventDispatchers();
-public:
-  virtual void addKeyEventPostProcessor(::java::awt::KeyEventPostProcessor *);
-  virtual void removeKeyEventPostProcessor(::java::awt::KeyEventPostProcessor *);
-public: // actually protected
-  virtual ::java::util::List * getKeyEventPostProcessors();
-public:
-  virtual jboolean dispatchEvent(::java::awt::AWTEvent *) = 0;
-  virtual void redispatchEvent(::java::awt::Component *, ::java::awt::AWTEvent *);
-  virtual jboolean dispatchKeyEvent(::java::awt::event::KeyEvent *) = 0;
-  virtual jboolean postProcessKeyEvent(::java::awt::event::KeyEvent *) = 0;
-  virtual void processKeyEvent(::java::awt::Component *, ::java::awt::event::KeyEvent *) = 0;
-public: // actually protected
-  virtual void enqueueKeyEvents(jlong, ::java::awt::Component *) = 0;
-  virtual void dequeueKeyEvents(jlong, ::java::awt::Component *) = 0;
-  virtual void discardKeyEvents(::java::awt::Component *) = 0;
-public:
-  virtual void focusNextComponent(::java::awt::Component *) = 0;
-  virtual void focusPreviousComponent(::java::awt::Component *) = 0;
-  virtual void upFocusCycle(::java::awt::Component *) = 0;
-  virtual void downFocusCycle(::java::awt::Container *) = 0;
-  virtual void focusNextComponent();
-  virtual void focusPreviousComponent();
-  virtual void upFocusCycle();
-  virtual void downFocusCycle();
-private:
-  ::java::lang::Object * getObject(::java::util::Map *);
-  ::java::lang::Object * getGlobalObject(::java::util::Map *, jboolean);
-  void setGlobalObject(::java::util::Map *, ::java::lang::Object *, ::java::lang::String *);
-public: // actually package-private
-  static ::java::awt::AWTEvent * retargetFocusEvent(::java::awt::AWTEvent *);
-  static void addLightweightFocusRequest(::java::awt::Component *, ::java::awt::Component *);
-public:
-  static const jint FORWARD_TRAVERSAL_KEYS = 0;
-  static const jint BACKWARD_TRAVERSAL_KEYS = 1;
-  static const jint UP_CYCLE_TRAVERSAL_KEYS = 2;
-  static const jint DOWN_CYCLE_TRAVERSAL_KEYS = 3;
-private:
-  static ::java::util::Set * DEFAULT_FORWARD_KEYS;
-  static ::java::util::Set * DEFAULT_BACKWARD_KEYS;
-  static ::java::util::Map * currentKeyboardFocusManagers;
-  static ::java::util::Map * currentFocusOwners;
-  static ::java::util::Map * currentPermanentFocusOwners;
-  static ::java::util::Map * currentFocusedWindows;
-  static ::java::util::Map * currentActiveWindows;
-  static ::java::util::Map * currentFocusCycleRoots;
-  ::java::awt::FocusTraversalPolicy * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultPolicy;
-  JArray< ::java::util::Set * > * defaultFocusKeys;
-  ::java::beans::PropertyChangeSupport * propertyChangeSupport;
-  ::java::beans::VetoableChangeSupport * vetoableChangeSupport;
-  ::java::util::ArrayList * keyEventDispatchers;
-  ::java::util::ArrayList * keyEventPostProcessors;
-  static ::java::util::HashMap * focusRequests;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_KeyboardFocusManager__
diff --git a/libjava/java/awt/Label$AccessibleAWTLabel.h b/libjava/java/awt/Label$AccessibleAWTLabel.h
deleted file mode 100644
index 7301841bc28..00000000000
--- a/libjava/java/awt/Label$AccessibleAWTLabel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Label$AccessibleAWTLabel__
-#define __java_awt_Label$AccessibleAWTLabel__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Label;
-        class Label$AccessibleAWTLabel;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::Label$AccessibleAWTLabel : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  Label$AccessibleAWTLabel(::java::awt::Label *);
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -3568967560160480438LL;
-public: // actually package-private
-  ::java::awt::Label * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Label$AccessibleAWTLabel__
diff --git a/libjava/java/awt/Label.h b/libjava/java/awt/Label.h
deleted file mode 100644
index d3151604d9a..00000000000
--- a/libjava/java/awt/Label.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Label__
-#define __java_awt_Label__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Label;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Label : public ::java::awt::Component
-{
-
-public:
-  Label();
-  Label(::java::lang::String *);
-  Label(::java::lang::String *, jint);
-  virtual jint getAlignment();
-  virtual void setAlignment(jint);
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  virtual void addNotify();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  static const jint LEFT = 0;
-  static const jint CENTER = 1;
-  static const jint RIGHT = 2;
-private:
-  static const jlong serialVersionUID = 3094126758329070636LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::Component)))) alignment;
-  ::java::lang::String * text;
-  static jlong nextLabelNumber;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Label__
diff --git a/libjava/java/awt/LayoutManager.h b/libjava/java/awt/LayoutManager.h
deleted file mode 100644
index 464871c049c..00000000000
--- a/libjava/java/awt/LayoutManager.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_LayoutManager__
-#define __java_awt_LayoutManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class LayoutManager;
-    }
-  }
-}
-
-class java::awt::LayoutManager : public ::java::lang::Object
-{
-
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *) = 0;
-  virtual void removeLayoutComponent(::java::awt::Component *) = 0;
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *) = 0;
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *) = 0;
-  virtual void layoutContainer(::java::awt::Container *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_LayoutManager__
diff --git a/libjava/java/awt/LayoutManager2.h b/libjava/java/awt/LayoutManager2.h
deleted file mode 100644
index 7c8331bd64d..00000000000
--- a/libjava/java/awt/LayoutManager2.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_LayoutManager2__
-#define __java_awt_LayoutManager2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class LayoutManager2;
-    }
-  }
-}
-
-class java::awt::LayoutManager2 : public ::java::lang::Object
-{
-
-public:
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *) = 0;
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *) = 0;
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *) = 0;
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *) = 0;
-  virtual void invalidateLayout(::java::awt::Container *) = 0;
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *) = 0;
-  virtual void removeLayoutComponent(::java::awt::Component *) = 0;
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *) = 0;
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *) = 0;
-  virtual void layoutContainer(::java::awt::Container *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_LayoutManager2__
diff --git a/libjava/java/awt/LightweightDispatcher.h b/libjava/java/awt/LightweightDispatcher.h
deleted file mode 100644
index 0a0bc5026e4..00000000000
--- a/libjava/java/awt/LightweightDispatcher.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_LightweightDispatcher__
-#define __java_awt_LightweightDispatcher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-        class Container;
-        class LightweightDispatcher;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class java::awt::LightweightDispatcher : public ::java::lang::Object
-{
-
-public: // actually package-private
-  static ::java::awt::LightweightDispatcher * getInstance();
-private:
-  LightweightDispatcher();
-public:
-  jboolean dispatchEvent(::java::awt::AWTEvent *);
-private:
-  jboolean handleMouseEvent(::java::awt::event::MouseEvent *);
-  ::java::awt::Component * findTarget(::java::awt::Container *, jint, jint);
-  jboolean isMouseListening(::java::awt::Component *);
-  void trackEnterExit(::java::awt::Component *, ::java::awt::event::MouseEvent *);
-  void redispatch(::java::awt::event::MouseEvent *, ::java::awt::Component *, jint);
-  jboolean isDragging(::java::awt::event::MouseEvent *);
-  static ::java::util::WeakHashMap * instances;
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastTarget;
-  ::java::awt::Component * mouseEventTarget;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_LightweightDispatcher__
diff --git a/libjava/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.h b/libjava/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.h
deleted file mode 100644
index 7014fd93007..00000000000
--- a/libjava/java/awt/List$AccessibleAWTList$AccessibleAWTListChild.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_List$AccessibleAWTList$AccessibleAWTListChild__
-#define __java_awt_List$AccessibleAWTList$AccessibleAWTListChild__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class List;
-        class List$AccessibleAWTList;
-        class List$AccessibleAWTList$AccessibleAWTListChild;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::List$AccessibleAWTList$AccessibleAWTListChild : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  List$AccessibleAWTList$AccessibleAWTListChild(::java::awt::List$AccessibleAWTList *, ::java::awt::List *, jint);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleIndexInParent();
-private:
-  static const jlong serialVersionUID = 4412022926028300317LL;
-  ::java::awt::List * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) parent;
-  jint indexInParent;
-public: // actually package-private
-  ::java::awt::List$AccessibleAWTList * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_List$AccessibleAWTList$AccessibleAWTListChild__
diff --git a/libjava/java/awt/List$AccessibleAWTList.h b/libjava/java/awt/List$AccessibleAWTList.h
deleted file mode 100644
index ca0dcaa5f19..00000000000
--- a/libjava/java/awt/List$AccessibleAWTList.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_List$AccessibleAWTList__
-#define __java_awt_List$AccessibleAWTList__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class List;
-        class List$AccessibleAWTList;
-      namespace event
-      {
-          class ActionEvent;
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::List$AccessibleAWTList : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  List$AccessibleAWTList(::java::awt::List *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  static ::java::awt::List * access$0(::java::awt::List$AccessibleAWTList *);
-private:
-  static const jlong serialVersionUID = 7924617370136012829LL;
-public: // actually package-private
-  ::java::awt::List * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_List$AccessibleAWTList__
diff --git a/libjava/java/awt/List.h b/libjava/java/awt/List.h
deleted file mode 100644
index ba11b18d8b9..00000000000
--- a/libjava/java/awt/List.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_List__
-#define __java_awt_List__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Dimension;
-        class List;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::List : public ::java::awt::Component
-{
-
-public:
-  List();
-  List(jint);
-  List(jint, jboolean);
-  virtual jint getItemCount();
-  virtual jint countItems();
-  virtual JArray< ::java::lang::String * > * getItems();
-  virtual ::java::lang::String * getItem(jint);
-  virtual jint getRows();
-  virtual jboolean isMultipleMode();
-  virtual jboolean allowsMultipleSelections();
-  virtual void setMultipleMode(jboolean);
-  virtual void setMultipleSelections(jboolean);
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void add(::java::lang::String *);
-  virtual void addItem(::java::lang::String *);
-  virtual void add(::java::lang::String *, jint);
-  virtual void addItem(::java::lang::String *, jint);
-  virtual void delItem(jint);
-  virtual void remove(jint);
-  virtual void delItems(jint, jint);
-  virtual void remove(::java::lang::String *);
-  virtual void removeAll();
-  virtual void clear();
-  virtual void replaceItem(::java::lang::String *, jint);
-  virtual jint getSelectedIndex();
-  virtual JArray< jint > * getSelectedIndexes();
-  virtual ::java::lang::String * getSelectedItem();
-  virtual JArray< ::java::lang::String * > * getSelectedItems();
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual jboolean isIndexSelected(jint);
-  virtual jboolean isSelected(jint);
-  virtual void makeVisible(jint);
-  virtual jint getVisibleIndex();
-  virtual void select(jint);
-  virtual void deselect(jint);
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processActionEvent(::java::awt::event::ActionEvent *);
-  virtual void processItemEvent(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_list_number;
-  static const jlong serialVersionUID = -3304312411574666869LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::awt::Component)))) items;
-  jboolean multipleMode;
-  jint rows;
-  JArray< jint > * selected;
-  jint visibleIndex;
-  ::java::awt::event::ItemListener * item_listeners;
-  ::java::awt::event::ActionListener * action_listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_List__
diff --git a/libjava/java/awt/MediaTracker$MediaEntry.h b/libjava/java/awt/MediaTracker$MediaEntry.h
deleted file mode 100644
index a21715b59b9..00000000000
--- a/libjava/java/awt/MediaTracker$MediaEntry.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MediaTracker$MediaEntry__
-#define __java_awt_MediaTracker$MediaEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-        class MediaTracker;
-        class MediaTracker$MediaEntry;
-    }
-  }
-}
-
-class java::awt::MediaTracker$MediaEntry : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MediaTracker$MediaEntry(::java::awt::MediaTracker *);
-public:
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::awt::Image * image;
-  ::java::awt::MediaTracker$MediaEntry * next;
-  jint status;
-  jint width;
-  jint height;
-  ::java::awt::MediaTracker * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MediaTracker$MediaEntry__
diff --git a/libjava/java/awt/MediaTracker.h b/libjava/java/awt/MediaTracker.h
deleted file mode 100644
index bc72868639d..00000000000
--- a/libjava/java/awt/MediaTracker.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MediaTracker__
-#define __java_awt_MediaTracker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Image;
-        class MediaTracker;
-        class MediaTracker$MediaEntry;
-    }
-  }
-}
-
-class java::awt::MediaTracker : public ::java::lang::Object
-{
-
-public:
-  MediaTracker(::java::awt::Component *);
-  virtual void addImage(::java::awt::Image *, jint);
-  virtual void addImage(::java::awt::Image *, jint, jint, jint);
-  virtual jboolean checkAll();
-  virtual jboolean checkAll(jboolean);
-  virtual jboolean isErrorAny();
-  virtual JArray< ::java::lang::Object * > * getErrorsAny();
-  virtual void waitForAll();
-  virtual jboolean waitForAll(jlong);
-  virtual jint statusAll(jboolean);
-  virtual jboolean checkID(jint);
-  virtual jboolean checkID(jint, jboolean);
-  virtual jboolean isErrorID(jint);
-  virtual JArray< ::java::lang::Object * > * getErrorsID(jint);
-  virtual void waitForID(jint);
-  virtual jboolean waitForID(jint, jlong);
-  virtual jint statusID(jint, jboolean);
-  virtual void removeImage(::java::awt::Image *);
-  virtual void removeImage(::java::awt::Image *, jint);
-  virtual void removeImage(::java::awt::Image *, jint, jint, jint);
-  static const jint LOADING = 1;
-  static const jint ABORTED = 2;
-  static const jint ERRORED = 4;
-  static const jint COMPLETE = 8;
-public: // actually package-private
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-  ::java::awt::MediaTracker$MediaEntry * head;
-  static const jlong serialVersionUID = -483174189758638095LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MediaTracker__
diff --git a/libjava/java/awt/Menu$AccessibleAWTMenu.h b/libjava/java/awt/Menu$AccessibleAWTMenu.h
deleted file mode 100644
index 73c33a7b70a..00000000000
--- a/libjava/java/awt/Menu$AccessibleAWTMenu.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Menu$AccessibleAWTMenu__
-#define __java_awt_Menu$AccessibleAWTMenu__
-
-#pragma interface
-
-#include <java/awt/MenuItem$AccessibleAWTMenuItem.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class Menu$AccessibleAWTMenu;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::Menu$AccessibleAWTMenu : public ::java::awt::MenuItem$AccessibleAWTMenuItem
-{
-
-public: // actually protected
-  Menu$AccessibleAWTMenu(::java::awt::Menu *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 5228160894980069094LL;
-public: // actually package-private
-  ::java::awt::Menu * __attribute__((aligned(__alignof__( ::java::awt::MenuItem$AccessibleAWTMenuItem)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Menu$AccessibleAWTMenu__
diff --git a/libjava/java/awt/Menu.h b/libjava/java/awt/Menu.h
deleted file mode 100644
index 7d2ab26d27c..00000000000
--- a/libjava/java/awt/Menu.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Menu__
-#define __java_awt_Menu__
-
-#pragma interface
-
-#include <java/awt/MenuItem.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuComponent;
-        class MenuItem;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Menu : public ::java::awt::MenuItem
-{
-
-public:
-  Menu();
-  Menu(::java::lang::String *);
-  Menu(::java::lang::String *, jboolean);
-  virtual jboolean isTearOff();
-  virtual jint getItemCount();
-  virtual jint countItems();
-  virtual ::java::awt::MenuItem * getItem(jint);
-  virtual ::java::awt::MenuItem * add(::java::awt::MenuItem *);
-  virtual void add(::java::lang::String *);
-  virtual void insert(::java::awt::MenuItem *, jint);
-  virtual void insert(::java::lang::String *, jint);
-  virtual void addSeparator();
-  virtual void insertSeparator(jint);
-  virtual void remove(jint);
-  virtual void remove(::java::awt::MenuComponent *);
-  virtual void removeAll();
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual ::java::lang::String * paramString();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_menu_number;
-  static const jlong serialVersionUID = -8809584163345499784LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::awt::MenuItem)))) items;
-  jboolean tearOff;
-  jboolean isHelpMenu;
-  jint menuSerializedDataVersion;
-public: // actually package-private
-  static ::java::lang::String * separatorLabel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Menu__
diff --git a/libjava/java/awt/MenuBar$AccessibleAWTMenuBar.h b/libjava/java/awt/MenuBar$AccessibleAWTMenuBar.h
deleted file mode 100644
index 2f40500593f..00000000000
--- a/libjava/java/awt/MenuBar$AccessibleAWTMenuBar.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuBar$AccessibleAWTMenuBar__
-#define __java_awt_MenuBar$AccessibleAWTMenuBar__
-
-#pragma interface
-
-#include <java/awt/MenuComponent$AccessibleAWTMenuComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class MenuBar;
-        class MenuBar$AccessibleAWTMenuBar;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::MenuBar$AccessibleAWTMenuBar : public ::java::awt::MenuComponent$AccessibleAWTMenuComponent
-{
-
-public: // actually protected
-  MenuBar$AccessibleAWTMenuBar(::java::awt::MenuBar *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -8577604491830083815LL;
-public: // actually package-private
-  ::java::awt::MenuBar * __attribute__((aligned(__alignof__( ::java::awt::MenuComponent$AccessibleAWTMenuComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuBar$AccessibleAWTMenuBar__
diff --git a/libjava/java/awt/MenuBar.h b/libjava/java/awt/MenuBar.h
deleted file mode 100644
index f9eded3de4e..00000000000
--- a/libjava/java/awt/MenuBar.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuBar__
-#define __java_awt_MenuBar__
-
-#pragma interface
-
-#include <java/awt/MenuComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Menu;
-        class MenuBar;
-        class MenuComponent;
-        class MenuItem;
-        class MenuShortcut;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::MenuBar : public ::java::awt::MenuComponent
-{
-
-public:
-  MenuBar();
-  virtual ::java::awt::Menu * getHelpMenu();
-  virtual void setHelpMenu(::java::awt::Menu *);
-  virtual ::java::awt::Menu * add(::java::awt::Menu *);
-  virtual void remove(jint);
-  virtual void remove(::java::awt::MenuComponent *);
-  virtual jint getMenuCount();
-  virtual jint countMenus();
-  virtual ::java::awt::Menu * getMenu(jint);
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual ::java::util::Enumeration * shortcuts();
-  virtual ::java::awt::MenuItem * getShortcutMenuItem(::java::awt::MenuShortcut *);
-  virtual void deleteShortcut(::java::awt::MenuShortcut *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = -4930327919388951260LL;
-  static jlong next_menubar_number;
-  ::java::awt::Menu * __attribute__((aligned(__alignof__( ::java::awt::MenuComponent)))) helpMenu;
-  ::java::util::Vector * menus;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuBar__
diff --git a/libjava/java/awt/MenuComponent$AccessibleAWTMenuComponent.h b/libjava/java/awt/MenuComponent$AccessibleAWTMenuComponent.h
deleted file mode 100644
index 05d724b702d..00000000000
--- a/libjava/java/awt/MenuComponent$AccessibleAWTMenuComponent.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuComponent$AccessibleAWTMenuComponent__
-#define __java_awt_MenuComponent$AccessibleAWTMenuComponent__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class MenuComponent;
-        class MenuComponent$AccessibleAWTMenuComponent;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleComponent;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::MenuComponent$AccessibleAWTMenuComponent : public ::javax::accessibility::AccessibleContext
-{
-
-public: // actually protected
-  MenuComponent$AccessibleAWTMenuComponent(::java::awt::MenuComponent *);
-public:
-  virtual void addAccessibleSelection(jint);
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void clearAccessibleSelection();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual jint getAccessibleIndexInParent();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::Accessible * getAccessibleParent();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Cursor * getCursor();
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::util::Locale * getLocale();
-  virtual ::java::awt::Point * getLocation();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getSize();
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual jboolean isEnabled();
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isShowing();
-  virtual jboolean isVisible();
-  virtual void removeAccessibleSelection(jint);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-  virtual void requestFocus();
-  virtual void selectAllAccessibleSelection();
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setLocation(::java::awt::Point *);
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void setVisible(jboolean);
-private:
-  static const jlong serialVersionUID = -4269533416223798698LL;
-public: // actually package-private
-  ::java::awt::MenuComponent * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuComponent$AccessibleAWTMenuComponent__
diff --git a/libjava/java/awt/MenuComponent.h b/libjava/java/awt/MenuComponent.h
deleted file mode 100644
index d47e7185368..00000000000
--- a/libjava/java/awt/MenuComponent.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuComponent__
-#define __java_awt_MenuComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Event;
-        class Font;
-        class MenuComponent;
-        class MenuContainer;
-        class Toolkit;
-      namespace event
-      {
-          class FocusListener;
-      }
-      namespace peer
-      {
-          class MenuComponentPeer;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::MenuComponent : public ::java::lang::Object
-{
-
-public:
-  MenuComponent();
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::lang::String * getName();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-public:
-  virtual void setName(::java::lang::String *);
-  virtual ::java::awt::MenuContainer * getParent();
-public: // actually package-private
-  virtual void setParent(::java::awt::MenuContainer *);
-public:
-  virtual ::java::awt::peer::MenuComponentPeer * getPeer();
-public: // actually package-private
-  virtual void setPeer(::java::awt::peer::MenuComponentPeer *);
-public:
-  virtual void removeNotify();
-public: // actually package-private
-  virtual ::java::awt::Toolkit * getToolkit();
-public: // actually protected
-  virtual ::java::lang::Object * getTreeLock();
-public: // actually package-private
-  virtual void setTreeLock(::java::lang::Object *);
-public:
-  virtual jboolean postEvent(::java::awt::Event *);
-  virtual void dispatchEvent(::java::awt::AWTEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -4536902356223894379LL;
-  ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::lang::Object)))) font;
-  ::java::lang::String * name;
-public: // actually package-private
-  ::java::awt::MenuContainer * parent;
-  ::java::awt::peer::MenuComponentPeer * peer;
-private:
-  ::java::lang::Object * tree_lock;
-  static ::java::awt::Toolkit * toolkit;
-public: // actually package-private
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-private:
-  jboolean nameExplicitlySet;
-  jboolean newEventsOnly;
-public: // actually package-private
-  ::java::awt::event::FocusListener * focusListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuComponent__
diff --git a/libjava/java/awt/MenuContainer.h b/libjava/java/awt/MenuContainer.h
deleted file mode 100644
index 3f2a1cf9154..00000000000
--- a/libjava/java/awt/MenuContainer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuContainer__
-#define __java_awt_MenuContainer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Event;
-        class Font;
-        class MenuComponent;
-        class MenuContainer;
-    }
-  }
-}
-
-class java::awt::MenuContainer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Font * getFont() = 0;
-  virtual void remove(::java::awt::MenuComponent *) = 0;
-  virtual jboolean postEvent(::java::awt::Event *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_MenuContainer__
diff --git a/libjava/java/awt/MenuItem$AccessibleAWTMenuItem.h b/libjava/java/awt/MenuItem$AccessibleAWTMenuItem.h
deleted file mode 100644
index 5bc2638663a..00000000000
--- a/libjava/java/awt/MenuItem$AccessibleAWTMenuItem.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuItem$AccessibleAWTMenuItem__
-#define __java_awt_MenuItem$AccessibleAWTMenuItem__
-
-#pragma interface
-
-#include <java/awt/MenuComponent$AccessibleAWTMenuComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class MenuItem;
-        class MenuItem$AccessibleAWTMenuItem;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-        class AccessibleRole;
-        class AccessibleValue;
-    }
-  }
-}
-
-class java::awt::MenuItem$AccessibleAWTMenuItem : public ::java::awt::MenuComponent$AccessibleAWTMenuComponent
-{
-
-public: // actually protected
-  MenuItem$AccessibleAWTMenuItem(::java::awt::MenuItem *);
-public:
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-private:
-  static const jlong serialVersionUID = -217847831945965825LL;
-public: // actually package-private
-  ::java::awt::MenuItem * __attribute__((aligned(__alignof__( ::java::awt::MenuComponent$AccessibleAWTMenuComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuItem$AccessibleAWTMenuItem__
diff --git a/libjava/java/awt/MenuItem.h b/libjava/java/awt/MenuItem.h
deleted file mode 100644
index 2b57ebf29d1..00000000000
--- a/libjava/java/awt/MenuItem.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuItem__
-#define __java_awt_MenuItem__
-
-#pragma interface
-
-#include <java/awt/MenuComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class MenuItem;
-        class MenuShortcut;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::MenuItem : public ::java::awt::MenuComponent
-{
-
-public:
-  MenuItem();
-  MenuItem(::java::lang::String *);
-  MenuItem(::java::lang::String *, ::java::awt::MenuShortcut *);
-  virtual ::java::lang::String * getLabel();
-  virtual void setLabel(::java::lang::String *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual void enable(jboolean);
-  virtual void enable();
-  virtual void disable();
-  virtual ::java::awt::MenuShortcut * getShortcut();
-  virtual void setShortcut(::java::awt::MenuShortcut *);
-  virtual void deleteShortcut();
-  virtual ::java::lang::String * getActionCommand();
-  virtual void setActionCommand(::java::lang::String *);
-public: // actually protected
-  virtual void enableEvents(jlong);
-  virtual void disableEvents(jlong);
-public:
-  virtual void addNotify();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processActionEvent(::java::awt::event::ActionEvent *);
-public:
-  virtual ::java::lang::String * paramString();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_menuitem_number;
-  static const jlong serialVersionUID = -21757335363267194LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::MenuComponent)))) actionCommand;
-  jboolean enabled;
-  jlong eventMask;
-  ::java::lang::String * label;
-private:
-  ::java::awt::MenuShortcut * shortcut;
-  ::java::awt::event::ActionListener * action_listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuItem__
diff --git a/libjava/java/awt/MenuShortcut.h b/libjava/java/awt/MenuShortcut.h
deleted file mode 100644
index 89ae7a8730f..00000000000
--- a/libjava/java/awt/MenuShortcut.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MenuShortcut__
-#define __java_awt_MenuShortcut__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class MenuShortcut;
-    }
-  }
-}
-
-class java::awt::MenuShortcut : public ::java::lang::Object
-{
-
-public:
-  MenuShortcut(jint);
-  MenuShortcut(jint, jboolean);
-  virtual jint getKey();
-  virtual jboolean usesShiftModifier();
-  virtual jboolean equals(::java::awt::MenuShortcut *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual jint hashCode();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-private:
-  void setKeyName(jint);
-  static const jlong serialVersionUID = 143448358473180225LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  jboolean usesShift;
-  ::java::lang::String * keyName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MenuShortcut__
diff --git a/libjava/java/awt/MouseInfo.h b/libjava/java/awt/MouseInfo.h
deleted file mode 100644
index 97aed5ce9c1..00000000000
--- a/libjava/java/awt/MouseInfo.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_MouseInfo__
-#define __java_awt_MouseInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class MouseInfo;
-        class PointerInfo;
-      namespace peer
-      {
-          class MouseInfoPeer;
-      }
-    }
-  }
-}
-
-class java::awt::MouseInfo : public ::java::lang::Object
-{
-
-public:
-  MouseInfo();
-  static ::java::awt::PointerInfo * getPointerInfo();
-  static jint getNumberOfButtons();
-private:
-  static ::java::awt::peer::MouseInfoPeer * peer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_MouseInfo__
diff --git a/libjava/java/awt/PageAttributes$ColorType.h b/libjava/java/awt/PageAttributes$ColorType.h
deleted file mode 100644
index ae67841f636..00000000000
--- a/libjava/java/awt/PageAttributes$ColorType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes$ColorType__
-#define __java_awt_PageAttributes$ColorType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes$ColorType;
-    }
-  }
-}
-
-class java::awt::PageAttributes$ColorType : public ::java::awt::AttributeValue
-{
-
-  PageAttributes$ColorType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::PageAttributes$ColorType * COLOR;
-  static ::java::awt::PageAttributes$ColorType * MONOCHROME;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes$ColorType__
diff --git a/libjava/java/awt/PageAttributes$MediaType.h b/libjava/java/awt/PageAttributes$MediaType.h
deleted file mode 100644
index c085d0aa7df..00000000000
--- a/libjava/java/awt/PageAttributes$MediaType.h
+++ /dev/null
@@ -1,179 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes$MediaType__
-#define __java_awt_PageAttributes$MediaType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes$MediaType;
-    }
-  }
-}
-
-class java::awt::PageAttributes$MediaType : public ::java::awt::AttributeValue
-{
-
-  PageAttributes$MediaType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::PageAttributes$MediaType * ISO_4A0;
-  static ::java::awt::PageAttributes$MediaType * ISO_2A0;
-  static ::java::awt::PageAttributes$MediaType * ISO_A0;
-  static ::java::awt::PageAttributes$MediaType * ISO_A1;
-  static ::java::awt::PageAttributes$MediaType * ISO_A2;
-  static ::java::awt::PageAttributes$MediaType * ISO_A3;
-  static ::java::awt::PageAttributes$MediaType * ISO_A4;
-  static ::java::awt::PageAttributes$MediaType * ISO_A5;
-  static ::java::awt::PageAttributes$MediaType * ISO_A6;
-  static ::java::awt::PageAttributes$MediaType * ISO_A7;
-  static ::java::awt::PageAttributes$MediaType * ISO_A8;
-  static ::java::awt::PageAttributes$MediaType * ISO_A9;
-  static ::java::awt::PageAttributes$MediaType * ISO_A10;
-  static ::java::awt::PageAttributes$MediaType * ISO_B0;
-  static ::java::awt::PageAttributes$MediaType * ISO_B1;
-  static ::java::awt::PageAttributes$MediaType * ISO_B2;
-  static ::java::awt::PageAttributes$MediaType * ISO_B3;
-  static ::java::awt::PageAttributes$MediaType * ISO_B4;
-  static ::java::awt::PageAttributes$MediaType * ISO_B5;
-  static ::java::awt::PageAttributes$MediaType * ISO_B6;
-  static ::java::awt::PageAttributes$MediaType * ISO_B7;
-  static ::java::awt::PageAttributes$MediaType * ISO_B8;
-  static ::java::awt::PageAttributes$MediaType * ISO_B9;
-  static ::java::awt::PageAttributes$MediaType * ISO_B10;
-  static ::java::awt::PageAttributes$MediaType * JIS_B0;
-  static ::java::awt::PageAttributes$MediaType * JIS_B1;
-  static ::java::awt::PageAttributes$MediaType * JIS_B2;
-  static ::java::awt::PageAttributes$MediaType * JIS_B3;
-  static ::java::awt::PageAttributes$MediaType * JIS_B4;
-  static ::java::awt::PageAttributes$MediaType * JIS_B5;
-  static ::java::awt::PageAttributes$MediaType * JIS_B6;
-  static ::java::awt::PageAttributes$MediaType * JIS_B7;
-  static ::java::awt::PageAttributes$MediaType * JIS_B8;
-  static ::java::awt::PageAttributes$MediaType * JIS_B9;
-  static ::java::awt::PageAttributes$MediaType * JIS_B10;
-  static ::java::awt::PageAttributes$MediaType * ISO_C0;
-  static ::java::awt::PageAttributes$MediaType * ISO_C1;
-  static ::java::awt::PageAttributes$MediaType * ISO_C2;
-  static ::java::awt::PageAttributes$MediaType * ISO_C3;
-  static ::java::awt::PageAttributes$MediaType * ISO_C4;
-  static ::java::awt::PageAttributes$MediaType * ISO_C5;
-  static ::java::awt::PageAttributes$MediaType * ISO_C6;
-  static ::java::awt::PageAttributes$MediaType * ISO_C7;
-  static ::java::awt::PageAttributes$MediaType * ISO_C8;
-  static ::java::awt::PageAttributes$MediaType * ISO_C9;
-  static ::java::awt::PageAttributes$MediaType * ISO_C10;
-  static ::java::awt::PageAttributes$MediaType * ISO_DESIGNATED_LONG;
-  static ::java::awt::PageAttributes$MediaType * EXECUTIVE;
-  static ::java::awt::PageAttributes$MediaType * FOLIO;
-  static ::java::awt::PageAttributes$MediaType * INVOICE;
-  static ::java::awt::PageAttributes$MediaType * LEDGER;
-  static ::java::awt::PageAttributes$MediaType * NA_LETTER;
-  static ::java::awt::PageAttributes$MediaType * NA_LEGAL;
-  static ::java::awt::PageAttributes$MediaType * QUARTO;
-  static ::java::awt::PageAttributes$MediaType * A;
-  static ::java::awt::PageAttributes$MediaType * B;
-  static ::java::awt::PageAttributes$MediaType * C;
-  static ::java::awt::PageAttributes$MediaType * D;
-  static ::java::awt::PageAttributes$MediaType * E;
-  static ::java::awt::PageAttributes$MediaType * NA_10X15_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_10X14_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_10X13_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_9X12_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_9X11_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_7X9_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_6X9_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_NUMBER_9_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_NUMBER_10_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_NUMBER_11_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_NUMBER_12_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * NA_NUMBER_14_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * INVITE_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * ITALY_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * MONARCH_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * PERSONAL_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * A0;
-  static ::java::awt::PageAttributes$MediaType * A1;
-  static ::java::awt::PageAttributes$MediaType * A2;
-  static ::java::awt::PageAttributes$MediaType * A3;
-  static ::java::awt::PageAttributes$MediaType * A4;
-  static ::java::awt::PageAttributes$MediaType * A5;
-  static ::java::awt::PageAttributes$MediaType * A6;
-  static ::java::awt::PageAttributes$MediaType * A7;
-  static ::java::awt::PageAttributes$MediaType * A8;
-  static ::java::awt::PageAttributes$MediaType * A9;
-  static ::java::awt::PageAttributes$MediaType * A10;
-  static ::java::awt::PageAttributes$MediaType * B0;
-  static ::java::awt::PageAttributes$MediaType * B1;
-  static ::java::awt::PageAttributes$MediaType * B2;
-  static ::java::awt::PageAttributes$MediaType * B3;
-  static ::java::awt::PageAttributes$MediaType * B4;
-  static ::java::awt::PageAttributes$MediaType * ISO_B4_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * B5;
-  static ::java::awt::PageAttributes$MediaType * ISO_B5_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * B6;
-  static ::java::awt::PageAttributes$MediaType * B7;
-  static ::java::awt::PageAttributes$MediaType * B8;
-  static ::java::awt::PageAttributes$MediaType * B9;
-  static ::java::awt::PageAttributes$MediaType * B10;
-  static ::java::awt::PageAttributes$MediaType * C0;
-  static ::java::awt::PageAttributes$MediaType * ISO_C0_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C1;
-  static ::java::awt::PageAttributes$MediaType * ISO_C1_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C2;
-  static ::java::awt::PageAttributes$MediaType * ISO_C2_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C3;
-  static ::java::awt::PageAttributes$MediaType * ISO_C3_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C4;
-  static ::java::awt::PageAttributes$MediaType * ISO_C4_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C5;
-  static ::java::awt::PageAttributes$MediaType * ISO_C5_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C6;
-  static ::java::awt::PageAttributes$MediaType * ISO_C6_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C7;
-  static ::java::awt::PageAttributes$MediaType * ISO_C7_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C8;
-  static ::java::awt::PageAttributes$MediaType * ISO_C8_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C9;
-  static ::java::awt::PageAttributes$MediaType * ISO_C9_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * C10;
-  static ::java::awt::PageAttributes$MediaType * ISO_C10_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * ISO_DESIGNATED_LONG_ENVELOPE;
-  static ::java::awt::PageAttributes$MediaType * STATEMENT;
-  static ::java::awt::PageAttributes$MediaType * TABLOID;
-  static ::java::awt::PageAttributes$MediaType * LETTER;
-  static ::java::awt::PageAttributes$MediaType * NOTE;
-  static ::java::awt::PageAttributes$MediaType * LEGAL;
-  static ::java::awt::PageAttributes$MediaType * ENV_10X15;
-  static ::java::awt::PageAttributes$MediaType * ENV_10X14;
-  static ::java::awt::PageAttributes$MediaType * ENV_10X13;
-  static ::java::awt::PageAttributes$MediaType * ENV_9X12;
-  static ::java::awt::PageAttributes$MediaType * ENV_9X11;
-  static ::java::awt::PageAttributes$MediaType * ENV_7X9;
-  static ::java::awt::PageAttributes$MediaType * ENV_6X9;
-  static ::java::awt::PageAttributes$MediaType * ENV_9;
-  static ::java::awt::PageAttributes$MediaType * ENV_10;
-  static ::java::awt::PageAttributes$MediaType * ENV_11;
-  static ::java::awt::PageAttributes$MediaType * ENV_12;
-  static ::java::awt::PageAttributes$MediaType * ENV_14;
-  static ::java::awt::PageAttributes$MediaType * ENV_INVITE;
-  static ::java::awt::PageAttributes$MediaType * ENV_ITALY;
-  static ::java::awt::PageAttributes$MediaType * ENV_MONARCH;
-  static ::java::awt::PageAttributes$MediaType * ENV_PERSONAL;
-  static ::java::awt::PageAttributes$MediaType * INVITE;
-  static ::java::awt::PageAttributes$MediaType * ITALY;
-  static ::java::awt::PageAttributes$MediaType * MONARCH;
-  static ::java::awt::PageAttributes$MediaType * PERSONAL;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes$MediaType__
diff --git a/libjava/java/awt/PageAttributes$OrientationRequestedType.h b/libjava/java/awt/PageAttributes$OrientationRequestedType.h
deleted file mode 100644
index 79e1602d3bd..00000000000
--- a/libjava/java/awt/PageAttributes$OrientationRequestedType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes$OrientationRequestedType__
-#define __java_awt_PageAttributes$OrientationRequestedType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes$OrientationRequestedType;
-    }
-  }
-}
-
-class java::awt::PageAttributes$OrientationRequestedType : public ::java::awt::AttributeValue
-{
-
-  PageAttributes$OrientationRequestedType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::PageAttributes$OrientationRequestedType * PORTRAIT;
-  static ::java::awt::PageAttributes$OrientationRequestedType * LANDSCAPE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes$OrientationRequestedType__
diff --git a/libjava/java/awt/PageAttributes$OriginType.h b/libjava/java/awt/PageAttributes$OriginType.h
deleted file mode 100644
index 16e04f86690..00000000000
--- a/libjava/java/awt/PageAttributes$OriginType.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes$OriginType__
-#define __java_awt_PageAttributes$OriginType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes$OriginType;
-    }
-  }
-}
-
-class java::awt::PageAttributes$OriginType : public ::java::awt::AttributeValue
-{
-
-  PageAttributes$OriginType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::PageAttributes$OriginType * PHYSICAL;
-  static ::java::awt::PageAttributes$OriginType * PRINTABLE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes$OriginType__
diff --git a/libjava/java/awt/PageAttributes$PrintQualityType.h b/libjava/java/awt/PageAttributes$PrintQualityType.h
deleted file mode 100644
index 3f2b68cab38..00000000000
--- a/libjava/java/awt/PageAttributes$PrintQualityType.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes$PrintQualityType__
-#define __java_awt_PageAttributes$PrintQualityType__
-
-#pragma interface
-
-#include <java/awt/AttributeValue.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes$PrintQualityType;
-    }
-  }
-}
-
-class java::awt::PageAttributes$PrintQualityType : public ::java::awt::AttributeValue
-{
-
-  PageAttributes$PrintQualityType(jint);
-  static JArray< ::java::lang::String * > * NAMES;
-public:
-  static ::java::awt::PageAttributes$PrintQualityType * HIGH;
-  static ::java::awt::PageAttributes$PrintQualityType * NORMAL;
-  static ::java::awt::PageAttributes$PrintQualityType * DRAFT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes$PrintQualityType__
diff --git a/libjava/java/awt/PageAttributes.h b/libjava/java/awt/PageAttributes.h
deleted file mode 100644
index 7ed2f7a42e3..00000000000
--- a/libjava/java/awt/PageAttributes.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PageAttributes__
-#define __java_awt_PageAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PageAttributes;
-        class PageAttributes$ColorType;
-        class PageAttributes$MediaType;
-        class PageAttributes$OrientationRequestedType;
-        class PageAttributes$OriginType;
-        class PageAttributes$PrintQualityType;
-    }
-  }
-}
-
-class java::awt::PageAttributes : public ::java::lang::Object
-{
-
-public:
-  PageAttributes();
-  PageAttributes(::java::awt::PageAttributes *);
-  PageAttributes(::java::awt::PageAttributes$ColorType *, ::java::awt::PageAttributes$MediaType *, ::java::awt::PageAttributes$OrientationRequestedType *, ::java::awt::PageAttributes$OriginType *, ::java::awt::PageAttributes$PrintQualityType *, JArray< jint > *);
-  ::java::lang::Object * clone();
-  void set(::java::awt::PageAttributes *);
-  ::java::awt::PageAttributes$ColorType * getColor();
-  void setColor(::java::awt::PageAttributes$ColorType *);
-  ::java::awt::PageAttributes$MediaType * getMedia();
-  void setMedia(::java::awt::PageAttributes$MediaType *);
-  void setMediaToDefault();
-  ::java::awt::PageAttributes$OrientationRequestedType * getOrientationRequested();
-  void setOrientationRequested(::java::awt::PageAttributes$OrientationRequestedType *);
-  void setOrientationRequested(jint);
-  void setOrientationRequestedToDefault();
-  ::java::awt::PageAttributes$OriginType * getOrigin();
-  void setOrigin(::java::awt::PageAttributes$OriginType *);
-  ::java::awt::PageAttributes$PrintQualityType * getPrintQuality();
-  void setPrintQuality(::java::awt::PageAttributes$PrintQualityType *);
-  void setPrintQuality(jint);
-  void setPrintQualityToDefault();
-  JArray< jint > * getPrinterResolution();
-  void setPrinterResolution(JArray< jint > *);
-  void setPrinterResolution(jint);
-  void setPrinterResolutionToDefault();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  ::java::awt::PageAttributes$ColorType * __attribute__((aligned(__alignof__( ::java::lang::Object)))) color;
-  ::java::awt::PageAttributes$MediaType * media;
-  ::java::awt::PageAttributes$OrientationRequestedType * orientation;
-  ::java::awt::PageAttributes$OriginType * origin;
-  ::java::awt::PageAttributes$PrintQualityType * quality;
-  jint resolutionX;
-  jint resolutionY;
-  jint resolutionScale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PageAttributes__
diff --git a/libjava/java/awt/Paint.h b/libjava/java/awt/Paint.h
deleted file mode 100644
index 85f7c9fcec1..00000000000
--- a/libjava/java/awt/Paint.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Paint__
-#define __java_awt_Paint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Paint;
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::Paint : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::PaintContext * createContext(::java::awt::image::ColorModel *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *) = 0;
-  virtual jint getTransparency() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Paint__
diff --git a/libjava/java/awt/PaintContext.h b/libjava/java/awt/PaintContext.h
deleted file mode 100644
index 7658a30e476..00000000000
--- a/libjava/java/awt/PaintContext.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PaintContext__
-#define __java_awt_PaintContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PaintContext;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-      }
-    }
-  }
-}
-
-class java::awt::PaintContext : public ::java::lang::Object
-{
-
-public:
-  virtual void dispose() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::image::Raster * getRaster(jint, jint, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_PaintContext__
diff --git a/libjava/java/awt/Panel$AccessibleAWTPanel.h b/libjava/java/awt/Panel$AccessibleAWTPanel.h
deleted file mode 100644
index 386cf0a2b4e..00000000000
--- a/libjava/java/awt/Panel$AccessibleAWTPanel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Panel$AccessibleAWTPanel__
-#define __java_awt_Panel$AccessibleAWTPanel__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Panel;
-        class Panel$AccessibleAWTPanel;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::Panel$AccessibleAWTPanel : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  Panel$AccessibleAWTPanel(::java::awt::Panel *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -6409552226660031050LL;
-public: // actually package-private
-  ::java::awt::Panel * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Panel$AccessibleAWTPanel__
diff --git a/libjava/java/awt/Panel.h b/libjava/java/awt/Panel.h
deleted file mode 100644
index 23a788e4be2..00000000000
--- a/libjava/java/awt/Panel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Panel__
-#define __java_awt_Panel__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class LayoutManager;
-        class Panel;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Panel : public ::java::awt::Container
-{
-
-public:
-  Panel();
-  Panel(::java::awt::LayoutManager *);
-  virtual void addNotify();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = -2728009084054400034LL;
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Container)))) context;
-  jboolean initialSystemUpdateDone;
-  jboolean initialUpdateConsumed;
-  static jlong next_panel_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Panel__
diff --git a/libjava/java/awt/Point.h b/libjava/java/awt/Point.h
deleted file mode 100644
index a161a00cdf5..00000000000
--- a/libjava/java/awt/Point.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Point__
-#define __java_awt_Point__
-
-#pragma interface
-
-#include <java/awt/geom/Point2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-    }
-  }
-}
-
-class java::awt::Point : public ::java::awt::geom::Point2D
-{
-
-public:
-  Point();
-  Point(::java::awt::Point *);
-  Point(jint, jint);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual void setLocation(jint, jint);
-  virtual void setLocation(jdouble, jdouble);
-  virtual void move(jint, jint);
-  virtual void translate(jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -5276940640259749850LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::awt::geom::Point2D)))) x;
-  jint y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Point__
diff --git a/libjava/java/awt/PointerInfo.h b/libjava/java/awt/PointerInfo.h
deleted file mode 100644
index fc149bbf014..00000000000
--- a/libjava/java/awt/PointerInfo.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PointerInfo__
-#define __java_awt_PointerInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsDevice;
-        class Point;
-        class PointerInfo;
-    }
-  }
-}
-
-class java::awt::PointerInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PointerInfo(::java::awt::GraphicsDevice *, ::java::awt::Point *);
-public:
-  virtual ::java::awt::GraphicsDevice * getDevice();
-  virtual ::java::awt::Point * getLocation();
-private:
-  ::java::awt::GraphicsDevice * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gd;
-  ::java::awt::Point * p;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PointerInfo__
diff --git a/libjava/java/awt/Polygon$1.h b/libjava/java/awt/Polygon$1.h
deleted file mode 100644
index cd1aaaf9cfe..00000000000
--- a/libjava/java/awt/Polygon$1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Polygon$1__
-#define __java_awt_Polygon$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Polygon;
-        class Polygon$1;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-  }
-}
-
-class java::awt::Polygon$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Polygon$1(::java::awt::Polygon *, ::java::awt::geom::AffineTransform *);
-public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) vertex;
-public: // actually package-private
-  ::java::awt::Polygon * this$0;
-private:
-  ::java::awt::geom::AffineTransform * val$transform;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Polygon$1__
diff --git a/libjava/java/awt/Polygon.h b/libjava/java/awt/Polygon.h
deleted file mode 100644
index e692f132e96..00000000000
--- a/libjava/java/awt/Polygon.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Polygon__
-#define __java_awt_Polygon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Polygon;
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::Polygon : public ::java::lang::Object
-{
-
-public:
-  Polygon();
-  Polygon(JArray< jint > *, JArray< jint > *, jint);
-  virtual void reset();
-  virtual void invalidate();
-  virtual void translate(jint, jint);
-  virtual void addPoint(jint, jint);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Rectangle * getBoundingBox();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual jboolean contains(jint, jint);
-  virtual jboolean inside(jint, jint);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-private:
-  jint evaluateCrossings(jdouble, jdouble, jboolean, jdouble);
-  static const jlong serialVersionUID = -6460061437900069969LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) npoints;
-  JArray< jint > * xpoints;
-  JArray< jint > * ypoints;
-public: // actually protected
-  ::java::awt::Rectangle * bounds;
-private:
-  static jdouble BIG_VALUE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Polygon__
diff --git a/libjava/java/awt/PopupMenu$AccessibleAWTPopupMenu.h b/libjava/java/awt/PopupMenu$AccessibleAWTPopupMenu.h
deleted file mode 100644
index f28ed4cac80..00000000000
--- a/libjava/java/awt/PopupMenu$AccessibleAWTPopupMenu.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PopupMenu$AccessibleAWTPopupMenu__
-#define __java_awt_PopupMenu$AccessibleAWTPopupMenu__
-
-#pragma interface
-
-#include <java/awt/Menu$AccessibleAWTMenu.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PopupMenu;
-        class PopupMenu$AccessibleAWTPopupMenu;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::PopupMenu$AccessibleAWTPopupMenu : public ::java::awt::Menu$AccessibleAWTMenu
-{
-
-public: // actually protected
-  PopupMenu$AccessibleAWTPopupMenu(::java::awt::PopupMenu *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -4282044795947239955LL;
-public: // actually package-private
-  ::java::awt::PopupMenu * __attribute__((aligned(__alignof__( ::java::awt::Menu$AccessibleAWTMenu)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PopupMenu$AccessibleAWTPopupMenu__
diff --git a/libjava/java/awt/PopupMenu.h b/libjava/java/awt/PopupMenu.h
deleted file mode 100644
index 855809bb0f8..00000000000
--- a/libjava/java/awt/PopupMenu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PopupMenu__
-#define __java_awt_PopupMenu__
-
-#pragma interface
-
-#include <java/awt/Menu.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class PopupMenu;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::PopupMenu : public ::java::awt::Menu
-{
-
-public:
-  PopupMenu();
-  PopupMenu(::java::lang::String *);
-  virtual void addNotify();
-  virtual void show(::java::awt::Component *, jint, jint);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-  static jlong next_popup_number;
-  static const jlong serialVersionUID = -4620452533522760060LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PopupMenu__
diff --git a/libjava/java/awt/PrintGraphics.h b/libjava/java/awt/PrintGraphics.h
deleted file mode 100644
index 7027cb6b743..00000000000
--- a/libjava/java/awt/PrintGraphics.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PrintGraphics__
-#define __java_awt_PrintGraphics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PrintGraphics;
-        class PrintJob;
-    }
-  }
-}
-
-class java::awt::PrintGraphics : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::PrintJob * getPrintJob() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_PrintGraphics__
diff --git a/libjava/java/awt/PrintJob.h b/libjava/java/awt/PrintJob.h
deleted file mode 100644
index 66c98e3e31b..00000000000
--- a/libjava/java/awt/PrintJob.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_PrintJob__
-#define __java_awt_PrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class PrintJob;
-    }
-  }
-}
-
-class java::awt::PrintJob : public ::java::lang::Object
-{
-
-public:
-  PrintJob();
-  virtual ::java::awt::Graphics * getGraphics() = 0;
-  virtual ::java::awt::Dimension * getPageDimension() = 0;
-  virtual jint getPageResolution() = 0;
-  virtual jboolean lastPageFirst() = 0;
-  virtual void end() = 0;
-  virtual void finalize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_PrintJob__
diff --git a/libjava/java/awt/Rectangle.h b/libjava/java/awt/Rectangle.h
deleted file mode 100644
index 6a098adb513..00000000000
--- a/libjava/java/awt/Rectangle.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Rectangle__
-#define __java_awt_Rectangle__
-
-#pragma interface
-
-#include <java/awt/geom/Rectangle2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Point;
-        class Rectangle;
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::Rectangle : public ::java::awt::geom::Rectangle2D
-{
-
-public:
-  Rectangle();
-  Rectangle(::java::awt::Rectangle *);
-  Rectangle(jint, jint, jint, jint);
-  Rectangle(jint, jint);
-  Rectangle(::java::awt::Point *, ::java::awt::Dimension *);
-  Rectangle(::java::awt::Point *);
-  Rectangle(::java::awt::Dimension *);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual void setBounds(jint, jint, jint, jint);
-  virtual void setRect(jdouble, jdouble, jdouble, jdouble);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual void setLocation(jint, jint);
-  virtual void move(jint, jint);
-  virtual void translate(jint, jint);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void setSize(jint, jint);
-  virtual void resize(jint, jint);
-  virtual jboolean contains(::java::awt::Point *);
-  virtual jboolean contains(jint, jint);
-  virtual jboolean contains(::java::awt::Rectangle *);
-  virtual jboolean contains(jint, jint, jint, jint);
-  virtual jboolean inside(jint, jint);
-  virtual jboolean intersects(::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * intersection(::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * union$(::java::awt::Rectangle *);
-  virtual void add(jint, jint);
-  virtual void add(::java::awt::Point *);
-  virtual void add(::java::awt::Rectangle *);
-  virtual void grow(jint, jint);
-  virtual jboolean isEmpty();
-  virtual jint outcode(jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -4345857070255674764LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::awt::geom::Rectangle2D)))) x;
-  jint y;
-  jint width;
-  jint height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Rectangle__
diff --git a/libjava/java/awt/RenderingHints$Key.h b/libjava/java/awt/RenderingHints$Key.h
deleted file mode 100644
index 7f4c9724cfd..00000000000
--- a/libjava/java/awt/RenderingHints$Key.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_RenderingHints$Key__
-#define __java_awt_RenderingHints$Key__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints$Key;
-    }
-  }
-}
-
-class java::awt::RenderingHints$Key : public ::java::lang::Object
-{
-
-public: // actually protected
-  RenderingHints$Key(jint);
-public:
-  virtual jboolean isCompatibleValue(::java::lang::Object *) = 0;
-public: // actually protected
-  virtual jint intKey();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_RenderingHints$Key__
diff --git a/libjava/java/awt/RenderingHints$KeyImpl.h b/libjava/java/awt/RenderingHints$KeyImpl.h
deleted file mode 100644
index d81b7b9c1bc..00000000000
--- a/libjava/java/awt/RenderingHints$KeyImpl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_RenderingHints$KeyImpl__
-#define __java_awt_RenderingHints$KeyImpl__
-
-#pragma interface
-
-#include <java/awt/RenderingHints$Key.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints$KeyImpl;
-    }
-  }
-}
-
-class java::awt::RenderingHints$KeyImpl : public ::java::awt::RenderingHints$Key
-{
-
-public: // actually package-private
-  RenderingHints$KeyImpl(jint, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  jboolean isCompatibleValue(::java::lang::Object *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::RenderingHints$Key)))) description;
-  ::java::lang::Object * v1;
-  ::java::lang::Object * v2;
-  ::java::lang::Object * v3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_RenderingHints$KeyImpl__
diff --git a/libjava/java/awt/RenderingHints.h b/libjava/java/awt/RenderingHints.h
deleted file mode 100644
index 6ceee185348..00000000000
--- a/libjava/java/awt/RenderingHints.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_RenderingHints__
-#define __java_awt_RenderingHints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-        class RenderingHints$Key;
-    }
-  }
-}
-
-class java::awt::RenderingHints : public ::java::lang::Object
-{
-
-public:
-  RenderingHints(::java::util::Map *);
-  RenderingHints(::java::awt::RenderingHints$Key *, ::java::lang::Object *);
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void add(::java::awt::RenderingHints *);
-  virtual void clear();
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::util::Set * keySet();
-  virtual ::java::util::Collection * values();
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hintMap;
-public:
-  static ::java::awt::RenderingHints$Key * KEY_ANTIALIASING;
-  static ::java::lang::Object * VALUE_ANTIALIAS_ON;
-  static ::java::lang::Object * VALUE_ANTIALIAS_OFF;
-  static ::java::lang::Object * VALUE_ANTIALIAS_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_RENDERING;
-  static ::java::lang::Object * VALUE_RENDER_SPEED;
-  static ::java::lang::Object * VALUE_RENDER_QUALITY;
-  static ::java::lang::Object * VALUE_RENDER_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_DITHERING;
-  static ::java::lang::Object * VALUE_DITHER_DISABLE;
-  static ::java::lang::Object * VALUE_DITHER_ENABLE;
-  static ::java::lang::Object * VALUE_DITHER_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_TEXT_ANTIALIASING;
-  static ::java::lang::Object * VALUE_TEXT_ANTIALIAS_ON;
-  static ::java::lang::Object * VALUE_TEXT_ANTIALIAS_OFF;
-  static ::java::lang::Object * VALUE_TEXT_ANTIALIAS_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_FRACTIONALMETRICS;
-  static ::java::lang::Object * VALUE_FRACTIONALMETRICS_OFF;
-  static ::java::lang::Object * VALUE_FRACTIONALMETRICS_ON;
-  static ::java::lang::Object * VALUE_FRACTIONALMETRICS_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_INTERPOLATION;
-  static ::java::lang::Object * VALUE_INTERPOLATION_NEAREST_NEIGHBOR;
-  static ::java::lang::Object * VALUE_INTERPOLATION_BILINEAR;
-  static ::java::lang::Object * VALUE_INTERPOLATION_BICUBIC;
-  static ::java::awt::RenderingHints$Key * KEY_ALPHA_INTERPOLATION;
-  static ::java::lang::Object * VALUE_ALPHA_INTERPOLATION_SPEED;
-  static ::java::lang::Object * VALUE_ALPHA_INTERPOLATION_QUALITY;
-  static ::java::lang::Object * VALUE_ALPHA_INTERPOLATION_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_COLOR_RENDERING;
-  static ::java::lang::Object * VALUE_COLOR_RENDER_SPEED;
-  static ::java::lang::Object * VALUE_COLOR_RENDER_QUALITY;
-  static ::java::lang::Object * VALUE_COLOR_RENDER_DEFAULT;
-  static ::java::awt::RenderingHints$Key * KEY_STROKE_CONTROL;
-  static ::java::lang::Object * VALUE_STROKE_DEFAULT;
-  static ::java::lang::Object * VALUE_STROKE_NORMALIZE;
-  static ::java::lang::Object * VALUE_STROKE_PURE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_RenderingHints__
diff --git a/libjava/java/awt/Robot$1.h b/libjava/java/awt/Robot$1.h
deleted file mode 100644
index b455f7246d6..00000000000
--- a/libjava/java/awt/Robot$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Robot$1__
-#define __java_awt_Robot$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Robot;
-        class Robot$1;
-    }
-  }
-}
-
-class java::awt::Robot$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Robot$1(::java::awt::Robot *);
-public:
-  void run();
-public: // actually package-private
-  ::java::awt::Robot * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Robot$1__
diff --git a/libjava/java/awt/Robot.h b/libjava/java/awt/Robot.h
deleted file mode 100644
index d283f7e97e7..00000000000
--- a/libjava/java/awt/Robot.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Robot__
-#define __java_awt_Robot__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class GraphicsDevice;
-        class Rectangle;
-        class Robot;
-      namespace image
-      {
-          class BufferedImage;
-      }
-      namespace peer
-      {
-          class RobotPeer;
-      }
-    }
-  }
-}
-
-class java::awt::Robot : public ::java::lang::Object
-{
-
-public:
-  Robot();
-  Robot(::java::awt::GraphicsDevice *);
-  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);
-  virtual ::java::awt::Color * getPixelColor(jint, jint);
-  virtual ::java::awt::image::BufferedImage * createScreenCapture(::java::awt::Rectangle *);
-  virtual jboolean isAutoWaitForIdle();
-  virtual void setAutoWaitForIdle(jboolean);
-  virtual jint getAutoDelay();
-  virtual void setAutoDelay(jint);
-  virtual void delay(jint);
-  virtual void waitForIdle();
-  virtual ::java::lang::String * toString();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitForIdle__;
-  jint autoDelay;
-  ::java::awt::peer::RobotPeer * peer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Robot__
diff --git a/libjava/java/awt/ScrollPane$AccessibleAWTScrollPane.h b/libjava/java/awt/ScrollPane$AccessibleAWTScrollPane.h
deleted file mode 100644
index dd103cde337..00000000000
--- a/libjava/java/awt/ScrollPane$AccessibleAWTScrollPane.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ScrollPane$AccessibleAWTScrollPane__
-#define __java_awt_ScrollPane$AccessibleAWTScrollPane__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ScrollPane;
-        class ScrollPane$AccessibleAWTScrollPane;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class java::awt::ScrollPane$AccessibleAWTScrollPane : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  ScrollPane$AccessibleAWTScrollPane(::java::awt::ScrollPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 6100703663886637LL;
-public: // actually package-private
-  ::java::awt::ScrollPane * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ScrollPane$AccessibleAWTScrollPane__
diff --git a/libjava/java/awt/ScrollPane.h b/libjava/java/awt/ScrollPane.h
deleted file mode 100644
index 30110cf7e78..00000000000
--- a/libjava/java/awt/ScrollPane.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ScrollPane__
-#define __java_awt_ScrollPane__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Adjustable;
-        class Component;
-        class Dimension;
-        class Graphics;
-        class LayoutManager;
-        class Point;
-        class ScrollPane;
-        class ScrollPaneAdjustable;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::ScrollPane : public ::java::awt::Container
-{
-
-public:
-  ScrollPane();
-  ScrollPane(jint);
-  virtual jint getScrollbarDisplayPolicy();
-  virtual ::java::awt::Adjustable * getHAdjustable();
-  virtual ::java::awt::Adjustable * getVAdjustable();
-  virtual ::java::awt::Dimension * getViewportSize();
-  virtual jint getHScrollbarHeight();
-  virtual jint getVScrollbarWidth();
-  virtual ::java::awt::Point * getScrollPosition();
-  virtual void setScrollPosition(::java::awt::Point *);
-  virtual void setScrollPosition(jint, jint);
-  virtual void addNotify();
-  virtual void removeNotify();
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void doLayout();
-  virtual void layout();
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void printComponents(::java::awt::Graphics *);
-  virtual ::java::lang::String * paramString();
-private:
-  ::java::lang::String * getScrollbarDisplayPolicyString();
-  ::java::lang::String * getIsValidString();
-public: // actually protected
-  virtual jboolean eventTypeEnabled(jint);
-public:
-  virtual jboolean isWheelScrollingEnabled();
-  virtual void setWheelScrollingEnabled(jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  static const jint SCROLLBARS_AS_NEEDED = 0;
-  static const jint SCROLLBARS_ALWAYS = 1;
-  static const jint SCROLLBARS_NEVER = 2;
-private:
-  static jlong next_scrollpane_number;
-  static const jlong serialVersionUID = 7956609840827222915LL;
-  ::java::awt::ScrollPaneAdjustable * __attribute__((aligned(__alignof__( ::java::awt::Container)))) hAdjustable;
-  ::java::awt::ScrollPaneAdjustable * vAdjustable;
-  jint scrollbarDisplayPolicy;
-  ::java::awt::Point * scrollPosition;
-  jboolean wheelScrollingEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ScrollPane__
diff --git a/libjava/java/awt/ScrollPaneAdjustable.h b/libjava/java/awt/ScrollPaneAdjustable.h
deleted file mode 100644
index a07d48c0c86..00000000000
--- a/libjava/java/awt/ScrollPaneAdjustable.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_ScrollPaneAdjustable__
-#define __java_awt_ScrollPaneAdjustable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ScrollPane;
-        class ScrollPaneAdjustable;
-      namespace event
-      {
-          class AdjustmentListener;
-      }
-    }
-  }
-}
-
-class java::awt::ScrollPaneAdjustable : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScrollPaneAdjustable(::java::awt::ScrollPane *, jint);
-  ScrollPaneAdjustable(::java::awt::ScrollPane *, jint, jint, jint, jint, jint, jint, jint);
-public:
-  virtual void addAdjustmentListener(::java::awt::event::AdjustmentListener *);
-  virtual void removeAdjustmentListener(::java::awt::event::AdjustmentListener *);
-  virtual JArray< ::java::awt::event::AdjustmentListener * > * getAdjustmentListeners();
-  virtual jint getBlockIncrement();
-  virtual jint getMaximum();
-  virtual jint getMinimum();
-  virtual jint getOrientation();
-  virtual jint getUnitIncrement();
-  virtual jint getValue();
-  virtual jint getVisibleAmount();
-  virtual void setBlockIncrement(jint);
-  virtual void setMaximum(jint);
-  virtual void setMinimum(jint);
-  virtual void setUnitIncrement(jint);
-  virtual void setValue(jint);
-  virtual void setVisibleAmount(jint);
-  virtual ::java::lang::String * paramString();
-private:
-  ::java::lang::String * paramStringHelper();
-public:
-  virtual ::java::lang::String * toString();
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-private:
-  static const jlong serialVersionUID = -3359745691033257079LL;
-public: // actually package-private
-  ::java::awt::ScrollPane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sp;
-  jint orientation;
-  jint value;
-  jint minimum;
-  jint maximum;
-  jint visibleAmount;
-  jint unitIncrement;
-  jint blockIncrement;
-  ::java::awt::event::AdjustmentListener * adjustmentListener;
-private:
-  jboolean valueIsAdjusting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_ScrollPaneAdjustable__
diff --git a/libjava/java/awt/Scrollbar$AccessibleAWTScrollBar.h b/libjava/java/awt/Scrollbar$AccessibleAWTScrollBar.h
deleted file mode 100644
index 1549a6a24cd..00000000000
--- a/libjava/java/awt/Scrollbar$AccessibleAWTScrollBar.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Scrollbar$AccessibleAWTScrollBar__
-#define __java_awt_Scrollbar$AccessibleAWTScrollBar__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Scrollbar;
-        class Scrollbar$AccessibleAWTScrollBar;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-  }
-}
-
-class java::awt::Scrollbar$AccessibleAWTScrollBar : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public: // actually protected
-  Scrollbar$AccessibleAWTScrollBar(::java::awt::Scrollbar *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-private:
-  static const jlong serialVersionUID = -344337268523697807LL;
-public: // actually package-private
-  ::java::awt::Scrollbar * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Scrollbar$AccessibleAWTScrollBar__
diff --git a/libjava/java/awt/Scrollbar.h b/libjava/java/awt/Scrollbar.h
deleted file mode 100644
index d13f504e979..00000000000
--- a/libjava/java/awt/Scrollbar.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Scrollbar__
-#define __java_awt_Scrollbar__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Scrollbar;
-      namespace event
-      {
-          class AdjustmentEvent;
-          class AdjustmentListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Scrollbar : public ::java::awt::Component
-{
-
-public:
-  Scrollbar();
-  Scrollbar(jint);
-  Scrollbar(jint, jint, jint, jint, jint);
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual jint getValue();
-  virtual void setValue(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getVisibleAmount();
-  virtual jint getVisible();
-  virtual void setVisibleAmount(jint);
-  virtual void setValues(jint, jint, jint, jint);
-  virtual jint getUnitIncrement();
-  virtual jint getLineIncrement();
-  virtual void setUnitIncrement(jint);
-  virtual void setLineIncrement(jint);
-  virtual jint getBlockIncrement();
-  virtual jint getPageIncrement();
-  virtual void setBlockIncrement(jint);
-  virtual void setPageIncrement(jint);
-  virtual void addNotify();
-  virtual void addAdjustmentListener(::java::awt::event::AdjustmentListener *);
-  virtual void removeAdjustmentListener(::java::awt::event::AdjustmentListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processAdjustmentEvent(::java::awt::event::AdjustmentEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::AdjustmentListener * > * getAdjustmentListeners();
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  static const jint HORIZONTAL = 0;
-  static const jint VERTICAL = 1;
-private:
-  static const jlong serialVersionUID = 8451667562882310543LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::Component)))) lineIncrement;
-  jint pageIncrement;
-  jint maximum;
-  jint minimum;
-  jint orientation;
-  jint value;
-  jint visibleAmount;
-  ::java::awt::event::AdjustmentListener * adjustment_listeners;
-  jboolean valueIsAdjusting;
-  static jlong next_scrollbar_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Scrollbar__
diff --git a/libjava/java/awt/Shape.h b/libjava/java/awt/Shape.h
deleted file mode 100644
index facef750333..00000000000
--- a/libjava/java/awt/Shape.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Shape__
-#define __java_awt_Shape__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::Shape : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
-  virtual jboolean contains(jdouble, jdouble) = 0;
-  virtual jboolean contains(::java::awt::geom::Point2D *) = 0;
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *) = 0;
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *) = 0;
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *) = 0;
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Shape__
diff --git a/libjava/java/awt/Stroke.h b/libjava/java/awt/Stroke.h
deleted file mode 100644
index bb04e488637..00000000000
--- a/libjava/java/awt/Stroke.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Stroke__
-#define __java_awt_Stroke__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-        class Stroke;
-    }
-  }
-}
-
-class java::awt::Stroke : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Shape * createStrokedShape(::java::awt::Shape *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Stroke__
diff --git a/libjava/java/awt/SystemColor.h b/libjava/java/awt/SystemColor.h
deleted file mode 100644
index 5e561faca5c..00000000000
--- a/libjava/java/awt/SystemColor.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_SystemColor__
-#define __java_awt_SystemColor__
-
-#pragma interface
-
-#include <java/awt/Color.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-        class SystemColor;
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::SystemColor : public ::java::awt::Color
-{
-
-  SystemColor(jint);
-public:
-  jint getRGB();
-  ::java::awt::PaintContext * createContext(::java::awt::image::ColorModel *, ::java::awt::Rectangle *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4503142729533789064LL;
-public:
-  static const jint DESKTOP = 0;
-  static const jint ACTIVE_CAPTION = 1;
-  static const jint ACTIVE_CAPTION_TEXT = 2;
-  static const jint ACTIVE_CAPTION_BORDER = 3;
-  static const jint INACTIVE_CAPTION = 4;
-  static const jint INACTIVE_CAPTION_TEXT = 5;
-  static const jint INACTIVE_CAPTION_BORDER = 6;
-  static const jint WINDOW = 7;
-  static const jint WINDOW_BORDER = 8;
-  static const jint WINDOW_TEXT = 9;
-  static const jint MENU = 10;
-  static const jint MENU_TEXT = 11;
-  static const jint TEXT = 12;
-  static const jint TEXT_TEXT = 13;
-  static const jint TEXT_HIGHLIGHT = 14;
-  static const jint TEXT_HIGHLIGHT_TEXT = 15;
-  static const jint TEXT_INACTIVE_TEXT = 16;
-  static const jint CONTROL = 17;
-  static const jint CONTROL_TEXT = 18;
-  static const jint CONTROL_HIGHLIGHT = 19;
-  static const jint CONTROL_LT_HIGHLIGHT = 20;
-  static const jint CONTROL_SHADOW = 21;
-  static const jint CONTROL_DK_SHADOW = 22;
-  static const jint SCROLLBAR = 23;
-  static const jint INFO = 24;
-  static const jint INFO_TEXT = 25;
-  static const jint NUM_COLORS = 26;
-private:
-  static JArray< jint > * colors;
-public:
-  static ::java::awt::SystemColor * desktop;
-  static ::java::awt::SystemColor * activeCaption;
-  static ::java::awt::SystemColor * activeCaptionText;
-  static ::java::awt::SystemColor * activeCaptionBorder;
-  static ::java::awt::SystemColor * inactiveCaption;
-  static ::java::awt::SystemColor * inactiveCaptionText;
-  static ::java::awt::SystemColor * inactiveCaptionBorder;
-  static ::java::awt::SystemColor * window;
-  static ::java::awt::SystemColor * windowBorder;
-  static ::java::awt::SystemColor * windowText;
-  static ::java::awt::SystemColor * menu;
-  static ::java::awt::SystemColor * menuText;
-  static ::java::awt::SystemColor * text;
-  static ::java::awt::SystemColor * textText;
-  static ::java::awt::SystemColor * textHighlight;
-  static ::java::awt::SystemColor * textHighlightText;
-  static ::java::awt::SystemColor * textInactiveText;
-  static ::java::awt::SystemColor * control;
-  static ::java::awt::SystemColor * controlText;
-  static ::java::awt::SystemColor * controlHighlight;
-  static ::java::awt::SystemColor * controlLtHighlight;
-  static ::java::awt::SystemColor * controlShadow;
-  static ::java::awt::SystemColor * controlDkShadow;
-  static ::java::awt::SystemColor * scrollbar;
-  static ::java::awt::SystemColor * info;
-  static ::java::awt::SystemColor * infoText;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_SystemColor__
diff --git a/libjava/java/awt/TextArea$AccessibleAWTTextArea.h b/libjava/java/awt/TextArea$AccessibleAWTTextArea.h
deleted file mode 100644
index 0803d64183e..00000000000
--- a/libjava/java/awt/TextArea$AccessibleAWTTextArea.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextArea$AccessibleAWTTextArea__
-#define __java_awt_TextArea$AccessibleAWTTextArea__
-
-#pragma interface
-
-#include <java/awt/TextComponent$AccessibleAWTTextComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class TextArea;
-        class TextArea$AccessibleAWTTextArea;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::TextArea$AccessibleAWTTextArea : public ::java::awt::TextComponent$AccessibleAWTTextComponent
-{
-
-public: // actually protected
-  TextArea$AccessibleAWTTextArea(::java::awt::TextArea *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 3472827823632144419LL;
-public: // actually package-private
-  ::java::awt::TextArea * __attribute__((aligned(__alignof__( ::java::awt::TextComponent$AccessibleAWTTextComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextArea$AccessibleAWTTextArea__
diff --git a/libjava/java/awt/TextArea.h b/libjava/java/awt/TextArea.h
deleted file mode 100644
index d1b0d66c870..00000000000
--- a/libjava/java/awt/TextArea.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextArea__
-#define __java_awt_TextArea__
-
-#pragma interface
-
-#include <java/awt/TextComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class TextArea;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::TextArea : public ::java::awt::TextComponent
-{
-
-public:
-  TextArea();
-  TextArea(::java::lang::String *);
-  TextArea(jint, jint);
-  TextArea(::java::lang::String *, jint, jint);
-  TextArea(::java::lang::String *, jint, jint, jint);
-  virtual jint getColumns();
-  virtual void setColumns(jint);
-  virtual jint getRows();
-  virtual void setRows(jint);
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMinimumSize(jint, jint);
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * minimumSize(jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getPreferredSize(jint, jint);
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Dimension * preferredSize(jint, jint);
-  virtual jint getScrollbarVisibility();
-  virtual void addNotify();
-  virtual void append(::java::lang::String *);
-  virtual void appendText(::java::lang::String *);
-  virtual void insert(::java::lang::String *, jint);
-  virtual void insertText(::java::lang::String *, jint);
-  virtual void replaceRange(::java::lang::String *, jint, jint);
-  virtual void replaceText(::java::lang::String *, jint, jint);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  static const jint SCROLLBARS_BOTH = 0;
-  static const jint SCROLLBARS_VERTICAL_ONLY = 1;
-  static const jint SCROLLBARS_HORIZONTAL_ONLY = 2;
-  static const jint SCROLLBARS_NONE = 3;
-private:
-  static const jlong serialVersionUID = 3692302836626095722LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::TextComponent)))) columns;
-  jint rows;
-  jint scrollbarVisibility;
-  static jlong next_text_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextArea__
diff --git a/libjava/java/awt/TextComponent$AccessibleAWTTextComponent.h b/libjava/java/awt/TextComponent$AccessibleAWTTextComponent.h
deleted file mode 100644
index 94d0031a3e5..00000000000
--- a/libjava/java/awt/TextComponent$AccessibleAWTTextComponent.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextComponent$AccessibleAWTTextComponent__
-#define __java_awt_TextComponent$AccessibleAWTTextComponent__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-        class TextComponent;
-        class TextComponent$AccessibleAWTTextComponent;
-      namespace event
-      {
-          class TextEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleText;
-    }
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class java::awt::TextComponent$AccessibleAWTTextComponent : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public:
-  TextComponent$AccessibleAWTTextComponent(::java::awt::TextComponent *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual jint getIndexAtPoint(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getCharCount();
-  virtual jint getCaretPosition();
-  virtual ::java::lang::String * getAtIndex(jint, jint);
-  virtual ::java::lang::String * getAfterIndex(jint, jint);
-  virtual ::java::lang::String * getBeforeIndex(jint, jint);
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint);
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual ::java::lang::String * getSelectedText();
-  virtual void textValueChanged(::java::awt::event::TextEvent *);
-private:
-  static const jlong serialVersionUID = 3631432373506317811LL;
-public: // actually package-private
-  ::java::awt::TextComponent * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextComponent$AccessibleAWTTextComponent__
diff --git a/libjava/java/awt/TextComponent.h b/libjava/java/awt/TextComponent.h
deleted file mode 100644
index 2b12f8b29d2..00000000000
--- a/libjava/java/awt/TextComponent.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextComponent__
-#define __java_awt_TextComponent__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Point;
-        class Rectangle;
-        class TextComponent;
-      namespace event
-      {
-          class TextEvent;
-          class TextListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::TextComponent : public ::java::awt::Component
-{
-
-public: // actually package-private
-  TextComponent(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  virtual ::java::lang::String * getSelectedText();
-  virtual jint getSelectionStart();
-  virtual void setSelectionStart(jint);
-  virtual jint getSelectionEnd();
-  virtual void setSelectionEnd(jint);
-  virtual void select(jint, jint);
-  virtual void selectAll();
-  virtual jint getCaretPosition();
-  virtual void setCaretPosition(jint);
-  virtual jboolean isEditable();
-  virtual void setEditable(jboolean);
-  virtual void removeNotify();
-  virtual void addTextListener(::java::awt::event::TextListener *);
-  virtual void removeTextListener(::java::awt::event::TextListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processTextEvent(::java::awt::event::TextEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::TextListener * > * getTextListeners();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual jint getIndexAtPoint(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  static jboolean ignoreOldMouseEvents();
-private:
-  static const jlong serialVersionUID = -2214773872412987419LL;
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::Component)))) editable;
-  jint selectionStart;
-  jint selectionEnd;
-  ::java::lang::String * text;
-public: // actually protected
-  ::java::awt::event::TextListener * textListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextComponent__
diff --git a/libjava/java/awt/TextField$AccessibleAWTTextField.h b/libjava/java/awt/TextField$AccessibleAWTTextField.h
deleted file mode 100644
index b49056a3f34..00000000000
--- a/libjava/java/awt/TextField$AccessibleAWTTextField.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextField$AccessibleAWTTextField__
-#define __java_awt_TextField$AccessibleAWTTextField__
-
-#pragma interface
-
-#include <java/awt/TextComponent$AccessibleAWTTextComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class TextField;
-        class TextField$AccessibleAWTTextField;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::TextField$AccessibleAWTTextField : public ::java::awt::TextComponent$AccessibleAWTTextComponent
-{
-
-public: // actually protected
-  TextField$AccessibleAWTTextField(::java::awt::TextField *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 6219164359235943158LL;
-public: // actually package-private
-  ::java::awt::TextField * __attribute__((aligned(__alignof__( ::java::awt::TextComponent$AccessibleAWTTextComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextField$AccessibleAWTTextField__
diff --git a/libjava/java/awt/TextField.h b/libjava/java/awt/TextField.h
deleted file mode 100644
index 747fe352155..00000000000
--- a/libjava/java/awt/TextField.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TextField__
-#define __java_awt_TextField__
-
-#pragma interface
-
-#include <java/awt/TextComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Dimension;
-        class TextField;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::TextField : public ::java::awt::TextComponent
-{
-
-public:
-  TextField();
-  TextField(::java::lang::String *);
-  TextField(jint);
-  TextField(::java::lang::String *, jint);
-  virtual jint getColumns();
-  virtual void setColumns(jint);
-  virtual jchar getEchoChar();
-  virtual void setEchoChar(jchar);
-  virtual void setEchoCharacter(jchar);
-  virtual jboolean echoCharIsSet();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMinimumSize(jint);
-  virtual ::java::awt::Dimension * minimumSize();
-  virtual ::java::awt::Dimension * minimumSize(jint);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getPreferredSize(jint);
-  virtual ::java::awt::Dimension * preferredSize();
-  virtual ::java::awt::Dimension * preferredSize(jint);
-  virtual void addNotify();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processActionEvent(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-private:
-  static jlong getUniqueLong();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static jlong next_textfield_number;
-  static const jlong serialVersionUID = -2966288784432217853LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::TextComponent)))) columns;
-  jchar echoChar;
-  ::java::awt::event::ActionListener * action_listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TextField__
diff --git a/libjava/java/awt/TexturePaint.h b/libjava/java/awt/TexturePaint.h
deleted file mode 100644
index a6711ad6b8a..00000000000
--- a/libjava/java/awt/TexturePaint.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_TexturePaint__
-#define __java_awt_TexturePaint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class PaintContext;
-        class Rectangle;
-        class RenderingHints;
-        class TexturePaint;
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::TexturePaint : public ::java::lang::Object
-{
-
-public:
-  TexturePaint(::java::awt::image::BufferedImage *, ::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::image::BufferedImage * getImage();
-  virtual ::java::awt::geom::Rectangle2D * getAnchorRect();
-  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();
-private:
-  ::java::awt::image::BufferedImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) texture;
-  ::java::awt::geom::Rectangle2D * anchor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_TexturePaint__
diff --git a/libjava/java/awt/Toolkit$1.h b/libjava/java/awt/Toolkit$1.h
deleted file mode 100644
index f884420bb83..00000000000
--- a/libjava/java/awt/Toolkit$1.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Toolkit$1__
-#define __java_awt_Toolkit$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Toolkit$1;
-    }
-  }
-}
-
-class java::awt::Toolkit$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Toolkit$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Toolkit$1__
diff --git a/libjava/java/awt/Toolkit$2.h b/libjava/java/awt/Toolkit$2.h
deleted file mode 100644
index 6eb50a74f6a..00000000000
--- a/libjava/java/awt/Toolkit$2.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Toolkit$2__
-#define __java_awt_Toolkit$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Toolkit$2;
-    }
-  }
-}
-
-class java::awt::Toolkit$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Toolkit$2();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Toolkit$2__
diff --git a/libjava/java/awt/Toolkit.h b/libjava/java/awt/Toolkit.h
deleted file mode 100644
index d8af0cd1545..00000000000
--- a/libjava/java/awt/Toolkit.h
+++ /dev/null
@@ -1,245 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Toolkit__
-#define __java_awt_Toolkit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace peer
-        {
-            class GLightweightPeer;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Button;
-        class Canvas;
-        class Checkbox;
-        class CheckboxMenuItem;
-        class Choice;
-        class Component;
-        class Container;
-        class Cursor;
-        class Dialog;
-        class Dimension;
-        class EventQueue;
-        class FileDialog;
-        class Font;
-        class FontMetrics;
-        class Frame;
-        class GraphicsConfiguration;
-        class Image;
-        class Insets;
-        class JobAttributes;
-        class Label;
-        class List;
-        class Menu;
-        class MenuBar;
-        class MenuItem;
-        class PageAttributes;
-        class Panel;
-        class Point;
-        class PopupMenu;
-        class PrintJob;
-        class ScrollPane;
-        class Scrollbar;
-        class TextArea;
-        class TextField;
-        class Toolkit;
-        class Window;
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureListener;
-          class DragGestureRecognizer;
-          class DragSource;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-      namespace event
-      {
-          class AWTEventListener;
-          class AWTEventListenerProxy;
-      }
-      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 LightweightPeer;
-          class ListPeer;
-          class MenuBarPeer;
-          class MenuItemPeer;
-          class MenuPeer;
-          class MouseInfoPeer;
-          class PanelPeer;
-          class PopupMenuPeer;
-          class ScrollPanePeer;
-          class ScrollbarPeer;
-          class TextAreaPeer;
-          class TextFieldPeer;
-          class WindowPeer;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class java::awt::Toolkit : public ::java::lang::Object
-{
-
-public:
-  Toolkit();
-public: // actually protected
-  virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *) = 0;
-  virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *) = 0;
-  virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *) = 0;
-  virtual ::java::awt::peer::ListPeer * createList(::java::awt::List *) = 0;
-  virtual ::java::awt::peer::CheckboxPeer * createCheckbox(::java::awt::Checkbox *) = 0;
-  virtual ::java::awt::peer::ScrollbarPeer * createScrollbar(::java::awt::Scrollbar *) = 0;
-  virtual ::java::awt::peer::ScrollPanePeer * createScrollPane(::java::awt::ScrollPane *) = 0;
-  virtual ::java::awt::peer::TextAreaPeer * createTextArea(::java::awt::TextArea *) = 0;
-  virtual ::java::awt::peer::ChoicePeer * createChoice(::java::awt::Choice *) = 0;
-  virtual ::java::awt::peer::FramePeer * createFrame(::java::awt::Frame *) = 0;
-  virtual ::java::awt::peer::CanvasPeer * createCanvas(::java::awt::Canvas *) = 0;
-  virtual ::java::awt::peer::PanelPeer * createPanel(::java::awt::Panel *) = 0;
-  virtual ::java::awt::peer::WindowPeer * createWindow(::java::awt::Window *) = 0;
-  virtual ::java::awt::peer::DialogPeer * createDialog(::java::awt::Dialog *) = 0;
-  virtual ::java::awt::peer::MenuBarPeer * createMenuBar(::java::awt::MenuBar *) = 0;
-  virtual ::java::awt::peer::MenuPeer * createMenu(::java::awt::Menu *) = 0;
-  virtual ::java::awt::peer::PopupMenuPeer * createPopupMenu(::java::awt::PopupMenu *) = 0;
-  virtual ::java::awt::peer::MenuItemPeer * createMenuItem(::java::awt::MenuItem *) = 0;
-  virtual ::java::awt::peer::MouseInfoPeer * getMouseInfoPeer();
-  virtual ::java::awt::peer::FileDialogPeer * createFileDialog(::java::awt::FileDialog *) = 0;
-  virtual ::java::awt::peer::CheckboxMenuItemPeer * createCheckboxMenuItem(::java::awt::CheckboxMenuItem *) = 0;
-  virtual ::java::awt::peer::LightweightPeer * createComponent(::java::awt::Component *);
-  virtual ::java::awt::peer::FontPeer * getFontPeer(::java::lang::String *, jint) = 0;
-  virtual void loadSystemColors(JArray< jint > *);
-public:
-  virtual void setDynamicLayout(jboolean);
-public: // actually protected
-  virtual jboolean isDynamicLayoutSet();
-public:
-  virtual jboolean isDynamicLayoutActive();
-  virtual ::java::awt::Dimension * getScreenSize() = 0;
-  virtual jint getScreenResolution() = 0;
-  virtual ::java::awt::Insets * getScreenInsets(::java::awt::GraphicsConfiguration *);
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual JArray< ::java::lang::String * > * getFontList() = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual void sync() = 0;
-  static ::java::awt::Toolkit * getDefaultToolkit();
-  virtual ::java::awt::Image * getImage(::java::lang::String *) = 0;
-  virtual ::java::awt::Image * getImage(::java::net::URL *) = 0;
-  virtual ::java::awt::Image * createImage(::java::lang::String *) = 0;
-  virtual ::java::awt::Image * createImage(::java::net::URL *) = 0;
-  virtual jboolean prepareImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *) = 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(JArray< jbyte > *);
-  virtual ::java::awt::Image * createImage(JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::util::Properties *) = 0;
-  virtual ::java::awt::PrintJob * getPrintJob(::java::awt::Frame *, ::java::lang::String *, ::java::awt::JobAttributes *, ::java::awt::PageAttributes *);
-  virtual void beep() = 0;
-  virtual ::java::awt::datatransfer::Clipboard * getSystemClipboard() = 0;
-  virtual ::java::awt::datatransfer::Clipboard * getSystemSelection();
-  virtual jint getMenuShortcutKeyMask();
-  virtual jboolean getLockingKeyState(jint);
-  virtual void setLockingKeyState(jint, jboolean);
-public: // actually protected
-  static ::java::awt::Container * getNativeContainer(::java::awt::Component *);
-public:
-  virtual ::java::awt::Cursor * createCustomCursor(::java::awt::Image *, ::java::awt::Point *, ::java::lang::String *);
-  virtual ::java::awt::Dimension * getBestCursorSize(jint, jint);
-  virtual jint getMaximumCursorColors();
-  virtual jboolean isFrameStateSupported(jint);
-  static ::java::lang::String * getProperty(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::awt::EventQueue * getSystemEventQueue();
-public: // actually protected
-  virtual ::java::awt::EventQueue * getSystemEventQueueImpl() = 0;
-public:
-  virtual ::java::awt::dnd::peer::DragSourceContextPeer * createDragSourceContextPeer(::java::awt::dnd::DragGestureEvent *) = 0;
-  virtual ::java::awt::dnd::DragGestureRecognizer * createDragGestureRecognizer(::java::lang::Class *, ::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual ::java::lang::Object * getDesktopProperty(::java::lang::String *);
-public: // actually protected
-  virtual void setDesktopProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * lazilyLoadDesktopProperty(::java::lang::String *);
-  virtual void initializeDesktopProperties();
-public:
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners(::java::lang::String *);
-  virtual void addAWTEventListener(::java::awt::event::AWTEventListener *, jlong);
-  virtual void removeAWTEventListener(::java::awt::event::AWTEventListener *);
-  virtual JArray< ::java::awt::event::AWTEventListener * > * getAWTEventListeners();
-  virtual JArray< ::java::awt::event::AWTEventListener * > * getAWTEventListeners(jlong);
-public: // actually package-private
-  virtual void globalDispatchEvent(::java::awt::AWTEvent *);
-public:
-  virtual ::java::util::Map * mapInputMethodHighlight(::java::awt::im::InputMethodHighlight *) = 0;
-private:
-  static void initAccessibility();
-  static ::java::lang::String * default_toolkit_name;
-  static ::java::awt::Toolkit * toolkit;
-  static ::java::util::Properties * props;
-public: // actually protected
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) desktopProperties;
-  ::java::beans::PropertyChangeSupport * desktopPropsSupport;
-public: // actually package-private
-  JArray< ::java::awt::event::AWTEventListenerProxy * > * awtEventListeners;
-private:
-  ::gnu::java::awt::peer::GLightweightPeer * lightweightPeer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Toolkit__
diff --git a/libjava/java/awt/Transparency.h b/libjava/java/awt/Transparency.h
deleted file mode 100644
index 1304a4647fe..00000000000
--- a/libjava/java/awt/Transparency.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Transparency__
-#define __java_awt_Transparency__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Transparency;
-    }
-  }
-}
-
-class java::awt::Transparency : public ::java::lang::Object
-{
-
-public:
-  virtual jint getTransparency() = 0;
-  static const jint OPAQUE = 1;
-  static const jint BITMASK = 2;
-  static const jint TRANSLUCENT = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_Transparency__
diff --git a/libjava/java/awt/Window$AccessibleAWTWindow.h b/libjava/java/awt/Window$AccessibleAWTWindow.h
deleted file mode 100644
index aa4d2ced16f..00000000000
--- a/libjava/java/awt/Window$AccessibleAWTWindow.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Window$AccessibleAWTWindow__
-#define __java_awt_Window$AccessibleAWTWindow__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Window;
-        class Window$AccessibleAWTWindow;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class java::awt::Window$AccessibleAWTWindow : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  Window$AccessibleAWTWindow(::java::awt::Window *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 4215068635060671780LL;
-public: // actually package-private
-  ::java::awt::Window * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Window$AccessibleAWTWindow__
diff --git a/libjava/java/awt/Window$WindowBltBufferStrategy.h b/libjava/java/awt/Window$WindowBltBufferStrategy.h
deleted file mode 100644
index eb29e059788..00000000000
--- a/libjava/java/awt/Window$WindowBltBufferStrategy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Window$WindowBltBufferStrategy__
-#define __java_awt_Window$WindowBltBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/Component$BltBufferStrategy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Window;
-        class Window$WindowBltBufferStrategy;
-    }
-  }
-}
-
-class java::awt::Window$WindowBltBufferStrategy : public ::java::awt::Component$BltBufferStrategy
-{
-
-public: // actually package-private
-  Window$WindowBltBufferStrategy(::java::awt::Window *, jint, jboolean);
-  ::java::awt::Window * __attribute__((aligned(__alignof__( ::java::awt::Component$BltBufferStrategy)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Window$WindowBltBufferStrategy__
diff --git a/libjava/java/awt/Window$WindowFlipBufferStrategy.h b/libjava/java/awt/Window$WindowFlipBufferStrategy.h
deleted file mode 100644
index 0fd395f3ec3..00000000000
--- a/libjava/java/awt/Window$WindowFlipBufferStrategy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Window$WindowFlipBufferStrategy__
-#define __java_awt_Window$WindowFlipBufferStrategy__
-
-#pragma interface
-
-#include <java/awt/Component$FlipBufferStrategy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Window;
-        class Window$WindowFlipBufferStrategy;
-    }
-  }
-}
-
-class java::awt::Window$WindowFlipBufferStrategy : public ::java::awt::Component$FlipBufferStrategy
-{
-
-public: // actually package-private
-  Window$WindowFlipBufferStrategy(::java::awt::Window *, jint);
-  ::java::awt::Window * __attribute__((aligned(__alignof__( ::java::awt::Component$FlipBufferStrategy)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Window$WindowFlipBufferStrategy__
diff --git a/libjava/java/awt/Window.h b/libjava/java/awt/Window.h
deleted file mode 100644
index bf369ed99ad..00000000000
--- a/libjava/java/awt/Window.h
+++ /dev/null
@@ -1,146 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_Window__
-#define __java_awt_Window__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class Component;
-        class Container;
-        class Cursor;
-        class Event;
-        class Frame;
-        class GraphicsConfiguration;
-        class Toolkit;
-        class Window;
-      namespace event
-      {
-          class WindowEvent;
-          class WindowFocusListener;
-          class WindowListener;
-          class WindowStateListener;
-      }
-      namespace image
-      {
-          class BufferStrategy;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-  }
-}
-
-class java::awt::Window : public ::java::awt::Container
-{
-
-public: // actually package-private
-  Window();
-  Window(::java::awt::GraphicsConfiguration *);
-public:
-  Window(::java::awt::Frame *);
-  Window(::java::awt::Window *);
-  Window(::java::awt::Window *, ::java::awt::GraphicsConfiguration *);
-public: // actually package-private
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfigurationImpl();
-public:
-  virtual void addNotify();
-  virtual void pack();
-  virtual void show();
-  virtual void hide();
-  virtual void dispose();
-  virtual void toBack();
-  virtual void toFront();
-  virtual ::java::awt::Toolkit * getToolkit();
-  virtual ::java::lang::String * getWarningString();
-  virtual ::java::util::Locale * getLocale();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Window * getOwner();
-  virtual JArray< ::java::awt::Window * > * getOwnedWindows();
-  virtual void addWindowListener(::java::awt::event::WindowListener *);
-  virtual void removeWindowListener(::java::awt::event::WindowListener *);
-  virtual JArray< ::java::awt::event::WindowListener * > * getWindowListeners();
-  virtual JArray< ::java::awt::event::WindowFocusListener * > * getWindowFocusListeners();
-  virtual JArray< ::java::awt::event::WindowStateListener * > * getWindowStateListeners();
-  virtual void addWindowFocusListener(::java::awt::event::WindowFocusListener *);
-  virtual void addWindowStateListener(::java::awt::event::WindowStateListener *);
-  virtual void removeWindowFocusListener(::java::awt::event::WindowFocusListener *);
-  virtual void removeWindowStateListener(::java::awt::event::WindowStateListener *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-public: // actually package-private
-  virtual void dispatchEventImpl(::java::awt::AWTEvent *);
-public: // actually protected
-  virtual void processEvent(::java::awt::AWTEvent *);
-  virtual void processWindowEvent(::java::awt::event::WindowEvent *);
-public:
-  virtual jboolean isActive();
-  virtual jboolean isFocused();
-  virtual ::java::awt::Component * getFocusOwner();
-  virtual ::java::awt::Component * getMostRecentFocusOwner();
-public: // actually package-private
-  virtual void setFocusOwner(::java::awt::Component *);
-public:
-  virtual jboolean postEvent(::java::awt::Event *);
-  virtual jboolean isShowing();
-  virtual void setLocationRelativeTo(::java::awt::Component *);
-  virtual void createBufferStrategy(jint);
-  virtual void createBufferStrategy(jint, ::java::awt::BufferCapabilities *);
-  virtual ::java::awt::image::BufferStrategy * getBufferStrategy();
-  virtual void applyResourceBundle(::java::util::ResourceBundle *);
-  virtual void applyResourceBundle(::java::lang::String *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfiguration();
-public: // actually protected
-  virtual void processWindowFocusEvent(::java::awt::event::WindowEvent *);
-  virtual void processWindowStateEvent(::java::awt::event::WindowEvent *);
-public:
-  virtual jboolean isFocusableWindow();
-  virtual jboolean getFocusableWindowState();
-  virtual void setFocusableWindowState(jboolean);
-  virtual jboolean isFocusCycleRoot();
-  virtual void setFocusCycleRoot(jboolean);
-  virtual ::java::awt::Container * getFocusCycleRootAncestor();
-  virtual jboolean isAlwaysOnTop();
-  virtual void setAlwaysOnTop(jboolean);
-public: // actually package-private
-  virtual ::java::lang::String * generateName();
-  virtual jboolean eventTypeEnabled(jint);
-private:
-  static jlong getUniqueLong();
-  static const jlong serialVersionUID = 4497834738069338734LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::Container)))) warningString;
-  jint windowSerializedDataVersion;
-  jint state;
-  jboolean focusableWindowState;
-  jboolean alwaysOnTop;
-  ::java::util::Vector * ownedWindows;
-  ::java::awt::event::WindowListener * windowListener;
-  ::java::awt::event::WindowFocusListener * windowFocusListener;
-  ::java::awt::event::WindowStateListener * windowStateListener;
-  ::java::awt::GraphicsConfiguration * graphicsConfiguration;
-  jboolean shown;
-public: // actually package-private
-  ::java::awt::Component * windowFocusOwner;
-private:
-  static jlong next_window_number;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_Window__
diff --git a/libjava/java/awt/color/CMMException.h b/libjava/java/awt/color/CMMException.h
deleted file mode 100644
index b6ee5337abf..00000000000
--- a/libjava/java/awt/color/CMMException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_CMMException__
-#define __java_awt_color_CMMException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class CMMException;
-      }
-    }
-  }
-}
-
-class java::awt::color::CMMException : public ::java::lang::RuntimeException
-{
-
-public:
-  CMMException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5775558044142994965LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_CMMException__
diff --git a/libjava/java/awt/color/ColorSpace.h b/libjava/java/awt/color/ColorSpace.h
deleted file mode 100644
index cb8ec13c394..00000000000
--- a/libjava/java/awt/color/ColorSpace.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ColorSpace__
-#define __java_awt_color_ColorSpace__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-    }
-  }
-}
-
-class java::awt::color::ColorSpace : public ::java::lang::Object
-{
-
-public: // actually protected
-  ColorSpace(jint, jint);
-public:
-  static ::java::awt::color::ColorSpace * getInstance(jint);
-  virtual jboolean isCS_sRGB();
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *) = 0;
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *) = 0;
-  virtual jint getType();
-  virtual jint getNumComponents();
-  virtual ::java::lang::String * getName(jint);
-  virtual jfloat getMinValue(jint);
-  virtual jfloat getMaxValue(jint);
-private:
-  static const jlong serialVersionUID = -409452704308689724LL;
-public:
-  static const jint TYPE_XYZ = 0;
-  static const jint TYPE_Lab = 1;
-  static const jint TYPE_Luv = 2;
-  static const jint TYPE_YCbCr = 3;
-  static const jint TYPE_Yxy = 4;
-  static const jint TYPE_RGB = 5;
-  static const jint TYPE_GRAY = 6;
-  static const jint TYPE_HSV = 7;
-  static const jint TYPE_HLS = 8;
-  static const jint TYPE_CMYK = 9;
-  static const jint TYPE_CMY = 11;
-  static const jint TYPE_2CLR = 12;
-  static const jint TYPE_3CLR = 13;
-  static const jint TYPE_4CLR = 14;
-  static const jint TYPE_5CLR = 15;
-  static const jint TYPE_6CLR = 16;
-  static const jint TYPE_7CLR = 17;
-  static const jint TYPE_8CLR = 18;
-  static const jint TYPE_9CLR = 19;
-  static const jint TYPE_ACLR = 20;
-  static const jint TYPE_BCLR = 21;
-  static const jint TYPE_CCLR = 22;
-  static const jint TYPE_DCLR = 23;
-  static const jint TYPE_ECLR = 24;
-  static const jint TYPE_FCLR = 25;
-  static const jint CS_sRGB = 1000;
-  static const jint CS_LINEAR_RGB = 1004;
-  static const jint CS_CIEXYZ = 1001;
-  static const jint CS_PYCC = 1002;
-  static const jint CS_GRAY = 1003;
-private:
-  static const jint CS_BASE = 1000;
-  static const jint CS_END = 1005;
-  static const jint CS_COUNT = 5;
-  static JArray< ::java::awt::color::ColorSpace * > * INSTANCES;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jint numComponents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ColorSpace__
diff --git a/libjava/java/awt/color/ICC_ColorSpace.h b/libjava/java/awt/color/ICC_ColorSpace.h
deleted file mode 100644
index 6dd2117912b..00000000000
--- a/libjava/java/awt/color/ICC_ColorSpace.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ICC_ColorSpace__
-#define __java_awt_color_ICC_ColorSpace__
-
-#pragma interface
-
-#include <java/awt/color/ColorSpace.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ColorSpaceConverter;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_ColorSpace;
-          class ICC_Profile;
-      }
-    }
-  }
-}
-
-class java::awt::color::ICC_ColorSpace : public ::java::awt::color::ColorSpace
-{
-
-public:
-  ICC_ColorSpace(::java::awt::color::ICC_Profile *);
-  virtual ::java::awt::color::ICC_Profile * getProfile();
-  virtual JArray< jfloat > * toRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromRGB(JArray< jfloat > *);
-  virtual JArray< jfloat > * toCIEXYZ(JArray< jfloat > *);
-  virtual JArray< jfloat > * fromCIEXYZ(JArray< jfloat > *);
-  virtual jboolean isCS_sRGB();
-  virtual jfloat getMinValue(jint);
-  virtual jfloat getMaxValue(jint);
-private:
-  ::gnu::java::awt::color::ColorSpaceConverter * getConverter(::java::awt::color::ICC_Profile *);
-  void makeArrays();
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 3455889114070431483LL;
-  ::java::awt::color::ICC_Profile * __attribute__((aligned(__alignof__( ::java::awt::color::ColorSpace)))) thisProfile;
-  JArray< jfloat > * minVal;
-  JArray< jfloat > * maxVal;
-  JArray< jfloat > * diffMinMax;
-  JArray< jfloat > * invDiffMinMax;
-  jboolean needScaleInit;
-  jint type;
-  jint nComponents;
-  ::gnu::java::awt::color::ColorSpaceConverter * converter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ICC_ColorSpace__
diff --git a/libjava/java/awt/color/ICC_Profile.h b/libjava/java/awt/color/ICC_Profile.h
deleted file mode 100644
index d6a406e033f..00000000000
--- a/libjava/java/awt/color/ICC_Profile.h
+++ /dev/null
@@ -1,217 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ICC_Profile__
-#define __java_awt_color_ICC_Profile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace awt
-      {
-        namespace color
-        {
-            class ProfileHeader;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_Profile;
-      }
-    }
-  }
-}
-
-class java::awt::color::ICC_Profile : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ICC_Profile(jint);
-  ICC_Profile(::gnu::java::awt::color::ProfileHeader *, ::java::util::Hashtable *);
-  ICC_Profile(JArray< jbyte > *);
-public: // actually protected
-  virtual void finalize();
-public:
-  static ::java::awt::color::ICC_Profile * getInstance(JArray< jbyte > *);
-  static ::java::awt::color::ICC_Profile * getInstance(jint);
-  static ::java::awt::color::ICC_Profile * getInstance(::java::lang::String *);
-  static ::java::awt::color::ICC_Profile * getInstance(::java::io::InputStream *);
-  virtual jint getMajorVersion();
-  virtual jint getMinorVersion();
-  virtual jint getProfileClass();
-  virtual jint getColorSpaceType();
-  virtual jint getPCSType();
-  virtual void write(::java::lang::String *);
-  virtual void write(::java::io::OutputStream *);
-  virtual JArray< jbyte > * getData();
-  virtual JArray< jbyte > * getData(jint);
-  virtual void setData(jint, JArray< jbyte > *);
-  virtual jint getNumComponents();
-public: // actually protected
-  virtual ::java::lang::Object * readResolve();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static ::java::util::Hashtable * createTagTable(JArray< jbyte > *);
-  jint getSize();
-  JArray< jbyte > * getTagTable();
-  static jboolean isRGBProfile(::gnu::java::awt::color::ProfileHeader *, ::java::util::Hashtable *);
-  static jboolean isGrayProfile(::gnu::java::awt::color::ProfileHeader *, ::java::util::Hashtable *);
-public: // actually package-private
-  virtual JArray< jshort > * getCurve(jint);
-  virtual JArray< jfloat > * getXYZData(jint);
-  virtual jint isPredefined();
-private:
-  JArray< jbyte > * makeXYZData(JArray< jfloat > *);
-  JArray< jbyte > * makeTextTag(::java::lang::String *);
-  JArray< jbyte > * makeDescTag(::java::lang::String *);
-  JArray< jbyte > * makeTRC();
-  JArray< jbyte > * makeTRC(jfloat);
-  JArray< jbyte > * makeTRC(JArray< jfloat > *);
-  JArray< jbyte > * makeIdentityClut();
-  void createProfile(jint);
-  void createRGBProfile();
-  void createLinearRGBProfile();
-  void createCIEProfile();
-  void createGrayProfile();
-  void createPyccProfile();
-  static const jlong serialVersionUID = -3938515861990936766LL;
-public:
-  static const jint CLASS_INPUT = 0;
-  static const jint CLASS_DISPLAY = 1;
-  static const jint CLASS_OUTPUT = 2;
-  static const jint CLASS_DEVICELINK = 3;
-  static const jint CLASS_COLORSPACECONVERSION = 4;
-  static const jint CLASS_ABSTRACT = 5;
-  static const jint CLASS_NAMEDCOLOR = 6;
-  static const jint icSigInputClass = 1935896178;
-  static const jint icSigDisplayClass = 1835955314;
-  static const jint icSigOutputClass = 1886549106;
-  static const jint icSigLinkClass = 1818848875;
-  static const jint icSigColorSpaceClass = 1936744803;
-  static const jint icSigAbstractClass = 1633842036;
-  static const jint icSigNamedColorClass = 1852662636;
-  static const jint icSigXYZData = 1482250784;
-  static const jint icSigLabData = 1281450528;
-  static const jint icSigLuvData = 1282766368;
-  static const jint icSigYCbCrData = 1497588338;
-  static const jint icSigYxyData = 1501067552;
-  static const jint icSigRgbData = 1380401696;
-  static const jint icSigGrayData = 1196573017;
-  static const jint icSigHsvData = 1213421088;
-  static const jint icSigHlsData = 1212961568;
-  static const jint icSigCmykData = 1129142603;
-  static const jint icSigCmyData = 1129142560;
-  static const jint icSigSpace2CLR = 843271250;
-  static const jint icSigSpace3CLR = 860048466;
-  static const jint icSigSpace4CLR = 876825682;
-  static const jint icSigSpace5CLR = 893602898;
-  static const jint icSigSpace6CLR = 910380114;
-  static const jint icSigSpace7CLR = 927157330;
-  static const jint icSigSpace8CLR = 943934546;
-  static const jint icSigSpace9CLR = 960711762;
-  static const jint icSigSpaceACLR = 1094929490;
-  static const jint icSigSpaceBCLR = 1111706706;
-  static const jint icSigSpaceCCLR = 1128483922;
-  static const jint icSigSpaceDCLR = 1145261138;
-  static const jint icSigSpaceECLR = 1162038354;
-  static const jint icSigSpaceFCLR = 1178815570;
-  static const jint icPerceptual = 0;
-  static const jint icRelativeColorimetric = 1;
-  static const jint icSaturation = 2;
-  static const jint icAbsoluteColorimetric = 3;
-  static const jint icSigAToB0Tag = 1093812784;
-  static const jint icSigAToB1Tag = 1093812785;
-  static const jint icSigAToB2Tag = 1093812786;
-  static const jint icSigBlueColorantTag = 1649957210;
-  static const jint icSigBlueTRCTag = 1649693251;
-  static const jint icSigBToA0Tag = 1110589744;
-  static const jint icSigBToA1Tag = 1110589745;
-  static const jint icSigBToA2Tag = 1110589746;
-  static const jint icSigCalibrationDateTimeTag = 1667329140;
-  static const jint icSigCharTargetTag = 1952543335;
-  static const jint icSigCopyrightTag = 1668313716;
-  static const jint icSigCrdInfoTag = 1668441193;
-  static const jint icSigDeviceMfgDescTag = 1684893284;
-  static const jint icSigDeviceModelDescTag = 1684890724;
-  static const jint icSigDeviceSettingsTag = 1684371059;
-  static const jint icSigGamutTag = 1734438260;
-  static const jint icSigGrayTRCTag = 1800688195;
-  static const jint icSigGreenColorantTag = 1733843290;
-  static const jint icSigGreenTRCTag = 1733579331;
-  static const jint icSigLuminanceTag = 1819635049;
-  static const jint icSigMeasurementTag = 1835360627;
-  static const jint icSigMediaBlackPointTag = 1651208308;
-  static const jint icSigMediaWhitePointTag = 2004119668;
-  static const jint icSigNamedColor2Tag = 1852009522;
-  static const jint icSigOutputResponseTag = 1919251312;
-  static const jint icSigPreview0Tag = 1886545200;
-  static const jint icSigPreview1Tag = 1886545201;
-  static const jint icSigPreview2Tag = 1886545202;
-  static const jint icSigProfileDescriptionTag = 1684370275;
-  static const jint icSigProfileSequenceDescTag = 1886610801;
-  static const jint icSigPs2CRD0Tag = 1886610480;
-  static const jint icSigPs2CRD1Tag = 1886610481;
-  static const jint icSigPs2CRD2Tag = 1886610482;
-  static const jint icSigPs2CRD3Tag = 1886610483;
-  static const jint icSigPs2CSATag = 1886597747;
-  static const jint icSigPs2RenderingIntentTag = 1886597737;
-  static const jint icSigRedColorantTag = 1918392666;
-  static const jint icSigRedTRCTag = 1918128707;
-  static const jint icSigScreeningDescTag = 1935897188;
-  static const jint icSigScreeningTag = 1935897198;
-  static const jint icSigTechnologyTag = 1952801640;
-  static const jint icSigUcrBgTag = 1650877472;
-  static const jint icSigViewingCondDescTag = 1987405156;
-  static const jint icSigViewingConditionsTag = 1986618743;
-  static const jint icSigChromaticityTag = 1667789421;
-  static const jint icSigHead = 1751474532;
-  static const jint icHdrSize = 0;
-  static const jint icHdrCmmId = 4;
-  static const jint icHdrVersion = 8;
-  static const jint icHdrDeviceClass = 12;
-  static const jint icHdrColorSpace = 16;
-  static const jint icHdrPcs = 20;
-  static const jint icHdrDate = 24;
-  static const jint icHdrMagic = 36;
-  static const jint icHdrPlatform = 40;
-  static const jint icHdrFlags = 44;
-  static const jint icHdrManufacturer = 48;
-  static const jint icHdrModel = 52;
-  static const jint icHdrAttributes = 56;
-  static const jint icHdrRenderingIntent = 64;
-  static const jint icHdrIlluminant = 68;
-  static const jint icHdrCreator = 80;
-  static const jint icTagType = 0;
-  static const jint icTagReserved = 4;
-  static const jint icCurveCount = 8;
-  static const jint icCurveData = 12;
-  static const jint icXYZNumberX = 8;
-private:
-  static const jint tagTableOffset = 128;
-  static const jint iccProfileSerializedDataVersion = 1;
-  static ::java::lang::String * copyrightNotice;
-  static const jint TRC_POINTS = 1024;
-  static JArray< jfloat > * D50;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) profileID;
-  ::gnu::java::awt::color::ProfileHeader * header;
-  ::java::util::Hashtable * tagTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ICC_Profile__
diff --git a/libjava/java/awt/color/ICC_ProfileGray.h b/libjava/java/awt/color/ICC_ProfileGray.h
deleted file mode 100644
index 9ebeef8dea2..00000000000
--- a/libjava/java/awt/color/ICC_ProfileGray.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ICC_ProfileGray__
-#define __java_awt_color_ICC_ProfileGray__
-
-#pragma interface
-
-#include <java/awt/color/ICC_Profile.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_ProfileGray;
-      }
-    }
-  }
-}
-
-class java::awt::color::ICC_ProfileGray : public ::java::awt::color::ICC_Profile
-{
-
-public: // actually package-private
-  ICC_ProfileGray(jint);
-  ICC_ProfileGray(JArray< jbyte > *);
-public:
-  virtual JArray< jfloat > * getMediaWhitePoint();
-  virtual jfloat getGamma();
-  virtual JArray< jshort > * getTRC();
-private:
-  static const jlong serialVersionUID = -1124721290732002649LL;
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::awt::color::ICC_Profile)))) whitePoint;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ICC_ProfileGray__
diff --git a/libjava/java/awt/color/ICC_ProfileRGB.h b/libjava/java/awt/color/ICC_ProfileRGB.h
deleted file mode 100644
index 7520d8af6c1..00000000000
--- a/libjava/java/awt/color/ICC_ProfileRGB.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ICC_ProfileRGB__
-#define __java_awt_color_ICC_ProfileRGB__
-
-#pragma interface
-
-#include <java/awt/color/ICC_Profile.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ICC_ProfileRGB;
-      }
-    }
-  }
-}
-
-class java::awt::color::ICC_ProfileRGB : public ::java::awt::color::ICC_Profile
-{
-
-public: // actually package-private
-  ICC_ProfileRGB(jint);
-  ICC_ProfileRGB(JArray< jbyte > *);
-public:
-  virtual JArray< jfloat > * getMediaWhitePoint();
-  virtual JArray< JArray< jfloat > * > * getMatrix();
-  virtual jfloat getGamma(jint);
-  virtual JArray< jshort > * getTRC(jint);
-private:
-  JArray< JArray< jfloat > * > * createMatrix();
-  static const jlong serialVersionUID = 8505067385152579334LL;
-public:
-  static const jint REDCOMPONENT = 0;
-  static const jint GREENCOMPONENT = 1;
-  static const jint BLUECOMPONENT = 2;
-private:
-  JArray< JArray< jfloat > * > * __attribute__((aligned(__alignof__( ::java::awt::color::ICC_Profile)))) matrix;
-  JArray< jfloat > * gamma;
-  JArray< jfloat > * whitePoint;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ICC_ProfileRGB__
diff --git a/libjava/java/awt/color/ProfileDataException.h b/libjava/java/awt/color/ProfileDataException.h
deleted file mode 100644
index 593bf1326ca..00000000000
--- a/libjava/java/awt/color/ProfileDataException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_color_ProfileDataException__
-#define __java_awt_color_ProfileDataException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ProfileDataException;
-      }
-    }
-  }
-}
-
-class java::awt::color::ProfileDataException : public ::java::lang::RuntimeException
-{
-
-public:
-  ProfileDataException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7286140888240322498LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_color_ProfileDataException__
diff --git a/libjava/java/awt/datatransfer/Clipboard.h b/libjava/java/awt/datatransfer/Clipboard.h
deleted file mode 100644
index 5ae0769e181..00000000000
--- a/libjava/java/awt/datatransfer/Clipboard.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_Clipboard__
-#define __java_awt_datatransfer_Clipboard__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class ClipboardOwner;
-          class DataFlavor;
-          class FlavorListener;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::Clipboard : public ::java::lang::Object
-{
-
-public:
-  Clipboard(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::awt::datatransfer::Transferable * getContents(::java::lang::Object *);
-  virtual void setContents(::java::awt::datatransfer::Transferable *, ::java::awt::datatransfer::ClipboardOwner *);
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getAvailableDataFlavors();
-  virtual jboolean isDataFlavorAvailable(::java::awt::datatransfer::DataFlavor *);
-  virtual ::java::lang::Object * getData(::java::awt::datatransfer::DataFlavor *);
-  virtual void addFlavorListener(::java::awt::datatransfer::FlavorListener *);
-  virtual void removeFlavorListener(::java::awt::datatransfer::FlavorListener *);
-  virtual JArray< ::java::awt::datatransfer::FlavorListener * > * getFlavorListeners();
-public: // actually protected
-  ::java::awt::datatransfer::Transferable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) contents;
-  ::java::awt::datatransfer::ClipboardOwner * owner;
-private:
-  ::java::lang::String * name;
-  ::java::util::ArrayList * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_Clipboard__
diff --git a/libjava/java/awt/datatransfer/ClipboardOwner.h b/libjava/java/awt/datatransfer/ClipboardOwner.h
deleted file mode 100644
index d20a514b322..00000000000
--- a/libjava/java/awt/datatransfer/ClipboardOwner.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_ClipboardOwner__
-#define __java_awt_datatransfer_ClipboardOwner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class ClipboardOwner;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::ClipboardOwner : public ::java::lang::Object
-{
-
-public:
-  virtual void lostOwnership(::java::awt::datatransfer::Clipboard *, ::java::awt::datatransfer::Transferable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_datatransfer_ClipboardOwner__
diff --git a/libjava/java/awt/datatransfer/DataFlavor.h b/libjava/java/awt/datatransfer/DataFlavor.h
deleted file mode 100644
index 3a94cabef65..00000000000
--- a/libjava/java/awt/datatransfer/DataFlavor.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_DataFlavor__
-#define __java_awt_datatransfer_DataFlavor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class MimeType;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::DataFlavor : public ::java::lang::Object
-{
-
-public: // actually protected
-  static ::java::lang::Class * tryToLoadClass(::java::lang::String *, ::java::lang::ClassLoader *);
-public:
-  static ::java::awt::datatransfer::DataFlavor * getTextPlainUnicodeFlavor();
-  static ::java::awt::datatransfer::DataFlavor * selectBestTextFlavor(JArray< ::java::awt::datatransfer::DataFlavor * > *);
-  DataFlavor();
-  DataFlavor(::java::lang::Class *, ::java::lang::String *);
-  DataFlavor(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-  DataFlavor(::java::lang::String *, ::java::lang::String *);
-  DataFlavor(::java::lang::String *);
-private:
-  void init(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-public:
-  virtual ::java::lang::String * getMimeType();
-  virtual ::java::lang::Class * getRepresentationClass();
-  virtual ::java::lang::String * getHumanPresentableName();
-  virtual ::java::lang::String * getPrimaryType();
-  virtual ::java::lang::String * getSubType();
-  virtual ::java::lang::String * getParameter(::java::lang::String *);
-  virtual void setHumanPresentableName(::java::lang::String *);
-  virtual jboolean isMimeTypeEqual(::java::lang::String *);
-  virtual jboolean isMimeTypeEqual(::java::awt::datatransfer::DataFlavor *);
-  virtual jboolean isMimeTypeSerializedObject();
-  virtual jboolean isRepresentationClassInputStream();
-  virtual jboolean isRepresentationClassSerializable();
-  virtual jboolean isRepresentationClassRemote();
-  virtual jboolean isFlavorSerializedObjectType();
-  virtual jboolean isFlavorRemoteObjectType();
-  virtual jboolean isFlavorJavaFileListType();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::awt::datatransfer::DataFlavor *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::String *);
-  virtual jint hashCode();
-  virtual jboolean match(::java::awt::datatransfer::DataFlavor *);
-public: // actually protected
-  virtual ::java::lang::String * normalizeMimeTypeParameter(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * normalizeMimeType(::java::lang::String *);
-public:
-  virtual void writeExternal(::java::io::ObjectOutput *);
-  virtual void readExternal(::java::io::ObjectInput *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::Class * getDefaultRepresentationClass();
-  virtual ::java::lang::String * getDefaultRepresentationClassAsString();
-  virtual ::java::io::Reader * getReaderForText(::java::awt::datatransfer::Transferable *);
-  virtual jboolean isRepresentationClassByteBuffer();
-  virtual jboolean isRepresentationClassCharBuffer();
-  virtual jboolean isRepresentationClassReader();
-  virtual jboolean isFlavorTextType();
-public: // actually package-private
-  static const jlong serialVersionUID = 8367026044764648243LL;
-public:
-  static ::java::awt::datatransfer::DataFlavor * plainTextFlavor;
-  static ::java::awt::datatransfer::DataFlavor * stringFlavor;
-  static ::java::awt::datatransfer::DataFlavor * javaFileListFlavor;
-  static ::java::awt::datatransfer::DataFlavor * imageFlavor;
-  static ::java::lang::String * javaSerializedObjectMimeType;
-  static ::java::lang::String * javaJVMLocalObjectMimeType;
-  static ::java::lang::String * javaRemoteObjectMimeType;
-private:
-  ::java::awt::datatransfer::MimeType * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mimeType;
-  ::java::lang::Class * representationClass;
-  ::java::lang::String * humanPresentableName;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_DataFlavor__
diff --git a/libjava/java/awt/datatransfer/FlavorEvent.h b/libjava/java/awt/datatransfer/FlavorEvent.h
deleted file mode 100644
index 00cfae1c058..00000000000
--- a/libjava/java/awt/datatransfer/FlavorEvent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_FlavorEvent__
-#define __java_awt_datatransfer_FlavorEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class FlavorEvent;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::FlavorEvent : public ::java::util::EventObject
-{
-
-public:
-  FlavorEvent(::java::awt::datatransfer::Clipboard *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_FlavorEvent__
diff --git a/libjava/java/awt/datatransfer/FlavorListener.h b/libjava/java/awt/datatransfer/FlavorListener.h
deleted file mode 100644
index 0e23dbb78e7..00000000000
--- a/libjava/java/awt/datatransfer/FlavorListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_FlavorListener__
-#define __java_awt_datatransfer_FlavorListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class FlavorEvent;
-          class FlavorListener;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::FlavorListener : public ::java::lang::Object
-{
-
-public:
-  virtual void flavorsChanged(::java::awt::datatransfer::FlavorEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_datatransfer_FlavorListener__
diff --git a/libjava/java/awt/datatransfer/FlavorMap.h b/libjava/java/awt/datatransfer/FlavorMap.h
deleted file mode 100644
index 688576910ae..00000000000
--- a/libjava/java/awt/datatransfer/FlavorMap.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_FlavorMap__
-#define __java_awt_datatransfer_FlavorMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class FlavorMap;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::FlavorMap : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Map * getNativesForFlavors(JArray< ::java::awt::datatransfer::DataFlavor * > *) = 0;
-  virtual ::java::util::Map * getFlavorsForNatives(JArray< ::java::lang::String * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_datatransfer_FlavorMap__
diff --git a/libjava/java/awt/datatransfer/FlavorTable.h b/libjava/java/awt/datatransfer/FlavorTable.h
deleted file mode 100644
index cec9406264a..00000000000
--- a/libjava/java/awt/datatransfer/FlavorTable.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_FlavorTable__
-#define __java_awt_datatransfer_FlavorTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class FlavorTable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::FlavorTable : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::List * getNativesForFlavor(::java::awt::datatransfer::DataFlavor *) = 0;
-  virtual ::java::util::List * getFlavorsForNative(::java::lang::String *) = 0;
-  virtual ::java::util::Map * getNativesForFlavors(JArray< ::java::awt::datatransfer::DataFlavor * > *) = 0;
-  virtual ::java::util::Map * getFlavorsForNatives(JArray< ::java::lang::String * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_datatransfer_FlavorTable__
diff --git a/libjava/java/awt/datatransfer/MimeType.h b/libjava/java/awt/datatransfer/MimeType.h
deleted file mode 100644
index 9ccd153f768..00000000000
--- a/libjava/java/awt/datatransfer/MimeType.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_MimeType__
-#define __java_awt_datatransfer_MimeType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class MimeType;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::MimeType : public ::java::lang::Object
-{
-
-public:
-  MimeType();
-public: // actually package-private
-  MimeType(::java::lang::String *);
-  virtual void addParameter(::java::lang::String *, ::java::lang::String *);
-  virtual void removeParameter(::java::lang::String *);
-  virtual ::java::lang::String * getParameter(::java::lang::String *);
-  virtual ::java::lang::String * getPrimaryType();
-  virtual ::java::lang::String * getSubType();
-  virtual ::java::lang::String * getBaseType();
-  virtual jboolean matches(::java::awt::datatransfer::MimeType *);
-public:
-  virtual void readExternal(::java::io::ObjectInput *);
-  virtual void writeExternal(::java::io::ObjectOutput *);
-  virtual ::java::lang::String * toString();
-private:
-  void parse(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) primaryType;
-  ::java::lang::String * subType;
-  ::java::util::HashMap * parameters;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_MimeType__
diff --git a/libjava/java/awt/datatransfer/MimeTypeParseException.h b/libjava/java/awt/datatransfer/MimeTypeParseException.h
deleted file mode 100644
index 5ac3ff2d3cc..00000000000
--- a/libjava/java/awt/datatransfer/MimeTypeParseException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_MimeTypeParseException__
-#define __java_awt_datatransfer_MimeTypeParseException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class MimeTypeParseException;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::MimeTypeParseException : public ::java::lang::Exception
-{
-
-public:
-  MimeTypeParseException();
-  MimeTypeParseException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5604407764691570741LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_MimeTypeParseException__
diff --git a/libjava/java/awt/datatransfer/StringSelection.h b/libjava/java/awt/datatransfer/StringSelection.h
deleted file mode 100644
index 09429bba1f3..00000000000
--- a/libjava/java/awt/datatransfer/StringSelection.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_StringSelection__
-#define __java_awt_datatransfer_StringSelection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class DataFlavor;
-          class StringSelection;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::StringSelection : public ::java::lang::Object
-{
-
-public:
-  StringSelection(::java::lang::String *);
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *);
-  virtual void lostOwnership(::java::awt::datatransfer::Clipboard *, ::java::awt::datatransfer::Transferable *);
-public: // actually package-private
-  static JArray< ::java::awt::datatransfer::DataFlavor * > * supported_flavors;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_StringSelection__
diff --git a/libjava/java/awt/datatransfer/SystemFlavorMap.h b/libjava/java/awt/datatransfer/SystemFlavorMap.h
deleted file mode 100644
index 62009addb3b..00000000000
--- a/libjava/java/awt/datatransfer/SystemFlavorMap.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_SystemFlavorMap__
-#define __java_awt_datatransfer_SystemFlavorMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class FlavorMap;
-          class SystemFlavorMap;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::SystemFlavorMap : public ::java::lang::Object
-{
-
-  SystemFlavorMap();
-public:
-  ::java::util::Map * getNativesForFlavors(JArray< ::java::awt::datatransfer::DataFlavor * > *);
-  ::java::util::Map * getFlavorsForNatives(JArray< ::java::lang::String * > *);
-  static ::java::awt::datatransfer::FlavorMap * getDefaultFlavorMap();
-  static ::java::lang::String * encodeJavaMIMEType(::java::lang::String *);
-  static ::java::lang::String * encodeDataFlavor(::java::awt::datatransfer::DataFlavor *);
-  static jboolean isJavaMIMEType(::java::lang::String *);
-  static ::java::lang::String * decodeJavaMIMEType(::java::lang::String *);
-  static ::java::awt::datatransfer::DataFlavor * decodeDataFlavor(::java::lang::String *);
-  ::java::util::List * getFlavorsForNative(::java::lang::String *);
-  ::java::util::List * getNativesForFlavor(::java::awt::datatransfer::DataFlavor *);
-  void addFlavorForUnencodedNative(::java::lang::String *, ::java::awt::datatransfer::DataFlavor *);
-  void addUnencodedNativeForFlavor(::java::awt::datatransfer::DataFlavor *, ::java::lang::String *);
-  void setNativesForFlavor(::java::awt::datatransfer::DataFlavor *, JArray< ::java::lang::String * > *);
-  void setFlavorsForNative(::java::lang::String *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
-private:
-  static ::java::util::Map * systemFlavorMaps;
-  static ::java::lang::String * GNU_JAVA_MIME_PREFIX;
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nativeToFlavorMap;
-  ::java::util::HashMap * flavorToNativeMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_SystemFlavorMap__
diff --git a/libjava/java/awt/datatransfer/Transferable.h b/libjava/java/awt/datatransfer/Transferable.h
deleted file mode 100644
index 0930f87d040..00000000000
--- a/libjava/java/awt/datatransfer/Transferable.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_Transferable__
-#define __java_awt_datatransfer_Transferable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::Transferable : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors() = 0;
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *) = 0;
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_datatransfer_Transferable__
diff --git a/libjava/java/awt/datatransfer/UnsupportedFlavorException.h b/libjava/java/awt/datatransfer/UnsupportedFlavorException.h
deleted file mode 100644
index fffc2ace08a..00000000000
--- a/libjava/java/awt/datatransfer/UnsupportedFlavorException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_datatransfer_UnsupportedFlavorException__
-#define __java_awt_datatransfer_UnsupportedFlavorException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class UnsupportedFlavorException;
-      }
-    }
-  }
-}
-
-class java::awt::datatransfer::UnsupportedFlavorException : public ::java::lang::Exception
-{
-
-public:
-  UnsupportedFlavorException(::java::awt::datatransfer::DataFlavor *);
-private:
-  static const jlong serialVersionUID = 5383814944251665601LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_datatransfer_UnsupportedFlavorException__
diff --git a/libjava/java/awt/dnd/Autoscroll.h b/libjava/java/awt/dnd/Autoscroll.h
deleted file mode 100644
index 4ab4c6a5cb0..00000000000
--- a/libjava/java/awt/dnd/Autoscroll.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_Autoscroll__
-#define __java_awt_dnd_Autoscroll__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Insets;
-        class Point;
-      namespace dnd
-      {
-          class Autoscroll;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::Autoscroll : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Insets * getAutoscrollInsets() = 0;
-  virtual void autoscroll(::java::awt::Point *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_Autoscroll__
diff --git a/libjava/java/awt/dnd/DnDConstants.h b/libjava/java/awt/dnd/DnDConstants.h
deleted file mode 100644
index a3cfb089ffd..00000000000
--- a/libjava/java/awt/dnd/DnDConstants.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DnDConstants__
-#define __java_awt_dnd_DnDConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DnDConstants;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DnDConstants : public ::java::lang::Object
-{
-
-  DnDConstants();
-public:
-  static const jint ACTION_NONE = 0;
-  static const jint ACTION_COPY = 1;
-  static const jint ACTION_MOVE = 2;
-  static const jint ACTION_COPY_OR_MOVE = 3;
-  static const jint ACTION_LINK = 1073741824;
-  static const jint ACTION_REFERENCE = 1073741824;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DnDConstants__
diff --git a/libjava/java/awt/dnd/DnDEventMulticaster.h b/libjava/java/awt/dnd/DnDEventMulticaster.h
deleted file mode 100644
index c70450f2565..00000000000
--- a/libjava/java/awt/dnd/DnDEventMulticaster.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DnDEventMulticaster__
-#define __java_awt_dnd_DnDEventMulticaster__
-
-#pragma interface
-
-#include <java/awt/AWTEventMulticaster.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DnDEventMulticaster;
-          class DragSourceListener;
-          class DragSourceMotionListener;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DnDEventMulticaster : public ::java::awt::AWTEventMulticaster
-{
-
-public: // actually protected
-  DnDEventMulticaster(::java::util::EventListener *, ::java::util::EventListener *);
-public:
-  static ::java::awt::dnd::DragSourceListener * add(::java::awt::dnd::DragSourceListener *, ::java::awt::dnd::DragSourceListener *);
-  static ::java::awt::dnd::DragSourceMotionListener * add(::java::awt::dnd::DragSourceMotionListener *, ::java::awt::dnd::DragSourceMotionListener *);
-  static ::java::awt::dnd::DragSourceListener * remove(::java::awt::dnd::DragSourceListener *, ::java::awt::dnd::DragSourceListener *);
-  static ::java::awt::dnd::DragSourceMotionListener * remove(::java::awt::dnd::DragSourceMotionListener *, ::java::awt::dnd::DragSourceMotionListener *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DnDEventMulticaster__
diff --git a/libjava/java/awt/dnd/DragGestureEvent.h b/libjava/java/awt/dnd/DragGestureEvent.h
deleted file mode 100644
index 7d34bc632dd..00000000000
--- a/libjava/java/awt/dnd/DragGestureEvent.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragGestureEvent__
-#define __java_awt_dnd_DragGestureEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Cursor;
-        class Image;
-        class Point;
-      namespace datatransfer
-      {
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureRecognizer;
-          class DragSource;
-          class DragSourceListener;
-      }
-      namespace event
-      {
-          class InputEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragGestureEvent : public ::java::util::EventObject
-{
-
-public:
-  DragGestureEvent(::java::awt::dnd::DragGestureRecognizer *, jint, ::java::awt::Point *, ::java::util::List *);
-  virtual ::java::awt::dnd::DragGestureRecognizer * getSourceAsDragGestureRecognizer();
-  virtual ::java::awt::Component * getComponent();
-  virtual ::java::awt::dnd::DragSource * getDragSource();
-  virtual ::java::awt::Point * getDragOrigin();
-  virtual ::java::util::Iterator * iterator();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual jint getDragAction();
-  virtual ::java::awt::event::InputEvent * getTriggerEvent();
-  virtual void startDrag(::java::awt::Cursor *, ::java::awt::datatransfer::Transferable *);
-  virtual void startDrag(::java::awt::Cursor *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-  virtual void startDrag(::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-private:
-  static const jlong serialVersionUID = 9080172649166731306LL;
-  ::java::awt::dnd::DragSource * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) dragSource;
-  ::java::awt::Component * component;
-  ::java::awt::Point * origin;
-  jint action;
-  ::java::util::List * events;
-  ::java::awt::dnd::DragGestureRecognizer * dgr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragGestureEvent__
diff --git a/libjava/java/awt/dnd/DragGestureListener.h b/libjava/java/awt/dnd/DragGestureListener.h
deleted file mode 100644
index 044956739c8..00000000000
--- a/libjava/java/awt/dnd/DragGestureListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragGestureListener__
-#define __java_awt_dnd_DragGestureListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureListener;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragGestureListener : public ::java::lang::Object
-{
-
-public:
-  virtual void dragGestureRecognized(::java::awt::dnd::DragGestureEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_DragGestureListener__
diff --git a/libjava/java/awt/dnd/DragGestureRecognizer.h b/libjava/java/awt/dnd/DragGestureRecognizer.h
deleted file mode 100644
index 22e856d609d..00000000000
--- a/libjava/java/awt/dnd/DragGestureRecognizer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragGestureRecognizer__
-#define __java_awt_dnd_DragGestureRecognizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace dnd
-      {
-          class DragGestureListener;
-          class DragGestureRecognizer;
-          class DragSource;
-      }
-      namespace event
-      {
-          class InputEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragGestureRecognizer : public ::java::lang::Object
-{
-
-public: // actually protected
-  DragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  DragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint);
-  DragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *);
-  DragGestureRecognizer(::java::awt::dnd::DragSource *);
-  virtual void registerListeners() = 0;
-  virtual void unregisterListeners() = 0;
-public:
-  virtual ::java::awt::dnd::DragSource * getDragSource();
-  virtual ::java::awt::Component * getComponent();
-  virtual void setComponent(::java::awt::Component *);
-  virtual jint getSourceActions();
-  virtual void setSourceActions(jint);
-  virtual ::java::awt::event::InputEvent * getTriggerEvent();
-  virtual void resetRecognizer();
-  virtual void addDragGestureListener(::java::awt::dnd::DragGestureListener *);
-  virtual void removeDragGestureListener(::java::awt::dnd::DragGestureListener *);
-public: // actually protected
-  virtual void fireDragGestureRecognized(jint, ::java::awt::Point *);
-  virtual void appendEvent(::java::awt::event::InputEvent *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 8996673345831063337LL;
-public: // actually protected
-  ::java::awt::dnd::DragSource * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dragSource;
-  ::java::awt::Component * component;
-  ::java::awt::dnd::DragGestureListener * dragGestureListener;
-  jint sourceActions;
-  ::java::util::ArrayList * events;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragGestureRecognizer__
diff --git a/libjava/java/awt/dnd/DragSource.h b/libjava/java/awt/dnd/DragSource.h
deleted file mode 100644
index 8f4246e1e61..00000000000
--- a/libjava/java/awt/dnd/DragSource.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSource__
-#define __java_awt_dnd_DragSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Cursor;
-        class Image;
-        class Point;
-      namespace datatransfer
-      {
-          class FlavorMap;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragGestureListener;
-          class DragGestureRecognizer;
-          class DragSource;
-          class DragSourceContext;
-          class DragSourceListener;
-          class DragSourceMotionListener;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSource : public ::java::lang::Object
-{
-
-public:
-  DragSource();
-  static ::java::awt::dnd::DragSource * getDefaultDragSource();
-  static jboolean isDragImageSupported();
-  virtual void startDrag(::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *, ::java::awt::datatransfer::FlavorMap *);
-  virtual void startDrag(::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *, ::java::awt::datatransfer::FlavorMap *);
-  virtual void startDrag(::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-  virtual void startDrag(::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-public: // actually protected
-  virtual ::java::awt::dnd::DragSourceContext * createDragSourceContext(::java::awt::dnd::peer::DragSourceContextPeer *, ::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-public:
-  virtual ::java::awt::datatransfer::FlavorMap * getFlavorMap();
-  virtual ::java::awt::dnd::DragGestureRecognizer * createDragGestureRecognizer(::java::lang::Class *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual ::java::awt::dnd::DragGestureRecognizer * createDefaultDragGestureRecognizer(::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  virtual void addDragSourceListener(::java::awt::dnd::DragSourceListener *);
-  virtual void removeDragSourceListener(::java::awt::dnd::DragSourceListener *);
-  virtual JArray< ::java::awt::dnd::DragSourceListener * > * getDragSourceListeners();
-  virtual void addDragSourceMotionListener(::java::awt::dnd::DragSourceMotionListener *);
-  virtual void removeDragSourceMotionListener(::java::awt::dnd::DragSourceMotionListener *);
-  virtual JArray< ::java::awt::dnd::DragSourceMotionListener * > * getDragSourceMotionListeners();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  static jint getDragThreshold();
-private:
-  static const jlong serialVersionUID = 6236096958971414066LL;
-public:
-  static ::java::awt::Cursor * DefaultCopyDrop;
-  static ::java::awt::Cursor * DefaultMoveDrop;
-  static ::java::awt::Cursor * DefaultLinkDrop;
-  static ::java::awt::Cursor * DefaultCopyNoDrop;
-  static ::java::awt::Cursor * DefaultMoveNoDrop;
-  static ::java::awt::Cursor * DefaultLinkNoDrop;
-private:
-  ::java::awt::datatransfer::FlavorMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) flavorMap;
-  ::java::awt::dnd::DragSourceListener * dragSourceListener;
-  ::java::awt::dnd::DragSourceMotionListener * dragSourceMotionListener;
-  static ::java::awt::dnd::DragSource * ds;
-  ::java::awt::dnd::peer::DragSourceContextPeer * peer;
-  ::java::awt::dnd::DragSourceContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSource__
diff --git a/libjava/java/awt/dnd/DragSourceAdapter.h b/libjava/java/awt/dnd/DragSourceAdapter.h
deleted file mode 100644
index c3a4177e6ae..00000000000
--- a/libjava/java/awt/dnd/DragSourceAdapter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceAdapter__
-#define __java_awt_dnd_DragSourceAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragSourceAdapter;
-          class DragSourceDragEvent;
-          class DragSourceDropEvent;
-          class DragSourceEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceAdapter : public ::java::lang::Object
-{
-
-public:
-  DragSourceAdapter();
-  virtual void dragEnter(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragOver(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragMouseMoved(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dropActionChanged(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragExit(::java::awt::dnd::DragSourceEvent *);
-  virtual void dragDropEnd(::java::awt::dnd::DragSourceDropEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSourceAdapter__
diff --git a/libjava/java/awt/dnd/DragSourceContext.h b/libjava/java/awt/dnd/DragSourceContext.h
deleted file mode 100644
index 1e4646729e4..00000000000
--- a/libjava/java/awt/dnd/DragSourceContext.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceContext__
-#define __java_awt_dnd_DragSourceContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Cursor;
-        class Image;
-        class Point;
-      namespace datatransfer
-      {
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DragGestureEvent;
-          class DragSource;
-          class DragSourceContext;
-          class DragSourceDragEvent;
-          class DragSourceDropEvent;
-          class DragSourceEvent;
-          class DragSourceListener;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceContext : public ::java::lang::Object
-{
-
-public:
-  DragSourceContext(::java::awt::dnd::peer::DragSourceContextPeer *, ::java::awt::dnd::DragGestureEvent *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *, ::java::awt::datatransfer::Transferable *, ::java::awt::dnd::DragSourceListener *);
-  virtual ::java::awt::dnd::DragSource * getDragSource();
-  virtual ::java::awt::Component * getComponent();
-  virtual ::java::awt::dnd::DragGestureEvent * getTrigger();
-  virtual jint getSourceActions();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void addDragSourceListener(::java::awt::dnd::DragSourceListener *);
-  virtual void removeDragSourceListener(::java::awt::dnd::DragSourceListener *);
-  virtual void transferablesFlavorsChanged();
-  virtual void dragEnter(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragOver(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragExit(::java::awt::dnd::DragSourceEvent *);
-  virtual void dropActionChanged(::java::awt::dnd::DragSourceDragEvent *);
-  virtual void dragDropEnd(::java::awt::dnd::DragSourceDropEvent *);
-  virtual void dragMouseMoved(::java::awt::dnd::DragSourceDragEvent *);
-  virtual ::java::awt::datatransfer::Transferable * getTransferable();
-public: // actually protected
-  virtual void updateCurrentCursor(jint, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = -115407898692194719LL;
-public: // actually protected
-  static const jint DEFAULT = 0;
-  static const jint ENTER = 1;
-  static const jint OVER = 2;
-  static const jint CHANGED = 3;
-private:
-  ::java::awt::dnd::peer::DragSourceContextPeer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) peer;
-  ::java::awt::Cursor * cursor;
-  ::java::awt::datatransfer::Transferable * transferable;
-  ::java::awt::dnd::DragGestureEvent * trigger;
-  ::java::awt::dnd::DragSourceListener * dragSourceListener;
-  jboolean useCustomCursor;
-  jint sourceActions;
-  ::java::awt::Image * image;
-  ::java::awt::Point * offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSourceContext__
diff --git a/libjava/java/awt/dnd/DragSourceDragEvent.h b/libjava/java/awt/dnd/DragSourceDragEvent.h
deleted file mode 100644
index ec0c80eecbc..00000000000
--- a/libjava/java/awt/dnd/DragSourceDragEvent.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceDragEvent__
-#define __java_awt_dnd_DragSourceDragEvent__
-
-#pragma interface
-
-#include <java/awt/dnd/DragSourceEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragSourceContext;
-          class DragSourceDragEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceDragEvent : public ::java::awt::dnd::DragSourceEvent
-{
-
-public:
-  DragSourceDragEvent(::java::awt::dnd::DragSourceContext *, jint, jint, jint);
-  DragSourceDragEvent(::java::awt::dnd::DragSourceContext *, jint, jint, jint, jint, jint);
-  virtual jint getTargetActions();
-  virtual jint getGestureModifiers();
-  virtual jint getGestureModifiersEx();
-  virtual jint getUserAction();
-  virtual jint getDropAction();
-private:
-  static const jlong serialVersionUID = 481346297933902471LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::dnd::DragSourceEvent)))) dropAction;
-  jint targetActions;
-  jint gestureModifiers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSourceDragEvent__
diff --git a/libjava/java/awt/dnd/DragSourceDropEvent.h b/libjava/java/awt/dnd/DragSourceDropEvent.h
deleted file mode 100644
index bc3341f02e6..00000000000
--- a/libjava/java/awt/dnd/DragSourceDropEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceDropEvent__
-#define __java_awt_dnd_DragSourceDropEvent__
-
-#pragma interface
-
-#include <java/awt/dnd/DragSourceEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragSourceContext;
-          class DragSourceDropEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceDropEvent : public ::java::awt::dnd::DragSourceEvent
-{
-
-public:
-  DragSourceDropEvent(::java::awt::dnd::DragSourceContext *);
-  DragSourceDropEvent(::java::awt::dnd::DragSourceContext *, jint, jboolean);
-  DragSourceDropEvent(::java::awt::dnd::DragSourceContext *, jint, jboolean, jint, jint);
-  virtual jint getDropAction();
-  virtual jboolean getDropSuccess();
-private:
-  static const jlong serialVersionUID = -5571321229470821891LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::dnd::DragSourceEvent)))) dropAction;
-  jboolean dropSuccess;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSourceDropEvent__
diff --git a/libjava/java/awt/dnd/DragSourceEvent.h b/libjava/java/awt/dnd/DragSourceEvent.h
deleted file mode 100644
index 0d008a19ccf..00000000000
--- a/libjava/java/awt/dnd/DragSourceEvent.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceEvent__
-#define __java_awt_dnd_DragSourceEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace dnd
-      {
-          class DragSourceContext;
-          class DragSourceEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceEvent : public ::java::util::EventObject
-{
-
-public:
-  DragSourceEvent(::java::awt::dnd::DragSourceContext *);
-  DragSourceEvent(::java::awt::dnd::DragSourceContext *, jint, jint);
-  virtual ::java::awt::dnd::DragSourceContext * getDragSourceContext();
-  virtual ::java::awt::Point * getLocation();
-  virtual jint getX();
-  virtual jint getY();
-private:
-  static const jlong serialVersionUID = -763287114604032641LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::util::EventObject)))) locationSpecified;
-  jint x;
-  jint y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DragSourceEvent__
diff --git a/libjava/java/awt/dnd/DragSourceListener.h b/libjava/java/awt/dnd/DragSourceListener.h
deleted file mode 100644
index fc845501a2e..00000000000
--- a/libjava/java/awt/dnd/DragSourceListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceListener__
-#define __java_awt_dnd_DragSourceListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragSourceDragEvent;
-          class DragSourceDropEvent;
-          class DragSourceEvent;
-          class DragSourceListener;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceListener : public ::java::lang::Object
-{
-
-public:
-  virtual void dragEnter(::java::awt::dnd::DragSourceDragEvent *) = 0;
-  virtual void dragOver(::java::awt::dnd::DragSourceDragEvent *) = 0;
-  virtual void dropActionChanged(::java::awt::dnd::DragSourceDragEvent *) = 0;
-  virtual void dragExit(::java::awt::dnd::DragSourceEvent *) = 0;
-  virtual void dragDropEnd(::java::awt::dnd::DragSourceDropEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_DragSourceListener__
diff --git a/libjava/java/awt/dnd/DragSourceMotionListener.h b/libjava/java/awt/dnd/DragSourceMotionListener.h
deleted file mode 100644
index 0db0603b266..00000000000
--- a/libjava/java/awt/dnd/DragSourceMotionListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DragSourceMotionListener__
-#define __java_awt_dnd_DragSourceMotionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DragSourceDragEvent;
-          class DragSourceMotionListener;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DragSourceMotionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void dragMouseMoved(::java::awt::dnd::DragSourceDragEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_DragSourceMotionListener__
diff --git a/libjava/java/awt/dnd/DropTarget$DropTargetAutoScroller.h b/libjava/java/awt/dnd/DropTarget$DropTargetAutoScroller.h
deleted file mode 100644
index cb72a909ff9..00000000000
--- a/libjava/java/awt/dnd/DropTarget$DropTargetAutoScroller.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTarget$DropTargetAutoScroller__
-#define __java_awt_dnd_DropTarget$DropTargetAutoScroller__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-        class Rectangle;
-      namespace dnd
-      {
-          class DropTarget$DropTargetAutoScroller;
-      }
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-    }
-  }
-}
-
-class java::awt::dnd::DropTarget$DropTargetAutoScroller : public ::java::lang::Object
-{
-
-public: // actually protected
-  DropTarget$DropTargetAutoScroller(::java::awt::Component *, ::java::awt::Point *);
-  virtual void updateLocation(::java::awt::Point *);
-  virtual void stop();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  static const jint HYSTERESIS = 10;
-  static const jint DELAY = 100;
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
-  ::java::awt::Point * point;
-  ::javax::swing::Timer * timer;
-  ::java::awt::Rectangle * outer;
-  ::java::awt::Rectangle * inner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTarget$DropTargetAutoScroller__
diff --git a/libjava/java/awt/dnd/DropTarget.h b/libjava/java/awt/dnd/DropTarget.h
deleted file mode 100644
index 399889a9542..00000000000
--- a/libjava/java/awt/dnd/DropTarget.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTarget__
-#define __java_awt_dnd_DropTarget__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace datatransfer
-      {
-          class FlavorMap;
-      }
-      namespace dnd
-      {
-          class DropTarget;
-          class DropTarget$DropTargetAutoScroller;
-          class DropTargetContext;
-          class DropTargetDragEvent;
-          class DropTargetDropEvent;
-          class DropTargetEvent;
-          class DropTargetListener;
-        namespace peer
-        {
-            class DropTargetPeer;
-        }
-      }
-      namespace peer
-      {
-          class ComponentPeer;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTarget : public ::java::lang::Object
-{
-
-public:
-  DropTarget();
-  DropTarget(::java::awt::Component *, ::java::awt::dnd::DropTargetListener *);
-  DropTarget(::java::awt::Component *, jint, ::java::awt::dnd::DropTargetListener *);
-  DropTarget(::java::awt::Component *, jint, ::java::awt::dnd::DropTargetListener *, jboolean);
-  DropTarget(::java::awt::Component *, jint, ::java::awt::dnd::DropTargetListener *, jboolean, ::java::awt::datatransfer::FlavorMap *);
-  virtual void setComponent(::java::awt::Component *);
-  virtual ::java::awt::Component * getComponent();
-  virtual void setDefaultActions(jint);
-  virtual jint getDefaultActions();
-  virtual void setActive(jboolean);
-  virtual jboolean isActive();
-  virtual void addDropTargetListener(::java::awt::dnd::DropTargetListener *);
-  virtual void removeDropTargetListener(::java::awt::dnd::DropTargetListener *);
-  virtual void dragEnter(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dragOver(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dropActionChanged(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dragExit(::java::awt::dnd::DropTargetEvent *);
-  virtual void drop(::java::awt::dnd::DropTargetDropEvent *);
-  virtual ::java::awt::datatransfer::FlavorMap * getFlavorMap();
-  virtual void setFlavorMap(::java::awt::datatransfer::FlavorMap *);
-  virtual void addNotify(::java::awt::peer::ComponentPeer *);
-  virtual void removeNotify(::java::awt::peer::ComponentPeer *);
-  virtual ::java::awt::dnd::DropTargetContext * getDropTargetContext();
-public: // actually protected
-  virtual ::java::awt::dnd::DropTargetContext * createDropTargetContext();
-  virtual ::java::awt::dnd::DropTarget$DropTargetAutoScroller * createDropTargetAutoScroller(::java::awt::Component *, ::java::awt::Point *);
-  virtual void initializeAutoscrolling(::java::awt::Point *);
-  virtual void updateAutoscroll(::java::awt::Point *);
-  virtual void clearAutoscroll();
-private:
-  static const jlong serialVersionUID = -6283860791671019047LL;
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
-  ::java::awt::datatransfer::FlavorMap * flavorMap;
-  jint actions;
-  ::java::awt::dnd::peer::DropTargetPeer * peer;
-  ::java::awt::dnd::DropTargetContext * dropTargetContext;
-  ::java::awt::dnd::DropTargetListener * dropTargetListener;
-  ::java::awt::dnd::DropTarget$DropTargetAutoScroller * autoscroller;
-  jboolean active;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTarget__
diff --git a/libjava/java/awt/dnd/DropTargetAdapter.h b/libjava/java/awt/dnd/DropTargetAdapter.h
deleted file mode 100644
index 34f4f5b669b..00000000000
--- a/libjava/java/awt/dnd/DropTargetAdapter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetAdapter__
-#define __java_awt_dnd_DropTargetAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DropTargetAdapter;
-          class DropTargetDragEvent;
-          class DropTargetDropEvent;
-          class DropTargetEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetAdapter : public ::java::lang::Object
-{
-
-public:
-  DropTargetAdapter();
-  virtual void dragEnter(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dragOver(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dropActionChanged(::java::awt::dnd::DropTargetDragEvent *);
-  virtual void dragExit(::java::awt::dnd::DropTargetEvent *);
-  virtual void drop(::java::awt::dnd::DropTargetDropEvent *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetAdapter__
diff --git a/libjava/java/awt/dnd/DropTargetContext$TransferableProxy.h b/libjava/java/awt/dnd/DropTargetContext$TransferableProxy.h
deleted file mode 100644
index e670c079d12..00000000000
--- a/libjava/java/awt/dnd/DropTargetContext$TransferableProxy.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetContext$TransferableProxy__
-#define __java_awt_dnd_DropTargetContext$TransferableProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTargetContext;
-          class DropTargetContext$TransferableProxy;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetContext$TransferableProxy : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DropTargetContext$TransferableProxy(::java::awt::dnd::DropTargetContext *, ::java::awt::datatransfer::Transferable *, jboolean);
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isLocal;
-  ::java::awt::datatransfer::Transferable * transferable;
-public: // actually package-private
-  ::java::awt::dnd::DropTargetContext * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetContext$TransferableProxy__
diff --git a/libjava/java/awt/dnd/DropTargetContext.h b/libjava/java/awt/dnd/DropTargetContext.h
deleted file mode 100644
index f6ea29be31d..00000000000
--- a/libjava/java/awt/dnd/DropTargetContext.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetContext__
-#define __java_awt_dnd_DropTargetContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTarget;
-          class DropTargetContext;
-        namespace peer
-        {
-            class DropTargetContextPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetContext : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DropTargetContext(::java::awt::dnd::DropTarget *);
-public:
-  virtual ::java::awt::dnd::DropTarget * getDropTarget();
-  virtual ::java::awt::Component * getComponent();
-  virtual void addNotify(::java::awt::dnd::peer::DropTargetContextPeer *);
-  virtual void removeNotify();
-public: // actually protected
-  virtual void setTargetActions(jint);
-  virtual jint getTargetActions();
-public:
-  virtual void dropComplete(jboolean);
-public: // actually protected
-  virtual void acceptDrag(jint);
-  virtual void rejectDrag();
-  virtual void acceptDrop(jint);
-  virtual void rejectDrop();
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getCurrentDataFlavors();
-  virtual ::java::util::List * getCurrentDataFlavorsAsList();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual ::java::awt::datatransfer::Transferable * getTransferable();
-  virtual ::java::awt::datatransfer::Transferable * createTransferableProxy(::java::awt::datatransfer::Transferable *, jboolean);
-public: // actually package-private
-  static const jlong serialVersionUID = -634158968993743371LL;
-private:
-  ::java::awt::dnd::DropTarget * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dropTarget;
-  jint targetActions;
-  ::java::awt::dnd::peer::DropTargetContextPeer * dtcp;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetContext__
diff --git a/libjava/java/awt/dnd/DropTargetDragEvent.h b/libjava/java/awt/dnd/DropTargetDragEvent.h
deleted file mode 100644
index d25da60043f..00000000000
--- a/libjava/java/awt/dnd/DropTargetDragEvent.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetDragEvent__
-#define __java_awt_dnd_DropTargetDragEvent__
-
-#pragma interface
-
-#include <java/awt/dnd/DropTargetEvent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTargetContext;
-          class DropTargetDragEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetDragEvent : public ::java::awt::dnd::DropTargetEvent
-{
-
-public:
-  DropTargetDragEvent(::java::awt::dnd::DropTargetContext *, ::java::awt::Point *, jint, jint);
-  virtual void acceptDrag(jint);
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getCurrentDataFlavors();
-  virtual ::java::util::List * getCurrentDataFlavorsAsList();
-  virtual jint getDropAction();
-  virtual ::java::awt::Point * getLocation();
-  virtual jint getSourceActions();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual void rejectDrag();
-  virtual ::java::awt::datatransfer::Transferable * getTransferable();
-private:
-  static const jlong serialVersionUID = -8422265619058953682LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::dnd::DropTargetEvent)))) dropAction;
-  jint srcActions;
-  ::java::awt::Point * location;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetDragEvent__
diff --git a/libjava/java/awt/dnd/DropTargetDropEvent.h b/libjava/java/awt/dnd/DropTargetDropEvent.h
deleted file mode 100644
index 08851b68cf4..00000000000
--- a/libjava/java/awt/dnd/DropTargetDropEvent.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetDropEvent__
-#define __java_awt_dnd_DropTargetDropEvent__
-
-#pragma interface
-
-#include <java/awt/dnd/DropTargetEvent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTargetContext;
-          class DropTargetDropEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetDropEvent : public ::java::awt::dnd::DropTargetEvent
-{
-
-public:
-  DropTargetDropEvent(::java::awt::dnd::DropTargetContext *, ::java::awt::Point *, jint, jint);
-  DropTargetDropEvent(::java::awt::dnd::DropTargetContext *, ::java::awt::Point *, jint, jint, jboolean);
-  virtual ::java::awt::Point * getLocation();
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getCurrentDataFlavors();
-  virtual ::java::util::List * getCurrentDataFlavorsAsList();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual jint getSourceActions();
-  virtual jint getDropAction();
-  virtual ::java::awt::datatransfer::Transferable * getTransferable();
-  virtual void acceptDrop(jint);
-  virtual void rejectDrop();
-  virtual void dropComplete(jboolean);
-  virtual jboolean isLocalTransfer();
-private:
-  static const jlong serialVersionUID = -1721911170440459322LL;
-  jint __attribute__((aligned(__alignof__( ::java::awt::dnd::DropTargetEvent)))) dropAction;
-  jint actions;
-  ::java::awt::Point * location;
-  jboolean isLocalTx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetDropEvent__
diff --git a/libjava/java/awt/dnd/DropTargetEvent.h b/libjava/java/awt/dnd/DropTargetEvent.h
deleted file mode 100644
index e090e197c1d..00000000000
--- a/libjava/java/awt/dnd/DropTargetEvent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetEvent__
-#define __java_awt_dnd_DropTargetEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DropTargetContext;
-          class DropTargetEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetEvent : public ::java::util::EventObject
-{
-
-public:
-  DropTargetEvent(::java::awt::dnd::DropTargetContext *);
-  virtual ::java::awt::dnd::DropTargetContext * getDropTargetContext();
-private:
-  static const jlong serialVersionUID = 2821229066521922993LL;
-public: // actually protected
-  ::java::awt::dnd::DropTargetContext * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_DropTargetEvent__
diff --git a/libjava/java/awt/dnd/DropTargetListener.h b/libjava/java/awt/dnd/DropTargetListener.h
deleted file mode 100644
index 83aba62d160..00000000000
--- a/libjava/java/awt/dnd/DropTargetListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_DropTargetListener__
-#define __java_awt_dnd_DropTargetListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DropTargetDragEvent;
-          class DropTargetDropEvent;
-          class DropTargetEvent;
-          class DropTargetListener;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::DropTargetListener : public ::java::lang::Object
-{
-
-public:
-  virtual void dragEnter(::java::awt::dnd::DropTargetDragEvent *) = 0;
-  virtual void dragOver(::java::awt::dnd::DropTargetDragEvent *) = 0;
-  virtual void dropActionChanged(::java::awt::dnd::DropTargetDragEvent *) = 0;
-  virtual void dragExit(::java::awt::dnd::DropTargetEvent *) = 0;
-  virtual void drop(::java::awt::dnd::DropTargetDropEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_DropTargetListener__
diff --git a/libjava/java/awt/dnd/InvalidDnDOperationException.h b/libjava/java/awt/dnd/InvalidDnDOperationException.h
deleted file mode 100644
index 674f7ce2dfe..00000000000
--- a/libjava/java/awt/dnd/InvalidDnDOperationException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_InvalidDnDOperationException__
-#define __java_awt_dnd_InvalidDnDOperationException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class InvalidDnDOperationException;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::InvalidDnDOperationException : public ::java::lang::IllegalStateException
-{
-
-public:
-  InvalidDnDOperationException();
-  InvalidDnDOperationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -6062568741193956678LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_InvalidDnDOperationException__
diff --git a/libjava/java/awt/dnd/MouseDragGestureRecognizer.h b/libjava/java/awt/dnd/MouseDragGestureRecognizer.h
deleted file mode 100644
index 00635da56d7..00000000000
--- a/libjava/java/awt/dnd/MouseDragGestureRecognizer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_MouseDragGestureRecognizer__
-#define __java_awt_dnd_MouseDragGestureRecognizer__
-
-#pragma interface
-
-#include <java/awt/dnd/DragGestureRecognizer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace dnd
-      {
-          class DragGestureListener;
-          class DragSource;
-          class MouseDragGestureRecognizer;
-      }
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class java::awt::dnd::MouseDragGestureRecognizer : public ::java::awt::dnd::DragGestureRecognizer
-{
-
-public: // actually protected
-  MouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint, ::java::awt::dnd::DragGestureListener *);
-  MouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *, jint);
-  MouseDragGestureRecognizer(::java::awt::dnd::DragSource *, ::java::awt::Component *);
-  MouseDragGestureRecognizer(::java::awt::dnd::DragSource *);
-  virtual void registerListeners();
-  virtual void unregisterListeners();
-public:
-  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 *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_dnd_MouseDragGestureRecognizer__
diff --git a/libjava/java/awt/dnd/peer/DragSourceContextPeer.h b/libjava/java/awt/dnd/peer/DragSourceContextPeer.h
deleted file mode 100644
index f5653f26034..00000000000
--- a/libjava/java/awt/dnd/peer/DragSourceContextPeer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_peer_DragSourceContextPeer__
-#define __java_awt_dnd_peer_DragSourceContextPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Cursor;
-        class Image;
-        class Point;
-      namespace dnd
-      {
-          class DragSourceContext;
-        namespace peer
-        {
-            class DragSourceContextPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::peer::DragSourceContextPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void startDrag(::java::awt::dnd::DragSourceContext *, ::java::awt::Cursor *, ::java::awt::Image *, ::java::awt::Point *) = 0;
-  virtual ::java::awt::Cursor * getCursor() = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual void transferablesFlavorsChanged() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_peer_DragSourceContextPeer__
diff --git a/libjava/java/awt/dnd/peer/DropTargetContextPeer.h b/libjava/java/awt/dnd/peer/DropTargetContextPeer.h
deleted file mode 100644
index cb7ae0d655e..00000000000
--- a/libjava/java/awt/dnd/peer/DropTargetContextPeer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_peer_DropTargetContextPeer__
-#define __java_awt_dnd_peer_DropTargetContextPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace dnd
-      {
-          class DropTarget;
-        namespace peer
-        {
-            class DropTargetContextPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::peer::DropTargetContextPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setTargetActions(jint) = 0;
-  virtual jint getTargetActions() = 0;
-  virtual ::java::awt::dnd::DropTarget * getDropTarget() = 0;
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors() = 0;
-  virtual ::java::awt::datatransfer::Transferable * getTransferable() = 0;
-  virtual jboolean isTransferableJVMLocal() = 0;
-  virtual void acceptDrag(jint) = 0;
-  virtual void rejectDrag() = 0;
-  virtual void acceptDrop(jint) = 0;
-  virtual void rejectDrop() = 0;
-  virtual void dropComplete(jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_peer_DropTargetContextPeer__
diff --git a/libjava/java/awt/dnd/peer/DropTargetPeer.h b/libjava/java/awt/dnd/peer/DropTargetPeer.h
deleted file mode 100644
index d96222ba87a..00000000000
--- a/libjava/java/awt/dnd/peer/DropTargetPeer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_dnd_peer_DropTargetPeer__
-#define __java_awt_dnd_peer_DropTargetPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace dnd
-      {
-          class DropTarget;
-        namespace peer
-        {
-            class DropTargetPeer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::dnd::peer::DropTargetPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void addDropTarget(::java::awt::dnd::DropTarget *) = 0;
-  virtual void removeDropTarget(::java::awt::dnd::DropTarget *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_dnd_peer_DropTargetPeer__
diff --git a/libjava/java/awt/event/AWTEventListener.h b/libjava/java/awt/event/AWTEventListener.h
deleted file mode 100644
index e85da18c51e..00000000000
--- a/libjava/java/awt/event/AWTEventListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_AWTEventListener__
-#define __java_awt_event_AWTEventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-      namespace event
-      {
-          class AWTEventListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::AWTEventListener : public ::java::lang::Object
-{
-
-public:
-  virtual void eventDispatched(::java::awt::AWTEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_AWTEventListener__
diff --git a/libjava/java/awt/event/AWTEventListenerProxy.h b/libjava/java/awt/event/AWTEventListenerProxy.h
deleted file mode 100644
index 90e1bc2d939..00000000000
--- a/libjava/java/awt/event/AWTEventListenerProxy.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_AWTEventListenerProxy__
-#define __java_awt_event_AWTEventListenerProxy__
-
-#pragma interface
-
-#include <java/util/EventListenerProxy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-      namespace event
-      {
-          class AWTEventListener;
-          class AWTEventListenerProxy;
-      }
-    }
-  }
-}
-
-class java::awt::event::AWTEventListenerProxy : public ::java::util::EventListenerProxy
-{
-
-public:
-  AWTEventListenerProxy(jlong, ::java::awt::event::AWTEventListener *);
-  virtual void eventDispatched(::java::awt::AWTEvent *);
-  virtual jlong getEventMask();
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::util::EventListenerProxy)))) mask;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_AWTEventListenerProxy__
diff --git a/libjava/java/awt/event/ActionEvent.h b/libjava/java/awt/event/ActionEvent.h
deleted file mode 100644
index a1eff263223..00000000000
--- a/libjava/java/awt/event/ActionEvent.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ActionEvent__
-#define __java_awt_event_ActionEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ActionEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  ActionEvent(::java::lang::Object *, jint, ::java::lang::String *);
-  ActionEvent(::java::lang::Object *, jint, ::java::lang::String *, jint);
-  ActionEvent(::java::lang::Object *, jint, ::java::lang::String *, jlong, jint);
-  virtual ::java::lang::String * getActionCommand();
-  virtual jlong getWhen();
-  virtual jint getModifiers();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -7671078796273832149LL;
-public:
-  static const jint SHIFT_MASK = 1;
-  static const jint CTRL_MASK = 2;
-  static const jint META_MASK = 4;
-  static const jint ALT_MASK = 8;
-  static const jint ACTION_FIRST = 1001;
-  static const jint ACTION_LAST = 1001;
-  static const jint ACTION_PERFORMED = 1001;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) actionCommand;
-  jint modifiers;
-  jlong when;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ActionEvent__
diff --git a/libjava/java/awt/event/ActionListener.h b/libjava/java/awt/event/ActionListener.h
deleted file mode 100644
index 0560d7caf56..00000000000
--- a/libjava/java/awt/event/ActionListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ActionListener__
-#define __java_awt_event_ActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::ActionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_ActionListener__
diff --git a/libjava/java/awt/event/AdjustmentEvent.h b/libjava/java/awt/event/AdjustmentEvent.h
deleted file mode 100644
index 71bef4d3949..00000000000
--- a/libjava/java/awt/event/AdjustmentEvent.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_AdjustmentEvent__
-#define __java_awt_event_AdjustmentEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Adjustable;
-      namespace event
-      {
-          class AdjustmentEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::AdjustmentEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  AdjustmentEvent(::java::awt::Adjustable *, jint, jint, jint);
-  AdjustmentEvent(::java::awt::Adjustable *, jint, jint, jint, jboolean);
-  virtual ::java::awt::Adjustable * getAdjustable();
-  virtual jint getValue();
-  virtual jint getAdjustmentType();
-  virtual jboolean getValueIsAdjusting();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 5700290645205279921LL;
-public:
-  static const jint ADJUSTMENT_FIRST = 601;
-  static const jint ADJUSTMENT_LAST = 601;
-  static const jint ADJUSTMENT_VALUE_CHANGED = 601;
-  static const jint UNIT_INCREMENT = 1;
-  static const jint UNIT_DECREMENT = 2;
-  static const jint BLOCK_DECREMENT = 3;
-  static const jint BLOCK_INCREMENT = 4;
-  static const jint TRACK = 5;
-private:
-  ::java::awt::Adjustable * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) adjustable;
-  jint adjustmentType;
-  jint value;
-  jboolean isAdjusting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_AdjustmentEvent__
diff --git a/libjava/java/awt/event/AdjustmentListener.h b/libjava/java/awt/event/AdjustmentListener.h
deleted file mode 100644
index 75e67203b25..00000000000
--- a/libjava/java/awt/event/AdjustmentListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_AdjustmentListener__
-#define __java_awt_event_AdjustmentListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class AdjustmentEvent;
-          class AdjustmentListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::AdjustmentListener : public ::java::lang::Object
-{
-
-public:
-  virtual void adjustmentValueChanged(::java::awt::event::AdjustmentEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_AdjustmentListener__
diff --git a/libjava/java/awt/event/ComponentAdapter.h b/libjava/java/awt/event/ComponentAdapter.h
deleted file mode 100644
index 0121a0de596..00000000000
--- a/libjava/java/awt/event/ComponentAdapter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ComponentAdapter__
-#define __java_awt_event_ComponentAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentAdapter;
-          class ComponentEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ComponentAdapter : public ::java::lang::Object
-{
-
-public:
-  ComponentAdapter();
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-  virtual void componentShown(::java::awt::event::ComponentEvent *);
-  virtual void componentHidden(::java::awt::event::ComponentEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ComponentAdapter__
diff --git a/libjava/java/awt/event/ComponentEvent.h b/libjava/java/awt/event/ComponentEvent.h
deleted file mode 100644
index 667ceb7c21e..00000000000
--- a/libjava/java/awt/event/ComponentEvent.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ComponentEvent__
-#define __java_awt_event_ComponentEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ComponentEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  ComponentEvent(::java::awt::Component *, jint);
-  virtual ::java::awt::Component * getComponent();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 8101406823902992965LL;
-public:
-  static const jint COMPONENT_FIRST = 100;
-  static const jint COMPONENT_LAST = 103;
-  static const jint COMPONENT_MOVED = 100;
-  static const jint COMPONENT_RESIZED = 101;
-  static const jint COMPONENT_SHOWN = 102;
-  static const jint COMPONENT_HIDDEN = 103;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ComponentEvent__
diff --git a/libjava/java/awt/event/ComponentListener.h b/libjava/java/awt/event/ComponentListener.h
deleted file mode 100644
index 961c9a9d306..00000000000
--- a/libjava/java/awt/event/ComponentListener.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ComponentListener__
-#define __java_awt_event_ComponentListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-          class ComponentListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::ComponentListener : public ::java::lang::Object
-{
-
-public:
-  virtual void componentResized(::java::awt::event::ComponentEvent *) = 0;
-  virtual void componentMoved(::java::awt::event::ComponentEvent *) = 0;
-  virtual void componentShown(::java::awt::event::ComponentEvent *) = 0;
-  virtual void componentHidden(::java::awt::event::ComponentEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_ComponentListener__
diff --git a/libjava/java/awt/event/ContainerAdapter.h b/libjava/java/awt/event/ContainerAdapter.h
deleted file mode 100644
index e483c5b0e75..00000000000
--- a/libjava/java/awt/event/ContainerAdapter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ContainerAdapter__
-#define __java_awt_event_ContainerAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerAdapter;
-          class ContainerEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ContainerAdapter : public ::java::lang::Object
-{
-
-public:
-  ContainerAdapter();
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ContainerAdapter__
diff --git a/libjava/java/awt/event/ContainerEvent.h b/libjava/java/awt/event/ContainerEvent.h
deleted file mode 100644
index f1d4680ef2c..00000000000
--- a/libjava/java/awt/event/ContainerEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ContainerEvent__
-#define __java_awt_event_ContainerEvent__
-
-#pragma interface
-
-#include <java/awt/event/ComponentEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ContainerEvent : public ::java::awt::event::ComponentEvent
-{
-
-public:
-  ContainerEvent(::java::awt::Component *, jint, ::java::awt::Component *);
-  virtual ::java::awt::Container * getContainer();
-  virtual ::java::awt::Component * getChild();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -4114942250539772041LL;
-public:
-  static const jint CONTAINER_FIRST = 300;
-  static const jint CONTAINER_LAST = 301;
-  static const jint COMPONENT_ADDED = 300;
-  static const jint COMPONENT_REMOVED = 301;
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentEvent)))) child;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ContainerEvent__
diff --git a/libjava/java/awt/event/ContainerListener.h b/libjava/java/awt/event/ContainerListener.h
deleted file mode 100644
index ac24d8ce019..00000000000
--- a/libjava/java/awt/event/ContainerListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ContainerListener__
-#define __java_awt_event_ContainerListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerEvent;
-          class ContainerListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::ContainerListener : public ::java::lang::Object
-{
-
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *) = 0;
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_ContainerListener__
diff --git a/libjava/java/awt/event/FocusAdapter.h b/libjava/java/awt/event/FocusAdapter.h
deleted file mode 100644
index f46f94e5c4f..00000000000
--- a/libjava/java/awt/event/FocusAdapter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_FocusAdapter__
-#define __java_awt_event_FocusAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusAdapter;
-          class FocusEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::FocusAdapter : public ::java::lang::Object
-{
-
-public:
-  FocusAdapter();
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_FocusAdapter__
diff --git a/libjava/java/awt/event/FocusEvent.h b/libjava/java/awt/event/FocusEvent.h
deleted file mode 100644
index 5c7315a9a5a..00000000000
--- a/libjava/java/awt/event/FocusEvent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_FocusEvent__
-#define __java_awt_event_FocusEvent__
-
-#pragma interface
-
-#include <java/awt/event/ComponentEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::FocusEvent : public ::java::awt::event::ComponentEvent
-{
-
-public:
-  FocusEvent(::java::awt::Component *, jint, jboolean, ::java::awt::Component *);
-  FocusEvent(::java::awt::Component *, jint, jboolean);
-  FocusEvent(::java::awt::Component *, jint);
-  virtual jboolean isTemporary();
-  virtual ::java::awt::Component * getOppositeComponent();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 523753786457416396LL;
-public:
-  static const jint FOCUS_FIRST = 1004;
-  static const jint FOCUS_LAST = 1005;
-  static const jint FOCUS_GAINED = 1004;
-  static const jint FOCUS_LOST = 1005;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::event::ComponentEvent)))) temporary;
-  ::java::awt::Component * opposite;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_FocusEvent__
diff --git a/libjava/java/awt/event/FocusListener.h b/libjava/java/awt/event/FocusListener.h
deleted file mode 100644
index f47a924b332..00000000000
--- a/libjava/java/awt/event/FocusListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_FocusListener__
-#define __java_awt_event_FocusListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-          class FocusListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::FocusListener : public ::java::lang::Object
-{
-
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *) = 0;
-  virtual void focusLost(::java::awt::event::FocusEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_FocusListener__
diff --git a/libjava/java/awt/event/HierarchyBoundsAdapter.h b/libjava/java/awt/event/HierarchyBoundsAdapter.h
deleted file mode 100644
index 125cf864cd8..00000000000
--- a/libjava/java/awt/event/HierarchyBoundsAdapter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_HierarchyBoundsAdapter__
-#define __java_awt_event_HierarchyBoundsAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class HierarchyBoundsAdapter;
-          class HierarchyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::HierarchyBoundsAdapter : public ::java::lang::Object
-{
-
-public:
-  HierarchyBoundsAdapter();
-  virtual void ancestorMoved(::java::awt::event::HierarchyEvent *);
-  virtual void ancestorResized(::java::awt::event::HierarchyEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_HierarchyBoundsAdapter__
diff --git a/libjava/java/awt/event/HierarchyBoundsListener.h b/libjava/java/awt/event/HierarchyBoundsListener.h
deleted file mode 100644
index 2ae05003f3e..00000000000
--- a/libjava/java/awt/event/HierarchyBoundsListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_HierarchyBoundsListener__
-#define __java_awt_event_HierarchyBoundsListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class HierarchyBoundsListener;
-          class HierarchyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::HierarchyBoundsListener : public ::java::lang::Object
-{
-
-public:
-  virtual void ancestorMoved(::java::awt::event::HierarchyEvent *) = 0;
-  virtual void ancestorResized(::java::awt::event::HierarchyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_HierarchyBoundsListener__
diff --git a/libjava/java/awt/event/HierarchyEvent.h b/libjava/java/awt/event/HierarchyEvent.h
deleted file mode 100644
index fe9585ae0a7..00000000000
--- a/libjava/java/awt/event/HierarchyEvent.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_HierarchyEvent__
-#define __java_awt_event_HierarchyEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-      namespace event
-      {
-          class HierarchyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::HierarchyEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  HierarchyEvent(::java::awt::Component *, jint, ::java::awt::Component *, ::java::awt::Container *);
-  HierarchyEvent(::java::awt::Component *, jint, ::java::awt::Component *, ::java::awt::Container *, jlong);
-  virtual ::java::awt::Component * getComponent();
-  virtual ::java::awt::Component * getChanged();
-  virtual ::java::awt::Container * getChangedParent();
-  virtual jlong getChangeFlags();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -5337576970038043990LL;
-public:
-  static const jint HIERARCHY_FIRST = 1400;
-  static const jint HIERARCHY_CHANGED = 1400;
-  static const jint ANCESTOR_MOVED = 1401;
-  static const jint ANCESTOR_RESIZED = 1402;
-  static const jint HIERARCHY_LAST = 1402;
-  static const jint PARENT_CHANGED = 1;
-  static const jint DISPLAYABILITY_CHANGED = 2;
-  static const jint SHOWING_CHANGED = 4;
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) changed;
-  ::java::awt::Container * changedParent;
-  jlong changeFlags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_HierarchyEvent__
diff --git a/libjava/java/awt/event/HierarchyListener.h b/libjava/java/awt/event/HierarchyListener.h
deleted file mode 100644
index e691edc2782..00000000000
--- a/libjava/java/awt/event/HierarchyListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_HierarchyListener__
-#define __java_awt_event_HierarchyListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class HierarchyEvent;
-          class HierarchyListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::HierarchyListener : public ::java::lang::Object
-{
-
-public:
-  virtual void hierarchyChanged(::java::awt::event::HierarchyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_HierarchyListener__
diff --git a/libjava/java/awt/event/InputEvent.h b/libjava/java/awt/event/InputEvent.h
deleted file mode 100644
index 863963ca05c..00000000000
--- a/libjava/java/awt/event/InputEvent.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_InputEvent__
-#define __java_awt_event_InputEvent__
-
-#pragma interface
-
-#include <java/awt/event/ComponentEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class InputEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::InputEvent : public ::java::awt::event::ComponentEvent
-{
-
-public: // actually package-private
-  InputEvent(::java::awt::Component *, jint, jlong, jint);
-public:
-  virtual jboolean isShiftDown();
-  virtual jboolean isControlDown();
-  virtual jboolean isMetaDown();
-  virtual jboolean isAltDown();
-  virtual jboolean isAltGraphDown();
-  virtual jlong getWhen();
-  virtual jint getModifiers();
-  virtual jint getModifiersEx();
-  virtual void consume();
-  virtual jboolean isConsumed();
-  static ::java::lang::String * getModifiersExText(jint);
-private:
-  static const jlong serialVersionUID = -2482525981698309786LL;
-public:
-  static const jint SHIFT_MASK = 1;
-  static const jint CTRL_MASK = 2;
-  static const jint META_MASK = 4;
-  static const jint ALT_MASK = 8;
-  static const jint ALT_GRAPH_MASK = 32;
-  static const jint BUTTON1_MASK = 16;
-  static const jint BUTTON2_MASK = 8;
-  static const jint BUTTON3_MASK = 4;
-  static const jint SHIFT_DOWN_MASK = 64;
-  static const jint CTRL_DOWN_MASK = 128;
-  static const jint META_DOWN_MASK = 256;
-  static const jint ALT_DOWN_MASK = 512;
-  static const jint BUTTON1_DOWN_MASK = 1024;
-  static const jint BUTTON2_DOWN_MASK = 2048;
-  static const jint BUTTON3_DOWN_MASK = 4096;
-  static const jint ALT_GRAPH_DOWN_MASK = 8192;
-public: // actually package-private
-  static const jint CONVERT_MASK = 10176;
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::awt::event::ComponentEvent)))) when;
-public: // actually package-private
-  jint modifiers;
-  jint modifiersEx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_InputEvent__
diff --git a/libjava/java/awt/event/InputMethodEvent.h b/libjava/java/awt/event/InputMethodEvent.h
deleted file mode 100644
index 0c02470459f..00000000000
--- a/libjava/java/awt/event/InputMethodEvent.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_InputMethodEvent__
-#define __java_awt_event_InputMethodEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class InputMethodEvent;
-      }
-      namespace font
-      {
-          class TextHitInfo;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class java::awt::event::InputMethodEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  InputMethodEvent(::java::awt::Component *, jint, jlong, ::java::text::AttributedCharacterIterator *, jint, ::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *);
-  InputMethodEvent(::java::awt::Component *, jint, ::java::text::AttributedCharacterIterator *, jint, ::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *);
-  InputMethodEvent(::java::awt::Component *, jint, ::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *);
-  virtual ::java::text::AttributedCharacterIterator * getText();
-  virtual jint getCommittedCharacterCount();
-  virtual ::java::awt::font::TextHitInfo * getCaret();
-  virtual ::java::awt::font::TextHitInfo * getVisiblePosition();
-  virtual void consume();
-  virtual jboolean isConsumed();
-  virtual jlong getWhen();
-  virtual ::java::lang::String * paramString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 4727190874778922661LL;
-public:
-  static const jint INPUT_METHOD_FIRST = 1100;
-  static const jint INPUT_METHOD_TEXT_CHANGED = 1100;
-  static const jint CARET_POSITION_CHANGED = 1101;
-  static const jint INPUT_METHOD_LAST = 1101;
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) when;
-  ::java::text::AttributedCharacterIterator * text;
-  jint committedCharacterCount;
-  ::java::awt::font::TextHitInfo * caret;
-  ::java::awt::font::TextHitInfo * visiblePosition;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_InputMethodEvent__
diff --git a/libjava/java/awt/event/InputMethodListener.h b/libjava/java/awt/event/InputMethodListener.h
deleted file mode 100644
index 4bb03de2b06..00000000000
--- a/libjava/java/awt/event/InputMethodListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_InputMethodListener__
-#define __java_awt_event_InputMethodListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class InputMethodEvent;
-          class InputMethodListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::InputMethodListener : public ::java::lang::Object
-{
-
-public:
-  virtual void inputMethodTextChanged(::java::awt::event::InputMethodEvent *) = 0;
-  virtual void caretPositionChanged(::java::awt::event::InputMethodEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_InputMethodListener__
diff --git a/libjava/java/awt/event/InvocationEvent.h b/libjava/java/awt/event/InvocationEvent.h
deleted file mode 100644
index 2dde3a4213e..00000000000
--- a/libjava/java/awt/event/InvocationEvent.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_InvocationEvent__
-#define __java_awt_event_InvocationEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class InvocationEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::InvocationEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  InvocationEvent(::java::lang::Object *, ::java::lang::Runnable *);
-  InvocationEvent(::java::lang::Object *, ::java::lang::Runnable *, ::java::lang::Object *, jboolean);
-public: // actually protected
-  InvocationEvent(::java::lang::Object *, jint, ::java::lang::Runnable *, ::java::lang::Object *, jboolean);
-public:
-  virtual void dispatch();
-  virtual ::java::lang::Exception * getException();
-  virtual ::java::lang::Throwable * getThrowable();
-  virtual jlong getWhen();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 436056344909459450LL;
-public:
-  static const jint INVOCATION_FIRST = 1200;
-  static const jint INVOCATION_DEFAULT = 1200;
-  static const jint INVOCATION_LAST = 1200;
-public: // actually protected
-  ::java::lang::Runnable * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) runnable;
-  ::java::lang::Object * notifier;
-  jboolean catchExceptions;
-private:
-  ::java::lang::Exception * exception;
-  ::java::lang::Throwable * throwable;
-  jlong when;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_InvocationEvent__
diff --git a/libjava/java/awt/event/ItemEvent.h b/libjava/java/awt/event/ItemEvent.h
deleted file mode 100644
index 61f4836468d..00000000000
--- a/libjava/java/awt/event/ItemEvent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ItemEvent__
-#define __java_awt_event_ItemEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class ItemSelectable;
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::ItemEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  ItemEvent(::java::awt::ItemSelectable *, jint, ::java::lang::Object *, jint);
-  virtual ::java::awt::ItemSelectable * getItemSelectable();
-  virtual ::java::lang::Object * getItem();
-  virtual jint getStateChange();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -608708132447206933LL;
-public:
-  static const jint ITEM_FIRST = 701;
-  static const jint ITEM_LAST = 701;
-  static const jint ITEM_STATE_CHANGED = 701;
-  static const jint SELECTED = 1;
-  static const jint DESELECTED = 2;
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) item;
-  jint stateChange;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_ItemEvent__
diff --git a/libjava/java/awt/event/ItemListener.h b/libjava/java/awt/event/ItemListener.h
deleted file mode 100644
index eee09ce9dae..00000000000
--- a/libjava/java/awt/event/ItemListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_ItemListener__
-#define __java_awt_event_ItemListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::ItemListener : public ::java::lang::Object
-{
-
-public:
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_ItemListener__
diff --git a/libjava/java/awt/event/KeyAdapter.h b/libjava/java/awt/event/KeyAdapter.h
deleted file mode 100644
index b63023e6610..00000000000
--- a/libjava/java/awt/event/KeyAdapter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_KeyAdapter__
-#define __java_awt_event_KeyAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyAdapter;
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::KeyAdapter : public ::java::lang::Object
-{
-
-public:
-  KeyAdapter();
-  virtual void keyTyped(::java::awt::event::KeyEvent *);
-  virtual void keyPressed(::java::awt::event::KeyEvent *);
-  virtual void keyReleased(::java::awt::event::KeyEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_KeyAdapter__
diff --git a/libjava/java/awt/event/KeyEvent.h b/libjava/java/awt/event/KeyEvent.h
deleted file mode 100644
index 6b3258677c5..00000000000
--- a/libjava/java/awt/event/KeyEvent.h
+++ /dev/null
@@ -1,255 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_KeyEvent__
-#define __java_awt_event_KeyEvent__
-
-#pragma interface
-
-#include <java/awt/event/InputEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::KeyEvent : public ::java::awt::event::InputEvent
-{
-
-public:
-  KeyEvent(::java::awt::Component *, jint, jlong, jint, jint, jchar, jint);
-  KeyEvent(::java::awt::Component *, jint, jlong, jint, jint, jchar);
-  KeyEvent(::java::awt::Component *, jint, jlong, jint, jint);
-  virtual jint getKeyCode();
-  virtual void setKeyCode(jint);
-  virtual jchar getKeyChar();
-  virtual void setKeyChar(jchar);
-  virtual void setModifiers(jint);
-  virtual jint getKeyLocation();
-  static ::java::lang::String * getKeyText(jint);
-  static ::java::lang::String * getKeyModifiersText(jint);
-  virtual jboolean isActionKey();
-  virtual ::java::lang::String * paramString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -2352130953028126954LL;
-public:
-  static const jint KEY_FIRST = 400;
-  static const jint KEY_LAST = 402;
-  static const jint KEY_TYPED = 400;
-  static const jint KEY_PRESSED = 401;
-  static const jint KEY_RELEASED = 402;
-  static const jint VK_ENTER = 10;
-  static const jint VK_BACK_SPACE = 8;
-  static const jint VK_TAB = 9;
-  static const jint VK_CANCEL = 3;
-  static const jint VK_CLEAR = 12;
-  static const jint VK_SHIFT = 16;
-  static const jint VK_CONTROL = 17;
-  static const jint VK_ALT = 18;
-  static const jint VK_PAUSE = 19;
-  static const jint VK_CAPS_LOCK = 20;
-  static const jint VK_ESCAPE = 27;
-  static const jint VK_SPACE = 32;
-  static const jint VK_PAGE_UP = 33;
-  static const jint VK_PAGE_DOWN = 34;
-  static const jint VK_END = 35;
-  static const jint VK_HOME = 36;
-  static const jint VK_LEFT = 37;
-  static const jint VK_UP = 38;
-  static const jint VK_RIGHT = 39;
-  static const jint VK_DOWN = 40;
-  static const jint VK_COMMA = 44;
-  static const jint VK_MINUS = 45;
-  static const jint VK_PERIOD = 46;
-  static const jint VK_SLASH = 47;
-  static const jint VK_0 = 48;
-  static const jint VK_1 = 49;
-  static const jint VK_2 = 50;
-  static const jint VK_3 = 51;
-  static const jint VK_4 = 52;
-  static const jint VK_5 = 53;
-  static const jint VK_6 = 54;
-  static const jint VK_7 = 55;
-  static const jint VK_8 = 56;
-  static const jint VK_9 = 57;
-  static const jint VK_SEMICOLON = 59;
-  static const jint VK_EQUALS = 61;
-  static const jint VK_A = 65;
-  static const jint VK_B = 66;
-  static const jint VK_C = 67;
-  static const jint VK_D = 68;
-  static const jint VK_E = 69;
-  static const jint VK_F = 70;
-  static const jint VK_G = 71;
-  static const jint VK_H = 72;
-  static const jint VK_I = 73;
-  static const jint VK_J = 74;
-  static const jint VK_K = 75;
-  static const jint VK_L = 76;
-  static const jint VK_M = 77;
-  static const jint VK_N = 78;
-  static const jint VK_O = 79;
-  static const jint VK_P = 80;
-  static const jint VK_Q = 81;
-  static const jint VK_R = 82;
-  static const jint VK_S = 83;
-  static const jint VK_T = 84;
-  static const jint VK_U = 85;
-  static const jint VK_V = 86;
-  static const jint VK_W = 87;
-  static const jint VK_X = 88;
-  static const jint VK_Y = 89;
-  static const jint VK_Z = 90;
-  static const jint VK_OPEN_BRACKET = 91;
-  static const jint VK_BACK_SLASH = 92;
-  static const jint VK_CLOSE_BRACKET = 93;
-  static const jint VK_NUMPAD0 = 96;
-  static const jint VK_NUMPAD1 = 97;
-  static const jint VK_NUMPAD2 = 98;
-  static const jint VK_NUMPAD3 = 99;
-  static const jint VK_NUMPAD4 = 100;
-  static const jint VK_NUMPAD5 = 101;
-  static const jint VK_NUMPAD6 = 102;
-  static const jint VK_NUMPAD7 = 103;
-  static const jint VK_NUMPAD8 = 104;
-  static const jint VK_NUMPAD9 = 105;
-  static const jint VK_MULTIPLY = 106;
-  static const jint VK_ADD = 107;
-  static const jint VK_SEPARATER = 108;
-  static const jint VK_SEPARATOR = 108;
-  static const jint VK_SUBTRACT = 109;
-  static const jint VK_DECIMAL = 110;
-  static const jint VK_DIVIDE = 111;
-  static const jint VK_DELETE = 127;
-  static const jint VK_NUM_LOCK = 144;
-  static const jint VK_SCROLL_LOCK = 145;
-  static const jint VK_F1 = 112;
-  static const jint VK_F2 = 113;
-  static const jint VK_F3 = 114;
-  static const jint VK_F4 = 115;
-  static const jint VK_F5 = 116;
-  static const jint VK_F6 = 117;
-  static const jint VK_F7 = 118;
-  static const jint VK_F8 = 119;
-  static const jint VK_F9 = 120;
-  static const jint VK_F10 = 121;
-  static const jint VK_F11 = 122;
-  static const jint VK_F12 = 123;
-  static const jint VK_F13 = 61440;
-  static const jint VK_F14 = 61441;
-  static const jint VK_F15 = 61442;
-  static const jint VK_F16 = 61443;
-  static const jint VK_F17 = 61444;
-  static const jint VK_F18 = 61445;
-  static const jint VK_F19 = 61446;
-  static const jint VK_F20 = 61447;
-  static const jint VK_F21 = 61448;
-  static const jint VK_F22 = 61449;
-  static const jint VK_F23 = 61450;
-  static const jint VK_F24 = 61451;
-  static const jint VK_PRINTSCREEN = 154;
-  static const jint VK_INSERT = 155;
-  static const jint VK_HELP = 156;
-  static const jint VK_META = 157;
-  static const jint VK_BACK_QUOTE = 192;
-  static const jint VK_QUOTE = 222;
-  static const jint VK_KP_UP = 224;
-  static const jint VK_KP_DOWN = 225;
-  static const jint VK_KP_LEFT = 226;
-  static const jint VK_KP_RIGHT = 227;
-  static const jint VK_DEAD_GRAVE = 128;
-  static const jint VK_DEAD_ACUTE = 129;
-  static const jint VK_DEAD_CIRCUMFLEX = 130;
-  static const jint VK_DEAD_TILDE = 131;
-  static const jint VK_DEAD_MACRON = 132;
-  static const jint VK_DEAD_BREVE = 133;
-  static const jint VK_DEAD_ABOVEDOT = 134;
-  static const jint VK_DEAD_DIAERESIS = 135;
-  static const jint VK_DEAD_ABOVERING = 136;
-  static const jint VK_DEAD_DOUBLEACUTE = 137;
-  static const jint VK_DEAD_CARON = 138;
-  static const jint VK_DEAD_CEDILLA = 139;
-  static const jint VK_DEAD_OGONEK = 140;
-  static const jint VK_DEAD_IOTA = 141;
-  static const jint VK_DEAD_VOICED_SOUND = 142;
-  static const jint VK_DEAD_SEMIVOICED_SOUND = 143;
-  static const jint VK_AMPERSAND = 150;
-  static const jint VK_ASTERISK = 151;
-  static const jint VK_QUOTEDBL = 152;
-  static const jint VK_LESS = 153;
-  static const jint VK_GREATER = 160;
-  static const jint VK_BRACELEFT = 161;
-  static const jint VK_BRACERIGHT = 162;
-  static const jint VK_AT = 512;
-  static const jint VK_COLON = 513;
-  static const jint VK_CIRCUMFLEX = 514;
-  static const jint VK_DOLLAR = 515;
-  static const jint VK_EURO_SIGN = 516;
-  static const jint VK_EXCLAMATION_MARK = 517;
-  static const jint VK_INVERTED_EXCLAMATION_MARK = 518;
-  static const jint VK_LEFT_PARENTHESIS = 519;
-  static const jint VK_NUMBER_SIGN = 520;
-  static const jint VK_PLUS = 521;
-  static const jint VK_RIGHT_PARENTHESIS = 522;
-  static const jint VK_UNDERSCORE = 523;
-  static const jint VK_FINAL = 24;
-  static const jint VK_CONVERT = 28;
-  static const jint VK_NONCONVERT = 29;
-  static const jint VK_ACCEPT = 30;
-  static const jint VK_MODECHANGE = 31;
-  static const jint VK_KANA = 21;
-  static const jint VK_KANJI = 25;
-  static const jint VK_ALPHANUMERIC = 240;
-  static const jint VK_KATAKANA = 241;
-  static const jint VK_HIRAGANA = 242;
-  static const jint VK_FULL_WIDTH = 243;
-  static const jint VK_HALF_WIDTH = 244;
-  static const jint VK_ROMAN_CHARACTERS = 245;
-  static const jint VK_ALL_CANDIDATES = 256;
-  static const jint VK_PREVIOUS_CANDIDATE = 257;
-  static const jint VK_CODE_INPUT = 258;
-  static const jint VK_JAPANESE_KATAKANA = 259;
-  static const jint VK_JAPANESE_HIRAGANA = 260;
-  static const jint VK_JAPANESE_ROMAN = 261;
-  static const jint VK_KANA_LOCK = 262;
-  static const jint VK_INPUT_METHOD_ON_OFF = 263;
-  static const jint VK_CUT = 65489;
-  static const jint VK_COPY = 65485;
-  static const jint VK_PASTE = 65487;
-  static const jint VK_UNDO = 65483;
-  static const jint VK_AGAIN = 65481;
-  static const jint VK_FIND = 65488;
-  static const jint VK_PROPS = 65482;
-  static const jint VK_STOP = 65480;
-  static const jint VK_COMPOSE = 65312;
-  static const jint VK_ALT_GRAPH = 65406;
-  static const jint VK_BEGIN = 65368;
-  static const jint VK_CONTEXT_MENU = 525;
-  static const jint VK_WINDOWS = 524;
-  static const jint VK_UNDEFINED = 0;
-  static const jchar CHAR_UNDEFINED = 65535;
-  static const jint KEY_LOCATION_UNKNOWN = 0;
-  static const jint KEY_LOCATION_STANDARD = 1;
-  static const jint KEY_LOCATION_LEFT = 2;
-  static const jint KEY_LOCATION_RIGHT = 3;
-  static const jint KEY_LOCATION_NUMPAD = 4;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::event::InputEvent)))) keyCode;
-  jchar keyChar;
-  jint keyLocation;
-  jboolean isProxyActive;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_KeyEvent__
diff --git a/libjava/java/awt/event/KeyListener.h b/libjava/java/awt/event/KeyListener.h
deleted file mode 100644
index a25e5b83e8f..00000000000
--- a/libjava/java/awt/event/KeyListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_KeyListener__
-#define __java_awt_event_KeyListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-          class KeyListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::KeyListener : public ::java::lang::Object
-{
-
-public:
-  virtual void keyTyped(::java::awt::event::KeyEvent *) = 0;
-  virtual void keyPressed(::java::awt::event::KeyEvent *) = 0;
-  virtual void keyReleased(::java::awt::event::KeyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_KeyListener__
diff --git a/libjava/java/awt/event/MouseAdapter.h b/libjava/java/awt/event/MouseAdapter.h
deleted file mode 100644
index d0ee27ee757..00000000000
--- a/libjava/java/awt/event/MouseAdapter.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseAdapter__
-#define __java_awt_event_MouseAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseAdapter;
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseAdapter : public ::java::lang::Object
-{
-
-public:
-  MouseAdapter();
-  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 *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_MouseAdapter__
diff --git a/libjava/java/awt/event/MouseEvent.h b/libjava/java/awt/event/MouseEvent.h
deleted file mode 100644
index 439fc50ca39..00000000000
--- a/libjava/java/awt/event/MouseEvent.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseEvent__
-#define __java_awt_event_MouseEvent__
-
-#pragma interface
-
-#include <java/awt/event/InputEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseEvent : public ::java::awt::event::InputEvent
-{
-
-public:
-  MouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean, jint);
-  MouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean);
-  virtual jint getX();
-  virtual jint getY();
-  virtual ::java::awt::Point * getPoint();
-  virtual void translatePoint(jint, jint);
-  virtual jint getClickCount();
-  virtual jint getButton();
-  virtual jboolean isPopupTrigger();
-  static ::java::lang::String * getMouseModifiersText(jint);
-  virtual ::java::lang::String * paramString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -991214153494842848LL;
-public:
-  static const jint MOUSE_FIRST = 500;
-  static const jint MOUSE_LAST = 507;
-  static const jint MOUSE_CLICKED = 500;
-  static const jint MOUSE_PRESSED = 501;
-  static const jint MOUSE_RELEASED = 502;
-  static const jint MOUSE_MOVED = 503;
-  static const jint MOUSE_ENTERED = 504;
-  static const jint MOUSE_EXITED = 505;
-  static const jint NOBUTTON = 0;
-  static const jint BUTTON1 = 1;
-  static const jint BUTTON2 = 2;
-  static const jint BUTTON3 = 3;
-  static const jint MOUSE_DRAGGED = 506;
-  static const jint MOUSE_WHEEL = 507;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::event::InputEvent)))) x;
-  jint y;
-  jint clickCount;
-  jint button;
-  jboolean popupTrigger;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_MouseEvent__
diff --git a/libjava/java/awt/event/MouseListener.h b/libjava/java/awt/event/MouseListener.h
deleted file mode 100644
index d3263ab8e74..00000000000
--- a/libjava/java/awt/event/MouseListener.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseListener__
-#define __java_awt_event_MouseListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-          class MouseListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseListener : public ::java::lang::Object
-{
-
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *) = 0;
-  virtual void mousePressed(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseReleased(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseEntered(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseExited(::java::awt::event::MouseEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_MouseListener__
diff --git a/libjava/java/awt/event/MouseMotionAdapter.h b/libjava/java/awt/event/MouseMotionAdapter.h
deleted file mode 100644
index 2c29cdd9d54..00000000000
--- a/libjava/java/awt/event/MouseMotionAdapter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseMotionAdapter__
-#define __java_awt_event_MouseMotionAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-          class MouseMotionAdapter;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseMotionAdapter : public ::java::lang::Object
-{
-
-public:
-  MouseMotionAdapter();
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_MouseMotionAdapter__
diff --git a/libjava/java/awt/event/MouseMotionListener.h b/libjava/java/awt/event/MouseMotionListener.h
deleted file mode 100644
index 84087bbf0a2..00000000000
--- a/libjava/java/awt/event/MouseMotionListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseMotionListener__
-#define __java_awt_event_MouseMotionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-          class MouseMotionListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseMotionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void mouseDragged(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseMoved(::java::awt::event::MouseEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_MouseMotionListener__
diff --git a/libjava/java/awt/event/MouseWheelEvent.h b/libjava/java/awt/event/MouseWheelEvent.h
deleted file mode 100644
index fd804a126c4..00000000000
--- a/libjava/java/awt/event/MouseWheelEvent.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseWheelEvent__
-#define __java_awt_event_MouseWheelEvent__
-
-#pragma interface
-
-#include <java/awt/event/MouseEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class MouseWheelEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseWheelEvent : public ::java::awt::event::MouseEvent
-{
-
-public:
-  MouseWheelEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean, jint, jint, jint);
-  virtual jint getScrollType();
-  virtual jint getScrollAmount();
-  virtual jint getWheelRotation();
-  virtual jint getUnitsToScroll();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 6459879390515399677LL;
-public:
-  static const jint WHEEL_UNIT_SCROLL = 0;
-  static const jint WHEEL_BLOCK_SCROLL = 1;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::event::MouseEvent)))) scrollType;
-  jint scrollAmount;
-  jint wheelRotation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_MouseWheelEvent__
diff --git a/libjava/java/awt/event/MouseWheelListener.h b/libjava/java/awt/event/MouseWheelListener.h
deleted file mode 100644
index 525b427e413..00000000000
--- a/libjava/java/awt/event/MouseWheelListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_MouseWheelListener__
-#define __java_awt_event_MouseWheelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseWheelEvent;
-          class MouseWheelListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::MouseWheelListener : public ::java::lang::Object
-{
-
-public:
-  virtual void mouseWheelMoved(::java::awt::event::MouseWheelEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_MouseWheelListener__
diff --git a/libjava/java/awt/event/PaintEvent.h b/libjava/java/awt/event/PaintEvent.h
deleted file mode 100644
index 4d1802729c2..00000000000
--- a/libjava/java/awt/event/PaintEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_PaintEvent__
-#define __java_awt_event_PaintEvent__
-
-#pragma interface
-
-#include <java/awt/event/ComponentEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Rectangle;
-      namespace event
-      {
-          class PaintEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::PaintEvent : public ::java::awt::event::ComponentEvent
-{
-
-public:
-  PaintEvent(::java::awt::Component *, jint, ::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * getUpdateRect();
-  virtual void setUpdateRect(::java::awt::Rectangle *);
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 1267492026433337593LL;
-public:
-  static const jint PAINT_FIRST = 800;
-  static const jint PAINT_LAST = 801;
-  static const jint PAINT = 800;
-  static const jint UPDATE = 801;
-private:
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentEvent)))) updateRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_PaintEvent__
diff --git a/libjava/java/awt/event/TextEvent.h b/libjava/java/awt/event/TextEvent.h
deleted file mode 100644
index bd673f73ccb..00000000000
--- a/libjava/java/awt/event/TextEvent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_TextEvent__
-#define __java_awt_event_TextEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class TextEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::TextEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  TextEvent(::java::lang::Object *, jint);
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 6269902291250941179LL;
-public:
-  static const jint TEXT_FIRST = 900;
-  static const jint TEXT_LAST = 900;
-  static const jint TEXT_VALUE_CHANGED = 900;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_TextEvent__
diff --git a/libjava/java/awt/event/TextListener.h b/libjava/java/awt/event/TextListener.h
deleted file mode 100644
index cb3ad2c9185..00000000000
--- a/libjava/java/awt/event/TextListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_TextListener__
-#define __java_awt_event_TextListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class TextEvent;
-          class TextListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::TextListener : public ::java::lang::Object
-{
-
-public:
-  virtual void textValueChanged(::java::awt::event::TextEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_TextListener__
diff --git a/libjava/java/awt/event/WindowAdapter.h b/libjava/java/awt/event/WindowAdapter.h
deleted file mode 100644
index fda064b21c5..00000000000
--- a/libjava/java/awt/event/WindowAdapter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_WindowAdapter__
-#define __java_awt_event_WindowAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowAdapter;
-          class WindowEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::WindowAdapter : public ::java::lang::Object
-{
-
-public:
-  WindowAdapter();
-  virtual void windowOpened(::java::awt::event::WindowEvent *);
-  virtual void windowClosing(::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 *);
-  virtual void windowStateChanged(::java::awt::event::WindowEvent *);
-  virtual void windowGainedFocus(::java::awt::event::WindowEvent *);
-  virtual void windowLostFocus(::java::awt::event::WindowEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_WindowAdapter__
diff --git a/libjava/java/awt/event/WindowEvent.h b/libjava/java/awt/event/WindowEvent.h
deleted file mode 100644
index 886927787e7..00000000000
--- a/libjava/java/awt/event/WindowEvent.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_WindowEvent__
-#define __java_awt_event_WindowEvent__
-
-#pragma interface
-
-#include <java/awt/event/ComponentEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Window;
-      namespace event
-      {
-          class WindowEvent;
-      }
-    }
-  }
-}
-
-class java::awt::event::WindowEvent : public ::java::awt::event::ComponentEvent
-{
-
-public:
-  WindowEvent(::java::awt::Window *, jint, ::java::awt::Window *, jint, jint);
-  WindowEvent(::java::awt::Window *, jint, ::java::awt::Window *);
-  WindowEvent(::java::awt::Window *, jint, jint, jint);
-  WindowEvent(::java::awt::Window *, jint);
-  virtual ::java::awt::Window * getWindow();
-  virtual ::java::awt::Window * getOppositeWindow();
-  virtual jint getOldState();
-  virtual jint getNewState();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -1567959133147912127LL;
-public:
-  static const jint WINDOW_FIRST = 200;
-  static const jint WINDOW_OPENED = 200;
-  static const jint WINDOW_CLOSING = 201;
-  static const jint WINDOW_CLOSED = 202;
-  static const jint WINDOW_ICONIFIED = 203;
-  static const jint WINDOW_DEICONIFIED = 204;
-  static const jint WINDOW_ACTIVATED = 205;
-  static const jint WINDOW_DEACTIVATED = 206;
-  static const jint WINDOW_GAINED_FOCUS = 207;
-  static const jint WINDOW_LOST_FOCUS = 208;
-  static const jint WINDOW_STATE_CHANGED = 209;
-  static const jint WINDOW_LAST = 209;
-private:
-  ::java::awt::Window * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentEvent)))) opposite;
-  jint oldState;
-  jint newState;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_event_WindowEvent__
diff --git a/libjava/java/awt/event/WindowFocusListener.h b/libjava/java/awt/event/WindowFocusListener.h
deleted file mode 100644
index 5ff8d3ac18a..00000000000
--- a/libjava/java/awt/event/WindowFocusListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_WindowFocusListener__
-#define __java_awt_event_WindowFocusListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-          class WindowFocusListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::WindowFocusListener : public ::java::lang::Object
-{
-
-public:
-  virtual void windowGainedFocus(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowLostFocus(::java::awt::event::WindowEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_WindowFocusListener__
diff --git a/libjava/java/awt/event/WindowListener.h b/libjava/java/awt/event/WindowListener.h
deleted file mode 100644
index b1b3109fc27..00000000000
--- a/libjava/java/awt/event/WindowListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_WindowListener__
-#define __java_awt_event_WindowListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-          class WindowListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::WindowListener : public ::java::lang::Object
-{
-
-public:
-  virtual void windowOpened(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowClosing(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowClosed(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowIconified(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowDeiconified(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowActivated(::java::awt::event::WindowEvent *) = 0;
-  virtual void windowDeactivated(::java::awt::event::WindowEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_WindowListener__
diff --git a/libjava/java/awt/event/WindowStateListener.h b/libjava/java/awt/event/WindowStateListener.h
deleted file mode 100644
index 459ad6926be..00000000000
--- a/libjava/java/awt/event/WindowStateListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_event_WindowStateListener__
-#define __java_awt_event_WindowStateListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-          class WindowStateListener;
-      }
-    }
-  }
-}
-
-class java::awt::event::WindowStateListener : public ::java::lang::Object
-{
-
-public:
-  virtual void windowStateChanged(::java::awt::event::WindowEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_event_WindowStateListener__
diff --git a/libjava/java/awt/font/FontRenderContext.h b/libjava/java/awt/font/FontRenderContext.h
deleted file mode 100644
index 30fb5973aee..00000000000
--- a/libjava/java/awt/font/FontRenderContext.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_FontRenderContext__
-#define __java_awt_font_FontRenderContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class FontRenderContext;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-  }
-}
-
-class java::awt::font::FontRenderContext : public ::java::lang::Object
-{
-
-public: // actually protected
-  FontRenderContext();
-public:
-  FontRenderContext(::java::awt::geom::AffineTransform *, jboolean, jboolean);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean equals(::java::awt::font::FontRenderContext *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual jint hashCode();
-  virtual jboolean isAntiAliased();
-  virtual jboolean usesFractionalMetrics();
-private:
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::lang::Object)))) affineTransform;
-  jboolean isAntiAliased__;
-  jboolean usesFractionalMetrics__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_FontRenderContext__
diff --git a/libjava/java/awt/font/GlyphJustificationInfo.h b/libjava/java/awt/font/GlyphJustificationInfo.h
deleted file mode 100644
index eb880668053..00000000000
--- a/libjava/java/awt/font/GlyphJustificationInfo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_GlyphJustificationInfo__
-#define __java_awt_font_GlyphJustificationInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class GlyphJustificationInfo;
-      }
-    }
-  }
-}
-
-class java::awt::font::GlyphJustificationInfo : public ::java::lang::Object
-{
-
-public:
-  GlyphJustificationInfo(jfloat, jboolean, jint, jfloat, jfloat, jboolean, jint, jfloat, jfloat);
-  static const jint PRIORITY_KASHIDA = 0;
-  static const jint PRIORITY_WHITESPACE = 1;
-  static const jint PRIORITY_INTERCHAR = 2;
-  static const jint PRIORITY_NONE = 3;
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) weight;
-  jint growPriority;
-  jboolean growAbsorb;
-  jfloat growLeftLimit;
-  jfloat growRightLimit;
-  jint shrinkPriority;
-  jboolean shrinkAbsorb;
-  jfloat shrinkLeftLimit;
-  jfloat shrinkRightLimit;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_GlyphJustificationInfo__
diff --git a/libjava/java/awt/font/GlyphMetrics.h b/libjava/java/awt/font/GlyphMetrics.h
deleted file mode 100644
index 7c44a20f263..00000000000
--- a/libjava/java/awt/font/GlyphMetrics.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_GlyphMetrics__
-#define __java_awt_font_GlyphMetrics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class GlyphMetrics;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::font::GlyphMetrics : public ::java::lang::Object
-{
-
-public:
-  GlyphMetrics(jboolean, jfloat, jfloat, ::java::awt::geom::Rectangle2D *, jbyte);
-  GlyphMetrics(jfloat, ::java::awt::geom::Rectangle2D *, jbyte);
-  jfloat getAdvance();
-  jfloat getAdvanceX();
-  jfloat getAdvanceY();
-  ::java::awt::geom::Rectangle2D * getBounds2D();
-  jfloat getLSB();
-  jfloat getRSB();
-  jint getType();
-  jboolean isCombining();
-  jboolean isComponent();
-  jboolean isLigature();
-  jboolean isStandard();
-  jboolean isWhitespace();
-  static const jbyte COMBINING = 2;
-  static const jbyte COMPONENT = 3;
-  static const jbyte LIGATURE = 1;
-  static const jbyte STANDARD = 0;
-  static const jbyte WHITESPACE = 4;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) horizontal;
-  jfloat advanceX;
-  jfloat advanceY;
-  ::java::awt::geom::Rectangle2D * bounds;
-  jbyte glyphType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_GlyphMetrics__
diff --git a/libjava/java/awt/font/GlyphVector.h b/libjava/java/awt/font/GlyphVector.h
deleted file mode 100644
index 67826afa8ca..00000000000
--- a/libjava/java/awt/font/GlyphVector.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_GlyphVector__
-#define __java_awt_font_GlyphVector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Rectangle;
-        class Shape;
-      namespace font
-      {
-          class FontRenderContext;
-          class GlyphJustificationInfo;
-          class GlyphMetrics;
-          class GlyphVector;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::font::GlyphVector : public ::java::lang::Object
-{
-
-public:
-  GlyphVector();
-  virtual jboolean equals(::java::awt::font::GlyphVector *) = 0;
-  virtual ::java::awt::Font * getFont() = 0;
-  virtual ::java::awt::font::FontRenderContext * getFontRenderContext() = 0;
-  virtual jint getGlyphCharIndex(jint);
-  virtual JArray< jint > * getGlyphCharIndices(jint, jint, JArray< jint > *);
-  virtual jint getGlyphCode(jint) = 0;
-  virtual JArray< jint > * getGlyphCodes(jint, jint, JArray< jint > *) = 0;
-  virtual ::java::awt::font::GlyphJustificationInfo * getGlyphJustificationInfo(jint) = 0;
-  virtual ::java::awt::Shape * getGlyphLogicalBounds(jint) = 0;
-  virtual ::java::awt::font::GlyphMetrics * getGlyphMetrics(jint) = 0;
-  virtual ::java::awt::Shape * getGlyphOutline(jint) = 0;
-  virtual ::java::awt::Shape * getGlyphOutline(jint, jfloat, jfloat);
-  virtual ::java::awt::Rectangle * getGlyphPixelBounds(jint, ::java::awt::font::FontRenderContext *, jfloat, jfloat);
-  virtual ::java::awt::geom::Point2D * getGlyphPosition(jint) = 0;
-  virtual JArray< jfloat > * getGlyphPositions(jint, jint, JArray< jfloat > *) = 0;
-  virtual ::java::awt::geom::AffineTransform * getGlyphTransform(jint) = 0;
-  virtual ::java::awt::Shape * getGlyphVisualBounds(jint) = 0;
-  virtual jint getLayoutFlags();
-  virtual ::java::awt::geom::Rectangle2D * getLogicalBounds() = 0;
-  virtual jint getNumGlyphs() = 0;
-  virtual ::java::awt::Shape * getOutline() = 0;
-  virtual ::java::awt::Shape * getOutline(jfloat, jfloat) = 0;
-  virtual ::java::awt::Rectangle * getPixelBounds(::java::awt::font::FontRenderContext *, jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getVisualBounds() = 0;
-  virtual void performDefaultLayout() = 0;
-  virtual void setGlyphPosition(jint, ::java::awt::geom::Point2D *) = 0;
-  virtual void setGlyphTransform(jint, ::java::awt::geom::AffineTransform *) = 0;
-  static const jint FLAG_COMPLEX_GLYPHS = 8;
-  static const jint FLAG_HAS_POSITION_ADJUSTMENTS = 2;
-  static const jint FLAG_HAS_TRANSFORMS = 1;
-  static const jint FLAG_MASK = 15;
-  static const jint FLAG_RUN_RTL = 4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_GlyphVector__
diff --git a/libjava/java/awt/font/GraphicAttribute.h b/libjava/java/awt/font/GraphicAttribute.h
deleted file mode 100644
index 622cbed7b89..00000000000
--- a/libjava/java/awt/font/GraphicAttribute.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_GraphicAttribute__
-#define __java_awt_font_GraphicAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics2D;
-      namespace font
-      {
-          class GlyphJustificationInfo;
-          class GraphicAttribute;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::font::GraphicAttribute : public ::java::lang::Object
-{
-
-public: // actually protected
-  GraphicAttribute(jint);
-public:
-  virtual void draw(::java::awt::Graphics2D *, jfloat, jfloat) = 0;
-  virtual jfloat getAdvance() = 0;
-  virtual jfloat getAscent() = 0;
-  virtual jfloat getDescent() = 0;
-  virtual jint getAlignment();
-  virtual ::java::awt::geom::Rectangle2D * getBounds();
-  virtual ::java::awt::font::GlyphJustificationInfo * getJustificationInfo();
-  static const jint BOTTOM_ALIGNMENT = -2;
-  static const jint CENTER_BASELINE = 1;
-  static const jint HANGING_BASELINE = 2;
-  static const jint ROMAN_BASELINE = 0;
-  static const jint TOP_ALIGNMENT = -1;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) alignment;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_GraphicAttribute__
diff --git a/libjava/java/awt/font/ImageGraphicAttribute.h b/libjava/java/awt/font/ImageGraphicAttribute.h
deleted file mode 100644
index 086fc3d1b53..00000000000
--- a/libjava/java/awt/font/ImageGraphicAttribute.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_ImageGraphicAttribute__
-#define __java_awt_font_ImageGraphicAttribute__
-
-#pragma interface
-
-#include <java/awt/font/GraphicAttribute.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics2D;
-        class Image;
-      namespace font
-      {
-          class ImageGraphicAttribute;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::font::ImageGraphicAttribute : public ::java::awt::font::GraphicAttribute
-{
-
-public:
-  ImageGraphicAttribute(::java::awt::Image *, jint);
-  ImageGraphicAttribute(::java::awt::Image *, jint, jfloat, jfloat);
-  void draw(::java::awt::Graphics2D *, jfloat, jfloat);
-  jboolean equals(::java::lang::Object *);
-  jboolean equals(::java::awt::font::ImageGraphicAttribute *);
-  jfloat getAdvance();
-  jfloat getAscent();
-  ::java::awt::geom::Rectangle2D * getBounds();
-  jfloat getDescent();
-  jint hashCode();
-private:
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::java::awt::font::GraphicAttribute)))) image;
-  jfloat originX;
-  jfloat originY;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_ImageGraphicAttribute__
diff --git a/libjava/java/awt/font/LineBreakMeasurer.h b/libjava/java/awt/font/LineBreakMeasurer.h
deleted file mode 100644
index 3d862e74833..00000000000
--- a/libjava/java/awt/font/LineBreakMeasurer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_LineBreakMeasurer__
-#define __java_awt_font_LineBreakMeasurer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class FontRenderContext;
-          class LineBreakMeasurer;
-          class TextLayout;
-          class TextMeasurer;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class BreakIterator;
-    }
-  }
-}
-
-class java::awt::font::LineBreakMeasurer : public ::java::lang::Object
-{
-
-public:
-  LineBreakMeasurer(::java::text::AttributedCharacterIterator *, ::java::text::BreakIterator *, ::java::awt::font::FontRenderContext *);
-  LineBreakMeasurer(::java::text::AttributedCharacterIterator *, ::java::awt::font::FontRenderContext *);
-  void deleteChar(::java::text::AttributedCharacterIterator *, jint);
-  void insertChar(::java::text::AttributedCharacterIterator *, jint);
-  ::java::awt::font::TextLayout * nextLayout(jfloat);
-  ::java::awt::font::TextLayout * nextLayout(jfloat, jint, jboolean);
-  jint nextOffset(jfloat);
-  jint nextOffset(jfloat, jint, jboolean);
-  void setPosition(jint);
-  jint getPosition();
-private:
-  ::java::text::AttributedCharacterIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
-  jint position;
-  ::java::awt::font::TextMeasurer * tm;
-  jint numChars;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_LineBreakMeasurer__
diff --git a/libjava/java/awt/font/LineMetrics.h b/libjava/java/awt/font/LineMetrics.h
deleted file mode 100644
index 35b8594dc1d..00000000000
--- a/libjava/java/awt/font/LineMetrics.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_LineMetrics__
-#define __java_awt_font_LineMetrics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class LineMetrics;
-      }
-    }
-  }
-}
-
-class java::awt::font::LineMetrics : public ::java::lang::Object
-{
-
-public:
-  LineMetrics();
-  virtual jfloat getAscent() = 0;
-  virtual jint getBaselineIndex() = 0;
-  virtual JArray< jfloat > * getBaselineOffsets() = 0;
-  virtual jfloat getDescent() = 0;
-  virtual jfloat getHeight() = 0;
-  virtual jfloat getLeading() = 0;
-  virtual jint getNumChars() = 0;
-  virtual jfloat getStrikethroughOffset() = 0;
-  virtual jfloat getStrikethroughThickness() = 0;
-  virtual jfloat getUnderlineOffset() = 0;
-  virtual jfloat getUnderlineThickness() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_LineMetrics__
diff --git a/libjava/java/awt/font/MultipleMaster.h b/libjava/java/awt/font/MultipleMaster.h
deleted file mode 100644
index 99e4580ae29..00000000000
--- a/libjava/java/awt/font/MultipleMaster.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_MultipleMaster__
-#define __java_awt_font_MultipleMaster__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class MultipleMaster;
-      }
-    }
-  }
-}
-
-class java::awt::font::MultipleMaster : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Font * deriveMMFont(JArray< jfloat > *) = 0;
-  virtual ::java::awt::Font * deriveMMFont(JArray< jfloat > *, jfloat, jfloat, jfloat, jfloat) = 0;
-  virtual JArray< jfloat > * getDesignAxisDefaults() = 0;
-  virtual JArray< ::java::lang::String * > * getDesignAxisNames() = 0;
-  virtual JArray< jfloat > * getDesignAxisRanges() = 0;
-  virtual jint getNumDesignAxes() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_font_MultipleMaster__
diff --git a/libjava/java/awt/font/NumericShaper.h b/libjava/java/awt/font/NumericShaper.h
deleted file mode 100644
index 85f0d4c318b..00000000000
--- a/libjava/java/awt/font/NumericShaper.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_NumericShaper__
-#define __java_awt_font_NumericShaper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class NumericShaper;
-      }
-    }
-  }
-}
-
-class java::awt::font::NumericShaper : public ::java::lang::Object
-{
-
-  NumericShaper(jint, jint);
-public:
-  jint getRanges();
-  jboolean isContextual();
-  void shape(JArray< jchar > *, jint, jint);
-private:
-  jint classify(::java::lang::Character$UnicodeBlock *);
-public:
-  void shape(JArray< jchar > *, jint, jint, jint);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-  static ::java::awt::font::NumericShaper * getShaper(jint);
-  static ::java::awt::font::NumericShaper * getContextualShaper(jint);
-  static ::java::awt::font::NumericShaper * getContextualShaper(jint, jint);
-private:
-  static const jlong serialVersionUID = -8022764705923730308LL;
-public:
-  static const jint ALL_RANGES = 524287;
-  static const jint ARABIC = 2;
-  static const jint BENGALI = 16;
-  static const jint DEVANAGARI = 8;
-  static const jint EASTERN_ARABIC = 4;
-  static const jint ETHIOPIC = 65536;
-  static const jint EUROPEAN = 1;
-  static const jint GUJARATI = 64;
-  static const jint GURMUKHI = 32;
-  static const jint KANNADA = 1024;
-  static const jint KHMER = 131072;
-  static const jint LAO = 8192;
-  static const jint MALAYALAM = 2048;
-  static const jint MONGOLIAN = 262144;
-  static const jint MYANMAR = 32768;
-  static const jint ORIYA = 128;
-  static const jint TAMIL = 256;
-  static const jint TELUGU = 512;
-  static const jint THAI = 4096;
-  static const jint TIBETAN = 16384;
-private:
-  static JArray< jchar > * zeroDigits;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  jint mask;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_NumericShaper__
diff --git a/libjava/java/awt/font/OpenType.h b/libjava/java/awt/font/OpenType.h
deleted file mode 100644
index bd1c0a622c1..00000000000
--- a/libjava/java/awt/font/OpenType.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_OpenType__
-#define __java_awt_font_OpenType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class OpenType;
-      }
-    }
-  }
-}
-
-class java::awt::font::OpenType : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * getFontTable(jint) = 0;
-  virtual JArray< jbyte > * getFontTable(jint, jint, jint) = 0;
-  virtual JArray< jbyte > * getFontTable(::java::lang::String *) = 0;
-  virtual JArray< jbyte > * getFontTable(::java::lang::String *, jint, jint) = 0;
-  virtual jint getFontTableSize(jint) = 0;
-  virtual jint getFontTableSize(::java::lang::String *) = 0;
-  virtual jint getVersion() = 0;
-  static const jint TAG_ACNT = 1633906292;
-  static const jint TAG_AVAR = 1635148146;
-  static const jint TAG_BASE = 1111577413;
-  static const jint TAG_BDAT = 1650745716;
-  static const jint TAG_BLOC = 1651273571;
-  static const jint TAG_BSLN = 1651731566;
-  static const jint TAG_CFF = 1128678944;
-  static const jint TAG_CMAP = 1668112752;
-  static const jint TAG_CVAR = 1668702578;
-  static const jint TAG_CVT = 1668707360;
-  static const jint TAG_DSIG = 1146308935;
-  static const jint TAG_EBDT = 1161970772;
-  static const jint TAG_EBLC = 1161972803;
-  static const jint TAG_EBSC = 1161974595;
-  static const jint TAG_FDSC = 1717859171;
-  static const jint TAG_FEAT = 1717920116;
-  static const jint TAG_FMTX = 1718449272;
-  static const jint TAG_FPGM = 1718642541;
-  static const jint TAG_FVAR = 1719034226;
-  static const jint TAG_GASP = 1734439792;
-  static const jint TAG_GDEF = 1195656518;
-  static const jint TAG_GLYF = 1735162214;
-  static const jint TAG_GPOS = 1196445523;
-  static const jint TAG_GSUB = 1196643650;
-  static const jint TAG_GVAR = 1735811442;
-  static const jint TAG_HDMX = 1751412088;
-  static const jint TAG_HEAD = 1751474532;
-  static const jint TAG_HHEA = 1751672161;
-  static const jint TAG_HMTX = 1752003704;
-  static const jint TAG_JSTF = 1246975046;
-  static const jint TAG_JUST = 1786082164;
-  static const jint TAG_KERN = 1801810542;
-  static const jint TAG_LCAR = 1818452338;
-  static const jint TAG_LOCA = 1819239265;
-  static const jint TAG_LTSH = 1280594760;
-  static const jint TAG_MAXP = 1835104368;
-  static const jint TAG_MMFX = 1296909912;
-  static const jint TAG_MMSD = 1296913220;
-  static const jint TAG_MORT = 1836020340;
-  static const jint TAG_NAME = 1851878757;
-  static const jint TAG_OPBD = 1836020340;
-  static const jint TAG_OS2 = 1330851634;
-  static const jint TAG_PCLT = 1346587732;
-  static const jint TAG_POST = 1886352244;
-  static const jint TAG_PREP = 1886545264;
-  static const jint TAG_PROP = 1886547824;
-  static const jint TAG_TRAK = 1953653099;
-  static const jint TAG_TYP1 = 1954115633;
-  static const jint TAG_VDMX = 1447316824;
-  static const jint TAG_VHEA = 1986553185;
-  static const jint TAG_VMTX = 1986884728;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_font_OpenType__
diff --git a/libjava/java/awt/font/ShapeGraphicAttribute.h b/libjava/java/awt/font/ShapeGraphicAttribute.h
deleted file mode 100644
index fd8d1be57ea..00000000000
--- a/libjava/java/awt/font/ShapeGraphicAttribute.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_ShapeGraphicAttribute__
-#define __java_awt_font_ShapeGraphicAttribute__
-
-#pragma interface
-
-#include <java/awt/font/GraphicAttribute.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics2D;
-        class Shape;
-      namespace font
-      {
-          class ShapeGraphicAttribute;
-      }
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::font::ShapeGraphicAttribute : public ::java::awt::font::GraphicAttribute
-{
-
-public:
-  ShapeGraphicAttribute(::java::awt::Shape *, jint, jboolean);
-  void draw(::java::awt::Graphics2D *, jfloat, jfloat);
-  jboolean equals(::java::lang::Object *);
-  jboolean equals(::java::awt::font::ShapeGraphicAttribute *);
-  jfloat getAdvance();
-  jfloat getAscent();
-  jfloat getDescent();
-  ::java::awt::geom::Rectangle2D * getBounds();
-  jint hashCode();
-  static const jboolean FILL = 0;
-  static const jboolean STROKE = 1;
-private:
-  ::java::awt::Shape * __attribute__((aligned(__alignof__( ::java::awt::font::GraphicAttribute)))) shape;
-  jboolean stroke;
-  ::java::awt::geom::Rectangle2D * bounds;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_ShapeGraphicAttribute__
diff --git a/libjava/java/awt/font/TextAttribute.h b/libjava/java/awt/font/TextAttribute.h
deleted file mode 100644
index 050d7149108..00000000000
--- a/libjava/java/awt/font/TextAttribute.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextAttribute__
-#define __java_awt_font_TextAttribute__
-
-#pragma interface
-
-#include <java/text/AttributedCharacterIterator$Attribute.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class TextAttribute;
-      }
-    }
-  }
-}
-
-class java::awt::font::TextAttribute : public ::java::text::AttributedCharacterIterator$Attribute
-{
-
-public: // actually protected
-  TextAttribute(::java::lang::String *);
-  ::java::lang::Object * readResolve();
-private:
-  static const jlong serialVersionUID = 7744112784117861702LL;
-public:
-  static ::java::awt::font::TextAttribute * BACKGROUND;
-  static ::java::awt::font::TextAttribute * BIDI_EMBEDDING;
-  static ::java::awt::font::TextAttribute * CHAR_REPLACEMENT;
-  static ::java::awt::font::TextAttribute * FAMILY;
-  static ::java::awt::font::TextAttribute * FONT;
-  static ::java::awt::font::TextAttribute * FOREGROUND;
-  static ::java::awt::font::TextAttribute * INPUT_METHOD_HIGHLIGHT;
-  static ::java::awt::font::TextAttribute * INPUT_METHOD_UNDERLINE;
-  static ::java::awt::font::TextAttribute * JUSTIFICATION;
-  static ::java::lang::Float * JUSTIFICATION_FULL;
-  static ::java::lang::Float * JUSTIFICATION_NONE;
-  static ::java::awt::font::TextAttribute * NUMERIC_SHAPING;
-  static ::java::awt::font::TextAttribute * POSTURE;
-  static ::java::lang::Float * POSTURE_OBLIQUE;
-  static ::java::lang::Float * POSTURE_REGULAR;
-  static ::java::awt::font::TextAttribute * RUN_DIRECTION;
-  static ::java::lang::Boolean * RUN_DIRECTION_LTR;
-  static ::java::lang::Boolean * RUN_DIRECTION_RTL;
-  static ::java::awt::font::TextAttribute * SIZE;
-  static ::java::awt::font::TextAttribute * STRIKETHROUGH;
-  static ::java::lang::Boolean * STRIKETHROUGH_ON;
-  static ::java::awt::font::TextAttribute * SUPERSCRIPT;
-  static ::java::lang::Integer * SUPERSCRIPT_SUB;
-  static ::java::lang::Integer * SUPERSCRIPT_SUPER;
-  static ::java::awt::font::TextAttribute * SWAP_COLORS;
-  static ::java::lang::Boolean * SWAP_COLORS_ON;
-  static ::java::awt::font::TextAttribute * TRANSFORM;
-  static ::java::awt::font::TextAttribute * UNDERLINE;
-  static ::java::lang::Integer * UNDERLINE_LOW_DASHED;
-  static ::java::lang::Integer * UNDERLINE_LOW_DOTTED;
-  static ::java::lang::Integer * UNDERLINE_LOW_GRAY;
-  static ::java::lang::Integer * UNDERLINE_LOW_ONE_PIXEL;
-  static ::java::lang::Integer * UNDERLINE_LOW_TWO_PIXEL;
-  static ::java::lang::Integer * UNDERLINE_ON;
-  static ::java::awt::font::TextAttribute * WEIGHT;
-  static ::java::lang::Float * WEIGHT_BOLD;
-  static ::java::lang::Float * WEIGHT_DEMIBOLD;
-  static ::java::lang::Float * WEIGHT_DEMILIGHT;
-  static ::java::lang::Float * WEIGHT_EXTRA_LIGHT;
-  static ::java::lang::Float * WEIGHT_EXTRABOLD;
-  static ::java::lang::Float * WEIGHT_HEAVY;
-  static ::java::lang::Float * WEIGHT_LIGHT;
-  static ::java::lang::Float * WEIGHT_MEDIUM;
-  static ::java::lang::Float * WEIGHT_REGULAR;
-  static ::java::lang::Float * WEIGHT_SEMIBOLD;
-  static ::java::lang::Float * WEIGHT_ULTRABOLD;
-  static ::java::awt::font::TextAttribute * WIDTH;
-  static ::java::lang::Float * WIDTH_CONDENSED;
-  static ::java::lang::Float * WIDTH_EXTENDED;
-  static ::java::lang::Float * WIDTH_REGULAR;
-  static ::java::lang::Float * WIDTH_SEMI_CONDENSED;
-  static ::java::lang::Float * WIDTH_SEMI_EXTENDED;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextAttribute__
diff --git a/libjava/java/awt/font/TextHitInfo.h b/libjava/java/awt/font/TextHitInfo.h
deleted file mode 100644
index a38745895e5..00000000000
--- a/libjava/java/awt/font/TextHitInfo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextHitInfo__
-#define __java_awt_font_TextHitInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class TextHitInfo;
-      }
-    }
-  }
-}
-
-class java::awt::font::TextHitInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TextHitInfo(jint, jboolean);
-public:
-  jint getCharIndex();
-  jboolean isLeadingEdge();
-  jint getInsertionIndex();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jboolean equals(::java::awt::font::TextHitInfo *);
-  static ::java::awt::font::TextHitInfo * leading(jint);
-  static ::java::awt::font::TextHitInfo * trailing(jint);
-  static ::java::awt::font::TextHitInfo * beforeOffset(jint);
-  static ::java::awt::font::TextHitInfo * afterOffset(jint);
-  ::java::awt::font::TextHitInfo * getOtherHit();
-  ::java::awt::font::TextHitInfo * getOffsetHit(jint);
-  ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) charIndex;
-  jboolean leadingEdge;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextHitInfo__
diff --git a/libjava/java/awt/font/TextLayout$CaretPolicy.h b/libjava/java/awt/font/TextLayout$CaretPolicy.h
deleted file mode 100644
index adb7b0d1fe6..00000000000
--- a/libjava/java/awt/font/TextLayout$CaretPolicy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextLayout$CaretPolicy__
-#define __java_awt_font_TextLayout$CaretPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class TextHitInfo;
-          class TextLayout;
-          class TextLayout$CaretPolicy;
-      }
-    }
-  }
-}
-
-class java::awt::font::TextLayout$CaretPolicy : public ::java::lang::Object
-{
-
-public:
-  TextLayout$CaretPolicy();
-  virtual ::java::awt::font::TextHitInfo * getStrongCaret(::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *, ::java::awt::font::TextLayout *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextLayout$CaretPolicy__
diff --git a/libjava/java/awt/font/TextLayout$Run.h b/libjava/java/awt/font/TextLayout$Run.h
deleted file mode 100644
index 3760b6eef9d..00000000000
--- a/libjava/java/awt/font/TextLayout$Run.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextLayout$Run__
-#define __java_awt_font_TextLayout$Run__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace font
-      {
-          class GlyphVector;
-          class TextLayout;
-          class TextLayout$Run;
-      }
-    }
-  }
-}
-
-class java::awt::font::TextLayout$Run : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TextLayout$Run(::java::awt::font::TextLayout *, ::java::awt::font::GlyphVector *, ::java::awt::Font *, jint, jint);
-  virtual jboolean isLeftToRight();
-  ::java::awt::font::GlyphVector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glyphVector;
-  ::java::awt::Font * font;
-  jint runStart;
-  jint runEnd;
-  jfloat location;
-  ::java::awt::font::TextLayout * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextLayout$Run__
diff --git a/libjava/java/awt/font/TextLayout.h b/libjava/java/awt/font/TextLayout.h
deleted file mode 100644
index f5c02bafd9b..00000000000
--- a/libjava/java/awt/font/TextLayout.h
+++ /dev/null
@@ -1,140 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextLayout__
-#define __java_awt_font_TextLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics2D;
-        class Shape;
-      namespace font
-      {
-          class FontRenderContext;
-          class LineMetrics;
-          class TextHitInfo;
-          class TextLayout;
-          class TextLayout$CaretPolicy;
-          class TextLayout$Run;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class Bidi;
-    }
-  }
-}
-
-class java::awt::font::TextLayout : public ::java::lang::Object
-{
-
-public:
-  TextLayout(::java::lang::String *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-  TextLayout(::java::lang::String *, ::java::util::Map *, ::java::awt::font::FontRenderContext *);
-  TextLayout(::java::text::AttributedCharacterIterator *, ::java::awt::font::FontRenderContext *);
-public: // actually package-private
-  TextLayout(::java::awt::font::TextLayout *, jint, jint);
-private:
-  void setCharIndices();
-  void setupMappings();
-  static ::java::lang::String * getText(::java::text::AttributedCharacterIterator *);
-  static ::java::awt::Font * getFont(::java::text::AttributedCharacterIterator *);
-  void getStringProperties();
-  void determineWhiteSpace();
-public: // actually protected
-  ::java::lang::Object * clone();
-public:
-  void draw(::java::awt::Graphics2D *, jfloat, jfloat);
-  jboolean equals(::java::lang::Object *);
-  jboolean equals(::java::awt::font::TextLayout *);
-  jfloat getAdvance();
-  jfloat getAscent();
-  jbyte getBaseline();
-  JArray< jfloat > * getBaselineOffsets();
-  ::java::awt::Shape * getBlackBoxBounds(jint, jint);
-  ::java::awt::geom::Rectangle2D * getBounds();
-  JArray< jfloat > * getCaretInfo(::java::awt::font::TextHitInfo *);
-  JArray< jfloat > * getCaretInfo(::java::awt::font::TextHitInfo *, ::java::awt::geom::Rectangle2D *);
-  ::java::awt::Shape * getCaretShape(::java::awt::font::TextHitInfo *);
-  ::java::awt::Shape * getCaretShape(::java::awt::font::TextHitInfo *, ::java::awt::geom::Rectangle2D *);
-  JArray< ::java::awt::Shape * > * getCaretShapes(jint);
-  JArray< ::java::awt::Shape * > * getCaretShapes(jint, ::java::awt::geom::Rectangle2D *);
-  JArray< ::java::awt::Shape * > * getCaretShapes(jint, ::java::awt::geom::Rectangle2D *, ::java::awt::font::TextLayout$CaretPolicy *);
-  jint getCharacterCount();
-  jbyte getCharacterLevel(jint);
-  jfloat getDescent();
-  ::java::awt::font::TextLayout * getJustifiedLayout(jfloat);
-  jfloat getLeading();
-  ::java::awt::Shape * getLogicalHighlightShape(jint, jint);
-  ::java::awt::Shape * getLogicalHighlightShape(jint, jint, ::java::awt::geom::Rectangle2D *);
-  JArray< jint > * getLogicalRangesForVisualSelection(::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *);
-  ::java::awt::font::TextHitInfo * getNextLeftHit(jint);
-  ::java::awt::font::TextHitInfo * getNextLeftHit(jint, ::java::awt::font::TextLayout$CaretPolicy *);
-  ::java::awt::font::TextHitInfo * getNextLeftHit(::java::awt::font::TextHitInfo *);
-  ::java::awt::font::TextHitInfo * getNextRightHit(jint);
-  ::java::awt::font::TextHitInfo * getNextRightHit(jint, ::java::awt::font::TextLayout$CaretPolicy *);
-  ::java::awt::font::TextHitInfo * getNextRightHit(::java::awt::font::TextHitInfo *);
-  ::java::awt::Shape * getOutline(::java::awt::geom::AffineTransform *);
-  jfloat getVisibleAdvance();
-  ::java::awt::Shape * getVisualHighlightShape(::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *);
-  ::java::awt::Shape * getVisualHighlightShape(::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *, ::java::awt::geom::Rectangle2D *);
-private:
-  ::java::awt::Shape * left(::java::awt::geom::Rectangle2D *);
-  ::java::awt::Shape * right(::java::awt::geom::Rectangle2D *);
-public:
-  ::java::awt::font::TextHitInfo * getVisualOtherHit(::java::awt::font::TextHitInfo *);
-public: // actually protected
-  void handleJustify(jfloat);
-public:
-  ::java::awt::font::TextHitInfo * hitTestChar(jfloat, jfloat);
-  ::java::awt::font::TextHitInfo * hitTestChar(jfloat, jfloat, ::java::awt::geom::Rectangle2D *);
-  jboolean isLeftToRight();
-  jboolean isVertical();
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  ::java::awt::geom::Rectangle2D * getNaturalBounds();
-  void checkHitInfo(::java::awt::font::TextHitInfo *);
-  jint hitToCaret(::java::awt::font::TextHitInfo *);
-  ::java::awt::font::TextHitInfo * caretToHit(jint);
-  jboolean isCharacterLTR(jint);
-  ::java::awt::font::TextLayout$Run * findRunAtIndex(jint);
-  void layoutRuns();
-  JArray< ::java::awt::font::TextLayout$Run * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) runs;
-  ::java::awt::font::FontRenderContext * frc;
-  JArray< jchar > * string;
-  jint offset;
-  jint length;
-  ::java::awt::geom::Rectangle2D * boundsCache;
-  ::java::awt::font::LineMetrics * lm;
-  jfloat totalAdvance;
-  ::java::awt::geom::Rectangle2D * naturalBounds;
-  JArray< JArray< jint > * > * charIndices;
-  jboolean leftToRight;
-  jboolean hasWhitespace;
-  ::java::text::Bidi * bidi;
-  JArray< jint > * logicalToVisual;
-  JArray< jint > * visualToLogical;
-  jint hash;
-public:
-  static ::java::awt::font::TextLayout$CaretPolicy * DEFAULT_CARET_POLICY;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextLayout__
diff --git a/libjava/java/awt/font/TextMeasurer.h b/libjava/java/awt/font/TextMeasurer.h
deleted file mode 100644
index 31ca7b27fa5..00000000000
--- a/libjava/java/awt/font/TextMeasurer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TextMeasurer__
-#define __java_awt_font_TextMeasurer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class FontRenderContext;
-          class TextLayout;
-          class TextMeasurer;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-}
-
-class java::awt::font::TextMeasurer : public ::java::lang::Object
-{
-
-public:
-  TextMeasurer(::java::text::AttributedCharacterIterator *, ::java::awt::font::FontRenderContext *);
-public: // actually protected
-  ::java::lang::Object * clone();
-public:
-  void deleteChar(::java::text::AttributedCharacterIterator *, jint);
-  void insertChar(::java::text::AttributedCharacterIterator *, jint);
-  jfloat getAdvanceBetween(jint, jint);
-  ::java::awt::font::TextLayout * getLayout(jint, jint);
-  jint getLineBreakIndex(jint, jfloat);
-private:
-  ::java::text::AttributedCharacterIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
-  ::java::awt::font::FontRenderContext * frc;
-  ::java::awt::font::TextLayout * totalLayout;
-  jint numChars;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TextMeasurer__
diff --git a/libjava/java/awt/font/TransformAttribute.h b/libjava/java/awt/font/TransformAttribute.h
deleted file mode 100644
index 16875a23d46..00000000000
--- a/libjava/java/awt/font/TransformAttribute.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_font_TransformAttribute__
-#define __java_awt_font_TransformAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace font
-      {
-          class TransformAttribute;
-      }
-      namespace geom
-      {
-          class AffineTransform;
-      }
-    }
-  }
-}
-
-class java::awt::font::TransformAttribute : public ::java::lang::Object
-{
-
-public:
-  TransformAttribute(::java::awt::geom::AffineTransform *);
-  ::java::awt::geom::AffineTransform * getTransform();
-  jboolean isIdentity();
-private:
-  static const jlong serialVersionUID = 3356247357827709530LL;
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::lang::Object)))) affineTransform;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_font_TransformAttribute__
diff --git a/libjava/java/awt/geom/AffineTransform.h b/libjava/java/awt/geom/AffineTransform.h
deleted file mode 100644
index 4c5efc8bb24..00000000000
--- a/libjava/java/awt/geom/AffineTransform.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_AffineTransform__
-#define __java_awt_geom_AffineTransform__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::AffineTransform : public ::java::lang::Object
-{
-
-public:
-  AffineTransform();
-  AffineTransform(::java::awt::geom::AffineTransform *);
-  AffineTransform(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  AffineTransform(JArray< jfloat > *);
-  AffineTransform(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  AffineTransform(JArray< jdouble > *);
-  static ::java::awt::geom::AffineTransform * getTranslateInstance(jdouble, jdouble);
-  static ::java::awt::geom::AffineTransform * getRotateInstance(jdouble);
-  static ::java::awt::geom::AffineTransform * getRotateInstance(jdouble, jdouble, jdouble);
-  static ::java::awt::geom::AffineTransform * getScaleInstance(jdouble, jdouble);
-  static ::java::awt::geom::AffineTransform * getShearInstance(jdouble, jdouble);
-  virtual jint getType();
-  virtual jdouble getDeterminant();
-  virtual void getMatrix(JArray< jdouble > *);
-  virtual jdouble getScaleX();
-  virtual jdouble getScaleY();
-  virtual jdouble getShearX();
-  virtual jdouble getShearY();
-  virtual jdouble getTranslateX();
-  virtual jdouble getTranslateY();
-  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 setToIdentity();
-  virtual void setToTranslation(jdouble, jdouble);
-  virtual void setToRotation(jdouble);
-  virtual void setToRotation(jdouble, jdouble, jdouble);
-  virtual void setToScale(jdouble, jdouble);
-  virtual void setToShear(jdouble, jdouble);
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual void setTransform(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void concatenate(::java::awt::geom::AffineTransform *);
-  virtual void preConcatenate(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::AffineTransform * createInverse();
-  virtual ::java::awt::geom::Point2D * transform(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void transform(JArray< ::java::awt::geom::Point2D * > *, jint, JArray< ::java::awt::geom::Point2D * > *, jint, jint);
-  virtual void transform(JArray< jfloat > *, jint, JArray< jfloat > *, jint, jint);
-  virtual void transform(JArray< jdouble > *, jint, JArray< jdouble > *, jint, jint);
-  virtual void transform(JArray< jfloat > *, jint, JArray< jdouble > *, jint, jint);
-  virtual void transform(JArray< jdouble > *, jint, JArray< jfloat > *, jint, jint);
-  virtual ::java::awt::geom::Point2D * inverseTransform(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void inverseTransform(JArray< jdouble > *, jint, JArray< jdouble > *, jint, jint);
-  virtual ::java::awt::geom::Point2D * deltaTransform(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void deltaTransform(JArray< jdouble > *, jint, JArray< jdouble > *, jint, jint);
-  virtual ::java::awt::Shape * createTransformedShape(::java::awt::Shape *);
-  virtual ::java::lang::String * toString();
-  virtual jboolean isIdentity();
-  virtual ::java::lang::Object * clone();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  void updateType();
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 1330973210523860834LL;
-public:
-  static const jint TYPE_IDENTITY = 0;
-  static const jint TYPE_TRANSLATION = 1;
-  static const jint TYPE_UNIFORM_SCALE = 2;
-  static const jint TYPE_GENERAL_SCALE = 4;
-  static const jint TYPE_MASK_SCALE = 6;
-  static const jint TYPE_FLIP = 64;
-  static const jint TYPE_QUADRANT_ROTATION = 8;
-  static const jint TYPE_GENERAL_ROTATION = 16;
-  static const jint TYPE_MASK_ROTATION = 24;
-  static const jint TYPE_GENERAL_TRANSFORM = 32;
-private:
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) m00;
-  jdouble m10;
-  jdouble m01;
-  jdouble m11;
-  jdouble m02;
-  jdouble m12;
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_AffineTransform__
diff --git a/libjava/java/awt/geom/Arc2D$ArcIterator.h b/libjava/java/awt/geom/Arc2D$ArcIterator.h
deleted file mode 100644
index 4fdf0e15c39..00000000000
--- a/libjava/java/awt/geom/Arc2D$ArcIterator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Arc2D$ArcIterator__
-#define __java_awt_geom_Arc2D$ArcIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Arc2D;
-          class Arc2D$ArcIterator;
-          class Ellipse2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Arc2D$ArcIterator : public ::java::lang::Object
-{
-
-public:
-  Arc2D$ArcIterator(::java::awt::geom::Arc2D *, ::java::awt::geom::AffineTransform *);
-  Arc2D$ArcIterator(::java::awt::geom::Ellipse2D *, ::java::awt::geom::AffineTransform *);
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-  jint limit;
-  ::java::awt::geom::AffineTransform * xform;
-  jdouble x;
-  jdouble y;
-  jdouble w;
-  jdouble h;
-  jdouble start;
-  jdouble extent;
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Arc2D$ArcIterator__
diff --git a/libjava/java/awt/geom/Arc2D$Double.h b/libjava/java/awt/geom/Arc2D$Double.h
deleted file mode 100644
index d39148b70dd..00000000000
--- a/libjava/java/awt/geom/Arc2D$Double.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Arc2D$Double__
-#define __java_awt_geom_Arc2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/Arc2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Arc2D$Double;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Arc2D$Double : public ::java::awt::geom::Arc2D
-{
-
-public:
-  Arc2D$Double();
-  Arc2D$Double(jint);
-  Arc2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint);
-  Arc2D$Double(::java::awt::geom::Rectangle2D *, jdouble, jdouble, jint);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jdouble getAngleStart();
-  virtual jdouble getAngleExtent();
-  virtual jboolean isEmpty();
-  virtual void setArc(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint);
-  virtual void setAngleStart(jdouble);
-  virtual void setAngleExtent(jdouble);
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * makeBounds(jdouble, jdouble, jdouble, jdouble);
-public:
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Arc2D)))) x;
-  jdouble y;
-  jdouble width;
-  jdouble height;
-  jdouble start;
-  jdouble extent;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Arc2D$Double__
diff --git a/libjava/java/awt/geom/Arc2D$Float.h b/libjava/java/awt/geom/Arc2D$Float.h
deleted file mode 100644
index 925c425acc8..00000000000
--- a/libjava/java/awt/geom/Arc2D$Float.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Arc2D$Float__
-#define __java_awt_geom_Arc2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/Arc2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Arc2D$Float;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Arc2D$Float : public ::java::awt::geom::Arc2D
-{
-
-public:
-  Arc2D$Float();
-  Arc2D$Float(jint);
-  Arc2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jint);
-  Arc2D$Float(::java::awt::geom::Rectangle2D *, jfloat, jfloat, jint);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jdouble getAngleStart();
-  virtual jdouble getAngleExtent();
-  virtual jboolean isEmpty();
-  virtual void setArc(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint);
-  virtual void setAngleStart(jdouble);
-  virtual void setAngleExtent(jdouble);
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * makeBounds(jdouble, jdouble, jdouble, jdouble);
-public:
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Arc2D)))) x;
-  jfloat y;
-  jfloat width;
-  jfloat height;
-  jfloat start;
-  jfloat extent;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Arc2D$Float__
diff --git a/libjava/java/awt/geom/Arc2D.h b/libjava/java/awt/geom/Arc2D.h
deleted file mode 100644
index d2bfc752793..00000000000
--- a/libjava/java/awt/geom/Arc2D.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Arc2D__
-#define __java_awt_geom_Arc2D__
-
-#pragma interface
-
-#include <java/awt/geom/RectangularShape.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Arc2D;
-          class Dimension2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Arc2D : public ::java::awt::geom::RectangularShape
-{
-
-public: // actually protected
-  Arc2D(jint);
-public:
-  virtual jdouble getAngleStart() = 0;
-  virtual jdouble getAngleExtent() = 0;
-  virtual jint getArcType();
-  virtual ::java::awt::geom::Point2D * getStartPoint();
-  virtual ::java::awt::geom::Point2D * getEndPoint();
-  virtual void setArc(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint) = 0;
-  virtual void setArc(::java::awt::geom::Point2D *, ::java::awt::geom::Dimension2D *, jdouble, jdouble, jint);
-  virtual void setArc(::java::awt::geom::Rectangle2D *, jdouble, jdouble, jint);
-  virtual void setArc(::java::awt::geom::Arc2D *);
-  virtual void setArcByCenter(jdouble, jdouble, jdouble, jdouble, jdouble, jint);
-  virtual void setArcByTangent(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, jdouble);
-  virtual void setAngleStart(jdouble) = 0;
-  virtual void setAngleExtent(jdouble) = 0;
-  virtual void setAngleStart(::java::awt::geom::Point2D *);
-  virtual void setAngles(jdouble, jdouble, jdouble, jdouble);
-  virtual void setAngles(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void setArcType(jint);
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-public: // actually protected
-  virtual ::java::awt::geom::Rectangle2D * makeBounds(jdouble, jdouble, jdouble, jdouble) = 0;
-public:
-  virtual jboolean containsAngle(jdouble);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  static const jint OPEN = 0;
-  static const jint CHORD = 1;
-  static const jint PIE = 2;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::geom::RectangularShape)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Arc2D__
diff --git a/libjava/java/awt/geom/Area$AreaIterator$IteratorSegment.h b/libjava/java/awt/geom/Area$AreaIterator$IteratorSegment.h
deleted file mode 100644
index 2dfcf311e28..00000000000
--- a/libjava/java/awt/geom/Area$AreaIterator$IteratorSegment.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$AreaIterator$IteratorSegment__
-#define __java_awt_geom_Area$AreaIterator$IteratorSegment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Area$AreaIterator;
-          class Area$AreaIterator$IteratorSegment;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$AreaIterator$IteratorSegment : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Area$AreaIterator$IteratorSegment(::java::awt::geom::Area$AreaIterator *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  JArray< jdouble > * coords;
-  ::java::awt::geom::Area$AreaIterator * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$AreaIterator$IteratorSegment__
diff --git a/libjava/java/awt/geom/Area$AreaIterator.h b/libjava/java/awt/geom/Area$AreaIterator.h
deleted file mode 100644
index 86824256ad0..00000000000
--- a/libjava/java/awt/geom/Area$AreaIterator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$AreaIterator__
-#define __java_awt_geom_Area$AreaIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$AreaIterator;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$AreaIterator : public ::java::lang::Object
-{
-
-public:
-  Area$AreaIterator(::java::awt::geom::Area *, ::java::awt::geom::AffineTransform *);
-  virtual jint currentSegment(JArray< jdouble > *);
-  virtual jint currentSegment(JArray< jfloat > *);
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) segments;
-  jint index;
-  ::java::awt::geom::AffineTransform * at;
-public: // actually package-private
-  ::java::awt::geom::Area * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$AreaIterator__
diff --git a/libjava/java/awt/geom/Area$CubicSegment.h b/libjava/java/awt/geom/Area$CubicSegment.h
deleted file mode 100644
index f5a31385e85..00000000000
--- a/libjava/java/awt/geom/Area$CubicSegment.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$CubicSegment__
-#define __java_awt_geom_Area$CubicSegment__
-
-#pragma interface
-
-#include <java/awt/geom/Area$Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$CubicSegment;
-          class Area$Segment;
-          class CubicCurve2D;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$CubicSegment : public ::java::awt::geom::Area$Segment
-{
-
-public:
-  Area$CubicSegment(::java::awt::geom::Area *, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual jdouble curveArea();
-  virtual jboolean equals(::java::awt::geom::Area$Segment *);
-  virtual ::java::awt::geom::Point2D * evaluatePoint(jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds();
-  virtual ::java::awt::geom::CubicCurve2D * getCubicCurve2D();
-  virtual JArray< jdouble > * getLoop();
-  virtual ::java::awt::geom::Point2D * getMidPoint();
-  virtual jint getType();
-  virtual jint pathIteratorFormat(JArray< jdouble > *);
-  virtual jint rayCrossing(jdouble, jdouble);
-  virtual void reverseCoords();
-  virtual jint splitIntersections(::java::awt::geom::Area$Segment *);
-  virtual void subdivideInsert(jdouble);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::geom::Area$Segment)))) cp1;
-  ::java::awt::geom::Point2D * cp2;
-  ::java::awt::geom::Area * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$CubicSegment__
diff --git a/libjava/java/awt/geom/Area$Intersection.h b/libjava/java/awt/geom/Area$Intersection.h
deleted file mode 100644
index c4c716286c9..00000000000
--- a/libjava/java/awt/geom/Area$Intersection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$Intersection__
-#define __java_awt_geom_Area$Intersection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Area;
-          class Area$Intersection;
-          class Area$Segment;
-          class Point2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$Intersection : public ::java::lang::Object
-{
-
-public:
-  Area$Intersection(::java::awt::geom::Area *, ::java::awt::geom::Point2D *, jdouble, jdouble);
-public: // actually package-private
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
-  jdouble ta;
-  jdouble tb;
-  ::java::awt::geom::Area$Segment * seg;
-  ::java::awt::geom::Area * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$Intersection__
diff --git a/libjava/java/awt/geom/Area$LineSegment.h b/libjava/java/awt/geom/Area$LineSegment.h
deleted file mode 100644
index 2eb0692a8d5..00000000000
--- a/libjava/java/awt/geom/Area$LineSegment.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$LineSegment__
-#define __java_awt_geom_Area$LineSegment__
-
-#pragma interface
-
-#include <java/awt/geom/Area$Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$LineSegment;
-          class Area$Segment;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$LineSegment : public ::java::awt::geom::Area$Segment
-{
-
-public:
-  Area$LineSegment(::java::awt::geom::Area *, jdouble, jdouble, jdouble, jdouble);
-  Area$LineSegment(::java::awt::geom::Area *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual void reverseCoords();
-  virtual ::java::awt::geom::Point2D * getMidPoint();
-  virtual jdouble curveArea();
-  virtual jint getType();
-  virtual void subdivideInsert(jdouble);
-  virtual jboolean isCoLinear(::java::awt::geom::Area$LineSegment *);
-  virtual ::java::awt::geom::Area$Segment * lastCoLinear();
-  virtual jboolean equals(::java::awt::geom::Area$Segment *);
-  virtual jint pathIteratorFormat(JArray< jdouble > *);
-  virtual jboolean hasIntersections(::java::awt::geom::Area$Segment *);
-  virtual jint splitIntersections(::java::awt::geom::Area$Segment *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds();
-  virtual jint rayCrossing(jdouble, jdouble);
-  ::java::awt::geom::Area * __attribute__((aligned(__alignof__( ::java::awt::geom::Area$Segment)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$LineSegment__
diff --git a/libjava/java/awt/geom/Area$QuadSegment.h b/libjava/java/awt/geom/Area$QuadSegment.h
deleted file mode 100644
index ca6dc99c5c2..00000000000
--- a/libjava/java/awt/geom/Area$QuadSegment.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$QuadSegment__
-#define __java_awt_geom_Area$QuadSegment__
-
-#pragma interface
-
-#include <java/awt/geom/Area$Segment.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$CubicSegment;
-          class Area$QuadSegment;
-          class Area$Segment;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$QuadSegment : public ::java::awt::geom::Area$Segment
-{
-
-public: // actually package-private
-  Area$QuadSegment(::java::awt::geom::Area *, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  virtual jdouble curveArea();
-  virtual jboolean equals(::java::awt::geom::Area$Segment *);
-  virtual ::java::awt::geom::Point2D * evaluatePoint(jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds();
-  virtual ::java::awt::geom::Area$CubicSegment * getCubicSegment();
-  virtual ::java::awt::geom::Point2D * getMidPoint();
-  virtual jint getType();
-  virtual jint pathIteratorFormat(JArray< jdouble > *);
-  virtual jint rayCrossing(jdouble, jdouble);
-  virtual void reverseCoords();
-  virtual jint splitIntersections(::java::awt::geom::Area$Segment *);
-  virtual void subdivideInsert(jdouble);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::geom::Area$Segment)))) cp;
-  ::java::awt::geom::Area * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$QuadSegment__
diff --git a/libjava/java/awt/geom/Area$Segment.h b/libjava/java/awt/geom/Area$Segment.h
deleted file mode 100644
index 866ecefdd4d..00000000000
--- a/libjava/java/awt/geom/Area$Segment.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area$Segment__
-#define __java_awt_geom_Area$Segment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$Intersection;
-          class Area$Segment;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area$Segment : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Area$Segment(::java::awt::geom::Area *);
-  virtual void reverseCoords() = 0;
-  virtual ::java::awt::geom::Point2D * getMidPoint() = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds() = 0;
-  virtual void transform(::java::awt::geom::AffineTransform *) = 0;
-  virtual jint getType() = 0;
-  virtual jint splitIntersections(::java::awt::geom::Area$Segment *) = 0;
-  virtual jint pathIteratorFormat(JArray< jdouble > *) = 0;
-  virtual jint rayCrossing(jdouble, jdouble) = 0;
-  virtual void subdivideInsert(jdouble) = 0;
-  virtual jdouble curveArea() = 0;
-  virtual jboolean equals(::java::awt::geom::Area$Segment *) = 0;
-  virtual jboolean contains(jdouble, jdouble);
-  virtual void nullNodes();
-  virtual void transformSegmentList(::java::awt::geom::AffineTransform *);
-  virtual jboolean hasClockwiseOrientation();
-public:
-  virtual ::java::awt::geom::Rectangle2D * getPathBounds();
-public: // actually package-private
-  virtual jdouble getSignedArea();
-  virtual void reverseAll();
-  virtual void insert(::java::awt::geom::Area$Segment *);
-  virtual jboolean isPolygonal();
-  virtual ::java::awt::geom::Area$Segment * cloneSegmentList();
-  virtual jint createNode(::java::awt::geom::Area$Segment *, ::java::awt::geom::Area$Intersection *);
-public: // actually protected
-  virtual jint createNodes(::java::awt::geom::Area$Segment *, JArray< ::java::awt::geom::Area$Intersection * > *);
-public: // actually package-private
-  virtual jboolean pathEquals(::java::awt::geom::Area$Segment *);
-  virtual ::java::awt::geom::Area$Segment * getTopLeft();
-  virtual jboolean isSegmentOutside(::java::awt::Shape *);
-  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::lang::Object)))) P1;
-  ::java::awt::geom::Point2D * P2;
-  ::java::awt::geom::Area$Segment * next;
-  ::java::awt::geom::Area$Segment * node;
-  ::java::awt::geom::Area * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area$Segment__
diff --git a/libjava/java/awt/geom/Area.h b/libjava/java/awt/geom/Area.h
deleted file mode 100644
index 47a87df4ec5..00000000000
--- a/libjava/java/awt/geom/Area.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Area__
-#define __java_awt_geom_Area__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class Area;
-          class Area$CubicSegment;
-          class Area$Intersection;
-          class Area$LineSegment;
-          class Area$QuadSegment;
-          class Area$Segment;
-          class CubicCurve2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Area : public ::java::lang::Object
-{
-
-public:
-  Area();
-  Area(::java::awt::Shape *);
-  virtual void add(::java::awt::geom::Area *);
-  virtual void subtract(::java::awt::geom::Area *);
-  virtual void intersect(::java::awt::geom::Area *);
-  virtual void exclusiveOr(::java::awt::geom::Area *);
-  virtual void reset();
-  virtual jboolean isEmpty();
-  virtual jboolean isPolygonal();
-  virtual jboolean isRectangular();
-  virtual jboolean isSingular();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::awt::geom::Area *);
-  virtual void transform(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::Area * createTransformedArea(::java::awt::geom::AffineTransform *);
-  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 jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-private:
-  ::java::util::Vector * weilerAtherton(::java::util::Vector *);
-  jint getRecursionDepth(::java::awt::geom::Area$CubicSegment *);
-  void recursiveSubdivide(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *, jint, jint, jdouble, jdouble, jdouble, jdouble);
-public: // actually package-private
-  virtual JArray< ::java::awt::geom::Area$Intersection * > * cubicCubicIntersect(::java::awt::geom::Area$CubicSegment *, ::java::awt::geom::Area$CubicSegment *);
-  virtual JArray< ::java::awt::geom::Area$Intersection * > * lineQuadIntersect(::java::awt::geom::Area$LineSegment *, ::java::awt::geom::Area$QuadSegment *);
-  virtual JArray< ::java::awt::geom::Area$Intersection * > * lineCubicIntersect(::java::awt::geom::Area$LineSegment *, ::java::awt::geom::Area$CubicSegment *);
-  virtual ::java::awt::geom::Area$Intersection * linesIntersect(::java::awt::geom::Area$LineSegment *, ::java::awt::geom::Area$LineSegment *);
-  virtual jboolean pointEquals(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-private:
-  ::java::util::Vector * makeSegment(::java::awt::Shape *);
-  jint createNodes(::java::awt::geom::Area$Segment *, ::java::awt::geom::Area$Segment *);
-  jint createNodesSelf(::java::awt::geom::Area$Segment *);
-  void deleteRedundantPaths(::java::util::Vector *);
-  void setDirection(::java::util::Vector *, jboolean);
-  static jdouble EPSILON;
-  static jdouble RS_EPSILON;
-  static jdouble PE_EPSILON;
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) solids;
-  ::java::util::Vector * holes;
-private:
-  ::java::util::Vector * cc_intersections;
-  jint windingRule;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Area__
diff --git a/libjava/java/awt/geom/CubicCurve2D$1.h b/libjava/java/awt/geom/CubicCurve2D$1.h
deleted file mode 100644
index ea945ea9f7c..00000000000
--- a/libjava/java/awt/geom/CubicCurve2D$1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_CubicCurve2D$1__
-#define __java_awt_geom_CubicCurve2D$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class CubicCurve2D;
-          class CubicCurve2D$1;
-      }
-    }
-  }
-}
-
-class java::awt::geom::CubicCurve2D$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CubicCurve2D$1(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::AffineTransform *);
-public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-public: // actually package-private
-  ::java::awt::geom::CubicCurve2D * this$0;
-private:
-  ::java::awt::geom::AffineTransform * val$at;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_CubicCurve2D$1__
diff --git a/libjava/java/awt/geom/CubicCurve2D$Double.h b/libjava/java/awt/geom/CubicCurve2D$Double.h
deleted file mode 100644
index d3d47429c1f..00000000000
--- a/libjava/java/awt/geom/CubicCurve2D$Double.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_CubicCurve2D$Double__
-#define __java_awt_geom_CubicCurve2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/CubicCurve2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class CubicCurve2D$Double;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::CubicCurve2D$Double : public ::java::awt::geom::CubicCurve2D
-{
-
-public:
-  CubicCurve2D$Double();
-  CubicCurve2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getCtrlX1();
-  virtual jdouble getCtrlY1();
-  virtual ::java::awt::geom::Point2D * getCtrlP1();
-  virtual jdouble getCtrlX2();
-  virtual jdouble getCtrlY2();
-  virtual ::java::awt::geom::Point2D * getCtrlP2();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::CubicCurve2D)))) x1;
-  jdouble y1;
-  jdouble ctrlx1;
-  jdouble ctrly1;
-  jdouble ctrlx2;
-  jdouble ctrly2;
-  jdouble x2;
-  jdouble y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_CubicCurve2D$Double__
diff --git a/libjava/java/awt/geom/CubicCurve2D$Float.h b/libjava/java/awt/geom/CubicCurve2D$Float.h
deleted file mode 100644
index 6e6cd4d2c97..00000000000
--- a/libjava/java/awt/geom/CubicCurve2D$Float.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_CubicCurve2D$Float__
-#define __java_awt_geom_CubicCurve2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/CubicCurve2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class CubicCurve2D$Float;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::CubicCurve2D$Float : public ::java::awt::geom::CubicCurve2D
-{
-
-public:
-  CubicCurve2D$Float();
-  CubicCurve2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getCtrlX1();
-  virtual jdouble getCtrlY1();
-  virtual ::java::awt::geom::Point2D * getCtrlP1();
-  virtual jdouble getCtrlX2();
-  virtual jdouble getCtrlY2();
-  virtual ::java::awt::geom::Point2D * getCtrlP2();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void setCurve(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::CubicCurve2D)))) x1;
-  jfloat y1;
-  jfloat ctrlx1;
-  jfloat ctrly1;
-  jfloat ctrlx2;
-  jfloat ctrly2;
-  jfloat x2;
-  jfloat y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_CubicCurve2D$Float__
diff --git a/libjava/java/awt/geom/CubicCurve2D.h b/libjava/java/awt/geom/CubicCurve2D.h
deleted file mode 100644
index f9f82b89458..00000000000
--- a/libjava/java/awt/geom/CubicCurve2D.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_CubicCurve2D__
-#define __java_awt_geom_CubicCurve2D__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-          class CubicCurve2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::CubicCurve2D : public ::java::lang::Object
-{
-
-public: // actually protected
-  CubicCurve2D();
-public:
-  virtual jdouble getX1() = 0;
-  virtual jdouble getY1() = 0;
-  virtual ::java::awt::geom::Point2D * getP1() = 0;
-  virtual jdouble getCtrlX1() = 0;
-  virtual jdouble getCtrlY1() = 0;
-  virtual ::java::awt::geom::Point2D * getCtrlP1() = 0;
-  virtual jdouble getCtrlX2() = 0;
-  virtual jdouble getCtrlY2() = 0;
-  virtual ::java::awt::geom::Point2D * getCtrlP2() = 0;
-  virtual jdouble getX2() = 0;
-  virtual jdouble getY2() = 0;
-  virtual ::java::awt::geom::Point2D * getP2() = 0;
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual void setCurve(JArray< jdouble > *, jint);
-  virtual void setCurve(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void setCurve(JArray< ::java::awt::geom::Point2D * > *, jint);
-  virtual void setCurve(::java::awt::geom::CubicCurve2D *);
-  static jdouble getFlatnessSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble getFlatness(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble getFlatnessSq(JArray< jdouble > *, jint);
-  static jdouble getFlatness(JArray< jdouble > *, jint);
-  virtual jdouble getFlatnessSq();
-  virtual jdouble getFlatness();
-  virtual void subdivide(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *);
-  static void subdivide(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *);
-  static void subdivide(JArray< jdouble > *, jint, JArray< jdouble > *, jint, JArray< jdouble > *, jint);
-  static jint solveCubic(JArray< jdouble > *);
-  static jint solveCubic(JArray< jdouble > *, JArray< jdouble > *);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual ::java::lang::Object * clone();
-private:
-  jint getAxisIntersections(jdouble, jdouble, jboolean, jdouble);
-public:
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
-private:
-  static jdouble BIG_VALUE;
-  static jdouble EPSILON;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_CubicCurve2D__
diff --git a/libjava/java/awt/geom/Dimension2D.h b/libjava/java/awt/geom/Dimension2D.h
deleted file mode 100644
index d201d7a5f5c..00000000000
--- a/libjava/java/awt/geom/Dimension2D.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Dimension2D__
-#define __java_awt_geom_Dimension2D__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Dimension2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Dimension2D : public ::java::lang::Object
-{
-
-public: // actually protected
-  Dimension2D();
-public:
-  virtual jdouble getWidth() = 0;
-  virtual jdouble getHeight() = 0;
-  virtual void setSize(jdouble, jdouble) = 0;
-  virtual void setSize(::java::awt::geom::Dimension2D *);
-  virtual ::java::lang::Object * clone();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Dimension2D__
diff --git a/libjava/java/awt/geom/Ellipse2D$Double.h b/libjava/java/awt/geom/Ellipse2D$Double.h
deleted file mode 100644
index 06b28e6f335..00000000000
--- a/libjava/java/awt/geom/Ellipse2D$Double.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Ellipse2D$Double__
-#define __java_awt_geom_Ellipse2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/Ellipse2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Ellipse2D$Double;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Ellipse2D$Double : public ::java::awt::geom::Ellipse2D
-{
-
-public:
-  Ellipse2D$Double();
-  Ellipse2D$Double(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jdouble getHeight();
-  virtual jdouble getWidth();
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jboolean isEmpty();
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Ellipse2D)))) height;
-  jdouble width;
-  jdouble x;
-  jdouble y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Ellipse2D$Double__
diff --git a/libjava/java/awt/geom/Ellipse2D$Float.h b/libjava/java/awt/geom/Ellipse2D$Float.h
deleted file mode 100644
index 52177dc028a..00000000000
--- a/libjava/java/awt/geom/Ellipse2D$Float.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Ellipse2D$Float__
-#define __java_awt_geom_Ellipse2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/Ellipse2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Ellipse2D$Float;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Ellipse2D$Float : public ::java::awt::geom::Ellipse2D
-{
-
-public:
-  Ellipse2D$Float();
-  Ellipse2D$Float(jfloat, jfloat, jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jdouble getHeight();
-  virtual jdouble getWidth();
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jboolean isEmpty();
-  virtual void setFrame(jfloat, jfloat, jfloat, jfloat);
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Ellipse2D)))) height;
-  jfloat width;
-  jfloat x;
-  jfloat y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Ellipse2D$Float__
diff --git a/libjava/java/awt/geom/Ellipse2D.h b/libjava/java/awt/geom/Ellipse2D.h
deleted file mode 100644
index a78c318d8b3..00000000000
--- a/libjava/java/awt/geom/Ellipse2D.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Ellipse2D__
-#define __java_awt_geom_Ellipse2D__
-
-#pragma interface
-
-#include <java/awt/geom/RectangularShape.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Ellipse2D;
-          class PathIterator;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Ellipse2D : public ::java::awt::geom::RectangularShape
-{
-
-public: // actually protected
-  Ellipse2D();
-public:
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Ellipse2D__
diff --git a/libjava/java/awt/geom/FlatteningPathIterator.h b/libjava/java/awt/geom/FlatteningPathIterator.h
deleted file mode 100644
index 7936286da87..00000000000
--- a/libjava/java/awt/geom/FlatteningPathIterator.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_FlatteningPathIterator__
-#define __java_awt_geom_FlatteningPathIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class FlatteningPathIterator;
-          class PathIterator;
-      }
-    }
-  }
-}
-
-class java::awt::geom::FlatteningPathIterator : public ::java::lang::Object
-{
-
-public:
-  FlatteningPathIterator(::java::awt::geom::PathIterator *, jdouble);
-  FlatteningPathIterator(::java::awt::geom::PathIterator *, jdouble, jint);
-  virtual jdouble getFlatness();
-  virtual jint getRecursionLimit();
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-  virtual jint currentSegment(JArray< jdouble > *);
-  virtual jint currentSegment(JArray< jfloat > *);
-private:
-  void fetchSegment();
-  void subdivideQuadratic();
-  void subdivideCubic();
-  ::java::awt::geom::PathIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) srcIter;
-  jdouble flatnessSq;
-  jint recursionLimit;
-  JArray< jdouble > * stack;
-  jint stackSize;
-  JArray< jint > * recLevel;
-  JArray< jdouble > * scratch;
-  jint srcSegType;
-  jdouble srcPosX;
-  jdouble srcPosY;
-  jboolean done;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_FlatteningPathIterator__
diff --git a/libjava/java/awt/geom/GeneralPath$GeneralPathIterator.h b/libjava/java/awt/geom/GeneralPath$GeneralPathIterator.h
deleted file mode 100644
index 9bf63bd5fe6..00000000000
--- a/libjava/java/awt/geom/GeneralPath$GeneralPathIterator.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_GeneralPath$GeneralPathIterator__
-#define __java_awt_geom_GeneralPath$GeneralPathIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class GeneralPath$GeneralPathIterator;
-      }
-    }
-  }
-}
-
-class java::awt::geom::GeneralPath$GeneralPathIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GeneralPath$GeneralPathIterator(::java::awt::geom::GeneralPath *, ::java::awt::geom::AffineTransform *);
-public:
-  virtual jint getWindingRule();
-  virtual jboolean isDone();
-  virtual void next();
-  virtual jint currentSegment(JArray< jfloat > *);
-  virtual jint currentSegment(JArray< jdouble > *);
-private:
-  static JArray< jint > * NUM_COORDS;
-public: // actually package-private
-  ::java::awt::geom::GeneralPath * __attribute__((aligned(__alignof__( ::java::lang::Object)))) path;
-private:
-  ::java::awt::geom::AffineTransform * transform;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_GeneralPath$GeneralPathIterator__
diff --git a/libjava/java/awt/geom/GeneralPath.h b/libjava/java/awt/geom/GeneralPath.h
deleted file mode 100644
index a2d37c73f87..00000000000
--- a/libjava/java/awt/geom/GeneralPath.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_GeneralPath__
-#define __java_awt_geom_GeneralPath__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-          class GeneralPath;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::GeneralPath : public ::java::lang::Object
-{
-
-public:
-  GeneralPath();
-  GeneralPath(jint);
-  GeneralPath(jint, jint);
-  GeneralPath(::java::awt::Shape *);
-  void moveTo(jfloat, jfloat);
-  void lineTo(jfloat, jfloat);
-  void quadTo(jfloat, jfloat, jfloat, jfloat);
-  void curveTo(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  void closePath();
-  void append(::java::awt::Shape *, jboolean);
-  void append(::java::awt::geom::PathIterator *, jboolean);
-  jint getWindingRule();
-  void setWindingRule(jint);
-  ::java::awt::geom::Point2D * getCurrentPoint();
-  void reset();
-  void transform(::java::awt::geom::AffineTransform *);
-  ::java::awt::Shape * createTransformedShape(::java::awt::geom::AffineTransform *);
-  ::java::awt::Rectangle * getBounds();
-  ::java::awt::geom::Rectangle2D * getBounds2D();
-  jboolean contains(jdouble, jdouble);
-  jboolean contains(::java::awt::geom::Point2D *);
-  jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  jboolean contains(::java::awt::geom::Rectangle2D *);
-  jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  jboolean intersects(::java::awt::geom::Rectangle2D *);
-  ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  ::java::lang::Object * clone();
-private:
-  void ensureSize(jint);
-  jint getAxisIntersections(jdouble, jdouble, jboolean, jdouble);
-  jint getWindingNumber(jdouble, jdouble);
-  jint evaluateCrossings(jdouble, jdouble, jboolean, jboolean, jdouble);
-public:
-  static const jint WIND_EVEN_ODD = 0;
-  static const jint WIND_NON_ZERO = 1;
-private:
-  static const jint INIT_SIZE = 10;
-  static jdouble BIG_VALUE;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) rule;
-  JArray< jbyte > * types;
-  JArray< jfloat > * xpoints;
-  JArray< jfloat > * ypoints;
-private:
-  jint subpath;
-public: // actually package-private
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_GeneralPath__
diff --git a/libjava/java/awt/geom/IllegalPathStateException.h b/libjava/java/awt/geom/IllegalPathStateException.h
deleted file mode 100644
index 4147334fdc3..00000000000
--- a/libjava/java/awt/geom/IllegalPathStateException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_IllegalPathStateException__
-#define __java_awt_geom_IllegalPathStateException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class IllegalPathStateException;
-      }
-    }
-  }
-}
-
-class java::awt::geom::IllegalPathStateException : public ::java::lang::RuntimeException
-{
-
-public:
-  IllegalPathStateException();
-  IllegalPathStateException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5158084205220481094LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_IllegalPathStateException__
diff --git a/libjava/java/awt/geom/Line2D$1.h b/libjava/java/awt/geom/Line2D$1.h
deleted file mode 100644
index c07bff5b6bf..00000000000
--- a/libjava/java/awt/geom/Line2D$1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Line2D$1__
-#define __java_awt_geom_Line2D$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Line2D;
-          class Line2D$1;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Line2D$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Line2D$1(::java::awt::geom::Line2D *, ::java::awt::geom::AffineTransform *);
-public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-public: // actually package-private
-  ::java::awt::geom::Line2D * this$0;
-private:
-  ::java::awt::geom::AffineTransform * val$at;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Line2D$1__
diff --git a/libjava/java/awt/geom/Line2D$Double.h b/libjava/java/awt/geom/Line2D$Double.h
deleted file mode 100644
index a9915b73d8c..00000000000
--- a/libjava/java/awt/geom/Line2D$Double.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Line2D$Double__
-#define __java_awt_geom_Line2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/Line2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Line2D$Double;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Line2D$Double : public ::java::awt::geom::Line2D
-{
-
-public:
-  Line2D$Double();
-  Line2D$Double(jdouble, jdouble, jdouble, jdouble);
-  Line2D$Double(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setLine(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Line2D)))) x1;
-  jdouble y1;
-  jdouble x2;
-  jdouble y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Line2D$Double__
diff --git a/libjava/java/awt/geom/Line2D$Float.h b/libjava/java/awt/geom/Line2D$Float.h
deleted file mode 100644
index 1a829e2c62f..00000000000
--- a/libjava/java/awt/geom/Line2D$Float.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Line2D$Float__
-#define __java_awt_geom_Line2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/Line2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Line2D$Float;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Line2D$Float : public ::java::awt::geom::Line2D
-{
-
-public:
-  Line2D$Float();
-  Line2D$Float(jfloat, jfloat, jfloat, jfloat);
-  Line2D$Float(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setLine(jdouble, jdouble, jdouble, jdouble);
-  virtual void setLine(jfloat, jfloat, jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Line2D)))) x1;
-  jfloat y1;
-  jfloat x2;
-  jfloat y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Line2D$Float__
diff --git a/libjava/java/awt/geom/Line2D.h b/libjava/java/awt/geom/Line2D.h
deleted file mode 100644
index 5310eadc7de..00000000000
--- a/libjava/java/awt/geom/Line2D.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Line2D__
-#define __java_awt_geom_Line2D__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-          class Line2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Line2D : public ::java::lang::Object
-{
-
-public: // actually protected
-  Line2D();
-public:
-  virtual jdouble getX1() = 0;
-  virtual jdouble getY1() = 0;
-  virtual ::java::awt::geom::Point2D * getP1() = 0;
-  virtual jdouble getX2() = 0;
-  virtual jdouble getY2() = 0;
-  virtual ::java::awt::geom::Point2D * getP2() = 0;
-  virtual void setLine(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual void setLine(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void setLine(::java::awt::geom::Line2D *);
-  static jint relativeCCW(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jint relativeCCW(jdouble, jdouble);
-  virtual jint relativeCCW(::java::awt::geom::Point2D *);
-private:
-  static jdouble area2(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jboolean between(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-public:
-  static jboolean linesIntersect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersectsLine(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersectsLine(::java::awt::geom::Line2D *);
-  static jdouble ptSegDistSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble ptSegDist(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble ptSegDistSq(jdouble, jdouble);
-  virtual jdouble ptSegDistSq(::java::awt::geom::Point2D *);
-  virtual jdouble ptSegDist(jdouble, jdouble);
-  virtual jdouble ptSegDist(::java::awt::geom::Point2D *);
-  static jdouble ptLineDistSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble ptLineDist(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble ptLineDistSq(jdouble, jdouble);
-  virtual jdouble ptLineDistSq(::java::awt::geom::Point2D *);
-  virtual jdouble ptLineDist(jdouble, jdouble);
-  virtual jdouble ptLineDist(::java::awt::geom::Point2D *);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Line2D__
diff --git a/libjava/java/awt/geom/NoninvertibleTransformException.h b/libjava/java/awt/geom/NoninvertibleTransformException.h
deleted file mode 100644
index 1e7b71249ef..00000000000
--- a/libjava/java/awt/geom/NoninvertibleTransformException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_NoninvertibleTransformException__
-#define __java_awt_geom_NoninvertibleTransformException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class NoninvertibleTransformException;
-      }
-    }
-  }
-}
-
-class java::awt::geom::NoninvertibleTransformException : public ::java::lang::Exception
-{
-
-public:
-  NoninvertibleTransformException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6137225240503990466LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_NoninvertibleTransformException__
diff --git a/libjava/java/awt/geom/PathIterator.h b/libjava/java/awt/geom/PathIterator.h
deleted file mode 100644
index a201f5604b9..00000000000
--- a/libjava/java/awt/geom/PathIterator.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_PathIterator__
-#define __java_awt_geom_PathIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class PathIterator;
-      }
-    }
-  }
-}
-
-class java::awt::geom::PathIterator : public ::java::lang::Object
-{
-
-public:
-  virtual jint getWindingRule() = 0;
-  virtual jboolean isDone() = 0;
-  virtual void next() = 0;
-  virtual jint currentSegment(JArray< jfloat > *) = 0;
-  virtual jint currentSegment(JArray< jdouble > *) = 0;
-  static const jint WIND_EVEN_ODD = 0;
-  static const jint WIND_NON_ZERO = 1;
-  static const jint SEG_MOVETO = 0;
-  static const jint SEG_LINETO = 1;
-  static const jint SEG_QUADTO = 2;
-  static const jint SEG_CUBICTO = 3;
-  static const jint SEG_CLOSE = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_geom_PathIterator__
diff --git a/libjava/java/awt/geom/Point2D$Double.h b/libjava/java/awt/geom/Point2D$Double.h
deleted file mode 100644
index b03db3fa76e..00000000000
--- a/libjava/java/awt/geom/Point2D$Double.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Point2D$Double__
-#define __java_awt_geom_Point2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/Point2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D$Double;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Point2D$Double : public ::java::awt::geom::Point2D
-{
-
-public:
-  Point2D$Double();
-  Point2D$Double(jdouble, jdouble);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual void setLocation(jdouble, jdouble);
-  virtual ::java::lang::String * toString();
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Point2D)))) x;
-  jdouble y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Point2D$Double__
diff --git a/libjava/java/awt/geom/Point2D$Float.h b/libjava/java/awt/geom/Point2D$Float.h
deleted file mode 100644
index f9da3d1be24..00000000000
--- a/libjava/java/awt/geom/Point2D$Float.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Point2D$Float__
-#define __java_awt_geom_Point2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/Point2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D$Float;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Point2D$Float : public ::java::awt::geom::Point2D
-{
-
-public:
-  Point2D$Float();
-  Point2D$Float(jfloat, jfloat);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual void setLocation(jdouble, jdouble);
-  virtual void setLocation(jfloat, jfloat);
-  virtual ::java::lang::String * toString();
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Point2D)))) x;
-  jfloat y;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Point2D$Float__
diff --git a/libjava/java/awt/geom/Point2D.h b/libjava/java/awt/geom/Point2D.h
deleted file mode 100644
index bddd3ab87c8..00000000000
--- a/libjava/java/awt/geom/Point2D.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Point2D__
-#define __java_awt_geom_Point2D__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Point2D : public ::java::lang::Object
-{
-
-public: // actually protected
-  Point2D();
-public:
-  virtual jdouble getX() = 0;
-  virtual jdouble getY() = 0;
-  virtual void setLocation(jdouble, jdouble) = 0;
-  virtual void setLocation(::java::awt::geom::Point2D *);
-  static jdouble distanceSq(jdouble, jdouble, jdouble, jdouble);
-  static jdouble distance(jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble distanceSq(jdouble, jdouble);
-  virtual jdouble distanceSq(::java::awt::geom::Point2D *);
-  virtual jdouble distance(jdouble, jdouble);
-  virtual jdouble distance(::java::awt::geom::Point2D *);
-  virtual ::java::lang::Object * clone();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Point2D__
diff --git a/libjava/java/awt/geom/QuadCurve2D$1.h b/libjava/java/awt/geom/QuadCurve2D$1.h
deleted file mode 100644
index 987541a759f..00000000000
--- a/libjava/java/awt/geom/QuadCurve2D$1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_QuadCurve2D$1__
-#define __java_awt_geom_QuadCurve2D$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class QuadCurve2D;
-          class QuadCurve2D$1;
-      }
-    }
-  }
-}
-
-class java::awt::geom::QuadCurve2D$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  QuadCurve2D$1(::java::awt::geom::QuadCurve2D *, ::java::awt::geom::AffineTransform *);
-public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-public: // actually package-private
-  ::java::awt::geom::QuadCurve2D * this$0;
-private:
-  ::java::awt::geom::AffineTransform * val$at;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_QuadCurve2D$1__
diff --git a/libjava/java/awt/geom/QuadCurve2D$Double.h b/libjava/java/awt/geom/QuadCurve2D$Double.h
deleted file mode 100644
index 91a524b0d94..00000000000
--- a/libjava/java/awt/geom/QuadCurve2D$Double.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_QuadCurve2D$Double__
-#define __java_awt_geom_QuadCurve2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/QuadCurve2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-          class QuadCurve2D$Double;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::QuadCurve2D$Double : public ::java::awt::geom::QuadCurve2D
-{
-
-public:
-  QuadCurve2D$Double();
-  QuadCurve2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getCtrlX();
-  virtual jdouble getCtrlY();
-  virtual ::java::awt::geom::Point2D * getCtrlPt();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::QuadCurve2D)))) x1;
-  jdouble y1;
-  jdouble ctrlx;
-  jdouble ctrly;
-  jdouble x2;
-  jdouble y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_QuadCurve2D$Double__
diff --git a/libjava/java/awt/geom/QuadCurve2D$Float.h b/libjava/java/awt/geom/QuadCurve2D$Float.h
deleted file mode 100644
index b2f36d62490..00000000000
--- a/libjava/java/awt/geom/QuadCurve2D$Float.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_QuadCurve2D$Float__
-#define __java_awt_geom_QuadCurve2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/QuadCurve2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Point2D;
-          class QuadCurve2D$Float;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::QuadCurve2D$Float : public ::java::awt::geom::QuadCurve2D
-{
-
-public:
-  QuadCurve2D$Float();
-  QuadCurve2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual jdouble getX1();
-  virtual jdouble getY1();
-  virtual ::java::awt::geom::Point2D * getP1();
-  virtual jdouble getCtrlX();
-  virtual jdouble getCtrlY();
-  virtual ::java::awt::geom::Point2D * getCtrlPt();
-  virtual jdouble getX2();
-  virtual jdouble getY2();
-  virtual ::java::awt::geom::Point2D * getP2();
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual void setCurve(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::QuadCurve2D)))) x1;
-  jfloat y1;
-  jfloat ctrlx;
-  jfloat ctrly;
-  jfloat x2;
-  jfloat y2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_QuadCurve2D$Float__
diff --git a/libjava/java/awt/geom/QuadCurve2D.h b/libjava/java/awt/geom/QuadCurve2D.h
deleted file mode 100644
index f9adea41b82..00000000000
--- a/libjava/java/awt/geom/QuadCurve2D.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_QuadCurve2D__
-#define __java_awt_geom_QuadCurve2D__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class Point2D;
-          class QuadCurve2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::QuadCurve2D : public ::java::lang::Object
-{
-
-public: // actually protected
-  QuadCurve2D();
-public:
-  virtual jdouble getX1() = 0;
-  virtual jdouble getY1() = 0;
-  virtual ::java::awt::geom::Point2D * getP1() = 0;
-  virtual jdouble getCtrlX() = 0;
-  virtual jdouble getCtrlY() = 0;
-  virtual ::java::awt::geom::Point2D * getCtrlPt() = 0;
-  virtual jdouble getX2() = 0;
-  virtual jdouble getY2() = 0;
-  virtual ::java::awt::geom::Point2D * getP2() = 0;
-  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual void setCurve(JArray< jdouble > *, jint);
-  virtual void setCurve(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void setCurve(JArray< ::java::awt::geom::Point2D * > *, jint);
-  virtual void setCurve(::java::awt::geom::QuadCurve2D *);
-  static jdouble getFlatnessSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble getFlatness(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  static jdouble getFlatnessSq(JArray< jdouble > *, jint);
-  static jdouble getFlatness(JArray< jdouble > *, jint);
-  virtual jdouble getFlatnessSq();
-  virtual jdouble getFlatness();
-  virtual void subdivide(::java::awt::geom::QuadCurve2D *, ::java::awt::geom::QuadCurve2D *);
-  static void subdivide(::java::awt::geom::QuadCurve2D *, ::java::awt::geom::QuadCurve2D *, ::java::awt::geom::QuadCurve2D *);
-  static void subdivide(JArray< jdouble > *, jint, JArray< jdouble > *, jint, JArray< jdouble > *, jint);
-  static jint solveQuadratic(JArray< jdouble > *);
-  static jint solveQuadratic(JArray< jdouble > *, JArray< jdouble > *);
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual ::java::lang::Object * clone();
-private:
-  jint getAxisIntersections(jdouble, jdouble, jboolean, jdouble);
-public:
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
-private:
-  static jdouble BIG_VALUE;
-  static jdouble EPSILON;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_QuadCurve2D__
diff --git a/libjava/java/awt/geom/Rectangle2D$1.h b/libjava/java/awt/geom/Rectangle2D$1.h
deleted file mode 100644
index 4403af4ecc5..00000000000
--- a/libjava/java/awt/geom/Rectangle2D$1.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Rectangle2D$1__
-#define __java_awt_geom_Rectangle2D$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Rectangle2D;
-          class Rectangle2D$1;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Rectangle2D$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Rectangle2D$1(::java::awt::geom::Rectangle2D *, jdouble, jdouble, jdouble, jdouble, ::java::awt::geom::AffineTransform *);
-public:
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-  jint currentSegment(JArray< jfloat > *);
-  jint currentSegment(JArray< jdouble > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-public: // actually package-private
-  ::java::awt::geom::Rectangle2D * this$0;
-private:
-  jdouble val$maxx;
-  jdouble val$miny;
-  jdouble val$maxy;
-  jdouble val$minx;
-  ::java::awt::geom::AffineTransform * val$at;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Rectangle2D$1__
diff --git a/libjava/java/awt/geom/Rectangle2D$Double.h b/libjava/java/awt/geom/Rectangle2D$Double.h
deleted file mode 100644
index 20105f932d1..00000000000
--- a/libjava/java/awt/geom/Rectangle2D$Double.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Rectangle2D$Double__
-#define __java_awt_geom_Rectangle2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/Rectangle2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Rectangle2D;
-          class Rectangle2D$Double;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Rectangle2D$Double : public ::java::awt::geom::Rectangle2D
-{
-
-public:
-  Rectangle2D$Double();
-  Rectangle2D$Double(jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jboolean isEmpty();
-  virtual void setRect(jdouble, jdouble, jdouble, jdouble);
-  virtual void setRect(::java::awt::geom::Rectangle2D *);
-  virtual jint outcode(jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *);
-  virtual ::java::lang::String * toString();
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Rectangle2D)))) x;
-  jdouble y;
-  jdouble width;
-  jdouble height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Rectangle2D$Double__
diff --git a/libjava/java/awt/geom/Rectangle2D$Float.h b/libjava/java/awt/geom/Rectangle2D$Float.h
deleted file mode 100644
index 61dbf373ce4..00000000000
--- a/libjava/java/awt/geom/Rectangle2D$Float.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Rectangle2D$Float__
-#define __java_awt_geom_Rectangle2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/Rectangle2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Rectangle2D;
-          class Rectangle2D$Float;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Rectangle2D$Float : public ::java::awt::geom::Rectangle2D
-{
-
-public:
-  Rectangle2D$Float();
-  Rectangle2D$Float(jfloat, jfloat, jfloat, jfloat);
-public: // actually package-private
-  Rectangle2D$Float(jdouble, jdouble, jdouble, jdouble);
-public:
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jboolean isEmpty();
-  virtual void setRect(jfloat, jfloat, jfloat, jfloat);
-  virtual void setRect(jdouble, jdouble, jdouble, jdouble);
-  virtual void setRect(::java::awt::geom::Rectangle2D *);
-  virtual jint outcode(jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *);
-  virtual ::java::lang::String * toString();
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Rectangle2D)))) x;
-  jfloat y;
-  jfloat width;
-  jfloat height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Rectangle2D$Float__
diff --git a/libjava/java/awt/geom/Rectangle2D.h b/libjava/java/awt/geom/Rectangle2D.h
deleted file mode 100644
index e81e0a8e161..00000000000
--- a/libjava/java/awt/geom/Rectangle2D.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_Rectangle2D__
-#define __java_awt_geom_Rectangle2D__
-
-#pragma interface
-
-#include <java/awt/geom/RectangularShape.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Line2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::Rectangle2D : public ::java::awt::geom::RectangularShape
-{
-
-public: // actually protected
-  Rectangle2D();
-public:
-  virtual void setRect(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual void setRect(::java::awt::geom::Rectangle2D *);
-  virtual jboolean intersectsLine(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean intersectsLine(::java::awt::geom::Line2D *);
-  virtual jint outcode(jdouble, jdouble) = 0;
-  virtual jint outcode(::java::awt::geom::Point2D *);
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *) = 0;
-  static void intersect(::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *) = 0;
-  static void union$(::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
-  virtual void add(jdouble, jdouble);
-  virtual void add(::java::awt::geom::Point2D *);
-  virtual void add(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  static const jint OUT_LEFT = 1;
-  static const jint OUT_TOP = 2;
-  static const jint OUT_RIGHT = 4;
-  static const jint OUT_BOTTOM = 8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_Rectangle2D__
diff --git a/libjava/java/awt/geom/RectangularShape.h b/libjava/java/awt/geom/RectangularShape.h
deleted file mode 100644
index 18e1360fa0d..00000000000
--- a/libjava/java/awt/geom/RectangularShape.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_RectangularShape__
-#define __java_awt_geom_RectangularShape__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace geom
-      {
-          class AffineTransform;
-          class Dimension2D;
-          class PathIterator;
-          class Point2D;
-          class Rectangle2D;
-          class RectangularShape;
-      }
-    }
-  }
-}
-
-class java::awt::geom::RectangularShape : public ::java::lang::Object
-{
-
-public: // actually protected
-  RectangularShape();
-public:
-  virtual jdouble getX() = 0;
-  virtual jdouble getY() = 0;
-  virtual jdouble getWidth() = 0;
-  virtual jdouble getHeight() = 0;
-  virtual jdouble getMinX();
-  virtual jdouble getMinY();
-  virtual jdouble getMaxX();
-  virtual jdouble getMaxY();
-  virtual jdouble getCenterX();
-  virtual jdouble getCenterY();
-  virtual ::java::awt::geom::Rectangle2D * getFrame();
-  virtual jboolean isEmpty() = 0;
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual void setFrame(::java::awt::geom::Point2D *, ::java::awt::geom::Dimension2D *);
-  virtual void setFrame(::java::awt::geom::Rectangle2D *);
-  virtual void setFrameFromDiagonal(jdouble, jdouble, jdouble, jdouble);
-  virtual void setFrameFromDiagonal(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual void setFrameFromCenter(jdouble, jdouble, jdouble, jdouble);
-  virtual void setFrameFromCenter(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual jboolean contains(::java::awt::geom::Point2D *);
-  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
-  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
-  virtual jboolean contains(jdouble, jdouble) = 0;
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble) = 0;
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_RectangularShape__
diff --git a/libjava/java/awt/geom/RoundRectangle2D$1.h b/libjava/java/awt/geom/RoundRectangle2D$1.h
deleted file mode 100644
index 04bb8a542c4..00000000000
--- a/libjava/java/awt/geom/RoundRectangle2D$1.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_RoundRectangle2D$1__
-#define __java_awt_geom_RoundRectangle2D$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class Arc2D$Double;
-          class PathIterator;
-          class RoundRectangle2D;
-          class RoundRectangle2D$1;
-      }
-    }
-  }
-}
-
-class java::awt::geom::RoundRectangle2D$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RoundRectangle2D$1(::java::awt::geom::RoundRectangle2D *, ::java::awt::geom::AffineTransform *);
-public:
-  jint currentSegment(JArray< jdouble > *);
-  jint currentSegment(JArray< jfloat > *);
-  jint getWindingRule();
-  jboolean isDone();
-  void next();
-public: // actually package-private
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jdouble y;
-  jdouble w;
-  jdouble h;
-  jdouble arcW;
-  jdouble arcH;
-  ::java::awt::geom::Arc2D$Double * arc;
-  ::java::awt::geom::PathIterator * corner;
-  jint step;
-  ::java::awt::geom::RoundRectangle2D * this$0;
-private:
-  ::java::awt::geom::AffineTransform * val$at;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_RoundRectangle2D$1__
diff --git a/libjava/java/awt/geom/RoundRectangle2D$Double.h b/libjava/java/awt/geom/RoundRectangle2D$Double.h
deleted file mode 100644
index 08010fd4125..00000000000
--- a/libjava/java/awt/geom/RoundRectangle2D$Double.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_RoundRectangle2D$Double__
-#define __java_awt_geom_RoundRectangle2D$Double__
-
-#pragma interface
-
-#include <java/awt/geom/RoundRectangle2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Rectangle2D;
-          class RoundRectangle2D$Double;
-      }
-    }
-  }
-}
-
-class java::awt::geom::RoundRectangle2D$Double : public ::java::awt::geom::RoundRectangle2D
-{
-
-public:
-  RoundRectangle2D$Double();
-  RoundRectangle2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  virtual jdouble getArcHeight();
-  virtual jdouble getArcWidth();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jboolean isEmpty();
-  virtual void setRoundRect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::RoundRectangle2D)))) archeight;
-  jdouble arcwidth;
-  jdouble x;
-  jdouble y;
-  jdouble width;
-  jdouble height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_RoundRectangle2D$Double__
diff --git a/libjava/java/awt/geom/RoundRectangle2D$Float.h b/libjava/java/awt/geom/RoundRectangle2D$Float.h
deleted file mode 100644
index 184c5f4b161..00000000000
--- a/libjava/java/awt/geom/RoundRectangle2D$Float.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_RoundRectangle2D$Float__
-#define __java_awt_geom_RoundRectangle2D$Float__
-
-#pragma interface
-
-#include <java/awt/geom/RoundRectangle2D.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class Rectangle2D;
-          class RoundRectangle2D$Float;
-      }
-    }
-  }
-}
-
-class java::awt::geom::RoundRectangle2D$Float : public ::java::awt::geom::RoundRectangle2D
-{
-
-public:
-  RoundRectangle2D$Float();
-  RoundRectangle2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual jdouble getArcHeight();
-  virtual jdouble getArcWidth();
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
-  virtual jdouble getX();
-  virtual jdouble getY();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jboolean isEmpty();
-  virtual void setRoundRect(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
-  virtual void setRoundRect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::RoundRectangle2D)))) archeight;
-  jfloat arcwidth;
-  jfloat x;
-  jfloat y;
-  jfloat width;
-  jfloat height;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_RoundRectangle2D$Float__
diff --git a/libjava/java/awt/geom/RoundRectangle2D.h b/libjava/java/awt/geom/RoundRectangle2D.h
deleted file mode 100644
index a9092ca5c99..00000000000
--- a/libjava/java/awt/geom/RoundRectangle2D.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_geom_RoundRectangle2D__
-#define __java_awt_geom_RoundRectangle2D__
-
-#pragma interface
-
-#include <java/awt/geom/RectangularShape.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace geom
-      {
-          class AffineTransform;
-          class PathIterator;
-          class RoundRectangle2D;
-      }
-    }
-  }
-}
-
-class java::awt::geom::RoundRectangle2D : public ::java::awt::geom::RectangularShape
-{
-
-public:
-  virtual jdouble getArcHeight() = 0;
-  virtual jdouble getArcWidth() = 0;
-  virtual void setRoundRect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble) = 0;
-public: // actually protected
-  RoundRectangle2D();
-public:
-  virtual jboolean contains(jdouble, jdouble);
-  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
-  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
-  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
-  virtual void setRoundRect(::java::awt::geom::RoundRectangle2D *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_geom_RoundRectangle2D__
diff --git a/libjava/java/awt/im/InputContext.h b/libjava/java/awt/im/InputContext.h
deleted file mode 100644
index 59c02044abb..00000000000
--- a/libjava/java/awt/im/InputContext.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_InputContext__
-#define __java_awt_im_InputContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-      namespace im
-      {
-          class InputContext;
-        namespace spi
-        {
-            class InputMethod;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::im::InputContext : public ::java::lang::Object
-{
-
-public: // actually protected
-  InputContext();
-public:
-  static ::java::awt::im::InputContext * getInstance();
-  virtual jboolean selectInputMethod(::java::util::Locale *);
-  virtual ::java::util::Locale * getLocale();
-  virtual void setCharacterSubsets(JArray< ::java::lang::Character$Subset * > *);
-  virtual void setCompositionEnabled(jboolean);
-  virtual jboolean isCompositionEnabled();
-  virtual void reconvert();
-  virtual void dispatchEvent(::java::awt::AWTEvent *);
-  virtual void removeNotify(::java::awt::Component *);
-  virtual void endComposition();
-  virtual void dispose();
-  virtual ::java::lang::Object * getInputMethodControlObject();
-private:
-  static ::java::util::ArrayList * descriptors;
-  ::java::awt::im::spi::InputMethod * __attribute__((aligned(__alignof__( ::java::lang::Object)))) im;
-  ::java::util::HashMap * recent;
-  JArray< ::java::lang::Character$Subset * > * subsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_im_InputContext__
diff --git a/libjava/java/awt/im/InputMethodHighlight.h b/libjava/java/awt/im/InputMethodHighlight.h
deleted file mode 100644
index 72eb7452183..00000000000
--- a/libjava/java/awt/im/InputMethodHighlight.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_InputMethodHighlight__
-#define __java_awt_im_InputMethodHighlight__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace im
-      {
-          class InputMethodHighlight;
-      }
-    }
-  }
-}
-
-class java::awt::im::InputMethodHighlight : public ::java::lang::Object
-{
-
-public:
-  InputMethodHighlight(jboolean, jint);
-  InputMethodHighlight(jboolean, jint, jint);
-  InputMethodHighlight(jboolean, jint, jint, ::java::util::Map *);
-  virtual jboolean isSelected();
-  virtual jint getState();
-  virtual jint getVariation();
-  virtual ::java::util::Map * getStyle();
-  static const jint RAW_TEXT = 0;
-  static const jint CONVERTED_TEXT = 1;
-  static ::java::awt::im::InputMethodHighlight * UNSELECTED_RAW_TEXT_HIGHLIGHT;
-  static ::java::awt::im::InputMethodHighlight * SELECTED_RAW_TEXT_HIGHLIGHT;
-  static ::java::awt::im::InputMethodHighlight * UNSELECTED_CONVERTED_TEXT_HIGHLIGHT;
-  static ::java::awt::im::InputMethodHighlight * SELECTED_CONVERTED_TEXT_HIGHLIGHT;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) selected;
-  jint state;
-  jint variation;
-  ::java::util::Map * style;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_im_InputMethodHighlight__
diff --git a/libjava/java/awt/im/InputMethodRequests.h b/libjava/java/awt/im/InputMethodRequests.h
deleted file mode 100644
index 4552bc9542e..00000000000
--- a/libjava/java/awt/im/InputMethodRequests.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_InputMethodRequests__
-#define __java_awt_im_InputMethodRequests__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace font
-      {
-          class TextHitInfo;
-      }
-      namespace im
-      {
-          class InputMethodRequests;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-}
-
-class java::awt::im::InputMethodRequests : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Rectangle * getTextLocation(::java::awt::font::TextHitInfo *) = 0;
-  virtual ::java::awt::font::TextHitInfo * getLocationOffset(jint, jint) = 0;
-  virtual jint getInsertPositionOffset() = 0;
-  virtual ::java::text::AttributedCharacterIterator * getCommittedText(jint, jint, JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  virtual jint getCommittedTextLength() = 0;
-  virtual ::java::text::AttributedCharacterIterator * cancelLatestCommittedText(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  virtual ::java::text::AttributedCharacterIterator * getSelectedText(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_im_InputMethodRequests__
diff --git a/libjava/java/awt/im/InputSubset.h b/libjava/java/awt/im/InputSubset.h
deleted file mode 100644
index 181a6af952f..00000000000
--- a/libjava/java/awt/im/InputSubset.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_InputSubset__
-#define __java_awt_im_InputSubset__
-
-#pragma interface
-
-#include <java/lang/Character$Subset.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace im
-      {
-          class InputSubset;
-      }
-    }
-  }
-}
-
-class java::awt::im::InputSubset : public ::java::lang::Character$Subset
-{
-
-  InputSubset(::java::lang::String *);
-public:
-  static ::java::awt::im::InputSubset * LATIN;
-  static ::java::awt::im::InputSubset * LATIN_DIGITS;
-  static ::java::awt::im::InputSubset * TRADITIONAL_HANZI;
-  static ::java::awt::im::InputSubset * SIMPLIFIED_HANZI;
-  static ::java::awt::im::InputSubset * KANJI;
-  static ::java::awt::im::InputSubset * HANJA;
-  static ::java::awt::im::InputSubset * HALFWIDTH_KATAKANA;
-  static ::java::awt::im::InputSubset * FULLWIDTH_LATIN;
-  static ::java::awt::im::InputSubset * FULLWIDTH_DIGITS;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_im_InputSubset__
diff --git a/libjava/java/awt/im/spi/InputMethod.h b/libjava/java/awt/im/spi/InputMethod.h
deleted file mode 100644
index d48fc67a42e..00000000000
--- a/libjava/java/awt/im/spi/InputMethod.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_spi_InputMethod__
-#define __java_awt_im_spi_InputMethod__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Rectangle;
-      namespace im
-      {
-        namespace spi
-        {
-            class InputMethod;
-            class InputMethodContext;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::im::spi::InputMethod : public ::java::lang::Object
-{
-
-public:
-  virtual void setInputMethodContext(::java::awt::im::spi::InputMethodContext *) = 0;
-  virtual jboolean setLocale(::java::util::Locale *) = 0;
-  virtual ::java::util::Locale * getLocale() = 0;
-  virtual void setCharacterSubsets(JArray< ::java::lang::Character$Subset * > *) = 0;
-  virtual void setCompositionEnabled(jboolean) = 0;
-  virtual jboolean isCompositionEnabled() = 0;
-  virtual void reconvert() = 0;
-  virtual void dispatchEvent(::java::awt::AWTEvent *) = 0;
-  virtual void notifyClientWindowChange(::java::awt::Rectangle *) = 0;
-  virtual void activate() = 0;
-  virtual void deactivate(jboolean) = 0;
-  virtual void hideWindows() = 0;
-  virtual void removeNotify() = 0;
-  virtual void endComposition() = 0;
-  virtual void dispose() = 0;
-  virtual ::java::lang::Object * getControlObject() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_im_spi_InputMethod__
diff --git a/libjava/java/awt/im/spi/InputMethodContext.h b/libjava/java/awt/im/spi/InputMethodContext.h
deleted file mode 100644
index 8dcef0e08c7..00000000000
--- a/libjava/java/awt/im/spi/InputMethodContext.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_spi_InputMethodContext__
-#define __java_awt_im_spi_InputMethodContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Window;
-      namespace font
-      {
-          class TextHitInfo;
-      }
-      namespace im
-      {
-        namespace spi
-        {
-            class InputMethod;
-            class InputMethodContext;
-        }
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFrame;
-    }
-  }
-}
-
-class java::awt::im::spi::InputMethodContext : public ::java::lang::Object
-{
-
-public:
-  virtual void dispatchInputMethodEvent(jint, ::java::text::AttributedCharacterIterator *, jint, ::java::awt::font::TextHitInfo *, ::java::awt::font::TextHitInfo *) = 0;
-  virtual ::java::awt::Window * createInputMethodWindow(::java::lang::String *, jboolean) = 0;
-  virtual ::javax::swing::JFrame * createInputMethodJFrame(::java::lang::String *, jboolean) = 0;
-  virtual void enableClientWindowNotification(::java::awt::im::spi::InputMethod *, jboolean) = 0;
-  virtual ::java::awt::Rectangle * getTextLocation(::java::awt::font::TextHitInfo *) = 0;
-  virtual ::java::awt::font::TextHitInfo * getLocationOffset(jint, jint) = 0;
-  virtual jint getInsertPositionOffset() = 0;
-  virtual ::java::text::AttributedCharacterIterator * getCommittedText(jint, jint, JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  virtual jint getCommittedTextLength() = 0;
-  virtual ::java::text::AttributedCharacterIterator * cancelLatestCommittedText(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  virtual ::java::text::AttributedCharacterIterator * getSelectedText(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_im_spi_InputMethodContext__
diff --git a/libjava/java/awt/im/spi/InputMethodDescriptor.h b/libjava/java/awt/im/spi/InputMethodDescriptor.h
deleted file mode 100644
index 60d0829fef0..00000000000
--- a/libjava/java/awt/im/spi/InputMethodDescriptor.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_im_spi_InputMethodDescriptor__
-#define __java_awt_im_spi_InputMethodDescriptor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace im
-      {
-        namespace spi
-        {
-            class InputMethod;
-            class InputMethodDescriptor;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::im::spi::InputMethodDescriptor : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::util::Locale * > * getAvailableLocales() = 0;
-  virtual jboolean hasDynamicLocaleList() = 0;
-  virtual ::java::lang::String * getInputMethodDisplayName(::java::util::Locale *, ::java::util::Locale *) = 0;
-  virtual ::java::awt::Image * getInputMethodIcon(::java::util::Locale *) = 0;
-  virtual ::java::awt::im::spi::InputMethod * createInputMethod() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_im_spi_InputMethodDescriptor__
diff --git a/libjava/java/awt/image/AffineTransformOp.h b/libjava/java/awt/image/AffineTransformOp.h
deleted file mode 100644
index be0dee40b3f..00000000000
--- a/libjava/java/awt/image/AffineTransformOp.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_AffineTransformOp__
-#define __java_awt_image_AffineTransformOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class AffineTransform;
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class AffineTransformOp;
-          class BufferedImage;
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::AffineTransformOp : public ::java::lang::Object
-{
-
-public:
-  AffineTransformOp(::java::awt::geom::AffineTransform *, jint);
-  AffineTransformOp(::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual jint getInterpolationType();
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-private:
-  void filterNearest(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jdouble > *, JArray< jdouble > *);
-  void filterBilinear(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jdouble > *, JArray< jdouble > *);
-  void filterBicubic(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jdouble > *, JArray< jdouble > *);
-public:
-  static const jint TYPE_NEAREST_NEIGHBOR = 1;
-  static const jint TYPE_BILINEAR = 2;
-  static const jint TYPE_BICUBIC = 3;
-private:
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::lang::Object)))) transform;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_AffineTransformOp__
diff --git a/libjava/java/awt/image/AreaAveragingScaleFilter.h b/libjava/java/awt/image/AreaAveragingScaleFilter.h
deleted file mode 100644
index 694ae79a772..00000000000
--- a/libjava/java/awt/image/AreaAveragingScaleFilter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_AreaAveragingScaleFilter__
-#define __java_awt_image_AreaAveragingScaleFilter__
-
-#pragma interface
-
-#include <java/awt/image/ReplicateScaleFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class AreaAveragingScaleFilter;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::AreaAveragingScaleFilter : public ::java::awt::image::ReplicateScaleFilter
-{
-
-public:
-  AreaAveragingScaleFilter(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< jbyte > * averagePixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jdouble, jdouble, jint);
-  JArray< jint > * averagePixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jdouble, jdouble, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_AreaAveragingScaleFilter__
diff --git a/libjava/java/awt/image/BandCombineOp.h b/libjava/java/awt/image/BandCombineOp.h
deleted file mode 100644
index 0233ef4d3c6..00000000000
--- a/libjava/java/awt/image/BandCombineOp.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BandCombineOp__
-#define __java_awt_image_BandCombineOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BandCombineOp;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::BandCombineOp : public ::java::lang::Object
-{
-
-public:
-  BandCombineOp(JArray< JArray< jfloat > * > *, ::java::awt::RenderingHints *);
-  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();
-  virtual JArray< JArray< jfloat > * > * getMatrix();
-private:
-  ::java::awt::RenderingHints * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hints;
-  JArray< JArray< jfloat > * > * matrix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BandCombineOp__
diff --git a/libjava/java/awt/image/BandedSampleModel.h b/libjava/java/awt/image/BandedSampleModel.h
deleted file mode 100644
index 5eca8194bca..00000000000
--- a/libjava/java/awt/image/BandedSampleModel.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BandedSampleModel__
-#define __java_awt_image_BandedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/ComponentSampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BandedSampleModel;
-          class DataBuffer;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::BandedSampleModel : public ::java::awt::image::ComponentSampleModel
-{
-
-  static JArray< jint > * createBankArray(jint);
-public:
-  BandedSampleModel(jint, jint, jint, jint);
-  BandedSampleModel(jint, jint, jint, jint, JArray< jint > *, JArray< jint > *);
-  ::java::awt::image::DataBuffer * createDataBuffer();
-  ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  jfloat getSampleFloat(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  jdouble getSampleDouble(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  JArray< jint > * getSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  void setPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  void setSample(jint, jint, jint, jfloat, ::java::awt::image::DataBuffer *);
-  void setSample(jint, jint, jint, jdouble, ::java::awt::image::DataBuffer *);
-  void setSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  ::java::lang::String * toString();
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::ComponentSampleModel)))) bitMasks;
-  JArray< jint > * bitOffsets;
-  JArray< jint > * sampleSize;
-  jint dataBitOffset;
-  jint elemBits;
-  jint numberOfBits;
-  jint numElems;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BandedSampleModel__
diff --git a/libjava/java/awt/image/BufferStrategy.h b/libjava/java/awt/image/BufferStrategy.h
deleted file mode 100644
index 682e73e073d..00000000000
--- a/libjava/java/awt/image/BufferStrategy.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferStrategy__
-#define __java_awt_image_BufferStrategy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class BufferCapabilities;
-        class Graphics;
-      namespace image
-      {
-          class BufferStrategy;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferStrategy : public ::java::lang::Object
-{
-
-public:
-  BufferStrategy();
-  virtual ::java::awt::BufferCapabilities * getCapabilities() = 0;
-  virtual ::java::awt::Graphics * getDrawGraphics() = 0;
-  virtual jboolean contentsLost() = 0;
-  virtual jboolean contentsRestored() = 0;
-  virtual void show() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferStrategy__
diff --git a/libjava/java/awt/image/BufferedImage$1.h b/libjava/java/awt/image/BufferedImage$1.h
deleted file mode 100644
index cdb16e7fc85..00000000000
--- a/libjava/java/awt/image/BufferedImage$1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImage$1__
-#define __java_awt_image_BufferedImage$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImage$1;
-          class ImageConsumer;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImage$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BufferedImage$1(::java::awt::image::BufferedImage *);
-public:
-  void addConsumer(::java::awt::image::ImageConsumer *);
-  jboolean isConsumer(::java::awt::image::ImageConsumer *);
-  void removeConsumer(::java::awt::image::ImageConsumer *);
-  void startProduction(::java::awt::image::ImageConsumer *);
-  void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumers;
-  ::java::awt::image::BufferedImage * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferedImage$1__
diff --git a/libjava/java/awt/image/BufferedImage.h b/libjava/java/awt/image/BufferedImage.h
deleted file mode 100644
index 9c54907a7b5..00000000000
--- a/libjava/java/awt/image/BufferedImage.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImage__
-#define __java_awt_image_BufferedImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Graphics2D;
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class IndexColorModel;
-          class Raster;
-          class SampleModel;
-          class TileObserver;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImage : public ::java::awt::Image
-{
-
-public:
-  BufferedImage(jint, jint, jint);
-  BufferedImage(jint, jint, jint, ::java::awt::image::IndexColorModel *);
-  BufferedImage(::java::awt::image::ColorModel *, ::java::awt::image::WritableRaster *, jboolean, ::java::util::Hashtable *);
-private:
-  void init(::java::awt::image::ColorModel *, ::java::awt::image::WritableRaster *, jboolean, ::java::util::Hashtable *, jint);
-  ::java::awt::image::IndexColorModel * createDefaultIndexedColorModel(jboolean);
-public:
-  virtual void coerceData(jboolean);
-  virtual ::java::awt::image::WritableRaster * copyData(::java::awt::image::WritableRaster *);
-  virtual ::java::awt::Graphics2D * createGraphics();
-  virtual void flush();
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual ::java::awt::image::Raster * getData();
-  virtual ::java::awt::image::Raster * getData(::java::awt::Rectangle *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual jint getHeight();
-  virtual jint getHeight(::java::awt::image::ImageObserver *);
-  virtual jint getMinTileX();
-  virtual jint getMinTileY();
-  virtual jint getMinX();
-  virtual jint getMinY();
-  virtual jint getNumXTiles();
-  virtual jint getNumYTiles();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
-  virtual JArray< ::java::lang::String * > * getPropertyNames();
-  virtual jint getRGB(jint, jint);
-  virtual JArray< jint > * getRGB(jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  virtual ::java::awt::image::WritableRaster * getRaster();
-  virtual ::java::awt::image::SampleModel * getSampleModel();
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual ::java::util::Vector * getSources();
-  virtual ::java::awt::image::BufferedImage * getSubimage(jint, jint, jint, jint);
-  virtual ::java::awt::image::Raster * getTile(jint, jint);
-  virtual jint getTileGridXOffset();
-  virtual jint getTileGridYOffset();
-  virtual jint getTileHeight();
-  virtual jint getTileWidth();
-  virtual jint getType();
-  virtual jint getWidth();
-  virtual jint getWidth(::java::awt::image::ImageObserver *);
-  virtual ::java::awt::image::WritableRaster * getWritableTile(jint, jint);
-  virtual JArray< ::java::awt::Point * > * getWritableTileIndices();
-  virtual jboolean hasTileWriters();
-  virtual jboolean isAlphaPremultiplied();
-  virtual jboolean isTileWritable(jint, jint);
-  virtual void releaseWritableTile(jint, jint);
-  virtual void setData(::java::awt::image::Raster *);
-  virtual void setRGB(jint, jint, jint);
-  virtual void setRGB(jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  virtual ::java::lang::String * toString();
-  virtual void addTileObserver(::java::awt::image::TileObserver *);
-  virtual void removeTileObserver(::java::awt::image::TileObserver *);
-  virtual jint getTransparency();
-  static const jint TYPE_CUSTOM = 0;
-  static const jint TYPE_INT_RGB = 1;
-  static const jint TYPE_INT_ARGB = 2;
-  static const jint TYPE_INT_ARGB_PRE = 3;
-  static const jint TYPE_INT_BGR = 4;
-  static const jint TYPE_3BYTE_BGR = 5;
-  static const jint TYPE_4BYTE_ABGR = 6;
-  static const jint TYPE_4BYTE_ABGR_PRE = 7;
-  static const jint TYPE_USHORT_565_RGB = 8;
-  static const jint TYPE_USHORT_555_RGB = 9;
-  static const jint TYPE_BYTE_GRAY = 10;
-  static const jint TYPE_USHORT_GRAY = 11;
-  static const jint TYPE_BYTE_BINARY = 12;
-  static const jint TYPE_BYTE_INDEXED = 13;
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::awt::Image)))) tileObservers;
-  ::java::awt::image::WritableRaster * raster;
-  ::java::awt::image::ColorModel * colorModel;
-  ::java::util::Hashtable * properties;
-  jboolean isPremultiplied;
-  jint type;
-private:
-  static JArray< ::java::awt::Point * > * tileIndices;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferedImage__
diff --git a/libjava/java/awt/image/BufferedImageFilter.h b/libjava/java/awt/image/BufferedImageFilter.h
deleted file mode 100644
index 08da9be7137..00000000000
--- a/libjava/java/awt/image/BufferedImageFilter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImageFilter__
-#define __java_awt_image_BufferedImageFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImageFilter;
-          class BufferedImageOp;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImageFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  BufferedImageFilter(::java::awt::image::BufferedImageOp *);
-  virtual ::java::awt::image::BufferedImageOp * getBufferedImageOp();
-  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::BufferedImageOp * __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) op;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_BufferedImageFilter__
diff --git a/libjava/java/awt/image/BufferedImageOp.h b/libjava/java/awt/image/BufferedImageOp.h
deleted file mode 100644
index 1af69aa02dd..00000000000
--- a/libjava/java/awt/image/BufferedImageOp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_BufferedImageOp__
-#define __java_awt_image_BufferedImageOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class BufferedImageOp;
-          class ColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::BufferedImageOp : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *) = 0;
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *) = 0;
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *) = 0;
-  virtual ::java::awt::RenderingHints * getRenderingHints() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_BufferedImageOp__
diff --git a/libjava/java/awt/image/ByteLookupTable.h b/libjava/java/awt/image/ByteLookupTable.h
deleted file mode 100644
index d34b385b2ef..00000000000
--- a/libjava/java/awt/image/ByteLookupTable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ByteLookupTable__
-#define __java_awt_image_ByteLookupTable__
-
-#pragma interface
-
-#include <java/awt/image/LookupTable.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ByteLookupTable;
-      }
-    }
-  }
-}
-
-class java::awt::image::ByteLookupTable : public ::java::awt::image::LookupTable
-{
-
-public:
-  ByteLookupTable(jint, JArray< JArray< jbyte > * > *);
-  ByteLookupTable(jint, JArray< jbyte > *);
-  virtual JArray< JArray< jbyte > * > * getTable();
-  virtual JArray< jint > * lookupPixel(JArray< jint > *, JArray< jint > *);
-  virtual JArray< jbyte > * lookupPixel(JArray< jbyte > *, JArray< jbyte > *);
-private:
-  JArray< JArray< jbyte > * > * __attribute__((aligned(__alignof__( ::java::awt::image::LookupTable)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ByteLookupTable__
diff --git a/libjava/java/awt/image/ColorConvertOp.h b/libjava/java/awt/image/ColorConvertOp.h
deleted file mode 100644
index 6455b46bbb7..00000000000
--- a/libjava/java/awt/image/ColorConvertOp.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ColorConvertOp__
-#define __java_awt_image_ColorConvertOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace color
-      {
-          class ColorSpace;
-          class ICC_Profile;
-      }
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorConvertOp;
-          class ColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ColorConvertOp : public ::java::lang::Object
-{
-
-public:
-  ColorConvertOp(::java::awt::color::ColorSpace *, ::java::awt::RenderingHints *);
-  ColorConvertOp(::java::awt::color::ColorSpace *, ::java::awt::color::ColorSpace *, ::java::awt::RenderingHints *);
-  ColorConvertOp(JArray< ::java::awt::color::ICC_Profile * > *, ::java::awt::RenderingHints *);
-  ColorConvertOp(::java::awt::RenderingHints *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual JArray< ::java::awt::color::ICC_Profile * > * getICC_Profiles();
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-private:
-  void copyimage(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  void copyraster(::java::awt::image::Raster *, ::java::awt::color::ColorSpace *, ::java::awt::image::WritableRaster *, ::java::awt::color::ColorSpace *);
-  ::java::awt::image::ColorModel * createCompatibleColorModel(::java::awt::image::BufferedImage *, ::java::awt::color::ColorSpace *);
-  ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *, ::java::awt::color::ColorSpace *, jboolean, jint);
-  ::java::awt::RenderingHints * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hints;
-  JArray< ::java::awt::color::ICC_Profile * > * profiles;
-  JArray< ::java::awt::color::ColorSpace * > * spaces;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ColorConvertOp__
diff --git a/libjava/java/awt/image/ColorModel$SRGBColorModel.h b/libjava/java/awt/image/ColorModel$SRGBColorModel.h
deleted file mode 100644
index 90428c4298b..00000000000
--- a/libjava/java/awt/image/ColorModel$SRGBColorModel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ColorModel$SRGBColorModel__
-#define __java_awt_image_ColorModel$SRGBColorModel__
-
-#pragma interface
-
-#include <java/awt/image/DirectColorModel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel$SRGBColorModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::ColorModel$SRGBColorModel : public ::java::awt::image::DirectColorModel
-{
-
-public: // actually package-private
-  ColorModel$SRGBColorModel();
-public:
-  virtual jint getAlpha(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ColorModel$SRGBColorModel__
diff --git a/libjava/java/awt/image/ColorModel.h b/libjava/java/awt/image/ColorModel.h
deleted file mode 100644
index 3ed3b82ccad..00000000000
--- a/libjava/java/awt/image/ColorModel.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ColorModel__
-#define __java_awt_image_ColorModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ColorModel : public ::java::lang::Object
-{
-
-public: // actually package-private
-  static JArray< jint > * nArray(jint, jint);
-  static JArray< jbyte > * nArray(jbyte, jint);
-public:
-  ColorModel(jint);
-public: // actually protected
-  ColorModel(jint, JArray< jint > *, ::java::awt::color::ColorSpace *, jboolean, jboolean, jint, jint);
-public:
-  virtual void finalize();
-  static ::java::awt::image::ColorModel * getRGBdefault();
-  virtual jboolean hasAlpha();
-  virtual jboolean isAlphaPremultiplied();
-  virtual jint getPixelSize();
-  virtual jint getComponentSize(jint);
-  virtual JArray< jint > * getComponentSize();
-  virtual jint getTransparency();
-  virtual jint getNumComponents();
-  virtual jint getNumColorComponents();
-  virtual jint getRed(jint) = 0;
-  virtual jint getGreen(jint) = 0;
-  virtual jint getBlue(jint) = 0;
-  virtual jint getAlpha(jint) = 0;
-  virtual jint getRGB(jint);
-public: // actually package-private
-  virtual jint getPixelFromArray(::java::lang::Object *);
-public:
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getAlpha(::java::lang::Object *);
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-  virtual JArray< jint > * getComponents(jint, JArray< jint > *, jint);
-  virtual JArray< jint > * getComponents(::java::lang::Object *, JArray< jint > *, jint);
-  virtual JArray< jint > * getUnnormalizedComponents(JArray< jfloat > *, jint, JArray< jint > *, jint);
-  virtual JArray< jfloat > * getNormalizedComponents(JArray< jint > *, jint, JArray< jfloat > *, jint);
-  virtual JArray< jfloat > * getNormalizedComponents(::java::lang::Object *, JArray< jfloat > *, jint);
-  virtual jint getDataElement(JArray< jint > *, jint);
-  virtual jint getDataElement(JArray< jfloat > *, jint);
-  virtual ::java::lang::Object * getDataElements(JArray< jint > *, jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(JArray< jfloat > *, jint, ::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::awt::color::ColorSpace * getColorSpace();
-  virtual ::java::awt::image::ColorModel * coerceData(::java::awt::image::WritableRaster *, jboolean);
-public: // actually protected
-  virtual void coerceDataWorker(::java::awt::image::WritableRaster *, jboolean);
-public:
-  virtual jboolean isCompatibleRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual jint getTransferType();
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster(::java::awt::image::WritableRaster *);
-public: // actually package-private
-  virtual ::java::lang::String * stringParam();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) pixel_bits;
-  jint transferType;
-public: // actually package-private
-  JArray< jint > * bits;
-  ::java::awt::color::ColorSpace * cspace;
-  jint transparency;
-  jboolean hasAlpha__;
-  jboolean isAlphaPremultiplied__;
-private:
-  static ::java::awt::image::ColorModel * S_RGB_MODEL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ColorModel__
diff --git a/libjava/java/awt/image/ComponentColorModel.h b/libjava/java/awt/image/ComponentColorModel.h
deleted file mode 100644
index e40ab1d2db1..00000000000
--- a/libjava/java/awt/image/ComponentColorModel.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ComponentColorModel__
-#define __java_awt_image_ComponentColorModel__
-
-#pragma interface
-
-#include <java/awt/image/ColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ComponentColorModel;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ComponentColorModel : public ::java::awt::image::ColorModel
-{
-
-  static jint sum(JArray< jint > *);
-  static JArray< jint > * findBits(::java::awt::color::ColorSpace *, jint, jboolean);
-public:
-  ComponentColorModel(::java::awt::color::ColorSpace *, JArray< jint > *, jboolean, jboolean, jint, jint);
-  ComponentColorModel(::java::awt::color::ColorSpace *, jboolean, jboolean, jint, jint);
-  virtual jint getRed(jint);
-  virtual jint getGreen(jint);
-  virtual jint getBlue(jint);
-  virtual jint getAlpha(jint);
-  virtual jint getRGB(jint);
-private:
-  JArray< jfloat > * getRGBFloat(jint);
-  JArray< jfloat > * getRGBFloat(::java::lang::Object *);
-public:
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getAlpha(::java::lang::Object *);
-private:
-  jint getRGB(JArray< jfloat > *);
-public:
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-  virtual JArray< jint > * getComponents(jint, JArray< jint > *, jint);
-  virtual JArray< jint > * getComponents(::java::lang::Object *, JArray< jint > *, jint);
-  virtual jint getDataElement(JArray< jint > *, jint);
-  virtual ::java::lang::Object * getDataElements(JArray< jint > *, jint, ::java::lang::Object *);
-  virtual ::java::awt::image::ColorModel * coerceData(::java::awt::image::WritableRaster *, jboolean);
-  virtual jboolean isCompatibleRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster(::java::awt::image::WritableRaster *);
-  virtual jboolean equals(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ComponentColorModel__
diff --git a/libjava/java/awt/image/ComponentSampleModel.h b/libjava/java/awt/image/ComponentSampleModel.h
deleted file mode 100644
index 4a1d2c675cb..00000000000
--- a/libjava/java/awt/image/ComponentSampleModel.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ComponentSampleModel__
-#define __java_awt_image_ComponentSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/SampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ComponentSampleModel;
-          class DataBuffer;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::ComponentSampleModel : public ::java::awt::image::SampleModel
-{
-
-public:
-  ComponentSampleModel(jint, jint, jint, jint, jint, JArray< jint > *);
-  ComponentSampleModel(jint, jint, jint, jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  virtual ::java::awt::image::DataBuffer * createDataBuffer();
-  virtual jint getOffset(jint, jint);
-  virtual jint getOffset(jint, jint, jint);
-  virtual JArray< jint > * getSampleSize();
-  virtual jint getSampleSize(jint);
-  virtual JArray< jint > * getBankIndices();
-  virtual JArray< jint > * getBandOffsets();
-  virtual jint getScanlineStride();
-  virtual jint getPixelStride();
-  virtual jint getNumDataElements();
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-public: // actually protected
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::SampleModel)))) bandOffsets;
-  JArray< jint > * bankIndices;
-  jint numBands;
-  jint numBanks;
-  jint scanlineStride;
-  jint pixelStride;
-private:
-  jboolean tightPixelPacking;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ComponentSampleModel__
diff --git a/libjava/java/awt/image/ConvolveOp.h b/libjava/java/awt/image/ConvolveOp.h
deleted file mode 100644
index e72a7033e62..00000000000
--- a/libjava/java/awt/image/ConvolveOp.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ConvolveOp__
-#define __java_awt_image_ConvolveOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class ConvolveOp;
-          class Kernel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::ConvolveOp : public ::java::lang::Object
-{
-
-public:
-  ConvolveOp(::java::awt::image::Kernel *, jint, ::java::awt::RenderingHints *);
-  ConvolveOp(::java::awt::image::Kernel *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual jint getEdgeCondition();
-  virtual ::java::awt::image::Kernel * getKernel();
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-private:
-  void fillEdge(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, jint, jint, jint, jint, jint);
-public:
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  static const jint EDGE_ZERO_FILL = 0;
-  static const jint EDGE_NO_OP = 1;
-private:
-  ::java::awt::image::Kernel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kernel;
-  jint edge;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ConvolveOp__
diff --git a/libjava/java/awt/image/CropImageFilter.h b/libjava/java/awt/image/CropImageFilter.h
deleted file mode 100644
index 23720dbdca3..00000000000
--- a/libjava/java/awt/image/CropImageFilter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_CropImageFilter__
-#define __java_awt_image_CropImageFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class CropImageFilter;
-      }
-    }
-  }
-}
-
-class java::awt::image::CropImageFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  CropImageFilter(jint, jint, jint, jint);
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  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);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) x;
-  jint y;
-  jint width;
-  jint height;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_CropImageFilter__
diff --git a/libjava/java/awt/image/DataBuffer.h b/libjava/java/awt/image/DataBuffer.h
deleted file mode 100644
index 5bb4ac2933c..00000000000
--- a/libjava/java/awt/image/DataBuffer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBuffer__
-#define __java_awt_image_DataBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBuffer : public ::java::lang::Object
-{
-
-public: // actually protected
-  DataBuffer(jint, jint);
-  DataBuffer(jint, jint, jint);
-  DataBuffer(jint, jint, jint, jint);
-  DataBuffer(jint, jint, jint, JArray< jint > *);
-public:
-  static jint getDataTypeSize(jint);
-  virtual jint getDataType();
-  virtual jint getSize();
-  virtual jint getOffset();
-  virtual JArray< jint > * getOffsets();
-  virtual jint getNumBanks();
-  virtual jint getElem(jint);
-  virtual jint getElem(jint, jint) = 0;
-  virtual void setElem(jint, jint);
-  virtual void setElem(jint, jint, jint) = 0;
-  virtual jfloat getElemFloat(jint);
-  virtual jfloat getElemFloat(jint, jint);
-  virtual void setElemFloat(jint, jfloat);
-  virtual void setElemFloat(jint, jint, jfloat);
-  virtual jdouble getElemDouble(jint);
-  virtual jdouble getElemDouble(jint, jint);
-  virtual void setElemDouble(jint, jdouble);
-  virtual void setElemDouble(jint, jint, jdouble);
-  static const jint TYPE_BYTE = 0;
-  static const jint TYPE_USHORT = 1;
-  static const jint TYPE_SHORT = 2;
-  static const jint TYPE_INT = 3;
-  static const jint TYPE_FLOAT = 4;
-  static const jint TYPE_DOUBLE = 5;
-  static const jint TYPE_UNDEFINED = 32;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) dataType;
-  jint banks;
-  jint offset;
-  jint size;
-  JArray< jint > * offsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBuffer__
diff --git a/libjava/java/awt/image/DataBufferByte.h b/libjava/java/awt/image/DataBufferByte.h
deleted file mode 100644
index 224be27ce29..00000000000
--- a/libjava/java/awt/image/DataBufferByte.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferByte__
-#define __java_awt_image_DataBufferByte__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferByte;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferByte : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferByte(jint);
-  DataBufferByte(jint, jint);
-  DataBufferByte(JArray< jbyte > *, jint);
-  DataBufferByte(JArray< jbyte > *, jint, jint);
-  DataBufferByte(JArray< JArray< jbyte > * > *, jint);
-  DataBufferByte(JArray< JArray< jbyte > * > *, jint, JArray< jint > *);
-  JArray< jbyte > * getData();
-  JArray< jbyte > * getData(jint);
-  JArray< JArray< jbyte > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jbyte > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferByte__
diff --git a/libjava/java/awt/image/DataBufferDouble.h b/libjava/java/awt/image/DataBufferDouble.h
deleted file mode 100644
index 056c5e4bbf0..00000000000
--- a/libjava/java/awt/image/DataBufferDouble.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferDouble__
-#define __java_awt_image_DataBufferDouble__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferDouble;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferDouble : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferDouble(jint);
-  DataBufferDouble(jint, jint);
-  DataBufferDouble(JArray< jdouble > *, jint);
-  DataBufferDouble(JArray< jdouble > *, jint, jint);
-  DataBufferDouble(JArray< JArray< jdouble > * > *, jint);
-  DataBufferDouble(JArray< JArray< jdouble > * > *, jint, JArray< jint > *);
-  JArray< jdouble > * getData();
-  JArray< jdouble > * getData(jint);
-  JArray< JArray< jdouble > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-  jfloat getElemFloat(jint);
-  jfloat getElemFloat(jint, jint);
-  void setElemFloat(jint, jfloat);
-  void setElemFloat(jint, jint, jfloat);
-  jdouble getElemDouble(jint);
-  jdouble getElemDouble(jint, jint);
-  void setElemDouble(jint, jdouble);
-  void setElemDouble(jint, jint, jdouble);
-private:
-  JArray< jdouble > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jdouble > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferDouble__
diff --git a/libjava/java/awt/image/DataBufferFloat.h b/libjava/java/awt/image/DataBufferFloat.h
deleted file mode 100644
index 621e3593f94..00000000000
--- a/libjava/java/awt/image/DataBufferFloat.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferFloat__
-#define __java_awt_image_DataBufferFloat__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferFloat;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferFloat : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferFloat(jint);
-  DataBufferFloat(jint, jint);
-  DataBufferFloat(JArray< jfloat > *, jint);
-  DataBufferFloat(JArray< jfloat > *, jint, jint);
-  DataBufferFloat(JArray< JArray< jfloat > * > *, jint);
-  DataBufferFloat(JArray< JArray< jfloat > * > *, jint, JArray< jint > *);
-  JArray< jfloat > * getData();
-  JArray< jfloat > * getData(jint);
-  JArray< JArray< jfloat > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-  jfloat getElemFloat(jint);
-  jfloat getElemFloat(jint, jint);
-  void setElemFloat(jint, jfloat);
-  void setElemFloat(jint, jint, jfloat);
-  jdouble getElemDouble(jint);
-  jdouble getElemDouble(jint, jint);
-  void setElemDouble(jint, jdouble);
-  void setElemDouble(jint, jint, jdouble);
-private:
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jfloat > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferFloat__
diff --git a/libjava/java/awt/image/DataBufferInt.h b/libjava/java/awt/image/DataBufferInt.h
deleted file mode 100644
index 0526f607fa4..00000000000
--- a/libjava/java/awt/image/DataBufferInt.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferInt__
-#define __java_awt_image_DataBufferInt__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferInt;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferInt : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferInt(jint);
-  DataBufferInt(jint, jint);
-  DataBufferInt(JArray< jint > *, jint);
-  DataBufferInt(JArray< jint > *, jint, jint);
-  DataBufferInt(JArray< JArray< jint > * > *, jint);
-  DataBufferInt(JArray< JArray< jint > * > *, jint, JArray< jint > *);
-  JArray< jint > * getData();
-  JArray< jint > * getData(jint);
-  JArray< JArray< jint > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jint > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferInt__
diff --git a/libjava/java/awt/image/DataBufferShort.h b/libjava/java/awt/image/DataBufferShort.h
deleted file mode 100644
index c66067109a1..00000000000
--- a/libjava/java/awt/image/DataBufferShort.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferShort__
-#define __java_awt_image_DataBufferShort__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferShort;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferShort : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferShort(jint);
-  DataBufferShort(jint, jint);
-  DataBufferShort(JArray< jshort > *, jint);
-  DataBufferShort(JArray< jshort > *, jint, jint);
-  DataBufferShort(JArray< JArray< jshort > * > *, jint);
-  DataBufferShort(JArray< JArray< jshort > * > *, jint, JArray< jint > *);
-  JArray< jshort > * getData();
-  JArray< jshort > * getData(jint);
-  JArray< JArray< jshort > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jshort > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferShort__
diff --git a/libjava/java/awt/image/DataBufferUShort.h b/libjava/java/awt/image/DataBufferUShort.h
deleted file mode 100644
index e67d26b1bf3..00000000000
--- a/libjava/java/awt/image/DataBufferUShort.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DataBufferUShort__
-#define __java_awt_image_DataBufferUShort__
-
-#pragma interface
-
-#include <java/awt/image/DataBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBufferUShort;
-      }
-    }
-  }
-}
-
-class java::awt::image::DataBufferUShort : public ::java::awt::image::DataBuffer
-{
-
-public:
-  DataBufferUShort(jint);
-  DataBufferUShort(jint, jint);
-  DataBufferUShort(JArray< jshort > *, jint);
-  DataBufferUShort(JArray< jshort > *, jint, jint);
-  DataBufferUShort(JArray< JArray< jshort > * > *, jint);
-  DataBufferUShort(JArray< JArray< jshort > * > *, jint, JArray< jint > *);
-  JArray< jshort > * getData();
-  JArray< jshort > * getData(jint);
-  JArray< JArray< jshort > * > * getBankData();
-  jint getElem(jint);
-  jint getElem(jint, jint);
-  void setElem(jint, jint);
-  void setElem(jint, jint, jint);
-private:
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::awt::image::DataBuffer)))) data;
-  JArray< JArray< jshort > * > * bankData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DataBufferUShort__
diff --git a/libjava/java/awt/image/DirectColorModel.h b/libjava/java/awt/image/DirectColorModel.h
deleted file mode 100644
index 476ab073d62..00000000000
--- a/libjava/java/awt/image/DirectColorModel.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_DirectColorModel__
-#define __java_awt_image_DirectColorModel__
-
-#pragma interface
-
-#include <java/awt/image/PackedColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class DirectColorModel;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::DirectColorModel : public ::java::awt::image::PackedColorModel
-{
-
-public:
-  DirectColorModel(jint, jint, jint, jint);
-  DirectColorModel(jint, jint, jint, jint, jint);
-  DirectColorModel(::java::awt::color::ColorSpace *, jint, jint, jint, jint, jint, jboolean, jint);
-  virtual jint getRedMask();
-  virtual jint getGreenMask();
-  virtual jint getBlueMask();
-  virtual jint getAlphaMask();
-  virtual jint getRed(jint);
-  virtual jint getGreen(jint);
-  virtual jint getBlue(jint);
-  virtual jint getAlpha(jint);
-private:
-  jint extractAndNormalizeSample(jint, jint);
-  jint extractAndScaleSample(jint, jint);
-public:
-  virtual jint getRGB(jint);
-  virtual jint getRed(::java::lang::Object *);
-  virtual jint getGreen(::java::lang::Object *);
-  virtual jint getBlue(::java::lang::Object *);
-  virtual jint getAlpha(::java::lang::Object *);
-  virtual jint getRGB(::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, ::java::lang::Object *);
-private:
-  jint valueToField(jint, jint, jint);
-  jint value16ToField(jint, jint);
-public:
-  virtual JArray< jint > * getComponents(jint, JArray< jint > *, jint);
-  virtual JArray< jint > * getComponents(::java::lang::Object *, JArray< jint > *, jint);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual jint getDataElement(JArray< jint > *, jint);
-  virtual ::java::lang::Object * getDataElements(JArray< jint > *, jint, ::java::lang::Object *);
-  virtual ::java::awt::image::ColorModel * coerceData(::java::awt::image::WritableRaster *, jboolean);
-  virtual jboolean isCompatibleRaster(::java::awt::image::Raster *);
-public: // actually package-private
-  virtual ::java::lang::String * stringParam();
-public:
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_DirectColorModel__
diff --git a/libjava/java/awt/image/FilteredImageSource.h b/libjava/java/awt/image/FilteredImageSource.h
deleted file mode 100644
index 93174c44f3c..00000000000
--- a/libjava/java/awt/image/FilteredImageSource.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_FilteredImageSource__
-#define __java_awt_image_FilteredImageSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class FilteredImageSource;
-          class ImageConsumer;
-          class ImageFilter;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::image::FilteredImageSource : public ::java::lang::Object
-{
-
-public:
-  FilteredImageSource(::java::awt::image::ImageProducer *, ::java::awt::image::ImageFilter *);
-  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 *);
-public: // actually package-private
-  ::java::awt::image::ImageProducer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ip;
-  ::java::awt::image::ImageFilter * filter;
-  ::java::util::Hashtable * consumers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_FilteredImageSource__
diff --git a/libjava/java/awt/image/ImageConsumer.h b/libjava/java/awt/image/ImageConsumer.h
deleted file mode 100644
index ffca9fc3cad..00000000000
--- a/libjava/java/awt/image/ImageConsumer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageConsumer__
-#define __java_awt_image_ImageConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageConsumer;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageConsumer : public ::java::lang::Object
-{
-
-public:
-  virtual void setDimensions(jint, jint) = 0;
-  virtual void setProperties(::java::util::Hashtable *) = 0;
-  virtual void setColorModel(::java::awt::image::ColorModel *) = 0;
-  virtual void setHints(jint) = 0;
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint) = 0;
-  virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint) = 0;
-  virtual void imageComplete(jint) = 0;
-  static const jint RANDOMPIXELORDER = 1;
-  static const jint TOPDOWNLEFTRIGHT = 2;
-  static const jint COMPLETESCANLINES = 4;
-  static const jint SINGLEPASS = 8;
-  static const jint SINGLEFRAME = 16;
-  static const jint IMAGEERROR = 1;
-  static const jint SINGLEFRAMEDONE = 2;
-  static const jint STATICIMAGEDONE = 3;
-  static const jint IMAGEABORTED = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_ImageConsumer__
diff --git a/libjava/java/awt/image/ImageFilter.h b/libjava/java/awt/image/ImageFilter.h
deleted file mode 100644
index 84b6f53b0e3..00000000000
--- a/libjava/java/awt/image/ImageFilter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageFilter__
-#define __java_awt_image_ImageFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageConsumer;
-          class ImageFilter;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageFilter : public ::java::lang::Object
-{
-
-public:
-  ImageFilter();
-  virtual void resendTopDownLeftRight(::java::awt::image::ImageProducer *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::image::ImageFilter * getFilterInstance(::java::awt::image::ImageConsumer *);
-  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);
-public: // actually protected
-  ::java::awt::image::ImageConsumer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) consumer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ImageFilter__
diff --git a/libjava/java/awt/image/ImageObserver.h b/libjava/java/awt/image/ImageObserver.h
deleted file mode 100644
index 563666a1a9d..00000000000
--- a/libjava/java/awt/image/ImageObserver.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageObserver__
-#define __java_awt_image_ImageObserver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageObserver : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint) = 0;
-  static const jint WIDTH = 1;
-  static const jint HEIGHT = 2;
-  static const jint PROPERTIES = 4;
-  static const jint SOMEBITS = 8;
-  static const jint FRAMEBITS = 16;
-  static const jint ALLBITS = 32;
-  static const jint ERROR = 64;
-  static const jint ABORT = 128;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_ImageObserver__
diff --git a/libjava/java/awt/image/ImageProducer.h b/libjava/java/awt/image/ImageProducer.h
deleted file mode 100644
index 108f61f49f3..00000000000
--- a/libjava/java/awt/image/ImageProducer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImageProducer__
-#define __java_awt_image_ImageProducer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-          class ImageProducer;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImageProducer : public ::java::lang::Object
-{
-
-public:
-  virtual void addConsumer(::java::awt::image::ImageConsumer *) = 0;
-  virtual jboolean isConsumer(::java::awt::image::ImageConsumer *) = 0;
-  virtual void removeConsumer(::java::awt::image::ImageConsumer *) = 0;
-  virtual void startProduction(::java::awt::image::ImageConsumer *) = 0;
-  virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_ImageProducer__
diff --git a/libjava/java/awt/image/ImagingOpException.h b/libjava/java/awt/image/ImagingOpException.h
deleted file mode 100644
index 9ce51161f2e..00000000000
--- a/libjava/java/awt/image/ImagingOpException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ImagingOpException__
-#define __java_awt_image_ImagingOpException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImagingOpException;
-      }
-    }
-  }
-}
-
-class java::awt::image::ImagingOpException : public ::java::lang::RuntimeException
-{
-
-public:
-  ImagingOpException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8026288481846276658LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ImagingOpException__
diff --git a/libjava/java/awt/image/IndexColorModel.h b/libjava/java/awt/image/IndexColorModel.h
deleted file mode 100644
index cbb2fac300c..00000000000
--- a/libjava/java/awt/image/IndexColorModel.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_IndexColorModel__
-#define __java_awt_image_IndexColorModel__
-
-#pragma interface
-
-#include <java/awt/image/ColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class IndexColorModel;
-          class Raster;
-          class SampleModel;
-      }
-    }
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class java::awt::image::IndexColorModel : public ::java::awt::image::ColorModel
-{
-
-public:
-  IndexColorModel(jint, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-  IndexColorModel(jint, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, jint);
-  IndexColorModel(jint, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
-  IndexColorModel(jint, jint, JArray< jbyte > *, jint, jboolean);
-  IndexColorModel(jint, jint, JArray< jbyte > *, jint, jboolean, jint);
-  IndexColorModel(jint, jint, JArray< jint > *, jint, jboolean, jint, jint);
-  IndexColorModel(jint, jint, JArray< jint > *, jint, jint, ::java::math::BigInteger *);
-  virtual jint getMapSize();
-  virtual jint getTransparentPixel();
-  virtual void getReds(JArray< jbyte > *);
-  virtual void getGreens(JArray< jbyte > *);
-  virtual void getBlues(JArray< jbyte > *);
-  virtual void getAlphas(JArray< jbyte > *);
-  virtual jint getRed(jint);
-  virtual jint getGreen(jint);
-  virtual jint getBlue(jint);
-  virtual jint getAlpha(jint);
-  virtual jint getRGB(jint);
-  virtual void getRGBs(JArray< jint > *);
-  virtual jboolean isValid(jint);
-  virtual jboolean isValid();
-  virtual ::java::math::BigInteger * getValidPixels();
-  virtual ::java::awt::image::BufferedImage * convertToIntDiscrete(::java::awt::image::Raster *, jboolean);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-private:
-  void setTransparentPixel(jint);
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::ColorModel)))) map_size;
-  jboolean opaque;
-  jint trans;
-  JArray< jint > * rgb;
-  ::java::math::BigInteger * validBits;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_IndexColorModel__
diff --git a/libjava/java/awt/image/Kernel.h b/libjava/java/awt/image/Kernel.h
deleted file mode 100644
index f0bacc1233c..00000000000
--- a/libjava/java/awt/image/Kernel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_Kernel__
-#define __java_awt_image_Kernel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class Kernel;
-      }
-    }
-  }
-}
-
-class java::awt::image::Kernel : public ::java::lang::Object
-{
-
-public:
-  Kernel(jint, jint, JArray< jfloat > *);
-  virtual jint getXOrigin();
-  virtual jint getYOrigin();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual JArray< jfloat > * getKernelData(JArray< jfloat > *);
-  virtual ::java::lang::Object * clone();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) width;
-  jint height;
-  JArray< jfloat > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_Kernel__
diff --git a/libjava/java/awt/image/LookupOp.h b/libjava/java/awt/image/LookupOp.h
deleted file mode 100644
index 07546043f0e..00000000000
--- a/libjava/java/awt/image/LookupOp.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_LookupOp__
-#define __java_awt_image_LookupOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class LookupOp;
-          class LookupTable;
-          class Raster;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::LookupOp : public ::java::lang::Object
-{
-
-public:
-  LookupOp(::java::awt::image::LookupTable *, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-  virtual ::java::awt::image::LookupTable * getTable();
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  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 *);
-private:
-  ::java::awt::image::LookupTable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lut;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_LookupOp__
diff --git a/libjava/java/awt/image/LookupTable.h b/libjava/java/awt/image/LookupTable.h
deleted file mode 100644
index 2fcd6459230..00000000000
--- a/libjava/java/awt/image/LookupTable.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_LookupTable__
-#define __java_awt_image_LookupTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class LookupTable;
-      }
-    }
-  }
-}
-
-class java::awt::image::LookupTable : public ::java::lang::Object
-{
-
-public: // actually protected
-  LookupTable(jint, jint);
-public:
-  virtual jint getNumComponents();
-  virtual jint getOffset();
-  virtual JArray< jint > * lookupPixel(JArray< jint > *, JArray< jint > *) = 0;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) offset;
-  jint numComponents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_LookupTable__
diff --git a/libjava/java/awt/image/MemoryImageSource.h b/libjava/java/awt/image/MemoryImageSource.h
deleted file mode 100644
index e717ee87c12..00000000000
--- a/libjava/java/awt/image/MemoryImageSource.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_MemoryImageSource__
-#define __java_awt_image_MemoryImageSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ImageConsumer;
-          class MemoryImageSource;
-      }
-    }
-  }
-}
-
-class java::awt::image::MemoryImageSource : public ::java::lang::Object
-{
-
-public:
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, ::java::util::Hashtable *);
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
-  MemoryImageSource(jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, ::java::util::Hashtable *);
-  MemoryImageSource(jint, jint, JArray< jint > *, jint, jint, ::java::util::Hashtable *);
-  MemoryImageSource(jint, jint, JArray< jint > *, 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 setAnimated(jboolean);
-  virtual void setFullBufferUpdates(jboolean);
-  virtual void newPixels();
-private:
-  void sendPicture(::java::awt::image::ImageConsumer *);
-public:
-  virtual void newPixels(jint, jint, jint, jint);
-  virtual void newPixels(jint, jint, jint, jint, jboolean);
-  virtual void newPixels(JArray< jbyte > *, ::java::awt::image::ColorModel *, jint, jint);
-  virtual void newPixels(JArray< jint > *, ::java::awt::image::ColorModel *, jint, jint);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) animated;
-  jboolean fullbuffers;
-  JArray< jint > * pixeli;
-  jint width;
-  jint height;
-  jint offset;
-  jint scansize;
-  JArray< jbyte > * pixelb;
-  ::java::awt::image::ColorModel * cm;
-  ::java::util::Hashtable * props;
-  ::java::util::Vector * consumers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_MemoryImageSource__
diff --git a/libjava/java/awt/image/MultiPixelPackedSampleModel.h b/libjava/java/awt/image/MultiPixelPackedSampleModel.h
deleted file mode 100644
index 377ceaf1ee9..00000000000
--- a/libjava/java/awt/image/MultiPixelPackedSampleModel.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_MultiPixelPackedSampleModel__
-#define __java_awt_image_MultiPixelPackedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/SampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-          class MultiPixelPackedSampleModel;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::MultiPixelPackedSampleModel : public ::java::awt::image::SampleModel
-{
-
-public:
-  MultiPixelPackedSampleModel(jint, jint, jint, jint);
-  MultiPixelPackedSampleModel(jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::DataBuffer * createDataBuffer();
-  virtual jint getNumDataElements();
-  virtual JArray< jint > * getSampleSize();
-  virtual jint getSampleSize(jint);
-  virtual jint getOffset(jint, jint);
-  virtual jint getBitOffset(jint);
-  virtual jint getDataBitOffset();
-  virtual jint getScanlineStride();
-  virtual jint getPixelBitStride();
-  virtual jint getTransferType();
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::SampleModel)))) scanlineStride;
-  JArray< jint > * bitMasks;
-  JArray< jint > * bitOffsets;
-  JArray< jint > * sampleSize;
-  jint dataBitOffset;
-  jint elemBits;
-  jint numberOfBits;
-  jint numElems;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_MultiPixelPackedSampleModel__
diff --git a/libjava/java/awt/image/PackedColorModel.h b/libjava/java/awt/image/PackedColorModel.h
deleted file mode 100644
index 2d98aa9e877..00000000000
--- a/libjava/java/awt/image/PackedColorModel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PackedColorModel__
-#define __java_awt_image_PackedColorModel__
-
-#pragma interface
-
-#include <java/awt/image/ColorModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class PackedColorModel;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::PackedColorModel : public ::java::awt::image::ColorModel
-{
-
-public:
-  PackedColorModel(::java::awt::color::ColorSpace *, jint, JArray< jint > *, jint, jboolean, jint, jint);
-private:
-  static JArray< jint > * calcBitsPerComponent(JArray< jint > *, jint);
-  void initMasks(JArray< jint > *, jint);
-public:
-  PackedColorModel(::java::awt::color::ColorSpace *, jint, jint, jint, jint, jint, jboolean, jint, jint);
-private:
-  static JArray< jint > * makeColorMaskArray(jint, jint, jint);
-public:
-  virtual jint getMask(jint);
-  virtual JArray< jint > * getMasks();
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
-  virtual ::java::awt::image::WritableRaster * getAlphaRaster(::java::awt::image::WritableRaster *);
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::awt::image::ColorModel)))) masks;
-public: // actually package-private
-  JArray< jint > * shifts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PackedColorModel__
diff --git a/libjava/java/awt/image/PixelGrabber$1.h b/libjava/java/awt/image/PixelGrabber$1.h
deleted file mode 100644
index cf22efa1b08..00000000000
--- a/libjava/java/awt/image/PixelGrabber$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PixelGrabber$1__
-#define __java_awt_image_PixelGrabber$1__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class PixelGrabber;
-          class PixelGrabber$1;
-      }
-    }
-  }
-}
-
-class java::awt::image::PixelGrabber$1 : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  PixelGrabber$1(::java::awt::image::PixelGrabber *);
-public:
-  void run();
-public: // actually package-private
-  ::java::awt::image::PixelGrabber * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PixelGrabber$1__
diff --git a/libjava/java/awt/image/PixelGrabber.h b/libjava/java/awt/image/PixelGrabber.h
deleted file mode 100644
index f530f343127..00000000000
--- a/libjava/java/awt/image/PixelGrabber.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PixelGrabber__
-#define __java_awt_image_PixelGrabber__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-      namespace image
-      {
-          class ColorModel;
-          class ImageProducer;
-          class PixelGrabber;
-      }
-    }
-  }
-}
-
-class java::awt::image::PixelGrabber : public ::java::lang::Object
-{
-
-public:
-  PixelGrabber(::java::awt::Image *, jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  PixelGrabber(::java::awt::image::ImageProducer *, jint, jint, jint, jint, JArray< jint > *, jint, jint);
-  PixelGrabber(::java::awt::Image *, jint, jint, jint, jint, jboolean);
-  virtual void startGrabbing();
-  virtual void abortGrabbing();
-  virtual jboolean grabPixels();
-  virtual jboolean grabPixels(jlong);
-private:
-  jboolean setObserverStatus();
-public:
-  virtual jint getStatus();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual ::java::lang::Object * getPixels();
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  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 jint status();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-  jint offset;
-  jint width;
-  jint height;
-  jint scansize;
-  jboolean forceRGB;
-  ::java::awt::image::ColorModel * model;
-  jint hints;
-  ::java::util::Hashtable * props;
-  JArray< jint > * int_pixel_buffer;
-  jboolean ints_delivered;
-  JArray< jbyte > * byte_pixel_buffer;
-  jboolean bytes_delivered;
-  ::java::awt::image::ImageProducer * ip;
-  jint observerStatus;
-  jint consumerStatus;
-private:
-  ::java::lang::Thread * grabberThread;
-public: // actually package-private
-  jboolean grabbing;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PixelGrabber__
diff --git a/libjava/java/awt/image/PixelInterleavedSampleModel.h b/libjava/java/awt/image/PixelInterleavedSampleModel.h
deleted file mode 100644
index 42ba5821751..00000000000
--- a/libjava/java/awt/image/PixelInterleavedSampleModel.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_PixelInterleavedSampleModel__
-#define __java_awt_image_PixelInterleavedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/ComponentSampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class PixelInterleavedSampleModel;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::PixelInterleavedSampleModel : public ::java::awt::image::ComponentSampleModel
-{
-
-public:
-  PixelInterleavedSampleModel(jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_PixelInterleavedSampleModel__
diff --git a/libjava/java/awt/image/RGBImageFilter.h b/libjava/java/awt/image/RGBImageFilter.h
deleted file mode 100644
index 34aea655ff6..00000000000
--- a/libjava/java/awt/image/RGBImageFilter.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RGBImageFilter__
-#define __java_awt_image_RGBImageFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class IndexColorModel;
-          class RGBImageFilter;
-      }
-    }
-  }
-}
-
-class java::awt::image::RGBImageFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  RGBImageFilter();
-  virtual void setColorModel(::java::awt::image::ColorModel *);
-  virtual void substituteColorModel(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::IndexColorModel * filterIndexColorModel(::java::awt::image::IndexColorModel *);
-  virtual void filterRGBPixels(jint, jint, jint, jint, JArray< jint > *, jint, 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 jint filterRGB(jint, jint, jint) = 0;
-public: // actually protected
-  ::java::awt::image::ColorModel * __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) origmodel;
-  ::java::awt::image::ColorModel * newmodel;
-  jboolean canFilterIndexColorModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_RGBImageFilter__
diff --git a/libjava/java/awt/image/Raster.h b/libjava/java/awt/image/Raster.h
deleted file mode 100644
index 2c187d5af3f..00000000000
--- a/libjava/java/awt/image/Raster.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_Raster__
-#define __java_awt_image_Raster__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class DataBuffer;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::Raster : public ::java::lang::Object
-{
-
-public: // actually protected
-  Raster(::java::awt::image::SampleModel *, ::java::awt::Point *);
-  Raster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  Raster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Rectangle *, ::java::awt::Point *, ::java::awt::image::Raster *);
-public:
-  static ::java::awt::image::WritableRaster * createInterleavedRaster(jint, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createInterleavedRaster(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createBandedRaster(jint, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createBandedRaster(jint, jint, jint, jint, JArray< jint > *, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(jint, jint, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createInterleavedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createBandedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, JArray< jint > *, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, JArray< jint > *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createPackedRaster(::java::awt::image::DataBuffer *, jint, jint, jint, ::java::awt::Point *);
-  static ::java::awt::image::Raster * createRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createWritableRaster(::java::awt::image::SampleModel *, ::java::awt::Point *);
-  static ::java::awt::image::WritableRaster * createWritableRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  virtual ::java::awt::image::Raster * getParent();
-  virtual jint getSampleModelTranslateX();
-  virtual jint getSampleModelTranslateY();
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster();
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(::java::awt::Rectangle *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint, jint, jint);
-  virtual ::java::awt::image::Raster * createTranslatedChild(jint, jint);
-  virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual jint getMinX();
-  virtual jint getMinY();
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getNumBands();
-  virtual jint getNumDataElements();
-  virtual jint getTransferType();
-  virtual ::java::awt::image::DataBuffer * getDataBuffer();
-  virtual ::java::awt::image::SampleModel * getSampleModel();
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *);
-  virtual JArray< jfloat > * getPixel(jint, jint, JArray< jfloat > *);
-  virtual JArray< jdouble > * getPixel(jint, jint, JArray< jdouble > *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *);
-  virtual JArray< jfloat > * getPixels(jint, jint, jint, jint, JArray< jfloat > *);
-  virtual JArray< jdouble > * getPixels(jint, jint, jint, jint, JArray< jdouble > *);
-  virtual jint getSample(jint, jint, jint);
-  virtual jfloat getSampleFloat(jint, jint, jint);
-  virtual jdouble getSampleDouble(jint, jint, jint);
-  virtual JArray< jint > * getSamples(jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual JArray< jfloat > * getSamples(jint, jint, jint, jint, jint, JArray< jfloat > *);
-  virtual JArray< jdouble > * getSamples(jint, jint, jint, jint, jint, JArray< jdouble > *);
-  virtual ::java::lang::String * toString();
-private:
-  static jint getTypeBits(jint);
-public: // actually protected
-  ::java::awt::image::SampleModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sampleModel;
-  ::java::awt::image::DataBuffer * dataBuffer;
-  jint minX;
-  jint minY;
-  jint width;
-  jint height;
-  jint sampleModelTranslateX;
-  jint sampleModelTranslateY;
-  jint numBands;
-  jint numDataElements;
-  ::java::awt::image::Raster * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_Raster__
diff --git a/libjava/java/awt/image/RasterFormatException.h b/libjava/java/awt/image/RasterFormatException.h
deleted file mode 100644
index acfe3941ca8..00000000000
--- a/libjava/java/awt/image/RasterFormatException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RasterFormatException__
-#define __java_awt_image_RasterFormatException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class RasterFormatException;
-      }
-    }
-  }
-}
-
-class java::awt::image::RasterFormatException : public ::java::lang::RuntimeException
-{
-
-public:
-  RasterFormatException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 96598996116164315LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_RasterFormatException__
diff --git a/libjava/java/awt/image/RasterOp.h b/libjava/java/awt/image/RasterOp.h
deleted file mode 100644
index a54b9b022f4..00000000000
--- a/libjava/java/awt/image/RasterOp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RasterOp__
-#define __java_awt_image_RasterOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class Raster;
-          class RasterOp;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::RasterOp : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *) = 0;
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *) = 0;
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *) = 0;
-  virtual ::java::awt::RenderingHints * getRenderingHints() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_RasterOp__
diff --git a/libjava/java/awt/image/RenderedImage.h b/libjava/java/awt/image/RenderedImage.h
deleted file mode 100644
index f47ca93cc0a..00000000000
--- a/libjava/java/awt/image/RenderedImage.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RenderedImage__
-#define __java_awt_image_RenderedImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class RenderedImage;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::RenderedImage : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Vector * getSources() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::image::SampleModel * getSampleModel() = 0;
-  virtual jint getWidth() = 0;
-  virtual jint getHeight() = 0;
-  virtual jint getMinX() = 0;
-  virtual jint getMinY() = 0;
-  virtual jint getNumXTiles() = 0;
-  virtual jint getNumYTiles() = 0;
-  virtual jint getMinTileX() = 0;
-  virtual jint getMinTileY() = 0;
-  virtual jint getTileWidth() = 0;
-  virtual jint getTileHeight() = 0;
-  virtual jint getTileGridXOffset() = 0;
-  virtual jint getTileGridYOffset() = 0;
-  virtual ::java::awt::image::Raster * getTile(jint, jint) = 0;
-  virtual ::java::awt::image::Raster * getData() = 0;
-  virtual ::java::awt::image::Raster * getData(::java::awt::Rectangle *) = 0;
-  virtual ::java::awt::image::WritableRaster * copyData(::java::awt::image::WritableRaster *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_RenderedImage__
diff --git a/libjava/java/awt/image/ReplicateScaleFilter.h b/libjava/java/awt/image/ReplicateScaleFilter.h
deleted file mode 100644
index d518d793f7d..00000000000
--- a/libjava/java/awt/image/ReplicateScaleFilter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ReplicateScaleFilter__
-#define __java_awt_image_ReplicateScaleFilter__
-
-#pragma interface
-
-#include <java/awt/image/ImageFilter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ColorModel;
-          class ReplicateScaleFilter;
-      }
-    }
-  }
-}
-
-class java::awt::image::ReplicateScaleFilter : public ::java::awt::image::ImageFilter
-{
-
-public:
-  ReplicateScaleFilter(jint, jint);
-  virtual void setDimensions(jint, jint);
-  virtual void setProperties(::java::util::Hashtable *);
-  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:
-  void setupSources();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::ImageFilter)))) destHeight;
-  jint destWidth;
-  jint srcHeight;
-  jint srcWidth;
-  JArray< jint > * srcrows;
-  JArray< jint > * srccols;
-  ::java::lang::Object * outpixbuf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ReplicateScaleFilter__
diff --git a/libjava/java/awt/image/RescaleOp.h b/libjava/java/awt/image/RescaleOp.h
deleted file mode 100644
index ba67ec9fc89..00000000000
--- a/libjava/java/awt/image/RescaleOp.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_RescaleOp__
-#define __java_awt_image_RescaleOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Point2D;
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class Raster;
-          class RescaleOp;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::RescaleOp : public ::java::lang::Object
-{
-
-public:
-  RescaleOp(JArray< jfloat > *, JArray< jfloat > *, ::java::awt::RenderingHints *);
-  RescaleOp(jfloat, jfloat, ::java::awt::RenderingHints *);
-  virtual JArray< jfloat > * getScaleFactors(JArray< jfloat > *);
-  virtual JArray< jfloat > * getOffsets(JArray< jfloat > *);
-  virtual jint getNumFactors();
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual ::java::awt::image::BufferedImage * filter(::java::awt::image::BufferedImage *, ::java::awt::image::BufferedImage *);
-  virtual ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *);
-private:
-  ::java::awt::image::WritableRaster * filter(::java::awt::image::Raster *, ::java::awt::image::WritableRaster *, JArray< jboolean > *);
-public:
-  virtual ::java::awt::image::BufferedImage * createCompatibleDestImage(::java::awt::image::BufferedImage *, ::java::awt::image::ColorModel *);
-  virtual ::java::awt::image::WritableRaster * createCompatibleDestRaster(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::BufferedImage *);
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::Raster *);
-  virtual ::java::awt::geom::Point2D * getPoint2D(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
-private:
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) scale;
-  JArray< jfloat > * offsets;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_RescaleOp__
diff --git a/libjava/java/awt/image/SampleModel.h b/libjava/java/awt/image/SampleModel.h
deleted file mode 100644
index 5d51a65d927..00000000000
--- a/libjava/java/awt/image/SampleModel.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_SampleModel__
-#define __java_awt_image_SampleModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-          class SampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::SampleModel : public ::java::lang::Object
-{
-
-public:
-  SampleModel(jint, jint, jint, jint);
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual jint getNumBands();
-  virtual jint getNumDataElements() = 0;
-  virtual jint getDataType();
-  virtual jint getTransferType();
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *) = 0;
-  virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *) = 0;
-  virtual void setDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jfloat > * getPixel(jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jdouble > * getPixel(jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jfloat > * getPixels(jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jdouble > * getPixels(jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *) = 0;
-  virtual jfloat getSampleFloat(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jdouble getSampleDouble(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jfloat > * getSamples(jint, jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jdouble > * getSamples(jint, jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *) = 0;
-  virtual void setSample(jint, jint, jint, jfloat, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jdouble, ::java::awt::image::DataBuffer *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jfloat > *, ::java::awt::image::DataBuffer *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jdouble > *, ::java::awt::image::DataBuffer *);
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint) = 0;
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *) = 0;
-  virtual ::java::awt::image::DataBuffer * createDataBuffer() = 0;
-  virtual JArray< jint > * getSampleSize() = 0;
-  virtual jint getSampleSize(jint) = 0;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) width;
-  jint height;
-  jint numBands;
-  jint dataType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_SampleModel__
diff --git a/libjava/java/awt/image/ShortLookupTable.h b/libjava/java/awt/image/ShortLookupTable.h
deleted file mode 100644
index 053331b0629..00000000000
--- a/libjava/java/awt/image/ShortLookupTable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_ShortLookupTable__
-#define __java_awt_image_ShortLookupTable__
-
-#pragma interface
-
-#include <java/awt/image/LookupTable.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ShortLookupTable;
-      }
-    }
-  }
-}
-
-class java::awt::image::ShortLookupTable : public ::java::awt::image::LookupTable
-{
-
-public:
-  ShortLookupTable(jint, JArray< JArray< jshort > * > *);
-  ShortLookupTable(jint, JArray< jshort > *);
-  virtual JArray< JArray< jshort > * > * getTable();
-  virtual JArray< jint > * lookupPixel(JArray< jint > *, JArray< jint > *);
-  virtual JArray< jshort > * lookupPixel(JArray< jshort > *, JArray< jshort > *);
-private:
-  JArray< JArray< jshort > * > * __attribute__((aligned(__alignof__( ::java::awt::image::LookupTable)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_ShortLookupTable__
diff --git a/libjava/java/awt/image/SinglePixelPackedSampleModel.h b/libjava/java/awt/image/SinglePixelPackedSampleModel.h
deleted file mode 100644
index 69950326992..00000000000
--- a/libjava/java/awt/image/SinglePixelPackedSampleModel.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_SinglePixelPackedSampleModel__
-#define __java_awt_image_SinglePixelPackedSampleModel__
-
-#pragma interface
-
-#include <java/awt/image/SampleModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class DataBuffer;
-          class SampleModel;
-          class SinglePixelPackedSampleModel;
-      }
-    }
-  }
-}
-
-class java::awt::image::SinglePixelPackedSampleModel : public ::java::awt::image::SampleModel
-{
-
-public:
-  SinglePixelPackedSampleModel(jint, jint, jint, JArray< jint > *);
-  SinglePixelPackedSampleModel(jint, jint, jint, jint, JArray< jint > *);
-  virtual jint getNumDataElements();
-  virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
-  virtual ::java::awt::image::DataBuffer * createDataBuffer();
-  virtual JArray< jint > * getSampleSize();
-  virtual jint getSampleSize(jint);
-  virtual jint getOffset(jint, jint);
-  virtual JArray< jint > * getBitOffsets();
-  virtual JArray< jint > * getBitMasks();
-  virtual jint getScanlineStride();
-  virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
-  virtual void setSample(jint, jint, jint, jint, ::java::awt::image::DataBuffer *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::awt::image::SampleModel)))) scanlineStride;
-  JArray< jint > * bitMasks;
-  JArray< jint > * bitOffsets;
-  JArray< jint > * sampleSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_SinglePixelPackedSampleModel__
diff --git a/libjava/java/awt/image/TileObserver.h b/libjava/java/awt/image/TileObserver.h
deleted file mode 100644
index 9f7d0a1a4cf..00000000000
--- a/libjava/java/awt/image/TileObserver.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_TileObserver__
-#define __java_awt_image_TileObserver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class TileObserver;
-          class WritableRenderedImage;
-      }
-    }
-  }
-}
-
-class java::awt::image::TileObserver : public ::java::lang::Object
-{
-
-public:
-  virtual void tileUpdate(::java::awt::image::WritableRenderedImage *, jint, jint, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_TileObserver__
diff --git a/libjava/java/awt/image/VolatileImage.h b/libjava/java/awt/image/VolatileImage.h
deleted file mode 100644
index ed289286350..00000000000
--- a/libjava/java/awt/image/VolatileImage.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_VolatileImage__
-#define __java_awt_image_VolatileImage__
-
-#pragma interface
-
-#include <java/awt/Image.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Graphics2D;
-        class GraphicsConfiguration;
-        class ImageCapabilities;
-      namespace image
-      {
-          class BufferedImage;
-          class ImageProducer;
-          class VolatileImage;
-      }
-    }
-  }
-}
-
-class java::awt::image::VolatileImage : public ::java::awt::Image
-{
-
-public:
-  VolatileImage();
-  virtual ::java::awt::image::BufferedImage * getSnapshot() = 0;
-  virtual jint getWidth() = 0;
-  virtual jint getHeight() = 0;
-  virtual ::java::awt::image::ImageProducer * getSource();
-  virtual void flush();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual ::java::awt::Graphics2D * createGraphics() = 0;
-  virtual jint validate(::java::awt::GraphicsConfiguration *) = 0;
-  virtual jboolean contentsLost() = 0;
-  virtual ::java::awt::ImageCapabilities * getCapabilities() = 0;
-  virtual jint getTransparency();
-  static const jint IMAGE_OK = 0;
-  static const jint IMAGE_RESTORED = 1;
-  static const jint IMAGE_INCOMPATIBLE = 2;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::awt::Image)))) transparency;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_VolatileImage__
diff --git a/libjava/java/awt/image/WritableRaster.h b/libjava/java/awt/image/WritableRaster.h
deleted file mode 100644
index 5db229c332d..00000000000
--- a/libjava/java/awt/image/WritableRaster.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_WritableRaster__
-#define __java_awt_image_WritableRaster__
-
-#pragma interface
-
-#include <java/awt/image/Raster.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class DataBuffer;
-          class Raster;
-          class SampleModel;
-          class WritableRaster;
-      }
-    }
-  }
-}
-
-class java::awt::image::WritableRaster : public ::java::awt::image::Raster
-{
-
-public: // actually protected
-  WritableRaster(::java::awt::image::SampleModel *, ::java::awt::Point *);
-  WritableRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Point *);
-  WritableRaster(::java::awt::image::SampleModel *, ::java::awt::image::DataBuffer *, ::java::awt::Rectangle *, ::java::awt::Point *, ::java::awt::image::WritableRaster *);
-public:
-  virtual ::java::awt::image::WritableRaster * getWritableParent();
-  virtual ::java::awt::image::WritableRaster * createWritableTranslatedChild(jint, jint);
-  virtual ::java::awt::image::WritableRaster * createWritableChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void setDataElements(jint, jint, ::java::lang::Object *);
-  virtual void setDataElements(jint, jint, ::java::awt::image::Raster *);
-  virtual void setDataElements(jint, jint, jint, jint, ::java::lang::Object *);
-  virtual void setRect(::java::awt::image::Raster *);
-  virtual void setRect(jint, jint, ::java::awt::image::Raster *);
-  virtual void setPixel(jint, jint, JArray< jint > *);
-  virtual void setPixel(jint, jint, JArray< jfloat > *);
-  virtual void setPixel(jint, jint, JArray< jdouble > *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jint > *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jfloat > *);
-  virtual void setPixels(jint, jint, jint, jint, JArray< jdouble > *);
-  virtual void setSample(jint, jint, jint, jint);
-  virtual void setSample(jint, jint, jint, jfloat);
-  virtual void setSample(jint, jint, jint, jdouble);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jfloat > *);
-  virtual void setSamples(jint, jint, jint, jint, jint, JArray< jdouble > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_WritableRaster__
diff --git a/libjava/java/awt/image/WritableRenderedImage.h b/libjava/java/awt/image/WritableRenderedImage.h
deleted file mode 100644
index f9b24812351..00000000000
--- a/libjava/java/awt/image/WritableRenderedImage.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_WritableRenderedImage__
-#define __java_awt_image_WritableRenderedImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-      namespace image
-      {
-          class ColorModel;
-          class Raster;
-          class SampleModel;
-          class TileObserver;
-          class WritableRaster;
-          class WritableRenderedImage;
-      }
-    }
-  }
-}
-
-class java::awt::image::WritableRenderedImage : public ::java::lang::Object
-{
-
-public:
-  virtual void addTileObserver(::java::awt::image::TileObserver *) = 0;
-  virtual void removeTileObserver(::java::awt::image::TileObserver *) = 0;
-  virtual ::java::awt::image::WritableRaster * getWritableTile(jint, jint) = 0;
-  virtual void releaseWritableTile(jint, jint) = 0;
-  virtual jboolean isTileWritable(jint, jint) = 0;
-  virtual JArray< ::java::awt::Point * > * getWritableTileIndices() = 0;
-  virtual jboolean hasTileWriters() = 0;
-  virtual void setData(::java::awt::image::Raster *) = 0;
-  virtual ::java::util::Vector * getSources() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::image::SampleModel * getSampleModel() = 0;
-  virtual jint getWidth() = 0;
-  virtual jint getHeight() = 0;
-  virtual jint getMinX() = 0;
-  virtual jint getMinY() = 0;
-  virtual jint getNumXTiles() = 0;
-  virtual jint getNumYTiles() = 0;
-  virtual jint getMinTileX() = 0;
-  virtual jint getMinTileY() = 0;
-  virtual jint getTileWidth() = 0;
-  virtual jint getTileHeight() = 0;
-  virtual jint getTileGridXOffset() = 0;
-  virtual jint getTileGridYOffset() = 0;
-  virtual ::java::awt::image::Raster * getTile(jint, jint) = 0;
-  virtual ::java::awt::image::Raster * getData() = 0;
-  virtual ::java::awt::image::Raster * getData(::java::awt::Rectangle *) = 0;
-  virtual ::java::awt::image::WritableRaster * copyData(::java::awt::image::WritableRaster *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_WritableRenderedImage__
diff --git a/libjava/java/awt/image/renderable/ContextualRenderedImageFactory.h b/libjava/java/awt/image/renderable/ContextualRenderedImageFactory.h
deleted file mode 100644
index d7ac12972d1..00000000000
--- a/libjava/java/awt/image/renderable/ContextualRenderedImageFactory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_ContextualRenderedImageFactory__
-#define __java_awt_image_renderable_ContextualRenderedImageFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace geom
-      {
-          class Rectangle2D;
-      }
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ContextualRenderedImageFactory;
-            class ParameterBlock;
-            class RenderContext;
-            class RenderableImage;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::ContextualRenderedImageFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::renderable::RenderContext * mapRenderContext(jint, ::java::awt::image::renderable::RenderContext *, ::java::awt::image::renderable::ParameterBlock *, ::java::awt::image::renderable::RenderableImage *) = 0;
-  virtual ::java::awt::image::RenderedImage * create(::java::awt::image::renderable::RenderContext *, ::java::awt::image::renderable::ParameterBlock *) = 0;
-  virtual ::java::awt::geom::Rectangle2D * getBounds2D(::java::awt::image::renderable::ParameterBlock *) = 0;
-  virtual ::java::lang::Object * getProperty(::java::awt::image::renderable::ParameterBlock *, ::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual jboolean isDynamic() = 0;
-  virtual ::java::awt::image::RenderedImage * create(::java::awt::image::renderable::ParameterBlock *, ::java::awt::RenderingHints *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_renderable_ContextualRenderedImageFactory__
diff --git a/libjava/java/awt/image/renderable/ParameterBlock.h b/libjava/java/awt/image/renderable/ParameterBlock.h
deleted file mode 100644
index cafafbdbb43..00000000000
--- a/libjava/java/awt/image/renderable/ParameterBlock.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_ParameterBlock__
-#define __java_awt_image_renderable_ParameterBlock__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ParameterBlock;
-            class RenderableImage;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::ParameterBlock : public ::java::lang::Object
-{
-
-public:
-  ParameterBlock();
-  ParameterBlock(::java::util::Vector *);
-  ParameterBlock(::java::util::Vector *, ::java::util::Vector *);
-  virtual ::java::lang::Object * shallowClone();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::awt::image::renderable::ParameterBlock * addSource(::java::lang::Object *);
-  virtual ::java::lang::Object * getSource(jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * setSource(::java::lang::Object *, jint);
-  virtual ::java::awt::image::RenderedImage * getRenderedSource(jint);
-  virtual ::java::awt::image::renderable::RenderableImage * getRenderableSource(jint);
-  virtual jint getNumSources();
-  virtual ::java::util::Vector * getSources();
-  virtual void setSources(::java::util::Vector *);
-  virtual void removeSources();
-  virtual jint getNumParameters();
-  virtual ::java::util::Vector * getParameters();
-  virtual void setParameters(::java::util::Vector *);
-  virtual void removeParameters();
-  virtual ::java::awt::image::renderable::ParameterBlock * add(::java::lang::Object *);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jbyte);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jchar);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jshort);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jlong);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jfloat);
-  virtual ::java::awt::image::renderable::ParameterBlock * add(jdouble);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(::java::lang::Object *, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jbyte, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jchar, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jshort, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jint, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jlong, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jfloat, jint);
-  virtual ::java::awt::image::renderable::ParameterBlock * set(jdouble, jint);
-  virtual ::java::lang::Object * getObjectParameter(jint);
-  virtual jbyte getByteParameter(jint);
-  virtual jchar getCharParameter(jint);
-  virtual jshort getShortParameter(jint);
-  virtual jint getIntParameter(jint);
-  virtual jlong getLongParameter(jint);
-  virtual jfloat getFloatParameter(jint);
-  virtual jdouble getDoubleParameter(jint);
-  virtual JArray< ::java::lang::Class * > * getParamClasses();
-private:
-  static const jlong serialVersionUID = -7577115551785240750LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sources;
-  ::java::util::Vector * parameters;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_ParameterBlock__
diff --git a/libjava/java/awt/image/renderable/RenderContext.h b/libjava/java/awt/image/renderable/RenderContext.h
deleted file mode 100644
index 4923ebc2db2..00000000000
--- a/libjava/java/awt/image/renderable/RenderContext.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderContext__
-#define __java_awt_image_renderable_RenderContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-        class Shape;
-      namespace geom
-      {
-          class AffineTransform;
-      }
-      namespace image
-      {
-        namespace renderable
-        {
-            class RenderContext;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderContext : public ::java::lang::Object
-{
-
-public:
-  RenderContext(::java::awt::geom::AffineTransform *, ::java::awt::Shape *, ::java::awt::RenderingHints *);
-  RenderContext(::java::awt::geom::AffineTransform *);
-  RenderContext(::java::awt::geom::AffineTransform *, ::java::awt::RenderingHints *);
-  RenderContext(::java::awt::geom::AffineTransform *, ::java::awt::Shape *);
-  virtual ::java::awt::RenderingHints * getRenderingHints();
-  virtual void setRenderingHints(::java::awt::RenderingHints *);
-  virtual void setTransform(::java::awt::geom::AffineTransform *);
-  virtual void preConcatenateTransform(::java::awt::geom::AffineTransform *);
-  virtual void preConcetenateTransform(::java::awt::geom::AffineTransform *);
-  virtual void concatenateTransform(::java::awt::geom::AffineTransform *);
-  virtual void concetenateTransform(::java::awt::geom::AffineTransform *);
-  virtual ::java::awt::geom::AffineTransform * getTransform();
-  virtual void setAreaOfInterest(::java::awt::Shape *);
-  virtual ::java::awt::Shape * getAreaOfInterest();
-  virtual ::java::lang::Object * clone();
-private:
-  ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::lang::Object)))) xform;
-  ::java::awt::Shape * aoi;
-  ::java::awt::RenderingHints * hints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_RenderContext__
diff --git a/libjava/java/awt/image/renderable/RenderableImage.h b/libjava/java/awt/image/renderable/RenderableImage.h
deleted file mode 100644
index c7fed510a1d..00000000000
--- a/libjava/java/awt/image/renderable/RenderableImage.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderableImage__
-#define __java_awt_image_renderable_RenderableImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class RenderContext;
-            class RenderableImage;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderableImage : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Vector * getSources() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getPropertyNames() = 0;
-  virtual jboolean isDynamic() = 0;
-  virtual jfloat getWidth() = 0;
-  virtual jfloat getHeight() = 0;
-  virtual jfloat getMinX() = 0;
-  virtual jfloat getMinY() = 0;
-  virtual ::java::awt::image::RenderedImage * createScaledRendering(jint, jint, ::java::awt::RenderingHints *) = 0;
-  virtual ::java::awt::image::RenderedImage * createDefaultRendering() = 0;
-  virtual ::java::awt::image::RenderedImage * createRendering(::java::awt::image::renderable::RenderContext *) = 0;
-  static ::java::lang::String * HINTS_OBSERVED;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_renderable_RenderableImage__
diff --git a/libjava/java/awt/image/renderable/RenderableImageOp.h b/libjava/java/awt/image/renderable/RenderableImageOp.h
deleted file mode 100644
index edc766d4e74..00000000000
--- a/libjava/java/awt/image/renderable/RenderableImageOp.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderableImageOp__
-#define __java_awt_image_renderable_RenderableImageOp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ContextualRenderedImageFactory;
-            class ParameterBlock;
-            class RenderContext;
-            class RenderableImageOp;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderableImageOp : public ::java::lang::Object
-{
-
-public:
-  RenderableImageOp(::java::awt::image::renderable::ContextualRenderedImageFactory *, ::java::awt::image::renderable::ParameterBlock *);
-  virtual ::java::util::Vector * getSources();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getPropertyNames();
-  virtual jboolean isDynamic();
-  virtual jfloat getWidth();
-  virtual jfloat getHeight();
-  virtual jfloat getMinX();
-  virtual jfloat getMinY();
-  virtual ::java::awt::image::renderable::ParameterBlock * setParameterBlock(::java::awt::image::renderable::ParameterBlock *);
-  virtual ::java::awt::image::renderable::ParameterBlock * getParameterBlock();
-  virtual ::java::awt::image::RenderedImage * createScaledRendering(jint, jint, ::java::awt::RenderingHints *);
-  virtual ::java::awt::image::RenderedImage * createDefaultRendering();
-  virtual ::java::awt::image::RenderedImage * createRendering(::java::awt::image::renderable::RenderContext *);
-private:
-  ::java::awt::image::renderable::ContextualRenderedImageFactory * __attribute__((aligned(__alignof__( ::java::lang::Object)))) crif;
-  ::java::awt::image::renderable::ParameterBlock * block;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_RenderableImageOp__
diff --git a/libjava/java/awt/image/renderable/RenderableImageProducer.h b/libjava/java/awt/image/renderable/RenderableImageProducer.h
deleted file mode 100644
index 4e1968fb84a..00000000000
--- a/libjava/java/awt/image/renderable/RenderableImageProducer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderableImageProducer__
-#define __java_awt_image_renderable_RenderableImageProducer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class ImageConsumer;
-        namespace renderable
-        {
-            class RenderContext;
-            class RenderableImage;
-            class RenderableImageProducer;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderableImageProducer : public ::java::lang::Object
-{
-
-public:
-  RenderableImageProducer(::java::awt::image::renderable::RenderableImage *, ::java::awt::image::renderable::RenderContext *);
-  virtual void setRenderContext(::java::awt::image::renderable::RenderContext *);
-  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 run();
-private:
-  ::java::awt::image::renderable::RenderableImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::awt::image::renderable::RenderContext * context;
-  ::java::util::ArrayList * consumers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_image_renderable_RenderableImageProducer__
diff --git a/libjava/java/awt/image/renderable/RenderedImageFactory.h b/libjava/java/awt/image/renderable/RenderedImageFactory.h
deleted file mode 100644
index 3e2eb934999..00000000000
--- a/libjava/java/awt/image/renderable/RenderedImageFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_image_renderable_RenderedImageFactory__
-#define __java_awt_image_renderable_RenderedImageFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class RenderingHints;
-      namespace image
-      {
-          class RenderedImage;
-        namespace renderable
-        {
-            class ParameterBlock;
-            class RenderedImageFactory;
-        }
-      }
-    }
-  }
-}
-
-class java::awt::image::renderable::RenderedImageFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::image::RenderedImage * create(::java::awt::image::renderable::ParameterBlock *, ::java::awt::RenderingHints *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_image_renderable_RenderedImageFactory__
diff --git a/libjava/java/awt/peer/ButtonPeer.h b/libjava/java/awt/peer/ButtonPeer.h
deleted file mode 100644
index 1f5c203e055..00000000000
--- a/libjava/java/awt/peer/ButtonPeer.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ButtonPeer__
-#define __java_awt_peer_ButtonPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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 ButtonPeer;
-          class ContainerPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::ButtonPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setLabel(::java::lang::String *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ButtonPeer__
diff --git a/libjava/java/awt/peer/CanvasPeer.h b/libjava/java/awt/peer/CanvasPeer.h
deleted file mode 100644
index 503b48a561d..00000000000
--- a/libjava/java/awt/peer/CanvasPeer.h
+++ /dev/null
@@ -1,109 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_CanvasPeer__
-#define __java_awt_peer_CanvasPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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 CanvasPeer;
-          class ContainerPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::CanvasPeer : public ::java::lang::Object
-{
-
-public:
-  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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_CanvasPeer__
diff --git a/libjava/java/awt/peer/CheckboxMenuItemPeer.h b/libjava/java/awt/peer/CheckboxMenuItemPeer.h
deleted file mode 100644
index 84a5ba9ae89..00000000000
--- a/libjava/java/awt/peer/CheckboxMenuItemPeer.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_CheckboxMenuItemPeer__
-#define __java_awt_peer_CheckboxMenuItemPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace peer
-      {
-          class CheckboxMenuItemPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::CheckboxMenuItemPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setState(jboolean) = 0;
-  virtual void disable() = 0;
-  virtual void enable() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_CheckboxMenuItemPeer__
diff --git a/libjava/java/awt/peer/CheckboxPeer.h b/libjava/java/awt/peer/CheckboxPeer.h
deleted file mode 100644
index a397322e497..00000000000
--- a/libjava/java/awt/peer/CheckboxPeer.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_CheckboxPeer__
-#define __java_awt_peer_CheckboxPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class BufferCapabilities;
-        class BufferCapabilities$FlipContents;
-        class CheckboxGroup;
-        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 CheckboxPeer;
-          class ContainerPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::CheckboxPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setCheckboxGroup(::java::awt::CheckboxGroup *) = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual void setState(jboolean) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_CheckboxPeer__
diff --git a/libjava/java/awt/peer/ChoicePeer.h b/libjava/java/awt/peer/ChoicePeer.h
deleted file mode 100644
index 78dca416d05..00000000000
--- a/libjava/java/awt/peer/ChoicePeer.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ChoicePeer__
-#define __java_awt_peer_ChoicePeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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 ChoicePeer;
-          class ContainerPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::ChoicePeer : public ::java::lang::Object
-{
-
-public:
-  virtual void add(::java::lang::String *, jint) = 0;
-  virtual void addItem(::java::lang::String *, jint) = 0;
-  virtual void remove(jint) = 0;
-  virtual void removeAll() = 0;
-  virtual void select(jint) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ChoicePeer__
diff --git a/libjava/java/awt/peer/ComponentPeer.h b/libjava/java/awt/peer/ComponentPeer.h
deleted file mode 100644
index 3d3c22d9d2b..00000000000
--- a/libjava/java/awt/peer/ComponentPeer.h
+++ /dev/null
@@ -1,109 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ComponentPeer__
-#define __java_awt_peer_ComponentPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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 ComponentPeer;
-          class ContainerPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::ComponentPeer : public ::java::lang::Object
-{
-
-public:
-  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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ComponentPeer__
diff --git a/libjava/java/awt/peer/ContainerPeer.h b/libjava/java/awt/peer/ContainerPeer.h
deleted file mode 100644
index 6d6e9df4580..00000000000
--- a/libjava/java/awt/peer/ContainerPeer.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ContainerPeer__
-#define __java_awt_peer_ContainerPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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;
-      }
-    }
-  }
-}
-
-class java::awt::peer::ContainerPeer : public ::java::lang::Object
-{
-
-public:
-  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 jboolean isRestackSupported() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ContainerPeer__
diff --git a/libjava/java/awt/peer/DialogPeer.h b/libjava/java/awt/peer/DialogPeer.h
deleted file mode 100644
index 2212ec95bcb..00000000000
--- a/libjava/java/awt/peer/DialogPeer.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_DialogPeer__
-#define __java_awt_peer_DialogPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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;
-          class DialogPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::DialogPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setResizable(jboolean) = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 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 jboolean isRestackSupported() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_DialogPeer__
diff --git a/libjava/java/awt/peer/FileDialogPeer.h b/libjava/java/awt/peer/FileDialogPeer.h
deleted file mode 100644
index b2419e42f41..00000000000
--- a/libjava/java/awt/peer/FileDialogPeer.h
+++ /dev/null
@@ -1,129 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_FileDialogPeer__
-#define __java_awt_peer_FileDialogPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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;
-          class FileDialogPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::FileDialogPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setFile(::java::lang::String *) = 0;
-  virtual void setDirectory(::java::lang::String *) = 0;
-  virtual void setFilenameFilter(::java::io::FilenameFilter *) = 0;
-  virtual void setResizable(jboolean) = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 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 jboolean isRestackSupported() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_FileDialogPeer__
diff --git a/libjava/java/awt/peer/FontPeer.h b/libjava/java/awt/peer/FontPeer.h
deleted file mode 100644
index 00f6f8a4fdb..00000000000
--- a/libjava/java/awt/peer/FontPeer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_FontPeer__
-#define __java_awt_peer_FontPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace peer
-      {
-          class FontPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::FontPeer : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_FontPeer__
diff --git a/libjava/java/awt/peer/FramePeer.h b/libjava/java/awt/peer/FramePeer.h
deleted file mode 100644
index a80ca5540f1..00000000000
--- a/libjava/java/awt/peer/FramePeer.h
+++ /dev/null
@@ -1,133 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_FramePeer__
-#define __java_awt_peer_FramePeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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 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;
-          class FramePeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::FramePeer : public ::java::lang::Object
-{
-
-public:
-  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 void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_FramePeer__
diff --git a/libjava/java/awt/peer/LabelPeer.h b/libjava/java/awt/peer/LabelPeer.h
deleted file mode 100644
index 426772d0e09..00000000000
--- a/libjava/java/awt/peer/LabelPeer.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_LabelPeer__
-#define __java_awt_peer_LabelPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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;
-          class LabelPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::LabelPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setAlignment(jint) = 0;
-  virtual void setText(::java::lang::String *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_LabelPeer__
diff --git a/libjava/java/awt/peer/LightweightPeer.h b/libjava/java/awt/peer/LightweightPeer.h
deleted file mode 100644
index 9c743d97f3d..00000000000
--- a/libjava/java/awt/peer/LightweightPeer.h
+++ /dev/null
@@ -1,109 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_LightweightPeer__
-#define __java_awt_peer_LightweightPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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;
-          class LightweightPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::LightweightPeer : public ::java::lang::Object
-{
-
-public:
-  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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_LightweightPeer__
diff --git a/libjava/java/awt/peer/ListPeer.h b/libjava/java/awt/peer/ListPeer.h
deleted file mode 100644
index 3dd6bad7aa2..00000000000
--- a/libjava/java/awt/peer/ListPeer.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ListPeer__
-#define __java_awt_peer_ListPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-          class ListPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::ListPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void add(::java::lang::String *, jint) = 0;
-  virtual void addItem(::java::lang::String *, jint) = 0;
-  virtual void clear() = 0;
-  virtual void delItems(jint, jint) = 0;
-  virtual void deselect(jint) = 0;
-  virtual JArray< jint > * getSelectedIndexes() = 0;
-  virtual void makeVisible(jint) = 0;
-  virtual ::java::awt::Dimension * minimumSize(jint) = 0;
-  virtual ::java::awt::Dimension * preferredSize(jint) = 0;
-  virtual void removeAll() = 0;
-  virtual void select(jint) = 0;
-  virtual void setMultipleMode(jboolean) = 0;
-  virtual void setMultipleSelections(jboolean) = 0;
-  virtual ::java::awt::Dimension * getPreferredSize(jint) = 0;
-  virtual ::java::awt::Dimension * getMinimumSize(jint) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ListPeer__
diff --git a/libjava/java/awt/peer/MenuBarPeer.h b/libjava/java/awt/peer/MenuBarPeer.h
deleted file mode 100644
index e7d84c0519d..00000000000
--- a/libjava/java/awt/peer/MenuBarPeer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_MenuBarPeer__
-#define __java_awt_peer_MenuBarPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Menu;
-      namespace peer
-      {
-          class MenuBarPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::MenuBarPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void addMenu(::java::awt::Menu *) = 0;
-  virtual void addHelpMenu(::java::awt::Menu *) = 0;
-  virtual void delMenu(jint) = 0;
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_MenuBarPeer__
diff --git a/libjava/java/awt/peer/MenuComponentPeer.h b/libjava/java/awt/peer/MenuComponentPeer.h
deleted file mode 100644
index a0a1ea14c64..00000000000
--- a/libjava/java/awt/peer/MenuComponentPeer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_MenuComponentPeer__
-#define __java_awt_peer_MenuComponentPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace peer
-      {
-          class MenuComponentPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::MenuComponentPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_MenuComponentPeer__
diff --git a/libjava/java/awt/peer/MenuItemPeer.h b/libjava/java/awt/peer/MenuItemPeer.h
deleted file mode 100644
index 8c9a9eee892..00000000000
--- a/libjava/java/awt/peer/MenuItemPeer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_MenuItemPeer__
-#define __java_awt_peer_MenuItemPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-      namespace peer
-      {
-          class MenuItemPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::MenuItemPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void disable() = 0;
-  virtual void enable() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_MenuItemPeer__
diff --git a/libjava/java/awt/peer/MenuPeer.h b/libjava/java/awt/peer/MenuPeer.h
deleted file mode 100644
index 4c813b11824..00000000000
--- a/libjava/java/awt/peer/MenuPeer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_MenuPeer__
-#define __java_awt_peer_MenuPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class MenuItem;
-      namespace peer
-      {
-          class MenuPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::MenuPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void addItem(::java::awt::MenuItem *) = 0;
-  virtual void addSeparator() = 0;
-  virtual void delItem(jint) = 0;
-  virtual void disable() = 0;
-  virtual void enable() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_MenuPeer__
diff --git a/libjava/java/awt/peer/MouseInfoPeer.h b/libjava/java/awt/peer/MouseInfoPeer.h
deleted file mode 100644
index 18f0c59b8d1..00000000000
--- a/libjava/java/awt/peer/MouseInfoPeer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_MouseInfoPeer__
-#define __java_awt_peer_MouseInfoPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Window;
-      namespace peer
-      {
-          class MouseInfoPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::MouseInfoPeer : public ::java::lang::Object
-{
-
-public:
-  virtual jint fillPointWithCoords(::java::awt::Point *) = 0;
-  virtual jboolean isWindowUnderMouse(::java::awt::Window *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_MouseInfoPeer__
diff --git a/libjava/java/awt/peer/PanelPeer.h b/libjava/java/awt/peer/PanelPeer.h
deleted file mode 100644
index 57e4ff7687a..00000000000
--- a/libjava/java/awt/peer/PanelPeer.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_PanelPeer__
-#define __java_awt_peer_PanelPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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;
-          class PanelPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::PanelPeer : public ::java::lang::Object
-{
-
-public:
-  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 jboolean isRestackSupported() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_PanelPeer__
diff --git a/libjava/java/awt/peer/PopupMenuPeer.h b/libjava/java/awt/peer/PopupMenuPeer.h
deleted file mode 100644
index e8bdd57b52a..00000000000
--- a/libjava/java/awt/peer/PopupMenuPeer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_PopupMenuPeer__
-#define __java_awt_peer_PopupMenuPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Event;
-        class Font;
-        class MenuItem;
-      namespace peer
-      {
-          class PopupMenuPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::PopupMenuPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void show(::java::awt::Component *, jint, jint) = 0;
-  virtual void show(::java::awt::Event *) = 0;
-  virtual void addItem(::java::awt::MenuItem *) = 0;
-  virtual void addSeparator() = 0;
-  virtual void delItem(jint) = 0;
-  virtual void disable() = 0;
-  virtual void enable() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_PopupMenuPeer__
diff --git a/libjava/java/awt/peer/RobotPeer.h b/libjava/java/awt/peer/RobotPeer.h
deleted file mode 100644
index f0f810ae384..00000000000
--- a/libjava/java/awt/peer/RobotPeer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_RobotPeer__
-#define __java_awt_peer_RobotPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace peer
-      {
-          class RobotPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::RobotPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void mouseMove(jint, jint) = 0;
-  virtual void mousePress(jint) = 0;
-  virtual void mouseRelease(jint) = 0;
-  virtual void mouseWheel(jint) = 0;
-  virtual void keyPress(jint) = 0;
-  virtual void keyRelease(jint) = 0;
-  virtual jint getRGBPixel(jint, jint) = 0;
-  virtual JArray< jint > * getRGBPixels(::java::awt::Rectangle *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_RobotPeer__
diff --git a/libjava/java/awt/peer/ScrollPanePeer.h b/libjava/java/awt/peer/ScrollPanePeer.h
deleted file mode 100644
index f6387a50468..00000000000
--- a/libjava/java/awt/peer/ScrollPanePeer.h
+++ /dev/null
@@ -1,127 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ScrollPanePeer__
-#define __java_awt_peer_ScrollPanePeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Adjustable;
-        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;
-          class ScrollPanePeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::ScrollPanePeer : public ::java::lang::Object
-{
-
-public:
-  virtual jint getHScrollbarHeight() = 0;
-  virtual jint getVScrollbarWidth() = 0;
-  virtual void setScrollPosition(jint, jint) = 0;
-  virtual void childResized(jint, jint) = 0;
-  virtual void setUnitIncrement(::java::awt::Adjustable *, jint) = 0;
-  virtual void setValue(::java::awt::Adjustable *, jint) = 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 jboolean isRestackSupported() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ScrollPanePeer__
diff --git a/libjava/java/awt/peer/ScrollbarPeer.h b/libjava/java/awt/peer/ScrollbarPeer.h
deleted file mode 100644
index 9e0c7c76c1b..00000000000
--- a/libjava/java/awt/peer/ScrollbarPeer.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_ScrollbarPeer__
-#define __java_awt_peer_ScrollbarPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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;
-          class ScrollbarPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::ScrollbarPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void setLineIncrement(jint) = 0;
-  virtual void setPageIncrement(jint) = 0;
-  virtual void setValues(jint, jint, jint, jint) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_ScrollbarPeer__
diff --git a/libjava/java/awt/peer/TextAreaPeer.h b/libjava/java/awt/peer/TextAreaPeer.h
deleted file mode 100644
index 1954909b9bc..00000000000
--- a/libjava/java/awt/peer/TextAreaPeer.h
+++ /dev/null
@@ -1,133 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_TextAreaPeer__
-#define __java_awt_peer_TextAreaPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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 im
-      {
-          class InputMethodRequests;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class TextAreaPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::TextAreaPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void insert(::java::lang::String *, jint) = 0;
-  virtual void insertText(::java::lang::String *, jint) = 0;
-  virtual ::java::awt::Dimension * minimumSize(jint, jint) = 0;
-  virtual ::java::awt::Dimension * getMinimumSize(jint, jint) = 0;
-  virtual ::java::awt::Dimension * preferredSize(jint, jint) = 0;
-  virtual ::java::awt::Dimension * getPreferredSize(jint, jint) = 0;
-  virtual void replaceRange(::java::lang::String *, jint, jint) = 0;
-  virtual void replaceText(::java::lang::String *, jint, jint) = 0;
-  virtual jint getSelectionEnd() = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual ::java::lang::String * getText() = 0;
-  virtual void setText(::java::lang::String *) = 0;
-  virtual void select(jint, jint) = 0;
-  virtual void setEditable(jboolean) = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual void setCaretPosition(jint) = 0;
-  virtual jint getIndexAtPoint(jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jlong filterEvents(jlong) = 0;
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_TextAreaPeer__
diff --git a/libjava/java/awt/peer/TextComponentPeer.h b/libjava/java/awt/peer/TextComponentPeer.h
deleted file mode 100644
index 37e0310bde1..00000000000
--- a/libjava/java/awt/peer/TextComponentPeer.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_TextComponentPeer__
-#define __java_awt_peer_TextComponentPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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 im
-      {
-          class InputMethodRequests;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class TextComponentPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::TextComponentPeer : public ::java::lang::Object
-{
-
-public:
-  virtual jint getSelectionEnd() = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual ::java::lang::String * getText() = 0;
-  virtual void setText(::java::lang::String *) = 0;
-  virtual void select(jint, jint) = 0;
-  virtual void setEditable(jboolean) = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual void setCaretPosition(jint) = 0;
-  virtual jint getIndexAtPoint(jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jlong filterEvents(jlong) = 0;
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_TextComponentPeer__
diff --git a/libjava/java/awt/peer/TextFieldPeer.h b/libjava/java/awt/peer/TextFieldPeer.h
deleted file mode 100644
index a3718929d64..00000000000
--- a/libjava/java/awt/peer/TextFieldPeer.h
+++ /dev/null
@@ -1,131 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_TextFieldPeer__
-#define __java_awt_peer_TextFieldPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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 im
-      {
-          class InputMethodRequests;
-      }
-      namespace image
-      {
-          class ColorModel;
-          class ImageObserver;
-          class ImageProducer;
-          class VolatileImage;
-      }
-      namespace peer
-      {
-          class ContainerPeer;
-          class TextFieldPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::TextFieldPeer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Dimension * minimumSize(jint) = 0;
-  virtual ::java::awt::Dimension * preferredSize(jint) = 0;
-  virtual ::java::awt::Dimension * getMinimumSize(jint) = 0;
-  virtual ::java::awt::Dimension * getPreferredSize(jint) = 0;
-  virtual void setEchoChar(jchar) = 0;
-  virtual void setEchoCharacter(jchar) = 0;
-  virtual jint getSelectionEnd() = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual ::java::lang::String * getText() = 0;
-  virtual void setText(::java::lang::String *) = 0;
-  virtual void select(jint, jint) = 0;
-  virtual void setEditable(jboolean) = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual void setCaretPosition(jint) = 0;
-  virtual jint getIndexAtPoint(jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jlong filterEvents(jlong) = 0;
-  virtual ::java::awt::im::InputMethodRequests * getInputMethodRequests() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_TextFieldPeer__
diff --git a/libjava/java/awt/peer/WindowPeer.h b/libjava/java/awt/peer/WindowPeer.h
deleted file mode 100644
index c900a1cecab..00000000000
--- a/libjava/java/awt/peer/WindowPeer.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_peer_WindowPeer__
-#define __java_awt_peer_WindowPeer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  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;
-          class WindowPeer;
-      }
-    }
-  }
-}
-
-class java::awt::peer::WindowPeer : public ::java::lang::Object
-{
-
-public:
-  virtual void toBack() = 0;
-  virtual void toFront() = 0;
-  virtual void updateAlwaysOnTop() = 0;
-  virtual jboolean requestWindowFocus() = 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 jboolean isRestackSupported() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_peer_WindowPeer__
diff --git a/libjava/java/awt/print/Book.h b/libjava/java/awt/print/Book.h
deleted file mode 100644
index cda28618c75..00000000000
--- a/libjava/java/awt/print/Book.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_Book__
-#define __java_awt_print_Book__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class Book;
-          class PageFormat;
-          class Printable;
-      }
-    }
-  }
-}
-
-class java::awt::print::Book : public ::java::lang::Object
-{
-
-public:
-  Book();
-  virtual jint getNumberOfPages();
-  virtual ::java::awt::print::PageFormat * getPageFormat(jint);
-  virtual ::java::awt::print::Printable * getPrintable(jint);
-  virtual void append(::java::awt::print::Printable *, ::java::awt::print::PageFormat *);
-  virtual void append(::java::awt::print::Printable *, ::java::awt::print::PageFormat *, jint);
-  virtual void setPage(jint, ::java::awt::print::Printable *, ::java::awt::print::PageFormat *);
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) printables;
-  ::java::util::Vector * page_formats;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_Book__
diff --git a/libjava/java/awt/print/NoPrinterJob.h b/libjava/java/awt/print/NoPrinterJob.h
deleted file mode 100644
index aac0af30b5a..00000000000
--- a/libjava/java/awt/print/NoPrinterJob.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_NoPrinterJob__
-#define __java_awt_print_NoPrinterJob__
-
-#pragma interface
-
-#include <java/awt/print/PrinterJob.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class NoPrinterJob;
-          class PageFormat;
-          class Pageable;
-          class Printable;
-      }
-    }
-  }
-}
-
-class java::awt::print::NoPrinterJob : public ::java::awt::print::PrinterJob
-{
-
-public: // actually package-private
-  NoPrinterJob();
-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 jboolean printDialog();
-  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 *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_NoPrinterJob__
diff --git a/libjava/java/awt/print/PageFormat.h b/libjava/java/awt/print/PageFormat.h
deleted file mode 100644
index 0f4af7b653b..00000000000
--- a/libjava/java/awt/print/PageFormat.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PageFormat__
-#define __java_awt_print_PageFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PageFormat;
-          class Paper;
-      }
-    }
-  }
-}
-
-class java::awt::print::PageFormat : public ::java::lang::Object
-{
-
-public:
-  PageFormat();
-  virtual jdouble getWidth();
-  virtual jdouble getHeight();
-  virtual jdouble getImageableX();
-  virtual jdouble getImageableY();
-  virtual jdouble getImageableWidth();
-  virtual jdouble getImageableHeight();
-  virtual ::java::awt::print::Paper * getPaper();
-  virtual void setPaper(::java::awt::print::Paper *);
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual JArray< jdouble > * getMatrix();
-  virtual ::java::lang::Object * clone();
-  static const jint LANDSCAPE = 0;
-  static const jint PORTRAIT = 1;
-  static const jint REVERSE_LANDSCAPE = 2;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) orientation;
-  ::java::awt::print::Paper * paper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_PageFormat__
diff --git a/libjava/java/awt/print/Pageable.h b/libjava/java/awt/print/Pageable.h
deleted file mode 100644
index b97d4e5222a..00000000000
--- a/libjava/java/awt/print/Pageable.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_Pageable__
-#define __java_awt_print_Pageable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PageFormat;
-          class Pageable;
-          class Printable;
-      }
-    }
-  }
-}
-
-class java::awt::print::Pageable : public ::java::lang::Object
-{
-
-public:
-  virtual jint getNumberOfPages() = 0;
-  virtual ::java::awt::print::PageFormat * getPageFormat(jint) = 0;
-  virtual ::java::awt::print::Printable * getPrintable(jint) = 0;
-  static const jint UNKNOWN_NUMBER_OF_PAGES = -1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_print_Pageable__
diff --git a/libjava/java/awt/print/Paper.h b/libjava/java/awt/print/Paper.h
deleted file mode 100644
index 3d7d3769ff6..00000000000
--- a/libjava/java/awt/print/Paper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_Paper__
-#define __java_awt_print_Paper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class Paper;
-      }
-    }
-  }
-}
-
-class java::awt::print::Paper : public ::java::lang::Object
-{
-
-public:
-  Paper();
-  virtual jdouble getHeight();
-  virtual jdouble getWidth();
-  virtual jdouble getImageableX();
-  virtual jdouble getImageableY();
-  virtual jdouble getImageableWidth();
-  virtual jdouble getImageableHeight();
-  virtual void setSize(jdouble, jdouble);
-  virtual void setImageableArea(jdouble, jdouble, jdouble, jdouble);
-  virtual ::java::lang::Object * clone();
-private:
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) height;
-  jdouble width;
-  jdouble imageableX;
-  jdouble imageableY;
-  jdouble imageableWidth;
-  jdouble imageableHeight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_Paper__
diff --git a/libjava/java/awt/print/Printable.h b/libjava/java/awt/print/Printable.h
deleted file mode 100644
index 4160afcfd01..00000000000
--- a/libjava/java/awt/print/Printable.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_Printable__
-#define __java_awt_print_Printable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-      namespace print
-      {
-          class PageFormat;
-          class Printable;
-      }
-    }
-  }
-}
-
-class java::awt::print::Printable : public ::java::lang::Object
-{
-
-public:
-  virtual jint print(::java::awt::Graphics *, ::java::awt::print::PageFormat *, jint) = 0;
-  static const jint PAGE_EXISTS = 0;
-  static const jint NO_SUCH_PAGE = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_print_Printable__
diff --git a/libjava/java/awt/print/PrinterAbortException.h b/libjava/java/awt/print/PrinterAbortException.h
deleted file mode 100644
index f8475d995cb..00000000000
--- a/libjava/java/awt/print/PrinterAbortException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PrinterAbortException__
-#define __java_awt_print_PrinterAbortException__
-
-#pragma interface
-
-#include <java/awt/print/PrinterException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PrinterAbortException;
-      }
-    }
-  }
-}
-
-class java::awt::print::PrinterAbortException : public ::java::awt::print::PrinterException
-{
-
-public:
-  PrinterAbortException();
-  PrinterAbortException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4725169026278854136LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_PrinterAbortException__
diff --git a/libjava/java/awt/print/PrinterException.h b/libjava/java/awt/print/PrinterException.h
deleted file mode 100644
index 009ec510f52..00000000000
--- a/libjava/java/awt/print/PrinterException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PrinterException__
-#define __java_awt_print_PrinterException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PrinterException;
-      }
-    }
-  }
-}
-
-class java::awt::print::PrinterException : public ::java::lang::Exception
-{
-
-public:
-  PrinterException();
-  PrinterException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3757589981158265819LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_PrinterException__
diff --git a/libjava/java/awt/print/PrinterGraphics.h b/libjava/java/awt/print/PrinterGraphics.h
deleted file mode 100644
index 74541c07a9e..00000000000
--- a/libjava/java/awt/print/PrinterGraphics.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PrinterGraphics__
-#define __java_awt_print_PrinterGraphics__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PrinterGraphics;
-          class PrinterJob;
-      }
-    }
-  }
-}
-
-class java::awt::print::PrinterGraphics : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::print::PrinterJob * getPrinterJob() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_awt_print_PrinterGraphics__
diff --git a/libjava/java/awt/print/PrinterIOException.h b/libjava/java/awt/print/PrinterIOException.h
deleted file mode 100644
index 46d7908d9a3..00000000000
--- a/libjava/java/awt/print/PrinterIOException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PrinterIOException__
-#define __java_awt_print_PrinterIOException__
-
-#pragma interface
-
-#include <java/awt/print/PrinterException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PrinterIOException;
-      }
-    }
-  }
-}
-
-class java::awt::print::PrinterIOException : public ::java::awt::print::PrinterException
-{
-
-public:
-  PrinterIOException(::java::io::IOException *);
-  virtual ::java::io::IOException * getIOException();
-  virtual ::java::lang::Throwable * getCause();
-private:
-  static const jlong serialVersionUID = 5850870712125932846LL;
-  ::java::io::IOException * __attribute__((aligned(__alignof__( ::java::awt::print::PrinterException)))) mException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_PrinterIOException__
diff --git a/libjava/java/awt/print/PrinterJob.h b/libjava/java/awt/print/PrinterJob.h
deleted file mode 100644
index a319de37b23..00000000000
--- a/libjava/java/awt/print/PrinterJob.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_awt_print_PrinterJob__
-#define __java_awt_print_PrinterJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace print
-      {
-          class PageFormat;
-          class Pageable;
-          class Printable;
-          class PrinterJob;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class PrintService;
-      namespace attribute
-      {
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class java::awt::print::PrinterJob : public ::java::lang::Object
-{
-
-public:
-  static ::java::awt::print::PrinterJob * getPrinterJob();
-  PrinterJob();
-  virtual jint getCopies() = 0;
-  virtual void setCopies(jint) = 0;
-  virtual ::java::lang::String * getJobName() = 0;
-  virtual void setJobName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getUserName() = 0;
-  virtual void cancel() = 0;
-  virtual jboolean isCancelled() = 0;
-  virtual ::java::awt::print::PageFormat * defaultPage();
-  virtual ::java::awt::print::PageFormat * defaultPage(::java::awt::print::PageFormat *) = 0;
-  virtual ::java::awt::print::PageFormat * pageDialog(::java::awt::print::PageFormat *) = 0;
-  virtual ::java::awt::print::PageFormat * pageDialog(::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual void print() = 0;
-  virtual void print(::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual jboolean printDialog() = 0;
-  virtual jboolean printDialog(::javax::print::attribute::PrintRequestAttributeSet *);
-  virtual void setPageable(::java::awt::print::Pageable *) = 0;
-  virtual void setPrintable(::java::awt::print::Printable *) = 0;
-  virtual void setPrintable(::java::awt::print::Printable *, ::java::awt::print::PageFormat *) = 0;
-  virtual ::java::awt::print::PageFormat * validatePage(::java::awt::print::PageFormat *) = 0;
-  static JArray< ::javax::print::PrintService * > * lookupPrintServices();
-  virtual ::javax::print::PrintService * getPrintService();
-  virtual void setPrintService(::javax::print::PrintService *);
-private:
-  ::javax::print::PrintService * __attribute__((aligned(__alignof__( ::java::lang::Object)))) printer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_awt_print_PrinterJob__
diff --git a/libjava/java/beans/AppletInitializer.h b/libjava/java/beans/AppletInitializer.h
deleted file mode 100644
index f0ea44fa5b0..00000000000
--- a/libjava/java/beans/AppletInitializer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_AppletInitializer__
-#define __java_beans_AppletInitializer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet;
-    }
-    namespace beans
-    {
-        class AppletInitializer;
-      namespace beancontext
-      {
-          class BeanContext;
-      }
-    }
-  }
-}
-
-class java::beans::AppletInitializer : public ::java::lang::Object
-{
-
-public:
-  virtual void activate(::java::applet::Applet *) = 0;
-  virtual void initialize(::java::applet::Applet *, ::java::beans::beancontext::BeanContext *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_AppletInitializer__
diff --git a/libjava/java/beans/BeanDescriptor.h b/libjava/java/beans/BeanDescriptor.h
deleted file mode 100644
index b1779b92865..00000000000
--- a/libjava/java/beans/BeanDescriptor.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_BeanDescriptor__
-#define __java_beans_BeanDescriptor__
-
-#pragma interface
-
-#include <java/beans/FeatureDescriptor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class BeanDescriptor;
-    }
-  }
-}
-
-class java::beans::BeanDescriptor : public ::java::beans::FeatureDescriptor
-{
-
-public:
-  BeanDescriptor(::java::lang::Class *);
-  BeanDescriptor(::java::lang::Class *, ::java::lang::Class *);
-  virtual ::java::lang::Class * getBeanClass();
-  virtual ::java::lang::Class * getCustomizerClass();
-public: // actually package-private
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::beans::FeatureDescriptor)))) beanClass;
-  ::java::lang::Class * customizerClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_BeanDescriptor__
diff --git a/libjava/java/beans/BeanInfo.h b/libjava/java/beans/BeanInfo.h
deleted file mode 100644
index dda47201610..00000000000
--- a/libjava/java/beans/BeanInfo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_BeanInfo__
-#define __java_beans_BeanInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-    namespace beans
-    {
-        class BeanDescriptor;
-        class BeanInfo;
-        class EventSetDescriptor;
-        class MethodDescriptor;
-        class PropertyDescriptor;
-    }
-  }
-}
-
-class java::beans::BeanInfo : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::beans::BeanDescriptor * getBeanDescriptor() = 0;
-  virtual JArray< ::java::beans::EventSetDescriptor * > * getEventSetDescriptors() = 0;
-  virtual jint getDefaultEventIndex() = 0;
-  virtual JArray< ::java::beans::PropertyDescriptor * > * getPropertyDescriptors() = 0;
-  virtual jint getDefaultPropertyIndex() = 0;
-  virtual JArray< ::java::beans::MethodDescriptor * > * getMethodDescriptors() = 0;
-  virtual JArray< ::java::beans::BeanInfo * > * getAdditionalBeanInfo() = 0;
-  virtual ::java::awt::Image * getIcon(jint) = 0;
-  static const jint ICON_COLOR_16x16 = 1;
-  static const jint ICON_COLOR_32x32 = 2;
-  static const jint ICON_MONO_16x16 = 3;
-  static const jint ICON_MONO_32x32 = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_BeanInfo__
diff --git a/libjava/java/beans/Beans.h b/libjava/java/beans/Beans.h
deleted file mode 100644
index ed2fbadbe45..00000000000
--- a/libjava/java/beans/Beans.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_Beans__
-#define __java_beans_Beans__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class AppletInitializer;
-        class Beans;
-      namespace beancontext
-      {
-          class BeanContext;
-      }
-    }
-  }
-}
-
-class java::beans::Beans : public ::java::lang::Object
-{
-
-public:
-  Beans();
-  static ::java::lang::Object * instantiate(::java::lang::ClassLoader *, ::java::lang::String *);
-  static ::java::lang::Object * instantiate(::java::lang::ClassLoader *, ::java::lang::String *, ::java::beans::beancontext::BeanContext *);
-  static ::java::lang::Object * instantiate(::java::lang::ClassLoader *, ::java::lang::String *, ::java::beans::beancontext::BeanContext *, ::java::beans::AppletInitializer *);
-  static ::java::lang::Object * getInstanceOf(::java::lang::Object *, ::java::lang::Class *);
-  static jboolean isInstanceOf(::java::lang::Object *, ::java::lang::Class *);
-  static jboolean isGuiAvailable();
-  static jboolean isDesignTime();
-  static void setGuiAvailable(jboolean);
-  static void setDesignTime(jboolean);
-public: // actually package-private
-  static jboolean designTime;
-  static jboolean guiAvailable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_Beans__
diff --git a/libjava/java/beans/Customizer.h b/libjava/java/beans/Customizer.h
deleted file mode 100644
index fbdae5ad102..00000000000
--- a/libjava/java/beans/Customizer.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_Customizer__
-#define __java_beans_Customizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class Customizer;
-        class PropertyChangeListener;
-    }
-  }
-}
-
-class java::beans::Customizer : public ::java::lang::Object
-{
-
-public:
-  virtual void setObject(::java::lang::Object *) = 0;
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_Customizer__
diff --git a/libjava/java/beans/DefaultPersistenceDelegate.h b/libjava/java/beans/DefaultPersistenceDelegate.h
deleted file mode 100644
index b0225b54cc5..00000000000
--- a/libjava/java/beans/DefaultPersistenceDelegate.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_DefaultPersistenceDelegate__
-#define __java_beans_DefaultPersistenceDelegate__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class DefaultPersistenceDelegate;
-        class Encoder;
-        class Expression;
-    }
-  }
-}
-
-class java::beans::DefaultPersistenceDelegate : public ::java::beans::PersistenceDelegate
-{
-
-public:
-  DefaultPersistenceDelegate();
-  DefaultPersistenceDelegate(JArray< ::java::lang::String * > *);
-public: // actually protected
-  virtual jboolean mutatesTo(::java::lang::Object *, ::java::lang::Object *);
-  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:
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::beans::PersistenceDelegate)))) constructorPropertyNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_DefaultPersistenceDelegate__
diff --git a/libjava/java/beans/DesignMode.h b/libjava/java/beans/DesignMode.h
deleted file mode 100644
index a88d84468fd..00000000000
--- a/libjava/java/beans/DesignMode.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_DesignMode__
-#define __java_beans_DesignMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class DesignMode;
-    }
-  }
-}
-
-class java::beans::DesignMode : public ::java::lang::Object
-{
-
-public:
-  virtual void setDesignTime(jboolean) = 0;
-  virtual jboolean isDesignTime() = 0;
-  static ::java::lang::String * PROPERTYNAME;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_DesignMode__
diff --git a/libjava/java/beans/Encoder$1.h b/libjava/java/beans/Encoder$1.h
deleted file mode 100644
index 874859790f6..00000000000
--- a/libjava/java/beans/Encoder$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_Encoder$1__
-#define __java_beans_Encoder$1__
-
-#pragma interface
-
-#include <java/beans/PersistenceDelegate.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Encoder$1;
-        class Expression;
-    }
-  }
-}
-
-class java::beans::Encoder$1 : public ::java::beans::PersistenceDelegate
-{
-
-public: // actually package-private
-  Encoder$1();
-public: // actually protected
-  ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_Encoder$1__
diff --git a/libjava/java/beans/Encoder.h b/libjava/java/beans/Encoder.h
deleted file mode 100644
index 345e98ca441..00000000000
--- a/libjava/java/beans/Encoder.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_Encoder__
-#define __java_beans_Encoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class ExceptionListener;
-        class Expression;
-        class PersistenceDelegate;
-        class Statement;
-    }
-  }
-}
-
-class java::beans::Encoder : public ::java::lang::Object
-{
-
-public:
-  Encoder();
-private:
-  static void setupDefaultPersistenceDelegates();
-public: // actually protected
-  virtual void writeObject(::java::lang::Object *);
-public:
-  virtual void setExceptionListener(::java::beans::ExceptionListener *);
-  virtual ::java::beans::ExceptionListener * getExceptionListener();
-  virtual ::java::beans::PersistenceDelegate * getPersistenceDelegate(::java::lang::Class *);
-  virtual void setPersistenceDelegate(::java::lang::Class *, ::java::beans::PersistenceDelegate *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual void writeStatement(::java::beans::Statement *);
-  virtual void writeExpression(::java::beans::Expression *);
-public: // actually package-private
-  virtual jboolean isImmutableType(::java::lang::Class *);
-  virtual void putCandidate(::java::lang::Object *, ::java::lang::Object *);
-private:
-  static ::java::beans::PersistenceDelegate * defaultPersistenceDelegate;
-  static ::java::beans::PersistenceDelegate * fakePersistenceDelegate;
-  static ::java::util::HashMap * delegates;
-  ::java::util::IdentityHashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) candidates;
-  ::java::beans::ExceptionListener * exceptionListener;
-  jint accessCounter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_Encoder__
diff --git a/libjava/java/beans/EventHandler.h b/libjava/java/beans/EventHandler.h
deleted file mode 100644
index b97ac5104a3..00000000000
--- a/libjava/java/beans/EventHandler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_EventHandler__
-#define __java_beans_EventHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class EventHandler;
-    }
-  }
-}
-
-class java::beans::EventHandler : public ::java::lang::Object
-{
-
-  ::java::lang::String * capitalize(::java::lang::String *);
-public:
-  EventHandler(::java::lang::Object *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getEventPropertyName();
-  virtual ::java::lang::String * getListenerMethodName();
-  virtual ::java::lang::Object * getTarget();
-  virtual ::java::lang::String * getAction();
-private:
-  JArray< ::java::lang::Object * > * getProperty(::java::lang::Object *, ::java::lang::String *);
-public:
-  virtual ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *);
-private:
-  ::java::lang::Class * initClass(::java::lang::Class *);
-  ::java::lang::Class * nextClass(::java::lang::Class *);
-public:
-  static ::java::lang::Object * create(::java::lang::Class *, ::java::lang::Object *, ::java::lang::String *);
-  static ::java::lang::Object * create(::java::lang::Class *, ::java::lang::Object *, ::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Object * create(::java::lang::Class *, ::java::lang::Object *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerMethod;
-  ::java::lang::Object * target;
-  ::java::lang::String * action;
-  ::java::lang::String * property;
-  ::java::lang::Class * targetClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_EventHandler__
diff --git a/libjava/java/beans/EventSetDescriptor.h b/libjava/java/beans/EventSetDescriptor.h
deleted file mode 100644
index fb99b607bb4..00000000000
--- a/libjava/java/beans/EventSetDescriptor.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_EventSetDescriptor__
-#define __java_beans_EventSetDescriptor__
-
-#pragma interface
-
-#include <java/beans/FeatureDescriptor.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class EventSetDescriptor;
-        class MethodDescriptor;
-    }
-  }
-}
-
-class java::beans::EventSetDescriptor : public ::java::beans::FeatureDescriptor
-{
-
-public:
-  EventSetDescriptor(::java::lang::Class *, ::java::lang::String *, ::java::lang::Class *, ::java::lang::String *);
-  EventSetDescriptor(::java::lang::Class *, ::java::lang::String *, ::java::lang::Class *, JArray< ::java::lang::String * > *, ::java::lang::String *, ::java::lang::String *);
-  EventSetDescriptor(::java::lang::Class *, ::java::lang::String *, ::java::lang::Class *, JArray< ::java::lang::String * > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  EventSetDescriptor(::java::lang::String *, ::java::lang::Class *, JArray< ::java::lang::reflect::Method * > *, ::java::lang::reflect::Method *, ::java::lang::reflect::Method *, ::java::lang::reflect::Method *);
-  EventSetDescriptor(::java::lang::String *, ::java::lang::Class *, JArray< ::java::lang::reflect::Method * > *, ::java::lang::reflect::Method *, ::java::lang::reflect::Method *);
-  EventSetDescriptor(::java::lang::String *, ::java::lang::Class *, JArray< ::java::beans::MethodDescriptor * > *, ::java::lang::reflect::Method *, ::java::lang::reflect::Method *);
-  virtual ::java::lang::Class * getListenerType();
-  virtual JArray< ::java::lang::reflect::Method * > * getListenerMethods();
-  virtual JArray< ::java::beans::MethodDescriptor * > * getListenerMethodDescriptors();
-  virtual ::java::lang::reflect::Method * getAddListenerMethod();
-  virtual ::java::lang::reflect::Method * getRemoveListenerMethod();
-  virtual ::java::lang::reflect::Method * getGetListenerMethod();
-  virtual void setUnicast(jboolean);
-  virtual jboolean isUnicast();
-  virtual void setInDefaultEventSet(jboolean);
-  virtual jboolean isInDefaultEventSet();
-private:
-  void checkAddListenerUnicast();
-  void checkMethods();
-  void findMethods(::java::lang::Class *, ::java::lang::Class *, JArray< ::java::lang::String * > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  ::java::lang::reflect::Method * __attribute__((aligned(__alignof__( ::java::beans::FeatureDescriptor)))) addListenerMethod;
-  ::java::lang::reflect::Method * removeListenerMethod;
-  ::java::lang::Class * listenerType;
-  JArray< ::java::beans::MethodDescriptor * > * listenerMethodDescriptors;
-  JArray< ::java::lang::reflect::Method * > * listenerMethods;
-  ::java::lang::reflect::Method * getListenerMethod;
-  jboolean unicast;
-  jboolean inDefaultEventSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_EventSetDescriptor__
diff --git a/libjava/java/beans/ExceptionListener.h b/libjava/java/beans/ExceptionListener.h
deleted file mode 100644
index 4356957fcba..00000000000
--- a/libjava/java/beans/ExceptionListener.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_ExceptionListener__
-#define __java_beans_ExceptionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-    }
-  }
-}
-
-class java::beans::ExceptionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void exceptionThrown(::java::lang::Exception *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_ExceptionListener__
diff --git a/libjava/java/beans/ExplicitInfo.h b/libjava/java/beans/ExplicitInfo.h
deleted file mode 100644
index 16860b43e52..00000000000
--- a/libjava/java/beans/ExplicitInfo.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_ExplicitInfo__
-#define __java_beans_ExplicitInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-    namespace beans
-    {
-        class BeanDescriptor;
-        class BeanInfo;
-        class EventSetDescriptor;
-        class ExplicitInfo;
-        class MethodDescriptor;
-        class PropertyDescriptor;
-    }
-  }
-}
-
-class java::beans::ExplicitInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ExplicitInfo(::java::lang::Class *, ::java::lang::Class *);
-  static void flushCaches();
-  static ::java::beans::BeanInfo * findExplicitBeanInfo(::java::lang::Class *);
-  static ::java::beans::BeanInfo * reallyFindExplicitBeanInfo(::java::lang::Class *);
-private:
-  static ::java::beans::BeanInfo * getBeanInfo(::java::lang::ClassLoader *, ::java::lang::String *);
-public: // actually package-private
-  ::java::beans::BeanDescriptor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) explicitBeanDescriptor;
-  JArray< ::java::beans::BeanInfo * > * explicitBeanInfo;
-  JArray< ::java::beans::PropertyDescriptor * > * explicitPropertyDescriptors;
-  JArray< ::java::beans::EventSetDescriptor * > * explicitEventSetDescriptors;
-  JArray< ::java::beans::MethodDescriptor * > * explicitMethodDescriptors;
-  jint defaultProperty;
-  jint defaultEvent;
-  JArray< ::java::awt::Image * > * im;
-  ::java::lang::Class * propertyStopClass;
-  ::java::lang::Class * eventStopClass;
-  ::java::lang::Class * methodStopClass;
-  static ::java::util::Hashtable * explicitBeanInfos;
-  static ::java::util::Vector * emptyBeanInfos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_ExplicitInfo__
diff --git a/libjava/java/beans/Expression.h b/libjava/java/beans/Expression.h
deleted file mode 100644
index 50fce152989..00000000000
--- a/libjava/java/beans/Expression.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_Expression__
-#define __java_beans_Expression__
-
-#pragma interface
-
-#include <java/beans/Statement.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class Expression;
-    }
-  }
-}
-
-class java::beans::Expression : public ::java::beans::Statement
-{
-
-public:
-  Expression(::java::lang::Object *, ::java::lang::Object *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  Expression(::java::lang::Object *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * getValue();
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static ::java::lang::Object * UNSET;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::beans::Statement)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_Expression__
diff --git a/libjava/java/beans/FeatureDescriptor.h b/libjava/java/beans/FeatureDescriptor.h
deleted file mode 100644
index 8f5f9327d72..00000000000
--- a/libjava/java/beans/FeatureDescriptor.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_FeatureDescriptor__
-#define __java_beans_FeatureDescriptor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class FeatureDescriptor;
-    }
-  }
-}
-
-class java::beans::FeatureDescriptor : public ::java::lang::Object
-{
-
-public:
-  FeatureDescriptor();
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getDisplayName();
-  virtual void setDisplayName(::java::lang::String *);
-  virtual ::java::lang::String * getShortDescription();
-  virtual void setShortDescription(::java::lang::String *);
-  virtual jboolean isExpert();
-  virtual void setExpert(jboolean);
-  virtual jboolean isHidden();
-  virtual void setHidden(jboolean);
-  virtual jboolean isPreferred();
-  virtual void setPreferred(jboolean);
-  virtual ::java::lang::Object * getValue(::java::lang::String *);
-  virtual void setValue(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::util::Enumeration * attributeNames();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * displayName;
-  ::java::lang::String * shortDescription;
-  jboolean expert;
-  jboolean hidden;
-  jboolean preferred;
-  ::java::util::Hashtable * valueHash;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_FeatureDescriptor__
diff --git a/libjava/java/beans/IndexedPropertyChangeEvent.h b/libjava/java/beans/IndexedPropertyChangeEvent.h
deleted file mode 100644
index 85082d12eb1..00000000000
--- a/libjava/java/beans/IndexedPropertyChangeEvent.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_IndexedPropertyChangeEvent__
-#define __java_beans_IndexedPropertyChangeEvent__
-
-#pragma interface
-
-#include <java/beans/PropertyChangeEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class IndexedPropertyChangeEvent;
-    }
-  }
-}
-
-class java::beans::IndexedPropertyChangeEvent : public ::java::beans::PropertyChangeEvent
-{
-
-public:
-  IndexedPropertyChangeEvent(::java::lang::Object *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *, jint);
-  virtual jint getIndex();
-private:
-  static const jlong serialVersionUID = -320227448495806870LL;
-  jint __attribute__((aligned(__alignof__( ::java::beans::PropertyChangeEvent)))) index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_IndexedPropertyChangeEvent__
diff --git a/libjava/java/beans/IndexedPropertyDescriptor.h b/libjava/java/beans/IndexedPropertyDescriptor.h
deleted file mode 100644
index 843eb1b94d3..00000000000
--- a/libjava/java/beans/IndexedPropertyDescriptor.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_IndexedPropertyDescriptor__
-#define __java_beans_IndexedPropertyDescriptor__
-
-#pragma interface
-
-#include <java/beans/PropertyDescriptor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class IndexedPropertyDescriptor;
-    }
-  }
-}
-
-class java::beans::IndexedPropertyDescriptor : public ::java::beans::PropertyDescriptor
-{
-
-public:
-  IndexedPropertyDescriptor(::java::lang::String *, ::java::lang::Class *);
-  IndexedPropertyDescriptor(::java::lang::String *, ::java::lang::Class *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  IndexedPropertyDescriptor(::java::lang::String *, ::java::lang::reflect::Method *, ::java::lang::reflect::Method *, ::java::lang::reflect::Method *, ::java::lang::reflect::Method *);
-  virtual ::java::lang::Class * getIndexedPropertyType();
-  virtual ::java::lang::reflect::Method * getIndexedReadMethod();
-  virtual void setIndexedReadMethod(::java::lang::reflect::Method *);
-  virtual ::java::lang::reflect::Method * getIndexedWriteMethod();
-  virtual void setIndexedWriteMethod(::java::lang::reflect::Method *);
-private:
-  void findMethods(::java::lang::Class *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::beans::PropertyDescriptor)))) indexedPropertyType;
-  ::java::lang::reflect::Method * setIndex;
-  ::java::lang::reflect::Method * getIndex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_IndexedPropertyDescriptor__
diff --git a/libjava/java/beans/IntrospectionException.h b/libjava/java/beans/IntrospectionException.h
deleted file mode 100644
index 87df2fd72c1..00000000000
--- a/libjava/java/beans/IntrospectionException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_IntrospectionException__
-#define __java_beans_IntrospectionException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class IntrospectionException;
-    }
-  }
-}
-
-class java::beans::IntrospectionException : public ::java::lang::Exception
-{
-
-public:
-  IntrospectionException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3728150539969542619LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_IntrospectionException__
diff --git a/libjava/java/beans/Introspector.h b/libjava/java/beans/Introspector.h
deleted file mode 100644
index 989c513334c..00000000000
--- a/libjava/java/beans/Introspector.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_Introspector__
-#define __java_beans_Introspector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-          class BeanInfoEmbryo;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class BeanInfo;
-        class ExplicitInfo;
-        class Introspector;
-    }
-  }
-}
-
-class java::beans::Introspector : public ::java::lang::Object
-{
-
-  Introspector();
-public:
-  static ::java::beans::BeanInfo * getBeanInfo(::java::lang::Class *);
-  static ::java::beans::BeanInfo * getBeanInfo(::java::lang::Class *, jint);
-  static void flushCaches();
-  static void flushFromCaches(::java::lang::Class *);
-private:
-  static void merge(::gnu::java::beans::BeanInfoEmbryo *, ::java::beans::ExplicitInfo *);
-public:
-  static ::java::beans::BeanInfo * getBeanInfo(::java::lang::Class *, ::java::lang::Class *);
-  static JArray< ::java::lang::String * > * getBeanInfoSearchPath();
-  static void setBeanInfoSearchPath(JArray< ::java::lang::String * > *);
-  static ::java::lang::String * decapitalize(::java::lang::String *);
-public: // actually package-private
-  static ::java::beans::BeanInfo * copyBeanInfo(::java::beans::BeanInfo *);
-public:
-  static const jint USE_ALL_BEANINFO = 1;
-  static const jint IGNORE_IMMEDIATE_BEANINFO = 2;
-  static const jint IGNORE_ALL_BEANINFO = 3;
-public: // actually package-private
-  static JArray< ::java::lang::String * > * beanInfoSearchPath;
-  static ::java::util::Hashtable * beanInfoCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_Introspector__
diff --git a/libjava/java/beans/MethodDescriptor.h b/libjava/java/beans/MethodDescriptor.h
deleted file mode 100644
index cf3ca4acf5c..00000000000
--- a/libjava/java/beans/MethodDescriptor.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_MethodDescriptor__
-#define __java_beans_MethodDescriptor__
-
-#pragma interface
-
-#include <java/beans/FeatureDescriptor.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class MethodDescriptor;
-        class ParameterDescriptor;
-    }
-  }
-}
-
-class java::beans::MethodDescriptor : public ::java::beans::FeatureDescriptor
-{
-
-public:
-  MethodDescriptor(::java::lang::reflect::Method *);
-  MethodDescriptor(::java::lang::reflect::Method *, JArray< ::java::beans::ParameterDescriptor * > *);
-  virtual JArray< ::java::beans::ParameterDescriptor * > * getParameterDescriptors();
-  virtual ::java::lang::reflect::Method * getMethod();
-private:
-  ::java::lang::reflect::Method * __attribute__((aligned(__alignof__( ::java::beans::FeatureDescriptor)))) m;
-  JArray< ::java::beans::ParameterDescriptor * > * parameterDescriptors;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_MethodDescriptor__
diff --git a/libjava/java/beans/ParameterDescriptor.h b/libjava/java/beans/ParameterDescriptor.h
deleted file mode 100644
index 66e201e14f5..00000000000
--- a/libjava/java/beans/ParameterDescriptor.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_ParameterDescriptor__
-#define __java_beans_ParameterDescriptor__
-
-#pragma interface
-
-#include <java/beans/FeatureDescriptor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class ParameterDescriptor;
-    }
-  }
-}
-
-class java::beans::ParameterDescriptor : public ::java::beans::FeatureDescriptor
-{
-
-public:
-  ParameterDescriptor();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_ParameterDescriptor__
diff --git a/libjava/java/beans/PersistenceDelegate.h b/libjava/java/beans/PersistenceDelegate.h
deleted file mode 100644
index 93b7865b9c9..00000000000
--- a/libjava/java/beans/PersistenceDelegate.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_PersistenceDelegate__
-#define __java_beans_PersistenceDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class Encoder;
-        class Expression;
-        class PersistenceDelegate;
-    }
-  }
-}
-
-class java::beans::PersistenceDelegate : public ::java::lang::Object
-{
-
-public:
-  PersistenceDelegate();
-public: // actually protected
-  virtual void initialize(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *, ::java::beans::Encoder *);
-public:
-  virtual void writeObject(::java::lang::Object *, ::java::beans::Encoder *);
-public: // actually protected
-  virtual jboolean mutatesTo(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::beans::Expression * instantiate(::java::lang::Object *, ::java::beans::Encoder *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_PersistenceDelegate__
diff --git a/libjava/java/beans/PropertyChangeEvent.h b/libjava/java/beans/PropertyChangeEvent.h
deleted file mode 100644
index 6ea9155158b..00000000000
--- a/libjava/java/beans/PropertyChangeEvent.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_PropertyChangeEvent__
-#define __java_beans_PropertyChangeEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-}
-
-class java::beans::PropertyChangeEvent : public ::java::util::EventObject
-{
-
-public:
-  PropertyChangeEvent(::java::lang::Object *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::String * getPropertyName();
-  virtual ::java::lang::Object * getNewValue();
-  virtual ::java::lang::Object * getOldValue();
-  virtual void setPropagationId(::java::lang::Object *);
-  virtual ::java::lang::Object * getPropagationId();
-public: // actually package-private
-  virtual ::java::beans::PropertyChangeEvent * rollback();
-private:
-  static const jlong serialVersionUID = 7042693688939648123LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) propertyName;
-  ::java::lang::Object * newValue;
-  ::java::lang::Object * oldValue;
-private:
-  ::java::lang::Object * propagationId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_PropertyChangeEvent__
diff --git a/libjava/java/beans/PropertyChangeListener.h b/libjava/java/beans/PropertyChangeListener.h
deleted file mode 100644
index c72b2be7307..00000000000
--- a/libjava/java/beans/PropertyChangeListener.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_PropertyChangeListener__
-#define __java_beans_PropertyChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class PropertyChangeListener;
-    }
-  }
-}
-
-class java::beans::PropertyChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_PropertyChangeListener__
diff --git a/libjava/java/beans/PropertyChangeListenerProxy.h b/libjava/java/beans/PropertyChangeListenerProxy.h
deleted file mode 100644
index 14cce8e3c89..00000000000
--- a/libjava/java/beans/PropertyChangeListenerProxy.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_PropertyChangeListenerProxy__
-#define __java_beans_PropertyChangeListenerProxy__
-
-#pragma interface
-
-#include <java/util/EventListenerProxy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class PropertyChangeListener;
-        class PropertyChangeListenerProxy;
-    }
-  }
-}
-
-class java::beans::PropertyChangeListenerProxy : public ::java::util::EventListenerProxy
-{
-
-public:
-  PropertyChangeListenerProxy(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual ::java::lang::String * getPropertyName();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::EventListenerProxy)))) propertyName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_PropertyChangeListenerProxy__
diff --git a/libjava/java/beans/PropertyChangeSupport.h b/libjava/java/beans/PropertyChangeSupport.h
deleted file mode 100644
index ae037a893e3..00000000000
--- a/libjava/java/beans/PropertyChangeSupport.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_PropertyChangeSupport__
-#define __java_beans_PropertyChangeSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-  }
-}
-
-class java::beans::PropertyChangeSupport : public ::java::lang::Object
-{
-
-public:
-  PropertyChangeSupport(::java::lang::Object *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners(::java::lang::String *);
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void firePropertyChange(::java::lang::String *, jint, jint);
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-  virtual void firePropertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void fireIndexedPropertyChange(::java::lang::String *, jint, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void fireIndexedPropertyChange(::java::lang::String *, jint, jint, jint);
-  virtual void fireIndexedPropertyChange(::java::lang::String *, jint, jboolean, jboolean);
-  virtual jboolean hasListeners(::java::lang::String *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 6401253773779951803LL;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children;
-  ::java::lang::Object * source;
-  static const jint propertyChangeSupportSerializedDataVersion = 2;
-  ::java::util::Vector * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_PropertyChangeSupport__
diff --git a/libjava/java/beans/PropertyDescriptor.h b/libjava/java/beans/PropertyDescriptor.h
deleted file mode 100644
index 242c3d5db99..00000000000
--- a/libjava/java/beans/PropertyDescriptor.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_PropertyDescriptor__
-#define __java_beans_PropertyDescriptor__
-
-#pragma interface
-
-#include <java/beans/FeatureDescriptor.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyDescriptor;
-        class PropertyEditor;
-    }
-  }
-}
-
-class java::beans::PropertyDescriptor : public ::java::beans::FeatureDescriptor
-{
-
-public: // actually package-private
-  PropertyDescriptor(::java::lang::String *);
-public:
-  PropertyDescriptor(::java::lang::String *, ::java::lang::Class *);
-  PropertyDescriptor(::java::lang::String *, ::java::lang::Class *, ::java::lang::String *, ::java::lang::String *);
-  PropertyDescriptor(::java::lang::String *, ::java::lang::reflect::Method *, ::java::lang::reflect::Method *);
-  virtual ::java::lang::Class * getPropertyType();
-  virtual ::java::lang::reflect::Method * getReadMethod();
-  virtual void setReadMethod(::java::lang::reflect::Method *);
-  virtual ::java::lang::reflect::Method * getWriteMethod();
-  virtual void setWriteMethod(::java::lang::reflect::Method *);
-  virtual jboolean isBound();
-  virtual void setBound(jboolean);
-  virtual jboolean isConstrained();
-  virtual void setConstrained(jboolean);
-  virtual ::java::lang::Class * getPropertyEditorClass();
-  virtual void setPropertyEditorClass(::java::lang::Class *);
-  virtual ::java::beans::PropertyEditor * createPropertyEditor(::java::lang::Object *);
-private:
-  ::java::lang::reflect::Constructor * findConstructor(::java::lang::Class *, JArray< ::java::lang::Class * > *);
-  ::java::beans::PropertyEditor * instantiateClass(::java::lang::reflect::Constructor *, JArray< ::java::lang::Object * > *);
-  void findMethods(::java::lang::Class *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  ::java::lang::Class * checkMethods(::java::lang::reflect::Method *, ::java::lang::reflect::Method *);
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::beans::FeatureDescriptor)))) propertyType;
-  ::java::lang::reflect::Method * getMethod;
-  ::java::lang::reflect::Method * setMethod;
-  ::java::lang::Class * propertyEditorClass;
-  jboolean bound;
-  jboolean constrained;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_PropertyDescriptor__
diff --git a/libjava/java/beans/PropertyEditor.h b/libjava/java/beans/PropertyEditor.h
deleted file mode 100644
index 4fab8c8d66b..00000000000
--- a/libjava/java/beans/PropertyEditor.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_PropertyEditor__
-#define __java_beans_PropertyEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyEditor;
-    }
-  }
-}
-
-class java::beans::PropertyEditor : public ::java::lang::Object
-{
-
-public:
-  virtual void setValue(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getValue() = 0;
-  virtual void setAsText(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAsText() = 0;
-  virtual JArray< ::java::lang::String * > * getTags() = 0;
-  virtual jboolean isPaintable() = 0;
-  virtual void paintValue(::java::awt::Graphics *, ::java::awt::Rectangle *) = 0;
-  virtual jboolean supportsCustomEditor() = 0;
-  virtual ::java::awt::Component * getCustomEditor() = 0;
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual ::java::lang::String * getJavaInitializationString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_PropertyEditor__
diff --git a/libjava/java/beans/PropertyEditorManager.h b/libjava/java/beans/PropertyEditorManager.h
deleted file mode 100644
index 88985b3b8cc..00000000000
--- a/libjava/java/beans/PropertyEditorManager.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_PropertyEditorManager__
-#define __java_beans_PropertyEditorManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyEditor;
-        class PropertyEditorManager;
-    }
-  }
-}
-
-class java::beans::PropertyEditorManager : public ::java::lang::Object
-{
-
-public:
-  PropertyEditorManager();
-  static void registerEditor(::java::lang::Class *, ::java::lang::Class *);
-  static ::java::beans::PropertyEditor * findEditor(::java::lang::Class *);
-  static JArray< ::java::lang::String * > * getEditorSearchPath();
-  static void setEditorSearchPath(JArray< ::java::lang::String * > *);
-public: // actually package-private
-  static ::java::util::Hashtable * editors;
-  static JArray< ::java::lang::String * > * editorSearchPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_PropertyEditorManager__
diff --git a/libjava/java/beans/PropertyEditorSupport.h b/libjava/java/beans/PropertyEditorSupport.h
deleted file mode 100644
index 62500511a14..00000000000
--- a/libjava/java/beans/PropertyEditorSupport.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_PropertyEditorSupport__
-#define __java_beans_PropertyEditorSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-        class PropertyEditorSupport;
-    }
-  }
-}
-
-class java::beans::PropertyEditorSupport : public ::java::lang::Object
-{
-
-public:
-  PropertyEditorSupport();
-  PropertyEditorSupport(::java::lang::Object *);
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getValue();
-  virtual jboolean isPaintable();
-  virtual void paintValue(::java::awt::Graphics *, ::java::awt::Rectangle *);
-  virtual ::java::lang::String * getJavaInitializationString();
-  virtual ::java::lang::String * getAsText();
-  virtual void setAsText(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getTags();
-  virtual ::java::awt::Component * getCustomEditor();
-  virtual jboolean supportsCustomEditor();
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void firePropertyChange();
-  virtual ::java::lang::Object * getSource();
-  virtual void setSource(::java::lang::Object *);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) eventSource;
-  ::java::lang::Object * value;
-  ::java::beans::PropertyChangeSupport * pSupport;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_PropertyEditorSupport__
diff --git a/libjava/java/beans/PropertyVetoException.h b/libjava/java/beans/PropertyVetoException.h
deleted file mode 100644
index 7de400634e1..00000000000
--- a/libjava/java/beans/PropertyVetoException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_PropertyVetoException__
-#define __java_beans_PropertyVetoException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class PropertyVetoException;
-    }
-  }
-}
-
-class java::beans::PropertyVetoException : public ::java::lang::Exception
-{
-
-public:
-  PropertyVetoException(::java::lang::String *, ::java::beans::PropertyChangeEvent *);
-  virtual ::java::beans::PropertyChangeEvent * getPropertyChangeEvent();
-private:
-  static const jlong serialVersionUID = 129596057694162164LL;
-  ::java::beans::PropertyChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) evt;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_PropertyVetoException__
diff --git a/libjava/java/beans/SimpleBeanInfo.h b/libjava/java/beans/SimpleBeanInfo.h
deleted file mode 100644
index ea77e474305..00000000000
--- a/libjava/java/beans/SimpleBeanInfo.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_SimpleBeanInfo__
-#define __java_beans_SimpleBeanInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-    namespace beans
-    {
-        class BeanDescriptor;
-        class BeanInfo;
-        class EventSetDescriptor;
-        class MethodDescriptor;
-        class PropertyDescriptor;
-        class SimpleBeanInfo;
-    }
-  }
-}
-
-class java::beans::SimpleBeanInfo : public ::java::lang::Object
-{
-
-public:
-  SimpleBeanInfo();
-  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);
-  virtual ::java::awt::Image * loadImage(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_SimpleBeanInfo__
diff --git a/libjava/java/beans/Statement.h b/libjava/java/beans/Statement.h
deleted file mode 100644
index 3df8477b4cf..00000000000
--- a/libjava/java/beans/Statement.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_Statement__
-#define __java_beans_Statement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class Statement;
-    }
-  }
-}
-
-class java::beans::Statement : public ::java::lang::Object
-{
-
-public:
-  Statement(::java::lang::Object *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual void execute();
-private:
-  ::java::lang::Class * unwrap(::java::lang::Class *);
-  jboolean compatible(JArray< ::java::lang::Class * > *, JArray< ::java::lang::Class * > *);
-  jboolean moreSpecific(JArray< ::java::lang::Class * > *, JArray< ::java::lang::Class * > *);
-public: // actually package-private
-  virtual ::java::lang::Object * doExecute();
-public:
-  virtual JArray< ::java::lang::Object * > * getArguments();
-  virtual ::java::lang::String * getMethodName();
-  virtual ::java::lang::Object * getTarget();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-  ::java::lang::String * methodName;
-  JArray< ::java::lang::Object * > * arguments;
-  ::java::lang::reflect::Method * method;
-  ::java::lang::reflect::Constructor * ctor;
-  static JArray< ::java::lang::Class * > * wrappers;
-  static JArray< ::java::lang::Class * > * natives;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_Statement__
diff --git a/libjava/java/beans/VetoableChangeListener.h b/libjava/java/beans/VetoableChangeListener.h
deleted file mode 100644
index 2bf9d1d07f1..00000000000
--- a/libjava/java/beans/VetoableChangeListener.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_VetoableChangeListener__
-#define __java_beans_VetoableChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class VetoableChangeListener;
-    }
-  }
-}
-
-class java::beans::VetoableChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void vetoableChange(::java::beans::PropertyChangeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_VetoableChangeListener__
diff --git a/libjava/java/beans/VetoableChangeListenerProxy.h b/libjava/java/beans/VetoableChangeListenerProxy.h
deleted file mode 100644
index f713ac432b6..00000000000
--- a/libjava/java/beans/VetoableChangeListenerProxy.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_VetoableChangeListenerProxy__
-#define __java_beans_VetoableChangeListenerProxy__
-
-#pragma interface
-
-#include <java/util/EventListenerProxy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class VetoableChangeListener;
-        class VetoableChangeListenerProxy;
-    }
-  }
-}
-
-class java::beans::VetoableChangeListenerProxy : public ::java::util::EventListenerProxy
-{
-
-public:
-  VetoableChangeListenerProxy(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual void vetoableChange(::java::beans::PropertyChangeEvent *);
-  virtual ::java::lang::String * getPropertyName();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::EventListenerProxy)))) propertyName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_VetoableChangeListenerProxy__
diff --git a/libjava/java/beans/VetoableChangeSupport.h b/libjava/java/beans/VetoableChangeSupport.h
deleted file mode 100644
index 9dfdbc589e9..00000000000
--- a/libjava/java/beans/VetoableChangeSupport.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_VetoableChangeSupport__
-#define __java_beans_VetoableChangeSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class VetoableChangeListener;
-        class VetoableChangeSupport;
-    }
-  }
-}
-
-class java::beans::VetoableChangeSupport : public ::java::lang::Object
-{
-
-public:
-  VetoableChangeSupport(::java::lang::Object *);
-  virtual void addVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual void removeVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners();
-  virtual void addVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual void removeVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners(::java::lang::String *);
-  virtual void fireVetoableChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void fireVetoableChange(::java::lang::String *, jint, jint);
-  virtual void fireVetoableChange(::java::lang::String *, jboolean, jboolean);
-  virtual void fireVetoableChange(::java::beans::PropertyChangeEvent *);
-  virtual jboolean hasListeners(::java::lang::String *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -5090210921595982017LL;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children;
-  ::java::lang::Object * source;
-  static const jint vetoableChangeSupportSerializedDataVersion = 2;
-  ::java::util::Vector * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_VetoableChangeSupport__
diff --git a/libjava/java/beans/Visibility.h b/libjava/java/beans/Visibility.h
deleted file mode 100644
index df5f7a62815..00000000000
--- a/libjava/java/beans/Visibility.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_Visibility__
-#define __java_beans_Visibility__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class Visibility;
-    }
-  }
-}
-
-class java::beans::Visibility : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean needsGui() = 0;
-  virtual jboolean avoidingGui() = 0;
-  virtual void dontUseGui() = 0;
-  virtual void okToUseGui() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_Visibility__
diff --git a/libjava/java/beans/XMLDecoder.h b/libjava/java/beans/XMLDecoder.h
deleted file mode 100644
index f5055c4f66d..00000000000
--- a/libjava/java/beans/XMLDecoder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_XMLDecoder__
-#define __java_beans_XMLDecoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class ExceptionListener;
-        class XMLDecoder;
-    }
-  }
-}
-
-class java::beans::XMLDecoder : public ::java::lang::Object
-{
-
-public:
-  XMLDecoder(::java::io::InputStream *);
-  XMLDecoder(::java::io::InputStream *, ::java::lang::Object *);
-  XMLDecoder(::java::io::InputStream *, ::java::lang::Object *, ::java::beans::ExceptionListener *);
-  XMLDecoder(::java::io::InputStream *, ::java::lang::Object *, ::java::beans::ExceptionListener *, ::java::lang::ClassLoader *);
-  virtual void close();
-  virtual ::java::beans::ExceptionListener * getExceptionListener();
-  virtual ::java::lang::Object * getOwner();
-  virtual ::java::lang::Object * readObject();
-  virtual void setExceptionListener(::java::beans::ExceptionListener *);
-  virtual void setOwner(::java::lang::Object *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) owner;
-  ::java::beans::ExceptionListener * exceptionListener;
-  ::java::io::InputStream * inputStream;
-  jboolean isStreamClosed;
-  ::java::lang::ClassLoader * classLoader;
-  ::java::util::Iterator * iterator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_XMLDecoder__
diff --git a/libjava/java/beans/XMLEncoder.h b/libjava/java/beans/XMLEncoder.h
deleted file mode 100644
index 3a6e01df100..00000000000
--- a/libjava/java/beans/XMLEncoder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_XMLEncoder__
-#define __java_beans_XMLEncoder__
-
-#pragma interface
-
-#include <java/beans/Encoder.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace beans
-      {
-        namespace encoder
-        {
-            class ScanEngine;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace beans
-    {
-        class Expression;
-        class Statement;
-        class XMLEncoder;
-    }
-  }
-}
-
-class java::beans::XMLEncoder : public ::java::beans::Encoder
-{
-
-public:
-  XMLEncoder(::java::io::OutputStream *);
-  virtual void close();
-  virtual void flush();
-  virtual void writeExpression(::java::beans::Expression *);
-  virtual void writeStatement(::java::beans::Statement *);
-  virtual void writeObject(::java::lang::Object *);
-  virtual void setOwner(::java::lang::Object *);
-  virtual ::java::lang::Object * getOwner();
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::beans::Encoder)))) owner;
-  ::java::lang::Exception * exception;
-  ::gnu::java::beans::encoder::ScanEngine * scanEngine;
-private:
-  jint accessCounter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_XMLEncoder__
diff --git a/libjava/java/beans/beancontext/BeanContext.h b/libjava/java/beans/beancontext/BeanContext.h
deleted file mode 100644
index e9935e0ea2d..00000000000
--- a/libjava/java/beans/beancontext/BeanContext.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContext__
-#define __java_beans_beancontext_BeanContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class VetoableChangeListener;
-      namespace beancontext
-      {
-          class BeanContext;
-          class BeanContextChild;
-          class BeanContextMembershipListener;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * instantiateChild(::java::lang::String *) = 0;
-  virtual ::java::net::URL * getResource(::java::lang::String *, ::java::beans::beancontext::BeanContextChild *) = 0;
-  virtual ::java::io::InputStream * getResourceAsStream(::java::lang::String *, ::java::beans::beancontext::BeanContextChild *) = 0;
-  virtual void addBeanContextMembershipListener(::java::beans::beancontext::BeanContextMembershipListener *) = 0;
-  virtual void removeBeanContextMembershipListener(::java::beans::beancontext::BeanContextMembershipListener *) = 0;
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  virtual void setBeanContext(::java::beans::beancontext::BeanContext *) = 0;
-  virtual ::java::beans::beancontext::BeanContext * getBeanContext() = 0;
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *) = 0;
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *) = 0;
-  virtual void addVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *) = 0;
-  virtual void removeVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *) = 0;
-  virtual jboolean needsGui() = 0;
-  virtual jboolean avoidingGui() = 0;
-  virtual void dontUseGui() = 0;
-  virtual void okToUseGui() = 0;
-  virtual void setDesignTime(jboolean) = 0;
-  virtual jboolean isDesignTime() = 0;
-  static ::java::lang::Object * globalHierarchyLock;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContext__
diff --git a/libjava/java/beans/beancontext/BeanContextChild.h b/libjava/java/beans/beancontext/BeanContextChild.h
deleted file mode 100644
index 0e1c8685f35..00000000000
--- a/libjava/java/beans/beancontext/BeanContextChild.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextChild__
-#define __java_beans_beancontext_BeanContextChild__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class VetoableChangeListener;
-      namespace beancontext
-      {
-          class BeanContext;
-          class BeanContextChild;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextChild : public ::java::lang::Object
-{
-
-public:
-  virtual void setBeanContext(::java::beans::beancontext::BeanContext *) = 0;
-  virtual ::java::beans::beancontext::BeanContext * getBeanContext() = 0;
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *) = 0;
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *) = 0;
-  virtual void addVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *) = 0;
-  virtual void removeVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContextChild__
diff --git a/libjava/java/beans/beancontext/BeanContextChildComponentProxy.h b/libjava/java/beans/beancontext/BeanContextChildComponentProxy.h
deleted file mode 100644
index 7e515669f6f..00000000000
--- a/libjava/java/beans/beancontext/BeanContextChildComponentProxy.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextChildComponentProxy__
-#define __java_beans_beancontext_BeanContextChildComponentProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextChildComponentProxy;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextChildComponentProxy : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getComponent() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContextChildComponentProxy__
diff --git a/libjava/java/beans/beancontext/BeanContextChildSupport.h b/libjava/java/beans/beancontext/BeanContextChildSupport.h
deleted file mode 100644
index 646217b30f0..00000000000
--- a/libjava/java/beans/beancontext/BeanContextChildSupport.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextChildSupport__
-#define __java_beans_beancontext_BeanContextChildSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-        class VetoableChangeListener;
-        class VetoableChangeSupport;
-      namespace beancontext
-      {
-          class BeanContext;
-          class BeanContextChild;
-          class BeanContextChildSupport;
-          class BeanContextServiceAvailableEvent;
-          class BeanContextServiceRevokedEvent;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextChildSupport : public ::java::lang::Object
-{
-
-public:
-  BeanContextChildSupport();
-  BeanContextChildSupport(::java::beans::beancontext::BeanContextChild *);
-  virtual void setBeanContext(::java::beans::beancontext::BeanContext *);
-  virtual ::java::beans::beancontext::BeanContext * getBeanContext();
-  virtual ::java::beans::beancontext::BeanContextChild * getBeanContextChildPeer();
-  virtual jboolean isDelegated();
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void addVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual void removeVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void fireVetoableChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void serviceRevoked(::java::beans::beancontext::BeanContextServiceRevokedEvent *);
-  virtual void serviceAvailable(::java::beans::beancontext::BeanContextServiceAvailableEvent *);
-  virtual jboolean validatePendingSetBeanContext(::java::beans::beancontext::BeanContext *);
-public: // actually protected
-  virtual void releaseBeanContextResources();
-  virtual void initializeBeanContextResources();
-public: // actually package-private
-  static const jlong serialVersionUID = 6328947014421475877LL;
-public:
-  ::java::beans::beancontext::BeanContextChild * __attribute__((aligned(__alignof__( ::java::lang::Object)))) beanContextChildPeer;
-public: // actually protected
-  ::java::beans::beancontext::BeanContext * beanContext;
-  jboolean rejectedSetBCOnce;
-  ::java::beans::PropertyChangeSupport * pcSupport;
-  ::java::beans::VetoableChangeSupport * vcSupport;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextChildSupport__
diff --git a/libjava/java/beans/beancontext/BeanContextContainerProxy.h b/libjava/java/beans/beancontext/BeanContextContainerProxy.h
deleted file mode 100644
index c3574f5db46..00000000000
--- a/libjava/java/beans/beancontext/BeanContextContainerProxy.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextContainerProxy__
-#define __java_beans_beancontext_BeanContextContainerProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-    }
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextContainerProxy;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextContainerProxy : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Container * getContainer() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContextContainerProxy__
diff --git a/libjava/java/beans/beancontext/BeanContextEvent.h b/libjava/java/beans/beancontext/BeanContextEvent.h
deleted file mode 100644
index a74c1da045e..00000000000
--- a/libjava/java/beans/beancontext/BeanContextEvent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextEvent__
-#define __java_beans_beancontext_BeanContextEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContext;
-          class BeanContextEvent;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextEvent : public ::java::util::EventObject
-{
-
-public: // actually protected
-  BeanContextEvent(::java::beans::beancontext::BeanContext *);
-public:
-  virtual ::java::beans::beancontext::BeanContext * getBeanContext();
-  virtual ::java::beans::beancontext::BeanContext * getPropagatedFrom();
-  virtual jboolean isPropagated();
-  virtual void setPropagatedFrom(::java::beans::beancontext::BeanContext *);
-private:
-  static const jlong serialVersionUID = 7267998073569045052LL;
-public: // actually protected
-  ::java::beans::beancontext::BeanContext * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) propagatedFrom;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextEvent__
diff --git a/libjava/java/beans/beancontext/BeanContextMembershipEvent.h b/libjava/java/beans/beancontext/BeanContextMembershipEvent.h
deleted file mode 100644
index 8b6c933bb34..00000000000
--- a/libjava/java/beans/beancontext/BeanContextMembershipEvent.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextMembershipEvent__
-#define __java_beans_beancontext_BeanContextMembershipEvent__
-
-#pragma interface
-
-#include <java/beans/beancontext/BeanContextEvent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContext;
-          class BeanContextMembershipEvent;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextMembershipEvent : public ::java::beans::beancontext::BeanContextEvent
-{
-
-public:
-  BeanContextMembershipEvent(::java::beans::beancontext::BeanContext *, ::java::util::Collection *);
-  BeanContextMembershipEvent(::java::beans::beancontext::BeanContext *, JArray< ::java::lang::Object * > *);
-  virtual jint size();
-  virtual ::java::util::Iterator * iterator();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual jboolean contains(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 3499346510334590959LL;
-public: // actually protected
-  ::java::util::Collection * __attribute__((aligned(__alignof__( ::java::beans::beancontext::BeanContextEvent)))) children;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextMembershipEvent__
diff --git a/libjava/java/beans/beancontext/BeanContextMembershipListener.h b/libjava/java/beans/beancontext/BeanContextMembershipListener.h
deleted file mode 100644
index 89efed826f9..00000000000
--- a/libjava/java/beans/beancontext/BeanContextMembershipListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextMembershipListener__
-#define __java_beans_beancontext_BeanContextMembershipListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextMembershipEvent;
-          class BeanContextMembershipListener;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextMembershipListener : public ::java::lang::Object
-{
-
-public:
-  virtual void childrenAdded(::java::beans::beancontext::BeanContextMembershipEvent *) = 0;
-  virtual void childrenRemoved(::java::beans::beancontext::BeanContextMembershipEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContextMembershipListener__
diff --git a/libjava/java/beans/beancontext/BeanContextProxy.h b/libjava/java/beans/beancontext/BeanContextProxy.h
deleted file mode 100644
index 3d18c0a81e8..00000000000
--- a/libjava/java/beans/beancontext/BeanContextProxy.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextProxy__
-#define __java_beans_beancontext_BeanContextProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextChild;
-          class BeanContextProxy;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextProxy : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::beans::beancontext::BeanContextChild * getBeanContextProxy() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContextProxy__
diff --git a/libjava/java/beans/beancontext/BeanContextServiceAvailableEvent.h b/libjava/java/beans/beancontext/BeanContextServiceAvailableEvent.h
deleted file mode 100644
index 7b69fe82b2f..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServiceAvailableEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServiceAvailableEvent__
-#define __java_beans_beancontext_BeanContextServiceAvailableEvent__
-
-#pragma interface
-
-#include <java/beans/beancontext/BeanContextEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServiceAvailableEvent;
-          class BeanContextServices;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServiceAvailableEvent : public ::java::beans::beancontext::BeanContextEvent
-{
-
-public:
-  BeanContextServiceAvailableEvent(::java::beans::beancontext::BeanContextServices *, ::java::lang::Class *);
-  virtual ::java::util::Iterator * getCurrentServiceSelectors();
-  virtual ::java::lang::Class * getServiceClass();
-  virtual ::java::beans::beancontext::BeanContextServices * getSourceAsBeanContextServices();
-private:
-  static const jlong serialVersionUID = -5333985775656400778LL;
-public: // actually protected
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::beans::beancontext::BeanContextEvent)))) serviceClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextServiceAvailableEvent__
diff --git a/libjava/java/beans/beancontext/BeanContextServiceProvider.h b/libjava/java/beans/beancontext/BeanContextServiceProvider.h
deleted file mode 100644
index 937bd5dec86..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServiceProvider.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServiceProvider__
-#define __java_beans_beancontext_BeanContextServiceProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServiceProvider;
-          class BeanContextServices;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServiceProvider : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getService(::java::beans::beancontext::BeanContextServices *, ::java::lang::Object *, ::java::lang::Class *, ::java::lang::Object *) = 0;
-  virtual void releaseService(::java::beans::beancontext::BeanContextServices *, ::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::util::Iterator * getCurrentServiceSelectors(::java::beans::beancontext::BeanContextServices *, ::java::lang::Class *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContextServiceProvider__
diff --git a/libjava/java/beans/beancontext/BeanContextServiceProviderBeanInfo.h b/libjava/java/beans/beancontext/BeanContextServiceProviderBeanInfo.h
deleted file mode 100644
index 952edd1e079..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServiceProviderBeanInfo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServiceProviderBeanInfo__
-#define __java_beans_beancontext_BeanContextServiceProviderBeanInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-    namespace beans
-    {
-        class BeanDescriptor;
-        class BeanInfo;
-        class EventSetDescriptor;
-        class MethodDescriptor;
-        class PropertyDescriptor;
-      namespace beancontext
-      {
-          class BeanContextServiceProviderBeanInfo;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServiceProviderBeanInfo : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::beans::BeanInfo * > * getServicesBeanInfo() = 0;
-  virtual ::java::beans::BeanDescriptor * getBeanDescriptor() = 0;
-  virtual JArray< ::java::beans::EventSetDescriptor * > * getEventSetDescriptors() = 0;
-  virtual jint getDefaultEventIndex() = 0;
-  virtual JArray< ::java::beans::PropertyDescriptor * > * getPropertyDescriptors() = 0;
-  virtual jint getDefaultPropertyIndex() = 0;
-  virtual JArray< ::java::beans::MethodDescriptor * > * getMethodDescriptors() = 0;
-  virtual JArray< ::java::beans::BeanInfo * > * getAdditionalBeanInfo() = 0;
-  virtual ::java::awt::Image * getIcon(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContextServiceProviderBeanInfo__
diff --git a/libjava/java/beans/beancontext/BeanContextServiceRevokedEvent.h b/libjava/java/beans/beancontext/BeanContextServiceRevokedEvent.h
deleted file mode 100644
index 700da3ac419..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServiceRevokedEvent.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServiceRevokedEvent__
-#define __java_beans_beancontext_BeanContextServiceRevokedEvent__
-
-#pragma interface
-
-#include <java/beans/beancontext/BeanContextEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServiceRevokedEvent;
-          class BeanContextServices;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServiceRevokedEvent : public ::java::beans::beancontext::BeanContextEvent
-{
-
-public:
-  BeanContextServiceRevokedEvent(::java::beans::beancontext::BeanContextServices *, ::java::lang::Class *, jboolean);
-  virtual ::java::lang::Class * getServiceClass();
-  virtual jboolean isServiceClass(::java::lang::Class *);
-  virtual ::java::beans::beancontext::BeanContextServices * getSourceAsBeanContextServices();
-  virtual jboolean isCurrentServiceInvalidNow();
-private:
-  static const jlong serialVersionUID = -1295543154724961754LL;
-public: // actually protected
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::beans::beancontext::BeanContextEvent)))) serviceClass;
-private:
-  jboolean invalidateRefs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextServiceRevokedEvent__
diff --git a/libjava/java/beans/beancontext/BeanContextServiceRevokedListener.h b/libjava/java/beans/beancontext/BeanContextServiceRevokedListener.h
deleted file mode 100644
index c74f48a087e..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServiceRevokedListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServiceRevokedListener__
-#define __java_beans_beancontext_BeanContextServiceRevokedListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServiceRevokedEvent;
-          class BeanContextServiceRevokedListener;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServiceRevokedListener : public ::java::lang::Object
-{
-
-public:
-  virtual void serviceRevoked(::java::beans::beancontext::BeanContextServiceRevokedEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContextServiceRevokedListener__
diff --git a/libjava/java/beans/beancontext/BeanContextServices.h b/libjava/java/beans/beancontext/BeanContextServices.h
deleted file mode 100644
index fd67419768e..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServices.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServices__
-#define __java_beans_beancontext_BeanContextServices__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class VetoableChangeListener;
-      namespace beancontext
-      {
-          class BeanContext;
-          class BeanContextChild;
-          class BeanContextMembershipListener;
-          class BeanContextServiceAvailableEvent;
-          class BeanContextServiceProvider;
-          class BeanContextServiceRevokedEvent;
-          class BeanContextServiceRevokedListener;
-          class BeanContextServices;
-          class BeanContextServicesListener;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServices : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean addService(::java::lang::Class *, ::java::beans::beancontext::BeanContextServiceProvider *) = 0;
-  virtual void revokeService(::java::lang::Class *, ::java::beans::beancontext::BeanContextServiceProvider *, jboolean) = 0;
-  virtual void releaseService(::java::beans::beancontext::BeanContextChild *, ::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getService(::java::beans::beancontext::BeanContextChild *, ::java::lang::Object *, ::java::lang::Class *, ::java::lang::Object *, ::java::beans::beancontext::BeanContextServiceRevokedListener *) = 0;
-  virtual ::java::util::Iterator * getCurrentServiceClasses() = 0;
-  virtual ::java::util::Iterator * getCurrentServiceSelectors(::java::lang::Class *) = 0;
-  virtual jboolean hasService(::java::lang::Class *) = 0;
-  virtual void addBeanContextServicesListener(::java::beans::beancontext::BeanContextServicesListener *) = 0;
-  virtual void removeBeanContextServicesListener(::java::beans::beancontext::BeanContextServicesListener *) = 0;
-  virtual ::java::lang::Object * instantiateChild(::java::lang::String *) = 0;
-  virtual ::java::net::URL * getResource(::java::lang::String *, ::java::beans::beancontext::BeanContextChild *) = 0;
-  virtual ::java::io::InputStream * getResourceAsStream(::java::lang::String *, ::java::beans::beancontext::BeanContextChild *) = 0;
-  virtual void addBeanContextMembershipListener(::java::beans::beancontext::BeanContextMembershipListener *) = 0;
-  virtual void removeBeanContextMembershipListener(::java::beans::beancontext::BeanContextMembershipListener *) = 0;
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  virtual void setBeanContext(::java::beans::beancontext::BeanContext *) = 0;
-  virtual ::java::beans::beancontext::BeanContext * getBeanContext() = 0;
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *) = 0;
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *) = 0;
-  virtual void addVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *) = 0;
-  virtual void removeVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *) = 0;
-  virtual jboolean needsGui() = 0;
-  virtual jboolean avoidingGui() = 0;
-  virtual void dontUseGui() = 0;
-  virtual void okToUseGui() = 0;
-  virtual void setDesignTime(jboolean) = 0;
-  virtual jboolean isDesignTime() = 0;
-  virtual void serviceAvailable(::java::beans::beancontext::BeanContextServiceAvailableEvent *) = 0;
-  virtual void serviceRevoked(::java::beans::beancontext::BeanContextServiceRevokedEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContextServices__
diff --git a/libjava/java/beans/beancontext/BeanContextServicesListener.h b/libjava/java/beans/beancontext/BeanContextServicesListener.h
deleted file mode 100644
index 2be3753497d..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServicesListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServicesListener__
-#define __java_beans_beancontext_BeanContextServicesListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServiceAvailableEvent;
-          class BeanContextServiceRevokedEvent;
-          class BeanContextServicesListener;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServicesListener : public ::java::lang::Object
-{
-
-public:
-  virtual void serviceAvailable(::java::beans::beancontext::BeanContextServiceAvailableEvent *) = 0;
-  virtual void serviceRevoked(::java::beans::beancontext::BeanContextServiceRevokedEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_beans_beancontext_BeanContextServicesListener__
diff --git a/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSChild.h b/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSChild.h
deleted file mode 100644
index d74827c1335..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSChild.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServicesSupport$BCSSChild__
-#define __java_beans_beancontext_BeanContextServicesSupport$BCSSChild__
-
-#pragma interface
-
-#include <java/beans/beancontext/BeanContextSupport$BCSChild.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServicesSupport;
-          class BeanContextServicesSupport$BCSSChild;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServicesSupport$BCSSChild : public ::java::beans::beancontext::BeanContextSupport$BCSChild
-{
-
-public: // actually package-private
-  BeanContextServicesSupport$BCSSChild(::java::beans::beancontext::BeanContextServicesSupport *, ::java::lang::Object *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -3263851306889194873LL;
-public: // actually package-private
-  ::java::beans::beancontext::BeanContextServicesSupport * __attribute__((aligned(__alignof__( ::java::beans::beancontext::BeanContextSupport$BCSChild)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextServicesSupport$BCSSChild__
diff --git a/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.h b/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.h
deleted file mode 100644
index f5b8392f1ba..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServicesSupport$BCSSProxyServiceProvider__
-#define __java_beans_beancontext_BeanContextServicesSupport$BCSSProxyServiceProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServiceProvider;
-          class BeanContextServiceRevokedEvent;
-          class BeanContextServices;
-          class BeanContextServicesSupport;
-          class BeanContextServicesSupport$BCSSProxyServiceProvider;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServicesSupport$BCSSProxyServiceProvider : public ::java::lang::Object
-{
-
-  BeanContextServicesSupport$BCSSProxyServiceProvider(::java::beans::beancontext::BeanContextServicesSupport *, ::java::beans::beancontext::BeanContextServiceProvider *);
-public:
-  virtual ::java::util::Iterator * getCurrentServiceSelectors(::java::beans::beancontext::BeanContextServices *, ::java::lang::Class *);
-  virtual ::java::lang::Object * getService(::java::beans::beancontext::BeanContextServices *, ::java::lang::Object *, ::java::lang::Class *, ::java::lang::Object *);
-  virtual void releaseService(::java::beans::beancontext::BeanContextServices *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void serviceRevoked(::java::beans::beancontext::BeanContextServiceRevokedEvent *);
-private:
-  static const jlong serialVersionUID = 7078212910685744490LL;
-  ::java::beans::beancontext::BeanContextServiceProvider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) provider;
-public: // actually package-private
-  ::java::beans::beancontext::BeanContextServicesSupport * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextServicesSupport$BCSSProxyServiceProvider__
diff --git a/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider.h b/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider.h
deleted file mode 100644
index 999ce912fd9..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvider.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServicesSupport$BCSSServiceProvider__
-#define __java_beans_beancontext_BeanContextServicesSupport$BCSSServiceProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServiceProvider;
-          class BeanContextServicesSupport$BCSSServiceProvider;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServicesSupport$BCSSServiceProvider : public ::java::lang::Object
-{
-
-  BeanContextServicesSupport$BCSSServiceProvider(::java::lang::Class *, ::java::beans::beancontext::BeanContextServiceProvider *);
-public: // actually protected
-  virtual ::java::beans::beancontext::BeanContextServiceProvider * getServiceProvider();
-private:
-  ::java::lang::Class * getServiceClass();
-public: // actually package-private
-  static ::java::lang::Class * access$0(::java::beans::beancontext::BeanContextServicesSupport$BCSSServiceProvider *);
-  BeanContextServicesSupport$BCSSServiceProvider(::java::lang::Class *, ::java::beans::beancontext::BeanContextServiceProvider *, ::java::beans::beancontext::BeanContextServicesSupport$BCSSServiceProvider *);
-private:
-  static const jlong serialVersionUID = 861278251667444782LL;
-public: // actually protected
-  ::java::beans::beancontext::BeanContextServiceProvider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) serviceProvider;
-private:
-  ::java::lang::Class * serviceClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextServicesSupport$BCSSServiceProvider__
diff --git a/libjava/java/beans/beancontext/BeanContextServicesSupport$Request.h b/libjava/java/beans/beancontext/BeanContextServicesSupport$Request.h
deleted file mode 100644
index 64fb227665c..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServicesSupport$Request.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServicesSupport$Request__
-#define __java_beans_beancontext_BeanContextServicesSupport$Request__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServicesSupport$Request;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServicesSupport$Request : public ::java::lang::Object
-{
-
-public:
-  BeanContextServicesSupport$Request(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getRequestor();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) requestor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextServicesSupport$Request__
diff --git a/libjava/java/beans/beancontext/BeanContextServicesSupport$ServiceLease.h b/libjava/java/beans/beancontext/BeanContextServicesSupport$ServiceLease.h
deleted file mode 100644
index 0f6a32ea122..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServicesSupport$ServiceLease.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServicesSupport$ServiceLease__
-#define __java_beans_beancontext_BeanContextServicesSupport$ServiceLease__
-
-#pragma interface
-
-#include <java/beans/beancontext/BeanContextServicesSupport$Request.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServicesSupport$ServiceLease;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServicesSupport$ServiceLease : public ::java::beans::beancontext::BeanContextServicesSupport$Request
-{
-
-public:
-  BeanContextServicesSupport$ServiceLease(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getService();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::beans::beancontext::BeanContextServicesSupport$Request)))) service;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextServicesSupport$ServiceLease__
diff --git a/libjava/java/beans/beancontext/BeanContextServicesSupport$ServiceRequest.h b/libjava/java/beans/beancontext/BeanContextServicesSupport$ServiceRequest.h
deleted file mode 100644
index 24465df7028..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServicesSupport$ServiceRequest.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServicesSupport$ServiceRequest__
-#define __java_beans_beancontext_BeanContextServicesSupport$ServiceRequest__
-
-#pragma interface
-
-#include <java/beans/beancontext/BeanContextServicesSupport$Request.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextServiceRevokedListener;
-          class BeanContextServicesSupport$ServiceRequest;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServicesSupport$ServiceRequest : public ::java::beans::beancontext::BeanContextServicesSupport$Request
-{
-
-public:
-  BeanContextServicesSupport$ServiceRequest(::java::lang::Object *, ::java::beans::beancontext::BeanContextServiceRevokedListener *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::beans::beancontext::BeanContextServiceRevokedListener * getListener();
-private:
-  ::java::beans::beancontext::BeanContextServiceRevokedListener * __attribute__((aligned(__alignof__( ::java::beans::beancontext::BeanContextServicesSupport$Request)))) listener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextServicesSupport$ServiceRequest__
diff --git a/libjava/java/beans/beancontext/BeanContextServicesSupport.h b/libjava/java/beans/beancontext/BeanContextServicesSupport.h
deleted file mode 100644
index f16583166b5..00000000000
--- a/libjava/java/beans/beancontext/BeanContextServicesSupport.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextServicesSupport__
-#define __java_beans_beancontext_BeanContextServicesSupport__
-
-#pragma interface
-
-#include <java/beans/beancontext/BeanContextSupport.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextChild;
-          class BeanContextServiceAvailableEvent;
-          class BeanContextServiceProvider;
-          class BeanContextServiceRevokedEvent;
-          class BeanContextServiceRevokedListener;
-          class BeanContextServices;
-          class BeanContextServicesListener;
-          class BeanContextServicesSupport;
-          class BeanContextServicesSupport$BCSSProxyServiceProvider;
-          class BeanContextServicesSupport$BCSSServiceProvider;
-          class BeanContextSupport$BCSChild;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextServicesSupport : public ::java::beans::beancontext::BeanContextSupport
-{
-
-public:
-  BeanContextServicesSupport();
-  BeanContextServicesSupport(::java::beans::beancontext::BeanContextServices *);
-  BeanContextServicesSupport(::java::beans::beancontext::BeanContextServices *, ::java::util::Locale *);
-  BeanContextServicesSupport(::java::beans::beancontext::BeanContextServices *, ::java::util::Locale *, jboolean);
-  BeanContextServicesSupport(::java::beans::beancontext::BeanContextServices *, ::java::util::Locale *, jboolean, jboolean);
-  virtual void addBeanContextServicesListener(::java::beans::beancontext::BeanContextServicesListener *);
-  virtual jboolean addService(::java::lang::Class *, ::java::beans::beancontext::BeanContextServiceProvider *);
-public: // actually protected
-  virtual jboolean addService(::java::lang::Class *, ::java::beans::beancontext::BeanContextServiceProvider *, jboolean);
-  virtual void bcsPreDeserializationHook(::java::io::ObjectInputStream *);
-  virtual void bcsPreSerializationHook(::java::io::ObjectOutputStream *);
-  virtual void childJustRemovedHook(::java::lang::Object *, ::java::beans::beancontext::BeanContextSupport$BCSChild *);
-  virtual ::java::beans::beancontext::BeanContextSupport$BCSChild * createBCSChild(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::beans::beancontext::BeanContextServicesSupport$BCSSServiceProvider * createBCSSServiceProvider(::java::lang::Class *, ::java::beans::beancontext::BeanContextServiceProvider *);
-  virtual void fireServiceAdded(::java::beans::beancontext::BeanContextServiceAvailableEvent *);
-  virtual void fireServiceAdded(::java::lang::Class *);
-  virtual void fireServiceRevoked(::java::beans::beancontext::BeanContextServiceRevokedEvent *);
-  virtual void fireServiceRevoked(::java::lang::Class *, jboolean);
-public:
-  virtual ::java::beans::beancontext::BeanContextServices * getBeanContextServicesPeer();
-public: // actually protected
-  static ::java::beans::beancontext::BeanContextServicesListener * getChildBeanContextServicesListener(::java::lang::Object *);
-public:
-  virtual ::java::util::Iterator * getCurrentServiceClasses();
-  virtual ::java::util::Iterator * getCurrentServiceSelectors(::java::lang::Class *);
-  virtual ::java::lang::Object * getService(::java::beans::beancontext::BeanContextChild *, ::java::lang::Object *, ::java::lang::Class *, ::java::lang::Object *, ::java::beans::beancontext::BeanContextServiceRevokedListener *);
-  virtual jboolean hasService(::java::lang::Class *);
-  virtual void initialize();
-public: // actually protected
-  virtual void initializeBeanContextResources();
-  virtual void releaseBeanContextResources();
-public:
-  virtual void releaseService(::java::beans::beancontext::BeanContextChild *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void removeBeanContextServicesListener(::java::beans::beancontext::BeanContextServicesListener *);
-  virtual void revokeService(::java::lang::Class *, ::java::beans::beancontext::BeanContextServiceProvider *, jboolean);
-  virtual void serviceAvailable(::java::beans::beancontext::BeanContextServiceAvailableEvent *);
-  virtual void serviceRevoked(::java::beans::beancontext::BeanContextServiceRevokedEvent *);
-private:
-  static const jlong serialVersionUID = -8494482757288719206LL;
-public: // actually protected
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::beans::beancontext::BeanContextSupport)))) bcsListeners;
-  ::java::beans::beancontext::BeanContextServicesSupport$BCSSProxyServiceProvider * proxy;
-  jint serializable;
-  ::java::util::HashMap * services;
-private:
-  ::java::util::HashMap * serviceUsers;
-  ::java::util::HashMap * serviceRequests;
-  ::java::util::HashMap * serviceLeases;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextServicesSupport__
diff --git a/libjava/java/beans/beancontext/BeanContextSupport$BCSChild.h b/libjava/java/beans/beancontext/BeanContextSupport$BCSChild.h
deleted file mode 100644
index 40720fb5748..00000000000
--- a/libjava/java/beans/beancontext/BeanContextSupport$BCSChild.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextSupport$BCSChild__
-#define __java_beans_beancontext_BeanContextSupport$BCSChild__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextSupport;
-          class BeanContextSupport$BCSChild;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextSupport$BCSChild : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BeanContextSupport$BCSChild(::java::beans::beancontext::BeanContextSupport *, ::java::lang::Object *, ::java::lang::Object *);
-private:
-  ::java::lang::Object * getTargetChild();
-public: // actually package-private
-  static ::java::lang::Object * access$0(::java::beans::beancontext::BeanContextSupport$BCSChild *);
-private:
-  static const jlong serialVersionUID = -5815286101609939109LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) targetChild;
-  ::java::lang::Object * peer;
-public: // actually package-private
-  ::java::beans::beancontext::BeanContextSupport * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextSupport$BCSChild__
diff --git a/libjava/java/beans/beancontext/BeanContextSupport$BCSIterator.h b/libjava/java/beans/beancontext/BeanContextSupport$BCSIterator.h
deleted file mode 100644
index 551697939f0..00000000000
--- a/libjava/java/beans/beancontext/BeanContextSupport$BCSIterator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextSupport$BCSIterator__
-#define __java_beans_beancontext_BeanContextSupport$BCSIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-      namespace beancontext
-      {
-          class BeanContextSupport$BCSIterator;
-      }
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextSupport$BCSIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BeanContextSupport$BCSIterator(::java::util::Iterator *);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-private:
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) child;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextSupport$BCSIterator__
diff --git a/libjava/java/beans/beancontext/BeanContextSupport.h b/libjava/java/beans/beancontext/BeanContextSupport.h
deleted file mode 100644
index 36678b520ca..00000000000
--- a/libjava/java/beans/beancontext/BeanContextSupport.h
+++ /dev/null
@@ -1,136 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_beans_beancontext_BeanContextSupport__
-#define __java_beans_beancontext_BeanContextSupport__
-
-#pragma interface
-
-#include <java/beans/beancontext/BeanContextChildSupport.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class PropertyChangeListener;
-        class VetoableChangeListener;
-        class Visibility;
-      namespace beancontext
-      {
-          class BeanContext;
-          class BeanContextChild;
-          class BeanContextMembershipEvent;
-          class BeanContextMembershipListener;
-          class BeanContextSupport;
-          class BeanContextSupport$BCSChild;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class java::beans::beancontext::BeanContextSupport : public ::java::beans::beancontext::BeanContextChildSupport
-{
-
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  BeanContextSupport();
-  BeanContextSupport(::java::beans::beancontext::BeanContext *);
-  BeanContextSupport(::java::beans::beancontext::BeanContext *, ::java::util::Locale *);
-  BeanContextSupport(::java::beans::beancontext::BeanContext *, ::java::util::Locale *, jboolean);
-  BeanContextSupport(::java::beans::beancontext::BeanContext *, ::java::util::Locale *, jboolean, jboolean);
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual void addBeanContextMembershipListener(::java::beans::beancontext::BeanContextMembershipListener *);
-  virtual jboolean avoidingGui();
-public: // actually protected
-  virtual ::java::util::Iterator * bcsChildren();
-  virtual void bcsPreDeserializationHook(::java::io::ObjectInputStream *);
-  virtual void bcsPreSerializationHook(::java::io::ObjectOutputStream *);
-  virtual void childDeserializedHook(::java::lang::Object *, ::java::beans::beancontext::BeanContextSupport$BCSChild *);
-  virtual void childJustAddedHook(::java::lang::Object *, ::java::beans::beancontext::BeanContextSupport$BCSChild *);
-  virtual void childJustRemovedHook(::java::lang::Object *, ::java::beans::beancontext::BeanContextSupport$BCSChild *);
-  static jboolean classEquals(::java::lang::Class *, ::java::lang::Class *);
-public:
-  virtual void clear();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean containsAll(::java::util::Collection *);
-  virtual jboolean containsKey(::java::lang::Object *);
-public: // actually protected
-  virtual JArray< ::java::lang::Object * > * copyChildren();
-  virtual ::java::beans::beancontext::BeanContextSupport$BCSChild * createBCSChild(::java::lang::Object *, ::java::lang::Object *);
-  virtual void deserialize(::java::io::ObjectInputStream *, ::java::util::Collection *);
-public:
-  virtual void dontUseGui();
-public: // actually protected
-  virtual void fireChildrenAdded(::java::beans::beancontext::BeanContextMembershipEvent *);
-  virtual void fireChildrenRemoved(::java::beans::beancontext::BeanContextMembershipEvent *);
-public:
-  virtual ::java::beans::beancontext::BeanContext * getBeanContextPeer();
-public: // actually protected
-  static ::java::beans::beancontext::BeanContextChild * getChildBeanContextChild(::java::lang::Object *);
-  static ::java::beans::beancontext::BeanContextMembershipListener * getChildBeanContextMembershipListener(::java::lang::Object *);
-  static ::java::beans::PropertyChangeListener * getChildPropertyChangeListener(::java::lang::Object *);
-  static ::java::io::Serializable * getChildSerializable(::java::lang::Object *);
-  static ::java::beans::VetoableChangeListener * getChildVetoableChangeListener(::java::lang::Object *);
-  static ::java::beans::Visibility * getChildVisibility(::java::lang::Object *);
-public:
-  virtual ::java::util::Locale * getLocale();
-  virtual ::java::net::URL * getResource(::java::lang::String *, ::java::beans::beancontext::BeanContextChild *);
-  virtual ::java::io::InputStream * getResourceAsStream(::java::lang::String *, ::java::beans::beancontext::BeanContextChild *);
-public: // actually protected
-  virtual void initialize();
-public:
-  virtual ::java::lang::Object * instantiateChild(::java::lang::String *);
-  virtual jboolean isDesignTime();
-  virtual jboolean isEmpty();
-  virtual jboolean isSerializing();
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean needsGui();
-  virtual void okToUseGui();
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void readChildren(::java::io::ObjectInputStream *);
-  virtual jboolean remove(::java::lang::Object *);
-public: // actually protected
-  virtual jboolean remove(::java::lang::Object *, jboolean);
-public:
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual void removeBeanContextMembershipListener(::java::beans::beancontext::BeanContextMembershipListener *);
-  virtual jboolean retainAll(::java::util::Collection *);
-public: // actually protected
-  virtual void serialize(::java::io::ObjectOutputStream *, ::java::util::Collection *);
-public:
-  virtual void setDesignTime(jboolean);
-  virtual void setLocale(::java::util::Locale *);
-  virtual jint size();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-public: // actually protected
-  virtual jboolean validatePendingAdd(::java::lang::Object *);
-  virtual jboolean validatePendingRemove(::java::lang::Object *);
-public:
-  virtual void vetoableChange(::java::beans::PropertyChangeEvent *);
-  virtual void writeChildren(::java::io::ObjectOutputStream *);
-private:
-  static const jlong serialVersionUID = -4879613978649577204LL;
-public: // actually protected
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::beans::beancontext::BeanContextChildSupport)))) bcmListeners;
-  ::java::util::HashMap * children;
-  jboolean designTime;
-  ::java::util::Locale * locale;
-  jboolean okToUseGui__;
-private:
-  jboolean serializing;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_beans_beancontext_BeanContextSupport__
diff --git a/libjava/java/io/BufferedInputStream.h b/libjava/java/io/BufferedInputStream.h
deleted file mode 100644
index d2851da735b..00000000000
--- a/libjava/java/io/BufferedInputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_BufferedInputStream__
-#define __java_io_BufferedInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::BufferedInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  BufferedInputStream(::java::io::InputStream *);
-  BufferedInputStream(::java::io::InputStream *, jint);
-  virtual jint available();
-  virtual void close();
-  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 package-private
-  virtual jboolean refill();
-private:
-  static const jint DEFAULT_BUFFER_SIZE = 2048;
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) buf;
-  jint count;
-  jint pos;
-  jint markpos;
-  jint marklimit;
-private:
-  jint bufferSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_BufferedInputStream__
diff --git a/libjava/java/io/BufferedOutputStream.h b/libjava/java/io/BufferedOutputStream.h
deleted file mode 100644
index ce34567c61b..00000000000
--- a/libjava/java/io/BufferedOutputStream.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_BufferedOutputStream__
-#define __java_io_BufferedOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::BufferedOutputStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  BufferedOutputStream(::java::io::OutputStream *);
-  BufferedOutputStream(::java::io::OutputStream *, jint);
-  virtual void flush();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-private:
-  static const jint DEFAULT_BUFFER_SIZE = 512;
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) buf;
-  jint count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_BufferedOutputStream__
diff --git a/libjava/java/io/BufferedReader.h b/libjava/java/io/BufferedReader.h
deleted file mode 100644
index 66d77663a7d..00000000000
--- a/libjava/java/io/BufferedReader.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_BufferedReader__
-#define __java_io_BufferedReader__
-
-#pragma interface
-
-#include <java/io/Reader.h>
-#include <gcj/array.h>
-
-
-class java::io::BufferedReader : public ::java::io::Reader
-{
-
-public:
-  BufferedReader(::java::io::Reader *);
-  BufferedReader(::java::io::Reader *, jint);
-  virtual void close();
-  virtual jboolean markSupported();
-  virtual void mark(jint);
-  virtual void reset();
-  virtual jboolean ready();
-  virtual jint read(JArray< jchar > *, jint, jint);
-private:
-  jint fill();
-public:
-  virtual jint read();
-private:
-  jint lineEnd(jint);
-public:
-  virtual ::java::lang::String * readLine();
-  virtual jlong skip(jlong);
-private:
-  void checkStatus();
-public: // actually package-private
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::io::Reader)))) in;
-  JArray< jchar > * buffer;
-  jint pos;
-  jint limit;
-  jint markPos;
-  static const jint DEFAULT_BUFFER_SIZE = 8192;
-private:
-  ::java::lang::StringBuffer * sbuf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_BufferedReader__
diff --git a/libjava/java/io/BufferedWriter.h b/libjava/java/io/BufferedWriter.h
deleted file mode 100644
index 68cfa095e24..00000000000
--- a/libjava/java/io/BufferedWriter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_BufferedWriter__
-#define __java_io_BufferedWriter__
-
-#pragma interface
-
-#include <java/io/Writer.h>
-#include <gcj/array.h>
-
-
-class java::io::BufferedWriter : public ::java::io::Writer
-{
-
-public:
-  BufferedWriter(::java::io::Writer *);
-  BufferedWriter(::java::io::Writer *, jint);
-  virtual void close();
-  virtual void flush();
-  virtual void newLine();
-  virtual void write(jint);
-  virtual void write(JArray< jchar > *, jint, jint);
-  virtual void write(::java::lang::String *, jint, jint);
-private:
-  void localFlush();
-  static const jint DEFAULT_BUFFER_SIZE = 8192;
-  ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::io::Writer)))) out;
-public: // actually package-private
-  JArray< jchar > * buffer;
-  jint count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_BufferedWriter__
diff --git a/libjava/java/io/ByteArrayInputStream.h b/libjava/java/io/ByteArrayInputStream.h
deleted file mode 100644
index 85411b3e04c..00000000000
--- a/libjava/java/io/ByteArrayInputStream.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ByteArrayInputStream__
-#define __java_io_ByteArrayInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::ByteArrayInputStream : public ::java::io::InputStream
-{
-
-public:
-  ByteArrayInputStream(JArray< jbyte > *);
-  ByteArrayInputStream(JArray< jbyte > *, jint, jint);
-  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
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) buf;
-  jint pos;
-  jint mark__;
-  jint count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ByteArrayInputStream__
diff --git a/libjava/java/io/ByteArrayOutputStream.h b/libjava/java/io/ByteArrayOutputStream.h
deleted file mode 100644
index 907c3d4ec91..00000000000
--- a/libjava/java/io/ByteArrayOutputStream.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ByteArrayOutputStream__
-#define __java_io_ByteArrayOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::ByteArrayOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  ByteArrayOutputStream();
-  ByteArrayOutputStream(jint);
-  virtual void reset();
-  virtual jint size();
-  virtual JArray< jbyte > * toByteArray();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(::java::lang::String *);
-  virtual ::java::lang::String * toString(jint);
-private:
-  void resize(jint);
-public:
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void writeTo(::java::io::OutputStream *);
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) buf;
-  jint count;
-private:
-  static const jint DEFAULT_INITIAL_BUFFER_SIZE = 32;
-  static jint initial_buffer_size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ByteArrayOutputStream__
diff --git a/libjava/java/io/CharArrayReader.h b/libjava/java/io/CharArrayReader.h
deleted file mode 100644
index f8b8f5d4c95..00000000000
--- a/libjava/java/io/CharArrayReader.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_CharArrayReader__
-#define __java_io_CharArrayReader__
-
-#pragma interface
-
-#include <java/io/Reader.h>
-#include <gcj/array.h>
-
-
-class java::io::CharArrayReader : public ::java::io::Reader
-{
-
-public:
-  CharArrayReader(JArray< jchar > *);
-  CharArrayReader(JArray< jchar > *, jint, jint);
-  virtual void close();
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual jint read();
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual jboolean ready();
-  virtual void reset();
-  virtual jlong skip(jlong);
-public: // actually protected
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::io::Reader)))) buf;
-  jint pos;
-  jint markedPos;
-  jint count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_CharArrayReader__
diff --git a/libjava/java/io/CharArrayWriter.h b/libjava/java/io/CharArrayWriter.h
deleted file mode 100644
index 35f49d23b78..00000000000
--- a/libjava/java/io/CharArrayWriter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_CharArrayWriter__
-#define __java_io_CharArrayWriter__
-
-#pragma interface
-
-#include <java/io/Writer.h>
-#include <gcj/array.h>
-
-
-class java::io::CharArrayWriter : public ::java::io::Writer
-{
-
-public:
-  CharArrayWriter();
-  CharArrayWriter(jint);
-  virtual void close();
-  virtual void flush();
-  virtual void reset();
-  virtual jint size();
-  virtual JArray< jchar > * toCharArray();
-  virtual ::java::lang::String * toString();
-  virtual void write(jint);
-  virtual void write(JArray< jchar > *, jint, jint);
-  virtual void write(::java::lang::String *, jint, jint);
-  virtual void writeTo(::java::io::Writer *);
-  virtual ::java::io::CharArrayWriter * target$append(jchar);
-  virtual ::java::io::CharArrayWriter * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::CharArrayWriter * target$append(::java::lang::CharSequence *, jint, jint);
-private:
-  void resize(jint);
-public:
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
-  virtual ::java::lang::Appendable * append(jchar);
-  virtual ::java::io::Writer * target$append(jchar);
-private:
-  static const jint DEFAULT_INITIAL_BUFFER_SIZE = 32;
-public: // actually protected
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::io::Writer)))) buf;
-  jint count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_CharArrayWriter__
diff --git a/libjava/java/io/CharConversionException.h b/libjava/java/io/CharConversionException.h
deleted file mode 100644
index 95034a89b15..00000000000
--- a/libjava/java/io/CharConversionException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_CharConversionException__
-#define __java_io_CharConversionException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-
-class java::io::CharConversionException : public ::java::io::IOException
-{
-
-public:
-  CharConversionException();
-  CharConversionException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8680016352018427031LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_CharConversionException__
diff --git a/libjava/java/io/Closeable.h b/libjava/java/io/Closeable.h
deleted file mode 100644
index 4668f50892f..00000000000
--- a/libjava/java/io/Closeable.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_Closeable__
-#define __java_io_Closeable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::Closeable : public ::java::lang::Object
-{
-
-public:
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_Closeable__
diff --git a/libjava/java/io/DataInput.h b/libjava/java/io/DataInput.h
deleted file mode 100644
index 9cb4952ffa7..00000000000
--- a/libjava/java/io/DataInput.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_DataInput__
-#define __java_io_DataInput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::io::DataInput : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean readBoolean() = 0;
-  virtual jbyte readByte() = 0;
-  virtual jint readUnsignedByte() = 0;
-  virtual jchar readChar() = 0;
-  virtual jshort readShort() = 0;
-  virtual jint readUnsignedShort() = 0;
-  virtual jint readInt() = 0;
-  virtual jlong readLong() = 0;
-  virtual jfloat readFloat() = 0;
-  virtual jdouble readDouble() = 0;
-  virtual ::java::lang::String * readLine() = 0;
-  virtual ::java::lang::String * readUTF() = 0;
-  virtual void readFully(JArray< jbyte > *) = 0;
-  virtual void readFully(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint skipBytes(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_DataInput__
diff --git a/libjava/java/io/DataInputStream.h b/libjava/java/io/DataInputStream.h
deleted file mode 100644
index a7b84590f01..00000000000
--- a/libjava/java/io/DataInputStream.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_DataInputStream__
-#define __java_io_DataInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::DataInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  DataInputStream(::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 ::java::lang::String * readUTF();
-  static ::java::lang::String * readUTF(::java::io::DataInput *);
-  virtual jint skipBytes(jint);
-public: // actually package-private
-  static jboolean convertToBoolean(jint);
-  static jbyte convertToByte(jint);
-  static jint convertToUnsignedByte(jint);
-  static jchar convertToChar(JArray< jbyte > *);
-  static jshort convertToShort(JArray< jbyte > *);
-  static jint convertToUnsignedShort(JArray< jbyte > *);
-  static jint convertToInt(JArray< jbyte > *);
-  static jlong convertToLong(JArray< jbyte > *);
-  static ::java::lang::String * convertFromUTF(JArray< jbyte > *);
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_DataInputStream__
diff --git a/libjava/java/io/DataOutput.h b/libjava/java/io/DataOutput.h
deleted file mode 100644
index f18f5e454cb..00000000000
--- a/libjava/java/io/DataOutput.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_DataOutput__
-#define __java_io_DataOutput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::io::DataOutput : public ::java::lang::Object
-{
-
-public:
-  virtual void writeBoolean(jboolean) = 0;
-  virtual void writeByte(jint) = 0;
-  virtual void writeChar(jint) = 0;
-  virtual void writeShort(jint) = 0;
-  virtual void writeInt(jint) = 0;
-  virtual void writeLong(jlong) = 0;
-  virtual void writeFloat(jfloat) = 0;
-  virtual void writeDouble(jdouble) = 0;
-  virtual void writeBytes(::java::lang::String *) = 0;
-  virtual void writeChars(::java::lang::String *) = 0;
-  virtual void writeUTF(::java::lang::String *) = 0;
-  virtual void write(jint) = 0;
-  virtual void write(JArray< jbyte > *) = 0;
-  virtual void write(JArray< jbyte > *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_DataOutput__
diff --git a/libjava/java/io/DataOutputStream.h b/libjava/java/io/DataOutputStream.h
deleted file mode 100644
index 0d89dca32bc..00000000000
--- a/libjava/java/io/DataOutputStream.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_DataOutputStream__
-#define __java_io_DataOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::DataOutputStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  DataOutputStream(::java::io::OutputStream *);
-  virtual void flush();
-  virtual jint size();
-  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);
-  virtual void writeBytes(::java::lang::String *);
-  virtual void writeChars(::java::lang::String *);
-private:
-  jint getUTFlength(::java::lang::String *, jint, jint);
-public:
-  virtual void writeUTF(::java::lang::String *);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) written;
-private:
-  JArray< jbyte > * buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_DataOutputStream__
diff --git a/libjava/java/io/DeleteFileHelper$1.h b/libjava/java/io/DeleteFileHelper$1.h
deleted file mode 100644
index 48f56715247..00000000000
--- a/libjava/java/io/DeleteFileHelper$1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_DeleteFileHelper$1__
-#define __java_io_DeleteFileHelper$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::DeleteFileHelper$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DeleteFileHelper$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_DeleteFileHelper$1__
diff --git a/libjava/java/io/DeleteFileHelper.h b/libjava/java/io/DeleteFileHelper.h
deleted file mode 100644
index 9b61c3aab71..00000000000
--- a/libjava/java/io/DeleteFileHelper.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_DeleteFileHelper__
-#define __java_io_DeleteFileHelper__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-
-class java::io::DeleteFileHelper : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  static void add(::java::io::File *);
-private:
-  static void deleteFiles();
-public: // actually package-private
-  DeleteFileHelper();
-public:
-  void run();
-private:
-  static ::java::util::ArrayList * filesToDelete;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_DeleteFileHelper__
diff --git a/libjava/java/io/EOFException.h b/libjava/java/io/EOFException.h
deleted file mode 100644
index be4b255e7c6..00000000000
--- a/libjava/java/io/EOFException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_EOFException__
-#define __java_io_EOFException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-
-class java::io::EOFException : public ::java::io::IOException
-{
-
-public:
-  EOFException();
-  EOFException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6433858223774886977LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_EOFException__
diff --git a/libjava/java/io/Externalizable.h b/libjava/java/io/Externalizable.h
deleted file mode 100644
index b74cf0860bc..00000000000
--- a/libjava/java/io/Externalizable.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_Externalizable__
-#define __java_io_Externalizable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::Externalizable : public ::java::lang::Object
-{
-
-public:
-  virtual void readExternal(::java::io::ObjectInput *) = 0;
-  virtual void writeExternal(::java::io::ObjectOutput *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_Externalizable__
diff --git a/libjava/java/io/File.h b/libjava/java/io/File.h
deleted file mode 100644
index 35ca3b7dfc6..00000000000
--- a/libjava/java/io/File.h
+++ /dev/null
@@ -1,150 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_File__
-#define __java_io_File__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-        class URL;
-    }
-  }
-}
-
-class java::io::File : public ::java::lang::Object
-{
-
-  jlong attr(jint);
-  jboolean _access(jint);
-  jboolean _stat(jint);
-  static void init_native();
-public:
-  virtual jboolean canRead();
-  virtual jboolean canWrite();
-private:
-  jboolean performCreate();
-public:
-  virtual jboolean createNewFile();
-private:
-  jboolean performDelete();
-public:
-  virtual jboolean delete$();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  jboolean internalExists();
-public:
-  virtual jboolean exists();
-  File(::java::lang::String *);
-private:
-  ::java::lang::String * normalizePath(::java::lang::String *);
-public:
-  File(::java::lang::String *, ::java::lang::String *);
-  File(::java::io::File *, ::java::lang::String *);
-  File(::java::net::URI *);
-  virtual ::java::lang::String * getAbsolutePath();
-  virtual ::java::io::File * getAbsoluteFile();
-  virtual ::java::lang::String * getCanonicalPath();
-  virtual ::java::io::File * getCanonicalFile();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getParent();
-  virtual ::java::io::File * getParentFile();
-  virtual ::java::lang::String * getPath();
-  virtual jint hashCode();
-  virtual jboolean isAbsolute();
-private:
-  jboolean internalIsDirectory();
-public:
-  virtual jboolean isDirectory();
-  virtual jboolean isFile();
-  virtual jboolean isHidden();
-  virtual jlong lastModified();
-  virtual jlong length();
-private:
-  JArray< ::java::lang::Object * > * performList(::java::io::FilenameFilter *, ::java::io::FileFilter *, ::java::lang::Class *);
-public:
-  virtual JArray< ::java::lang::String * > * list(::java::io::FilenameFilter *);
-  virtual JArray< ::java::lang::String * > * list();
-  virtual JArray< ::java::io::File * > * listFiles();
-  virtual JArray< ::java::io::File * > * listFiles(::java::io::FilenameFilter *);
-  virtual JArray< ::java::io::File * > * listFiles(::java::io::FileFilter *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::net::URI * toURI();
-  virtual ::java::net::URL * toURL();
-private:
-  jboolean performMkdir();
-public:
-  virtual jboolean mkdir();
-private:
-  static jboolean mkdirs(::java::io::File *);
-public:
-  virtual jboolean mkdirs();
-private:
-  static ::java::lang::String * nextValue();
-public:
-  static ::java::io::File * createTempFile(::java::lang::String *, ::java::lang::String *, ::java::io::File *);
-private:
-  jboolean performSetReadOnly();
-public:
-  virtual jboolean setReadOnly();
-private:
-  static JArray< ::java::io::File * > * performListRoots();
-public:
-  static JArray< ::java::io::File * > * listRoots();
-  static ::java::io::File * createTempFile(::java::lang::String *, ::java::lang::String *);
-  virtual jint compareTo(::java::io::File *);
-  virtual jint compareTo(::java::lang::Object *);
-private:
-  jboolean performRenameTo(::java::io::File *);
-public:
-  virtual jboolean renameTo(::java::io::File *);
-private:
-  jboolean performSetLastModified(jlong);
-public:
-  virtual jboolean setLastModified(jlong);
-private:
-  void checkWrite();
-  void checkRead();
-public:
-  virtual void deleteOnExit();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 301077366599181567LL;
-  static const jint READ = 0;
-  static const jint WRITE = 1;
-  static const jint EXISTS = 2;
-  static const jint DIRECTORY = 0;
-  static const jint ISFILE = 1;
-  static const jint ISHIDDEN = 2;
-  static const jint MODIFIED = 0;
-  static const jint LENGTH = 1;
-public:
-  static ::java::lang::String * separator;
-private:
-  static ::java::lang::String * dupSeparator;
-public:
-  static jchar separatorChar;
-  static ::java::lang::String * pathSeparator;
-  static jchar pathSeparatorChar;
-public: // actually package-private
-  static ::java::lang::String * tmpdir;
-  static jint maxPathLen;
-  static jboolean caseSensitive;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) path;
-  static jlong counter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_File__
diff --git a/libjava/java/io/FileDescriptor.h b/libjava/java/io/FileDescriptor.h
deleted file mode 100644
index a3863f331c7..00000000000
--- a/libjava/java/io/FileDescriptor.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FileDescriptor__
-#define __java_io_FileDescriptor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class ByteChannel;
-      }
-    }
-  }
-}
-
-class java::io::FileDescriptor : public ::java::lang::Object
-{
-
-public:
-  FileDescriptor();
-public: // actually package-private
-  FileDescriptor(::java::nio::channels::ByteChannel *);
-public:
-  void sync();
-  jboolean valid();
-  static ::java::io::FileDescriptor * in;
-  static ::java::io::FileDescriptor * out;
-  static ::java::io::FileDescriptor * err;
-public: // actually package-private
-  ::java::nio::channels::ByteChannel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) channel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FileDescriptor__
diff --git a/libjava/java/io/FileFilter.h b/libjava/java/io/FileFilter.h
deleted file mode 100644
index e90e437957f..00000000000
--- a/libjava/java/io/FileFilter.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FileFilter__
-#define __java_io_FileFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::FileFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean accept(::java::io::File *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_FileFilter__
diff --git a/libjava/java/io/FileInputStream.h b/libjava/java/io/FileInputStream.h
deleted file mode 100644
index 01efe5620d7..00000000000
--- a/libjava/java/io/FileInputStream.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FileInputStream__
-#define __java_io_FileInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace channels
-        {
-            class FileChannelImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class FileChannel;
-      }
-    }
-  }
-}
-
-class java::io::FileInputStream : public ::java::io::InputStream
-{
-
-public:
-  FileInputStream(::java::lang::String *);
-  FileInputStream(::java::io::File *);
-  FileInputStream(::java::io::FileDescriptor *);
-public: // actually package-private
-  FileInputStream(::gnu::java::nio::channels::FileChannelImpl *);
-public:
-  virtual jint available();
-  virtual void close();
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual ::java::io::FileDescriptor * getFD();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jlong skip(jlong);
-  virtual ::java::nio::channels::FileChannel * getChannel();
-private:
-  ::java::io::FileDescriptor * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) fd;
-  ::gnu::java::nio::channels::FileChannelImpl * ch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FileInputStream__
diff --git a/libjava/java/io/FileNotFoundException.h b/libjava/java/io/FileNotFoundException.h
deleted file mode 100644
index 794160dd5e0..00000000000
--- a/libjava/java/io/FileNotFoundException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FileNotFoundException__
-#define __java_io_FileNotFoundException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-
-class java::io::FileNotFoundException : public ::java::io::IOException
-{
-
-public:
-  FileNotFoundException();
-  FileNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -897856973823710492LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FileNotFoundException__
diff --git a/libjava/java/io/FileOutputStream.h b/libjava/java/io/FileOutputStream.h
deleted file mode 100644
index b2bf0d942ca..00000000000
--- a/libjava/java/io/FileOutputStream.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FileOutputStream__
-#define __java_io_FileOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace channels
-        {
-            class FileChannelImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class FileChannel;
-      }
-    }
-  }
-}
-
-class java::io::FileOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  FileOutputStream(::java::lang::String *, jboolean);
-  FileOutputStream(::java::lang::String *);
-  FileOutputStream(::java::io::File *);
-  FileOutputStream(::java::io::File *, jboolean);
-  FileOutputStream(::java::io::FileDescriptor *);
-public: // actually package-private
-  FileOutputStream(::gnu::java::nio::channels::FileChannelImpl *);
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual ::java::io::FileDescriptor * getFD();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void close();
-  virtual ::java::nio::channels::FileChannel * getChannel();
-private:
-  ::java::io::FileDescriptor * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) fd;
-  ::gnu::java::nio::channels::FileChannelImpl * ch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FileOutputStream__
diff --git a/libjava/java/io/FilePermission.h b/libjava/java/io/FilePermission.h
deleted file mode 100644
index bace152f01c..00000000000
--- a/libjava/java/io/FilePermission.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FilePermission__
-#define __java_io_FilePermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-}
-
-class java::io::FilePermission : public ::java::security::Permission
-{
-
-  void checkPerms();
-public:
-  FilePermission(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * getActions();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jboolean implies(::java::security::Permission *);
-private:
-  static const jlong serialVersionUID = 7930732926638008763LL;
-  static ::java::lang::String * ALL_FILES;
-  jboolean __attribute__((aligned(__alignof__( ::java::security::Permission)))) readPerm;
-  jboolean writePerm;
-  jboolean executePerm;
-  jboolean deletePerm;
-  ::java::lang::String * actionsString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FilePermission__
diff --git a/libjava/java/io/FileReader.h b/libjava/java/io/FileReader.h
deleted file mode 100644
index 4d1fba21200..00000000000
--- a/libjava/java/io/FileReader.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FileReader__
-#define __java_io_FileReader__
-
-#pragma interface
-
-#include <java/io/InputStreamReader.h>
-
-class java::io::FileReader : public ::java::io::InputStreamReader
-{
-
-public:
-  FileReader(::java::io::File *);
-  FileReader(::java::io::FileDescriptor *);
-  FileReader(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FileReader__
diff --git a/libjava/java/io/FileWriter.h b/libjava/java/io/FileWriter.h
deleted file mode 100644
index b75ea008cdb..00000000000
--- a/libjava/java/io/FileWriter.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FileWriter__
-#define __java_io_FileWriter__
-
-#pragma interface
-
-#include <java/io/OutputStreamWriter.h>
-
-class java::io::FileWriter : public ::java::io::OutputStreamWriter
-{
-
-public:
-  FileWriter(::java::io::File *);
-  FileWriter(::java::io::File *, jboolean);
-  FileWriter(::java::io::FileDescriptor *);
-  FileWriter(::java::lang::String *);
-  FileWriter(::java::lang::String *, jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FileWriter__
diff --git a/libjava/java/io/FilenameFilter.h b/libjava/java/io/FilenameFilter.h
deleted file mode 100644
index 2337ed32737..00000000000
--- a/libjava/java/io/FilenameFilter.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FilenameFilter__
-#define __java_io_FilenameFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::FilenameFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean accept(::java::io::File *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_FilenameFilter__
diff --git a/libjava/java/io/FilterInputStream.h b/libjava/java/io/FilterInputStream.h
deleted file mode 100644
index 1116639c137..00000000000
--- a/libjava/java/io/FilterInputStream.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FilterInputStream__
-#define __java_io_FilterInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::FilterInputStream : public ::java::io::InputStream
-{
-
-public: // actually protected
-  FilterInputStream(::java::io::InputStream *);
-public:
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual void reset();
-  virtual jint available();
-  virtual jlong skip(jlong);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void close();
-public: // actually protected
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) in;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FilterInputStream__
diff --git a/libjava/java/io/FilterOutputStream.h b/libjava/java/io/FilterOutputStream.h
deleted file mode 100644
index 571b255d6a9..00000000000
--- a/libjava/java/io/FilterOutputStream.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FilterOutputStream__
-#define __java_io_FilterOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::FilterOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  FilterOutputStream(::java::io::OutputStream *);
-  virtual void close();
-  virtual void flush();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-public: // actually protected
-  ::java::io::OutputStream * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FilterOutputStream__
diff --git a/libjava/java/io/FilterReader.h b/libjava/java/io/FilterReader.h
deleted file mode 100644
index 52a1995fec0..00000000000
--- a/libjava/java/io/FilterReader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FilterReader__
-#define __java_io_FilterReader__
-
-#pragma interface
-
-#include <java/io/Reader.h>
-#include <gcj/array.h>
-
-
-class java::io::FilterReader : public ::java::io::Reader
-{
-
-public: // actually protected
-  FilterReader(::java::io::Reader *);
-public:
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual void reset();
-  virtual jboolean ready();
-  virtual jlong skip(jlong);
-  virtual jint read();
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual void close();
-public: // actually protected
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::io::Reader)))) in;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FilterReader__
diff --git a/libjava/java/io/FilterWriter.h b/libjava/java/io/FilterWriter.h
deleted file mode 100644
index 146f0156342..00000000000
--- a/libjava/java/io/FilterWriter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_FilterWriter__
-#define __java_io_FilterWriter__
-
-#pragma interface
-
-#include <java/io/Writer.h>
-#include <gcj/array.h>
-
-
-class java::io::FilterWriter : public ::java::io::Writer
-{
-
-public: // actually protected
-  FilterWriter(::java::io::Writer *);
-public:
-  virtual void close();
-  virtual void flush();
-  virtual void write(jint);
-  virtual void write(JArray< jchar > *, jint, jint);
-  virtual void write(::java::lang::String *, jint, jint);
-public: // actually protected
-  ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::io::Writer)))) out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_FilterWriter__
diff --git a/libjava/java/io/Flushable.h b/libjava/java/io/Flushable.h
deleted file mode 100644
index 2acd25dec02..00000000000
--- a/libjava/java/io/Flushable.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_Flushable__
-#define __java_io_Flushable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::Flushable : public ::java::lang::Object
-{
-
-public:
-  virtual void flush() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_Flushable__
diff --git a/libjava/java/io/IOException.h b/libjava/java/io/IOException.h
deleted file mode 100644
index bdd92e0e4d8..00000000000
--- a/libjava/java/io/IOException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_IOException__
-#define __java_io_IOException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::io::IOException : public ::java::lang::Exception
-{
-
-public:
-  IOException();
-  IOException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7818375828146090155LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_IOException__
diff --git a/libjava/java/io/InputStream.h b/libjava/java/io/InputStream.h
deleted file mode 100644
index 263af2c8167..00000000000
--- a/libjava/java/io/InputStream.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_InputStream__
-#define __java_io_InputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::io::InputStream : public ::java::lang::Object
-{
-
-public:
-  InputStream();
-  virtual jint available();
-  virtual void close();
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual jint read() = 0;
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void reset();
-  virtual jlong skip(jlong);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_InputStream__
diff --git a/libjava/java/io/InputStreamReader.h b/libjava/java/io/InputStreamReader.h
deleted file mode 100644
index 46050d5c37c..00000000000
--- a/libjava/java/io/InputStreamReader.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_InputStreamReader__
-#define __java_io_InputStreamReader__
-
-#pragma interface
-
-#include <java/io/Reader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class BytesToUnicode;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-      }
-    }
-  }
-}
-
-class java::io::InputStreamReader : public ::java::io::Reader
-{
-
-public:
-  InputStreamReader(::java::io::InputStream *);
-  InputStreamReader(::java::io::InputStream *, ::java::lang::String *);
-  InputStreamReader(::java::io::InputStream *, ::java::nio::charset::Charset *);
-  InputStreamReader(::java::io::InputStream *, ::java::nio::charset::CharsetDecoder *);
-private:
-  InputStreamReader(::java::io::InputStream *, ::gnu::gcj::convert::BytesToUnicode *);
-public:
-  virtual void close();
-  virtual ::java::lang::String * getEncoding();
-  virtual jboolean ready();
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual jint read();
-private:
-  jint refill(JArray< jchar > *, jint, jint);
-public: // actually package-private
-  ::java::io::BufferedInputStream * __attribute__((aligned(__alignof__( ::java::io::Reader)))) in;
-  JArray< jchar > * work;
-  jint wpos;
-  jint wcount;
-  ::gnu::gcj::convert::BytesToUnicode * converter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_InputStreamReader__
diff --git a/libjava/java/io/InterruptedIOException.h b/libjava/java/io/InterruptedIOException.h
deleted file mode 100644
index 40922cd79c0..00000000000
--- a/libjava/java/io/InterruptedIOException.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_InterruptedIOException__
-#define __java_io_InterruptedIOException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-
-class java::io::InterruptedIOException : public ::java::io::IOException
-{
-
-public:
-  InterruptedIOException();
-  InterruptedIOException(::java::lang::String *);
-public: // actually package-private
-  InterruptedIOException(::java::lang::String *, jint);
-private:
-  static const jlong serialVersionUID = 4020568460727500567LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::io::IOException)))) bytesTransferred;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_InterruptedIOException__
diff --git a/libjava/java/io/InvalidClassException.h b/libjava/java/io/InvalidClassException.h
deleted file mode 100644
index 6216a9ad920..00000000000
--- a/libjava/java/io/InvalidClassException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_InvalidClassException__
-#define __java_io_InvalidClassException__
-
-#pragma interface
-
-#include <java/io/ObjectStreamException.h>
-
-class java::io::InvalidClassException : public ::java::io::ObjectStreamException
-{
-
-public:
-  InvalidClassException(::java::lang::String *);
-  InvalidClassException(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getMessage();
-private:
-  static const jlong serialVersionUID = -4333316296251054416LL;
-public:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::io::ObjectStreamException)))) classname;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_InvalidClassException__
diff --git a/libjava/java/io/InvalidObjectException.h b/libjava/java/io/InvalidObjectException.h
deleted file mode 100644
index 550dd439d0e..00000000000
--- a/libjava/java/io/InvalidObjectException.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_InvalidObjectException__
-#define __java_io_InvalidObjectException__
-
-#pragma interface
-
-#include <java/io/ObjectStreamException.h>
-
-class java::io::InvalidObjectException : public ::java::io::ObjectStreamException
-{
-
-public:
-  InvalidObjectException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3233174318281839583LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_InvalidObjectException__
diff --git a/libjava/java/io/LineNumberInputStream.h b/libjava/java/io/LineNumberInputStream.h
deleted file mode 100644
index 676893d51a3..00000000000
--- a/libjava/java/io/LineNumberInputStream.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_LineNumberInputStream__
-#define __java_io_LineNumberInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::LineNumberInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  LineNumberInputStream(::java::io::InputStream *);
-  virtual jint available();
-  virtual jint getLineNumber();
-  virtual void mark(jint);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void reset();
-  virtual void setLineNumber(jint);
-  virtual jlong skip(jlong);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) lineNumber;
-  jint markLineNumber;
-  jboolean justReadReturnChar;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_LineNumberInputStream__
diff --git a/libjava/java/io/LineNumberReader.h b/libjava/java/io/LineNumberReader.h
deleted file mode 100644
index 33564c94909..00000000000
--- a/libjava/java/io/LineNumberReader.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_LineNumberReader__
-#define __java_io_LineNumberReader__
-
-#pragma interface
-
-#include <java/io/BufferedReader.h>
-#include <gcj/array.h>
-
-
-class java::io::LineNumberReader : public ::java::io::BufferedReader
-{
-
-public:
-  LineNumberReader(::java::io::Reader *);
-  LineNumberReader(::java::io::Reader *, jint);
-  virtual jint getLineNumber();
-  virtual void setLineNumber(jint);
-  virtual void mark(jint);
-  virtual void reset();
-private:
-  jint fill();
-public:
-  virtual jint read();
-  virtual jint read(JArray< jchar > *, jint, jint);
-private:
-  void skipRedundantLF();
-public:
-  virtual ::java::lang::String * readLine();
-  virtual jlong skip(jlong);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::io::BufferedReader)))) lineNumber;
-  jboolean matchedNewLine;
-  jint savedLineNumber;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_LineNumberReader__
diff --git a/libjava/java/io/NotActiveException.h b/libjava/java/io/NotActiveException.h
deleted file mode 100644
index 9020e4e03f4..00000000000
--- a/libjava/java/io/NotActiveException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_NotActiveException__
-#define __java_io_NotActiveException__
-
-#pragma interface
-
-#include <java/io/ObjectStreamException.h>
-
-class java::io::NotActiveException : public ::java::io::ObjectStreamException
-{
-
-public:
-  NotActiveException();
-  NotActiveException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3893467273049808895LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_NotActiveException__
diff --git a/libjava/java/io/NotSerializableException.h b/libjava/java/io/NotSerializableException.h
deleted file mode 100644
index 55699b406de..00000000000
--- a/libjava/java/io/NotSerializableException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_NotSerializableException__
-#define __java_io_NotSerializableException__
-
-#pragma interface
-
-#include <java/io/ObjectStreamException.h>
-
-class java::io::NotSerializableException : public ::java::io::ObjectStreamException
-{
-
-public:
-  NotSerializableException();
-  NotSerializableException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2906642554793891381LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_NotSerializableException__
diff --git a/libjava/java/io/ObjectInput.h b/libjava/java/io/ObjectInput.h
deleted file mode 100644
index 7cfac206034..00000000000
--- a/libjava/java/io/ObjectInput.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectInput__
-#define __java_io_ObjectInput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::io::ObjectInput : public ::java::lang::Object
-{
-
-public:
-  virtual jint available() = 0;
-  virtual jint read() = 0;
-  virtual jint read(JArray< jbyte > *) = 0;
-  virtual jint read(JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::lang::Object * readObject() = 0;
-  virtual jlong skip(jlong) = 0;
-  virtual void close() = 0;
-  virtual jboolean readBoolean() = 0;
-  virtual jbyte readByte() = 0;
-  virtual jint readUnsignedByte() = 0;
-  virtual jchar readChar() = 0;
-  virtual jshort readShort() = 0;
-  virtual jint readUnsignedShort() = 0;
-  virtual jint readInt() = 0;
-  virtual jlong readLong() = 0;
-  virtual jfloat readFloat() = 0;
-  virtual jdouble readDouble() = 0;
-  virtual ::java::lang::String * readLine() = 0;
-  virtual ::java::lang::String * readUTF() = 0;
-  virtual void readFully(JArray< jbyte > *) = 0;
-  virtual void readFully(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint skipBytes(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_ObjectInput__
diff --git a/libjava/java/io/ObjectInputStream$1.h b/libjava/java/io/ObjectInputStream$1.h
deleted file mode 100644
index 3a3241a0ecd..00000000000
--- a/libjava/java/io/ObjectInputStream$1.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectInputStream$1__
-#define __java_io_ObjectInputStream$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectInputStream$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ObjectInputStream$1(::java::io::ObjectInputStream *, ::java::lang::Class *);
-public:
-  ::java::lang::Object * run();
-public: // actually package-private
-  ::java::io::ObjectInputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::lang::Class * val$local_constructor_class;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectInputStream$1__
diff --git a/libjava/java/io/ObjectInputStream$2.h b/libjava/java/io/ObjectInputStream$2.h
deleted file mode 100644
index 70fbf58a68d..00000000000
--- a/libjava/java/io/ObjectInputStream$2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectInputStream$2__
-#define __java_io_ObjectInputStream$2__
-
-#pragma interface
-
-#include <java/io/ObjectInputStream$GetField.h>
-#include <gcj/array.h>
-
-
-class java::io::ObjectInputStream$2 : public ::java::io::ObjectInputStream$GetField
-{
-
-public: // actually package-private
-  ObjectInputStream$2(::java::io::ObjectInputStream *, ::java::io::ObjectStreamClass *, JArray< jbyte > *, JArray< ::java::lang::Object * > *);
-public:
-  ::java::io::ObjectStreamClass * getObjectStreamClass();
-  jboolean defaulted(::java::lang::String *);
-  jboolean get(::java::lang::String *, jboolean);
-  jchar get(::java::lang::String *, jchar);
-  jbyte get(::java::lang::String *, jbyte);
-  jshort get(::java::lang::String *, jshort);
-  jint get(::java::lang::String *, jint);
-  jlong get(::java::lang::String *, jlong);
-  jfloat get(::java::lang::String *, jfloat);
-  jdouble get(::java::lang::String *, jdouble);
-  ::java::lang::Object * get(::java::lang::String *, ::java::lang::Object *);
-private:
-  ::java::io::ObjectStreamField * getField(::java::lang::String *, ::java::lang::Class *);
-public: // actually package-private
-  ::java::io::ObjectInputStream * __attribute__((aligned(__alignof__( ::java::io::ObjectInputStream$GetField)))) this$0;
-private:
-  ::java::io::ObjectStreamClass * val$clazz;
-  JArray< jbyte > * val$prim_field_data;
-  JArray< ::java::lang::Object * > * val$objs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectInputStream$2__
diff --git a/libjava/java/io/ObjectInputStream$GetField.h b/libjava/java/io/ObjectInputStream$GetField.h
deleted file mode 100644
index d61509c4a0a..00000000000
--- a/libjava/java/io/ObjectInputStream$GetField.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectInputStream$GetField__
-#define __java_io_ObjectInputStream$GetField__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectInputStream$GetField : public ::java::lang::Object
-{
-
-public:
-  ObjectInputStream$GetField();
-  virtual ::java::io::ObjectStreamClass * getObjectStreamClass() = 0;
-  virtual jboolean defaulted(::java::lang::String *) = 0;
-  virtual jboolean get(::java::lang::String *, jboolean) = 0;
-  virtual jchar get(::java::lang::String *, jchar) = 0;
-  virtual jbyte get(::java::lang::String *, jbyte) = 0;
-  virtual jshort get(::java::lang::String *, jshort) = 0;
-  virtual jint get(::java::lang::String *, jint) = 0;
-  virtual jlong get(::java::lang::String *, jlong) = 0;
-  virtual jfloat get(::java::lang::String *, jfloat) = 0;
-  virtual jdouble get(::java::lang::String *, jdouble) = 0;
-  virtual ::java::lang::Object * get(::java::lang::String *, ::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectInputStream$GetField__
diff --git a/libjava/java/io/ObjectInputStream$ValidatorAndPriority.h b/libjava/java/io/ObjectInputStream$ValidatorAndPriority.h
deleted file mode 100644
index 02e6ae6230f..00000000000
--- a/libjava/java/io/ObjectInputStream$ValidatorAndPriority.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectInputStream$ValidatorAndPriority__
-#define __java_io_ObjectInputStream$ValidatorAndPriority__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectInputStream$ValidatorAndPriority : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ObjectInputStream$ValidatorAndPriority(::java::io::ObjectInputValidation *, jint);
-public:
-  jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) priority;
-  ::java::io::ObjectInputValidation * validator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectInputStream$ValidatorAndPriority__
diff --git a/libjava/java/io/ObjectInputStream.h b/libjava/java/io/ObjectInputStream.h
deleted file mode 100644
index b27764a445b..00000000000
--- a/libjava/java/io/ObjectInputStream.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectInputStream__
-#define __java_io_ObjectInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::ObjectInputStream : public ::java::io::InputStream
-{
-
-public:
-  ObjectInputStream(::java::io::InputStream *);
-  virtual ::java::lang::Object * readObject();
-private:
-  ::java::lang::Object * parseContent(jbyte);
-  void checkTypeConsistency(::java::lang::String *, JArray< ::java::io::ObjectStreamField * > *, JArray< ::java::io::ObjectStreamField * > *);
-public: // actually protected
-  virtual ::java::io::ObjectStreamClass * readClassDescriptor();
-public:
-  virtual void defaultReadObject();
-  virtual void registerValidation(::java::io::ObjectInputValidation *, jint);
-public: // actually protected
-  virtual ::java::lang::Class * resolveClass(::java::io::ObjectStreamClass *);
-private:
-  ::java::lang::ClassLoader * currentLoader();
-  ::java::io::ObjectStreamClass * lookupClass(::java::lang::Class *);
-  JArray< ::java::io::ObjectStreamClass * > * hierarchy(::java::lang::Class *);
-public: // actually protected
-  virtual ::java::lang::Object * resolveObject(::java::lang::Object *);
-  virtual ::java::lang::Class * resolveProxyClass(JArray< ::java::lang::String * > *);
-  virtual jboolean enableResolveObject(jboolean);
-  virtual void readStreamHeader();
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint available();
-  virtual void close();
-  virtual jboolean readBoolean();
-  virtual jbyte readByte();
-  virtual jint readUnsignedByte();
-  virtual jshort readShort();
-  virtual jint readUnsignedShort();
-  virtual jchar readChar();
-  virtual jint readInt();
-  virtual jlong readLong();
-  virtual jfloat readFloat();
-  virtual jdouble readDouble();
-  virtual void readFully(JArray< jbyte > *);
-  virtual void readFully(JArray< jbyte > *, jint, jint);
-  virtual jint skipBytes(jint);
-  virtual ::java::lang::String * readLine();
-  virtual ::java::lang::String * readUTF();
-  virtual ::java::io::ObjectInputStream$GetField * readFields();
-public: // actually protected
-  ObjectInputStream();
-  virtual ::java::lang::Object * readObjectOverride();
-private:
-  jint assignNewHandle(::java::lang::Object *);
-  void rememberHandle(::java::lang::Object *, jint);
-  ::java::lang::Object * lookupHandle(jint);
-  ::java::lang::Object * processResolution(::java::io::ObjectStreamClass *, ::java::lang::Object *, jint);
-  void clearHandles();
-  void readNextBlock();
-  void readNextBlock(jbyte);
-  void readArrayElements(::java::lang::Object *, ::java::lang::Class *);
-  void readFields(::java::lang::Object *, ::java::io::ObjectStreamClass *);
-  jboolean setBlockDataMode(jboolean);
-  ::java::lang::Object * newObject(::java::lang::Class *, ::java::lang::reflect::Constructor *);
-  void invokeValidators();
-  void callReadMethod(::java::lang::reflect::Method *, ::java::lang::Class *, ::java::lang::Object *);
-  void dumpElement(::java::lang::String *);
-  void dumpElementln(::java::lang::String *);
-  static const jint BUFFER_SIZE = 1024;
-  ::java::io::DataInputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) realInputStream;
-  ::java::io::DataInputStream * dataInputStream;
-  ::java::io::DataInputStream * blockDataInput;
-  jint blockDataPosition;
-  jint blockDataBytes;
-  JArray< jbyte > * blockData;
-  jboolean useSubclassMethod;
-  jint nextOID;
-  jboolean resolveEnabled;
-  ::java::util::Vector * objectLookupTable;
-  ::java::lang::Object * currentObject;
-  ::java::io::ObjectStreamClass * currentObjectStreamClass;
-  ::java::util::TreeSet * currentObjectValidators;
-  jboolean readDataFromBlock;
-  jboolean fieldsAlreadyRead;
-  ::java::util::Hashtable * classLookupTable;
-  ::java::io::ObjectInputStream$GetField * prereadFields;
-  static jboolean dump;
-  jint depth;
-  static const jboolean DEBUG = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectInputStream__
diff --git a/libjava/java/io/ObjectInputValidation.h b/libjava/java/io/ObjectInputValidation.h
deleted file mode 100644
index 6b0df7dfce5..00000000000
--- a/libjava/java/io/ObjectInputValidation.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectInputValidation__
-#define __java_io_ObjectInputValidation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectInputValidation : public ::java::lang::Object
-{
-
-public:
-  virtual void validateObject() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_ObjectInputValidation__
diff --git a/libjava/java/io/ObjectOutput.h b/libjava/java/io/ObjectOutput.h
deleted file mode 100644
index ec45c019345..00000000000
--- a/libjava/java/io/ObjectOutput.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectOutput__
-#define __java_io_ObjectOutput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::io::ObjectOutput : public ::java::lang::Object
-{
-
-public:
-  virtual void write(jint) = 0;
-  virtual void write(JArray< jbyte > *) = 0;
-  virtual void write(JArray< jbyte > *, jint, jint) = 0;
-  virtual void writeObject(::java::lang::Object *) = 0;
-  virtual void flush() = 0;
-  virtual void close() = 0;
-  virtual void writeBoolean(jboolean) = 0;
-  virtual void writeByte(jint) = 0;
-  virtual void writeChar(jint) = 0;
-  virtual void writeShort(jint) = 0;
-  virtual void writeInt(jint) = 0;
-  virtual void writeLong(jlong) = 0;
-  virtual void writeFloat(jfloat) = 0;
-  virtual void writeDouble(jdouble) = 0;
-  virtual void writeBytes(::java::lang::String *) = 0;
-  virtual void writeChars(::java::lang::String *) = 0;
-  virtual void writeUTF(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_ObjectOutput__
diff --git a/libjava/java/io/ObjectOutputStream$1.h b/libjava/java/io/ObjectOutputStream$1.h
deleted file mode 100644
index 5890abf9004..00000000000
--- a/libjava/java/io/ObjectOutputStream$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectOutputStream$1__
-#define __java_io_ObjectOutputStream$1__
-
-#pragma interface
-
-#include <java/io/ObjectOutputStream$PutField.h>
-#include <gcj/array.h>
-
-
-class java::io::ObjectOutputStream$1 : public ::java::io::ObjectOutputStream$PutField
-{
-
-public: // actually package-private
-  ObjectOutputStream$1(::java::io::ObjectOutputStream *);
-private:
-  ::java::io::ObjectStreamField * getField(::java::lang::String *);
-public:
-  void put(::java::lang::String *, jboolean);
-  void put(::java::lang::String *, jbyte);
-  void put(::java::lang::String *, jchar);
-  void put(::java::lang::String *, jdouble);
-  void put(::java::lang::String *, jfloat);
-  void put(::java::lang::String *, jint);
-  void put(::java::lang::String *, jlong);
-  void put(::java::lang::String *, jshort);
-  void put(::java::lang::String *, ::java::lang::Object *);
-  void write(::java::io::ObjectOutput *);
-private:
-  void checkType(::java::io::ObjectStreamField *, jchar);
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::ObjectOutputStream$PutField)))) prim_field_data;
-  JArray< ::java::lang::Object * > * objs;
-public: // actually package-private
-  ::java::io::ObjectOutputStream * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectOutputStream$1__
diff --git a/libjava/java/io/ObjectOutputStream$PutField.h b/libjava/java/io/ObjectOutputStream$PutField.h
deleted file mode 100644
index 790bb0e09b6..00000000000
--- a/libjava/java/io/ObjectOutputStream$PutField.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectOutputStream$PutField__
-#define __java_io_ObjectOutputStream$PutField__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectOutputStream$PutField : public ::java::lang::Object
-{
-
-public:
-  ObjectOutputStream$PutField();
-  virtual void put(::java::lang::String *, jboolean) = 0;
-  virtual void put(::java::lang::String *, jbyte) = 0;
-  virtual void put(::java::lang::String *, jchar) = 0;
-  virtual void put(::java::lang::String *, jdouble) = 0;
-  virtual void put(::java::lang::String *, jfloat) = 0;
-  virtual void put(::java::lang::String *, jint) = 0;
-  virtual void put(::java::lang::String *, jlong) = 0;
-  virtual void put(::java::lang::String *, jshort) = 0;
-  virtual void put(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void write(::java::io::ObjectOutput *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectOutputStream$PutField__
diff --git a/libjava/java/io/ObjectOutputStream.h b/libjava/java/io/ObjectOutputStream.h
deleted file mode 100644
index 273f04b14e4..00000000000
--- a/libjava/java/io/ObjectOutputStream.h
+++ /dev/null
@@ -1,122 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectOutputStream__
-#define __java_io_ObjectOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace io
-      {
-          class ObjectIdentityMap2Int;
-      }
-      namespace security
-      {
-        namespace action
-        {
-            class SetAccessibleAction;
-        }
-      }
-    }
-  }
-}
-
-class java::io::ObjectOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  ObjectOutputStream(::java::io::OutputStream *);
-  virtual void writeObject(::java::lang::Object *);
-public: // actually protected
-  virtual void writeClassDescriptor(::java::io::ObjectStreamClass *);
-public:
-  virtual void defaultWriteObject();
-private:
-  void markFieldsWritten();
-public:
-  virtual void reset();
-private:
-  void reset(jboolean);
-public:
-  virtual void useProtocolVersion(jint);
-public: // actually protected
-  virtual void annotateClass(::java::lang::Class *);
-  virtual void annotateProxyClass(::java::lang::Class *);
-  virtual ::java::lang::Object * replaceObject(::java::lang::Object *);
-  virtual jboolean enableReplaceObject(jboolean);
-  virtual void writeStreamHeader();
-  ObjectOutputStream();
-  virtual void writeObjectOverride(::java::lang::Object *);
-public:
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void flush();
-public: // actually protected
-  virtual void drain();
-public:
-  virtual void close();
-  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);
-  virtual void writeBytes(::java::lang::String *);
-  virtual void writeChars(::java::lang::String *);
-  virtual void writeUTF(::java::lang::String *);
-  virtual ::java::io::ObjectOutputStream$PutField * putFields();
-  virtual void writeFields();
-private:
-  void writeBlockDataHeader(jint);
-  jint findHandle(::java::lang::Object *);
-  jint assignNewHandle(::java::lang::Object *);
-  void clearHandles();
-  void writeArraySizeAndElements(::java::lang::Object *, ::java::lang::Class *);
-  void writeFields(::java::lang::Object *, ::java::io::ObjectStreamClass *);
-  void writeFields(::java::lang::Object *, JArray< ::java::io::ObjectStreamField * > *);
-public: // actually package-private
-  virtual jboolean setBlockDataMode(jboolean);
-private:
-  void callWriteMethod(::java::lang::Object *, ::java::io::ObjectStreamClass *);
-  void dumpElementln(::java::lang::String *);
-  static const jint BUFFER_SIZE = 1024;
-  static jint defaultProtocolVersion;
-  ::java::io::DataOutputStream * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) dataOutput;
-  jboolean writeDataAsBlocks;
-  ::java::io::DataOutputStream * realOutput;
-  ::java::io::DataOutputStream * blockDataOutput;
-  JArray< jbyte > * blockData;
-  jint blockDataCount;
-  ::java::lang::Object * currentObject;
-public: // actually package-private
-  ::java::io::ObjectStreamClass * currentObjectStreamClass;
-private:
-  ::java::io::ObjectOutputStream$PutField * currentPutField;
-  jboolean fieldsAlreadyWritten;
-  jboolean replacementEnabled;
-  jboolean isSerializing;
-  jint nextOID;
-  ::gnu::java::io::ObjectIdentityMap2Int * OIDLookupTable;
-  jint protocolVersion;
-  jboolean useSubclassMethod;
-  ::gnu::java::security::action::SetAccessibleAction * setAccessible;
-  jint depth;
-  jboolean dump;
-  static const jboolean DEBUG = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectOutputStream__
diff --git a/libjava/java/io/ObjectStreamClass$1.h b/libjava/java/io/ObjectStreamClass$1.h
deleted file mode 100644
index c57bb25973a..00000000000
--- a/libjava/java/io/ObjectStreamClass$1.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectStreamClass$1__
-#define __java_io_ObjectStreamClass$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectStreamClass$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ObjectStreamClass$1(::java::io::ObjectStreamClass *);
-public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ::java::io::ObjectStreamClass * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectStreamClass$1__
diff --git a/libjava/java/io/ObjectStreamClass$2.h b/libjava/java/io/ObjectStreamClass$2.h
deleted file mode 100644
index 2152ca09156..00000000000
--- a/libjava/java/io/ObjectStreamClass$2.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectStreamClass$2__
-#define __java_io_ObjectStreamClass$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectStreamClass$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ObjectStreamClass$2(::java::io::ObjectStreamClass *, ::java::lang::reflect::Constructor *);
-public:
-  ::java::lang::Object * run();
-public: // actually package-private
-  ::java::io::ObjectStreamClass * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::lang::reflect::Constructor * val$c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectStreamClass$2__
diff --git a/libjava/java/io/ObjectStreamClass$InterfaceComparator.h b/libjava/java/io/ObjectStreamClass$InterfaceComparator.h
deleted file mode 100644
index 7faddc7d78d..00000000000
--- a/libjava/java/io/ObjectStreamClass$InterfaceComparator.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectStreamClass$InterfaceComparator__
-#define __java_io_ObjectStreamClass$InterfaceComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectStreamClass$InterfaceComparator : public ::java::lang::Object
-{
-
-  ObjectStreamClass$InterfaceComparator();
-public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ObjectStreamClass$InterfaceComparator(::java::io::ObjectStreamClass$InterfaceComparator *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectStreamClass$InterfaceComparator__
diff --git a/libjava/java/io/ObjectStreamClass$MemberComparator.h b/libjava/java/io/ObjectStreamClass$MemberComparator.h
deleted file mode 100644
index 81a8ca48699..00000000000
--- a/libjava/java/io/ObjectStreamClass$MemberComparator.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectStreamClass$MemberComparator__
-#define __java_io_ObjectStreamClass$MemberComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectStreamClass$MemberComparator : public ::java::lang::Object
-{
-
-  ObjectStreamClass$MemberComparator();
-public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ObjectStreamClass$MemberComparator(::java::io::ObjectStreamClass$MemberComparator *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectStreamClass$MemberComparator__
diff --git a/libjava/java/io/ObjectStreamClass.h b/libjava/java/io/ObjectStreamClass.h
deleted file mode 100644
index 7638f7bed3a..00000000000
--- a/libjava/java/io/ObjectStreamClass.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectStreamClass__
-#define __java_io_ObjectStreamClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace io
-      {
-          class NullOutputStream;
-      }
-    }
-  }
-}
-
-class java::io::ObjectStreamClass : public ::java::lang::Object
-{
-
-public:
-  static ::java::io::ObjectStreamClass * lookup(::java::lang::Class *);
-public: // actually package-private
-  static ::java::io::ObjectStreamClass * lookupForClassObject(::java::lang::Class *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::Class * forClass();
-  virtual jlong getSerialVersionUID();
-  virtual JArray< ::java::io::ObjectStreamField * > * getFields();
-  virtual ::java::io::ObjectStreamField * getField(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual jboolean hasWriteMethod();
-  virtual jboolean isSerializable();
-  virtual jboolean isExternalizable();
-  virtual jboolean isEnum();
-  virtual ::java::io::ObjectStreamClass * getSuper();
-  virtual JArray< ::java::io::ObjectStreamClass * > * hierarchy();
-  virtual jint getFlags();
-  ObjectStreamClass(::java::lang::String *, jlong, jbyte, JArray< ::java::io::ObjectStreamField * > *);
-  virtual void setClass(::java::lang::Class *, ::java::io::ObjectStreamClass *);
-  virtual void setSuperclass(::java::io::ObjectStreamClass *);
-  virtual void calculateOffsets();
-private:
-  ::java::lang::reflect::Method * findMethod(JArray< ::java::lang::reflect::Method * > *, ::java::lang::String *, JArray< ::java::lang::Class * > *, ::java::lang::Class *, jboolean);
-  static jboolean inSamePackage(::java::lang::Class *, ::java::lang::Class *);
-  static ::java::lang::reflect::Method * findAccessibleMethod(::java::lang::String *, ::java::lang::Class *);
-  static jboolean loadedByBootOrApplicationClassLoader(::java::lang::Class *);
-  void cacheMethods();
-  ObjectStreamClass(::java::lang::Class *);
-  void setFlags(::java::lang::Class *);
-  void setFields(::java::lang::Class *);
-  jlong getClassUID(::java::lang::Class *);
-public: // actually package-private
-  virtual jlong getClassUIDFromField(::java::lang::Class *);
-  virtual jlong calculateClassUID(::java::lang::Class *);
-private:
-  JArray< ::java::io::ObjectStreamField * > * getSerialPersistentFields(::java::lang::Class *);
-public: // actually package-private
-  virtual ::java::io::Externalizable * newInstance();
-  static JArray< ::java::io::ObjectStreamField * > * INVALID_FIELDS;
-private:
-  JArray< ::java::io::ObjectStreamClass * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hierarchy__;
-public: // actually package-private
-  static JArray< ::java::lang::Class * > * noArgs;
-  static ::java::util::Hashtable * methodCache;
-  static JArray< ::java::lang::Class * > * readObjectSignature;
-  static JArray< ::java::lang::Class * > * writeObjectSignature;
-  static ::java::util::Hashtable * uidCache;
-public:
-  static JArray< ::java::io::ObjectStreamField * > * NO_FIELDS;
-private:
-  static ::java::util::Hashtable * classLookupTable;
-  static ::gnu::java::io::NullOutputStream * nullOutputStream;
-  static ::java::util::Comparator * interfaceComparator;
-  static ::java::util::Comparator * memberComparator;
-  static JArray< ::java::lang::Class * > * writeMethodArgTypes;
-  ::java::io::ObjectStreamClass * superClass;
-  ::java::lang::Class * clazz;
-  ::java::lang::String * name;
-  jlong uid;
-  jbyte flags;
-public: // actually package-private
-  JArray< ::java::io::ObjectStreamField * > * fields;
-  jint primFieldSize;
-  jint objectFieldCount;
-  ::java::lang::reflect::Method * readObjectMethod;
-  ::java::lang::reflect::Method * readResolveMethod;
-  ::java::lang::reflect::Method * writeReplaceMethod;
-  ::java::lang::reflect::Method * writeObjectMethod;
-  jboolean realClassIsSerializable;
-  jboolean realClassIsExternalizable;
-  JArray< ::java::io::ObjectStreamField * > * fieldMapping;
-  ::java::lang::reflect::Constructor * firstNonSerializableParentConstructor;
-private:
-  ::java::lang::reflect::Constructor * constructor;
-public: // actually package-private
-  jboolean isProxyClass;
-private:
-  static const jlong serialVersionUID = -6120832682080437368LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectStreamClass__
diff --git a/libjava/java/io/ObjectStreamConstants.h b/libjava/java/io/ObjectStreamConstants.h
deleted file mode 100644
index f4e9508738b..00000000000
--- a/libjava/java/io/ObjectStreamConstants.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectStreamConstants__
-#define __java_io_ObjectStreamConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectStreamConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint PROTOCOL_VERSION_1 = 1;
-  static const jint PROTOCOL_VERSION_2 = 2;
-  static const jshort STREAM_MAGIC = -21267;
-  static const jshort STREAM_VERSION = 5;
-  static const jbyte TC_NULL = 112;
-  static const jbyte TC_REFERENCE = 113;
-  static const jbyte TC_CLASSDESC = 114;
-  static const jbyte TC_OBJECT = 115;
-  static const jbyte TC_STRING = 116;
-  static const jbyte TC_ARRAY = 117;
-  static const jbyte TC_CLASS = 118;
-  static const jbyte TC_BLOCKDATA = 119;
-  static const jbyte TC_ENDBLOCKDATA = 120;
-  static const jbyte TC_RESET = 121;
-  static const jbyte TC_BLOCKDATALONG = 122;
-  static const jbyte TC_EXCEPTION = 123;
-  static const jbyte TC_LONGSTRING = 124;
-  static const jbyte TC_PROXYCLASSDESC = 125;
-  static const jbyte TC_ENUM = 126;
-  static const jbyte TC_BASE = 112;
-  static const jbyte TC_MAX = 126;
-  static const jint baseWireHandle = 8257536;
-  static const jbyte SC_WRITE_METHOD = 1;
-  static const jbyte SC_SERIALIZABLE = 2;
-  static const jbyte SC_EXTERNALIZABLE = 4;
-  static const jbyte SC_BLOCK_DATA = 8;
-  static const jbyte SC_ENUM = 16;
-  static ::java::io::SerializablePermission * SUBSTITUTION_PERMISSION;
-  static ::java::io::SerializablePermission * SUBCLASS_IMPLEMENTATION_PERMISSION;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_ObjectStreamConstants__
diff --git a/libjava/java/io/ObjectStreamException.h b/libjava/java/io/ObjectStreamException.h
deleted file mode 100644
index 4ce5833516b..00000000000
--- a/libjava/java/io/ObjectStreamException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectStreamException__
-#define __java_io_ObjectStreamException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-
-class java::io::ObjectStreamException : public ::java::io::IOException
-{
-
-public: // actually protected
-  ObjectStreamException();
-  ObjectStreamException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7260898174833392607LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectStreamException__
diff --git a/libjava/java/io/ObjectStreamField$1.h b/libjava/java/io/ObjectStreamField$1.h
deleted file mode 100644
index e17f3c1ded7..00000000000
--- a/libjava/java/io/ObjectStreamField$1.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectStreamField$1__
-#define __java_io_ObjectStreamField$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectStreamField$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ObjectStreamField$1(::java::io::ObjectStreamField *, ::java::lang::reflect::Field *);
-public:
-  ::java::lang::Object * run();
-public: // actually package-private
-  ::java::io::ObjectStreamField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::lang::reflect::Field * val$f;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectStreamField$1__
diff --git a/libjava/java/io/ObjectStreamField.h b/libjava/java/io/ObjectStreamField.h
deleted file mode 100644
index 5b3116fc116..00000000000
--- a/libjava/java/io/ObjectStreamField.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_ObjectStreamField__
-#define __java_io_ObjectStreamField__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::ObjectStreamField : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ObjectStreamField(::java::lang::reflect::Field *);
-public:
-  ObjectStreamField(::java::lang::String *, ::java::lang::Class *);
-  ObjectStreamField(::java::lang::String *, ::java::lang::Class *, jboolean);
-public: // actually package-private
-  ObjectStreamField(::java::lang::String *, ::java::lang::String *);
-  virtual void resolveType(::java::lang::ClassLoader *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::Class * getType();
-  virtual jchar getTypeCode();
-  virtual ::java::lang::String * getTypeString();
-  virtual jint getOffset();
-public: // actually protected
-  virtual void setOffset(jint);
-public:
-  virtual jboolean isUnshared();
-  virtual jboolean isPrimitive();
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  virtual void setPersistent(jboolean);
-  virtual jboolean isPersistent();
-  virtual void setToSet(jboolean);
-  virtual jboolean isToSet();
-  virtual void lookupField(::java::lang::Class *);
-  virtual void checkFieldType();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual void setBooleanField(::java::lang::Object *, jboolean);
-  virtual void setByteField(::java::lang::Object *, jbyte);
-  virtual void setCharField(::java::lang::Object *, jchar);
-  virtual void setShortField(::java::lang::Object *, jshort);
-  virtual void setIntField(::java::lang::Object *, jint);
-  virtual void setLongField(::java::lang::Object *, jlong);
-  virtual void setFloatField(::java::lang::Object *, jfloat);
-  virtual void setDoubleField(::java::lang::Object *, jdouble);
-  virtual void setObjectField(::java::lang::Object *, ::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::Class * type;
-  ::java::lang::String * typename$;
-  jint offset;
-  jboolean unshared;
-  jboolean persistent;
-  jboolean toset;
-public: // actually package-private
-  ::java::lang::reflect::Field * field;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_ObjectStreamField__
diff --git a/libjava/java/io/OptionalDataException.h b/libjava/java/io/OptionalDataException.h
deleted file mode 100644
index b12a8390977..00000000000
--- a/libjava/java/io/OptionalDataException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_OptionalDataException__
-#define __java_io_OptionalDataException__
-
-#pragma interface
-
-#include <java/io/ObjectStreamException.h>
-
-class java::io::OptionalDataException : public ::java::io::ObjectStreamException
-{
-
-public: // actually package-private
-  OptionalDataException(jboolean, jint);
-private:
-  static const jlong serialVersionUID = -8011121865681257820LL;
-public:
-  jboolean __attribute__((aligned(__alignof__( ::java::io::ObjectStreamException)))) eof;
-  jint length;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_OptionalDataException__
diff --git a/libjava/java/io/OutputStream.h b/libjava/java/io/OutputStream.h
deleted file mode 100644
index 28f158511e8..00000000000
--- a/libjava/java/io/OutputStream.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_OutputStream__
-#define __java_io_OutputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::io::OutputStream : public ::java::lang::Object
-{
-
-public:
-  OutputStream();
-  virtual void write(jint) = 0;
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void flush();
-  virtual void close();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_OutputStream__
diff --git a/libjava/java/io/OutputStreamWriter.h b/libjava/java/io/OutputStreamWriter.h
deleted file mode 100644
index 8ad6c8e690a..00000000000
--- a/libjava/java/io/OutputStreamWriter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_OutputStreamWriter__
-#define __java_io_OutputStreamWriter__
-
-#pragma interface
-
-#include <java/io/Writer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class UnicodeToBytes;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class java::io::OutputStreamWriter : public ::java::io::Writer
-{
-
-  OutputStreamWriter(::java::io::OutputStream *, ::gnu::gcj::convert::UnicodeToBytes *);
-public:
-  OutputStreamWriter(::java::io::OutputStream *, ::java::lang::String *);
-  OutputStreamWriter(::java::io::OutputStream *);
-  OutputStreamWriter(::java::io::OutputStream *, ::java::nio::charset::Charset *);
-  OutputStreamWriter(::java::io::OutputStream *, ::java::nio::charset::CharsetEncoder *);
-  virtual void close();
-  virtual ::java::lang::String * getEncoding();
-  virtual void flush();
-  virtual void write(JArray< jchar > *, jint, jint);
-private:
-  void writeChars(JArray< jchar > *, jint, jint);
-public:
-  virtual void write(::java::lang::String *, jint, jint);
-  virtual void write(jint);
-public: // actually package-private
-  ::java::io::BufferedOutputStream * __attribute__((aligned(__alignof__( ::java::io::Writer)))) out;
-  ::gnu::gcj::convert::UnicodeToBytes * converter;
-private:
-  JArray< jchar > * work;
-  jint wcount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_OutputStreamWriter__
diff --git a/libjava/java/io/PipedInputStream.h b/libjava/java/io/PipedInputStream.h
deleted file mode 100644
index 9531667af4b..00000000000
--- a/libjava/java/io/PipedInputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_PipedInputStream__
-#define __java_io_PipedInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::PipedInputStream : public ::java::io::InputStream
-{
-
-public:
-  PipedInputStream();
-  PipedInputStream(::java::io::PipedOutputStream *);
-  virtual void connect(::java::io::PipedOutputStream *);
-public: // actually protected
-  virtual void receive(jint);
-public: // actually package-private
-  virtual void receive(JArray< jbyte > *, jint, jint);
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint available();
-  virtual void close();
-public: // actually package-private
-  ::java::io::PipedOutputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) source;
-  jboolean closed;
-public: // actually protected
-  static const jint PIPE_SIZE = 1024;
-  JArray< jbyte > * buffer;
-  jint in;
-  jint out;
-private:
-  JArray< jbyte > * read_buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_PipedInputStream__
diff --git a/libjava/java/io/PipedOutputStream.h b/libjava/java/io/PipedOutputStream.h
deleted file mode 100644
index 79e069e40f2..00000000000
--- a/libjava/java/io/PipedOutputStream.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_PipedOutputStream__
-#define __java_io_PipedOutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::PipedOutputStream : public ::java::io::OutputStream
-{
-
-public:
-  PipedOutputStream();
-  PipedOutputStream(::java::io::PipedInputStream *);
-  virtual void connect(::java::io::PipedInputStream *);
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void flush();
-  virtual void close();
-public: // actually package-private
-  ::java::io::PipedInputStream * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) sink;
-  jboolean closed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_PipedOutputStream__
diff --git a/libjava/java/io/PipedReader.h b/libjava/java/io/PipedReader.h
deleted file mode 100644
index 1eac2f79e18..00000000000
--- a/libjava/java/io/PipedReader.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_PipedReader__
-#define __java_io_PipedReader__
-
-#pragma interface
-
-#include <java/io/Reader.h>
-#include <gcj/array.h>
-
-
-class java::io::PipedReader : public ::java::io::Reader
-{
-
-public:
-  PipedReader();
-  PipedReader(::java::io::PipedWriter *);
-  virtual void connect(::java::io::PipedWriter *);
-public: // actually package-private
-  virtual void receive(JArray< jchar > *, jint, jint);
-public:
-  virtual jint read();
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual jboolean ready();
-  virtual void close();
-public: // actually package-private
-  ::java::io::PipedWriter * __attribute__((aligned(__alignof__( ::java::io::Reader)))) source;
-  jboolean closed;
-  static const jint PIPE_SIZE = 2048;
-  JArray< jchar > * buffer;
-  jint in;
-  jint out;
-  JArray< jchar > * read_buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_PipedReader__
diff --git a/libjava/java/io/PipedWriter.h b/libjava/java/io/PipedWriter.h
deleted file mode 100644
index d1aac55aecf..00000000000
--- a/libjava/java/io/PipedWriter.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_PipedWriter__
-#define __java_io_PipedWriter__
-
-#pragma interface
-
-#include <java/io/Writer.h>
-#include <gcj/array.h>
-
-
-class java::io::PipedWriter : public ::java::io::Writer
-{
-
-public:
-  PipedWriter();
-  PipedWriter(::java::io::PipedReader *);
-  virtual void connect(::java::io::PipedReader *);
-  virtual void write(jint);
-  virtual void write(JArray< jchar > *, jint, jint);
-  virtual void flush();
-  virtual void close();
-public: // actually package-private
-  ::java::io::PipedReader * __attribute__((aligned(__alignof__( ::java::io::Writer)))) sink;
-  jboolean closed;
-  JArray< jchar > * read_buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_PipedWriter__
diff --git a/libjava/java/io/PrintStream.h b/libjava/java/io/PrintStream.h
deleted file mode 100644
index 3740fc78596..00000000000
--- a/libjava/java/io/PrintStream.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_PrintStream__
-#define __java_io_PrintStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace convert
-      {
-          class UnicodeToBytes;
-      }
-    }
-  }
-}
-
-class java::io::PrintStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  PrintStream(::java::io::OutputStream *);
-  PrintStream(::java::io::OutputStream *, jboolean);
-  PrintStream(::java::io::OutputStream *, jboolean, ::java::lang::String *);
-  virtual jboolean checkError();
-public: // actually protected
-  virtual void setError();
-public:
-  virtual void close();
-  virtual void flush();
-private:
-  void print(::java::lang::String *, jboolean);
-  void print(JArray< jchar > *, jint, jint, jboolean);
-  void writeChars(JArray< jchar > *, jint, jint);
-  void writeChars(::java::lang::String *, jint, jint);
-public:
-  virtual void print(jboolean);
-  virtual void print(jint);
-  virtual void print(jlong);
-  virtual void print(jfloat);
-  virtual void print(jdouble);
-  virtual void print(::java::lang::Object *);
-  virtual void print(::java::lang::String *);
-  virtual void print(jchar);
-  virtual void print(JArray< jchar > *);
-  virtual void println();
-  virtual void println(jboolean);
-  virtual void println(jint);
-  virtual void println(jlong);
-  virtual void println(jfloat);
-  virtual void println(jdouble);
-  virtual void println(::java::lang::Object *);
-  virtual void println(::java::lang::String *);
-  virtual void println(jchar);
-  virtual void println(JArray< jchar > *);
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual ::java::io::PrintStream * target$append(jchar);
-  virtual ::java::io::PrintStream * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::PrintStream * target$append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::PrintStream * printf(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::io::PrintStream * printf(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::io::PrintStream * format(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::io::PrintStream * format(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::lang::Appendable * append(jchar);
-private:
-  static JArray< jchar > * line_separator;
-public: // actually package-private
-  ::gnu::gcj::convert::UnicodeToBytes * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) converter;
-  JArray< jchar > * work;
-  JArray< jbyte > * work_bytes;
-private:
-  jboolean error_occurred;
-  jboolean auto_flush;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_PrintStream__
diff --git a/libjava/java/io/PrintWriter.h b/libjava/java/io/PrintWriter.h
deleted file mode 100644
index 2cbbd042dd9..00000000000
--- a/libjava/java/io/PrintWriter.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_PrintWriter__
-#define __java_io_PrintWriter__
-
-#pragma interface
-
-#include <java/io/Writer.h>
-#include <gcj/array.h>
-
-
-class java::io::PrintWriter : public ::java::io::Writer
-{
-
-public:
-  PrintWriter(::java::io::Writer *);
-  PrintWriter(::java::io::Writer *, jboolean);
-  PrintWriter(::java::io::OutputStream *);
-  PrintWriter(::java::io::OutputStream *, jboolean);
-  PrintWriter(::java::lang::String *);
-  PrintWriter(::java::lang::String *, ::java::lang::String *);
-  PrintWriter(::java::io::File *);
-  PrintWriter(::java::io::File *, ::java::lang::String *);
-public: // actually protected
-  virtual void setError();
-public:
-  virtual jboolean checkError();
-  virtual void flush();
-  virtual void close();
-  virtual void print(::java::lang::String *);
-  virtual void print(jchar);
-  virtual void print(JArray< jchar > *);
-  virtual void print(jboolean);
-  virtual void print(jint);
-  virtual void print(jlong);
-  virtual void print(jfloat);
-  virtual void print(jdouble);
-  virtual void print(::java::lang::Object *);
-  virtual void println();
-  virtual void println(jboolean);
-  virtual void println(jint);
-  virtual void println(jlong);
-  virtual void println(jfloat);
-  virtual void println(jdouble);
-  virtual void println(::java::lang::Object *);
-  virtual void println(::java::lang::String *);
-  virtual void println(jchar);
-  virtual void println(JArray< jchar > *);
-  virtual void write(jint);
-  virtual void write(JArray< jchar > *, jint, jint);
-  virtual void write(::java::lang::String *, jint, jint);
-  virtual void write(JArray< jchar > *);
-  virtual void write(::java::lang::String *);
-  virtual ::java::io::PrintWriter * target$append(jchar);
-  virtual ::java::io::PrintWriter * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::PrintWriter * target$append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::PrintWriter * printf(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::io::PrintWriter * printf(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::io::PrintWriter * format(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::io::PrintWriter * format(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
-  virtual ::java::lang::Appendable * append(jchar);
-  virtual ::java::io::Writer * target$append(jchar);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::io::Writer)))) autoflush;
-  jboolean error;
-  jboolean closed;
-public: // actually protected
-  ::java::io::Writer * out;
-private:
-  static JArray< jchar > * line_separator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_PrintWriter__
diff --git a/libjava/java/io/PushbackInputStream.h b/libjava/java/io/PushbackInputStream.h
deleted file mode 100644
index 032bfce983a..00000000000
--- a/libjava/java/io/PushbackInputStream.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_PushbackInputStream__
-#define __java_io_PushbackInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::PushbackInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  PushbackInputStream(::java::io::InputStream *);
-  PushbackInputStream(::java::io::InputStream *, jint);
-  virtual jint available();
-  virtual void close();
-  virtual jboolean markSupported();
-  virtual void reset();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void unread(jint);
-  virtual void unread(JArray< jbyte > *);
-  virtual void unread(JArray< jbyte > *, jint, jint);
-  virtual jlong skip(jlong);
-private:
-  static const jint DEFAULT_BUFFER_SIZE = 1;
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) buf;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_PushbackInputStream__
diff --git a/libjava/java/io/PushbackReader.h b/libjava/java/io/PushbackReader.h
deleted file mode 100644
index 8d1c2ee5e35..00000000000
--- a/libjava/java/io/PushbackReader.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_PushbackReader__
-#define __java_io_PushbackReader__
-
-#pragma interface
-
-#include <java/io/FilterReader.h>
-#include <gcj/array.h>
-
-
-class java::io::PushbackReader : public ::java::io::FilterReader
-{
-
-public:
-  PushbackReader(::java::io::Reader *);
-  PushbackReader(::java::io::Reader *, jint);
-  virtual void close();
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual void reset();
-  virtual jboolean ready();
-  virtual jlong skip(jlong);
-  virtual jint read();
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual void unread(jint);
-  virtual void unread(JArray< jchar > *);
-  virtual void unread(JArray< jchar > *, jint, jint);
-private:
-  static const jint DEFAULT_BUFFER_SIZE = 1;
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::io::FilterReader)))) buf;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_PushbackReader__
diff --git a/libjava/java/io/RandomAccessFile.h b/libjava/java/io/RandomAccessFile.h
deleted file mode 100644
index 6b6076dfaf2..00000000000
--- a/libjava/java/io/RandomAccessFile.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_RandomAccessFile__
-#define __java_io_RandomAccessFile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace channels
-        {
-            class FileChannelImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class FileChannel;
-      }
-    }
-  }
-}
-
-class java::io::RandomAccessFile : public ::java::lang::Object
-{
-
-public:
-  RandomAccessFile(::java::io::File *, ::java::lang::String *);
-  RandomAccessFile(::java::lang::String *, ::java::lang::String *);
-  virtual void close();
-  virtual ::java::io::FileDescriptor * getFD();
-  virtual jlong getFilePointer();
-  virtual void setLength(jlong);
-  virtual jlong length();
-  virtual jint read();
-  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 ::java::lang::String * readUTF();
-  virtual void seek(jlong);
-  virtual jint skipBytes(jint);
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  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);
-  virtual void writeBytes(::java::lang::String *);
-  virtual void writeChars(::java::lang::String *);
-  virtual void writeUTF(::java::lang::String *);
-  virtual ::java::nio::channels::FileChannel * getChannel();
-private:
-  ::gnu::java::nio::channels::FileChannelImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ch;
-  ::java::io::FileDescriptor * fd;
-  ::java::io::DataOutputStream * out;
-  ::java::io::DataInputStream * in;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_RandomAccessFile__
diff --git a/libjava/java/io/Reader.h b/libjava/java/io/Reader.h
deleted file mode 100644
index 678bc918144..00000000000
--- a/libjava/java/io/Reader.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_Reader__
-#define __java_io_Reader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class CharBuffer;
-    }
-  }
-}
-
-class java::io::Reader : public ::java::lang::Object
-{
-
-public: // actually protected
-  Reader();
-  Reader(::java::lang::Object *);
-public:
-  virtual jint read(JArray< jchar > *, jint, jint) = 0;
-  virtual jint read(JArray< jchar > *);
-  virtual jint read();
-  virtual jint read(::java::nio::CharBuffer *);
-  virtual void close() = 0;
-  virtual jboolean markSupported();
-  virtual void mark(jint);
-  virtual void reset();
-  virtual jboolean ready();
-  virtual jlong skip(jlong);
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_Reader__
diff --git a/libjava/java/io/SequenceInputStream.h b/libjava/java/io/SequenceInputStream.h
deleted file mode 100644
index f5baa7d103f..00000000000
--- a/libjava/java/io/SequenceInputStream.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_SequenceInputStream__
-#define __java_io_SequenceInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::SequenceInputStream : public ::java::io::InputStream
-{
-
-public:
-  SequenceInputStream(::java::util::Enumeration *);
-  SequenceInputStream(::java::io::InputStream *, ::java::io::InputStream *);
-  virtual jint available();
-  virtual void close();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  ::java::io::InputStream * getNextStream();
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) in;
-  ::java::io::InputStream * in2;
-  ::java::util::Enumeration * e;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_SequenceInputStream__
diff --git a/libjava/java/io/Serializable.h b/libjava/java/io/Serializable.h
deleted file mode 100644
index 12c36e55cea..00000000000
--- a/libjava/java/io/Serializable.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_Serializable__
-#define __java_io_Serializable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::Serializable : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_io_Serializable__
diff --git a/libjava/java/io/SerializablePermission.h b/libjava/java/io/SerializablePermission.h
deleted file mode 100644
index 04c3dcee412..00000000000
--- a/libjava/java/io/SerializablePermission.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_SerializablePermission__
-#define __java_io_SerializablePermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-#include <gcj/array.h>
-
-
-class java::io::SerializablePermission : public ::java::security::BasicPermission
-{
-
-public:
-  SerializablePermission(::java::lang::String *);
-  SerializablePermission(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  static const jlong serialVersionUID = 8537212141160296410LL;
-private:
-  static JArray< ::java::lang::String * > * legal_names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_SerializablePermission__
diff --git a/libjava/java/io/StreamCorruptedException.h b/libjava/java/io/StreamCorruptedException.h
deleted file mode 100644
index 79b0d02a9be..00000000000
--- a/libjava/java/io/StreamCorruptedException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_StreamCorruptedException__
-#define __java_io_StreamCorruptedException__
-
-#pragma interface
-
-#include <java/io/ObjectStreamException.h>
-
-class java::io::StreamCorruptedException : public ::java::io::ObjectStreamException
-{
-
-public:
-  StreamCorruptedException();
-  StreamCorruptedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8983558202217591746LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_StreamCorruptedException__
diff --git a/libjava/java/io/StreamTokenizer.h b/libjava/java/io/StreamTokenizer.h
deleted file mode 100644
index ad9496cd4bb..00000000000
--- a/libjava/java/io/StreamTokenizer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_StreamTokenizer__
-#define __java_io_StreamTokenizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::io::StreamTokenizer : public ::java::lang::Object
-{
-
-public:
-  StreamTokenizer(::java::io::InputStream *);
-  StreamTokenizer(::java::io::Reader *);
-  virtual void commentChar(jint);
-  virtual void eolIsSignificant(jboolean);
-  virtual jint lineno();
-  virtual void lowerCaseMode(jboolean);
-private:
-  jboolean isWhitespace(jint);
-  jboolean isAlphabetic(jint);
-  jboolean isNumeric(jint);
-  jboolean isQuote(jint);
-  jboolean isComment(jint);
-public:
-  virtual jint nextToken();
-private:
-  void resetChar(jint);
-public:
-  virtual void ordinaryChar(jint);
-  virtual void ordinaryChars(jint, jint);
-  virtual void parseNumbers();
-  virtual void pushBack();
-  virtual void quoteChar(jint);
-  virtual void resetSyntax();
-  virtual void slashSlashComments(jboolean);
-  virtual void slashStarComments(jboolean);
-  virtual ::java::lang::String * toString();
-  virtual void whitespaceChars(jint, jint);
-  virtual void wordChars(jint, jint);
-  static const jint TT_EOF = -1;
-  static const jint TT_EOL = 10;
-  static const jint TT_NUMBER = -2;
-  static const jint TT_WORD = -3;
-private:
-  static const jint TT_NONE = -4;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) ttype;
-  ::java::lang::String * sval;
-  jdouble nval;
-private:
-  jboolean eolSignificant;
-  jboolean lowerCase;
-  jboolean slashSlash;
-  jboolean slashStar;
-  JArray< jboolean > * whitespace;
-  JArray< jboolean > * alphabetic;
-  JArray< jboolean > * numeric;
-  JArray< jboolean > * quote;
-  JArray< jboolean > * comment;
-  ::java::io::PushbackReader * in;
-  jboolean pushedBack;
-  jint lineNumber;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_StreamTokenizer__
diff --git a/libjava/java/io/StringBufferInputStream.h b/libjava/java/io/StringBufferInputStream.h
deleted file mode 100644
index 077bc4d2875..00000000000
--- a/libjava/java/io/StringBufferInputStream.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_StringBufferInputStream__
-#define __java_io_StringBufferInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-
-class java::io::StringBufferInputStream : public ::java::io::InputStream
-{
-
-public:
-  StringBufferInputStream(::java::lang::String *);
-  virtual jint available();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void reset();
-  virtual jlong skip(jlong);
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) buffer;
-  jint pos;
-  jint count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_StringBufferInputStream__
diff --git a/libjava/java/io/StringReader.h b/libjava/java/io/StringReader.h
deleted file mode 100644
index 57a2d3f8040..00000000000
--- a/libjava/java/io/StringReader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_StringReader__
-#define __java_io_StringReader__
-
-#pragma interface
-
-#include <java/io/Reader.h>
-#include <gcj/array.h>
-
-
-class java::io::StringReader : public ::java::io::Reader
-{
-
-public:
-  StringReader(::java::lang::String *);
-  virtual void close();
-  virtual void mark(jint);
-  virtual jboolean markSupported();
-  virtual jint read();
-  virtual jint read(JArray< jchar > *, jint, jint);
-  virtual jboolean ready();
-  virtual void reset();
-  virtual jlong skip(jlong);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::io::Reader)))) buf;
-  jint pos;
-  jint markedPos;
-  jint count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_StringReader__
diff --git a/libjava/java/io/StringWriter.h b/libjava/java/io/StringWriter.h
deleted file mode 100644
index 16e6de52b73..00000000000
--- a/libjava/java/io/StringWriter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_StringWriter__
-#define __java_io_StringWriter__
-
-#pragma interface
-
-#include <java/io/Writer.h>
-#include <gcj/array.h>
-
-
-class java::io::StringWriter : public ::java::io::Writer
-{
-
-public:
-  virtual void close();
-  virtual void flush();
-  virtual ::java::lang::StringBuffer * getBuffer();
-  StringWriter();
-  StringWriter(jint);
-  virtual ::java::lang::String * toString();
-  virtual void write(jint);
-  virtual void write(JArray< jchar > *, jint, jint);
-  virtual void write(::java::lang::String *);
-  virtual void write(::java::lang::String *, jint, jint);
-  virtual ::java::io::StringWriter * target$append(jchar);
-  virtual ::java::io::StringWriter * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::StringWriter * target$append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
-  virtual ::java::lang::Appendable * append(jchar);
-  virtual ::java::io::Writer * target$append(jchar);
-private:
-  static const jint DEFAULT_BUFFER_SIZE = 16;
-  ::java::lang::StringBuffer * __attribute__((aligned(__alignof__( ::java::io::Writer)))) buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_StringWriter__
diff --git a/libjava/java/io/SyncFailedException.h b/libjava/java/io/SyncFailedException.h
deleted file mode 100644
index 1088ca2dd12..00000000000
--- a/libjava/java/io/SyncFailedException.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_SyncFailedException__
-#define __java_io_SyncFailedException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-
-class java::io::SyncFailedException : public ::java::io::IOException
-{
-
-public:
-  SyncFailedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2353342684412443330LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_SyncFailedException__
diff --git a/libjava/java/io/UTFDataFormatException.h b/libjava/java/io/UTFDataFormatException.h
deleted file mode 100644
index 48f8cf7a626..00000000000
--- a/libjava/java/io/UTFDataFormatException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_UTFDataFormatException__
-#define __java_io_UTFDataFormatException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-
-class java::io::UTFDataFormatException : public ::java::io::IOException
-{
-
-public:
-  UTFDataFormatException();
-  UTFDataFormatException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 420743449228280612LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_UTFDataFormatException__
diff --git a/libjava/java/io/UnsupportedEncodingException.h b/libjava/java/io/UnsupportedEncodingException.h
deleted file mode 100644
index 6291af25593..00000000000
--- a/libjava/java/io/UnsupportedEncodingException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_UnsupportedEncodingException__
-#define __java_io_UnsupportedEncodingException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-
-class java::io::UnsupportedEncodingException : public ::java::io::IOException
-{
-
-public:
-  UnsupportedEncodingException();
-  UnsupportedEncodingException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4274276298326136670LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_UnsupportedEncodingException__
diff --git a/libjava/java/io/VMObjectInputStream.h b/libjava/java/io/VMObjectInputStream.h
deleted file mode 100644
index 307dd551fa4..00000000000
--- a/libjava/java/io/VMObjectInputStream.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_VMObjectInputStream__
-#define __java_io_VMObjectInputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::VMObjectInputStream : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMObjectInputStream();
-  static ::java::lang::Object * allocateObject(::java::lang::Class *, ::java::lang::Class *, ::java::lang::reflect::Constructor *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_VMObjectInputStream__
diff --git a/libjava/java/io/VMObjectStreamClass.h b/libjava/java/io/VMObjectStreamClass.h
deleted file mode 100644
index 5f2ef2cb073..00000000000
--- a/libjava/java/io/VMObjectStreamClass.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_VMObjectStreamClass__
-#define __java_io_VMObjectStreamClass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::io::VMObjectStreamClass : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMObjectStreamClass();
-  static jboolean hasClassInitializer(::java::lang::Class *);
-  static void setDoubleNative(::java::lang::reflect::Field *, ::java::lang::Object *, jdouble);
-  static void setFloatNative(::java::lang::reflect::Field *, ::java::lang::Object *, jfloat);
-  static void setLongNative(::java::lang::reflect::Field *, ::java::lang::Object *, jlong);
-  static void setIntNative(::java::lang::reflect::Field *, ::java::lang::Object *, jint);
-  static void setShortNative(::java::lang::reflect::Field *, ::java::lang::Object *, jshort);
-  static void setCharNative(::java::lang::reflect::Field *, ::java::lang::Object *, jchar);
-  static void setByteNative(::java::lang::reflect::Field *, ::java::lang::Object *, jbyte);
-  static void setBooleanNative(::java::lang::reflect::Field *, ::java::lang::Object *, jboolean);
-  static void setObjectNative(::java::lang::reflect::Field *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_VMObjectStreamClass__
diff --git a/libjava/java/io/WriteAbortedException.h b/libjava/java/io/WriteAbortedException.h
deleted file mode 100644
index 712c04d0fe3..00000000000
--- a/libjava/java/io/WriteAbortedException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_WriteAbortedException__
-#define __java_io_WriteAbortedException__
-
-#pragma interface
-
-#include <java/io/ObjectStreamException.h>
-
-class java::io::WriteAbortedException : public ::java::io::ObjectStreamException
-{
-
-public:
-  WriteAbortedException(::java::lang::String *, ::java::lang::Exception *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Throwable * getCause();
-private:
-  static const jlong serialVersionUID = -3326426625597282442LL;
-public:
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::io::ObjectStreamException)))) detail;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_WriteAbortedException__
diff --git a/libjava/java/io/Writer.h b/libjava/java/io/Writer.h
deleted file mode 100644
index 611566470ba..00000000000
--- a/libjava/java/io/Writer.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_io_Writer__
-#define __java_io_Writer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::io::Writer : public ::java::lang::Object
-{
-
-public: // actually protected
-  Writer();
-  Writer(::java::lang::Object *);
-public:
-  virtual void flush() = 0;
-  virtual void close() = 0;
-  virtual void write(jint);
-  virtual void write(JArray< jchar > *);
-  virtual void write(JArray< jchar > *, jint, jint) = 0;
-  virtual void write(::java::lang::String *);
-  virtual void write(::java::lang::String *, jint, jint);
-  virtual ::java::io::Writer * target$append(jchar);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::lang::Appendable * append(jchar);
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_io_Writer__
diff --git a/libjava/java/lang/AbstractMethodError.h b/libjava/java/lang/AbstractMethodError.h
deleted file mode 100644
index 92a757da238..00000000000
--- a/libjava/java/lang/AbstractMethodError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_AbstractMethodError__
-#define __java_lang_AbstractMethodError__
-
-#pragma interface
-
-#include <java/lang/IncompatibleClassChangeError.h>
-
-class java::lang::AbstractMethodError : public ::java::lang::IncompatibleClassChangeError
-{
-
-public:
-  AbstractMethodError();
-  AbstractMethodError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1654391082989018462LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_AbstractMethodError__
diff --git a/libjava/java/lang/Appendable.h b/libjava/java/lang/Appendable.h
deleted file mode 100644
index d304ff9cfd0..00000000000
--- a/libjava/java/lang/Appendable.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Appendable__
-#define __java_lang_Appendable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Appendable : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Appendable * append(jchar) = 0;
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *) = 0;
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_Appendable__
diff --git a/libjava/java/lang/ArithmeticException.h b/libjava/java/lang/ArithmeticException.h
deleted file mode 100644
index 8d784adb7e7..00000000000
--- a/libjava/java/lang/ArithmeticException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ArithmeticException__
-#define __java_lang_ArithmeticException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::ArithmeticException : public ::java::lang::RuntimeException
-{
-
-public:
-  ArithmeticException();
-  ArithmeticException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2256477558314496007LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ArithmeticException__
diff --git a/libjava/java/lang/ArrayIndexOutOfBoundsException.h b/libjava/java/lang/ArrayIndexOutOfBoundsException.h
deleted file mode 100644
index 8e65f70f741..00000000000
--- a/libjava/java/lang/ArrayIndexOutOfBoundsException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ArrayIndexOutOfBoundsException__
-#define __java_lang_ArrayIndexOutOfBoundsException__
-
-#pragma interface
-
-#include <java/lang/IndexOutOfBoundsException.h>
-
-class java::lang::ArrayIndexOutOfBoundsException : public ::java::lang::IndexOutOfBoundsException
-{
-
-public:
-  ArrayIndexOutOfBoundsException();
-  ArrayIndexOutOfBoundsException(::java::lang::String *);
-  ArrayIndexOutOfBoundsException(jint);
-private:
-  static const jlong serialVersionUID = -5116101128118950844LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ArrayIndexOutOfBoundsException__
diff --git a/libjava/java/lang/ArrayStoreException.h b/libjava/java/lang/ArrayStoreException.h
deleted file mode 100644
index 8e120d11cbb..00000000000
--- a/libjava/java/lang/ArrayStoreException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ArrayStoreException__
-#define __java_lang_ArrayStoreException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::ArrayStoreException : public ::java::lang::RuntimeException
-{
-
-public:
-  ArrayStoreException();
-  ArrayStoreException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4522193890499838241LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ArrayStoreException__
diff --git a/libjava/java/lang/AssertionError.h b/libjava/java/lang/AssertionError.h
deleted file mode 100644
index 0154c04b3f4..00000000000
--- a/libjava/java/lang/AssertionError.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_AssertionError__
-#define __java_lang_AssertionError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-
-class java::lang::AssertionError : public ::java::lang::Error
-{
-
-public:
-  AssertionError();
-  AssertionError(::java::lang::Object *);
-  AssertionError(jboolean);
-  AssertionError(jchar);
-  AssertionError(jint);
-  AssertionError(jlong);
-  AssertionError(jfloat);
-  AssertionError(jdouble);
-private:
-  static const jlong serialVersionUID = -5013299493970297370LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_AssertionError__
diff --git a/libjava/java/lang/Boolean.h b/libjava/java/lang/Boolean.h
deleted file mode 100644
index a8476f7b8b1..00000000000
--- a/libjava/java/lang/Boolean.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Boolean__
-#define __java_lang_Boolean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Boolean : public ::java::lang::Object
-{
-
-public:
-  Boolean(jboolean);
-  Boolean(::java::lang::String *);
-  jboolean booleanValue();
-  static ::java::lang::Boolean * valueOf(jboolean);
-  static ::java::lang::Boolean * valueOf(::java::lang::String *);
-  static ::java::lang::String * toString(jboolean);
-  ::java::lang::String * toString();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  static jboolean getBoolean(::java::lang::String *);
-  jint target$compareTo(::java::lang::Boolean *);
-  static jboolean parseBoolean(::java::lang::String *);
-  jint compareTo(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -3665804199014368530LL;
-public:
-  static ::java::lang::Boolean * TRUE;
-  static ::java::lang::Boolean * FALSE;
-  static ::java::lang::Class * TYPE;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Boolean__
diff --git a/libjava/java/lang/Byte.h b/libjava/java/lang/Byte.h
deleted file mode 100644
index 2caccd7be5c..00000000000
--- a/libjava/java/lang/Byte.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Byte__
-#define __java_lang_Byte__
-
-#pragma interface
-
-#include <java/lang/Number.h>
-#include <gcj/array.h>
-
-
-class java::lang::Byte : public ::java::lang::Number
-{
-
-public:
-  Byte(jbyte);
-  Byte(::java::lang::String *);
-  static ::java::lang::String * toString(jbyte);
-  static jbyte parseByte(::java::lang::String *);
-  static jbyte parseByte(::java::lang::String *, jint);
-  static ::java::lang::Byte * valueOf(::java::lang::String *, jint);
-  static ::java::lang::Byte * valueOf(::java::lang::String *);
-  static ::java::lang::Byte * valueOf(jbyte);
-  static ::java::lang::Byte * decode(::java::lang::String *);
-  jbyte byteValue();
-  jshort shortValue();
-  jint intValue();
-  jlong longValue();
-  jfloat floatValue();
-  jdouble doubleValue();
-  ::java::lang::String * toString();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jint target$compareTo(::java::lang::Byte *);
-  jint compareTo(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -7183698231559129828LL;
-public:
-  static const jbyte MIN_VALUE = -128;
-  static const jbyte MAX_VALUE = 127;
-  static ::java::lang::Class * TYPE;
-  static const jint SIZE = 8;
-private:
-  static JArray< ::java::lang::Byte * > * byteCache;
-  jbyte __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Byte__
diff --git a/libjava/java/lang/CharSequence.h b/libjava/java/lang/CharSequence.h
deleted file mode 100644
index 1348b564d04..00000000000
--- a/libjava/java/lang/CharSequence.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_CharSequence__
-#define __java_lang_CharSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::CharSequence : public ::java::lang::Object
-{
-
-public:
-  virtual jchar charAt(jint) = 0;
-  virtual jint length() = 0;
-  virtual ::java::lang::CharSequence * subSequence(jint, jint) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_CharSequence__
diff --git a/libjava/java/lang/Character$Subset.h b/libjava/java/lang/Character$Subset.h
deleted file mode 100644
index 93f2ba1cb34..00000000000
--- a/libjava/java/lang/Character$Subset.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Character$Subset__
-#define __java_lang_Character$Subset__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Character$Subset : public ::java::lang::Object
-{
-
-public: // actually protected
-  Character$Subset(::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Character$Subset__
diff --git a/libjava/java/lang/Character$UnicodeBlock.h b/libjava/java/lang/Character$UnicodeBlock.h
deleted file mode 100644
index 43fa6b447e3..00000000000
--- a/libjava/java/lang/Character$UnicodeBlock.h
+++ /dev/null
@@ -1,161 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Character$UnicodeBlock__
-#define __java_lang_Character$UnicodeBlock__
-
-#pragma interface
-
-#include <java/lang/Character$Subset.h>
-#include <gcj/array.h>
-
-
-class java::lang::Character$UnicodeBlock : public ::java::lang::Character$Subset
-{
-
-  Character$UnicodeBlock(jint, jint, ::java::lang::String *, ::java::lang::String *);
-public:
-  static ::java::lang::Character$UnicodeBlock * of(jchar);
-  static ::java::lang::Character$UnicodeBlock * of(jint);
-  static ::java::lang::Character$UnicodeBlock * forName(::java::lang::String *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Character$Subset)))) start;
-  jint end;
-  ::java::lang::String * canonicalName;
-  static const jint CANONICAL_NAME = 0;
-  static const jint NO_SPACES_NAME = 1;
-  static const jint CONSTANT_NAME = 2;
-public:
-  static ::java::lang::Character$UnicodeBlock * BASIC_LATIN;
-  static ::java::lang::Character$UnicodeBlock * LATIN_1_SUPPLEMENT;
-  static ::java::lang::Character$UnicodeBlock * LATIN_EXTENDED_A;
-  static ::java::lang::Character$UnicodeBlock * LATIN_EXTENDED_B;
-  static ::java::lang::Character$UnicodeBlock * IPA_EXTENSIONS;
-  static ::java::lang::Character$UnicodeBlock * SPACING_MODIFIER_LETTERS;
-  static ::java::lang::Character$UnicodeBlock * COMBINING_DIACRITICAL_MARKS;
-  static ::java::lang::Character$UnicodeBlock * GREEK;
-  static ::java::lang::Character$UnicodeBlock * CYRILLIC;
-  static ::java::lang::Character$UnicodeBlock * CYRILLIC_SUPPLEMENTARY;
-  static ::java::lang::Character$UnicodeBlock * ARMENIAN;
-  static ::java::lang::Character$UnicodeBlock * HEBREW;
-  static ::java::lang::Character$UnicodeBlock * ARABIC;
-  static ::java::lang::Character$UnicodeBlock * SYRIAC;
-  static ::java::lang::Character$UnicodeBlock * THAANA;
-  static ::java::lang::Character$UnicodeBlock * DEVANAGARI;
-  static ::java::lang::Character$UnicodeBlock * BENGALI;
-  static ::java::lang::Character$UnicodeBlock * GURMUKHI;
-  static ::java::lang::Character$UnicodeBlock * GUJARATI;
-  static ::java::lang::Character$UnicodeBlock * ORIYA;
-  static ::java::lang::Character$UnicodeBlock * TAMIL;
-  static ::java::lang::Character$UnicodeBlock * TELUGU;
-  static ::java::lang::Character$UnicodeBlock * KANNADA;
-  static ::java::lang::Character$UnicodeBlock * MALAYALAM;
-  static ::java::lang::Character$UnicodeBlock * SINHALA;
-  static ::java::lang::Character$UnicodeBlock * THAI;
-  static ::java::lang::Character$UnicodeBlock * LAO;
-  static ::java::lang::Character$UnicodeBlock * TIBETAN;
-  static ::java::lang::Character$UnicodeBlock * MYANMAR;
-  static ::java::lang::Character$UnicodeBlock * GEORGIAN;
-  static ::java::lang::Character$UnicodeBlock * HANGUL_JAMO;
-  static ::java::lang::Character$UnicodeBlock * ETHIOPIC;
-  static ::java::lang::Character$UnicodeBlock * CHEROKEE;
-  static ::java::lang::Character$UnicodeBlock * UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS;
-  static ::java::lang::Character$UnicodeBlock * OGHAM;
-  static ::java::lang::Character$UnicodeBlock * RUNIC;
-  static ::java::lang::Character$UnicodeBlock * TAGALOG;
-  static ::java::lang::Character$UnicodeBlock * HANUNOO;
-  static ::java::lang::Character$UnicodeBlock * BUHID;
-  static ::java::lang::Character$UnicodeBlock * TAGBANWA;
-  static ::java::lang::Character$UnicodeBlock * KHMER;
-  static ::java::lang::Character$UnicodeBlock * MONGOLIAN;
-  static ::java::lang::Character$UnicodeBlock * LIMBU;
-  static ::java::lang::Character$UnicodeBlock * TAI_LE;
-  static ::java::lang::Character$UnicodeBlock * KHMER_SYMBOLS;
-  static ::java::lang::Character$UnicodeBlock * PHONETIC_EXTENSIONS;
-  static ::java::lang::Character$UnicodeBlock * LATIN_EXTENDED_ADDITIONAL;
-  static ::java::lang::Character$UnicodeBlock * GREEK_EXTENDED;
-  static ::java::lang::Character$UnicodeBlock * GENERAL_PUNCTUATION;
-  static ::java::lang::Character$UnicodeBlock * SUPERSCRIPTS_AND_SUBSCRIPTS;
-  static ::java::lang::Character$UnicodeBlock * CURRENCY_SYMBOLS;
-  static ::java::lang::Character$UnicodeBlock * COMBINING_MARKS_FOR_SYMBOLS;
-  static ::java::lang::Character$UnicodeBlock * LETTERLIKE_SYMBOLS;
-  static ::java::lang::Character$UnicodeBlock * NUMBER_FORMS;
-  static ::java::lang::Character$UnicodeBlock * ARROWS;
-  static ::java::lang::Character$UnicodeBlock * MATHEMATICAL_OPERATORS;
-  static ::java::lang::Character$UnicodeBlock * MISCELLANEOUS_TECHNICAL;
-  static ::java::lang::Character$UnicodeBlock * CONTROL_PICTURES;
-  static ::java::lang::Character$UnicodeBlock * OPTICAL_CHARACTER_RECOGNITION;
-  static ::java::lang::Character$UnicodeBlock * ENCLOSED_ALPHANUMERICS;
-  static ::java::lang::Character$UnicodeBlock * BOX_DRAWING;
-  static ::java::lang::Character$UnicodeBlock * BLOCK_ELEMENTS;
-  static ::java::lang::Character$UnicodeBlock * GEOMETRIC_SHAPES;
-  static ::java::lang::Character$UnicodeBlock * MISCELLANEOUS_SYMBOLS;
-  static ::java::lang::Character$UnicodeBlock * DINGBATS;
-  static ::java::lang::Character$UnicodeBlock * MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A;
-  static ::java::lang::Character$UnicodeBlock * SUPPLEMENTAL_ARROWS_A;
-  static ::java::lang::Character$UnicodeBlock * BRAILLE_PATTERNS;
-  static ::java::lang::Character$UnicodeBlock * SUPPLEMENTAL_ARROWS_B;
-  static ::java::lang::Character$UnicodeBlock * MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B;
-  static ::java::lang::Character$UnicodeBlock * SUPPLEMENTAL_MATHEMATICAL_OPERATORS;
-  static ::java::lang::Character$UnicodeBlock * MISCELLANEOUS_SYMBOLS_AND_ARROWS;
-  static ::java::lang::Character$UnicodeBlock * CJK_RADICALS_SUPPLEMENT;
-  static ::java::lang::Character$UnicodeBlock * KANGXI_RADICALS;
-  static ::java::lang::Character$UnicodeBlock * IDEOGRAPHIC_DESCRIPTION_CHARACTERS;
-  static ::java::lang::Character$UnicodeBlock * CJK_SYMBOLS_AND_PUNCTUATION;
-  static ::java::lang::Character$UnicodeBlock * HIRAGANA;
-  static ::java::lang::Character$UnicodeBlock * KATAKANA;
-  static ::java::lang::Character$UnicodeBlock * BOPOMOFO;
-  static ::java::lang::Character$UnicodeBlock * HANGUL_COMPATIBILITY_JAMO;
-  static ::java::lang::Character$UnicodeBlock * KANBUN;
-  static ::java::lang::Character$UnicodeBlock * BOPOMOFO_EXTENDED;
-  static ::java::lang::Character$UnicodeBlock * KATAKANA_PHONETIC_EXTENSIONS;
-  static ::java::lang::Character$UnicodeBlock * ENCLOSED_CJK_LETTERS_AND_MONTHS;
-  static ::java::lang::Character$UnicodeBlock * CJK_COMPATIBILITY;
-  static ::java::lang::Character$UnicodeBlock * CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A;
-  static ::java::lang::Character$UnicodeBlock * YIJING_HEXAGRAM_SYMBOLS;
-  static ::java::lang::Character$UnicodeBlock * CJK_UNIFIED_IDEOGRAPHS;
-  static ::java::lang::Character$UnicodeBlock * YI_SYLLABLES;
-  static ::java::lang::Character$UnicodeBlock * YI_RADICALS;
-  static ::java::lang::Character$UnicodeBlock * HANGUL_SYLLABLES;
-  static ::java::lang::Character$UnicodeBlock * HIGH_SURROGATES;
-  static ::java::lang::Character$UnicodeBlock * HIGH_PRIVATE_USE_SURROGATES;
-  static ::java::lang::Character$UnicodeBlock * LOW_SURROGATES;
-  static ::java::lang::Character$UnicodeBlock * PRIVATE_USE_AREA;
-  static ::java::lang::Character$UnicodeBlock * CJK_COMPATIBILITY_IDEOGRAPHS;
-  static ::java::lang::Character$UnicodeBlock * ALPHABETIC_PRESENTATION_FORMS;
-  static ::java::lang::Character$UnicodeBlock * ARABIC_PRESENTATION_FORMS_A;
-  static ::java::lang::Character$UnicodeBlock * VARIATION_SELECTORS;
-  static ::java::lang::Character$UnicodeBlock * COMBINING_HALF_MARKS;
-  static ::java::lang::Character$UnicodeBlock * CJK_COMPATIBILITY_FORMS;
-  static ::java::lang::Character$UnicodeBlock * SMALL_FORM_VARIANTS;
-  static ::java::lang::Character$UnicodeBlock * ARABIC_PRESENTATION_FORMS_B;
-  static ::java::lang::Character$UnicodeBlock * HALFWIDTH_AND_FULLWIDTH_FORMS;
-  static ::java::lang::Character$UnicodeBlock * SPECIALS;
-  static ::java::lang::Character$UnicodeBlock * LINEAR_B_SYLLABARY;
-  static ::java::lang::Character$UnicodeBlock * LINEAR_B_IDEOGRAMS;
-  static ::java::lang::Character$UnicodeBlock * AEGEAN_NUMBERS;
-  static ::java::lang::Character$UnicodeBlock * OLD_ITALIC;
-  static ::java::lang::Character$UnicodeBlock * GOTHIC;
-  static ::java::lang::Character$UnicodeBlock * UGARITIC;
-  static ::java::lang::Character$UnicodeBlock * DESERET;
-  static ::java::lang::Character$UnicodeBlock * SHAVIAN;
-  static ::java::lang::Character$UnicodeBlock * OSMANYA;
-  static ::java::lang::Character$UnicodeBlock * CYPRIOT_SYLLABARY;
-  static ::java::lang::Character$UnicodeBlock * BYZANTINE_MUSICAL_SYMBOLS;
-  static ::java::lang::Character$UnicodeBlock * MUSICAL_SYMBOLS;
-  static ::java::lang::Character$UnicodeBlock * TAI_XUAN_JING_SYMBOLS;
-  static ::java::lang::Character$UnicodeBlock * MATHEMATICAL_ALPHANUMERIC_SYMBOLS;
-  static ::java::lang::Character$UnicodeBlock * CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B;
-  static ::java::lang::Character$UnicodeBlock * CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT;
-  static ::java::lang::Character$UnicodeBlock * TAGS;
-  static ::java::lang::Character$UnicodeBlock * VARIATION_SELECTORS_SUPPLEMENT;
-  static ::java::lang::Character$UnicodeBlock * SUPPLEMENTARY_PRIVATE_USE_AREA_A;
-  static ::java::lang::Character$UnicodeBlock * SUPPLEMENTARY_PRIVATE_USE_AREA_B;
-  static ::java::lang::Character$UnicodeBlock * SURROGATES_AREA;
-private:
-  static JArray< ::java::lang::Character$UnicodeBlock * > * sets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Character$UnicodeBlock__
diff --git a/libjava/java/lang/Character.h b/libjava/java/lang/Character.h
deleted file mode 100644
index ed913ab7c7e..00000000000
--- a/libjava/java/lang/Character.h
+++ /dev/null
@@ -1,175 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Character__
-#define __java_lang_Character__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::Character : public ::java::lang::Object
-{
-
-  static jchar readChar(jchar);
-  static jchar readCodePoint(jint);
-public:
-  Character(jchar);
-  jchar charValue();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * toString();
-  static ::java::lang::String * toString(jchar);
-  static jboolean isLowerCase(jchar);
-  static jboolean isLowerCase(jint);
-  static jboolean isUpperCase(jchar);
-  static jboolean isUpperCase(jint);
-  static jboolean isTitleCase(jchar);
-  static jboolean isTitleCase(jint);
-  static jboolean isDigit(jchar);
-  static jboolean isDigit(jint);
-  static jboolean isDefined(jchar);
-  static jboolean isDefined(jint);
-  static jboolean isLetter(jchar);
-  static jboolean isLetter(jint);
-  static jboolean isLetterOrDigit(jchar);
-  static jboolean isLetterOrDigit(jint);
-  static jboolean isJavaLetter(jchar);
-  static jboolean isJavaIdentifierStart(jint);
-  static jboolean isJavaLetterOrDigit(jchar);
-  static jboolean isJavaIdentifierStart(jchar);
-  static jboolean isJavaIdentifierPart(jchar);
-  static jboolean isJavaIdentifierPart(jint);
-  static jboolean isUnicodeIdentifierStart(jchar);
-  static jboolean isUnicodeIdentifierStart(jint);
-  static jboolean isUnicodeIdentifierPart(jchar);
-  static jboolean isUnicodeIdentifierPart(jint);
-  static jboolean isIdentifierIgnorable(jchar);
-  static jboolean isIdentifierIgnorable(jint);
-  static jchar toLowerCase(jchar);
-  static jint toLowerCase(jint);
-  static jchar toUpperCase(jchar);
-  static jint toUpperCase(jint);
-  static jchar toTitleCase(jchar);
-  static jint toTitleCase(jint);
-  static jint digit(jchar, jint);
-  static jint digit(jint, jint);
-  static jint getNumericValue(jchar);
-  static jint getNumericValue(jint);
-  static jboolean isSpace(jchar);
-  static jboolean isSpaceChar(jchar);
-  static jboolean isSpaceChar(jint);
-  static jboolean isWhitespace(jchar);
-  static jboolean isWhitespace(jint);
-  static jboolean isISOControl(jchar);
-  static jboolean isISOControl(jint);
-  static jint getType(jchar);
-  static jint getType(jint);
-  static jchar forDigit(jint, jint);
-  static jbyte getDirectionality(jchar);
-  static jbyte getDirectionality(jint);
-  static jboolean isMirrored(jchar);
-  static jboolean isMirrored(jint);
-  jint compareTo(::java::lang::Character *);
-  jint compareTo(::java::lang::Object *);
-  static ::java::lang::Character * valueOf(jchar);
-  static jchar reverseBytes(jchar);
-  static JArray< jchar > * toChars(jint);
-  static jint toChars(jint, JArray< jchar > *, jint);
-  static jint charCount(jint);
-  static jboolean isSupplementaryCodePoint(jint);
-  static jboolean isValidCodePoint(jint);
-  static jboolean isHighSurrogate(jchar);
-  static jboolean isLowSurrogate(jchar);
-  static jboolean isSurrogatePair(jchar, jchar);
-  static jint toCodePoint(jchar, jchar);
-  static jint codePointAt(::java::lang::CharSequence *, jint);
-  static jint codePointAt(JArray< jchar > *, jint);
-  static jint codePointAt(JArray< jchar > *, jint, jint);
-  static jint codePointBefore(JArray< jchar > *, jint);
-  static jint codePointBefore(JArray< jchar > *, jint, jint);
-  static jint codePointBefore(::java::lang::CharSequence *, jint);
-private:
-  jchar __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static const jlong serialVersionUID = 3786198910865385080LL;
-public:
-  static const jint MIN_RADIX = 2;
-  static const jint MAX_RADIX = 36;
-  static const jchar MIN_VALUE = 0;
-  static const jchar MAX_VALUE = 65535;
-  static ::java::lang::Class * TYPE;
-  static const jint SIZE = 16;
-private:
-  static const jint MAX_CACHE = 127;
-  static JArray< ::java::lang::Character * > * charCache;
-public:
-  static const jbyte UPPERCASE_LETTER = 1;
-  static const jbyte LOWERCASE_LETTER = 2;
-  static const jbyte TITLECASE_LETTER = 3;
-  static const jbyte NON_SPACING_MARK = 6;
-  static const jbyte COMBINING_SPACING_MARK = 8;
-  static const jbyte ENCLOSING_MARK = 7;
-  static const jbyte DECIMAL_DIGIT_NUMBER = 9;
-  static const jbyte LETTER_NUMBER = 10;
-  static const jbyte OTHER_NUMBER = 11;
-  static const jbyte SPACE_SEPARATOR = 12;
-  static const jbyte LINE_SEPARATOR = 13;
-  static const jbyte PARAGRAPH_SEPARATOR = 14;
-  static const jbyte CONTROL = 15;
-  static const jbyte FORMAT = 16;
-  static const jbyte SURROGATE = 19;
-  static const jbyte PRIVATE_USE = 18;
-  static const jbyte UNASSIGNED = 0;
-  static const jbyte MODIFIER_LETTER = 4;
-  static const jbyte OTHER_LETTER = 5;
-  static const jbyte CONNECTOR_PUNCTUATION = 23;
-  static const jbyte DASH_PUNCTUATION = 20;
-  static const jbyte START_PUNCTUATION = 21;
-  static const jbyte END_PUNCTUATION = 22;
-  static const jbyte INITIAL_QUOTE_PUNCTUATION = 29;
-  static const jbyte FINAL_QUOTE_PUNCTUATION = 30;
-  static const jbyte OTHER_PUNCTUATION = 24;
-  static const jbyte MATH_SYMBOL = 25;
-  static const jbyte CURRENCY_SYMBOL = 26;
-  static const jbyte MODIFIER_SYMBOL = 27;
-  static const jbyte OTHER_SYMBOL = 28;
-  static const jbyte DIRECTIONALITY_UNDEFINED = -1;
-  static const jbyte DIRECTIONALITY_LEFT_TO_RIGHT = 0;
-  static const jbyte DIRECTIONALITY_RIGHT_TO_LEFT = 1;
-  static const jbyte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC = 2;
-  static const jbyte DIRECTIONALITY_EUROPEAN_NUMBER = 3;
-  static const jbyte DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR = 4;
-  static const jbyte DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR = 5;
-  static const jbyte DIRECTIONALITY_ARABIC_NUMBER = 6;
-  static const jbyte DIRECTIONALITY_COMMON_NUMBER_SEPARATOR = 7;
-  static const jbyte DIRECTIONALITY_NONSPACING_MARK = 8;
-  static const jbyte DIRECTIONALITY_BOUNDARY_NEUTRAL = 9;
-  static const jbyte DIRECTIONALITY_PARAGRAPH_SEPARATOR = 10;
-  static const jbyte DIRECTIONALITY_SEGMENT_SEPARATOR = 11;
-  static const jbyte DIRECTIONALITY_WHITESPACE = 12;
-  static const jbyte DIRECTIONALITY_OTHER_NEUTRALS = 13;
-  static const jbyte DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING = 14;
-  static const jbyte DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE = 15;
-  static const jbyte DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING = 16;
-  static const jbyte DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE = 17;
-  static const jbyte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = 18;
-private:
-  static const jint TYPE_MASK = 31;
-  static const jint NO_BREAK_MASK = 32;
-  static const jint MIRROR_MASK = 64;
-public:
-  static const jint MIN_SUPPLEMENTARY_CODE_POINT = 65536;
-  static const jint MIN_CODE_POINT = 0;
-  static const jint MAX_CODE_POINT = 1114111;
-  static const jchar MIN_HIGH_SURROGATE = 55296;
-  static const jchar MAX_HIGH_SURROGATE = 56319;
-  static const jchar MIN_LOW_SURROGATE = 56320;
-  static const jchar MAX_LOW_SURROGATE = 57343;
-  static const jchar MIN_SURROGATE = 55296;
-  static const jchar MAX_SURROGATE = 57343;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Character__
diff --git a/libjava/java/lang/ClassCastException.h b/libjava/java/lang/ClassCastException.h
deleted file mode 100644
index 55c0bcc8871..00000000000
--- a/libjava/java/lang/ClassCastException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ClassCastException__
-#define __java_lang_ClassCastException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::ClassCastException : public ::java::lang::RuntimeException
-{
-
-public:
-  ClassCastException();
-  ClassCastException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -9223365651070458532LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ClassCastException__
diff --git a/libjava/java/lang/ClassCircularityError.h b/libjava/java/lang/ClassCircularityError.h
deleted file mode 100644
index 81d6f93adf0..00000000000
--- a/libjava/java/lang/ClassCircularityError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ClassCircularityError__
-#define __java_lang_ClassCircularityError__
-
-#pragma interface
-
-#include <java/lang/LinkageError.h>
-
-class java::lang::ClassCircularityError : public ::java::lang::LinkageError
-{
-
-public:
-  ClassCircularityError();
-  ClassCircularityError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1054362542914539689LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ClassCircularityError__
diff --git a/libjava/java/lang/ClassFormatError.h b/libjava/java/lang/ClassFormatError.h
deleted file mode 100644
index ee6664f5610..00000000000
--- a/libjava/java/lang/ClassFormatError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ClassFormatError__
-#define __java_lang_ClassFormatError__
-
-#pragma interface
-
-#include <java/lang/LinkageError.h>
-
-class java::lang::ClassFormatError : public ::java::lang::LinkageError
-{
-
-public:
-  ClassFormatError();
-  ClassFormatError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8420114879011949195LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ClassFormatError__
diff --git a/libjava/java/lang/ClassLoader$AnnotationsKey.h b/libjava/java/lang/ClassLoader$AnnotationsKey.h
deleted file mode 100644
index 1a395b07bd6..00000000000
--- a/libjava/java/lang/ClassLoader$AnnotationsKey.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ClassLoader$AnnotationsKey__
-#define __java_lang_ClassLoader$AnnotationsKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::ClassLoader$AnnotationsKey : public ::java::lang::Object
-{
-
-public:
-  ClassLoader$AnnotationsKey(::java::lang::Class *, jint, jint, jint);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) member_type;
-  jint member_index;
-  jint kind_req;
-  ::java::lang::Class * declaringClass;
-  jint hashCode__;
-public:
-  static JArray< ::java::lang::annotation::Annotation * > * NIL;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ClassLoader$AnnotationsKey__
diff --git a/libjava/java/lang/ClassLoader.h b/libjava/java/lang/ClassLoader.h
deleted file mode 100644
index 0b82a046786..00000000000
--- a/libjava/java/lang/ClassLoader.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ClassLoader__
-#define __java_lang_ClassLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class ProtectionDomain;
-    }
-  }
-}
-
-jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);
-void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);
-
-class java::lang::ClassLoader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  virtual JArray< ::java::lang::Object * > * getDeclaredAnnotations(::java::lang::Class *, jint, jint, jint);
-  virtual JArray< ::java::lang::Object * > * putDeclaredAnnotations(::java::lang::Class *, jint, jint, jint, JArray< ::java::lang::Object * > *);
-public: // actually protected
-  ClassLoader();
-  ClassLoader(::java::lang::ClassLoader *);
-public:
-  virtual ::java::lang::Class * loadClass(::java::lang::String *);
-private:
-  ::java::lang::Class * loadClassFromSig(::java::lang::String *);
-public: // actually protected
-  virtual ::java::lang::Class * loadClass(::java::lang::String *, jboolean);
-  virtual ::java::lang::Class * findClass(::java::lang::String *);
-  virtual ::java::lang::Class * defineClass(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::Class * defineClass(::java::lang::String *, JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::Class * defineClass(::java::lang::String *, JArray< jbyte > *, jint, jint, ::java::security::ProtectionDomain *);
-  virtual ::java::lang::Class * defineClass(::java::lang::String *, ::java::nio::ByteBuffer *, ::java::security::ProtectionDomain *);
-  virtual void resolveClass(::java::lang::Class *);
-  virtual ::java::lang::Class * findSystemClass(::java::lang::String *);
-public:
-  virtual ::java::lang::ClassLoader * getParent();
-public: // actually protected
-  virtual void setSigners(::java::lang::Class *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Class * findLoadedClass(::java::lang::String *);
-public:
-  virtual ::java::net::URL * getResource(::java::lang::String *);
-  virtual ::java::util::Enumeration * getResources(::java::lang::String *);
-public: // actually protected
-  virtual ::java::util::Enumeration * findResources(::java::lang::String *);
-  virtual ::java::net::URL * findResource(::java::lang::String *);
-public:
-  static ::java::net::URL * getSystemResource(::java::lang::String *);
-  static ::java::util::Enumeration * getSystemResources(::java::lang::String *);
-  virtual ::java::io::InputStream * getResourceAsStream(::java::lang::String *);
-  static ::java::io::InputStream * getSystemResourceAsStream(::java::lang::String *);
-  static ::java::lang::ClassLoader * getSystemClassLoader();
-public: // actually protected
-  virtual ::java::lang::Package * definePackage(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::net::URL *);
-  virtual ::java::lang::Package * getPackage(::java::lang::String *);
-  virtual JArray< ::java::lang::Package * > * getPackages();
-  virtual ::java::lang::String * findLibrary(::java::lang::String *);
-public:
-  virtual void setDefaultAssertionStatus(jboolean);
-  virtual void setPackageAssertionStatus(::java::lang::String *, jboolean);
-  virtual void setClassAssertionStatus(::java::lang::String *, jboolean);
-  virtual void clearAssertionStatus();
-public: // actually package-private
-  virtual jboolean isAncestorOf(::java::lang::ClassLoader *);
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loadedClasses;
-  ::java::util::HashMap * definedPackages;
-private:
-  ::java::lang::ClassLoader * parent;
-  jboolean initialized;
-public: // actually package-private
-  static ::java::lang::ClassLoader * systemClassLoader;
-private:
-  ::java::util::concurrent::ConcurrentHashMap * declaredAnnotations;
-public: // actually package-private
-  static ::java::security::ProtectionDomain * defaultProtectionDomain;
-  jboolean defaultAssertionStatus;
-  static ::java::util::Map * systemPackageAssertionStatus;
-  ::java::util::Map * packageAssertionStatus;
-  static ::java::util::Map * systemClassAssertionStatus;
-  ::java::util::Map * classAssertionStatus;
-public:
-  static ::java::lang::Class class$;
-
-  friend jclass (::_Jv_FindClass) (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);
-  friend void ::_Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);
-};
-
-#endif // __java_lang_ClassLoader__
diff --git a/libjava/java/lang/ClassNotFoundException.h b/libjava/java/lang/ClassNotFoundException.h
deleted file mode 100644
index c0ab7815807..00000000000
--- a/libjava/java/lang/ClassNotFoundException.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ClassNotFoundException__
-#define __java_lang_ClassNotFoundException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::ClassNotFoundException : public ::java::lang::Exception
-{
-
-public:
-  ClassNotFoundException();
-  ClassNotFoundException(::java::lang::String *);
-  ClassNotFoundException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::Throwable * getException();
-  virtual ::java::lang::Throwable * getCause();
-private:
-  static const jlong serialVersionUID = 9176873029745254542LL;
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) ex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ClassNotFoundException__
diff --git a/libjava/java/lang/CloneNotSupportedException.h b/libjava/java/lang/CloneNotSupportedException.h
deleted file mode 100644
index 19fa2124a8a..00000000000
--- a/libjava/java/lang/CloneNotSupportedException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_CloneNotSupportedException__
-#define __java_lang_CloneNotSupportedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::CloneNotSupportedException : public ::java::lang::Exception
-{
-
-public:
-  CloneNotSupportedException();
-  CloneNotSupportedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5195511250079656443LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_CloneNotSupportedException__
diff --git a/libjava/java/lang/Cloneable.h b/libjava/java/lang/Cloneable.h
deleted file mode 100644
index ff5db98d069..00000000000
--- a/libjava/java/lang/Cloneable.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Cloneable__
-#define __java_lang_Cloneable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Cloneable : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_Cloneable__
diff --git a/libjava/java/lang/Comparable.h b/libjava/java/lang/Comparable.h
deleted file mode 100644
index b594e2ddc09..00000000000
--- a/libjava/java/lang/Comparable.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Comparable__
-#define __java_lang_Comparable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Comparable : public ::java::lang::Object
-{
-
-public:
-  virtual jint compareTo(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_Comparable__
diff --git a/libjava/java/lang/Compiler.h b/libjava/java/lang/Compiler.h
deleted file mode 100644
index e21d90300d1..00000000000
--- a/libjava/java/lang/Compiler.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Compiler__
-#define __java_lang_Compiler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Compiler : public ::java::lang::Object
-{
-
-  Compiler();
-public:
-  static jboolean compileClass(::java::lang::Class *);
-  static jboolean compileClasses(::java::lang::String *);
-  static ::java::lang::Object * command(::java::lang::Object *);
-  static void enable();
-  static void disable();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Compiler__
diff --git a/libjava/java/lang/Deprecated.h b/libjava/java/lang/Deprecated.h
deleted file mode 100644
index 6ab34f11a0e..00000000000
--- a/libjava/java/lang/Deprecated.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Deprecated__
-#define __java_lang_Deprecated__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Deprecated : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * annotationType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_Deprecated__
diff --git a/libjava/java/lang/Double.h b/libjava/java/lang/Double.h
deleted file mode 100644
index 5fb99da4a99..00000000000
--- a/libjava/java/lang/Double.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Double__
-#define __java_lang_Double__
-
-#pragma interface
-
-#include <java/lang/Number.h>
-
-class java::lang::Double : public ::java::lang::Number
-{
-
-public:
-  Double(jdouble);
-  Double(::java::lang::String *);
-  static ::java::lang::String * toString(jdouble);
-  static ::java::lang::String * toHexString(jdouble);
-  static ::java::lang::Double * valueOf(jdouble);
-  static ::java::lang::Double * valueOf(::java::lang::String *);
-  static jdouble parseDouble(::java::lang::String *);
-  static jboolean isNaN(jdouble);
-  static jboolean isInfinite(jdouble);
-  jboolean isNaN();
-  jboolean isInfinite();
-  ::java::lang::String * toString();
-  jbyte byteValue();
-  jshort shortValue();
-  jint intValue();
-  jlong longValue();
-  jfloat floatValue();
-  jdouble doubleValue();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  static jlong doubleToLongBits(jdouble);
-  static jlong doubleToRawLongBits(jdouble);
-  static jdouble longBitsToDouble(jlong);
-  jint target$compareTo(::java::lang::Double *);
-  static jint compare(jdouble, jdouble);
-  jint compareTo(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -9172774392245257468LL;
-public:
-  static jdouble MAX_VALUE;
-  static jdouble MIN_VALUE;
-  static jdouble NEGATIVE_INFINITY;
-  static jdouble POSITIVE_INFINITY;
-  static jdouble NaN;
-  static const jint SIZE = 64;
-  static ::java::lang::Class * TYPE;
-private:
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Double__
diff --git a/libjava/java/lang/EcosProcess.h b/libjava/java/lang/EcosProcess.h
deleted file mode 100644
index 30fd067e034..00000000000
--- a/libjava/java/lang/EcosProcess.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_EcosProcess__
-#define __java_lang_EcosProcess__
-
-#pragma interface
-
-#include <java/lang/Process.h>
-#include <gcj/array.h>
-
-
-class java::lang::EcosProcess : public ::java::lang::Process
-{
-
-public:
-  void destroy();
-  jint exitValue();
-  ::java::io::InputStream * getErrorStream();
-  ::java::io::InputStream * getInputStream();
-  ::java::io::OutputStream * getOutputStream();
-  jint waitFor();
-  EcosProcess(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::io::File *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_EcosProcess__
diff --git a/libjava/java/lang/Enum.h b/libjava/java/lang/Enum.h
deleted file mode 100644
index cb3aabc94e4..00000000000
--- a/libjava/java/lang/Enum.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Enum__
-#define __java_lang_Enum__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Enum : public ::java::lang::Object
-{
-
-public: // actually protected
-  Enum(::java::lang::String *, jint);
-public:
-  static ::java::lang::Enum * valueOf(::java::lang::Class *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual jint target$compareTo(::java::lang::Enum *);
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-public:
-  virtual ::java::lang::String * name();
-  virtual jint ordinal();
-  virtual ::java::lang::Class * getDeclaringClass();
-  virtual jint compareTo(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -4300926546619394005LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
-  jint ordinal__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Enum__
diff --git a/libjava/java/lang/EnumConstantNotPresentException.h b/libjava/java/lang/EnumConstantNotPresentException.h
deleted file mode 100644
index b3bc11b28c4..00000000000
--- a/libjava/java/lang/EnumConstantNotPresentException.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_EnumConstantNotPresentException__
-#define __java_lang_EnumConstantNotPresentException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::EnumConstantNotPresentException : public ::java::lang::RuntimeException
-{
-
-public:
-  EnumConstantNotPresentException(::java::lang::Class *, ::java::lang::String *);
-  virtual ::java::lang::String * constantName();
-  virtual ::java::lang::Class * enumType();
-private:
-  static const jlong serialVersionUID = -6046998521960521108LL;
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) enumType__;
-  ::java::lang::String * constantName__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_EnumConstantNotPresentException__
diff --git a/libjava/java/lang/Error.h b/libjava/java/lang/Error.h
deleted file mode 100644
index 9cb6019b434..00000000000
--- a/libjava/java/lang/Error.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Error__
-#define __java_lang_Error__
-
-#pragma interface
-
-#include <java/lang/Throwable.h>
-
-class java::lang::Error : public ::java::lang::Throwable
-{
-
-public:
-  Error();
-  Error(::java::lang::String *);
-  Error(::java::lang::String *, ::java::lang::Throwable *);
-  Error(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 4980196508277280342LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Error__
diff --git a/libjava/java/lang/Exception.h b/libjava/java/lang/Exception.h
deleted file mode 100644
index 9f3ab43a5db..00000000000
--- a/libjava/java/lang/Exception.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Exception__
-#define __java_lang_Exception__
-
-#pragma interface
-
-#include <java/lang/Throwable.h>
-
-class java::lang::Exception : public ::java::lang::Throwable
-{
-
-public:
-  Exception();
-  Exception(::java::lang::String *);
-  Exception(::java::lang::String *, ::java::lang::Throwable *);
-  Exception(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -3387516993124229948LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Exception__
diff --git a/libjava/java/lang/ExceptionInInitializerError.h b/libjava/java/lang/ExceptionInInitializerError.h
deleted file mode 100644
index 89fbaee7ca0..00000000000
--- a/libjava/java/lang/ExceptionInInitializerError.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ExceptionInInitializerError__
-#define __java_lang_ExceptionInInitializerError__
-
-#pragma interface
-
-#include <java/lang/LinkageError.h>
-
-class java::lang::ExceptionInInitializerError : public ::java::lang::LinkageError
-{
-
-public:
-  ExceptionInInitializerError();
-  ExceptionInInitializerError(::java::lang::String *);
-  ExceptionInInitializerError(::java::lang::Throwable *);
-  virtual ::java::lang::Throwable * getException();
-  virtual ::java::lang::Throwable * getCause();
-public: // actually package-private
-  static const jlong serialVersionUID = 1521711792217232256LL;
-private:
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::LinkageError)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ExceptionInInitializerError__
diff --git a/libjava/java/lang/Float.h b/libjava/java/lang/Float.h
deleted file mode 100644
index 87859cb28c0..00000000000
--- a/libjava/java/lang/Float.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Float__
-#define __java_lang_Float__
-
-#pragma interface
-
-#include <java/lang/Number.h>
-
-class java::lang::Float : public ::java::lang::Number
-{
-
-public:
-  Float(jfloat);
-  Float(jdouble);
-  Float(::java::lang::String *);
-  static ::java::lang::String * toString(jfloat);
-  static ::java::lang::String * toHexString(jfloat);
-  static ::java::lang::Float * valueOf(::java::lang::String *);
-  static ::java::lang::Float * valueOf(jfloat);
-  static jfloat parseFloat(::java::lang::String *);
-  static jboolean isNaN(jfloat);
-  static jboolean isInfinite(jfloat);
-  jboolean isNaN();
-  jboolean isInfinite();
-  ::java::lang::String * toString();
-  jbyte byteValue();
-  jshort shortValue();
-  jint intValue();
-  jlong longValue();
-  jfloat floatValue();
-  jdouble doubleValue();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  static jint floatToIntBits(jfloat);
-  static jint floatToRawIntBits(jfloat);
-  static jfloat intBitsToFloat(jint);
-  jint target$compareTo(::java::lang::Float *);
-  static jint compare(jfloat, jfloat);
-  jint compareTo(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -2671257302660747028LL;
-public:
-  static jfloat MAX_VALUE;
-  static jfloat MIN_VALUE;
-  static jfloat NEGATIVE_INFINITY;
-  static jfloat POSITIVE_INFINITY;
-  static jfloat NaN;
-  static ::java::lang::Class * TYPE;
-  static const jint SIZE = 32;
-private:
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Float__
diff --git a/libjava/java/lang/IllegalAccessError.h b/libjava/java/lang/IllegalAccessError.h
deleted file mode 100644
index 12b8747c4ef..00000000000
--- a/libjava/java/lang/IllegalAccessError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_IllegalAccessError__
-#define __java_lang_IllegalAccessError__
-
-#pragma interface
-
-#include <java/lang/IncompatibleClassChangeError.h>
-
-class java::lang::IllegalAccessError : public ::java::lang::IncompatibleClassChangeError
-{
-
-public:
-  IllegalAccessError();
-  IllegalAccessError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8988904074992417891LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_IllegalAccessError__
diff --git a/libjava/java/lang/IllegalAccessException.h b/libjava/java/lang/IllegalAccessException.h
deleted file mode 100644
index c0917475699..00000000000
--- a/libjava/java/lang/IllegalAccessException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_IllegalAccessException__
-#define __java_lang_IllegalAccessException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::IllegalAccessException : public ::java::lang::Exception
-{
-
-public:
-  IllegalAccessException();
-  IllegalAccessException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6616958222490762034LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_IllegalAccessException__
diff --git a/libjava/java/lang/IllegalArgumentException.h b/libjava/java/lang/IllegalArgumentException.h
deleted file mode 100644
index 187e430c165..00000000000
--- a/libjava/java/lang/IllegalArgumentException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_IllegalArgumentException__
-#define __java_lang_IllegalArgumentException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::IllegalArgumentException : public ::java::lang::RuntimeException
-{
-
-public:
-  IllegalArgumentException();
-  IllegalArgumentException(::java::lang::String *);
-  IllegalArgumentException(::java::lang::String *, ::java::lang::Throwable *);
-  IllegalArgumentException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -5365630128856068164LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_IllegalArgumentException__
diff --git a/libjava/java/lang/IllegalMonitorStateException.h b/libjava/java/lang/IllegalMonitorStateException.h
deleted file mode 100644
index ad9cb590292..00000000000
--- a/libjava/java/lang/IllegalMonitorStateException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_IllegalMonitorStateException__
-#define __java_lang_IllegalMonitorStateException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::IllegalMonitorStateException : public ::java::lang::RuntimeException
-{
-
-public:
-  IllegalMonitorStateException();
-  IllegalMonitorStateException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3713306369498869069LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_IllegalMonitorStateException__
diff --git a/libjava/java/lang/IllegalStateException.h b/libjava/java/lang/IllegalStateException.h
deleted file mode 100644
index e79bced810f..00000000000
--- a/libjava/java/lang/IllegalStateException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_IllegalStateException__
-#define __java_lang_IllegalStateException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::IllegalStateException : public ::java::lang::RuntimeException
-{
-
-public:
-  IllegalStateException();
-  IllegalStateException(::java::lang::String *);
-  IllegalStateException(::java::lang::String *, ::java::lang::Throwable *);
-  IllegalStateException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -1848914673093119416LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_IllegalStateException__
diff --git a/libjava/java/lang/IllegalThreadStateException.h b/libjava/java/lang/IllegalThreadStateException.h
deleted file mode 100644
index 066eb92cd66..00000000000
--- a/libjava/java/lang/IllegalThreadStateException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_IllegalThreadStateException__
-#define __java_lang_IllegalThreadStateException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-
-class java::lang::IllegalThreadStateException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  IllegalThreadStateException();
-  IllegalThreadStateException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7626246362397460174LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_IllegalThreadStateException__
diff --git a/libjava/java/lang/IncompatibleClassChangeError.h b/libjava/java/lang/IncompatibleClassChangeError.h
deleted file mode 100644
index ca4099194e8..00000000000
--- a/libjava/java/lang/IncompatibleClassChangeError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_IncompatibleClassChangeError__
-#define __java_lang_IncompatibleClassChangeError__
-
-#pragma interface
-
-#include <java/lang/LinkageError.h>
-
-class java::lang::IncompatibleClassChangeError : public ::java::lang::LinkageError
-{
-
-public:
-  IncompatibleClassChangeError();
-  IncompatibleClassChangeError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4914975503642802119LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_IncompatibleClassChangeError__
diff --git a/libjava/java/lang/IndexOutOfBoundsException.h b/libjava/java/lang/IndexOutOfBoundsException.h
deleted file mode 100644
index 4cd4184a712..00000000000
--- a/libjava/java/lang/IndexOutOfBoundsException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_IndexOutOfBoundsException__
-#define __java_lang_IndexOutOfBoundsException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::IndexOutOfBoundsException : public ::java::lang::RuntimeException
-{
-
-public:
-  IndexOutOfBoundsException();
-  IndexOutOfBoundsException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 234122996006267687LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_IndexOutOfBoundsException__
diff --git a/libjava/java/lang/InheritableThreadLocal.h b/libjava/java/lang/InheritableThreadLocal.h
deleted file mode 100644
index 9caf6f3df47..00000000000
--- a/libjava/java/lang/InheritableThreadLocal.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_InheritableThreadLocal__
-#define __java_lang_InheritableThreadLocal__
-
-#pragma interface
-
-#include <java/lang/ThreadLocal.h>
-
-class java::lang::InheritableThreadLocal : public ::java::lang::ThreadLocal
-{
-
-public:
-  InheritableThreadLocal();
-public: // actually protected
-  virtual ::java::lang::Object * childValue(::java::lang::Object *);
-public: // actually package-private
-  static void newChildThread(::java::lang::Thread *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_InheritableThreadLocal__
diff --git a/libjava/java/lang/InstantiationError.h b/libjava/java/lang/InstantiationError.h
deleted file mode 100644
index 4b817d2b316..00000000000
--- a/libjava/java/lang/InstantiationError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_InstantiationError__
-#define __java_lang_InstantiationError__
-
-#pragma interface
-
-#include <java/lang/IncompatibleClassChangeError.h>
-
-class java::lang::InstantiationError : public ::java::lang::IncompatibleClassChangeError
-{
-
-public:
-  InstantiationError();
-  InstantiationError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4885810657349421204LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_InstantiationError__
diff --git a/libjava/java/lang/InstantiationException.h b/libjava/java/lang/InstantiationException.h
deleted file mode 100644
index 805ab3c70dc..00000000000
--- a/libjava/java/lang/InstantiationException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_InstantiationException__
-#define __java_lang_InstantiationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::InstantiationException : public ::java::lang::Exception
-{
-
-public:
-  InstantiationException();
-  InstantiationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8441929162975509110LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_InstantiationException__
diff --git a/libjava/java/lang/Integer.h b/libjava/java/lang/Integer.h
deleted file mode 100644
index e33c78f2cc2..00000000000
--- a/libjava/java/lang/Integer.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Integer__
-#define __java_lang_Integer__
-
-#pragma interface
-
-#include <java/lang/Number.h>
-#include <gcj/array.h>
-
-
-class java::lang::Integer : public ::java::lang::Number
-{
-
-public:
-  Integer(jint);
-  Integer(::java::lang::String *);
-  static ::java::lang::String * toString(jint, jint);
-  static ::java::lang::String * toHexString(jint);
-  static ::java::lang::String * toOctalString(jint);
-  static ::java::lang::String * toBinaryString(jint);
-  static ::java::lang::String * toString(jint);
-  static jint parseInt(::java::lang::String *, jint);
-  static jint parseInt(::java::lang::String *);
-  static ::java::lang::Integer * valueOf(::java::lang::String *, jint);
-  static ::java::lang::Integer * valueOf(::java::lang::String *);
-  static ::java::lang::Integer * valueOf(jint);
-  jbyte byteValue();
-  jshort shortValue();
-  jint intValue();
-  jlong longValue();
-  jfloat floatValue();
-  jdouble doubleValue();
-  ::java::lang::String * toString();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  static ::java::lang::Integer * getInteger(::java::lang::String *);
-  static ::java::lang::Integer * getInteger(::java::lang::String *, jint);
-  static ::java::lang::Integer * getInteger(::java::lang::String *, ::java::lang::Integer *);
-  static ::java::lang::Integer * decode(::java::lang::String *);
-  jint target$compareTo(::java::lang::Integer *);
-  static jint bitCount(jint);
-  static jint rotateLeft(jint, jint);
-  static jint rotateRight(jint, jint);
-  static jint highestOneBit(jint);
-  static jint numberOfLeadingZeros(jint);
-  static jint lowestOneBit(jint);
-  static jint numberOfTrailingZeros(jint);
-  static jint signum(jint);
-  static jint reverseBytes(jint);
-  static jint reverse(jint);
-public: // actually package-private
-  static ::java::lang::String * toUnsignedString(jint, jint);
-  static jint parseInt(::java::lang::String *, jint, jboolean);
-public:
-  jint compareTo(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1360826667806852920LL;
-public:
-  static const jint MIN_VALUE = -2147483647 - 1;
-  static const jint MAX_VALUE = 2147483647;
-  static ::java::lang::Class * TYPE;
-  static const jint SIZE = 32;
-private:
-  static const jint MIN_CACHE = -128;
-  static const jint MAX_CACHE = 127;
-  static JArray< ::java::lang::Integer * > * intCache;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Integer__
diff --git a/libjava/java/lang/InternalError.h b/libjava/java/lang/InternalError.h
deleted file mode 100644
index b0477bbe640..00000000000
--- a/libjava/java/lang/InternalError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_InternalError__
-#define __java_lang_InternalError__
-
-#pragma interface
-
-#include <java/lang/VirtualMachineError.h>
-
-class java::lang::InternalError : public ::java::lang::VirtualMachineError
-{
-
-public:
-  InternalError();
-  InternalError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -9062593416125562365LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_InternalError__
diff --git a/libjava/java/lang/InterruptedException.h b/libjava/java/lang/InterruptedException.h
deleted file mode 100644
index c452de6b5e5..00000000000
--- a/libjava/java/lang/InterruptedException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_InterruptedException__
-#define __java_lang_InterruptedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::InterruptedException : public ::java::lang::Exception
-{
-
-public:
-  InterruptedException();
-  InterruptedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6700697376100628473LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_InterruptedException__
diff --git a/libjava/java/lang/Iterable.h b/libjava/java/lang/Iterable.h
deleted file mode 100644
index 3bdb2543b3b..00000000000
--- a/libjava/java/lang/Iterable.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Iterable__
-#define __java_lang_Iterable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Iterable : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Iterator * iterator() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_Iterable__
diff --git a/libjava/java/lang/LinkageError.h b/libjava/java/lang/LinkageError.h
deleted file mode 100644
index 4368d8b9ff8..00000000000
--- a/libjava/java/lang/LinkageError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_LinkageError__
-#define __java_lang_LinkageError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-
-class java::lang::LinkageError : public ::java::lang::Error
-{
-
-public:
-  LinkageError();
-  LinkageError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3579600108157160122LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_LinkageError__
diff --git a/libjava/java/lang/Long.h b/libjava/java/lang/Long.h
deleted file mode 100644
index da04281a659..00000000000
--- a/libjava/java/lang/Long.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Long__
-#define __java_lang_Long__
-
-#pragma interface
-
-#include <java/lang/Number.h>
-
-class java::lang::Long : public ::java::lang::Number
-{
-
-public:
-  Long(jlong);
-  Long(::java::lang::String *);
-  static ::java::lang::String * toString(jlong, jint);
-  static ::java::lang::String * toHexString(jlong);
-  static ::java::lang::String * toOctalString(jlong);
-  static ::java::lang::String * toBinaryString(jlong);
-  static ::java::lang::String * toString(jlong);
-  static jlong parseLong(::java::lang::String *, jint);
-  static jlong parseLong(::java::lang::String *);
-  static ::java::lang::Long * valueOf(::java::lang::String *, jint);
-  static ::java::lang::Long * valueOf(::java::lang::String *);
-  static ::java::lang::Long * valueOf(jlong);
-  static ::java::lang::Long * decode(::java::lang::String *);
-  jbyte byteValue();
-  jshort shortValue();
-  jint intValue();
-  jlong longValue();
-  jfloat floatValue();
-  jdouble doubleValue();
-  ::java::lang::String * toString();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  static ::java::lang::Long * getLong(::java::lang::String *);
-  static ::java::lang::Long * getLong(::java::lang::String *, jlong);
-  static ::java::lang::Long * getLong(::java::lang::String *, ::java::lang::Long *);
-  jint target$compareTo(::java::lang::Long *);
-  static jint bitCount(jlong);
-  static jlong rotateLeft(jlong, jint);
-  static jlong rotateRight(jlong, jint);
-  static jlong highestOneBit(jlong);
-  static jint numberOfLeadingZeros(jlong);
-  static jlong lowestOneBit(jlong);
-  static jint numberOfTrailingZeros(jlong);
-  static jint signum(jlong);
-  static jlong reverseBytes(jlong);
-  static jlong reverse(jlong);
-private:
-  static ::java::lang::String * toUnsignedString(jlong, jint);
-  static jlong parseLong(::java::lang::String *, jint, jboolean);
-public:
-  jint compareTo(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 4290774380558885855LL;
-public:
-  static const jlong MIN_VALUE = -9223372036854775807LL - 1;
-  static const jlong MAX_VALUE = 9223372036854775807LL;
-  static ::java::lang::Class * TYPE;
-  static const jint SIZE = 64;
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Long__
diff --git a/libjava/java/lang/Math.h b/libjava/java/lang/Math.h
deleted file mode 100644
index 32707e9f8cd..00000000000
--- a/libjava/java/lang/Math.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Math__
-#define __java_lang_Math__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Math : public ::java::lang::Object
-{
-
-  Math();
-public:
-  static jint abs(jint);
-  static jlong abs(jlong);
-  static jfloat abs(jfloat);
-  static jdouble abs(jdouble);
-  static jint min(jint, jint);
-  static jlong min(jlong, jlong);
-  static jfloat min(jfloat, jfloat);
-  static jdouble min(jdouble, jdouble);
-  static jint max(jint, jint);
-  static jlong max(jlong, jlong);
-  static jfloat max(jfloat, jfloat);
-  static jdouble max(jdouble, jdouble);
-  static jdouble sin(jdouble);
-  static jdouble cos(jdouble);
-  static jdouble tan(jdouble);
-  static jdouble asin(jdouble);
-  static jdouble acos(jdouble);
-  static jdouble atan(jdouble);
-  static jdouble atan2(jdouble, jdouble);
-  static jdouble exp(jdouble);
-  static jdouble log(jdouble);
-  static jdouble sqrt(jdouble);
-  static jdouble pow(jdouble, jdouble);
-  static jdouble IEEEremainder(jdouble, jdouble);
-  static jdouble ceil(jdouble);
-  static jdouble floor(jdouble);
-  static jdouble rint(jdouble);
-  static jint round(jfloat);
-  static jlong round(jdouble);
-  static jdouble random();
-  static jdouble toRadians(jdouble);
-  static jdouble toDegrees(jdouble);
-  static jdouble cbrt(jdouble);
-  static jdouble cosh(jdouble);
-  static jdouble expm1(jdouble);
-  static jdouble hypot(jdouble, jdouble);
-  static jdouble log10(jdouble);
-  static jdouble log1p(jdouble);
-  static jdouble signum(jdouble);
-  static jfloat signum(jfloat);
-  static jdouble sinh(jdouble);
-  static jdouble tanh(jdouble);
-  static jdouble ulp(jdouble);
-  static jfloat ulp(jfloat);
-private:
-  static ::java::util::Random * rand;
-public:
-  static jdouble E;
-  static jdouble PI;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Math__
diff --git a/libjava/java/lang/NegativeArraySizeException.h b/libjava/java/lang/NegativeArraySizeException.h
deleted file mode 100644
index e05f7c51563..00000000000
--- a/libjava/java/lang/NegativeArraySizeException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_NegativeArraySizeException__
-#define __java_lang_NegativeArraySizeException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::NegativeArraySizeException : public ::java::lang::RuntimeException
-{
-
-public:
-  NegativeArraySizeException();
-  NegativeArraySizeException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8960118058596991861LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_NegativeArraySizeException__
diff --git a/libjava/java/lang/NoClassDefFoundError.h b/libjava/java/lang/NoClassDefFoundError.h
deleted file mode 100644
index 90790a7b9e5..00000000000
--- a/libjava/java/lang/NoClassDefFoundError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_NoClassDefFoundError__
-#define __java_lang_NoClassDefFoundError__
-
-#pragma interface
-
-#include <java/lang/LinkageError.h>
-
-class java::lang::NoClassDefFoundError : public ::java::lang::LinkageError
-{
-
-public:
-  NoClassDefFoundError();
-  NoClassDefFoundError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 9095859863287012458LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_NoClassDefFoundError__
diff --git a/libjava/java/lang/NoSuchFieldError.h b/libjava/java/lang/NoSuchFieldError.h
deleted file mode 100644
index 65f444e8394..00000000000
--- a/libjava/java/lang/NoSuchFieldError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_NoSuchFieldError__
-#define __java_lang_NoSuchFieldError__
-
-#pragma interface
-
-#include <java/lang/IncompatibleClassChangeError.h>
-
-class java::lang::NoSuchFieldError : public ::java::lang::IncompatibleClassChangeError
-{
-
-public:
-  NoSuchFieldError();
-  NoSuchFieldError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3456430195886129035LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_NoSuchFieldError__
diff --git a/libjava/java/lang/NoSuchFieldException.h b/libjava/java/lang/NoSuchFieldException.h
deleted file mode 100644
index 36fe841ed74..00000000000
--- a/libjava/java/lang/NoSuchFieldException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_NoSuchFieldException__
-#define __java_lang_NoSuchFieldException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::NoSuchFieldException : public ::java::lang::Exception
-{
-
-public:
-  NoSuchFieldException();
-  NoSuchFieldException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -6143714805279938260LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_NoSuchFieldException__
diff --git a/libjava/java/lang/NoSuchMethodError.h b/libjava/java/lang/NoSuchMethodError.h
deleted file mode 100644
index 5db0a040e22..00000000000
--- a/libjava/java/lang/NoSuchMethodError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_NoSuchMethodError__
-#define __java_lang_NoSuchMethodError__
-
-#pragma interface
-
-#include <java/lang/IncompatibleClassChangeError.h>
-
-class java::lang::NoSuchMethodError : public ::java::lang::IncompatibleClassChangeError
-{
-
-public:
-  NoSuchMethodError();
-  NoSuchMethodError(::java::lang::String *);
-public: // actually package-private
-  static const jlong serialVersionUID = -3765521442372831335LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_NoSuchMethodError__
diff --git a/libjava/java/lang/NoSuchMethodException.h b/libjava/java/lang/NoSuchMethodException.h
deleted file mode 100644
index dc905d67f48..00000000000
--- a/libjava/java/lang/NoSuchMethodException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_NoSuchMethodException__
-#define __java_lang_NoSuchMethodException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::NoSuchMethodException : public ::java::lang::Exception
-{
-
-public:
-  NoSuchMethodException();
-  NoSuchMethodException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5034388446362600923LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_NoSuchMethodException__
diff --git a/libjava/java/lang/NullPointerException.h b/libjava/java/lang/NullPointerException.h
deleted file mode 100644
index 4af582cf43e..00000000000
--- a/libjava/java/lang/NullPointerException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_NullPointerException__
-#define __java_lang_NullPointerException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::NullPointerException : public ::java::lang::RuntimeException
-{
-
-public:
-  NullPointerException();
-  NullPointerException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5162710183389028792LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_NullPointerException__
diff --git a/libjava/java/lang/Number.h b/libjava/java/lang/Number.h
deleted file mode 100644
index 65ba9201988..00000000000
--- a/libjava/java/lang/Number.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Number__
-#define __java_lang_Number__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::Number : public ::java::lang::Object
-{
-
-public:
-  Number();
-  virtual jint intValue() = 0;
-  virtual jlong longValue() = 0;
-  virtual jfloat floatValue() = 0;
-  virtual jdouble doubleValue() = 0;
-  virtual jbyte byteValue();
-  virtual jshort shortValue();
-private:
-  static const jlong serialVersionUID = -8742448824652078965LL;
-public: // actually package-private
-  static JArray< jchar > * digits;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Number__
diff --git a/libjava/java/lang/NumberFormatException.h b/libjava/java/lang/NumberFormatException.h
deleted file mode 100644
index 34bd4d678c2..00000000000
--- a/libjava/java/lang/NumberFormatException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_NumberFormatException__
-#define __java_lang_NumberFormatException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-
-class java::lang::NumberFormatException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  NumberFormatException();
-  NumberFormatException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2848938806368998894LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_NumberFormatException__
diff --git a/libjava/java/lang/OutOfMemoryError.h b/libjava/java/lang/OutOfMemoryError.h
deleted file mode 100644
index 7fac1f5a090..00000000000
--- a/libjava/java/lang/OutOfMemoryError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_OutOfMemoryError__
-#define __java_lang_OutOfMemoryError__
-
-#pragma interface
-
-#include <java/lang/VirtualMachineError.h>
-
-class java::lang::OutOfMemoryError : public ::java::lang::VirtualMachineError
-{
-
-public:
-  OutOfMemoryError();
-  OutOfMemoryError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8228564086184010517LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_OutOfMemoryError__
diff --git a/libjava/java/lang/Override.h b/libjava/java/lang/Override.h
deleted file mode 100644
index e6424ee6a00..00000000000
--- a/libjava/java/lang/Override.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Override__
-#define __java_lang_Override__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Override : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * annotationType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_Override__
diff --git a/libjava/java/lang/Package.h b/libjava/java/lang/Package.h
deleted file mode 100644
index 6d12d9f3687..00000000000
--- a/libjava/java/lang/Package.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Package__
-#define __java_lang_Package__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-}
-
-class java::lang::Package : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Package(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::net::URL *);
-  Package(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::net::URL *, ::java::lang::ClassLoader *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getSpecificationTitle();
-  virtual ::java::lang::String * getSpecificationVersion();
-  virtual ::java::lang::String * getSpecificationVendor();
-  virtual ::java::lang::String * getImplementationTitle();
-  virtual ::java::lang::String * getImplementationVersion();
-  virtual ::java::lang::String * getImplementationVendor();
-  virtual jboolean isSealed();
-  virtual jboolean isSealed(::java::net::URL *);
-  virtual jboolean isCompatibleWith(::java::lang::String *);
-  static ::java::lang::Package * getPackage(::java::lang::String *);
-  static JArray< ::java::lang::Package * > * getPackages();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::annotation::Annotation * getAnnotation(::java::lang::Class *);
-  virtual JArray< ::java::lang::annotation::Annotation * > * getAnnotations();
-  virtual JArray< ::java::lang::annotation::Annotation * > * getDeclaredAnnotations();
-  virtual jboolean isAnnotationPresent(::java::lang::Class *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * implTitle;
-  ::java::lang::String * implVendor;
-  ::java::lang::String * implVersion;
-  ::java::lang::String * specTitle;
-  ::java::lang::String * specVendor;
-  ::java::lang::String * specVersion;
-  ::java::net::URL * sealed;
-  ::java::lang::ClassLoader * loader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Package__
diff --git a/libjava/java/lang/PosixProcess$EOFInputStream.h b/libjava/java/lang/PosixProcess$EOFInputStream.h
deleted file mode 100644
index bda16533a3f..00000000000
--- a/libjava/java/lang/PosixProcess$EOFInputStream.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_PosixProcess$EOFInputStream__
-#define __java_lang_PosixProcess$EOFInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-
-class java::lang::PosixProcess$EOFInputStream : public ::java::io::InputStream
-{
-
-public: // actually package-private
-  PosixProcess$EOFInputStream();
-public:
-  virtual jint read();
-public: // actually package-private
-  static ::java::lang::PosixProcess$EOFInputStream * instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_PosixProcess$EOFInputStream__
diff --git a/libjava/java/lang/PosixProcess$ProcessManager.h b/libjava/java/lang/PosixProcess$ProcessManager.h
deleted file mode 100644
index d8d0d594232..00000000000
--- a/libjava/java/lang/PosixProcess$ProcessManager.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_PosixProcess$ProcessManager__
-#define __java_lang_PosixProcess$ProcessManager__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-
-class java::lang::PosixProcess$ProcessManager : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  PosixProcess$ProcessManager();
-private:
-  ::java::lang::PosixProcess * removeProcessFromMap(jlong);
-public: // actually package-private
-  virtual void addProcessToMap(::java::lang::PosixProcess *);
-  virtual void startExecuting(::java::lang::PosixProcess *);
-  virtual void waitUntilReady();
-public:
-  virtual void run();
-private:
-  void init();
-  void waitForSignal();
-  jboolean reap();
-  void signalReaper();
-public: // actually package-private
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) queue;
-private:
-  ::java::util::Map * pidToProcess;
-  jboolean ready;
-  jlong reaperPID;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_PosixProcess$ProcessManager__
diff --git a/libjava/java/lang/PosixProcess.h b/libjava/java/lang/PosixProcess.h
deleted file mode 100644
index 62539ceb2ac..00000000000
--- a/libjava/java/lang/PosixProcess.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_PosixProcess__
-#define __java_lang_PosixProcess__
-
-#pragma interface
-
-#include <java/lang/Process.h>
-#include <gcj/array.h>
-
-
-class java::lang::PosixProcess : public ::java::lang::Process
-{
-
-public:
-  void destroy();
-private:
-  void nativeDestroy();
-public:
-  jint exitValue();
-public: // actually package-private
-  void processTerminationCleanup();
-public:
-  ::java::io::InputStream * getErrorStream();
-  ::java::io::InputStream * getInputStream();
-  ::java::io::OutputStream * getOutputStream();
-  jint waitFor();
-public: // actually package-private
-  void spawn(::java::lang::PosixProcess$ProcessManager *);
-private:
-  void nativeSpawn();
-public: // actually package-private
-  PosixProcess(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::io::File *);
-  static jlong access$0(::java::lang::PosixProcess *);
-  static ::java::lang::Object * access$1();
-  static void access$2(::java::lang::PosixProcess$ProcessManager *);
-private:
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Process)))) progarray;
-  JArray< ::java::lang::String * > * envp;
-  ::java::io::File * dir;
-  ::java::lang::Throwable * exception;
-  jlong pid;
-public: // actually package-private
-  static const jint STATE_WAITING_TO_START = 0;
-  static const jint STATE_RUNNING = 1;
-  static const jint STATE_TERMINATED = 2;
-  jint state;
-  jint status;
-private:
-  ::java::io::InputStream * errorStream;
-  ::java::io::InputStream * inputStream;
-  ::java::io::OutputStream * outputStream;
-  ::java::io::InputStream * returnedErrorStream;
-  ::java::io::InputStream * returnedInputStream;
-  static ::java::lang::Object * queueLock;
-  static ::java::lang::PosixProcess$ProcessManager * processManager;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_PosixProcess__
diff --git a/libjava/java/lang/Process.h b/libjava/java/lang/Process.h
deleted file mode 100644
index f363feb50ef..00000000000
--- a/libjava/java/lang/Process.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Process__
-#define __java_lang_Process__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Process : public ::java::lang::Object
-{
-
-public:
-  Process();
-  virtual ::java::io::OutputStream * getOutputStream() = 0;
-  virtual ::java::io::InputStream * getInputStream() = 0;
-  virtual ::java::io::InputStream * getErrorStream() = 0;
-  virtual jint waitFor() = 0;
-  virtual jint exitValue() = 0;
-  virtual void destroy() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Process__
diff --git a/libjava/java/lang/ProcessBuilder.h b/libjava/java/lang/ProcessBuilder.h
deleted file mode 100644
index fd6029df0e5..00000000000
--- a/libjava/java/lang/ProcessBuilder.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ProcessBuilder__
-#define __java_lang_ProcessBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::ProcessBuilder : public ::java::lang::Object
-{
-
-public:
-  ProcessBuilder(::java::util::List *);
-  ProcessBuilder(JArray< ::java::lang::String * > *);
-  ::java::util::List * command();
-  ::java::lang::ProcessBuilder * command(::java::util::List *);
-  ::java::lang::ProcessBuilder * command(JArray< ::java::lang::String * > *);
-  ::java::io::File * directory();
-  ::java::lang::ProcessBuilder * directory(::java::io::File *);
-  ::java::util::Map * environment();
-  jboolean redirectErrorStream();
-  ::java::lang::ProcessBuilder * redirectErrorStream(jboolean);
-  ::java::lang::Process * start();
-private:
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::lang::Object)))) directory__;
-  ::java::util::List * command__;
-  ::java::util::Map * environment__;
-  jboolean redirect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ProcessBuilder__
diff --git a/libjava/java/lang/Readable.h b/libjava/java/lang/Readable.h
deleted file mode 100644
index d8e7d2185c3..00000000000
--- a/libjava/java/lang/Readable.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Readable__
-#define __java_lang_Readable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class CharBuffer;
-    }
-  }
-}
-
-class java::lang::Readable : public ::java::lang::Object
-{
-
-public:
-  virtual jint read(::java::nio::CharBuffer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_Readable__
diff --git a/libjava/java/lang/Runnable.h b/libjava/java/lang/Runnable.h
deleted file mode 100644
index ba5985cbf13..00000000000
--- a/libjava/java/lang/Runnable.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Runnable__
-#define __java_lang_Runnable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Runnable : public ::java::lang::Object
-{
-
-public:
-  virtual void run() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_Runnable__
diff --git a/libjava/java/lang/Runtime.h b/libjava/java/lang/Runtime.h
deleted file mode 100644
index 4679cc0b146..00000000000
--- a/libjava/java/lang/Runtime.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Runtime__
-#define __java_lang_Runtime__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::Runtime : public ::java::lang::Object
-{
-
-  Runtime();
-public:
-  static ::java::lang::Runtime * getRuntime();
-  virtual void exit(jint);
-public: // actually package-private
-  static void exitNoChecksAccessor(jint);
-private:
-  void exitNoChecks(jint);
-public: // actually package-private
-  virtual jboolean runShutdownHooks();
-public:
-  virtual void addShutdownHook(::java::lang::Thread *);
-  virtual jboolean removeShutdownHook(::java::lang::Thread *);
-  virtual void halt(jint);
-  static void runFinalizersOnExit(jboolean);
-  virtual ::java::lang::Process * exec(::java::lang::String *);
-  virtual ::java::lang::Process * exec(::java::lang::String *, JArray< ::java::lang::String * > *);
-  virtual ::java::lang::Process * exec(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::io::File *);
-  virtual ::java::lang::Process * exec(JArray< ::java::lang::String * > *);
-  virtual ::java::lang::Process * exec(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-  virtual ::java::lang::Process * exec(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::io::File *);
-  virtual jint availableProcessors();
-  virtual jlong freeMemory();
-  virtual jlong totalMemory();
-  virtual jlong maxMemory();
-  virtual void gc();
-  virtual void runFinalization();
-  virtual void traceInstructions(jboolean);
-  virtual void traceMethodCalls(jboolean);
-  virtual void load(::java::lang::String *);
-  virtual void loadLibrary(::java::lang::String *);
-  virtual ::java::io::InputStream * getLocalizedInputStream(::java::io::InputStream *);
-  virtual ::java::io::OutputStream * getLocalizedOutputStream(::java::io::OutputStream *);
-public: // actually package-private
-  virtual void exitInternal(jint);
-  virtual void _load(::java::lang::String *, jboolean);
-  virtual jboolean loadLibraryInternal(::java::lang::String *);
-private:
-  static void init();
-  void runFinalizationForExit();
-public: // actually package-private
-  static ::java::lang::String * nativeGetLibname(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Process * execInternal(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::io::File *);
-private:
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) libpath;
-  ::java::lang::Thread * exitSequence;
-  ::java::util::Set * shutdownHooks;
-  jboolean finalizeOnExit;
-  static ::java::lang::Runtime * current;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Runtime__
diff --git a/libjava/java/lang/RuntimeException.h b/libjava/java/lang/RuntimeException.h
deleted file mode 100644
index 0bce089c7e4..00000000000
--- a/libjava/java/lang/RuntimeException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_RuntimeException__
-#define __java_lang_RuntimeException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::RuntimeException : public ::java::lang::Exception
-{
-
-public:
-  RuntimeException();
-  RuntimeException(::java::lang::String *);
-  RuntimeException(::java::lang::String *, ::java::lang::Throwable *);
-  RuntimeException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -7034897190745766939LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_RuntimeException__
diff --git a/libjava/java/lang/RuntimePermission.h b/libjava/java/lang/RuntimePermission.h
deleted file mode 100644
index 8b48175454e..00000000000
--- a/libjava/java/lang/RuntimePermission.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_RuntimePermission__
-#define __java_lang_RuntimePermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-
-class java::lang::RuntimePermission : public ::java::security::BasicPermission
-{
-
-public:
-  RuntimePermission(::java::lang::String *);
-  RuntimePermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7399184964622342223LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_RuntimePermission__
diff --git a/libjava/java/lang/SecurityContext.h b/libjava/java/lang/SecurityContext.h
deleted file mode 100644
index e7b0e595deb..00000000000
--- a/libjava/java/lang/SecurityContext.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_SecurityContext__
-#define __java_lang_SecurityContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::SecurityContext : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SecurityContext(JArray< ::java::lang::Class * > *);
-  JArray< ::java::lang::Class * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) classes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_SecurityContext__
diff --git a/libjava/java/lang/SecurityException.h b/libjava/java/lang/SecurityException.h
deleted file mode 100644
index 3b19ba203e1..00000000000
--- a/libjava/java/lang/SecurityException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_SecurityException__
-#define __java_lang_SecurityException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::SecurityException : public ::java::lang::RuntimeException
-{
-
-public:
-  SecurityException();
-  SecurityException(::java::lang::String *);
-  SecurityException(::java::lang::String *, ::java::lang::Throwable *);
-  SecurityException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 6878364983674394167LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_SecurityException__
diff --git a/libjava/java/lang/SecurityManager$1.h b/libjava/java/lang/SecurityManager$1.h
deleted file mode 100644
index 21df4f767ed..00000000000
--- a/libjava/java/lang/SecurityManager$1.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_SecurityManager$1__
-#define __java_lang_SecurityManager$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::SecurityManager$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SecurityManager$1(::java::lang::SecurityManager *, ::java::lang::String *);
-public:
-  ::java::lang::Object * run();
-public: // actually package-private
-  ::java::lang::SecurityManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::lang::String * val$restriction;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_SecurityManager$1__
diff --git a/libjava/java/lang/SecurityManager.h b/libjava/java/lang/SecurityManager.h
deleted file mode 100644
index 28ef484c3ce..00000000000
--- a/libjava/java/lang/SecurityManager.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_SecurityManager__
-#define __java_lang_SecurityManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-    }
-    namespace security
-    {
-        class Permission;
-    }
-  }
-}
-
-class java::lang::SecurityManager : public ::java::lang::Object
-{
-
-public:
-  SecurityManager();
-  virtual jboolean getInCheck();
-public: // actually protected
-  virtual JArray< ::java::lang::Class * > * getClassContext();
-  virtual ::java::lang::ClassLoader * currentClassLoader();
-  virtual ::java::lang::Class * currentLoadedClass();
-  virtual jint classDepth(::java::lang::String *);
-  virtual jint classLoaderDepth();
-  virtual jboolean inClass(::java::lang::String *);
-  virtual jboolean inClassLoader();
-public:
-  virtual ::java::lang::Object * getSecurityContext();
-  virtual void checkPermission(::java::security::Permission *);
-  virtual void checkPermission(::java::security::Permission *, ::java::lang::Object *);
-  virtual void checkCreateClassLoader();
-  virtual void checkAccess(::java::lang::Thread *);
-  virtual void checkAccess(::java::lang::ThreadGroup *);
-  virtual void checkExit(jint);
-  virtual void checkExec(::java::lang::String *);
-  virtual void checkLink(::java::lang::String *);
-  virtual void checkRead(::java::io::FileDescriptor *);
-  virtual void checkRead(::java::lang::String *);
-  virtual void checkRead(::java::lang::String *, ::java::lang::Object *);
-  virtual void checkWrite(::java::io::FileDescriptor *);
-  virtual void checkWrite(::java::lang::String *);
-  virtual void checkDelete(::java::lang::String *);
-  virtual void checkConnect(::java::lang::String *, jint);
-  virtual void checkConnect(::java::lang::String *, jint, ::java::lang::Object *);
-  virtual void checkListen(jint);
-  virtual void checkAccept(::java::lang::String *, jint);
-  virtual void checkMulticast(::java::net::InetAddress *);
-  virtual void checkMulticast(::java::net::InetAddress *, jbyte);
-  virtual void checkPropertiesAccess();
-  virtual void checkPropertyAccess(::java::lang::String *);
-  virtual jboolean checkTopLevelWindow(::java::lang::Object *);
-  virtual void checkPrintJobAccess();
-  virtual void checkSystemClipboardAccess();
-  virtual void checkAwtEventQueueAccess();
-  virtual void checkPackageAccess(::java::lang::String *);
-  virtual void checkPackageDefinition(::java::lang::String *);
-  virtual void checkSetFactory();
-  virtual void checkMemberAccess(::java::lang::Class *, jint);
-  virtual void checkSecurityAccess(::java::lang::String *);
-  virtual ::java::lang::ThreadGroup * getThreadGroup();
-public: // actually package-private
-  virtual void checkPackageList(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static volatile ::java::lang::SecurityManager * current;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) inCheck;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_SecurityManager__
diff --git a/libjava/java/lang/Short.h b/libjava/java/lang/Short.h
deleted file mode 100644
index 42671174cfc..00000000000
--- a/libjava/java/lang/Short.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Short__
-#define __java_lang_Short__
-
-#pragma interface
-
-#include <java/lang/Number.h>
-#include <gcj/array.h>
-
-
-class java::lang::Short : public ::java::lang::Number
-{
-
-public:
-  Short(jshort);
-  Short(::java::lang::String *);
-  static ::java::lang::String * toString(jshort);
-  static jshort parseShort(::java::lang::String *);
-  static jshort parseShort(::java::lang::String *, jint);
-  static ::java::lang::Short * valueOf(::java::lang::String *, jint);
-  static ::java::lang::Short * valueOf(::java::lang::String *);
-  static ::java::lang::Short * valueOf(jshort);
-  static ::java::lang::Short * decode(::java::lang::String *);
-  jbyte byteValue();
-  jshort shortValue();
-  jint intValue();
-  jlong longValue();
-  jfloat floatValue();
-  jdouble doubleValue();
-  ::java::lang::String * toString();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jint target$compareTo(::java::lang::Short *);
-  static jshort reverseBytes(jshort);
-  jint compareTo(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 7515723908773894738LL;
-public:
-  static const jshort MIN_VALUE = -32768;
-  static const jshort MAX_VALUE = 32767;
-  static ::java::lang::Class * TYPE;
-  static const jint SIZE = 16;
-private:
-  static const jint MIN_CACHE = -128;
-  static const jint MAX_CACHE = 127;
-  static JArray< ::java::lang::Short * > * shortCache;
-  jshort __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Short__
diff --git a/libjava/java/lang/StackOverflowError.h b/libjava/java/lang/StackOverflowError.h
deleted file mode 100644
index 6d1e06f6594..00000000000
--- a/libjava/java/lang/StackOverflowError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_StackOverflowError__
-#define __java_lang_StackOverflowError__
-
-#pragma interface
-
-#include <java/lang/VirtualMachineError.h>
-
-class java::lang::StackOverflowError : public ::java::lang::VirtualMachineError
-{
-
-public:
-  StackOverflowError();
-  StackOverflowError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8609175038441759607LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_StackOverflowError__
diff --git a/libjava/java/lang/StackTraceElement.h b/libjava/java/lang/StackTraceElement.h
deleted file mode 100644
index 7adf3dc31f5..00000000000
--- a/libjava/java/lang/StackTraceElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_StackTraceElement__
-#define __java_lang_StackTraceElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::StackTraceElement : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StackTraceElement(::java::lang::String *, jint, ::java::lang::String *, ::java::lang::String *, jboolean);
-public:
-  StackTraceElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jint);
-  ::java::lang::String * getFileName();
-  jint getLineNumber();
-  ::java::lang::String * getClassName();
-  ::java::lang::String * getMethodName();
-  jboolean isNativeMethod();
-  ::java::lang::String * toString();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-private:
-  static jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-  static jint hashCode(::java::lang::Object *);
-  static const jlong serialVersionUID = 6992337162326171013LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) fileName;
-  jint lineNumber;
-  ::java::lang::String * declaringClass;
-  ::java::lang::String * methodName;
-  jboolean isNative;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_StackTraceElement__
diff --git a/libjava/java/lang/StrictMath.h b/libjava/java/lang/StrictMath.h
deleted file mode 100644
index d37d5d66848..00000000000
--- a/libjava/java/lang/StrictMath.h
+++ /dev/null
@@ -1,203 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_StrictMath__
-#define __java_lang_StrictMath__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::StrictMath : public ::java::lang::Object
-{
-
-  StrictMath();
-public:
-  static jint abs(jint);
-  static jlong abs(jlong);
-  static jfloat abs(jfloat);
-  static jdouble abs(jdouble);
-  static jint min(jint, jint);
-  static jlong min(jlong, jlong);
-  static jfloat min(jfloat, jfloat);
-  static jdouble min(jdouble, jdouble);
-  static jint max(jint, jint);
-  static jlong max(jlong, jlong);
-  static jfloat max(jfloat, jfloat);
-  static jdouble max(jdouble, jdouble);
-  static jdouble sin(jdouble);
-  static jdouble cos(jdouble);
-  static jdouble tan(jdouble);
-  static jdouble asin(jdouble);
-  static jdouble acos(jdouble);
-  static jdouble atan(jdouble);
-  static jdouble atan2(jdouble, jdouble);
-  static jdouble sinh(jdouble);
-  static jdouble cosh(jdouble);
-  static jdouble tanh(jdouble);
-private:
-  static jlong getLowDWord(jlong);
-  static jlong getHighDWord(jlong);
-  static jdouble buildDouble(jlong, jlong);
-public:
-  static jdouble cbrt(jdouble);
-  static jdouble exp(jdouble);
-  static jdouble expm1(jdouble);
-  static jdouble log(jdouble);
-  static jdouble sqrt(jdouble);
-  static jdouble pow(jdouble, jdouble);
-  static jdouble IEEEremainder(jdouble, jdouble);
-  static jdouble ceil(jdouble);
-  static jdouble floor(jdouble);
-  static jdouble rint(jdouble);
-  static jint round(jfloat);
-  static jlong round(jdouble);
-  static jdouble random();
-  static jdouble toRadians(jdouble);
-  static jdouble toDegrees(jdouble);
-private:
-  static jint remPiOver2(jdouble, JArray< jdouble > *);
-  static jint remPiOver2(JArray< jdouble > *, JArray< jdouble > *, jint, jint);
-  static jdouble scale(jdouble, jint);
-  static jdouble sin(jdouble, jdouble);
-  static jdouble cos(jdouble, jdouble);
-  static jdouble tan(jdouble, jdouble, jboolean);
-public:
-  static jdouble signum(jdouble);
-  static jfloat signum(jfloat);
-  static jdouble ulp(jdouble);
-  static jfloat ulp(jfloat);
-private:
-  static ::java::util::Random * rand;
-public:
-  static jdouble E;
-  static jdouble PI;
-private:
-  static jdouble TWO_16;
-  static jdouble TWO_20;
-  static jdouble TWO_24;
-  static jdouble TWO_27;
-  static jdouble TWO_28;
-  static jdouble TWO_29;
-  static jdouble TWO_31;
-  static jdouble TWO_49;
-  static jdouble TWO_52;
-  static jdouble TWO_54;
-  static jdouble TWO_57;
-  static jdouble TWO_60;
-  static jdouble TWO_64;
-  static jdouble TWO_66;
-  static jdouble TWO_1023;
-  static JArray< jint > * TWO_OVER_PI;
-  static JArray< jdouble > * PI_OVER_TWO;
-  static jdouble PI_L;
-  static jdouble PIO2_1;
-  static jdouble PIO2_1L;
-  static jdouble PIO2_2;
-  static jdouble PIO2_2L;
-  static jdouble PIO2_3;
-  static jdouble PIO2_3L;
-  static jdouble SQRT_1_5;
-  static jdouble SQRT_2;
-  static jdouble SQRT_3;
-  static jdouble EXP_LIMIT_H;
-  static jdouble EXP_LIMIT_L;
-  static jdouble CP;
-  static jdouble CP_H;
-  static jdouble CP_L;
-  static jdouble LN2;
-  static jdouble LN2_H;
-  static jdouble LN2_L;
-  static jdouble INV_LN2;
-  static jdouble INV_LN2_H;
-  static jdouble INV_LN2_L;
-  static jdouble LG1;
-  static jdouble LG2;
-  static jdouble LG3;
-  static jdouble LG4;
-  static jdouble LG5;
-  static jdouble LG6;
-  static jdouble LG7;
-  static jdouble L1;
-  static jdouble L2;
-  static jdouble L3;
-  static jdouble L4;
-  static jdouble L5;
-  static jdouble L6;
-  static jdouble P1;
-  static jdouble P2;
-  static jdouble P3;
-  static jdouble P4;
-  static jdouble P5;
-  static jdouble DP_H;
-  static jdouble DP_L;
-  static jdouble OVT;
-  static jdouble S1;
-  static jdouble S2;
-  static jdouble S3;
-  static jdouble S4;
-  static jdouble S5;
-  static jdouble S6;
-  static jdouble C1;
-  static jdouble C2;
-  static jdouble C3;
-  static jdouble C4;
-  static jdouble C5;
-  static jdouble C6;
-  static jdouble T0;
-  static jdouble T1;
-  static jdouble T2;
-  static jdouble T3;
-  static jdouble T4;
-  static jdouble T5;
-  static jdouble T6;
-  static jdouble T7;
-  static jdouble T8;
-  static jdouble T9;
-  static jdouble T10;
-  static jdouble T11;
-  static jdouble T12;
-  static jdouble PS0;
-  static jdouble PS1;
-  static jdouble PS2;
-  static jdouble PS3;
-  static jdouble PS4;
-  static jdouble PS5;
-  static jdouble QS1;
-  static jdouble QS2;
-  static jdouble QS3;
-  static jdouble QS4;
-  static jdouble ATAN_0_5H;
-  static jdouble ATAN_0_5L;
-  static jdouble ATAN_1_5H;
-  static jdouble ATAN_1_5L;
-  static jdouble AT0;
-  static jdouble AT1;
-  static jdouble AT2;
-  static jdouble AT3;
-  static jdouble AT4;
-  static jdouble AT5;
-  static jdouble AT6;
-  static jdouble AT7;
-  static jdouble AT8;
-  static jdouble AT9;
-  static jdouble AT10;
-  static const jint CBRT_B1 = 715094163;
-  static const jint CBRT_B2 = 696219795;
-  static jdouble CBRT_C;
-  static jdouble CBRT_D;
-  static jdouble CBRT_E;
-  static jdouble CBRT_F;
-  static jdouble CBRT_G;
-  static jdouble EXPM1_Q1;
-  static jdouble EXPM1_Q2;
-  static jdouble EXPM1_Q3;
-  static jdouble EXPM1_Q4;
-  static jdouble EXPM1_Q5;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_StrictMath__
diff --git a/libjava/java/lang/String$CaseInsensitiveComparator.h b/libjava/java/lang/String$CaseInsensitiveComparator.h
deleted file mode 100644
index 11c0ea557b7..00000000000
--- a/libjava/java/lang/String$CaseInsensitiveComparator.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_String$CaseInsensitiveComparator__
-#define __java_lang_String$CaseInsensitiveComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::String$CaseInsensitiveComparator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  String$CaseInsensitiveComparator();
-public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 8575799808933029326LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_String$CaseInsensitiveComparator__
diff --git a/libjava/java/lang/String.h b/libjava/java/lang/String.h
deleted file mode 100644
index 44be2741c30..00000000000
--- a/libjava/java/lang/String.h
+++ /dev/null
@@ -1,138 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_String__
-#define __java_lang_String__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class StringBuffer;
-      }
-    }
-  }
-}
-
-jchar* _Jv_GetStringChars (jstring str);
-jstring* _Jv_StringFindSlot (jchar*, jint, jint);
-jstring* _Jv_StringGetSlot (jstring);
-jstring _Jv_NewStringUtf8Const (_Jv_Utf8Const* str);
-jstring _Jv_NewStringLatin1 (const char*, jsize);
-jstring _Jv_AllocString (jsize);
-
-class java::lang::String : public ::java::lang::Object
-{
-
-public:
-  String();
-  String(::java::lang::String *);
-  String(JArray< jchar > *);
-  String(JArray< jchar > *, jint, jint);
-  String(JArray< jbyte > *, jint, jint, jint);
-  String(JArray< jbyte > *, jint);
-  String(JArray< jbyte > *, jint, jint, ::java::lang::String *);
-  String(JArray< jbyte > *, ::java::lang::String *);
-  String(JArray< jbyte > *, jint, jint);
-  String(JArray< jbyte > *);
-  String(::java::lang::StringBuffer *);
-  String(::java::lang::StringBuilder *);
-public: // actually package-private
-  String(JArray< jchar > *, jint, jint, jboolean);
-  String(::gnu::gcj::runtime::StringBuffer *);
-public:
-  jint length();
-  jchar charAt(jint);
-  jint codePointAt(jint);
-  jint codePointBefore(jint);
-  void getChars(jint, jint, JArray< jchar > *, jint);
-  void getBytes(jint, jint, JArray< jbyte > *, jint);
-  JArray< jbyte > * getBytes(::java::lang::String *);
-  JArray< jbyte > * getBytes();
-  jboolean equals(::java::lang::Object *);
-  jboolean contentEquals(::java::lang::StringBuffer *);
-  jboolean contentEquals(::java::lang::CharSequence *);
-  jboolean equalsIgnoreCase(::java::lang::String *);
-  jint compareTo(::java::lang::String *);
-  jint compareTo(::java::lang::Object *);
-  jint compareToIgnoreCase(::java::lang::String *);
-  jboolean regionMatches(jint, ::java::lang::String *, jint, jint);
-  jboolean regionMatches(jboolean, jint, ::java::lang::String *, jint, jint);
-  jboolean startsWith(::java::lang::String *, jint);
-  jboolean startsWith(::java::lang::String *);
-  jboolean endsWith(::java::lang::String *);
-  jint hashCode();
-  jint indexOf(jint);
-  jint indexOf(jint, jint);
-  jint lastIndexOf(jint);
-  jint lastIndexOf(jint, jint);
-  jint indexOf(::java::lang::String *);
-  jint indexOf(::java::lang::String *, jint);
-  jint lastIndexOf(::java::lang::String *);
-  jint lastIndexOf(::java::lang::String *, jint);
-  ::java::lang::String * substring(jint);
-  ::java::lang::String * substring(jint, jint);
-  ::java::lang::CharSequence * subSequence(jint, jint);
-  ::java::lang::String * concat(::java::lang::String *);
-  ::java::lang::String * replace(jchar, jchar);
-  jboolean matches(::java::lang::String *);
-  ::java::lang::String * replaceFirst(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * replaceAll(::java::lang::String *, ::java::lang::String *);
-  JArray< ::java::lang::String * > * split(::java::lang::String *, jint);
-  JArray< ::java::lang::String * > * split(::java::lang::String *);
-  ::java::lang::String * toLowerCase(::java::util::Locale *);
-  ::java::lang::String * toLowerCase();
-  ::java::lang::String * toUpperCase(::java::util::Locale *);
-  ::java::lang::String * toUpperCase();
-  ::java::lang::String * trim();
-  ::java::lang::String * toString();
-  JArray< jchar > * toCharArray();
-  static ::java::lang::String * valueOf(::java::lang::Object *);
-  static ::java::lang::String * valueOf(JArray< jchar > *);
-  static ::java::lang::String * valueOf(JArray< jchar > *, jint, jint);
-  static ::java::lang::String * copyValueOf(JArray< jchar > *, jint, jint);
-  static ::java::lang::String * copyValueOf(JArray< jchar > *);
-  static ::java::lang::String * valueOf(jboolean);
-  static ::java::lang::String * valueOf(jchar);
-  static ::java::lang::String * valueOf(jint);
-  static ::java::lang::String * valueOf(jlong);
-  static ::java::lang::String * valueOf(jfloat);
-  static ::java::lang::String * valueOf(jdouble);
-  ::java::lang::String * intern();
-  jint codePointCount(jint, jint);
-  jboolean contains(::java::lang::CharSequence *);
-  ::java::lang::String * replace(::java::lang::CharSequence *, ::java::lang::CharSequence *);
-private:
-  void init(JArray< jchar > *, jint, jint, jboolean);
-  void init(JArray< jbyte > *, jint, jint, jint);
-  void init(JArray< jbyte > *, jint, jint, ::java::lang::String *);
-  void init(::gnu::gcj::runtime::StringBuffer *);
-  static const jlong serialVersionUID = -6849794470754667710LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
-  jint boffset;
-public: // actually package-private
-  jint count;
-private:
-  jint cachedHashCode;
-public:
-  static ::java::util::Comparator * CASE_INSENSITIVE_ORDER;
-  static ::java::lang::Class class$;
-
-  friend jchar* ::_Jv_GetStringChars (jstring str);
-  friend jstring* ::_Jv_StringFindSlot (jchar*, jint, jint);
-  friend jstring* ::_Jv_StringGetSlot (jstring);
-  friend jstring (::_Jv_NewStringUtf8Const) (_Jv_Utf8Const* str);
-  friend jstring (::_Jv_NewStringLatin1) (const char*, jsize);
-  friend jstring (::_Jv_AllocString) (jsize);
-};
-
-#endif // __java_lang_String__
diff --git a/libjava/java/lang/StringBuffer.h b/libjava/java/lang/StringBuffer.h
deleted file mode 100644
index 93951f471f6..00000000000
--- a/libjava/java/lang/StringBuffer.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_StringBuffer__
-#define __java_lang_StringBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::StringBuffer : public ::java::lang::Object
-{
-
-public:
-  StringBuffer();
-  StringBuffer(jint);
-  StringBuffer(::java::lang::String *);
-  StringBuffer(::java::lang::CharSequence *);
-  jint length();
-  jint capacity();
-  void ensureCapacity(jint);
-  void setLength(jint);
-  jchar charAt(jint);
-  jint codePointAt(jint);
-  jint codePointBefore(jint);
-  void getChars(jint, jint, JArray< jchar > *, jint);
-  void setCharAt(jint, jchar);
-  ::java::lang::StringBuffer * append(::java::lang::Object *);
-  ::java::lang::StringBuffer * append(::java::lang::String *);
-  ::java::lang::StringBuffer * append(::java::lang::StringBuffer *);
-  ::java::lang::StringBuffer * append(::java::lang::CharSequence *);
-  ::java::lang::StringBuffer * append(::java::lang::CharSequence *, jint, jint);
-  ::java::lang::StringBuffer * append(JArray< jchar > *);
-  ::java::lang::StringBuffer * append(JArray< jchar > *, jint, jint);
-  ::java::lang::StringBuffer * append(jboolean);
-  ::java::lang::StringBuffer * append(jchar);
-  ::java::lang::StringBuffer * appendCodePoint(jint);
-  ::java::lang::StringBuffer * append(jint);
-  ::java::lang::StringBuffer * append(jlong);
-  ::java::lang::StringBuffer * append(jfloat);
-  ::java::lang::StringBuffer * append(jdouble);
-  ::java::lang::StringBuffer * delete$(jint, jint);
-  ::java::lang::StringBuffer * deleteCharAt(jint);
-  ::java::lang::StringBuffer * replace(jint, jint, ::java::lang::String *);
-  ::java::lang::String * substring(jint);
-  ::java::lang::CharSequence * subSequence(jint, jint);
-  ::java::lang::String * substring(jint, jint);
-  ::java::lang::StringBuffer * insert(jint, JArray< jchar > *, jint, jint);
-  ::java::lang::StringBuffer * insert(jint, ::java::lang::Object *);
-  ::java::lang::StringBuffer * insert(jint, ::java::lang::String *);
-  ::java::lang::StringBuffer * insert(jint, ::java::lang::CharSequence *);
-  ::java::lang::StringBuffer * insert(jint, ::java::lang::CharSequence *, jint, jint);
-  ::java::lang::StringBuffer * insert(jint, JArray< jchar > *);
-  ::java::lang::StringBuffer * insert(jint, jboolean);
-  ::java::lang::StringBuffer * insert(jint, jchar);
-  ::java::lang::StringBuffer * insert(jint, jint);
-  ::java::lang::StringBuffer * insert(jint, jlong);
-  ::java::lang::StringBuffer * insert(jint, jfloat);
-  ::java::lang::StringBuffer * 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);
-  ::java::lang::StringBuffer * reverse();
-  ::java::lang::String * toString();
-  void trimToSize();
-  jint codePointCount(jint, jint);
-  jint offsetByCodePoints(jint, jint);
-private:
-  void ensureCapacity_unsynchronized(jint);
-  jboolean regionMatches(jint, ::java::lang::String *);
-  static const jlong serialVersionUID = 3388685877147921107LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  JArray< jchar > * value;
-  jboolean shared;
-private:
-  static const jint DEFAULT_CAPACITY = 16;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_StringBuffer__
diff --git a/libjava/java/lang/StringBuilder.h b/libjava/java/lang/StringBuilder.h
deleted file mode 100644
index d4912bf0cb4..00000000000
--- a/libjava/java/lang/StringBuilder.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_StringBuilder__
-#define __java_lang_StringBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::StringBuilder : public ::java::lang::Object
-{
-
-public:
-  StringBuilder();
-  StringBuilder(jint);
-  StringBuilder(::java::lang::String *);
-  StringBuilder(::java::lang::CharSequence *);
-  jint length();
-  jint capacity();
-  void ensureCapacity(jint);
-  void setLength(jint);
-  jchar charAt(jint);
-  void getChars(jint, jint, JArray< jchar > *, jint);
-  void setCharAt(jint, jchar);
-  ::java::lang::StringBuilder * append(::java::lang::Object *);
-  ::java::lang::StringBuilder * append(::java::lang::String *);
-  ::java::lang::StringBuilder * append(::java::lang::StringBuffer *);
-  ::java::lang::StringBuilder * append(JArray< jchar > *);
-  ::java::lang::StringBuilder * append(JArray< jchar > *, jint, jint);
-  ::java::lang::StringBuilder * append(jboolean);
-  ::java::lang::StringBuilder * target$append(jchar);
-  ::java::lang::StringBuilder * target$append(::java::lang::CharSequence *);
-  ::java::lang::StringBuilder * target$append(::java::lang::CharSequence *, jint, jint);
-  ::java::lang::StringBuilder * appendCodePoint(jint);
-  ::java::lang::StringBuilder * append(jint);
-  ::java::lang::StringBuilder * append(jlong);
-  ::java::lang::StringBuilder * append(jfloat);
-  ::java::lang::StringBuilder * append(jdouble);
-  ::java::lang::StringBuilder * delete$(jint, jint);
-  ::java::lang::StringBuilder * deleteCharAt(jint);
-  ::java::lang::StringBuilder * replace(jint, jint, ::java::lang::String *);
-  ::java::lang::String * substring(jint);
-  ::java::lang::CharSequence * subSequence(jint, jint);
-  ::java::lang::String * substring(jint, jint);
-  ::java::lang::StringBuilder * insert(jint, JArray< jchar > *, jint, jint);
-  ::java::lang::StringBuilder * insert(jint, ::java::lang::Object *);
-  ::java::lang::StringBuilder * insert(jint, ::java::lang::String *);
-  ::java::lang::StringBuilder * insert(jint, ::java::lang::CharSequence *);
-  ::java::lang::StringBuilder * insert(jint, ::java::lang::CharSequence *, jint, jint);
-  ::java::lang::StringBuilder * insert(jint, JArray< jchar > *);
-  ::java::lang::StringBuilder * insert(jint, jboolean);
-  ::java::lang::StringBuilder * insert(jint, jchar);
-  ::java::lang::StringBuilder * insert(jint, jint);
-  ::java::lang::StringBuilder * insert(jint, jlong);
-  ::java::lang::StringBuilder * insert(jint, jfloat);
-  ::java::lang::StringBuilder * 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);
-  ::java::lang::StringBuilder * reverse();
-  ::java::lang::String * toString();
-private:
-  jboolean regionMatches(jint, ::java::lang::String *);
-public:
-  ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  ::java::lang::Appendable * append(jchar);
-private:
-  static const jlong serialVersionUID = 4383685877147921099LL;
-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 // __java_lang_StringBuilder__
diff --git a/libjava/java/lang/StringIndexOutOfBoundsException.h b/libjava/java/lang/StringIndexOutOfBoundsException.h
deleted file mode 100644
index e3669a0d366..00000000000
--- a/libjava/java/lang/StringIndexOutOfBoundsException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_StringIndexOutOfBoundsException__
-#define __java_lang_StringIndexOutOfBoundsException__
-
-#pragma interface
-
-#include <java/lang/IndexOutOfBoundsException.h>
-
-class java::lang::StringIndexOutOfBoundsException : public ::java::lang::IndexOutOfBoundsException
-{
-
-public:
-  StringIndexOutOfBoundsException();
-  StringIndexOutOfBoundsException(::java::lang::String *);
-  StringIndexOutOfBoundsException(jint);
-private:
-  static const jlong serialVersionUID = -6762910422159637258LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_StringIndexOutOfBoundsException__
diff --git a/libjava/java/lang/SuppressWarnings.h b/libjava/java/lang/SuppressWarnings.h
deleted file mode 100644
index 3f28104d9ad..00000000000
--- a/libjava/java/lang/SuppressWarnings.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_SuppressWarnings__
-#define __java_lang_SuppressWarnings__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::SuppressWarnings : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::String * > * value() = 0;
-  virtual ::java::lang::Class * annotationType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_SuppressWarnings__
diff --git a/libjava/java/lang/System$EnvironmentCollection.h b/libjava/java/lang/System$EnvironmentCollection.h
deleted file mode 100644
index 8392e1782ba..00000000000
--- a/libjava/java/lang/System$EnvironmentCollection.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_System$EnvironmentCollection__
-#define __java_lang_System$EnvironmentCollection__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::lang::System$EnvironmentCollection : public ::java::util::AbstractCollection
-{
-
-public:
-  System$EnvironmentCollection(::java::util::Collection *);
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean containsAll(::java::util::Collection *);
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual jboolean retainAll(::java::util::Collection *);
-  virtual jint size();
-public: // actually protected
-  ::java::util::Collection * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_System$EnvironmentCollection__
diff --git a/libjava/java/lang/System$EnvironmentMap.h b/libjava/java/lang/System$EnvironmentMap.h
deleted file mode 100644
index ee4582b43fb..00000000000
--- a/libjava/java/lang/System$EnvironmentMap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_System$EnvironmentMap__
-#define __java_lang_System$EnvironmentMap__
-
-#pragma interface
-
-#include <java/util/HashMap.h>
-
-class java::lang::System$EnvironmentMap : public ::java::util::HashMap
-{
-
-public: // actually package-private
-  System$EnvironmentMap();
-public:
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::util::Set * entrySet();
-  virtual ::java::lang::String * target$get(::java::lang::Object *);
-  virtual ::java::util::Set * keySet();
-  virtual ::java::lang::String * target$remove(::java::lang::Object *);
-  virtual ::java::util::Collection * values();
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-private:
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::util::HashMap)))) entries;
-  ::java::util::Set * keys;
-  ::java::util::Collection * values__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_System$EnvironmentMap__
diff --git a/libjava/java/lang/System$EnvironmentSet.h b/libjava/java/lang/System$EnvironmentSet.h
deleted file mode 100644
index 9a1e1a65dee..00000000000
--- a/libjava/java/lang/System$EnvironmentSet.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_System$EnvironmentSet__
-#define __java_lang_System$EnvironmentSet__
-
-#pragma interface
-
-#include <java/lang/System$EnvironmentCollection.h>
-
-class java::lang::System$EnvironmentSet : public ::java::lang::System$EnvironmentCollection
-{
-
-public:
-  System$EnvironmentSet(::java::util::Set *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_System$EnvironmentSet__
diff --git a/libjava/java/lang/System.h b/libjava/java/lang/System.h
deleted file mode 100644
index 5a759678328..00000000000
--- a/libjava/java/lang/System.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_System__
-#define __java_lang_System__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::System : public ::java::lang::Object
-{
-
-  System();
-public:
-  static void setIn(::java::io::InputStream *);
-  static void setOut(::java::io::PrintStream *);
-  static void setErr(::java::io::PrintStream *);
-  static void setSecurityManager(::java::lang::SecurityManager *);
-  static ::java::lang::SecurityManager * getSecurityManager();
-  static jlong currentTimeMillis();
-  static jlong nanoTime();
-  static void arraycopy(::java::lang::Object *, jint, ::java::lang::Object *, jint, jint);
-  static jint identityHashCode(::java::lang::Object *);
-  static ::java::util::Properties * getProperties();
-  static void setProperties(::java::util::Properties *);
-  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::lang::String * clearProperty(::java::lang::String *);
-  static ::java::lang::String * getenv(::java::lang::String *);
-  static ::java::util::Map * getenv();
-  static void exit(jint);
-  static void gc();
-  static void runFinalization();
-  static void runFinalizersOnExit(jboolean);
-  static void load(::java::lang::String *);
-  static void loadLibrary(::java::lang::String *);
-  static ::java::lang::String * mapLibraryName(::java::lang::String *);
-private:
-  static void setIn0(::java::io::InputStream *);
-  static void setOut0(::java::io::PrintStream *);
-  static void setErr0(::java::io::PrintStream *);
-public: // actually package-private
-  static ::java::lang::String * getenv0(::java::lang::String *);
-public:
-  static ::java::io::InputStream * in;
-  static ::java::io::PrintStream * out;
-  static ::java::io::PrintStream * err;
-private:
-  static ::java::util::Map * environmentMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_System__
diff --git a/libjava/java/lang/Thread$State.h b/libjava/java/lang/Thread$State.h
deleted file mode 100644
index 4620c722436..00000000000
--- a/libjava/java/lang/Thread$State.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Thread$State__
-#define __java_lang_Thread$State__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-
-class java::lang::Thread$State : public ::java::lang::Enum
-{
-
-  Thread$State(::java::lang::String *, jint);
-public:
-  static JArray< ::java::lang::Thread$State * > * values();
-  static ::java::lang::Thread$State * valueOf(::java::lang::String *);
-  static ::java::lang::Thread$State * BLOCKED;
-  static ::java::lang::Thread$State * NEW;
-  static ::java::lang::Thread$State * RUNNABLE;
-  static ::java::lang::Thread$State * TERMINATED;
-  static ::java::lang::Thread$State * TIMED_WAITING;
-  static ::java::lang::Thread$State * WAITING;
-private:
-  static JArray< ::java::lang::Thread$State * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Thread$State__
diff --git a/libjava/java/lang/Thread$UncaughtExceptionHandler.h b/libjava/java/lang/Thread$UncaughtExceptionHandler.h
deleted file mode 100644
index 88d2b5b902f..00000000000
--- a/libjava/java/lang/Thread$UncaughtExceptionHandler.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Thread$UncaughtExceptionHandler__
-#define __java_lang_Thread$UncaughtExceptionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Thread$UncaughtExceptionHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void uncaughtException(::java::lang::Thread *, ::java::lang::Throwable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_Thread$UncaughtExceptionHandler__
diff --git a/libjava/java/lang/Thread.h b/libjava/java/lang/Thread.h
deleted file mode 100644
index c3556f0684d..00000000000
--- a/libjava/java/lang/Thread.h
+++ /dev/null
@@ -1,161 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Thread__
-#define __java_lang_Thread__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-        class RawDataManaged;
-    }
-    namespace java
-    {
-      namespace util
-      {
-          class WeakIdentityHashMap;
-      }
-    }
-  }
-}
-
-class _Jv_JNIEnv;
-#define _JV_NOT_OWNER 1
-#define _JV_INTERRUPTED 2
-_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();
-void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);
-void _Jv_ThreadRun (java::lang::Thread* thread);
-jint _Jv_AttachCurrentThread(java::lang::Thread* thread);
-java::lang::Thread* _Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);
-java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);
-jint _Jv_DetachCurrentThread ();
-struct _Jv_Thread_t;
-_Jv_Thread_t* _Jv_ThreadGetData (java::lang::Thread* thread);
-
-class java::lang::Thread : public ::java::lang::Object
-{
-
-public:
-  Thread();
-  Thread(::java::lang::Runnable *);
-  Thread(::java::lang::String *);
-  Thread(::java::lang::ThreadGroup *, ::java::lang::Runnable *);
-  Thread(::java::lang::ThreadGroup *, ::java::lang::String *);
-  Thread(::java::lang::Runnable *, ::java::lang::String *);
-  Thread(::java::lang::ThreadGroup *, ::java::lang::Runnable *, ::java::lang::String *);
-  Thread(::java::lang::ThreadGroup *, ::java::lang::Runnable *, ::java::lang::String *, jlong);
-private:
-  Thread(::java::lang::Thread *, ::java::lang::ThreadGroup *, ::java::lang::Runnable *, ::java::lang::String *);
-public:
-  static jint activeCount();
-  virtual void checkAccess();
-  virtual jint countStackFrames();
-  static ::java::lang::Thread * currentThread();
-  virtual void destroy();
-  static void dumpStack();
-  static jint enumerate(JArray< ::java::lang::Thread * > *);
-  virtual ::java::lang::String * getName();
-  virtual jint getPriority();
-  virtual ::java::lang::ThreadGroup * getThreadGroup();
-  static jboolean holdsLock(::java::lang::Object *);
-  virtual void interrupt();
-  static jboolean interrupted();
-  virtual jboolean isInterrupted();
-  virtual jboolean isAlive();
-  virtual jboolean isDaemon();
-  virtual void join();
-  virtual void join(jlong);
-  virtual void join(jlong, jint);
-  virtual void resume();
-private:
-  void finish_();
-  jboolean isInterrupted(jboolean);
-public:
-  virtual void run();
-  virtual void setDaemon(jboolean);
-  virtual ::java::lang::ClassLoader * getContextClassLoader();
-  virtual void setContextClassLoader(::java::lang::ClassLoader *);
-  virtual void setName(::java::lang::String *);
-  static void yield();
-  static void sleep(jlong);
-  static void sleep(jlong, jint);
-  virtual void start();
-  virtual void stop();
-  virtual void stop(::java::lang::Throwable *);
-  virtual void suspend();
-  virtual void setPriority(jint);
-  virtual ::java::lang::String * toString();
-private:
-  void initialize_native();
-  static ::java::lang::String * gen_name();
-public: // actually package-private
-  static ::java::util::Map * getThreadLocals();
-public:
-  virtual void setUncaughtExceptionHandler(::java::lang::Thread$UncaughtExceptionHandler *);
-  virtual ::java::lang::Thread$UncaughtExceptionHandler * getUncaughtExceptionHandler();
-  static void setDefaultUncaughtExceptionHandler(::java::lang::Thread$UncaughtExceptionHandler *);
-  static ::java::lang::Thread$UncaughtExceptionHandler * getDefaultUncaughtExceptionHandler();
-  virtual jlong getId();
-  virtual ::java::lang::Thread$State * getState();
-  static ::java::util::Map * getAllStackTraces();
-  virtual JArray< ::java::lang::StackTraceElement * > * getStackTrace();
-  static const jint MIN_PRIORITY = 1;
-  static const jint NORM_PRIORITY = 5;
-  static const jint MAX_PRIORITY = 10;
-public: // actually package-private
-  ::java::lang::ThreadGroup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) group;
-private:
-  ::java::lang::Runnable * runnable;
-public: // actually package-private
-  ::java::lang::String * name;
-private:
-  jboolean daemon;
-  jint priority;
-public: // actually package-private
-  jboolean interrupt_flag;
-private:
-  static const jbyte THREAD_DEAD = 0;
-  static const jbyte THREAD_ALIVE = 1;
-  static const jbyte THREAD_SIGNALED = 2;
-  jboolean startable_flag;
-  ::java::lang::ClassLoader * contextClassLoader;
-  jlong threadId;
-  static jlong nextThreadId;
-  static jlong totalThreadsCreated;
-  static ::java::lang::Thread$UncaughtExceptionHandler * defaultHandler;
-public: // actually package-private
-  ::gnu::java::util::WeakIdentityHashMap * locals;
-  ::java::lang::Thread$UncaughtExceptionHandler * exceptionHandler;
-private:
-  ::java::lang::Object * parkBlocker;
-public: // actually package-private
-  static const jbyte THREAD_PARK_RUNNING = 0;
-  static const jbyte THREAD_PARK_PERMIT = 1;
-  static const jbyte THREAD_PARK_PARKED = 2;
-  static const jbyte THREAD_PARK_DEAD = 3;
-  ::java::lang::Object * accessControlState;
-  ::gnu::gcj::RawData * interp_frame;
-  volatile jint state;
-  ::gnu::gcj::RawDataManaged * data;
-public:
-  static ::java::lang::Class class$;
-
-  friend _Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();
-  friend void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);
-  friend void ::_Jv_ThreadRun (java::lang::Thread* thread);
-  friend jint (::_Jv_AttachCurrentThread) (java::lang::Thread* thread);
-  friend java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);
-  friend java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);
-  friend jint (::_Jv_DetachCurrentThread) ();
-};
-
-#endif // __java_lang_Thread__
diff --git a/libjava/java/lang/ThreadDeath.h b/libjava/java/lang/ThreadDeath.h
deleted file mode 100644
index d06ce3458b3..00000000000
--- a/libjava/java/lang/ThreadDeath.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ThreadDeath__
-#define __java_lang_ThreadDeath__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-
-class java::lang::ThreadDeath : public ::java::lang::Error
-{
-
-public:
-  ThreadDeath();
-private:
-  static const jlong serialVersionUID = -4417128565033088268LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ThreadDeath__
diff --git a/libjava/java/lang/ThreadGroup.h b/libjava/java/lang/ThreadGroup.h
deleted file mode 100644
index a197ca16eb6..00000000000
--- a/libjava/java/lang/ThreadGroup.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ThreadGroup__
-#define __java_lang_ThreadGroup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::ThreadGroup : public ::java::lang::Object
-{
-
-  ThreadGroup();
-public:
-  ThreadGroup(::java::lang::String *);
-  ThreadGroup(::java::lang::ThreadGroup *, ::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::ThreadGroup * getParent();
-  virtual jint getMaxPriority();
-  virtual jboolean isDaemon();
-  virtual jboolean isDestroyed();
-  virtual void setDaemon(jboolean);
-  virtual void setMaxPriority(jint);
-  virtual jboolean parentOf(::java::lang::ThreadGroup *);
-  virtual void checkAccess();
-  virtual jint activeCount();
-  virtual jint enumerate(JArray< ::java::lang::Thread * > *);
-  virtual jint enumerate(JArray< ::java::lang::Thread * > *, jboolean);
-  virtual jint activeGroupCount();
-  virtual jint enumerate(JArray< ::java::lang::ThreadGroup * > *);
-  virtual jint enumerate(JArray< ::java::lang::ThreadGroup * > *, jboolean);
-  virtual void stop();
-  virtual void interrupt();
-  virtual void suspend();
-  virtual void resume();
-  virtual void destroy();
-  virtual void list();
-  virtual void uncaughtException(::java::lang::Thread *, ::java::lang::Throwable *);
-  virtual jboolean allowThreadSuspension(jboolean);
-  virtual ::java::lang::String * toString();
-private:
-  jint enumerate(JArray< ::java::lang::Thread * > *, jint, jboolean);
-  jint enumerate(JArray< ::java::lang::ThreadGroup * > *, jint, jboolean);
-  void list(::java::lang::String *);
-public: // actually package-private
-  virtual void addThread(::java::lang::Thread *);
-  virtual void removeThread(::java::lang::Thread *);
-  virtual void removeGroup(::java::lang::ThreadGroup *);
-  static ::java::lang::Thread * getThreadFromId(jlong);
-private:
-  ::java::lang::Thread * getThreadFromIdImpl(jlong);
-public: // actually package-private
-  static ::java::lang::ThreadGroup * root;
-  static jboolean had_uncaught_exception;
-  ::java::lang::ThreadGroup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
-  ::java::lang::String * name;
-private:
-  ::java::util::Vector * threads;
-  ::java::util::Vector * groups;
-  jboolean daemon_flag;
-  jint maxpri;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ThreadGroup__
diff --git a/libjava/java/lang/ThreadLocal.h b/libjava/java/lang/ThreadLocal.h
deleted file mode 100644
index 4bea9318516..00000000000
--- a/libjava/java/lang/ThreadLocal.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ThreadLocal__
-#define __java_lang_ThreadLocal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-}
-
-class java::lang::ThreadLocal : public ::java::lang::Object
-{
-
-public:
-  ThreadLocal();
-public: // actually protected
-  virtual ::java::lang::Object * initialValue();
-public:
-  virtual ::java::lang::Object * get();
-private:
-  ::java::lang::Object * internalGet();
-public:
-  virtual void set(::java::lang::Object *);
-private:
-  void internalSet(::java::lang::Object *);
-public:
-  virtual void remove();
-private:
-  void internalRemove();
-public: // actually protected
-  virtual void finalize();
-private:
-  void constructNative();
-public: // actually package-private
-  static ::java::lang::Object * sentinel;
-private:
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) TLSPointer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ThreadLocal__
diff --git a/libjava/java/lang/Throwable$StaticData.h b/libjava/java/lang/Throwable$StaticData.h
deleted file mode 100644
index 6bb0912de2d..00000000000
--- a/libjava/java/lang/Throwable$StaticData.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Throwable$StaticData__
-#define __java_lang_Throwable$StaticData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Throwable$StaticData : public ::java::lang::Object
-{
-
-  Throwable$StaticData();
-public: // actually package-private
-  static ::java::lang::String * nl;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Throwable$StaticData__
diff --git a/libjava/java/lang/Throwable.h b/libjava/java/lang/Throwable.h
deleted file mode 100644
index 0b8fdca68e7..00000000000
--- a/libjava/java/lang/Throwable.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Throwable__
-#define __java_lang_Throwable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::Throwable : public ::java::lang::Object
-{
-
-public:
-  Throwable();
-  Throwable(::java::lang::String *);
-  Throwable(::java::lang::String *, ::java::lang::Throwable *);
-  Throwable(::java::lang::Throwable *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::String * getLocalizedMessage();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::Throwable * initCause(::java::lang::Throwable *);
-  virtual ::java::lang::String * toString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  ::java::lang::String * stackTraceString();
-  static void stackTraceStringBuffer(::java::lang::StringBuffer *, ::java::lang::String *, JArray< ::java::lang::StackTraceElement * > *, jint);
-public:
-  virtual ::java::lang::Throwable * fillInStackTrace();
-  virtual JArray< ::java::lang::StackTraceElement * > * getStackTrace();
-  virtual void setStackTrace(JArray< ::java::lang::StackTraceElement * > *);
-private:
-  static const jlong serialVersionUID = -3042686055658047285LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) detailMessage;
-  ::java::lang::Throwable * cause;
-  JArray< ::java::lang::StackTraceElement * > * stackTrace;
-  ::java::lang::VMThrowable * vmState;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Throwable__
diff --git a/libjava/java/lang/TypeNotPresentException.h b/libjava/java/lang/TypeNotPresentException.h
deleted file mode 100644
index 076f0a6d43f..00000000000
--- a/libjava/java/lang/TypeNotPresentException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_TypeNotPresentException__
-#define __java_lang_TypeNotPresentException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::TypeNotPresentException : public ::java::lang::RuntimeException
-{
-
-public:
-  TypeNotPresentException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::String * typeName();
-private:
-  static const jlong serialVersionUID = -5101214195716534496LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) typeName__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_TypeNotPresentException__
diff --git a/libjava/java/lang/UnknownError.h b/libjava/java/lang/UnknownError.h
deleted file mode 100644
index 2ed851aae57..00000000000
--- a/libjava/java/lang/UnknownError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_UnknownError__
-#define __java_lang_UnknownError__
-
-#pragma interface
-
-#include <java/lang/VirtualMachineError.h>
-
-class java::lang::UnknownError : public ::java::lang::VirtualMachineError
-{
-
-public:
-  UnknownError();
-  UnknownError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2524784860676771849LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_UnknownError__
diff --git a/libjava/java/lang/UnsatisfiedLinkError.h b/libjava/java/lang/UnsatisfiedLinkError.h
deleted file mode 100644
index a560313fe21..00000000000
--- a/libjava/java/lang/UnsatisfiedLinkError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_UnsatisfiedLinkError__
-#define __java_lang_UnsatisfiedLinkError__
-
-#pragma interface
-
-#include <java/lang/LinkageError.h>
-
-class java::lang::UnsatisfiedLinkError : public ::java::lang::LinkageError
-{
-
-public:
-  UnsatisfiedLinkError();
-  UnsatisfiedLinkError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4019343241616879428LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_UnsatisfiedLinkError__
diff --git a/libjava/java/lang/UnsupportedClassVersionError.h b/libjava/java/lang/UnsupportedClassVersionError.h
deleted file mode 100644
index afa5b1875da..00000000000
--- a/libjava/java/lang/UnsupportedClassVersionError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_UnsupportedClassVersionError__
-#define __java_lang_UnsupportedClassVersionError__
-
-#pragma interface
-
-#include <java/lang/ClassFormatError.h>
-
-class java::lang::UnsupportedClassVersionError : public ::java::lang::ClassFormatError
-{
-
-public:
-  UnsupportedClassVersionError();
-  UnsupportedClassVersionError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7123279212883497373LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_UnsupportedClassVersionError__
diff --git a/libjava/java/lang/UnsupportedOperationException.h b/libjava/java/lang/UnsupportedOperationException.h
deleted file mode 100644
index ce808bdedde..00000000000
--- a/libjava/java/lang/UnsupportedOperationException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_UnsupportedOperationException__
-#define __java_lang_UnsupportedOperationException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::UnsupportedOperationException : public ::java::lang::RuntimeException
-{
-
-public:
-  UnsupportedOperationException();
-  UnsupportedOperationException(::java::lang::String *);
-  UnsupportedOperationException(::java::lang::String *, ::java::lang::Throwable *);
-  UnsupportedOperationException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -1242599979055084673LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_UnsupportedOperationException__
diff --git a/libjava/java/lang/VMClassLoader.h b/libjava/java/lang/VMClassLoader.h
deleted file mode 100644
index dce7092bfce..00000000000
--- a/libjava/java/lang/VMClassLoader.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_VMClassLoader__
-#define __java_lang_VMClassLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class BootClassLoader;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-        class Permission;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::lang::VMClassLoader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMClassLoader();
-  static ::java::lang::Class * defineClass(::java::lang::ClassLoader *, ::java::lang::String *, JArray< jbyte > *, jint, jint, ::java::security::ProtectionDomain *);
-  static void resolveClass(::java::lang::Class *);
-  static ::java::lang::Class * loadClass(::java::lang::String *, jboolean);
-  static ::java::net::URL * getResource(::java::lang::String *);
-  static ::java::util::Enumeration * getResources(::java::lang::String *);
-  static ::java::lang::Package * getPackage(::java::lang::String *);
-  static JArray< ::java::lang::Package * > * getPackages();
-  static void definePackageForNative(::java::lang::String *);
-  static ::java::lang::Class * getPrimitiveClass(jchar);
-  static jboolean defaultAssertionStatus();
-  static ::java::util::Map * packageAssertionStatus();
-  static ::java::util::Map * classAssertionStatus();
-  static ::java::lang::ClassLoader * getSystemClassLoaderInternal();
-  static void initBootLoader(::java::lang::String *);
-  static void initialize(::java::lang::String *);
-  static ::java::lang::Class * nativeFindClass(::java::lang::String *);
-  static ::java::lang::ClassLoader * getSystemClassLoader();
-  static ::java::security::Permission * protectionDomainPermission;
-  static ::java::security::ProtectionDomain * unknownProtectionDomain;
-  static ::java::util::HashMap * definedPackages;
-  static ::gnu::gcj::runtime::BootClassLoader * bootLoader;
-private:
-  static ::java::util::HashSet * tried_libraries;
-  static jint lib_control;
-  static const jint LIB_FULL = 0;
-  static const jint LIB_CACHE = 1;
-  static const jint LIB_NEVER = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_VMClassLoader__
diff --git a/libjava/java/lang/VMCompiler.h b/libjava/java/lang/VMCompiler.h
deleted file mode 100644
index e81f694e196..00000000000
--- a/libjava/java/lang/VMCompiler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_VMCompiler__
-#define __java_lang_VMCompiler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace hash
-        {
-            class MD5;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::lang::VMCompiler : public ::java::lang::Object
-{
-
-public:
-  static jboolean precompiles();
-private:
-  VMCompiler();
-  static ::java::lang::Class * loadSharedLibrary(::java::lang::ClassLoader *, ::java::lang::String *, ::java::security::ProtectionDomain *, ::java::lang::String *);
-public:
-  static ::java::lang::Class * compileClass(::java::lang::ClassLoader *, ::java::lang::String *, JArray< jbyte > *, jint, jint, ::java::security::ProtectionDomain *);
-  static jboolean compileClass(::java::lang::Class *);
-  static jboolean compileClasses(::java::lang::String *);
-  static ::java::lang::Object * command(::java::lang::Object *);
-  static void enable();
-  static void disable();
-  static jboolean useCompiler;
-  static jboolean canUseCompiler;
-  static ::java::lang::String * gcjJitCompiler;
-  static ::java::lang::String * gcjJitCompilerOptions;
-  static ::java::lang::String * gcjJitTmpdir;
-private:
-  static ::java::util::WeakHashMap * sharedHelperMap;
-  static ::java::util::Vector * precompiledMapFiles;
-  static ::gnu::java::security::hash::MD5 * md5Digest;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_VMCompiler__
diff --git a/libjava/java/lang/VMDouble.h b/libjava/java/lang/VMDouble.h
deleted file mode 100644
index 76b6d50208a..00000000000
--- a/libjava/java/lang/VMDouble.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_VMDouble__
-#define __java_lang_VMDouble__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::VMDouble : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMDouble();
-public:
-  static jlong doubleToLongBits(jdouble);
-  static jlong doubleToRawLongBits(jdouble);
-  static jdouble longBitsToDouble(jlong);
-  static ::java::lang::String * toString(jdouble, jboolean);
-  static jdouble parseDouble(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_VMDouble__
diff --git a/libjava/java/lang/VMFloat.h b/libjava/java/lang/VMFloat.h
deleted file mode 100644
index 58e7ba9bbcc..00000000000
--- a/libjava/java/lang/VMFloat.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_VMFloat__
-#define __java_lang_VMFloat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::VMFloat : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMFloat();
-  static jint floatToIntBits(jfloat);
-  static jint floatToRawIntBits(jfloat);
-  static jfloat intBitsToFloat(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_VMFloat__
diff --git a/libjava/java/lang/VMThrowable.h b/libjava/java/lang/VMThrowable.h
deleted file mode 100644
index 1991b6cd8dd..00000000000
--- a/libjava/java/lang/VMThrowable.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_VMThrowable__
-#define __java_lang_VMThrowable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawDataManaged;
-    }
-  }
-}
-
-class java::lang::VMThrowable : public ::java::lang::Object
-{
-
-  VMThrowable();
-public: // actually package-private
-  static ::java::lang::VMThrowable * fillInStackTrace(::java::lang::Throwable *);
-  JArray< ::java::lang::StackTraceElement * > * getStackTrace(::java::lang::Throwable *);
-private:
-  ::gnu::gcj::RawDataManaged * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_VMThrowable__
diff --git a/libjava/java/lang/VerifyError.h b/libjava/java/lang/VerifyError.h
deleted file mode 100644
index 54aafd27ee2..00000000000
--- a/libjava/java/lang/VerifyError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_VerifyError__
-#define __java_lang_VerifyError__
-
-#pragma interface
-
-#include <java/lang/LinkageError.h>
-
-class java::lang::VerifyError : public ::java::lang::LinkageError
-{
-
-public:
-  VerifyError();
-  VerifyError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7001962396098498785LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_VerifyError__
diff --git a/libjava/java/lang/VirtualMachineError.h b/libjava/java/lang/VirtualMachineError.h
deleted file mode 100644
index 9eb04ceaabb..00000000000
--- a/libjava/java/lang/VirtualMachineError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_VirtualMachineError__
-#define __java_lang_VirtualMachineError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-
-class java::lang::VirtualMachineError : public ::java::lang::Error
-{
-
-public:
-  VirtualMachineError();
-  VirtualMachineError(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4161983926571568670LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_VirtualMachineError__
diff --git a/libjava/java/lang/Void.h b/libjava/java/lang/Void.h
deleted file mode 100644
index be277b02aaa..00000000000
--- a/libjava/java/lang/Void.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Void__
-#define __java_lang_Void__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::Void : public ::java::lang::Object
-{
-
-  Void();
-public:
-  static ::java::lang::Class * TYPE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Void__
diff --git a/libjava/java/lang/Win32Process.h b/libjava/java/lang/Win32Process.h
deleted file mode 100644
index 0b49c6e9c33..00000000000
--- a/libjava/java/lang/Win32Process.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_Win32Process__
-#define __java_lang_Win32Process__
-
-#pragma interface
-
-#include <java/lang/Process.h>
-#include <gcj/array.h>
-
-
-class java::lang::Win32Process : public ::java::lang::Process
-{
-
-public:
-  void destroy();
-  jint exitValue();
-  ::java::io::InputStream * getErrorStream();
-  ::java::io::InputStream * getInputStream();
-  ::java::io::OutputStream * getOutputStream();
-  jint waitFor();
-  Win32Process(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::io::File *);
-private:
-  jboolean hasExited();
-  void startProcess(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::io::File *);
-  void cleanup();
-  ::java::io::OutputStream * __attribute__((aligned(__alignof__( ::java::lang::Process)))) outputStream;
-  ::java::io::InputStream * inputStream;
-  ::java::io::InputStream * errorStream;
-  jint procHandle;
-  jint exitCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_Win32Process__
diff --git a/libjava/java/lang/annotation/Annotation.h b/libjava/java/lang/annotation/Annotation.h
deleted file mode 100644
index 9c9c3d7ab3b..00000000000
--- a/libjava/java/lang/annotation/Annotation.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_annotation_Annotation__
-#define __java_lang_annotation_Annotation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::annotation::Annotation : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * annotationType() = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_annotation_Annotation__
diff --git a/libjava/java/lang/annotation/AnnotationFormatError.h b/libjava/java/lang/annotation/AnnotationFormatError.h
deleted file mode 100644
index f5c43b24151..00000000000
--- a/libjava/java/lang/annotation/AnnotationFormatError.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_annotation_AnnotationFormatError__
-#define __java_lang_annotation_AnnotationFormatError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-
-class java::lang::annotation::AnnotationFormatError : public ::java::lang::Error
-{
-
-public:
-  AnnotationFormatError(::java::lang::String *);
-  AnnotationFormatError(::java::lang::String *, ::java::lang::Throwable *);
-  AnnotationFormatError(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -4256701562333669892LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_annotation_AnnotationFormatError__
diff --git a/libjava/java/lang/annotation/AnnotationTypeMismatchException.h b/libjava/java/lang/annotation/AnnotationTypeMismatchException.h
deleted file mode 100644
index 082d9f6a3c7..00000000000
--- a/libjava/java/lang/annotation/AnnotationTypeMismatchException.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_annotation_AnnotationTypeMismatchException__
-#define __java_lang_annotation_AnnotationTypeMismatchException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::annotation::AnnotationTypeMismatchException : public ::java::lang::RuntimeException
-{
-
-public:
-  AnnotationTypeMismatchException(::java::lang::reflect::Method *, ::java::lang::String *);
-  virtual ::java::lang::reflect::Method * element();
-  virtual ::java::lang::String * foundType();
-private:
-  static const jlong serialVersionUID = 8125925355765570191LL;
-  ::java::lang::reflect::Method * __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) element__;
-  ::java::lang::String * foundType__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_annotation_AnnotationTypeMismatchException__
diff --git a/libjava/java/lang/annotation/Documented.h b/libjava/java/lang/annotation/Documented.h
deleted file mode 100644
index d2a920dc72a..00000000000
--- a/libjava/java/lang/annotation/Documented.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_annotation_Documented__
-#define __java_lang_annotation_Documented__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::annotation::Documented : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * annotationType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_annotation_Documented__
diff --git a/libjava/java/lang/annotation/ElementType.h b/libjava/java/lang/annotation/ElementType.h
deleted file mode 100644
index c475967ab5d..00000000000
--- a/libjava/java/lang/annotation/ElementType.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_annotation_ElementType__
-#define __java_lang_annotation_ElementType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-
-class java::lang::annotation::ElementType : public ::java::lang::Enum
-{
-
-  ElementType(::java::lang::String *, jint);
-public:
-  static JArray< ::java::lang::annotation::ElementType * > * values();
-  static ::java::lang::annotation::ElementType * valueOf(::java::lang::String *);
-  static ::java::lang::annotation::ElementType * ANNOTATION_TYPE;
-  static ::java::lang::annotation::ElementType * CONSTRUCTOR;
-  static ::java::lang::annotation::ElementType * FIELD;
-  static ::java::lang::annotation::ElementType * LOCAL_VARIABLE;
-  static ::java::lang::annotation::ElementType * METHOD;
-  static ::java::lang::annotation::ElementType * PACKAGE;
-  static ::java::lang::annotation::ElementType * PARAMETER;
-  static ::java::lang::annotation::ElementType * TYPE;
-private:
-  static const jlong serialVersionUID = 2798216111136361587LL;
-  static JArray< ::java::lang::annotation::ElementType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_annotation_ElementType__
diff --git a/libjava/java/lang/annotation/IncompleteAnnotationException.h b/libjava/java/lang/annotation/IncompleteAnnotationException.h
deleted file mode 100644
index aff0f7e0b37..00000000000
--- a/libjava/java/lang/annotation/IncompleteAnnotationException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_annotation_IncompleteAnnotationException__
-#define __java_lang_annotation_IncompleteAnnotationException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::annotation::IncompleteAnnotationException : public ::java::lang::RuntimeException
-{
-
-public:
-  IncompleteAnnotationException(::java::lang::Class *, ::java::lang::String *);
-  virtual ::java::lang::Class * annotationType();
-  virtual ::java::lang::String * elementName();
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) annotationType__;
-  ::java::lang::String * elementName__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_annotation_IncompleteAnnotationException__
diff --git a/libjava/java/lang/annotation/Inherited.h b/libjava/java/lang/annotation/Inherited.h
deleted file mode 100644
index b1ebc883eca..00000000000
--- a/libjava/java/lang/annotation/Inherited.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_annotation_Inherited__
-#define __java_lang_annotation_Inherited__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::annotation::Inherited : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * annotationType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_annotation_Inherited__
diff --git a/libjava/java/lang/annotation/Retention.h b/libjava/java/lang/annotation/Retention.h
deleted file mode 100644
index 42fb4a542b6..00000000000
--- a/libjava/java/lang/annotation/Retention.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_annotation_Retention__
-#define __java_lang_annotation_Retention__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::annotation::Retention : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::annotation::RetentionPolicy * value() = 0;
-  virtual ::java::lang::Class * annotationType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_annotation_Retention__
diff --git a/libjava/java/lang/annotation/RetentionPolicy.h b/libjava/java/lang/annotation/RetentionPolicy.h
deleted file mode 100644
index 5d642601dc6..00000000000
--- a/libjava/java/lang/annotation/RetentionPolicy.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_annotation_RetentionPolicy__
-#define __java_lang_annotation_RetentionPolicy__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-
-class java::lang::annotation::RetentionPolicy : public ::java::lang::Enum
-{
-
-  RetentionPolicy(::java::lang::String *, jint);
-public:
-  static JArray< ::java::lang::annotation::RetentionPolicy * > * values();
-  static ::java::lang::annotation::RetentionPolicy * valueOf(::java::lang::String *);
-  static ::java::lang::annotation::RetentionPolicy * CLASS;
-  static ::java::lang::annotation::RetentionPolicy * RUNTIME;
-  static ::java::lang::annotation::RetentionPolicy * SOURCE;
-private:
-  static const jlong serialVersionUID = -1700821648800605045LL;
-  static JArray< ::java::lang::annotation::RetentionPolicy * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_annotation_RetentionPolicy__
diff --git a/libjava/java/lang/annotation/Target.h b/libjava/java/lang/annotation/Target.h
deleted file mode 100644
index 96ac5178821..00000000000
--- a/libjava/java/lang/annotation/Target.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_annotation_Target__
-#define __java_lang_annotation_Target__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::annotation::Target : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::annotation::ElementType * > * value() = 0;
-  virtual ::java::lang::Class * annotationType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_annotation_Target__
diff --git a/libjava/java/lang/instrument/ClassDefinition.h b/libjava/java/lang/instrument/ClassDefinition.h
deleted file mode 100644
index b9106ed8eee..00000000000
--- a/libjava/java/lang/instrument/ClassDefinition.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_instrument_ClassDefinition__
-#define __java_lang_instrument_ClassDefinition__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::instrument::ClassDefinition : public ::java::lang::Object
-{
-
-public:
-  ClassDefinition(::java::lang::Class *, JArray< jbyte > *);
-  ::java::lang::Class * getDefinitionClass();
-  JArray< jbyte > * getDefinitionClassFile();
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) theClass;
-  JArray< jbyte > * theClassFile;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_instrument_ClassDefinition__
diff --git a/libjava/java/lang/instrument/ClassFileTransformer.h b/libjava/java/lang/instrument/ClassFileTransformer.h
deleted file mode 100644
index cda1510b0a6..00000000000
--- a/libjava/java/lang/instrument/ClassFileTransformer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_instrument_ClassFileTransformer__
-#define __java_lang_instrument_ClassFileTransformer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::lang::instrument::ClassFileTransformer : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * transform(::java::lang::ClassLoader *, ::java::lang::String *, ::java::lang::Class *, ::java::security::ProtectionDomain *, JArray< jbyte > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_instrument_ClassFileTransformer__
diff --git a/libjava/java/lang/instrument/IllegalClassFormatException.h b/libjava/java/lang/instrument/IllegalClassFormatException.h
deleted file mode 100644
index c1b8783e777..00000000000
--- a/libjava/java/lang/instrument/IllegalClassFormatException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_instrument_IllegalClassFormatException__
-#define __java_lang_instrument_IllegalClassFormatException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::instrument::IllegalClassFormatException : public ::java::lang::Exception
-{
-
-public:
-  IllegalClassFormatException();
-  IllegalClassFormatException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3841736710924794009LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_instrument_IllegalClassFormatException__
diff --git a/libjava/java/lang/instrument/Instrumentation.h b/libjava/java/lang/instrument/Instrumentation.h
deleted file mode 100644
index d131d0c6948..00000000000
--- a/libjava/java/lang/instrument/Instrumentation.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_instrument_Instrumentation__
-#define __java_lang_instrument_Instrumentation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::instrument::Instrumentation : public ::java::lang::Object
-{
-
-public:
-  virtual void addTransformer(::java::lang::instrument::ClassFileTransformer *) = 0;
-  virtual jboolean removeTransformer(::java::lang::instrument::ClassFileTransformer *) = 0;
-  virtual jboolean isRedefineClassesSupported() = 0;
-  virtual void redefineClasses(JArray< ::java::lang::instrument::ClassDefinition * > *) = 0;
-  virtual JArray< ::java::lang::Class * > * getAllLoadedClasses() = 0;
-  virtual JArray< ::java::lang::Class * > * getInitiatedClasses(::java::lang::ClassLoader *) = 0;
-  virtual jlong getObjectSize(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_instrument_Instrumentation__
diff --git a/libjava/java/lang/instrument/UnmodifiableClassException.h b/libjava/java/lang/instrument/UnmodifiableClassException.h
deleted file mode 100644
index e5fac3cdd41..00000000000
--- a/libjava/java/lang/instrument/UnmodifiableClassException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_instrument_UnmodifiableClassException__
-#define __java_lang_instrument_UnmodifiableClassException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::instrument::UnmodifiableClassException : public ::java::lang::Exception
-{
-
-public:
-  UnmodifiableClassException();
-  UnmodifiableClassException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1716652643585309178LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_instrument_UnmodifiableClassException__
diff --git a/libjava/java/lang/management/ClassLoadingMXBean.h b/libjava/java/lang/management/ClassLoadingMXBean.h
deleted file mode 100644
index 371b63d3dd0..00000000000
--- a/libjava/java/lang/management/ClassLoadingMXBean.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_ClassLoadingMXBean__
-#define __java_lang_management_ClassLoadingMXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::management::ClassLoadingMXBean : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLoadedClassCount() = 0;
-  virtual jlong getTotalLoadedClassCount() = 0;
-  virtual jlong getUnloadedClassCount() = 0;
-  virtual jboolean isVerbose() = 0;
-  virtual void setVerbose(jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_management_ClassLoadingMXBean__
diff --git a/libjava/java/lang/management/CompilationMXBean.h b/libjava/java/lang/management/CompilationMXBean.h
deleted file mode 100644
index bbd1e0a210e..00000000000
--- a/libjava/java/lang/management/CompilationMXBean.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_CompilationMXBean__
-#define __java_lang_management_CompilationMXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::management::CompilationMXBean : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual jboolean isCompilationTimeMonitoringSupported() = 0;
-  virtual jlong getTotalCompilationTime() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_management_CompilationMXBean__
diff --git a/libjava/java/lang/management/GarbageCollectorMXBean.h b/libjava/java/lang/management/GarbageCollectorMXBean.h
deleted file mode 100644
index 35222cab065..00000000000
--- a/libjava/java/lang/management/GarbageCollectorMXBean.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_GarbageCollectorMXBean__
-#define __java_lang_management_GarbageCollectorMXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::management::GarbageCollectorMXBean : public ::java::lang::Object
-{
-
-public:
-  virtual jlong getCollectionCount() = 0;
-  virtual jlong getCollectionTime() = 0;
-  virtual JArray< ::java::lang::String * > * getMemoryPoolNames() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual jboolean isValid() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_management_GarbageCollectorMXBean__
diff --git a/libjava/java/lang/management/ManagementFactory.h b/libjava/java/lang/management/ManagementFactory.h
deleted file mode 100644
index a315333be05..00000000000
--- a/libjava/java/lang/management/ManagementFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_ManagementFactory__
-#define __java_lang_management_ManagementFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-    }
-  }
-}
-
-class java::lang::management::ManagementFactory : public ::java::lang::Object
-{
-
-  ManagementFactory();
-public:
-  static ::java::lang::management::OperatingSystemMXBean * getOperatingSystemMXBean();
-  static ::java::lang::management::RuntimeMXBean * getRuntimeMXBean();
-  static ::java::lang::management::ClassLoadingMXBean * getClassLoadingMXBean();
-  static ::java::lang::management::ThreadMXBean * getThreadMXBean();
-  static ::java::lang::management::MemoryMXBean * getMemoryMXBean();
-  static ::java::lang::management::CompilationMXBean * getCompilationMXBean();
-  static ::java::util::List * getMemoryPoolMXBeans();
-  static ::java::util::List * getMemoryManagerMXBeans();
-  static ::java::util::List * getGarbageCollectorMXBeans();
-  static ::javax::management::MBeanServer * getPlatformMBeanServer();
-  static ::java::lang::String * CLASS_LOADING_MXBEAN_NAME;
-  static ::java::lang::String * COMPILATION_MXBEAN_NAME;
-  static ::java::lang::String * GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE;
-  static ::java::lang::String * MEMORY_MANAGER_MXBEAN_DOMAIN_TYPE;
-  static ::java::lang::String * MEMORY_MXBEAN_NAME;
-  static ::java::lang::String * MEMORY_POOL_MXBEAN_DOMAIN_TYPE;
-  static ::java::lang::String * OPERATING_SYSTEM_MXBEAN_NAME;
-  static ::java::lang::String * RUNTIME_MXBEAN_NAME;
-  static ::java::lang::String * THREAD_MXBEAN_NAME;
-private:
-  static ::java::lang::management::OperatingSystemMXBean * osBean;
-  static ::java::lang::management::RuntimeMXBean * runtimeBean;
-  static ::java::lang::management::ClassLoadingMXBean * classLoadingBean;
-  static ::java::lang::management::ThreadMXBean * threadBean;
-  static ::java::lang::management::MemoryMXBean * memoryBean;
-  static ::java::lang::management::CompilationMXBean * compilationBean;
-  static ::javax::management::MBeanServer * platformServer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_management_ManagementFactory__
diff --git a/libjava/java/lang/management/ManagementPermission.h b/libjava/java/lang/management/ManagementPermission.h
deleted file mode 100644
index 4ac4a4fef4f..00000000000
--- a/libjava/java/lang/management/ManagementPermission.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_ManagementPermission__
-#define __java_lang_management_ManagementPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-
-class java::lang::management::ManagementPermission : public ::java::security::BasicPermission
-{
-
-public:
-  ManagementPermission(::java::lang::String *);
-  ManagementPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1897496590799378737LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_management_ManagementPermission__
diff --git a/libjava/java/lang/management/MemoryMXBean.h b/libjava/java/lang/management/MemoryMXBean.h
deleted file mode 100644
index 2fb70add22e..00000000000
--- a/libjava/java/lang/management/MemoryMXBean.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_MemoryMXBean__
-#define __java_lang_management_MemoryMXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::management::MemoryMXBean : public ::java::lang::Object
-{
-
-public:
-  virtual void gc() = 0;
-  virtual ::java::lang::management::MemoryUsage * getHeapMemoryUsage() = 0;
-  virtual ::java::lang::management::MemoryUsage * getNonHeapMemoryUsage() = 0;
-  virtual jint getObjectPendingFinalizationCount() = 0;
-  virtual jboolean isVerbose() = 0;
-  virtual void setVerbose(jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_management_MemoryMXBean__
diff --git a/libjava/java/lang/management/MemoryManagerMXBean.h b/libjava/java/lang/management/MemoryManagerMXBean.h
deleted file mode 100644
index 6509205a9b0..00000000000
--- a/libjava/java/lang/management/MemoryManagerMXBean.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_MemoryManagerMXBean__
-#define __java_lang_management_MemoryManagerMXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::management::MemoryManagerMXBean : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::String * > * getMemoryPoolNames() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual jboolean isValid() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_management_MemoryManagerMXBean__
diff --git a/libjava/java/lang/management/MemoryNotificationInfo.h b/libjava/java/lang/management/MemoryNotificationInfo.h
deleted file mode 100644
index 07cfefff3bb..00000000000
--- a/libjava/java/lang/management/MemoryNotificationInfo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_MemoryNotificationInfo__
-#define __java_lang_management_MemoryNotificationInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeData;
-      }
-    }
-  }
-}
-
-class java::lang::management::MemoryNotificationInfo : public ::java::lang::Object
-{
-
-public:
-  MemoryNotificationInfo(::java::lang::String *, ::java::lang::management::MemoryUsage *, jlong);
-  static ::java::lang::management::MemoryNotificationInfo * from(::javax::management::openmbean::CompositeData *);
-  virtual jlong getCount();
-  virtual ::java::lang::String * getPoolName();
-  virtual ::java::lang::management::MemoryUsage * getUsage();
-  static ::java::lang::String * MEMORY_THRESHOLD_EXCEEDED;
-  static ::java::lang::String * MEMORY_COLLECTION_THRESHOLD_EXCEEDED;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) poolName;
-  ::java::lang::management::MemoryUsage * usage;
-  jlong count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_management_MemoryNotificationInfo__
diff --git a/libjava/java/lang/management/MemoryPoolMXBean.h b/libjava/java/lang/management/MemoryPoolMXBean.h
deleted file mode 100644
index 4209d573a9d..00000000000
--- a/libjava/java/lang/management/MemoryPoolMXBean.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_MemoryPoolMXBean__
-#define __java_lang_management_MemoryPoolMXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::management::MemoryPoolMXBean : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::management::MemoryUsage * getCollectionUsage() = 0;
-  virtual jlong getCollectionUsageThreshold() = 0;
-  virtual jlong getCollectionUsageThresholdCount() = 0;
-  virtual JArray< ::java::lang::String * > * getMemoryManagerNames() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::java::lang::management::MemoryUsage * getPeakUsage() = 0;
-  virtual ::java::lang::management::MemoryType * getType() = 0;
-  virtual ::java::lang::management::MemoryUsage * getUsage() = 0;
-  virtual jlong getUsageThreshold() = 0;
-  virtual jlong getUsageThresholdCount() = 0;
-  virtual jboolean isCollectionUsageThresholdExceeded() = 0;
-  virtual jboolean isCollectionUsageThresholdSupported() = 0;
-  virtual jboolean isUsageThresholdExceeded() = 0;
-  virtual jboolean isUsageThresholdSupported() = 0;
-  virtual jboolean isValid() = 0;
-  virtual void resetPeakUsage() = 0;
-  virtual void setCollectionUsageThreshold(jlong) = 0;
-  virtual void setUsageThreshold(jlong) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_management_MemoryPoolMXBean__
diff --git a/libjava/java/lang/management/MemoryType.h b/libjava/java/lang/management/MemoryType.h
deleted file mode 100644
index b93587d308a..00000000000
--- a/libjava/java/lang/management/MemoryType.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_MemoryType__
-#define __java_lang_management_MemoryType__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-
-class java::lang::management::MemoryType : public ::java::lang::Enum
-{
-
-  MemoryType(::java::lang::String *, jint);
-public:
-  static JArray< ::java::lang::management::MemoryType * > * values();
-  static ::java::lang::management::MemoryType * valueOf(::java::lang::String *);
-  static ::java::lang::management::MemoryType * HEAP;
-  static ::java::lang::management::MemoryType * NON_HEAP;
-private:
-  static JArray< ::java::lang::management::MemoryType * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_management_MemoryType__
diff --git a/libjava/java/lang/management/MemoryUsage.h b/libjava/java/lang/management/MemoryUsage.h
deleted file mode 100644
index 3b126f8183e..00000000000
--- a/libjava/java/lang/management/MemoryUsage.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_MemoryUsage__
-#define __java_lang_management_MemoryUsage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeData;
-      }
-    }
-  }
-}
-
-class java::lang::management::MemoryUsage : public ::java::lang::Object
-{
-
-public:
-  MemoryUsage(jlong, jlong, jlong, jlong);
-  static ::java::lang::management::MemoryUsage * from(::javax::management::openmbean::CompositeData *);
-  virtual jlong getCommitted();
-  virtual jlong getInit();
-  virtual jlong getMax();
-  virtual jlong getUsed();
-  virtual ::java::lang::String * toString();
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) init;
-  jlong used;
-  jlong committed;
-  jlong maximum;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_management_MemoryUsage__
diff --git a/libjava/java/lang/management/OperatingSystemMXBean.h b/libjava/java/lang/management/OperatingSystemMXBean.h
deleted file mode 100644
index adb562cf516..00000000000
--- a/libjava/java/lang/management/OperatingSystemMXBean.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_OperatingSystemMXBean__
-#define __java_lang_management_OperatingSystemMXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::management::OperatingSystemMXBean : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getArch() = 0;
-  virtual jint getAvailableProcessors() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::java::lang::String * getVersion() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_management_OperatingSystemMXBean__
diff --git a/libjava/java/lang/management/RuntimeMXBean.h b/libjava/java/lang/management/RuntimeMXBean.h
deleted file mode 100644
index c2666744020..00000000000
--- a/libjava/java/lang/management/RuntimeMXBean.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_RuntimeMXBean__
-#define __java_lang_management_RuntimeMXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::management::RuntimeMXBean : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getBootClassPath() = 0;
-  virtual ::java::lang::String * getClassPath() = 0;
-  virtual ::java::util::List * getInputArguments() = 0;
-  virtual ::java::lang::String * getLibraryPath() = 0;
-  virtual ::java::lang::String * getManagementSpecVersion() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::java::lang::String * getSpecName() = 0;
-  virtual ::java::lang::String * getSpecVendor() = 0;
-  virtual ::java::lang::String * getSpecVersion() = 0;
-  virtual jlong getStartTime() = 0;
-  virtual ::java::util::Map * getSystemProperties() = 0;
-  virtual jlong getUptime() = 0;
-  virtual ::java::lang::String * getVmName() = 0;
-  virtual ::java::lang::String * getVmVendor() = 0;
-  virtual ::java::lang::String * getVmVersion() = 0;
-  virtual jboolean isBootClassPathSupported() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_management_RuntimeMXBean__
diff --git a/libjava/java/lang/management/ThreadInfo.h b/libjava/java/lang/management/ThreadInfo.h
deleted file mode 100644
index a06b99ce4cc..00000000000
--- a/libjava/java/lang/management/ThreadInfo.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_ThreadInfo__
-#define __java_lang_management_ThreadInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeData;
-          class CompositeType;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class java::lang::management::ThreadInfo : public ::java::lang::Object
-{
-
-  ThreadInfo(::java::lang::Thread *, jlong, jlong, ::java::lang::Object *, ::java::lang::Thread *, jlong, jlong, jboolean, jboolean, JArray< ::java::lang::StackTraceElement * > *);
-  ThreadInfo(jlong, ::java::lang::String *, ::java::lang::Thread$State *, jlong, jlong, ::java::lang::String *, jlong, ::java::lang::String *, jlong, jlong, jboolean, jboolean, JArray< ::java::lang::StackTraceElement * > *);
-public: // actually package-private
-  static void checkAttribute(::javax::management::openmbean::CompositeType *, ::java::lang::String *, ::javax::management::openmbean::OpenType *);
-public:
-  static ::java::lang::management::ThreadInfo * from(::javax::management::openmbean::CompositeData *);
-  virtual jlong getBlockedCount();
-  virtual jlong getBlockedTime();
-  virtual ::java::lang::String * getLockName();
-  virtual jlong getLockOwnerId();
-  virtual ::java::lang::String * getLockOwnerName();
-  virtual JArray< ::java::lang::StackTraceElement * > * getStackTrace();
-  virtual jlong getThreadId();
-  virtual ::java::lang::String * getThreadName();
-  virtual ::java::lang::Thread$State * getThreadState();
-  virtual jlong getWaitedCount();
-  virtual jlong getWaitedTime();
-  virtual jboolean isInNative();
-  virtual jboolean isSuspended();
-  virtual ::java::lang::String * toString();
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) threadId;
-  ::java::lang::String * threadName;
-  ::java::lang::Thread$State * threadState;
-  jlong blockedCount;
-  jlong blockedTime;
-  ::java::lang::String * lockName;
-  jlong lockOwnerId;
-  ::java::lang::String * lockOwnerName;
-  jlong waitedCount;
-  jlong waitedTime;
-  jboolean isInNative__;
-  jboolean isSuspended__;
-  JArray< ::java::lang::StackTraceElement * > * trace;
-  static ::java::lang::management::ThreadMXBean * bean;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_management_ThreadInfo__
diff --git a/libjava/java/lang/management/ThreadMXBean.h b/libjava/java/lang/management/ThreadMXBean.h
deleted file mode 100644
index a160b088149..00000000000
--- a/libjava/java/lang/management/ThreadMXBean.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_ThreadMXBean__
-#define __java_lang_management_ThreadMXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::management::ThreadMXBean : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jlong > * findMonitorDeadlockedThreads() = 0;
-  virtual JArray< jlong > * getAllThreadIds() = 0;
-  virtual jlong getCurrentThreadCpuTime() = 0;
-  virtual jlong getCurrentThreadUserTime() = 0;
-  virtual jint getDaemonThreadCount() = 0;
-  virtual jint getPeakThreadCount() = 0;
-  virtual jint getThreadCount() = 0;
-  virtual jlong getThreadCpuTime(jlong) = 0;
-  virtual ::java::lang::management::ThreadInfo * getThreadInfo(jlong) = 0;
-  virtual JArray< ::java::lang::management::ThreadInfo * > * getThreadInfo(JArray< jlong > *) = 0;
-  virtual ::java::lang::management::ThreadInfo * getThreadInfo(jlong, jint) = 0;
-  virtual JArray< ::java::lang::management::ThreadInfo * > * getThreadInfo(JArray< jlong > *, jint) = 0;
-  virtual jlong getThreadUserTime(jlong) = 0;
-  virtual jlong getTotalStartedThreadCount() = 0;
-  virtual jboolean isCurrentThreadCpuTimeSupported() = 0;
-  virtual jboolean isThreadContentionMonitoringEnabled() = 0;
-  virtual jboolean isThreadContentionMonitoringSupported() = 0;
-  virtual jboolean isThreadCpuTimeEnabled() = 0;
-  virtual jboolean isThreadCpuTimeSupported() = 0;
-  virtual void resetPeakThreadCount() = 0;
-  virtual void setThreadContentionMonitoringEnabled(jboolean) = 0;
-  virtual void setThreadCpuTimeEnabled(jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_management_ThreadMXBean__
diff --git a/libjava/java/lang/management/VMManagementFactory.h b/libjava/java/lang/management/VMManagementFactory.h
deleted file mode 100644
index e712cbfc871..00000000000
--- a/libjava/java/lang/management/VMManagementFactory.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_management_VMManagementFactory__
-#define __java_lang_management_VMManagementFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::management::VMManagementFactory : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMManagementFactory();
-  static JArray< ::java::lang::String * > * getMemoryPoolNames();
-  static JArray< ::java::lang::String * > * getMemoryManagerNames();
-  static JArray< ::java::lang::String * > * getGarbageCollectorNames();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_management_VMManagementFactory__
diff --git a/libjava/java/lang/ref/PhantomReference.h b/libjava/java/lang/ref/PhantomReference.h
deleted file mode 100644
index 0c8a823d4f8..00000000000
--- a/libjava/java/lang/ref/PhantomReference.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ref_PhantomReference__
-#define __java_lang_ref_PhantomReference__
-
-#pragma interface
-
-#include <java/lang/ref/Reference.h>
-
-class java::lang::ref::PhantomReference : public ::java::lang::ref::Reference
-{
-
-public:
-  PhantomReference(::java::lang::Object *, ::java::lang::ref::ReferenceQueue *);
-  virtual ::java::lang::Object * get();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ref_PhantomReference__
diff --git a/libjava/java/lang/ref/Reference.h b/libjava/java/lang/ref/Reference.h
deleted file mode 100644
index 3eeaf65c645..00000000000
--- a/libjava/java/lang/ref/Reference.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ref_Reference__
-#define __java_lang_ref_Reference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-}
-
-class java::lang::ref::Reference : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Reference(::java::lang::Object *);
-  Reference(::java::lang::Object *, ::java::lang::ref::ReferenceQueue *);
-private:
-  void create(::java::lang::Object *);
-public:
-  virtual ::java::lang::Object * get();
-  virtual void clear();
-  virtual jboolean isEnqueued();
-  virtual jboolean enqueue();
-public: // actually package-private
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) referent;
-  ::gnu::gcj::RawData * copy;
-  jboolean cleared;
-  ::java::lang::ref::ReferenceQueue * queue;
-  ::java::lang::ref::Reference * nextOnQueue;
-  static ::java::lang::Object * lock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ref_Reference__
diff --git a/libjava/java/lang/ref/ReferenceQueue.h b/libjava/java/lang/ref/ReferenceQueue.h
deleted file mode 100644
index bd4a9d8b71d..00000000000
--- a/libjava/java/lang/ref/ReferenceQueue.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ref_ReferenceQueue__
-#define __java_lang_ref_ReferenceQueue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::ref::ReferenceQueue : public ::java::lang::Object
-{
-
-public:
-  ReferenceQueue();
-  virtual ::java::lang::ref::Reference * poll();
-public: // actually package-private
-  virtual jboolean enqueue(::java::lang::ref::Reference *);
-private:
-  ::java::lang::ref::Reference * dequeue();
-public:
-  virtual ::java::lang::ref::Reference * remove(jlong);
-  virtual ::java::lang::ref::Reference * remove();
-private:
-  ::java::lang::ref::Reference * __attribute__((aligned(__alignof__( ::java::lang::Object)))) first;
-  ::java::lang::Object * lock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ref_ReferenceQueue__
diff --git a/libjava/java/lang/ref/SoftReference.h b/libjava/java/lang/ref/SoftReference.h
deleted file mode 100644
index faa98e7bd62..00000000000
--- a/libjava/java/lang/ref/SoftReference.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ref_SoftReference__
-#define __java_lang_ref_SoftReference__
-
-#pragma interface
-
-#include <java/lang/ref/Reference.h>
-
-class java::lang::ref::SoftReference : public ::java::lang::ref::Reference
-{
-
-public:
-  SoftReference(::java::lang::Object *);
-  SoftReference(::java::lang::Object *, ::java::lang::ref::ReferenceQueue *);
-  virtual ::java::lang::Object * get();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ref_SoftReference__
diff --git a/libjava/java/lang/ref/WeakReference.h b/libjava/java/lang/ref/WeakReference.h
deleted file mode 100644
index b540274d3f3..00000000000
--- a/libjava/java/lang/ref/WeakReference.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_ref_WeakReference__
-#define __java_lang_ref_WeakReference__
-
-#pragma interface
-
-#include <java/lang/ref/Reference.h>
-
-class java::lang::ref::WeakReference : public ::java::lang::ref::Reference
-{
-
-public:
-  WeakReference(::java::lang::Object *);
-  WeakReference(::java::lang::Object *, ::java::lang::ref::ReferenceQueue *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_ref_WeakReference__
diff --git a/libjava/java/lang/reflect/AccessibleObject.h b/libjava/java/lang/reflect/AccessibleObject.h
deleted file mode 100644
index d140e300c58..00000000000
--- a/libjava/java/lang/reflect/AccessibleObject.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_AccessibleObject__
-#define __java_lang_reflect_AccessibleObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::AccessibleObject : public ::java::lang::Object
-{
-
-public: // actually protected
-  AccessibleObject();
-public:
-  virtual jboolean isAccessible();
-  static void setAccessible(JArray< ::java::lang::reflect::AccessibleObject * > *, jboolean);
-  virtual void setAccessible(jboolean);
-private:
-  static void checkPermission();
-  void secureSetAccessible(jboolean);
-public:
-  virtual ::java::lang::annotation::Annotation * getAnnotation(::java::lang::Class *);
-  virtual JArray< ::java::lang::annotation::Annotation * > * getAnnotations();
-  virtual JArray< ::java::lang::annotation::Annotation * > * getDeclaredAnnotations();
-  virtual jboolean isAnnotationPresent(::java::lang::Class *);
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) flag;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_AccessibleObject__
diff --git a/libjava/java/lang/reflect/AnnotatedElement.h b/libjava/java/lang/reflect/AnnotatedElement.h
deleted file mode 100644
index 5792b75e0cc..00000000000
--- a/libjava/java/lang/reflect/AnnotatedElement.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_AnnotatedElement__
-#define __java_lang_reflect_AnnotatedElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::AnnotatedElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::annotation::Annotation * getAnnotation(::java::lang::Class *) = 0;
-  virtual JArray< ::java::lang::annotation::Annotation * > * getAnnotations() = 0;
-  virtual JArray< ::java::lang::annotation::Annotation * > * getDeclaredAnnotations() = 0;
-  virtual jboolean isAnnotationPresent(::java::lang::Class *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_reflect_AnnotatedElement__
diff --git a/libjava/java/lang/reflect/Array.h b/libjava/java/lang/reflect/Array.h
deleted file mode 100644
index 48df7d3fa50..00000000000
--- a/libjava/java/lang/reflect/Array.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Array__
-#define __java_lang_reflect_Array__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::Array : public ::java::lang::Object
-{
-
-  Array();
-public:
-  static ::java::lang::Object * newInstance(::java::lang::Class *, jint);
-  static ::java::lang::Object * newInstance(::java::lang::Class *, JArray< jint > *);
-  static jint getLength(::java::lang::Object *);
-  static ::java::lang::Object * get(::java::lang::Object *, jint);
-  static jboolean getBoolean(::java::lang::Object *, jint);
-  static jbyte getByte(::java::lang::Object *, jint);
-  static jchar getChar(::java::lang::Object *, jint);
-  static jshort getShort(::java::lang::Object *, jint);
-  static jint getInt(::java::lang::Object *, jint);
-  static jlong getLong(::java::lang::Object *, jint);
-  static jfloat getFloat(::java::lang::Object *, jint);
-  static jdouble getDouble(::java::lang::Object *, jint);
-private:
-  static ::java::lang::Class * getElementType(::java::lang::Object *, jint);
-  static void set(::java::lang::Object *, jint, ::java::lang::Object *, ::java::lang::Class *);
-public:
-  static void set(::java::lang::Object *, jint, ::java::lang::Object *);
-  static void setBoolean(::java::lang::Object *, jint, jboolean);
-  static void setByte(::java::lang::Object *, jint, jbyte);
-  static void setChar(::java::lang::Object *, jint, jchar);
-  static void setShort(::java::lang::Object *, jint, jshort);
-  static void setInt(::java::lang::Object *, jint, jint);
-  static void setLong(::java::lang::Object *, jint, jlong);
-  static void setFloat(::java::lang::Object *, jint, jfloat);
-  static void setDouble(::java::lang::Object *, jint, jdouble);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_Array__
diff --git a/libjava/java/lang/reflect/Constructor.h b/libjava/java/lang/reflect/Constructor.h
deleted file mode 100644
index 5a200bc114d..00000000000
--- a/libjava/java/lang/reflect/Constructor.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Constructor__
-#define __java_lang_reflect_Constructor__
-
-#pragma interface
-
-#include <java/lang/reflect/AccessibleObject.h>
-#include <gcj/array.h>
-
-
-jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);
-jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);
-
-class java::lang::reflect::Constructor : public ::java::lang::reflect::AccessibleObject
-{
-
-  Constructor();
-public:
-  ::java::lang::Class * getDeclaringClass();
-  ::java::lang::String * getName();
-private:
-  jint getModifiersInternal();
-public:
-  jint getModifiers();
-  jboolean isSynthetic();
-  jboolean isVarArgs();
-  JArray< ::java::lang::Class * > * getParameterTypes();
-  JArray< ::java::lang::Class * > * getExceptionTypes();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-public: // actually package-private
-  static void addTypeParameters(::java::lang::StringBuilder *, JArray< ::java::lang::reflect::TypeVariable * > *);
-public:
-  ::java::lang::String * toGenericString();
-  ::java::lang::Object * newInstance(JArray< ::java::lang::Object * > *);
-  JArray< ::java::lang::reflect::TypeVariable * > * getTypeParameters();
-private:
-  ::java::lang::String * getSignature();
-public:
-  JArray< ::java::lang::reflect::Type * > * getGenericExceptionTypes();
-  JArray< ::java::lang::reflect::Type * > * getGenericParameterTypes();
-  ::java::lang::annotation::Annotation * getAnnotation(::java::lang::Class *);
-  JArray< ::java::lang::annotation::Annotation * > * getDeclaredAnnotations();
-  JArray< JArray< ::java::lang::annotation::Annotation * > * > * getParameterAnnotations();
-private:
-  JArray< ::java::lang::annotation::Annotation * > * getDeclaredAnnotationsInternal();
-  JArray< JArray< ::java::lang::annotation::Annotation * > * > * getParameterAnnotationsInternal();
-  void getType();
-  static const jint CONSTRUCTOR_MODIFIERS = 7;
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::reflect::AccessibleObject)))) declaringClass;
-  JArray< ::java::lang::Class * > * exception_types;
-  JArray< ::java::lang::Class * > * parameter_types;
-  jint offset;
-public:
-  static ::java::lang::Class class$;
-
-  friend jmethodID (::_Jv_FromReflectedConstructor) (java::lang::reflect::Constructor *);
-  friend jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);
-  friend class java::lang::Class;
-};
-
-#endif // __java_lang_reflect_Constructor__
diff --git a/libjava/java/lang/reflect/Field.h b/libjava/java/lang/reflect/Field.h
deleted file mode 100644
index 3e39fb2bad1..00000000000
--- a/libjava/java/lang/reflect/Field.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Field__
-#define __java_lang_reflect_Field__
-
-#pragma interface
-
-#include <java/lang/reflect/AccessibleObject.h>
-#include <gcj/array.h>
-
-
-jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);
-jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);
-
-class java::lang::reflect::Field : public ::java::lang::reflect::AccessibleObject
-{
-
-public: // actually package-private
-  Field();
-public:
-  ::java::lang::Class * getDeclaringClass();
-  ::java::lang::String * getName();
-private:
-  jint getModifiersInternal();
-public:
-  jint getModifiers();
-  jboolean isSynthetic();
-  jboolean isEnumConstant();
-  ::java::lang::Class * getType();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-  ::java::lang::String * toGenericString();
-  ::java::lang::Object * get(::java::lang::Object *);
-  jboolean getBoolean(::java::lang::Object *);
-  jbyte getByte(::java::lang::Object *);
-  jchar getChar(::java::lang::Object *);
-  jshort getShort(::java::lang::Object *);
-  jint getInt(::java::lang::Object *);
-  jlong getLong(::java::lang::Object *);
-  jfloat getFloat(::java::lang::Object *);
-  jdouble getDouble(::java::lang::Object *);
-private:
-  jboolean getBoolean(::java::lang::Class *, ::java::lang::Object *);
-  jchar getChar(::java::lang::Class *, ::java::lang::Object *);
-  jbyte getByte(::java::lang::Class *, ::java::lang::Object *);
-  jshort getShort(::java::lang::Class *, ::java::lang::Object *);
-  jint getInt(::java::lang::Class *, ::java::lang::Object *);
-  jlong getLong(::java::lang::Class *, ::java::lang::Object *);
-  jfloat getFloat(::java::lang::Class *, ::java::lang::Object *);
-  jdouble getDouble(::java::lang::Class *, ::java::lang::Object *);
-  ::java::lang::Object * get(::java::lang::Class *, ::java::lang::Object *);
-public:
-  void set(::java::lang::Object *, ::java::lang::Object *);
-  void setBoolean(::java::lang::Object *, jboolean);
-  void setByte(::java::lang::Object *, jbyte);
-  void setChar(::java::lang::Object *, jchar);
-  void setShort(::java::lang::Object *, jshort);
-  void setInt(::java::lang::Object *, jint);
-  void setLong(::java::lang::Object *, jlong);
-  void setFloat(::java::lang::Object *, jfloat);
-  void setDouble(::java::lang::Object *, jdouble);
-  ::java::lang::reflect::Type * getGenericType();
-  ::java::lang::annotation::Annotation * getAnnotation(::java::lang::Class *);
-  JArray< ::java::lang::annotation::Annotation * > * getDeclaredAnnotations();
-private:
-  JArray< ::java::lang::annotation::Annotation * > * getDeclaredAnnotationsInternal();
-  ::java::lang::String * getSignature();
-public: // actually package-private
-  void setByte(::java::lang::Class *, ::java::lang::Object *, jbyte, jboolean);
-  void setShort(::java::lang::Class *, ::java::lang::Object *, jshort, jboolean);
-  void setInt(::java::lang::Class *, ::java::lang::Object *, jint, jboolean);
-  void setLong(::java::lang::Class *, ::java::lang::Object *, jlong, jboolean);
-  void setFloat(::java::lang::Class *, ::java::lang::Object *, jfloat, jboolean);
-  void setDouble(::java::lang::Class *, ::java::lang::Object *, jdouble, jboolean);
-  void setChar(::java::lang::Class *, ::java::lang::Object *, jchar, jboolean);
-  void setBoolean(::java::lang::Class *, ::java::lang::Object *, jboolean, jboolean);
-  void set(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *, ::java::lang::Class *, jboolean);
-private:
-  void set(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *);
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::reflect::AccessibleObject)))) declaringClass;
-  ::java::lang::String * name;
-  jint offset;
-  ::java::lang::Class * type;
-public: // actually package-private
-  static const jint FIELD_MODIFIERS = 223;
-public:
-  static ::java::lang::Class class$;
-
-  friend jfieldID (::_Jv_FromReflectedField) (java::lang::reflect::Field *);
-  friend jobject (::_Jv_JNI_ToReflectedField) (_Jv_JNIEnv*, jclass, jfieldID, jboolean);
-  friend class java::lang::Class;
-};
-
-#endif // __java_lang_reflect_Field__
diff --git a/libjava/java/lang/reflect/GenericArrayType.h b/libjava/java/lang/reflect/GenericArrayType.h
deleted file mode 100644
index cdeb0b2a328..00000000000
--- a/libjava/java/lang/reflect/GenericArrayType.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_GenericArrayType__
-#define __java_lang_reflect_GenericArrayType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::reflect::GenericArrayType : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::reflect::Type * getGenericComponentType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_reflect_GenericArrayType__
diff --git a/libjava/java/lang/reflect/GenericDeclaration.h b/libjava/java/lang/reflect/GenericDeclaration.h
deleted file mode 100644
index 5c484ea96ea..00000000000
--- a/libjava/java/lang/reflect/GenericDeclaration.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_GenericDeclaration__
-#define __java_lang_reflect_GenericDeclaration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::GenericDeclaration : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::reflect::TypeVariable * > * getTypeParameters() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_reflect_GenericDeclaration__
diff --git a/libjava/java/lang/reflect/GenericSignatureFormatError.h b/libjava/java/lang/reflect/GenericSignatureFormatError.h
deleted file mode 100644
index c46c9264ad3..00000000000
--- a/libjava/java/lang/reflect/GenericSignatureFormatError.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_GenericSignatureFormatError__
-#define __java_lang_reflect_GenericSignatureFormatError__
-
-#pragma interface
-
-#include <java/lang/ClassFormatError.h>
-
-class java::lang::reflect::GenericSignatureFormatError : public ::java::lang::ClassFormatError
-{
-
-public:
-  GenericSignatureFormatError();
-private:
-  static const jlong serialVersionUID = 6709919147137911034LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_GenericSignatureFormatError__
diff --git a/libjava/java/lang/reflect/InvocationHandler.h b/libjava/java/lang/reflect/InvocationHandler.h
deleted file mode 100644
index 7221953217a..00000000000
--- a/libjava/java/lang/reflect/InvocationHandler.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_InvocationHandler__
-#define __java_lang_reflect_InvocationHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::InvocationHandler : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_reflect_InvocationHandler__
diff --git a/libjava/java/lang/reflect/InvocationTargetException.h b/libjava/java/lang/reflect/InvocationTargetException.h
deleted file mode 100644
index 37e229c2957..00000000000
--- a/libjava/java/lang/reflect/InvocationTargetException.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_InvocationTargetException__
-#define __java_lang_reflect_InvocationTargetException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::lang::reflect::InvocationTargetException : public ::java::lang::Exception
-{
-
-public: // actually protected
-  InvocationTargetException();
-public:
-  InvocationTargetException(::java::lang::Throwable *);
-  InvocationTargetException(::java::lang::Throwable *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getTargetException();
-  virtual ::java::lang::Throwable * getCause();
-private:
-  static const jlong serialVersionUID = 4085088731926701167LL;
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) target;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_InvocationTargetException__
diff --git a/libjava/java/lang/reflect/MalformedParameterizedTypeException.h b/libjava/java/lang/reflect/MalformedParameterizedTypeException.h
deleted file mode 100644
index a48f669c0c1..00000000000
--- a/libjava/java/lang/reflect/MalformedParameterizedTypeException.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_MalformedParameterizedTypeException__
-#define __java_lang_reflect_MalformedParameterizedTypeException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::reflect::MalformedParameterizedTypeException : public ::java::lang::RuntimeException
-{
-
-public:
-  MalformedParameterizedTypeException();
-private:
-  static const jlong serialVersionUID = -5696557788586220964LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_MalformedParameterizedTypeException__
diff --git a/libjava/java/lang/reflect/Member.h b/libjava/java/lang/reflect/Member.h
deleted file mode 100644
index 9e3522be0d6..00000000000
--- a/libjava/java/lang/reflect/Member.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Member__
-#define __java_lang_reflect_Member__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::reflect::Member : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getDeclaringClass() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual jint getModifiers() = 0;
-  virtual jboolean isSynthetic() = 0;
-  static const jint DECLARED = 1;
-  static const jint PUBLIC = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_reflect_Member__
diff --git a/libjava/java/lang/reflect/Method.h b/libjava/java/lang/reflect/Method.h
deleted file mode 100644
index 7d4b46d3e27..00000000000
--- a/libjava/java/lang/reflect/Method.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Method__
-#define __java_lang_reflect_Method__
-
-#pragma interface
-
-#include <java/lang/reflect/AccessibleObject.h>
-#include <gcj/array.h>
-
-
-jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);
-jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);
-
-class java::lang::reflect::Method : public ::java::lang::reflect::AccessibleObject
-{
-
-  Method();
-public:
-  ::java::lang::Class * getDeclaringClass();
-  ::java::lang::String * getName();
-private:
-  jint getModifiersInternal();
-public:
-  jint getModifiers();
-  jboolean isBridge();
-  jboolean isSynthetic();
-  jboolean isVarArgs();
-  ::java::lang::Class * getReturnType();
-  JArray< ::java::lang::Class * > * getParameterTypes();
-  JArray< ::java::lang::Class * > * getExceptionTypes();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-  ::java::lang::String * toGenericString();
-  ::java::lang::Object * invoke(::java::lang::Object *, JArray< ::java::lang::Object * > *);
-  JArray< ::java::lang::reflect::TypeVariable * > * getTypeParameters();
-private:
-  ::java::lang::String * getSignature();
-public:
-  JArray< ::java::lang::reflect::Type * > * getGenericExceptionTypes();
-  JArray< ::java::lang::reflect::Type * > * getGenericParameterTypes();
-  ::java::lang::reflect::Type * getGenericReturnType();
-  ::java::lang::Object * getDefaultValue();
-  ::java::lang::annotation::Annotation * getAnnotation(::java::lang::Class *);
-  JArray< ::java::lang::annotation::Annotation * > * getDeclaredAnnotations();
-  JArray< JArray< ::java::lang::annotation::Annotation * > * > * getParameterAnnotations();
-private:
-  JArray< ::java::lang::annotation::Annotation * > * getDeclaredAnnotationsInternal();
-  JArray< JArray< ::java::lang::annotation::Annotation * > * > * getParameterAnnotationsInternal();
-  void getType();
-public: // actually package-private
-  static void appendClassName(::java::lang::StringBuffer *, ::java::lang::Class *);
-  static const jint METHOD_MODIFIERS = 3391;
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::reflect::AccessibleObject)))) declaringClass;
-public: // actually package-private
-  JArray< ::java::lang::Class * > * exception_types;
-private:
-  ::java::lang::String * name;
-public: // actually package-private
-  JArray< ::java::lang::Class * > * parameter_types;
-  ::java::lang::Class * return_type;
-private:
-  jint offset;
-public:
-  static ::java::lang::Class class$;
-
-  friend jmethodID (::_Jv_FromReflectedMethod) (java::lang::reflect::Method *);
-  friend jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);
-  friend class java::lang::Class;
-  friend class java::io::ObjectInputStream;
-};
-
-#endif // __java_lang_reflect_Method__
diff --git a/libjava/java/lang/reflect/Modifier.h b/libjava/java/lang/reflect/Modifier.h
deleted file mode 100644
index 4ee474a9500..00000000000
--- a/libjava/java/lang/reflect/Modifier.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Modifier__
-#define __java_lang_reflect_Modifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::reflect::Modifier : public ::java::lang::Object
-{
-
-public:
-  Modifier();
-  static jboolean isAbstract(jint);
-  static jboolean isFinal(jint);
-  static jboolean isInterface(jint);
-  static jboolean isNative(jint);
-  static jboolean isPrivate(jint);
-  static jboolean isProtected(jint);
-  static jboolean isPublic(jint);
-  static jboolean isStatic(jint);
-  static jboolean isStrict(jint);
-  static jboolean isSynchronized(jint);
-  static jboolean isTransient(jint);
-  static jboolean isVolatile(jint);
-  static ::java::lang::String * toString(jint);
-public: // actually package-private
-  static ::java::lang::StringBuilder * toString(jint, ::java::lang::StringBuilder *);
-  static ::java::lang::StringBuffer * toString(jint, ::java::lang::StringBuffer *);
-public:
-  static const jint PUBLIC = 1;
-  static const jint PRIVATE = 2;
-  static const jint PROTECTED = 4;
-  static const jint STATIC = 8;
-  static const jint FINAL = 16;
-  static const jint SYNCHRONIZED = 32;
-  static const jint VOLATILE = 64;
-  static const jint TRANSIENT = 128;
-  static const jint NATIVE = 256;
-  static const jint INTERFACE = 512;
-  static const jint ABSTRACT = 1024;
-  static const jint STRICT = 2048;
-public: // actually package-private
-  static const jint SUPER = 32;
-  static const jint ALL_FLAGS = 4095;
-  static const jint BRIDGE = 64;
-  static const jint VARARGS = 128;
-  static const jint SYNTHETIC = 4096;
-  static const jint ENUM = 16384;
-  static const jint INVISIBLE = 32768;
-  static const jint INTERPRETED = 4096;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_Modifier__
diff --git a/libjava/java/lang/reflect/ParameterizedType.h b/libjava/java/lang/reflect/ParameterizedType.h
deleted file mode 100644
index dab9ad953b6..00000000000
--- a/libjava/java/lang/reflect/ParameterizedType.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_ParameterizedType__
-#define __java_lang_reflect_ParameterizedType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::ParameterizedType : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::reflect::Type * > * getActualTypeArguments() = 0;
-  virtual ::java::lang::reflect::Type * getOwnerType() = 0;
-  virtual ::java::lang::reflect::Type * getRawType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_reflect_ParameterizedType__
diff --git a/libjava/java/lang/reflect/Proxy$ClassFactory.h b/libjava/java/lang/reflect/Proxy$ClassFactory.h
deleted file mode 100644
index c4cfb883d4c..00000000000
--- a/libjava/java/lang/reflect/Proxy$ClassFactory.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Proxy$ClassFactory__
-#define __java_lang_reflect_Proxy$ClassFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::Proxy$ClassFactory : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Proxy$ClassFactory(::java::lang::reflect::Proxy$ProxyData *);
-private:
-  void emitMethod(jint, JArray< ::java::lang::Class * > *);
-public: // actually package-private
-  ::java::lang::Class * generate(::java::lang::ClassLoader *);
-private:
-  void putU1(jint);
-  void putU2(jint);
-  void putU4(jint);
-  void putConst(jint);
-  void putLoad(jint, ::java::lang::Class *);
-  ::java::lang::String * wrapper(::java::lang::Class *);
-  jchar utf8Info(::java::lang::String *);
-  jchar classInfo(::java::lang::String *);
-  jchar classInfo(::java::lang::Class *);
-  jchar refInfo(jbyte, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  jchar nameAndTypeInfo(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * toUtf8(::java::lang::String *);
-  jchar poolIndex(::java::lang::String *);
-  static const jbyte FIELD = 1;
-  static const jbyte METHOD = 2;
-  static const jbyte INTERFACE = 3;
-  static ::java::lang::String * CTOR_SIG;
-  static ::java::lang::String * INVOKE_SIG;
-  static const jchar ACONST_NULL = 1;
-  static const jchar ICONST_0 = 3;
-  static const jchar BIPUSH = 16;
-  static const jchar SIPUSH = 17;
-  static const jchar ILOAD = 21;
-  static const jchar ILOAD_0 = 26;
-  static const jchar ALOAD_0 = 42;
-  static const jchar ALOAD_1 = 43;
-  static const jchar AALOAD = 50;
-  static const jchar AASTORE = 83;
-  static const jchar DUP = 89;
-  static const jchar DUP_X1 = 90;
-  static const jchar SWAP = 95;
-  static const jchar IRETURN = 172;
-  static const jchar LRETURN = 173;
-  static const jchar FRETURN = 174;
-  static const jchar DRETURN = 175;
-  static const jchar ARETURN = 176;
-  static const jchar RETURN = 177;
-  static const jchar GETSTATIC = 178;
-  static const jchar GETFIELD = 180;
-  static const jchar INVOKEVIRTUAL = 182;
-  static const jchar INVOKESPECIAL = 183;
-  static const jchar INVOKEINTERFACE = 185;
-  static const jchar NEW = 187;
-  static const jchar ANEWARRAY = 189;
-  static const jchar ATHROW = 191;
-  static const jchar CHECKCAST = 192;
-  ::java::lang::StringBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pool;
-  ::java::lang::StringBuffer * stream;
-  ::java::util::Map * poolEntries;
-  ::java::lang::String * qualName;
-  JArray< ::java::lang::reflect::Method * > * methods;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_Proxy$ClassFactory__
diff --git a/libjava/java/lang/reflect/Proxy$ProxyData.h b/libjava/java/lang/reflect/Proxy$ProxyData.h
deleted file mode 100644
index 2c0d91e5e5a..00000000000
--- a/libjava/java/lang/reflect/Proxy$ProxyData.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Proxy$ProxyData__
-#define __java_lang_reflect_Proxy$ProxyData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::Proxy$ProxyData : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Proxy$ProxyData();
-private:
-  static ::java::lang::String * getPackage(::java::lang::Class *);
-public: // actually package-private
-  static ::java::lang::reflect::Proxy$ProxyData * getProxyData(::java::lang::reflect::Proxy$ProxyType *);
-private:
-  static jboolean isCoreObjectMethod(::java::lang::reflect::Method *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pack;
-  JArray< ::java::lang::Class * > * interfaces;
-  JArray< ::java::lang::reflect::Method * > * methods;
-  JArray< JArray< ::java::lang::Class * > * > * exceptions;
-private:
-  static jint count;
-public: // actually package-private
-  jint id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_Proxy$ProxyData__
diff --git a/libjava/java/lang/reflect/Proxy$ProxySignature.h b/libjava/java/lang/reflect/Proxy$ProxySignature.h
deleted file mode 100644
index ae0f028deb0..00000000000
--- a/libjava/java/lang/reflect/Proxy$ProxySignature.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Proxy$ProxySignature__
-#define __java_lang_reflect_Proxy$ProxySignature__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::reflect::Proxy$ProxySignature : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Proxy$ProxySignature(::java::lang::reflect::Method *);
-  void checkCompatibility(::java::lang::reflect::Proxy$ProxySignature *);
-public:
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  static ::java::util::HashMap * coreMethods;
-  ::java::lang::reflect::Method * __attribute__((aligned(__alignof__( ::java::lang::Object)))) method;
-  ::java::util::Set * exceptions;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_Proxy$ProxySignature__
diff --git a/libjava/java/lang/reflect/Proxy$ProxyType.h b/libjava/java/lang/reflect/Proxy$ProxyType.h
deleted file mode 100644
index da7653539f4..00000000000
--- a/libjava/java/lang/reflect/Proxy$ProxyType.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Proxy$ProxyType__
-#define __java_lang_reflect_Proxy$ProxyType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::Proxy$ProxyType : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Proxy$ProxyType(::java::lang::ClassLoader *, JArray< ::java::lang::Class * > *);
-public:
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loader;
-  JArray< ::java::lang::Class * > * interfaces;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_Proxy$ProxyType__
diff --git a/libjava/java/lang/reflect/Proxy.h b/libjava/java/lang/reflect/Proxy.h
deleted file mode 100644
index 4dad2cffd2d..00000000000
--- a/libjava/java/lang/reflect/Proxy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Proxy__
-#define __java_lang_reflect_Proxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::Proxy : public ::java::lang::Object
-{
-
-public: // actually protected
-  Proxy(::java::lang::reflect::InvocationHandler *);
-public:
-  static ::java::lang::Class * getProxyClass(::java::lang::ClassLoader *, JArray< ::java::lang::Class * > *);
-  static ::java::lang::Object * newProxyInstance(::java::lang::ClassLoader *, JArray< ::java::lang::Class * > *, ::java::lang::reflect::InvocationHandler *);
-  static jboolean isProxyClass(::java::lang::Class *);
-  static ::java::lang::reflect::InvocationHandler * getInvocationHandler(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -2222568056686623797LL;
-  static ::java::util::Map * proxyClasses;
-public: // actually protected
-  ::java::lang::reflect::InvocationHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) h;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_Proxy__
diff --git a/libjava/java/lang/reflect/ReflectPermission.h b/libjava/java/lang/reflect/ReflectPermission.h
deleted file mode 100644
index 0e6a7c32e79..00000000000
--- a/libjava/java/lang/reflect/ReflectPermission.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_ReflectPermission__
-#define __java_lang_reflect_ReflectPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-
-class java::lang::reflect::ReflectPermission : public ::java::security::BasicPermission
-{
-
-public:
-  ReflectPermission(::java::lang::String *);
-  ReflectPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7412737110241507485LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_ReflectPermission__
diff --git a/libjava/java/lang/reflect/Type.h b/libjava/java/lang/reflect/Type.h
deleted file mode 100644
index 55c317fa425..00000000000
--- a/libjava/java/lang/reflect/Type.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_Type__
-#define __java_lang_reflect_Type__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::lang::reflect::Type : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_reflect_Type__
diff --git a/libjava/java/lang/reflect/TypeVariable.h b/libjava/java/lang/reflect/TypeVariable.h
deleted file mode 100644
index 6029c01903d..00000000000
--- a/libjava/java/lang/reflect/TypeVariable.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_TypeVariable__
-#define __java_lang_reflect_TypeVariable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::TypeVariable : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::reflect::Type * > * getBounds() = 0;
-  virtual ::java::lang::reflect::GenericDeclaration * getGenericDeclaration() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_reflect_TypeVariable__
diff --git a/libjava/java/lang/reflect/UndeclaredThrowableException.h b/libjava/java/lang/reflect/UndeclaredThrowableException.h
deleted file mode 100644
index 01b969b0e43..00000000000
--- a/libjava/java/lang/reflect/UndeclaredThrowableException.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_UndeclaredThrowableException__
-#define __java_lang_reflect_UndeclaredThrowableException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::lang::reflect::UndeclaredThrowableException : public ::java::lang::RuntimeException
-{
-
-public:
-  UndeclaredThrowableException(::java::lang::Throwable *);
-  UndeclaredThrowableException(::java::lang::Throwable *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getUndeclaredThrowable();
-  virtual ::java::lang::Throwable * getCause();
-private:
-  static const jlong serialVersionUID = 330127114055056639LL;
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) undeclaredThrowable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_UndeclaredThrowableException__
diff --git a/libjava/java/lang/reflect/VMProxy.h b/libjava/java/lang/reflect/VMProxy.h
deleted file mode 100644
index e48e8e4e875..00000000000
--- a/libjava/java/lang/reflect/VMProxy.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_VMProxy__
-#define __java_lang_reflect_VMProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::VMProxy : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMProxy();
-  static ::java::lang::Class * getProxyClass(::java::lang::ClassLoader *, JArray< ::java::lang::Class * > *);
-  static ::java::lang::reflect::Proxy$ProxyData * getProxyData(::java::lang::ClassLoader *, JArray< ::java::lang::Class * > *);
-  static ::java::lang::Class * generateProxyClass(::java::lang::ClassLoader *, ::java::lang::reflect::Proxy$ProxyData *);
-  static jboolean HAVE_NATIVE_GET_PROXY_CLASS;
-  static jboolean HAVE_NATIVE_GET_PROXY_DATA;
-  static jboolean HAVE_NATIVE_GENERATE_PROXY_CLASS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_lang_reflect_VMProxy__
diff --git a/libjava/java/lang/reflect/WildcardType.h b/libjava/java/lang/reflect/WildcardType.h
deleted file mode 100644
index 2c5b93d65e7..00000000000
--- a/libjava/java/lang/reflect/WildcardType.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_lang_reflect_WildcardType__
-#define __java_lang_reflect_WildcardType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::lang::reflect::WildcardType : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::reflect::Type * > * getLowerBounds() = 0;
-  virtual JArray< ::java::lang::reflect::Type * > * getUpperBounds() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_lang_reflect_WildcardType__
diff --git a/libjava/java/math/BigDecimal.h b/libjava/java/math/BigDecimal.h
deleted file mode 100644
index 72b877e85f4..00000000000
--- a/libjava/java/math/BigDecimal.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_math_BigDecimal__
-#define __java_math_BigDecimal__
-
-#pragma interface
-
-#include <java/lang/Number.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-        class BigInteger;
-        class MathContext;
-        class RoundingMode;
-    }
-  }
-}
-
-class java::math::BigDecimal : public ::java::lang::Number
-{
-
-public:
-  BigDecimal(jint);
-  BigDecimal(jint, ::java::math::MathContext *);
-  BigDecimal(jlong);
-  BigDecimal(jlong, ::java::math::MathContext *);
-  BigDecimal(::java::math::BigInteger *, ::java::math::MathContext *);
-  BigDecimal(::java::lang::String *, ::java::math::MathContext *);
-  BigDecimal(::java::math::BigInteger *);
-  BigDecimal(::java::math::BigInteger *, jint);
-  BigDecimal(::java::math::BigInteger *, jint, ::java::math::MathContext *);
-  BigDecimal(jdouble, ::java::math::MathContext *);
-  BigDecimal(jdouble);
-  BigDecimal(JArray< jchar > *, jint, jint, ::java::math::MathContext *);
-  BigDecimal(JArray< jchar > *, ::java::math::MathContext *);
-  BigDecimal(JArray< jchar > *);
-  BigDecimal(JArray< jchar > *, jint, jint);
-  BigDecimal(::java::lang::String *);
-  static ::java::math::BigDecimal * valueOf(jlong);
-  static ::java::math::BigDecimal * valueOf(jlong, jint);
-  virtual ::java::math::BigDecimal * add(::java::math::BigDecimal *);
-  virtual ::java::math::BigDecimal * add(::java::math::BigDecimal *, ::java::math::MathContext *);
-  virtual ::java::math::BigDecimal * subtract(::java::math::BigDecimal *);
-  virtual ::java::math::BigDecimal * subtract(::java::math::BigDecimal *, ::java::math::MathContext *);
-  virtual ::java::math::BigDecimal * multiply(::java::math::BigDecimal *);
-  virtual ::java::math::BigDecimal * multiply(::java::math::BigDecimal *, ::java::math::MathContext *);
-  virtual ::java::math::BigDecimal * divide(::java::math::BigDecimal *, jint);
-  virtual ::java::math::BigDecimal * divide(::java::math::BigDecimal *, jint, ::java::math::RoundingMode *);
-  virtual ::java::math::BigDecimal * divide(::java::math::BigDecimal *, ::java::math::RoundingMode *);
-  virtual ::java::math::BigDecimal * divide(::java::math::BigDecimal *, jint, jint);
-  virtual ::java::math::BigDecimal * divide(::java::math::BigDecimal *);
-  virtual ::java::math::BigDecimal * remainder(::java::math::BigDecimal *);
-  virtual JArray< ::java::math::BigDecimal * > * divideAndRemainder(::java::math::BigDecimal *);
-  virtual ::java::math::BigDecimal * divideToIntegralValue(::java::math::BigDecimal *);
-private:
-  ::java::math::BigDecimal * floor();
-public:
-  virtual jint target$compareTo(::java::math::BigDecimal *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::math::BigDecimal * max(::java::math::BigDecimal *);
-  virtual ::java::math::BigDecimal * min(::java::math::BigDecimal *);
-  virtual ::java::math::BigDecimal * movePointLeft(jint);
-  virtual ::java::math::BigDecimal * movePointRight(jint);
-  virtual jint signum();
-  virtual jint scale();
-  virtual ::java::math::BigInteger * unscaledValue();
-  virtual ::java::math::BigDecimal * abs();
-  virtual ::java::math::BigDecimal * negate();
-  virtual ::java::math::BigDecimal * negate(::java::math::MathContext *);
-  virtual ::java::math::BigDecimal * plus();
-  virtual ::java::math::BigDecimal * plus(::java::math::MathContext *);
-  virtual ::java::math::BigDecimal * round(::java::math::MathContext *);
-  virtual jint precision();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toEngineeringString();
-  virtual ::java::lang::String * toPlainString();
-  virtual ::java::math::BigInteger * toBigInteger();
-  virtual ::java::math::BigInteger * toBigIntegerExact();
-  virtual jint intValue();
-  virtual ::java::math::BigDecimal * stripTrailingZeros();
-  virtual jlong longValue();
-  virtual jfloat floatValue();
-  virtual jdouble doubleValue();
-  virtual ::java::math::BigDecimal * setScale(jint);
-  virtual ::java::math::BigDecimal * setScale(jint, jint);
-  virtual ::java::math::BigDecimal * setScale(jint, ::java::math::RoundingMode *);
-  static ::java::math::BigDecimal * valueOf(jdouble);
-  virtual ::java::math::BigDecimal * scaleByPowerOfTen(jint);
-  virtual ::java::math::BigDecimal * pow(jint);
-  virtual ::java::math::BigDecimal * pow(jint, ::java::math::MathContext *);
-  virtual ::java::math::BigDecimal * abs(::java::math::MathContext *);
-  virtual ::java::math::BigDecimal * ulp();
-  virtual jlong longValueExact();
-  virtual jint intValueExact();
-  virtual jbyte byteValueExact();
-  virtual jshort shortValueExact();
-  virtual jint compareTo(::java::lang::Object *);
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Number)))) intVal;
-  jint scale__;
-  jint precision__;
-  static const jlong serialVersionUID = 6108874887143696463LL;
-public:
-  static ::java::math::BigDecimal * ZERO;
-  static ::java::math::BigDecimal * ONE;
-  static ::java::math::BigDecimal * TEN;
-  static const jint ROUND_UP = 0;
-  static const jint ROUND_DOWN = 1;
-  static const jint ROUND_CEILING = 2;
-  static const jint ROUND_FLOOR = 3;
-  static const jint ROUND_HALF_UP = 4;
-  static const jint ROUND_HALF_DOWN = 5;
-  static const jint ROUND_HALF_EVEN = 6;
-  static const jint ROUND_UNNECESSARY = 7;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_math_BigDecimal__
diff --git a/libjava/java/math/BigInteger.h b/libjava/java/math/BigInteger.h
deleted file mode 100644
index e1d4461e850..00000000000
--- a/libjava/java/math/BigInteger.h
+++ /dev/null
@@ -1,195 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_math_BigInteger__
-#define __java_math_BigInteger__
-
-#pragma interface
-
-#include <java/lang/Number.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-}
-
-class java::math::BigInteger : public ::java::lang::Number
-{
-
-  BigInteger();
-  BigInteger(jint);
-public:
-  BigInteger(::java::lang::String *, jint);
-  BigInteger(::java::lang::String *);
-  BigInteger(JArray< jbyte > *);
-  BigInteger(jint, JArray< jbyte > *);
-  BigInteger(jint, ::java::util::Random *);
-private:
-  void init(jint, ::java::util::Random *);
-public:
-  BigInteger(jint, jint, ::java::util::Random *);
-  static ::java::math::BigInteger * probablePrime(jint, ::java::util::Random *);
-  static ::java::math::BigInteger * valueOf(jlong);
-private:
-  static ::java::math::BigInteger * make(JArray< jint > *, jint);
-  static JArray< jint > * byteArrayToIntArray(JArray< jbyte > *, jint);
-  static ::java::math::BigInteger * alloc(jint);
-  void realloc(jint);
-  jboolean isNegative();
-public:
-  virtual jint signum();
-private:
-  static jint compareTo(::java::math::BigInteger *, ::java::math::BigInteger *);
-public:
-  virtual jint target$compareTo(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * min(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * max(::java::math::BigInteger *);
-private:
-  jboolean isZero();
-  jboolean isOne();
-  static jint wordsNeeded(JArray< jint > *, jint);
-  ::java::math::BigInteger * canonicalize();
-  static ::java::math::BigInteger * add(jint, jint);
-  static ::java::math::BigInteger * add(::java::math::BigInteger *, jint);
-  void setAdd(::java::math::BigInteger *, jint);
-  void setAdd(jint);
-  void set(jlong);
-  void set(JArray< jint > *, jint);
-  void set(::java::math::BigInteger *);
-  static ::java::math::BigInteger * add(::java::math::BigInteger *, ::java::math::BigInteger *, jint);
-public:
-  virtual ::java::math::BigInteger * add(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * subtract(::java::math::BigInteger *);
-private:
-  static ::java::math::BigInteger * times(::java::math::BigInteger *, jint);
-  static ::java::math::BigInteger * times(::java::math::BigInteger *, ::java::math::BigInteger *);
-public:
-  virtual ::java::math::BigInteger * multiply(::java::math::BigInteger *);
-private:
-  static void divide(jlong, jlong, ::java::math::BigInteger *, ::java::math::BigInteger *, jint);
-  static void divide(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, jint);
-public:
-  virtual ::java::math::BigInteger * divide(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * remainder(::java::math::BigInteger *);
-  virtual JArray< ::java::math::BigInteger * > * divideAndRemainder(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * mod(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * pow(jint);
-private:
-  static JArray< jint > * euclidInv(jint, jint, jint);
-  static void euclidInv(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, JArray< ::java::math::BigInteger * > *);
-public:
-  virtual ::java::math::BigInteger * modInverse(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * modPow(::java::math::BigInteger *, ::java::math::BigInteger *);
-private:
-  static jint gcd(jint, jint);
-public:
-  virtual ::java::math::BigInteger * gcd(::java::math::BigInteger *);
-  virtual jboolean isProbablePrime(jint);
-private:
-  void setInvert();
-  void setShiftLeft(::java::math::BigInteger *, jint);
-  void setShiftRight(::java::math::BigInteger *, jint);
-  void setShift(::java::math::BigInteger *, jint);
-  static ::java::math::BigInteger * shift(::java::math::BigInteger *, jint);
-public:
-  virtual ::java::math::BigInteger * shiftLeft(jint);
-  virtual ::java::math::BigInteger * shiftRight(jint);
-private:
-  void format(jint, ::java::lang::StringBuffer *);
-public:
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jint);
-  virtual jint intValue();
-  virtual jlong longValue();
-  virtual jint hashCode();
-private:
-  static jboolean equals(::java::math::BigInteger *, ::java::math::BigInteger *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  static ::java::math::BigInteger * valueOf(::java::lang::String *, jint);
-  static ::java::math::BigInteger * valueOf(JArray< jbyte > *, jint, jboolean, jint);
-public:
-  virtual jdouble doubleValue();
-  virtual jfloat floatValue();
-private:
-  jboolean checkBits(jint);
-  jdouble roundToDouble(jint, jboolean, jboolean);
-  void getAbsolute(JArray< jint > *);
-  static jboolean negate(JArray< jint > *, JArray< jint > *, jint);
-  void setNegative(::java::math::BigInteger *);
-  void setNegative();
-  static ::java::math::BigInteger * abs(::java::math::BigInteger *);
-public:
-  virtual ::java::math::BigInteger * abs();
-private:
-  static ::java::math::BigInteger * neg(::java::math::BigInteger *);
-public:
-  virtual ::java::math::BigInteger * negate();
-  virtual jint bitLength();
-  virtual JArray< jbyte > * toByteArray();
-private:
-  static jint swappedOp(jint);
-  static ::java::math::BigInteger * bitOp(jint, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  static void setBitOp(::java::math::BigInteger *, jint, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  static ::java::math::BigInteger * and$(::java::math::BigInteger *, jint);
-public:
-  virtual ::java::math::BigInteger * and$(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * or$(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * xor$(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * not$();
-  virtual ::java::math::BigInteger * andNot(::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * clearBit(jint);
-  virtual ::java::math::BigInteger * setBit(jint);
-  virtual jboolean testBit(jint);
-  virtual ::java::math::BigInteger * flipBit(jint);
-  virtual jint getLowestSetBit();
-private:
-  static jint bitCount(jint);
-  static jint bitCount(JArray< jint > *, jint);
-public:
-  virtual jint bitCount();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  virtual jint compareTo(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Number)))) ival;
-  JArray< jint > * words;
-  jint bitCount__;
-  jint bitLength__;
-  jint firstNonzeroByteNum;
-  jint lowestSetBit;
-  JArray< jbyte > * magnitude;
-  jint signum__;
-  static const jlong serialVersionUID = -8287574255936472291LL;
-  static const jint minFixNum = -100;
-  static const jint maxFixNum = 1024;
-  static const jint numFixNum = 1125;
-  static JArray< ::java::math::BigInteger * > * smallFixNums;
-public:
-  static ::java::math::BigInteger * ZERO;
-  static ::java::math::BigInteger * ONE;
-  static ::java::math::BigInteger * TEN;
-private:
-  static const jint FLOOR = 1;
-  static const jint CEILING = 2;
-  static const jint TRUNCATE = 3;
-  static const jint ROUND = 4;
-  static JArray< jint > * primes;
-  static JArray< jint > * k;
-  static JArray< jint > * t;
-  static JArray< jbyte > * bit4_count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_math_BigInteger__
diff --git a/libjava/java/math/MathContext.h b/libjava/java/math/MathContext.h
deleted file mode 100644
index bed83920be8..00000000000
--- a/libjava/java/math/MathContext.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_math_MathContext__
-#define __java_math_MathContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class MathContext;
-        class RoundingMode;
-    }
-  }
-}
-
-class java::math::MathContext : public ::java::lang::Object
-{
-
-public:
-  MathContext(jint);
-  MathContext(jint, ::java::math::RoundingMode *);
-  MathContext(::java::lang::String *);
-  jboolean equals(::java::lang::Object *);
-  jint getPrecision();
-  ::java::math::RoundingMode * getRoundingMode();
-  ::java::lang::String * toString();
-  jint hashCode();
-  static ::java::math::MathContext * UNLIMITED;
-  static ::java::math::MathContext * DECIMAL32;
-  static ::java::math::MathContext * DECIMAL64;
-  static ::java::math::MathContext * DECIMAL128;
-private:
-  static const jlong serialVersionUID = 5579720004786848255LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) precision;
-  ::java::math::RoundingMode * roundMode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_math_MathContext__
diff --git a/libjava/java/math/RoundingMode.h b/libjava/java/math/RoundingMode.h
deleted file mode 100644
index b72f7cff7ec..00000000000
--- a/libjava/java/math/RoundingMode.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_math_RoundingMode__
-#define __java_math_RoundingMode__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class RoundingMode;
-    }
-  }
-}
-
-class java::math::RoundingMode : public ::java::lang::Enum
-{
-
-  RoundingMode(::java::lang::String *, jint);
-public:
-  static ::java::math::RoundingMode * valueOf(jint);
-  static JArray< ::java::math::RoundingMode * > * values();
-  static ::java::math::RoundingMode * valueOf(::java::lang::String *);
-  static ::java::math::RoundingMode * UP;
-  static ::java::math::RoundingMode * DOWN;
-  static ::java::math::RoundingMode * CEILING;
-  static ::java::math::RoundingMode * FLOOR;
-  static ::java::math::RoundingMode * HALF_UP;
-  static ::java::math::RoundingMode * HALF_DOWN;
-  static ::java::math::RoundingMode * HALF_EVEN;
-  static ::java::math::RoundingMode * UNNECESSARY;
-private:
-  static const jlong serialVersionUID = 432302042773881265LL;
-  static JArray< ::java::math::RoundingMode * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_math_RoundingMode__
diff --git a/libjava/java/net/Authenticator.h b/libjava/java/net/Authenticator.h
deleted file mode 100644
index b8e26606bea..00000000000
--- a/libjava/java/net/Authenticator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_Authenticator__
-#define __java_net_Authenticator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Authenticator;
-        class InetAddress;
-        class PasswordAuthentication;
-    }
-  }
-}
-
-class java::net::Authenticator : public ::java::lang::Object
-{
-
-public:
-  static void setDefault(::java::net::Authenticator *);
-  static ::java::net::PasswordAuthentication * requestPasswordAuthentication(::java::net::InetAddress *, jint, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static ::java::net::PasswordAuthentication * requestPasswordAuthentication(::java::lang::String *, ::java::net::InetAddress *, jint, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  Authenticator();
-public: // actually protected
-  virtual ::java::net::InetAddress * getRequestingSite();
-  virtual ::java::lang::String * getRequestingHost();
-  virtual jint getRequestingPort();
-  virtual ::java::lang::String * getRequestingProtocol();
-  virtual ::java::lang::String * getRequestingPrompt();
-  virtual ::java::lang::String * getRequestingScheme();
-  virtual ::java::net::PasswordAuthentication * getPasswordAuthentication();
-private:
-  static ::java::net::Authenticator * defaultAuthenticator;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) host;
-  ::java::net::InetAddress * addr;
-  jint port;
-  ::java::lang::String * protocol;
-  ::java::lang::String * prompt;
-  ::java::lang::String * scheme;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_Authenticator__
diff --git a/libjava/java/net/BindException.h b/libjava/java/net/BindException.h
deleted file mode 100644
index 6056f55f744..00000000000
--- a/libjava/java/net/BindException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_BindException__
-#define __java_net_BindException__
-
-#pragma interface
-
-#include <java/net/SocketException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class BindException;
-    }
-  }
-}
-
-class java::net::BindException : public ::java::net::SocketException
-{
-
-public:
-  BindException();
-  BindException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5945005768251722951LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_BindException__
diff --git a/libjava/java/net/ConnectException.h b/libjava/java/net/ConnectException.h
deleted file mode 100644
index 324ff1fe7c7..00000000000
--- a/libjava/java/net/ConnectException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_ConnectException__
-#define __java_net_ConnectException__
-
-#pragma interface
-
-#include <java/net/SocketException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ConnectException;
-    }
-  }
-}
-
-class java::net::ConnectException : public ::java::net::SocketException
-{
-
-public:
-  ConnectException();
-  ConnectException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3831404271622369215LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_ConnectException__
diff --git a/libjava/java/net/ContentHandler.h b/libjava/java/net/ContentHandler.h
deleted file mode 100644
index 62aecff06a0..00000000000
--- a/libjava/java/net/ContentHandler.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_ContentHandler__
-#define __java_net_ContentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ContentHandler;
-        class URLConnection;
-    }
-  }
-}
-
-class java::net::ContentHandler : public ::java::lang::Object
-{
-
-public:
-  ContentHandler();
-  virtual ::java::lang::Object * getContent(::java::net::URLConnection *) = 0;
-  virtual ::java::lang::Object * getContent(::java::net::URLConnection *, JArray< ::java::lang::Class * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_ContentHandler__
diff --git a/libjava/java/net/ContentHandlerFactory.h b/libjava/java/net/ContentHandlerFactory.h
deleted file mode 100644
index ca153310473..00000000000
--- a/libjava/java/net/ContentHandlerFactory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_ContentHandlerFactory__
-#define __java_net_ContentHandlerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ContentHandler;
-        class ContentHandlerFactory;
-    }
-  }
-}
-
-class java::net::ContentHandlerFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::net::ContentHandler * createContentHandler(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_net_ContentHandlerFactory__
diff --git a/libjava/java/net/DatagramPacket.h b/libjava/java/net/DatagramPacket.h
deleted file mode 100644
index 068329e05c5..00000000000
--- a/libjava/java/net/DatagramPacket.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_DatagramPacket__
-#define __java_net_DatagramPacket__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class DatagramPacket;
-        class InetAddress;
-        class SocketAddress;
-    }
-  }
-}
-
-class java::net::DatagramPacket : public ::java::lang::Object
-{
-
-public:
-  DatagramPacket(JArray< jbyte > *, jint, jint);
-  DatagramPacket(JArray< jbyte > *, jint);
-  DatagramPacket(JArray< jbyte > *, jint, jint, ::java::net::InetAddress *, jint);
-  DatagramPacket(JArray< jbyte > *, jint, ::java::net::InetAddress *, jint);
-  DatagramPacket(JArray< jbyte > *, jint, jint, ::java::net::SocketAddress *);
-  DatagramPacket(JArray< jbyte > *, jint, ::java::net::SocketAddress *);
-  ::java::net::InetAddress * getAddress();
-  jint getPort();
-  JArray< jbyte > * getData();
-  jint getOffset();
-  jint getLength();
-  void setAddress(::java::net::InetAddress *);
-  void setPort(jint);
-  void setSocketAddress(::java::net::SocketAddress *);
-  ::java::net::SocketAddress * getSocketAddress();
-  void setData(JArray< jbyte > *);
-  void setData(JArray< jbyte > *, jint, jint);
-  void setLength(jint);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  jint offset;
-public: // actually package-private
-  jint length;
-  jint maxlen;
-private:
-  ::java::net::InetAddress * address;
-  jint port;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_DatagramPacket__
diff --git a/libjava/java/net/DatagramSocket.h b/libjava/java/net/DatagramSocket.h
deleted file mode 100644
index a1761e11549..00000000000
--- a/libjava/java/net/DatagramSocket.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_DatagramSocket__
-#define __java_net_DatagramSocket__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class DatagramPacket;
-        class DatagramSocket;
-        class DatagramSocketImpl;
-        class DatagramSocketImplFactory;
-        class InetAddress;
-        class SocketAddress;
-    }
-    namespace nio
-    {
-      namespace channels
-      {
-          class DatagramChannel;
-      }
-    }
-  }
-}
-
-class java::net::DatagramSocket : public ::java::lang::Object
-{
-
-public: // actually protected
-  DatagramSocket(::java::net::DatagramSocketImpl *);
-public:
-  DatagramSocket();
-  DatagramSocket(jint);
-  DatagramSocket(jint, ::java::net::InetAddress *);
-  DatagramSocket(::java::net::SocketAddress *);
-public: // actually package-private
-  virtual ::java::net::DatagramSocketImpl * getImpl();
-public:
-  virtual void close();
-  virtual ::java::net::InetAddress * getInetAddress();
-  virtual jint getPort();
-  virtual ::java::net::InetAddress * getLocalAddress();
-  virtual jint getLocalPort();
-  virtual jint getSoTimeout();
-  virtual void setSoTimeout(jint);
-  virtual jint getSendBufferSize();
-  virtual void setSendBufferSize(jint);
-  virtual jint getReceiveBufferSize();
-  virtual void setReceiveBufferSize(jint);
-  virtual void connect(::java::net::InetAddress *, jint);
-  virtual void disconnect();
-  virtual void receive(::java::net::DatagramPacket *);
-  virtual void send(::java::net::DatagramPacket *);
-  virtual void bind(::java::net::SocketAddress *);
-  virtual jboolean isClosed();
-  virtual ::java::nio::channels::DatagramChannel * getChannel();
-  virtual void connect(::java::net::SocketAddress *);
-  virtual jboolean isBound();
-  virtual jboolean isConnected();
-  virtual ::java::net::SocketAddress * getRemoteSocketAddress();
-  virtual ::java::net::SocketAddress * getLocalSocketAddress();
-  virtual void setReuseAddress(jboolean);
-  virtual jboolean getReuseAddress();
-  virtual void setBroadcast(jboolean);
-  virtual jboolean getBroadcast();
-  virtual void setTrafficClass(jint);
-  virtual jint getTrafficClass();
-  static void setDatagramSocketImplFactory(::java::net::DatagramSocketImplFactory *);
-private:
-  static ::java::net::DatagramSocketImplFactory * factory;
-  ::java::net::DatagramSocketImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) impl;
-  jboolean implCreated;
-  ::java::net::InetAddress * remoteAddress;
-  jint remotePort;
-  jboolean bound;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_DatagramSocket__
diff --git a/libjava/java/net/DatagramSocketImpl.h b/libjava/java/net/DatagramSocketImpl.h
deleted file mode 100644
index e29991b4235..00000000000
--- a/libjava/java/net/DatagramSocketImpl.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_DatagramSocketImpl__
-#define __java_net_DatagramSocketImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class DatagramPacket;
-        class DatagramSocketImpl;
-        class InetAddress;
-        class NetworkInterface;
-        class SocketAddress;
-    }
-  }
-}
-
-class java::net::DatagramSocketImpl : public ::java::lang::Object
-{
-
-public:
-  DatagramSocketImpl();
-public: // actually protected
-  virtual void bind(jint, ::java::net::InetAddress *) = 0;
-  virtual void close() = 0;
-  virtual void create() = 0;
-  virtual jint peek(::java::net::InetAddress *) = 0;
-  virtual jint peekData(::java::net::DatagramPacket *) = 0;
-  virtual void send(::java::net::DatagramPacket *) = 0;
-  virtual void receive(::java::net::DatagramPacket *) = 0;
-  virtual void connect(::java::net::InetAddress *, jint);
-  virtual void disconnect();
-  virtual void setTTL(jbyte) = 0;
-  virtual jbyte getTTL() = 0;
-  virtual void setTimeToLive(jint) = 0;
-  virtual jint getTimeToLive() = 0;
-  virtual void join(::java::net::InetAddress *) = 0;
-  virtual void leave(::java::net::InetAddress *) = 0;
-  virtual void joinGroup(::java::net::SocketAddress *, ::java::net::NetworkInterface *) = 0;
-  virtual void leaveGroup(::java::net::SocketAddress *, ::java::net::NetworkInterface *) = 0;
-  virtual ::java::io::FileDescriptor * getFileDescriptor();
-  virtual jint getLocalPort();
-public:
-  virtual void setOption(jint, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getOption(jint) = 0;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) localPort;
-  ::java::io::FileDescriptor * fd;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_DatagramSocketImpl__
diff --git a/libjava/java/net/DatagramSocketImplFactory.h b/libjava/java/net/DatagramSocketImplFactory.h
deleted file mode 100644
index 15e1780ec89..00000000000
--- a/libjava/java/net/DatagramSocketImplFactory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_DatagramSocketImplFactory__
-#define __java_net_DatagramSocketImplFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class DatagramSocketImpl;
-        class DatagramSocketImplFactory;
-    }
-  }
-}
-
-class java::net::DatagramSocketImplFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::net::DatagramSocketImpl * createDatagramSocketImpl() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_net_DatagramSocketImplFactory__
diff --git a/libjava/java/net/FileNameMap.h b/libjava/java/net/FileNameMap.h
deleted file mode 100644
index 916f14023e9..00000000000
--- a/libjava/java/net/FileNameMap.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_FileNameMap__
-#define __java_net_FileNameMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class FileNameMap;
-    }
-  }
-}
-
-class java::net::FileNameMap : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getContentTypeFor(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_net_FileNameMap__
diff --git a/libjava/java/net/HttpURLConnection.h b/libjava/java/net/HttpURLConnection.h
deleted file mode 100644
index d192e33ad6b..00000000000
--- a/libjava/java/net/HttpURLConnection.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_HttpURLConnection__
-#define __java_net_HttpURLConnection__
-
-#pragma interface
-
-#include <java/net/URLConnection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class HttpURLConnection;
-        class URL;
-    }
-    namespace security
-    {
-        class Permission;
-    }
-  }
-}
-
-class java::net::HttpURLConnection : public ::java::net::URLConnection
-{
-
-public: // actually protected
-  HttpURLConnection(::java::net::URL *);
-public:
-  virtual void disconnect() = 0;
-  virtual jboolean usingProxy() = 0;
-  static void setFollowRedirects(jboolean);
-  static jboolean getFollowRedirects();
-  virtual jboolean getInstanceFollowRedirects();
-  virtual void setInstanceFollowRedirects(jboolean);
-  virtual void setRequestMethod(::java::lang::String *);
-  virtual ::java::lang::String * getRequestMethod();
-  virtual jint getResponseCode();
-  virtual ::java::lang::String * getResponseMessage();
-private:
-  void getResponseVals();
-public:
-  virtual ::java::security::Permission * getPermission();
-  virtual ::java::io::InputStream * getErrorStream();
-  virtual jlong getHeaderFieldDate(::java::lang::String *, jlong);
-public: // actually package-private
-  static const jint HTTP_CONTINUE = 100;
-public:
-  static const jint HTTP_OK = 200;
-  static const jint HTTP_CREATED = 201;
-  static const jint HTTP_ACCEPTED = 202;
-  static const jint HTTP_NOT_AUTHORITATIVE = 203;
-  static const jint HTTP_NO_CONTENT = 204;
-  static const jint HTTP_RESET = 205;
-  static const jint HTTP_PARTIAL = 206;
-  static const jint HTTP_MULT_CHOICE = 300;
-  static const jint HTTP_MOVED_PERM = 301;
-  static const jint HTTP_MOVED_TEMP = 302;
-  static const jint HTTP_SEE_OTHER = 303;
-  static const jint HTTP_NOT_MODIFIED = 304;
-  static const jint HTTP_USE_PROXY = 305;
-  static const jint HTTP_BAD_REQUEST = 400;
-  static const jint HTTP_UNAUTHORIZED = 401;
-  static const jint HTTP_PAYMENT_REQUIRED = 402;
-  static const jint HTTP_FORBIDDEN = 403;
-  static const jint HTTP_NOT_FOUND = 404;
-  static const jint HTTP_BAD_METHOD = 405;
-  static const jint HTTP_NOT_ACCEPTABLE = 406;
-  static const jint HTTP_PROXY_AUTH = 407;
-  static const jint HTTP_CLIENT_TIMEOUT = 408;
-  static const jint HTTP_CONFLICT = 409;
-  static const jint HTTP_GONE = 410;
-  static const jint HTTP_LENGTH_REQUIRED = 411;
-  static const jint HTTP_PRECON_FAILED = 412;
-  static const jint HTTP_ENTITY_TOO_LARGE = 413;
-  static const jint HTTP_REQ_TOO_LONG = 414;
-  static const jint HTTP_UNSUPPORTED_TYPE = 415;
-  static const jint HTTP_SERVER_ERROR = 500;
-  static const jint HTTP_INTERNAL_ERROR = 500;
-  static const jint HTTP_NOT_IMPLEMENTED = 501;
-  static const jint HTTP_BAD_GATEWAY = 502;
-  static const jint HTTP_UNAVAILABLE = 503;
-  static const jint HTTP_GATEWAY_TIMEOUT = 504;
-  static const jint HTTP_VERSION = 505;
-private:
-  static jboolean followRedirects;
-  static ::java::lang::String * valid_methods;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::net::URLConnection)))) method;
-  jint responseCode;
-  ::java::lang::String * responseMessage;
-  jboolean instanceFollowRedirects;
-private:
-  jboolean gotResponseVals;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_HttpURLConnection__
diff --git a/libjava/java/net/Inet4Address.h b/libjava/java/net/Inet4Address.h
deleted file mode 100644
index 5ff13154680..00000000000
--- a/libjava/java/net/Inet4Address.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_Inet4Address__
-#define __java_net_Inet4Address__
-
-#pragma interface
-
-#include <java/net/InetAddress.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Inet4Address;
-    }
-  }
-}
-
-class java::net::Inet4Address : public ::java::net::InetAddress
-{
-
-  ::java::lang::Object * writeReplace();
-public: // actually package-private
-  Inet4Address(JArray< jbyte > *, ::java::lang::String *);
-public:
-  jboolean isMulticastAddress();
-  jboolean isLoopbackAddress();
-  jboolean isAnyLocalAddress();
-  jboolean isLinkLocalAddress();
-  jboolean isSiteLocalAddress();
-  jboolean isMCGlobal();
-  jboolean isMCNodeLocal();
-  jboolean isMCLinkLocal();
-  jboolean isMCSiteLocal();
-  jboolean isMCOrgLocal();
-  JArray< jbyte > * getAddress();
-  ::java::lang::String * getHostAddress();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  static const jlong serialVersionUID = 3286316764910316507LL;
-private:
-  static const jint AF_INET = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_Inet4Address__
diff --git a/libjava/java/net/Inet6Address.h b/libjava/java/net/Inet6Address.h
deleted file mode 100644
index 933a4780a18..00000000000
--- a/libjava/java/net/Inet6Address.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_Inet6Address__
-#define __java_net_Inet6Address__
-
-#pragma interface
-
-#include <java/net/InetAddress.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Inet6Address;
-        class NetworkInterface;
-    }
-  }
-}
-
-class java::net::Inet6Address : public ::java::net::InetAddress
-{
-
-public: // actually package-private
-  Inet6Address(JArray< jbyte > *, ::java::lang::String *);
-public:
-  jboolean isMulticastAddress();
-  jboolean isAnyLocalAddress();
-  jboolean isLoopbackAddress();
-  jboolean isLinkLocalAddress();
-  jboolean isSiteLocalAddress();
-  jboolean isMCGlobal();
-  jboolean isMCNodeLocal();
-  jboolean isMCLinkLocal();
-  jboolean isMCSiteLocal();
-  jboolean isMCOrgLocal();
-  JArray< jbyte > * getAddress();
-  static ::java::net::Inet6Address * getByAddress(::java::lang::String *, JArray< jbyte > *, jint);
-  static ::java::net::Inet6Address * getByAddress(::java::lang::String *, JArray< jbyte > *, ::java::net::NetworkInterface *);
-  ::java::net::NetworkInterface * getScopedInterface();
-  jint getScopeId();
-  ::java::lang::String * getHostAddress();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  jboolean isIPv4CompatibleAddress();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public: // actually package-private
-  static const jlong serialVersionUID = 6880410070516793377LL;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::net::InetAddress)))) ipaddress;
-private:
-  jint scope_id;
-  jboolean scope_id_set;
-  jboolean scope_ifname_set;
-  ::java::lang::String * ifname;
-  ::java::net::NetworkInterface * nif;
-  static const jint AF_INET6 = 10;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_Inet6Address__
diff --git a/libjava/java/net/InetAddress.h b/libjava/java/net/InetAddress.h
deleted file mode 100644
index 8cde4fb5daa..00000000000
--- a/libjava/java/net/InetAddress.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_InetAddress__
-#define __java_net_InetAddress__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-    }
-  }
-}
-
-class java::net::InetAddress : public ::java::lang::Object
-{
-
-public: // actually package-private
-  InetAddress(JArray< jbyte > *, ::java::lang::String *, jint);
-public:
-  virtual jboolean isMulticastAddress();
-  virtual jboolean isAnyLocalAddress();
-  virtual jboolean isLoopbackAddress();
-  virtual jboolean isLinkLocalAddress();
-  virtual jboolean isSiteLocalAddress();
-  virtual jboolean isMCGlobal();
-  virtual jboolean isMCNodeLocal();
-  virtual jboolean isMCLinkLocal();
-  virtual jboolean isMCSiteLocal();
-  virtual jboolean isMCOrgLocal();
-  virtual ::java::lang::String * getHostName();
-public: // actually package-private
-  virtual ::java::lang::String * internalGetCanonicalHostName();
-public:
-  virtual ::java::lang::String * getCanonicalHostName();
-  virtual JArray< jbyte > * getAddress();
-  virtual ::java::lang::String * getHostAddress();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  static ::java::net::InetAddress * getByAddress(JArray< jbyte > *);
-  static ::java::net::InetAddress * getByAddress(::java::lang::String *, JArray< jbyte > *);
-public: // actually package-private
-  static ::java::net::InetAddress * getByLiteral(::java::lang::String *);
-public:
-  static ::java::net::InetAddress * getByName(::java::lang::String *);
-  static JArray< ::java::net::InetAddress * > * getAllByName(::java::lang::String *);
-  static ::java::net::InetAddress * getLocalHost();
-private:
-  ::java::lang::Object * readResolve();
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 3286316764910316507LL;
-public: // actually package-private
-  static ::java::net::InetAddress * ANY_IF;
-  static ::java::net::InetAddress * LOCALHOST;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) address;
-public: // actually package-private
-  JArray< jbyte > * addr;
-  ::java::lang::String * hostName;
-private:
-  jint family;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_InetAddress__
diff --git a/libjava/java/net/InetSocketAddress.h b/libjava/java/net/InetSocketAddress.h
deleted file mode 100644
index b4f14d41c8d..00000000000
--- a/libjava/java/net/InetSocketAddress.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_InetSocketAddress__
-#define __java_net_InetSocketAddress__
-
-#pragma interface
-
-#include <java/net/SocketAddress.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class InetSocketAddress;
-    }
-  }
-}
-
-class java::net::InetSocketAddress : public ::java::net::SocketAddress
-{
-
-public:
-  InetSocketAddress(::java::net::InetAddress *, jint);
-  InetSocketAddress(jint);
-  InetSocketAddress(::java::lang::String *, jint);
-private:
-  InetSocketAddress(::java::lang::String *, jint, jboolean);
-public:
-  static ::java::net::InetSocketAddress * createUnresolved(::java::lang::String *, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::net::InetAddress * getAddress();
-  virtual ::java::lang::String * getHostName();
-  virtual jint getPort();
-  virtual jint hashCode();
-  virtual jboolean isUnresolved();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 5076001401234631237LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::net::SocketAddress)))) hostname;
-  ::java::net::InetAddress * addr;
-  jint port;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_InetSocketAddress__
diff --git a/libjava/java/net/JarURLConnection.h b/libjava/java/net/JarURLConnection.h
deleted file mode 100644
index 6c89e6e4d18..00000000000
--- a/libjava/java/net/JarURLConnection.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_JarURLConnection__
-#define __java_net_JarURLConnection__
-
-#pragma interface
-
-#include <java/net/URLConnection.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class JarURLConnection;
-        class URL;
-        class URLConnection;
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::net::JarURLConnection : public ::java::net::URLConnection
-{
-
-public: // actually protected
-  JarURLConnection(::java::net::URL *);
-public:
-  virtual ::java::net::URL * getJarFileURL();
-  virtual ::java::lang::String * getEntryName();
-  virtual ::java::util::jar::JarEntry * getJarEntry();
-  virtual ::java::util::jar::JarFile * getJarFile() = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * getCertificates();
-  virtual ::java::util::jar::Attributes * getMainAttributes();
-  virtual ::java::util::jar::Attributes * getAttributes();
-  virtual ::java::util::jar::Manifest * getManifest();
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::net::URLConnection)))) jarFileURL;
-public: // actually protected
-  ::java::net::URLConnection * jarFileURLConnection;
-private:
-  ::java::lang::String * entryName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_JarURLConnection__
diff --git a/libjava/java/net/MalformedURLException.h b/libjava/java/net/MalformedURLException.h
deleted file mode 100644
index 713bf5e7d6f..00000000000
--- a/libjava/java/net/MalformedURLException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_MalformedURLException__
-#define __java_net_MalformedURLException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class MalformedURLException;
-    }
-  }
-}
-
-class java::net::MalformedURLException : public ::java::io::IOException
-{
-
-public:
-  MalformedURLException();
-  MalformedURLException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -182787522200415866LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_MalformedURLException__
diff --git a/libjava/java/net/MimeTypeMapper.h b/libjava/java/net/MimeTypeMapper.h
deleted file mode 100644
index 06fb2679e6f..00000000000
--- a/libjava/java/net/MimeTypeMapper.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_MimeTypeMapper__
-#define __java_net_MimeTypeMapper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class MimeTypeMapper;
-    }
-  }
-}
-
-class java::net::MimeTypeMapper : public ::java::lang::Object
-{
-
-public:
-  MimeTypeMapper();
-  static void fillFromFile(::java::util::Map *, ::java::lang::String *);
-  virtual ::java::lang::String * getContentTypeFor(::java::lang::String *);
-  static void main(JArray< ::java::lang::String * > *);
-public: // actually protected
-  static JArray< JArray< ::java::lang::String * > * > * mime_strings;
-private:
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mime_types;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_MimeTypeMapper__
diff --git a/libjava/java/net/MulticastSocket.h b/libjava/java/net/MulticastSocket.h
deleted file mode 100644
index 2faac45e39f..00000000000
--- a/libjava/java/net/MulticastSocket.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_MulticastSocket__
-#define __java_net_MulticastSocket__
-
-#pragma interface
-
-#include <java/net/DatagramSocket.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class DatagramPacket;
-        class InetAddress;
-        class MulticastSocket;
-        class NetworkInterface;
-        class SocketAddress;
-    }
-  }
-}
-
-class java::net::MulticastSocket : public ::java::net::DatagramSocket
-{
-
-public:
-  MulticastSocket();
-  MulticastSocket(jint);
-  MulticastSocket(::java::net::SocketAddress *);
-  virtual ::java::net::InetAddress * getInterface();
-  virtual jbyte getTTL();
-  virtual jint getTimeToLive();
-  virtual void setInterface(::java::net::InetAddress *);
-  virtual void setNetworkInterface(::java::net::NetworkInterface *);
-  virtual ::java::net::NetworkInterface * getNetworkInterface();
-  virtual void setLoopbackMode(jboolean);
-  virtual jboolean getLoopbackMode();
-  virtual void setTTL(jbyte);
-  virtual void setTimeToLive(jint);
-  virtual void joinGroup(::java::net::InetAddress *);
-  virtual void leaveGroup(::java::net::InetAddress *);
-  virtual void joinGroup(::java::net::SocketAddress *, ::java::net::NetworkInterface *);
-  virtual void leaveGroup(::java::net::SocketAddress *, ::java::net::NetworkInterface *);
-  virtual void send(::java::net::DatagramPacket *, jbyte);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_MulticastSocket__
diff --git a/libjava/java/net/NetPermission.h b/libjava/java/net/NetPermission.h
deleted file mode 100644
index a6c88555bc9..00000000000
--- a/libjava/java/net/NetPermission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_NetPermission__
-#define __java_net_NetPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class NetPermission;
-    }
-  }
-}
-
-class java::net::NetPermission : public ::java::security::BasicPermission
-{
-
-public:
-  NetPermission(::java::lang::String *);
-  NetPermission(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  static const jlong serialVersionUID = -8343910153355041693LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_NetPermission__
diff --git a/libjava/java/net/NetworkInterface.h b/libjava/java/net/NetworkInterface.h
deleted file mode 100644
index 66898a2129f..00000000000
--- a/libjava/java/net/NetworkInterface.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_NetworkInterface__
-#define __java_net_NetworkInterface__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class NetworkInterface;
-    }
-  }
-}
-
-class java::net::NetworkInterface : public ::java::lang::Object
-{
-
-public: // actually package-private
-  NetworkInterface(::java::lang::String *, ::java::net::InetAddress *);
-  NetworkInterface(::java::lang::String *, JArray< ::java::net::InetAddress * > *);
-public:
-  ::java::lang::String * getName();
-  ::java::util::Enumeration * getInetAddresses();
-  ::java::lang::String * getDisplayName();
-  static ::java::net::NetworkInterface * getByName(::java::lang::String *);
-  static ::java::net::NetworkInterface * getByInetAddress(::java::net::InetAddress *);
-private:
-  static ::java::util::Collection * condense(::java::util::Collection *);
-public:
-  static ::java::util::Enumeration * getNetworkInterfaces();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::util::Vector * inetAddresses;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_NetworkInterface__
diff --git a/libjava/java/net/NoRouteToHostException.h b/libjava/java/net/NoRouteToHostException.h
deleted file mode 100644
index 7a639eaa749..00000000000
--- a/libjava/java/net/NoRouteToHostException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_NoRouteToHostException__
-#define __java_net_NoRouteToHostException__
-
-#pragma interface
-
-#include <java/net/SocketException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class NoRouteToHostException;
-    }
-  }
-}
-
-class java::net::NoRouteToHostException : public ::java::net::SocketException
-{
-
-public:
-  NoRouteToHostException();
-  NoRouteToHostException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1897550894873493790LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_NoRouteToHostException__
diff --git a/libjava/java/net/PasswordAuthentication.h b/libjava/java/net/PasswordAuthentication.h
deleted file mode 100644
index 2567fd0e5fc..00000000000
--- a/libjava/java/net/PasswordAuthentication.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_PasswordAuthentication__
-#define __java_net_PasswordAuthentication__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class PasswordAuthentication;
-    }
-  }
-}
-
-class java::net::PasswordAuthentication : public ::java::lang::Object
-{
-
-public:
-  PasswordAuthentication(::java::lang::String *, JArray< jchar > *);
-  ::java::lang::String * getUserName();
-  JArray< jchar > * getPassword();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) username;
-  JArray< jchar > * password;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_PasswordAuthentication__
diff --git a/libjava/java/net/PortUnreachableException.h b/libjava/java/net/PortUnreachableException.h
deleted file mode 100644
index 5e0fff24987..00000000000
--- a/libjava/java/net/PortUnreachableException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_PortUnreachableException__
-#define __java_net_PortUnreachableException__
-
-#pragma interface
-
-#include <java/net/SocketException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class PortUnreachableException;
-    }
-  }
-}
-
-class java::net::PortUnreachableException : public ::java::net::SocketException
-{
-
-public:
-  PortUnreachableException();
-  PortUnreachableException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8462541992376507323LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_PortUnreachableException__
diff --git a/libjava/java/net/ProtocolException.h b/libjava/java/net/ProtocolException.h
deleted file mode 100644
index 39e7b7b1e41..00000000000
--- a/libjava/java/net/ProtocolException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_ProtocolException__
-#define __java_net_ProtocolException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ProtocolException;
-    }
-  }
-}
-
-class java::net::ProtocolException : public ::java::io::IOException
-{
-
-public:
-  ProtocolException();
-  ProtocolException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -6098449442062388080LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_ProtocolException__
diff --git a/libjava/java/net/Proxy$Type.h b/libjava/java/net/Proxy$Type.h
deleted file mode 100644
index 288bd8c519a..00000000000
--- a/libjava/java/net/Proxy$Type.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_Proxy$Type__
-#define __java_net_Proxy$Type__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Proxy$Type;
-    }
-  }
-}
-
-class java::net::Proxy$Type : public ::java::lang::Enum
-{
-
-  Proxy$Type(::java::lang::String *, jint);
-public:
-  static JArray< ::java::net::Proxy$Type * > * values();
-  static ::java::net::Proxy$Type * valueOf(::java::lang::String *);
-  static ::java::net::Proxy$Type * DIRECT;
-  static ::java::net::Proxy$Type * HTTP;
-  static ::java::net::Proxy$Type * SOCKS;
-private:
-  static const jlong serialVersionUID = -2231209257930100533LL;
-  static JArray< ::java::net::Proxy$Type * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_Proxy$Type__
diff --git a/libjava/java/net/Proxy.h b/libjava/java/net/Proxy.h
deleted file mode 100644
index b6b44e3a62f..00000000000
--- a/libjava/java/net/Proxy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_Proxy__
-#define __java_net_Proxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Proxy;
-        class Proxy$Type;
-        class SocketAddress;
-    }
-  }
-}
-
-class java::net::Proxy : public ::java::lang::Object
-{
-
-public:
-  Proxy(::java::net::Proxy$Type *, ::java::net::SocketAddress *);
-  virtual ::java::net::SocketAddress * address();
-  virtual ::java::net::Proxy$Type * type();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  static ::java::net::Proxy * NO_PROXY;
-private:
-  ::java::net::Proxy$Type * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type__;
-  ::java::net::SocketAddress * address__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_Proxy__
diff --git a/libjava/java/net/ProxySelector.h b/libjava/java/net/ProxySelector.h
deleted file mode 100644
index 62382ee58a5..00000000000
--- a/libjava/java/net/ProxySelector.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_ProxySelector__
-#define __java_net_ProxySelector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ProxySelector;
-        class SocketAddress;
-        class URI;
-    }
-  }
-}
-
-class java::net::ProxySelector : public ::java::lang::Object
-{
-
-public:
-  ProxySelector();
-  static ::java::net::ProxySelector * getDefault();
-  static void setDefault(::java::net::ProxySelector *);
-  virtual void connectFailed(::java::net::URI *, ::java::net::SocketAddress *, ::java::io::IOException *) = 0;
-  virtual ::java::util::List * select(::java::net::URI *) = 0;
-private:
-  static ::java::net::ProxySelector * defaultSelector;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_ProxySelector__
diff --git a/libjava/java/net/ResolverCache$Entry.h b/libjava/java/net/ResolverCache$Entry.h
deleted file mode 100644
index 22b5da83f97..00000000000
--- a/libjava/java/net/ResolverCache$Entry.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_ResolverCache$Entry__
-#define __java_net_ResolverCache$Entry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ResolverCache$Entry;
-    }
-  }
-}
-
-class java::net::ResolverCache$Entry : public ::java::lang::Object
-{
-
-public:
-  ResolverCache$Entry(::java::lang::Object *, ::java::lang::Object *);
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::lang::Object * value;
-  jlong expires;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_ResolverCache$Entry__
diff --git a/libjava/java/net/ResolverCache.h b/libjava/java/net/ResolverCache.h
deleted file mode 100644
index d274d235c05..00000000000
--- a/libjava/java/net/ResolverCache.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_ResolverCache__
-#define __java_net_ResolverCache__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ResolverCache;
-        class ResolverCache$Entry;
-    }
-  }
-}
-
-class java::net::ResolverCache : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ResolverCache();
-private:
-  static jint getTTL(::java::lang::String *, jint);
-public:
-  static ::java::lang::String * getHostByAddr(JArray< jbyte > *);
-  static JArray< JArray< jbyte > * > * getHostByName(::java::lang::String *);
-private:
-  static ::java::lang::Object * makeHashableAddress(JArray< jbyte > *);
-  static ::java::net::ResolverCache$Entry * get(::java::lang::Object *);
-  static void put(::java::net::ResolverCache$Entry *);
-  static void reap();
-public: // actually package-private
-  static jint access$0();
-  static jint access$1();
-private:
-  static jint POSITIVE_TTL;
-  static jint NEGATIVE_TTL;
-  static ::java::util::HashMap * cache;
-  static ::java::util::LinkedList * killqueue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_ResolverCache__
diff --git a/libjava/java/net/ServerSocket.h b/libjava/java/net/ServerSocket.h
deleted file mode 100644
index af51cb6d864..00000000000
--- a/libjava/java/net/ServerSocket.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_ServerSocket__
-#define __java_net_ServerSocket__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class InetSocketAddress;
-        class ServerSocket;
-        class Socket;
-        class SocketAddress;
-        class SocketImpl;
-        class SocketImplFactory;
-    }
-    namespace nio
-    {
-      namespace channels
-      {
-          class ServerSocketChannel;
-      }
-    }
-  }
-}
-
-class java::net::ServerSocket : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ServerSocket(::java::net::SocketImpl *);
-  virtual ::java::net::SocketImpl * getImpl();
-public:
-  ServerSocket();
-  ServerSocket(jint);
-  ServerSocket(jint, jint);
-  ServerSocket(jint, jint, ::java::net::InetAddress *);
-  virtual void bind(::java::net::SocketAddress *);
-  virtual void bind(::java::net::SocketAddress *, jint);
-  virtual ::java::net::InetAddress * getInetAddress();
-  virtual jint getLocalPort();
-  virtual ::java::net::SocketAddress * getLocalSocketAddress();
-  virtual ::java::net::Socket * accept();
-public: // actually protected
-  virtual void implAccept(::java::net::Socket *);
-public:
-  virtual void close();
-  virtual ::java::nio::channels::ServerSocketChannel * getChannel();
-  virtual jboolean isBound();
-  virtual jboolean isClosed();
-  virtual void setSoTimeout(jint);
-  virtual jint getSoTimeout();
-  virtual void setReuseAddress(jboolean);
-  virtual jboolean getReuseAddress();
-  virtual void setReceiveBufferSize(jint);
-  virtual jint getReceiveBufferSize();
-  virtual ::java::lang::String * toString();
-  static void setSocketFactory(::java::net::SocketImplFactory *);
-private:
-  static ::java::net::SocketImplFactory * factory;
-  ::java::net::SocketImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) impl;
-  ::java::net::InetSocketAddress * local;
-  jint port;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_ServerSocket__
diff --git a/libjava/java/net/Socket.h b/libjava/java/net/Socket.h
deleted file mode 100644
index 776d6fc473a..00000000000
--- a/libjava/java/net/Socket.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_Socket__
-#define __java_net_Socket__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-        class SocketAddress;
-        class SocketImpl;
-        class SocketImplFactory;
-    }
-    namespace nio
-    {
-      namespace channels
-      {
-          class SocketChannel;
-      }
-    }
-  }
-}
-
-class java::net::Socket : public ::java::lang::Object
-{
-
-public:
-  Socket();
-public: // actually protected
-  Socket(::java::net::SocketImpl *);
-public:
-  Socket(::java::lang::String *, jint);
-  Socket(::java::net::InetAddress *, jint);
-  Socket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  Socket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-  Socket(::java::lang::String *, jint, jboolean);
-  Socket(::java::net::InetAddress *, jint, jboolean);
-private:
-  Socket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint, jboolean);
-  ::java::net::SocketImpl * getImpl();
-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 * getLocalSocketAddress();
-  virtual ::java::net::SocketAddress * getRemoteSocketAddress();
-  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 close();
-  virtual ::java::lang::String * toString();
-  static void setSocketImplFactory(::java::net::SocketImplFactory *);
-  virtual void shutdownInput();
-  virtual void shutdownOutput();
-  virtual ::java::nio::channels::SocketChannel * getChannel();
-  virtual jboolean getReuseAddress();
-  virtual void setReuseAddress(jboolean);
-  virtual jint getTrafficClass();
-  virtual void setTrafficClass(jint);
-  virtual jboolean isConnected();
-  virtual jboolean isBound();
-  virtual jboolean isClosed();
-  virtual jboolean isInputShutdown();
-  virtual jboolean isOutputShutdown();
-public: // actually package-private
-  static ::java::net::SocketImplFactory * factory;
-  ::java::net::SocketImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) impl;
-  jboolean implCreated;
-  jboolean bound;
-private:
-  jboolean inputShutdown;
-  jboolean outputShutdown;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_Socket__
diff --git a/libjava/java/net/SocketAddress.h b/libjava/java/net/SocketAddress.h
deleted file mode 100644
index 42f0f21b101..00000000000
--- a/libjava/java/net/SocketAddress.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_SocketAddress__
-#define __java_net_SocketAddress__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class SocketAddress;
-    }
-  }
-}
-
-class java::net::SocketAddress : public ::java::lang::Object
-{
-
-public:
-  SocketAddress();
-public: // actually package-private
-  static const jlong serialVersionUID = 5215720748342549866LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_SocketAddress__
diff --git a/libjava/java/net/SocketException.h b/libjava/java/net/SocketException.h
deleted file mode 100644
index 563e7f13b1e..00000000000
--- a/libjava/java/net/SocketException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_SocketException__
-#define __java_net_SocketException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class SocketException;
-    }
-  }
-}
-
-class java::net::SocketException : public ::java::io::IOException
-{
-
-public:
-  SocketException();
-  SocketException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5935874303556886934LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_SocketException__
diff --git a/libjava/java/net/SocketImpl.h b/libjava/java/net/SocketImpl.h
deleted file mode 100644
index 0daf5146da0..00000000000
--- a/libjava/java/net/SocketImpl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_SocketImpl__
-#define __java_net_SocketImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class SocketAddress;
-        class SocketImpl;
-    }
-  }
-}
-
-class java::net::SocketImpl : public ::java::lang::Object
-{
-
-public:
-  SocketImpl();
-public: // actually protected
-  virtual void create(jboolean) = 0;
-  virtual void connect(::java::lang::String *, jint) = 0;
-  virtual void connect(::java::net::InetAddress *, jint) = 0;
-  virtual void connect(::java::net::SocketAddress *, jint) = 0;
-  virtual void bind(::java::net::InetAddress *, jint) = 0;
-  virtual void listen(jint) = 0;
-  virtual void accept(::java::net::SocketImpl *) = 0;
-  virtual ::java::io::InputStream * getInputStream() = 0;
-  virtual ::java::io::OutputStream * getOutputStream() = 0;
-  virtual jint available() = 0;
-  virtual void close() = 0;
-  virtual ::java::io::FileDescriptor * getFileDescriptor();
-  virtual ::java::net::InetAddress * getInetAddress();
-  virtual jint getPort();
-  virtual jboolean supportsUrgentData();
-  virtual void sendUrgentData(jint) = 0;
-  virtual jint getLocalPort();
-public:
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual void shutdownInput();
-  virtual void shutdownOutput();
-public:
-  virtual void setOption(jint, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getOption(jint) = 0;
-public: // actually protected
-  ::java::net::InetAddress * __attribute__((aligned(__alignof__( ::java::lang::Object)))) address;
-  ::java::io::FileDescriptor * fd;
-  jint localport;
-  jint port;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_SocketImpl__
diff --git a/libjava/java/net/SocketImplFactory.h b/libjava/java/net/SocketImplFactory.h
deleted file mode 100644
index 2089846dfcc..00000000000
--- a/libjava/java/net/SocketImplFactory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_SocketImplFactory__
-#define __java_net_SocketImplFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class SocketImpl;
-        class SocketImplFactory;
-    }
-  }
-}
-
-class java::net::SocketImplFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::net::SocketImpl * createSocketImpl() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_net_SocketImplFactory__
diff --git a/libjava/java/net/SocketOptions.h b/libjava/java/net/SocketOptions.h
deleted file mode 100644
index 6a56d13468d..00000000000
--- a/libjava/java/net/SocketOptions.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_SocketOptions__
-#define __java_net_SocketOptions__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class SocketOptions;
-    }
-  }
-}
-
-class java::net::SocketOptions : public ::java::lang::Object
-{
-
-public:
-  virtual void setOption(jint, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getOption(jint) = 0;
-  static const jint SO_KEEPALIVE = 8;
-  static const jint SO_LINGER = 128;
-  static const jint SO_TIMEOUT = 4102;
-  static const jint SO_BINDADDR = 15;
-  static const jint SO_SNDBUF = 4097;
-  static const jint SO_RCVBUF = 4098;
-  static const jint SO_REUSEADDR = 4;
-  static const jint SO_BROADCAST = 32;
-  static const jint SO_OOBINLINE = 4099;
-  static const jint TCP_NODELAY = 1;
-  static const jint IP_MULTICAST_IF = 16;
-  static const jint IP_MULTICAST_IF2 = 31;
-  static const jint IP_MULTICAST_LOOP = 18;
-  static const jint IP_TOS = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_net_SocketOptions__
diff --git a/libjava/java/net/SocketPermission.h b/libjava/java/net/SocketPermission.h
deleted file mode 100644
index dae8e83afd9..00000000000
--- a/libjava/java/net/SocketPermission.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_SocketPermission__
-#define __java_net_SocketPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class SocketPermission;
-    }
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::net::SocketPermission : public ::java::security::Permission
-{
-
-public:
-  SocketPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static ::java::lang::String * processHostport(::java::lang::String *);
-  void setHostPort(::java::lang::String *);
-  void setActions(::java::lang::String *);
-  void setAction(::java::lang::String *);
-public:
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * getActions();
-  ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  JArray< ::java::net::InetAddress * > * getAddresses();
-  ::java::lang::String * getCanonicalHostName();
-public:
-  jboolean implies(::java::security::Permission *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public: // actually package-private
-  static const jlong serialVersionUID = -7204263841984476862LL;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::security::Permission)))) hostname;
-  ::java::net::InetAddress * address;
-  jint minport;
-  jint maxport;
-  static const jint MIN_PORT = 0;
-  static const jint MAX_PORT = 2147483647;
-  ::java::lang::String * actions;
-  jint actionmask;
-  static JArray< ::java::lang::String * > * ACTIONS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_SocketPermission__
diff --git a/libjava/java/net/SocketTimeoutException.h b/libjava/java/net/SocketTimeoutException.h
deleted file mode 100644
index a32424b91d7..00000000000
--- a/libjava/java/net/SocketTimeoutException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_SocketTimeoutException__
-#define __java_net_SocketTimeoutException__
-
-#pragma interface
-
-#include <java/io/InterruptedIOException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class SocketTimeoutException;
-    }
-  }
-}
-
-class java::net::SocketTimeoutException : public ::java::io::InterruptedIOException
-{
-
-public:
-  SocketTimeoutException();
-  SocketTimeoutException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8846654841826352300LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_SocketTimeoutException__
diff --git a/libjava/java/net/URI.h b/libjava/java/net/URI.h
deleted file mode 100644
index 9c8f4f2d1fc..00000000000
--- a/libjava/java/net/URI.h
+++ /dev/null
@@ -1,134 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URI__
-#define __java_net_URI__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-        class URL;
-    }
-  }
-}
-
-class java::net::URI : public ::java::lang::Object
-{
-
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static ::java::lang::String * getURIGroup(::java::util::regex::Matcher *, jint);
-  void parseURI(::java::lang::String *);
-  static ::java::lang::String * unquote(::java::lang::String *);
-  static ::java::lang::String * quote(::java::lang::String *);
-  static ::java::lang::String * quoteAuthority(::java::lang::String *);
-  static ::java::lang::String * quote(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * quoteHost(::java::lang::String *);
-  static ::java::lang::String * quotePath(::java::lang::String *);
-  static ::java::lang::String * quoteUserInfo(::java::lang::String *);
-public:
-  URI(::java::lang::String *);
-  URI(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jint, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  URI(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  URI(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  URI(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static ::java::net::URI * create(::java::lang::String *);
-  ::java::net::URI * parseServerAuthority();
-  ::java::net::URI * normalize();
-private:
-  ::java::lang::String * normalizePath(::java::lang::String *);
-  void removeLastSegment(::java::lang::StringBuffer *);
-public:
-  ::java::net::URI * resolve(::java::net::URI *);
-  ::java::net::URI * resolve(::java::lang::String *);
-  ::java::net::URI * relativize(::java::net::URI *);
-  ::java::net::URL * toURL();
-  ::java::lang::String * getScheme();
-  jboolean isAbsolute();
-  jboolean isOpaque();
-  ::java::lang::String * getRawSchemeSpecificPart();
-  ::java::lang::String * getSchemeSpecificPart();
-  ::java::lang::String * getRawAuthority();
-  ::java::lang::String * getAuthority();
-  ::java::lang::String * getRawUserInfo();
-  ::java::lang::String * getUserInfo();
-  ::java::lang::String * getHost();
-  jint getPort();
-  ::java::lang::String * getRawPath();
-  ::java::lang::String * getPath();
-  ::java::lang::String * getRawQuery();
-  ::java::lang::String * getQuery();
-  ::java::lang::String * getRawFragment();
-  ::java::lang::String * getFragment();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  jint target$compareTo(::java::net::URI *);
-private:
-  jint compareFragments(::java::net::URI *);
-public:
-  ::java::lang::String * toString();
-  ::java::lang::String * toASCIIString();
-private:
-  static ::java::lang::String * escapeCharacters(::java::lang::String *);
-public:
-  jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  static const jlong serialVersionUID = -6052424284110960213LL;
-private:
-  static ::java::lang::String * URI_REGEXP;
-  static ::java::lang::String * AUTHORITY_REGEXP;
-  static ::java::lang::String * RFC2396_DIGIT;
-  static ::java::lang::String * RFC2396_LOWALPHA;
-  static ::java::lang::String * RFC2396_UPALPHA;
-  static ::java::lang::String * RFC2396_ALPHA;
-  static ::java::lang::String * RFC2396_ALPHANUM;
-  static ::java::lang::String * RFC3986_UNRESERVED;
-  static ::java::lang::String * RFC3986_SUBDELIMS;
-  static ::java::lang::String * RFC3986_REG_NAME;
-  static ::java::lang::String * RFC3986_PCHAR;
-  static ::java::lang::String * RFC3986_SEGMENT;
-  static ::java::lang::String * RFC3986_PATH_SEGMENTS;
-  static ::java::lang::String * RFC3986_SSP;
-  static ::java::lang::String * RFC3986_HOST;
-  static ::java::lang::String * RFC3986_USERINFO;
-  static const jint SCHEME_GROUP = 2;
-  static const jint SCHEME_SPEC_PART_GROUP = 3;
-  static const jint AUTHORITY_GROUP = 5;
-  static const jint PATH_GROUP = 6;
-  static const jint QUERY_GROUP = 8;
-  static const jint FRAGMENT_GROUP = 10;
-  static const jint AUTHORITY_USERINFO_GROUP = 2;
-  static const jint AUTHORITY_HOST_GROUP = 3;
-  static const jint AUTHORITY_PORT_GROUP = 5;
-  static ::java::util::regex::Pattern * URI_PATTERN;
-  static ::java::util::regex::Pattern * AUTHORITY_PATTERN;
-  static ::java::lang::String * HEX;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) scheme;
-  ::java::lang::String * rawSchemeSpecificPart;
-  ::java::lang::String * schemeSpecificPart;
-  ::java::lang::String * rawAuthority;
-  ::java::lang::String * authority;
-  ::java::lang::String * rawUserInfo;
-  ::java::lang::String * userInfo;
-  ::java::lang::String * rawHost;
-  ::java::lang::String * host;
-  jint port;
-  ::java::lang::String * rawPath;
-  ::java::lang::String * path;
-  ::java::lang::String * rawQuery;
-  ::java::lang::String * query;
-  ::java::lang::String * rawFragment;
-  ::java::lang::String * fragment;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URI__
diff --git a/libjava/java/net/URISyntaxException.h b/libjava/java/net/URISyntaxException.h
deleted file mode 100644
index 93f1a4e6651..00000000000
--- a/libjava/java/net/URISyntaxException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URISyntaxException__
-#define __java_net_URISyntaxException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URISyntaxException;
-    }
-  }
-}
-
-class java::net::URISyntaxException : public ::java::lang::Exception
-{
-
-public:
-  URISyntaxException(::java::lang::String *, ::java::lang::String *);
-  URISyntaxException(::java::lang::String *, ::java::lang::String *, jint);
-  virtual ::java::lang::String * getInput();
-  virtual ::java::lang::String * getReason();
-  virtual jint getIndex();
-  virtual ::java::lang::String * getMessage();
-private:
-  static const jlong serialVersionUID = 2137979680897488891LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) input;
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URISyntaxException__
diff --git a/libjava/java/net/URL$1.h b/libjava/java/net/URL$1.h
deleted file mode 100644
index d81ebe4bc0d..00000000000
--- a/libjava/java/net/URL$1.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URL$1__
-#define __java_net_URL$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL$1;
-    }
-  }
-}
-
-class java::net::URL$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  URL$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URL$1__
diff --git a/libjava/java/net/URL.h b/libjava/java/net/URL.h
deleted file mode 100644
index f0553c968bc..00000000000
--- a/libjava/java/net/URL.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URL__
-#define __java_net_URL__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-        class URL;
-        class URLConnection;
-        class URLStreamHandler;
-        class URLStreamHandlerFactory;
-    }
-  }
-}
-
-class java::net::URL : public ::java::lang::Object
-{
-
-public:
-  URL(::java::lang::String *, ::java::lang::String *, jint, ::java::lang::String *);
-  URL(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  URL(::java::lang::String *, ::java::lang::String *, jint, ::java::lang::String *, ::java::net::URLStreamHandler *);
-  URL(::java::lang::String *);
-  URL(::java::net::URL *, ::java::lang::String *);
-  URL(::java::net::URL *, ::java::lang::String *, ::java::net::URLStreamHandler *);
-private:
-  URL(::java::net::URL *, ::java::lang::String *, ::java::net::URLStreamHandler *, jboolean);
-public:
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Object * getContent();
-  ::java::lang::Object * getContent(JArray< ::java::lang::Class * > *);
-  ::java::lang::String * getFile();
-  ::java::lang::String * getPath();
-  ::java::lang::String * getAuthority();
-  ::java::lang::String * getHost();
-  jint getPort();
-  jint getDefaultPort();
-  ::java::lang::String * getProtocol();
-  ::java::lang::String * getRef();
-  ::java::lang::String * getUserInfo();
-  ::java::lang::String * getQuery();
-  jint hashCode();
-  ::java::net::URLConnection * openConnection();
-  ::java::io::InputStream * openStream();
-  jboolean sameFile(::java::net::URL *);
-public: // actually protected
-  void set(::java::lang::String *, ::java::lang::String *, jint, ::java::lang::String *, ::java::lang::String *);
-  void set(::java::lang::String *, ::java::lang::String *, jint, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  static void setURLStreamHandlerFactory(::java::net::URLStreamHandlerFactory *);
-  ::java::lang::String * toExternalForm();
-  ::java::lang::String * toString();
-private:
-  static ::java::net::URLStreamHandler * getURLStreamHandler(::java::lang::String *);
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  ::java::net::URI * toURI();
-private:
-  static ::java::lang::String * DEFAULT_SEARCH_PATH;
-  static ::java::lang::ClassLoader * systemClassLoader;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) protocol;
-  ::java::lang::String * authority;
-  ::java::lang::String * host;
-  ::java::lang::String * userInfo;
-  jint port;
-  ::java::lang::String * file;
-  ::java::lang::String * ref;
-  jint hashCode__;
-public: // actually package-private
-  ::java::net::URLStreamHandler * ph;
-private:
-  static ::java::net::URLStreamHandlerFactory * factory;
-  static const jlong serialVersionUID = -7627629688361524110LL;
-  static ::java::util::HashMap * ph_cache;
-  static jboolean cache_handlers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URL__
diff --git a/libjava/java/net/URLClassLoader$1.h b/libjava/java/net/URLClassLoader$1.h
deleted file mode 100644
index d7f57791125..00000000000
--- a/libjava/java/net/URLClassLoader$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$1__
-#define __java_net_URLClassLoader$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URLClassLoader;
-        class URLClassLoader$1;
-    }
-    namespace security
-    {
-        class CodeSource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  URLClassLoader$1(::java::net::URLClassLoader *, ::java::lang::String *, JArray< jbyte > *, ::java::security::CodeSource *);
-public:
-  ::java::lang::Object * run();
-public: // actually package-private
-  ::java::net::URLClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::lang::String * val$className;
-  JArray< jbyte > * val$classData;
-  ::java::security::CodeSource * val$source;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$1__
diff --git a/libjava/java/net/URLClassLoader$2.h b/libjava/java/net/URLClassLoader$2.h
deleted file mode 100644
index 274d4c33a1e..00000000000
--- a/libjava/java/net/URLClassLoader$2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$2__
-#define __java_net_URLClassLoader$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URLClassLoader$2;
-    }
-  }
-}
-
-class java::net::URLClassLoader$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  URLClassLoader$2(::java::lang::ClassLoader *, ::java::lang::Object *);
-public:
-  ::java::lang::Object * run();
-private:
-  ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$parent;
-  ::java::lang::Object * val$securityContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$2__
diff --git a/libjava/java/net/URLClassLoader$CoreResource.h b/libjava/java/net/URLClassLoader$CoreResource.h
deleted file mode 100644
index ff3314a33bf..00000000000
--- a/libjava/java/net/URLClassLoader$CoreResource.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$CoreResource__
-#define __java_net_URLClassLoader$CoreResource__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$Resource.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class Core;
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$CoreResource;
-        class URLClassLoader$CoreURLLoader;
-    }
-  }
-}
-
-class java::net::URLClassLoader$CoreResource : public ::java::net::URLClassLoader$Resource
-{
-
-public: // actually package-private
-  URLClassLoader$CoreResource(::java::net::URLClassLoader$CoreURLLoader *, ::java::lang::String *, ::gnu::gcj::Core *);
-  ::java::io::InputStream * getInputStream();
-public:
-  jint getLength();
-  ::java::net::URL * getURL();
-private:
-  ::gnu::gcj::Core * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$Resource)))) core;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$CoreResource__
diff --git a/libjava/java/net/URLClassLoader$CoreURLLoader.h b/libjava/java/net/URLClassLoader$CoreURLLoader.h
deleted file mode 100644
index 3c701cddf3a..00000000000
--- a/libjava/java/net/URLClassLoader$CoreURLLoader.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$CoreURLLoader__
-#define __java_net_URLClassLoader$CoreURLLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$URLLoader.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$CoreURLLoader;
-        class URLClassLoader$Resource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$CoreURLLoader : public ::java::net::URLClassLoader$URLLoader
-{
-
-public: // actually package-private
-  URLClassLoader$CoreURLLoader(::java::net::URLClassLoader *, ::java::net::URL *);
-  ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$URLLoader)))) dir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$CoreURLLoader__
diff --git a/libjava/java/net/URLClassLoader$FileResource.h b/libjava/java/net/URLClassLoader$FileResource.h
deleted file mode 100644
index a98e9bf223a..00000000000
--- a/libjava/java/net/URLClassLoader$FileResource.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$FileResource__
-#define __java_net_URLClassLoader$FileResource__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$Resource.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$FileResource;
-        class URLClassLoader$FileURLLoader;
-    }
-  }
-}
-
-class java::net::URLClassLoader$FileResource : public ::java::net::URLClassLoader$Resource
-{
-
-public: // actually package-private
-  URLClassLoader$FileResource(::java::net::URLClassLoader$FileURLLoader *, ::java::io::File *);
-  ::java::io::InputStream * getInputStream();
-public:
-  jint getLength();
-  ::java::net::URL * getURL();
-public: // actually package-private
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$Resource)))) file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$FileResource__
diff --git a/libjava/java/net/URLClassLoader$FileURLLoader.h b/libjava/java/net/URLClassLoader$FileURLLoader.h
deleted file mode 100644
index ff0b7dc7ce6..00000000000
--- a/libjava/java/net/URLClassLoader$FileURLLoader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$FileURLLoader__
-#define __java_net_URLClassLoader$FileURLLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$URLLoader.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$FileURLLoader;
-        class URLClassLoader$Resource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$FileURLLoader : public ::java::net::URLClassLoader$URLLoader
-{
-
-public: // actually package-private
-  URLClassLoader$FileURLLoader(::java::net::URLClassLoader *, ::java::net::URL *, ::java::net::URL *);
-  ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *);
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$URLLoader)))) dir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$FileURLLoader__
diff --git a/libjava/java/net/URLClassLoader$JarURLLoader.h b/libjava/java/net/URLClassLoader$JarURLLoader.h
deleted file mode 100644
index f1a36153a2c..00000000000
--- a/libjava/java/net/URLClassLoader$JarURLLoader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$JarURLLoader__
-#define __java_net_URLClassLoader$JarURLLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$URLLoader.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$JarURLLoader;
-        class URLClassLoader$Resource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$JarURLLoader : public ::java::net::URLClassLoader$URLLoader
-{
-
-public:
-  URLClassLoader$JarURLLoader(::java::net::URLClassLoader *, ::java::net::URL *, ::java::net::URL *);
-public: // actually package-private
-  ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *);
-  ::java::util::jar::Manifest * getManifest();
-  ::java::util::Vector * getClassPath();
-  ::java::util::jar::JarFile * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$URLLoader)))) jarfile;
-  ::java::net::URL * baseJarURL;
-  ::java::util::Vector * classPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$JarURLLoader__
diff --git a/libjava/java/net/URLClassLoader$JarURLResource.h b/libjava/java/net/URLClassLoader$JarURLResource.h
deleted file mode 100644
index 0db0fdeec99..00000000000
--- a/libjava/java/net/URLClassLoader$JarURLResource.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$JarURLResource__
-#define __java_net_URLClassLoader$JarURLResource__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$Resource.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$JarURLLoader;
-        class URLClassLoader$JarURLResource;
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::net::URLClassLoader$JarURLResource : public ::java::net::URLClassLoader$Resource
-{
-
-public: // actually package-private
-  URLClassLoader$JarURLResource(::java::net::URLClassLoader$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__( ::java::net::URLClassLoader$Resource)))) entry;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$JarURLResource__
diff --git a/libjava/java/net/URLClassLoader$RemoteResource.h b/libjava/java/net/URLClassLoader$RemoteResource.h
deleted file mode 100644
index 10d2622c9fe..00000000000
--- a/libjava/java/net/URLClassLoader$RemoteResource.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$RemoteResource__
-#define __java_net_URLClassLoader$RemoteResource__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$Resource.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$RemoteResource;
-        class URLClassLoader$RemoteURLLoader;
-    }
-  }
-}
-
-class java::net::URLClassLoader$RemoteResource : public ::java::net::URLClassLoader$Resource
-{
-
-public: // actually package-private
-  URLClassLoader$RemoteResource(::java::net::URLClassLoader$RemoteURLLoader *, ::java::lang::String *, ::java::net::URL *, ::java::io::InputStream *, jint);
-  ::java::io::InputStream * getInputStream();
-public:
-  jint getLength();
-  ::java::net::URL * getURL();
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$Resource)))) url;
-  ::java::io::InputStream * stream;
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$RemoteResource__
diff --git a/libjava/java/net/URLClassLoader$RemoteURLLoader.h b/libjava/java/net/URLClassLoader$RemoteURLLoader.h
deleted file mode 100644
index 7c2876b4ef6..00000000000
--- a/libjava/java/net/URLClassLoader$RemoteURLLoader.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$RemoteURLLoader__
-#define __java_net_URLClassLoader$RemoteURLLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$URLLoader.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$RemoteURLLoader;
-        class URLClassLoader$Resource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$RemoteURLLoader : public ::java::net::URLClassLoader$URLLoader
-{
-
-public: // actually package-private
-  URLClassLoader$RemoteURLLoader(::java::net::URLClassLoader *, ::java::net::URL *);
-  ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$URLLoader)))) protocol;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$RemoteURLLoader__
diff --git a/libjava/java/net/URLClassLoader$Resource.h b/libjava/java/net/URLClassLoader$Resource.h
deleted file mode 100644
index 7fc102a9224..00000000000
--- a/libjava/java/net/URLClassLoader$Resource.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$Resource__
-#define __java_net_URLClassLoader$Resource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$Resource;
-        class URLClassLoader$URLLoader;
-    }
-    namespace security
-    {
-        class CodeSource;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::net::URLClassLoader$Resource : public ::java::lang::Object
-{
-
-public: // actually package-private
-  URLClassLoader$Resource(::java::net::URLClassLoader$URLLoader *);
-  virtual ::java::security::CodeSource * getCodeSource();
-  virtual JArray< ::java::security::cert::Certificate * > * getCertificates();
-  virtual ::java::net::URL * getURL() = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::io::InputStream * getInputStream() = 0;
-  ::java::net::URLClassLoader$URLLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$Resource__
diff --git a/libjava/java/net/URLClassLoader$SoResource.h b/libjava/java/net/URLClassLoader$SoResource.h
deleted file mode 100644
index dce7601125f..00000000000
--- a/libjava/java/net/URLClassLoader$SoResource.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$SoResource__
-#define __java_net_URLClassLoader$SoResource__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$Resource.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$SoResource;
-        class URLClassLoader$SoURLLoader;
-    }
-  }
-}
-
-class java::net::URLClassLoader$SoResource : public ::java::net::URLClassLoader$Resource
-{
-
-public: // actually package-private
-  URLClassLoader$SoResource(::java::net::URLClassLoader$SoURLLoader *, ::java::net::URL *);
-  ::java::io::InputStream * getInputStream();
-public:
-  jint getLength();
-  ::java::net::URL * getURL();
-public: // actually package-private
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$Resource)))) url;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$SoResource__
diff --git a/libjava/java/net/URLClassLoader$SoURLLoader.h b/libjava/java/net/URLClassLoader$SoURLLoader.h
deleted file mode 100644
index 85d2d2e991a..00000000000
--- a/libjava/java/net/URLClassLoader$SoURLLoader.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$SoURLLoader__
-#define __java_net_URLClassLoader$SoURLLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$URLLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class SharedLibHelper;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$Resource;
-        class URLClassLoader$SoURLLoader;
-    }
-  }
-}
-
-class java::net::URLClassLoader$SoURLLoader : public ::java::net::URLClassLoader$URLLoader
-{
-
-public: // actually package-private
-  URLClassLoader$SoURLLoader(::java::net::URLClassLoader *, ::java::net::URL *);
-  URLClassLoader$SoURLLoader(::java::net::URLClassLoader *, ::java::net::URL *, ::java::net::URL *);
-  ::java::lang::Class * getClass(::java::lang::String *);
-  ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *);
-  ::gnu::gcj::runtime::SharedLibHelper * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$URLLoader)))) helper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$SoURLLoader__
diff --git a/libjava/java/net/URLClassLoader$URLLoader.h b/libjava/java/net/URLClassLoader$URLLoader.h
deleted file mode 100644
index f205d74b3db..00000000000
--- a/libjava/java/net/URLClassLoader$URLLoader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$URLLoader__
-#define __java_net_URLClassLoader$URLLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$Resource;
-        class URLClassLoader$URLLoader;
-    }
-    namespace security
-    {
-        class CodeSource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$URLLoader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  URLClassLoader$URLLoader(::java::net::URLClassLoader *, ::java::net::URL *);
-  URLClassLoader$URLLoader(::java::net::URLClassLoader *, ::java::net::URL *, ::java::net::URL *);
-  virtual ::java::lang::Class * getClass(::java::lang::String *);
-  virtual ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *) = 0;
-  virtual ::java::util::jar::Manifest * getManifest();
-  virtual ::java::util::Vector * getClassPath();
-  ::java::net::URLClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) classloader;
-  ::java::net::URL * baseURL;
-  ::java::security::CodeSource * noCertCodeSource;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$URLLoader__
diff --git a/libjava/java/net/URLClassLoader.h b/libjava/java/net/URLClassLoader.h
deleted file mode 100644
index 2e5f15c9bda..00000000000
--- a/libjava/java/net/URLClassLoader.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader__
-#define __java_net_URLClassLoader__
-
-#pragma interface
-
-#include <java/security/SecureClassLoader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace net
-      {
-        namespace loader
-        {
-            class Resource;
-            class URLStreamHandlerCache;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLStreamHandlerFactory;
-    }
-    namespace security
-    {
-        class AccessControlContext;
-        class CodeSource;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::net::URLClassLoader : public ::java::security::SecureClassLoader
-{
-
-public:
-  URLClassLoader(JArray< ::java::net::URL * > *);
-  URLClassLoader(JArray< ::java::net::URL * > *, ::java::lang::ClassLoader *);
-public: // actually package-private
-  URLClassLoader(::java::lang::ClassLoader *, ::java::security::AccessControlContext *);
-public:
-  URLClassLoader(JArray< ::java::net::URL * > *, ::java::lang::ClassLoader *, ::java::net::URLStreamHandlerFactory *);
-public: // actually protected
-  virtual void addURL(::java::net::URL *);
-private:
-  void addURLImpl(::java::net::URL *);
-  void addURLs(JArray< ::java::net::URL * > *);
-  ::java::lang::String * getAttributeValue(::java::util::jar::Attributes$Name *, ::java::util::jar::Attributes *, ::java::util::jar::Attributes *);
-public: // actually protected
-  virtual ::java::lang::Package * definePackage(::java::lang::String *, ::java::util::jar::Manifest *, ::java::net::URL *);
-  virtual ::java::lang::Class * findClass(::java::lang::String *);
-public:
-  virtual ::java::lang::String * toString();
-private:
-  ::gnu::java::net::loader::Resource * findURLResource(::java::lang::String *);
-public:
-  virtual ::java::net::URL * findResource(::java::lang::String *);
-  virtual ::java::util::Enumeration * findResources(::java::lang::String *);
-public: // actually protected
-  virtual ::java::security::PermissionCollection * getPermissions(::java::security::CodeSource *);
-public:
-  virtual JArray< ::java::net::URL * > * getURLs();
-  static ::java::net::URLClassLoader * newInstance(JArray< ::java::net::URL * > *);
-  static ::java::net::URLClassLoader * newInstance(JArray< ::java::net::URL * > *, ::java::lang::ClassLoader *);
-public: // actually package-private
-  static ::java::lang::Class * access$0(::java::net::URLClassLoader *, ::java::lang::String *, JArray< jbyte > *, jint, jint, ::java::security::CodeSource *);
-private:
-  static ::gnu::java::net::loader::URLStreamHandlerCache * factoryCache;
-  static ::java::lang::String * URL_LOADER_PREFIX;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::security::SecureClassLoader)))) urls;
-  ::java::util::Vector * urlinfos;
-  ::java::net::URLStreamHandlerFactory * factory;
-  ::java::security::AccessControlContext * securityContext;
-  ::java::lang::String * thisString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader__
diff --git a/libjava/java/net/URLConnection.h b/libjava/java/net/URLConnection.h
deleted file mode 100644
index c40d9598b9d..00000000000
--- a/libjava/java/net/URLConnection.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLConnection__
-#define __java_net_URLConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ContentHandler;
-        class ContentHandlerFactory;
-        class FileNameMap;
-        class URL;
-        class URLConnection;
-    }
-    namespace security
-    {
-        class Permission;
-    }
-    namespace text
-    {
-        class ParsePosition;
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class java::net::URLConnection : public ::java::lang::Object
-{
-
-public: // actually protected
-  URLConnection(::java::net::URL *);
-public:
-  virtual void connect() = 0;
-  virtual ::java::net::URL * getURL();
-  virtual jint getConnectTimeout();
-  virtual void setConnectTimeout(jint);
-  virtual jint getReadTimeout();
-  virtual void setReadTimeout(jint);
-  virtual jint getContentLength();
-  virtual ::java::lang::String * getContentType();
-  virtual ::java::lang::String * getContentEncoding();
-  virtual jlong getExpiration();
-  virtual jlong getDate();
-  virtual jlong getLastModified();
-  virtual ::java::lang::String * getHeaderField(jint);
-  virtual ::java::lang::String * getHeaderField(::java::lang::String *);
-  virtual ::java::util::Map * getHeaderFields();
-  virtual jint getHeaderFieldInt(::java::lang::String *, jint);
-  virtual jlong getHeaderFieldDate(::java::lang::String *, jlong);
-  virtual ::java::lang::String * getHeaderFieldKey(jint);
-  virtual ::java::lang::Object * getContent();
-  virtual ::java::lang::Object * getContent(JArray< ::java::lang::Class * > *);
-  virtual ::java::security::Permission * getPermission();
-  virtual ::java::io::InputStream * getInputStream();
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual ::java::lang::String * toString();
-  virtual void setDoInput(jboolean);
-  virtual jboolean getDoInput();
-  virtual void setDoOutput(jboolean);
-  virtual jboolean getDoOutput();
-  virtual void setAllowUserInteraction(jboolean);
-  virtual jboolean getAllowUserInteraction();
-  static void setDefaultAllowUserInteraction(jboolean);
-  static jboolean getDefaultAllowUserInteraction();
-  virtual void setUseCaches(jboolean);
-  virtual jboolean getUseCaches();
-  virtual void setIfModifiedSince(jlong);
-  virtual jlong getIfModifiedSince();
-  virtual jboolean getDefaultUseCaches();
-  virtual void setDefaultUseCaches(jboolean);
-  virtual void setRequestProperty(::java::lang::String *, ::java::lang::String *);
-  virtual void addRequestProperty(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getRequestProperty(::java::lang::String *);
-  virtual ::java::util::Map * getRequestProperties();
-  static void setDefaultRequestProperty(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * getDefaultRequestProperty(::java::lang::String *);
-  static void setContentHandlerFactory(::java::net::ContentHandlerFactory *);
-  static ::java::lang::String * guessContentTypeFromName(::java::lang::String *);
-  static ::java::lang::String * guessContentTypeFromStream(::java::io::InputStream *);
-  static ::java::net::FileNameMap * getFileNameMap();
-  static void setFileNameMap(::java::net::FileNameMap *);
-private:
-  ::java::net::ContentHandler * getContentHandler(::java::lang::String *);
-  static void initializeDateFormats();
-  static ::java::net::FileNameMap * fileNameMap;
-  static ::java::net::ContentHandlerFactory * factory;
-  static jboolean defaultAllowUserInteraction;
-  static jboolean defaultUseCaches;
-  static ::java::net::ContentHandlerFactory * defaultFactory;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) allowUserInteraction;
-  jboolean connected;
-  jboolean doInput;
-  jboolean doOutput;
-  jboolean useCaches;
-  jlong ifModifiedSince;
-  ::java::net::URL * url;
-private:
-  static JArray< ::java::text::SimpleDateFormat * > * dateFormats;
-  static jboolean dateformats_initialized;
-  jint connectTimeout;
-  jint readTimeout;
-  ::java::text::ParsePosition * position;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLConnection__
diff --git a/libjava/java/net/URLDecoder.h b/libjava/java/net/URLDecoder.h
deleted file mode 100644
index a6586cf741a..00000000000
--- a/libjava/java/net/URLDecoder.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLDecoder__
-#define __java_net_URLDecoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URLDecoder;
-    }
-  }
-}
-
-class java::net::URLDecoder : public ::java::lang::Object
-{
-
-public:
-  URLDecoder();
-  static ::java::lang::String * decode(::java::lang::String *);
-  static ::java::lang::String * decode(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLDecoder__
diff --git a/libjava/java/net/URLEncoder.h b/libjava/java/net/URLEncoder.h
deleted file mode 100644
index 87b3c574f78..00000000000
--- a/libjava/java/net/URLEncoder.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLEncoder__
-#define __java_net_URLEncoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URLEncoder;
-    }
-  }
-}
-
-class java::net::URLEncoder : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::String * encode(::java::lang::String *);
-  static ::java::lang::String * encode(::java::lang::String *, ::java::lang::String *);
-private:
-  static jboolean isSafe(jchar);
-  URLEncoder();
-  static ::java::lang::String * hex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLEncoder__
diff --git a/libjava/java/net/URLStreamHandler.h b/libjava/java/net/URLStreamHandler.h
deleted file mode 100644
index ebcd44159c2..00000000000
--- a/libjava/java/net/URLStreamHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLStreamHandler__
-#define __java_net_URLStreamHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class URL;
-        class URLConnection;
-        class URLStreamHandler;
-    }
-  }
-}
-
-class java::net::URLStreamHandler : public ::java::lang::Object
-{
-
-public:
-  URLStreamHandler();
-public: // actually protected
-  virtual ::java::net::URLConnection * openConnection(::java::net::URL *) = 0;
-  virtual void parseURL(::java::net::URL *, ::java::lang::String *, jint, jint);
-private:
-  static ::java::lang::String * canonicalizeFilename(::java::lang::String *);
-public: // actually protected
-  virtual jboolean sameFile(::java::net::URL *, ::java::net::URL *);
-  virtual void setURL(::java::net::URL *, ::java::lang::String *, ::java::lang::String *, jint, ::java::lang::String *, ::java::lang::String *);
-  virtual void setURL(::java::net::URL *, ::java::lang::String *, ::java::lang::String *, jint, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual jboolean equals(::java::net::URL *, ::java::net::URL *);
-  virtual jboolean hostsEqual(::java::net::URL *, ::java::net::URL *);
-  virtual ::java::net::InetAddress * getHostAddress(::java::net::URL *);
-  virtual jint getDefaultPort();
-  virtual jint hashCode(::java::net::URL *);
-  virtual ::java::lang::String * toExternalForm(::java::net::URL *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLStreamHandler__
diff --git a/libjava/java/net/URLStreamHandlerFactory.h b/libjava/java/net/URLStreamHandlerFactory.h
deleted file mode 100644
index dde45e239a2..00000000000
--- a/libjava/java/net/URLStreamHandlerFactory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLStreamHandlerFactory__
-#define __java_net_URLStreamHandlerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URLStreamHandler;
-        class URLStreamHandlerFactory;
-    }
-  }
-}
-
-class java::net::URLStreamHandlerFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::net::URLStreamHandler * createURLStreamHandler(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_net_URLStreamHandlerFactory__
diff --git a/libjava/java/net/UnknownHostException.h b/libjava/java/net/UnknownHostException.h
deleted file mode 100644
index 965d439f3bf..00000000000
--- a/libjava/java/net/UnknownHostException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_UnknownHostException__
-#define __java_net_UnknownHostException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class UnknownHostException;
-    }
-  }
-}
-
-class java::net::UnknownHostException : public ::java::io::IOException
-{
-
-public:
-  UnknownHostException();
-  UnknownHostException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4639126076052875403LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_UnknownHostException__
diff --git a/libjava/java/net/UnknownServiceException.h b/libjava/java/net/UnknownServiceException.h
deleted file mode 100644
index 1bdc8021c3d..00000000000
--- a/libjava/java/net/UnknownServiceException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_UnknownServiceException__
-#define __java_net_UnknownServiceException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class UnknownServiceException;
-    }
-  }
-}
-
-class java::net::UnknownServiceException : public ::java::io::IOException
-{
-
-public:
-  UnknownServiceException();
-  UnknownServiceException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4169033248853639508LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_UnknownServiceException__
diff --git a/libjava/java/net/VMInetAddress.h b/libjava/java/net/VMInetAddress.h
deleted file mode 100644
index e093e2c2e9c..00000000000
--- a/libjava/java/net/VMInetAddress.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_VMInetAddress__
-#define __java_net_VMInetAddress__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class VMInetAddress;
-    }
-  }
-}
-
-class java::net::VMInetAddress : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMInetAddress();
-public:
-  static ::java::lang::String * getLocalHostname();
-  static JArray< jbyte > * lookupInaddrAny();
-  static ::java::lang::String * getHostByAddr(JArray< jbyte > *);
-  static JArray< JArray< jbyte > * > * getHostByName(::java::lang::String *);
-  static JArray< jbyte > * aton(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_VMInetAddress__
diff --git a/libjava/java/net/VMNetworkInterface.h b/libjava/java/net/VMNetworkInterface.h
deleted file mode 100644
index 792c5337a57..00000000000
--- a/libjava/java/net/VMNetworkInterface.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_VMNetworkInterface__
-#define __java_net_VMNetworkInterface__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class VMNetworkInterface;
-    }
-  }
-}
-
-class java::net::VMNetworkInterface : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMNetworkInterface();
-public:
-  static ::java::util::Vector * getInterfaces();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_VMNetworkInterface__
diff --git a/libjava/java/net/VMURLConnection.h b/libjava/java/net/VMURLConnection.h
deleted file mode 100644
index 0c0828ae457..00000000000
--- a/libjava/java/net/VMURLConnection.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_VMURLConnection__
-#define __java_net_VMURLConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class VMURLConnection;
-    }
-  }
-}
-
-class java::net::VMURLConnection : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMURLConnection();
-private:
-  static void init();
-  static ::java::lang::String * guessContentTypeFromBuffer(JArray< jbyte > *, jint);
-public: // actually package-private
-  static ::java::lang::String * guessContentTypeFromStream(::java::io::InputStream *);
-public:
-  static const jint LENGTH = 1024;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_VMURLConnection__
diff --git a/libjava/java/nio/Buffer.h b/libjava/java/nio/Buffer.h
deleted file mode 100644
index fd985db9421..00000000000
--- a/libjava/java/nio/Buffer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_Buffer__
-#define __java_nio_Buffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class Buffer;
-    }
-  }
-}
-
-class java::nio::Buffer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Buffer(jint, jint, jint, jint);
-public:
-  virtual jint capacity();
-  virtual ::java::nio::Buffer * clear();
-  virtual ::java::nio::Buffer * flip();
-  virtual jboolean hasRemaining();
-  virtual jboolean isReadOnly() = 0;
-  virtual jint limit();
-  virtual ::java::nio::Buffer * limit(jint);
-  virtual ::java::nio::Buffer * mark();
-  virtual jint position();
-  virtual ::java::nio::Buffer * position(jint);
-  virtual jint remaining();
-  virtual ::java::nio::Buffer * reset();
-  virtual ::java::nio::Buffer * rewind();
-public: // actually package-private
-  virtual void checkForUnderflow();
-  virtual void checkForUnderflow(jint);
-  virtual void checkForOverflow();
-  virtual void checkForOverflow(jint);
-  virtual void checkIndex(jint);
-  virtual void checkIfReadOnly();
-  static void checkArraySize(jint, jint, jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) cap;
-  jint limit__;
-  jint pos;
-  jint mark__;
-  ::gnu::gcj::RawData * address;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_Buffer__
diff --git a/libjava/java/nio/BufferOverflowException.h b/libjava/java/nio/BufferOverflowException.h
deleted file mode 100644
index 2c2a8c2c4fb..00000000000
--- a/libjava/java/nio/BufferOverflowException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_BufferOverflowException__
-#define __java_nio_BufferOverflowException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class BufferOverflowException;
-    }
-  }
-}
-
-class java::nio::BufferOverflowException : public ::java::lang::RuntimeException
-{
-
-public:
-  BufferOverflowException();
-private:
-  static const jlong serialVersionUID = -5484897634319144535LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_BufferOverflowException__
diff --git a/libjava/java/nio/BufferUnderflowException.h b/libjava/java/nio/BufferUnderflowException.h
deleted file mode 100644
index 6b52f20c74c..00000000000
--- a/libjava/java/nio/BufferUnderflowException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_BufferUnderflowException__
-#define __java_nio_BufferUnderflowException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class BufferUnderflowException;
-    }
-  }
-}
-
-class java::nio::BufferUnderflowException : public ::java::lang::RuntimeException
-{
-
-public:
-  BufferUnderflowException();
-private:
-  static const jlong serialVersionUID = -1713313658691622206LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_BufferUnderflowException__
diff --git a/libjava/java/nio/ByteBuffer.h b/libjava/java/nio/ByteBuffer.h
deleted file mode 100644
index 08f821b2825..00000000000
--- a/libjava/java/nio/ByteBuffer.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_ByteBuffer__
-#define __java_nio_ByteBuffer__
-
-#pragma interface
-
-#include <java/nio/Buffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ByteOrder;
-        class CharBuffer;
-        class DoubleBuffer;
-        class FloatBuffer;
-        class IntBuffer;
-        class LongBuffer;
-        class ShortBuffer;
-    }
-  }
-}
-
-class java::nio::ByteBuffer : public ::java::nio::Buffer
-{
-
-public: // actually package-private
-  ByteBuffer(jint, jint, jint, jint);
-public:
-  static ::java::nio::ByteBuffer * allocateDirect(jint);
-  static ::java::nio::ByteBuffer * allocate(jint);
-  static ::java::nio::ByteBuffer * wrap(JArray< jbyte > *, jint, jint);
-  static ::java::nio::ByteBuffer * wrap(JArray< jbyte > *);
-  virtual ::java::nio::ByteBuffer * get(JArray< jbyte > *, jint, jint);
-  virtual ::java::nio::ByteBuffer * get(JArray< jbyte > *);
-  virtual ::java::nio::ByteBuffer * put(::java::nio::ByteBuffer *);
-  virtual ::java::nio::ByteBuffer * put(JArray< jbyte > *, jint, jint);
-  virtual ::java::nio::ByteBuffer * put(JArray< jbyte > *);
-  virtual jboolean hasArray();
-  virtual JArray< jbyte > * array();
-  virtual jint arrayOffset();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::ByteBuffer *);
-  virtual ::java::nio::ByteOrder * order();
-  virtual ::java::nio::ByteBuffer * order(::java::nio::ByteOrder *);
-  virtual jbyte get() = 0;
-  virtual ::java::nio::ByteBuffer * put(jbyte) = 0;
-  virtual jbyte get(jint) = 0;
-  virtual ::java::nio::ByteBuffer * put(jint, jbyte) = 0;
-  virtual ::java::nio::ByteBuffer * compact() = 0;
-public: // actually package-private
-  virtual void shiftDown(jint, jint, jint);
-public:
-  virtual jboolean isDirect() = 0;
-  virtual ::java::nio::ByteBuffer * slice() = 0;
-  virtual ::java::nio::ByteBuffer * duplicate() = 0;
-  virtual ::java::nio::ByteBuffer * asReadOnlyBuffer() = 0;
-  virtual ::java::nio::ShortBuffer * asShortBuffer() = 0;
-  virtual ::java::nio::CharBuffer * asCharBuffer() = 0;
-  virtual ::java::nio::IntBuffer * asIntBuffer() = 0;
-  virtual ::java::nio::LongBuffer * asLongBuffer() = 0;
-  virtual ::java::nio::FloatBuffer * asFloatBuffer() = 0;
-  virtual ::java::nio::DoubleBuffer * asDoubleBuffer() = 0;
-  virtual jchar getChar() = 0;
-  virtual ::java::nio::ByteBuffer * putChar(jchar) = 0;
-  virtual jchar getChar(jint) = 0;
-  virtual ::java::nio::ByteBuffer * putChar(jint, jchar) = 0;
-  virtual jshort getShort() = 0;
-  virtual ::java::nio::ByteBuffer * putShort(jshort) = 0;
-  virtual jshort getShort(jint) = 0;
-  virtual ::java::nio::ByteBuffer * putShort(jint, jshort) = 0;
-  virtual jint getInt() = 0;
-  virtual ::java::nio::ByteBuffer * putInt(jint) = 0;
-  virtual jint getInt(jint) = 0;
-  virtual ::java::nio::ByteBuffer * putInt(jint, jint) = 0;
-  virtual jlong getLong() = 0;
-  virtual ::java::nio::ByteBuffer * putLong(jlong) = 0;
-  virtual jlong getLong(jint) = 0;
-  virtual ::java::nio::ByteBuffer * putLong(jint, jlong) = 0;
-  virtual jfloat getFloat() = 0;
-  virtual ::java::nio::ByteBuffer * putFloat(jfloat) = 0;
-  virtual jfloat getFloat(jint) = 0;
-  virtual ::java::nio::ByteBuffer * putFloat(jint, jfloat) = 0;
-  virtual jdouble getDouble() = 0;
-  virtual ::java::nio::ByteBuffer * putDouble(jdouble) = 0;
-  virtual jdouble getDouble(jint) = 0;
-  virtual ::java::nio::ByteBuffer * putDouble(jint, jdouble) = 0;
-  virtual ::java::lang::String * toString();
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  ::java::nio::ByteOrder * __attribute__((aligned(__alignof__( ::java::nio::Buffer)))) endian;
-  jint array_offset;
-  JArray< jbyte > * backing_buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_ByteBuffer__
diff --git a/libjava/java/nio/ByteBufferHelper.h b/libjava/java/nio/ByteBufferHelper.h
deleted file mode 100644
index 851b57aad61..00000000000
--- a/libjava/java/nio/ByteBufferHelper.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_ByteBufferHelper__
-#define __java_nio_ByteBufferHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ByteBufferHelper;
-        class ByteOrder;
-    }
-  }
-}
-
-class java::nio::ByteBufferHelper : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ByteBufferHelper();
-public:
-  static jchar getChar(::java::nio::ByteBuffer *, ::java::nio::ByteOrder *);
-  static void putChar(::java::nio::ByteBuffer *, jchar, ::java::nio::ByteOrder *);
-  static jchar getChar(::java::nio::ByteBuffer *, jint, ::java::nio::ByteOrder *);
-  static void putChar(::java::nio::ByteBuffer *, jint, jchar, ::java::nio::ByteOrder *);
-  static jshort getShort(::java::nio::ByteBuffer *, ::java::nio::ByteOrder *);
-  static void putShort(::java::nio::ByteBuffer *, jshort, ::java::nio::ByteOrder *);
-  static jshort getShort(::java::nio::ByteBuffer *, jint, ::java::nio::ByteOrder *);
-  static void putShort(::java::nio::ByteBuffer *, jint, jshort, ::java::nio::ByteOrder *);
-  static jint getInt(::java::nio::ByteBuffer *, ::java::nio::ByteOrder *);
-  static void putInt(::java::nio::ByteBuffer *, jint, ::java::nio::ByteOrder *);
-  static jint getInt(::java::nio::ByteBuffer *, jint, ::java::nio::ByteOrder *);
-  static void putInt(::java::nio::ByteBuffer *, jint, jint, ::java::nio::ByteOrder *);
-  static jlong getLong(::java::nio::ByteBuffer *, ::java::nio::ByteOrder *);
-  static void putLong(::java::nio::ByteBuffer *, jlong, ::java::nio::ByteOrder *);
-  static jlong getLong(::java::nio::ByteBuffer *, jint, ::java::nio::ByteOrder *);
-  static void putLong(::java::nio::ByteBuffer *, jint, jlong, ::java::nio::ByteOrder *);
-  static jfloat getFloat(::java::nio::ByteBuffer *, ::java::nio::ByteOrder *);
-  static void putFloat(::java::nio::ByteBuffer *, jfloat, ::java::nio::ByteOrder *);
-  static jfloat getFloat(::java::nio::ByteBuffer *, jint, ::java::nio::ByteOrder *);
-  static void putFloat(::java::nio::ByteBuffer *, jint, jfloat, ::java::nio::ByteOrder *);
-  static jdouble getDouble(::java::nio::ByteBuffer *, ::java::nio::ByteOrder *);
-  static void putDouble(::java::nio::ByteBuffer *, jdouble, ::java::nio::ByteOrder *);
-  static jdouble getDouble(::java::nio::ByteBuffer *, jint, ::java::nio::ByteOrder *);
-  static void putDouble(::java::nio::ByteBuffer *, jint, jdouble, ::java::nio::ByteOrder *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_ByteBufferHelper__
diff --git a/libjava/java/nio/ByteBufferImpl.h b/libjava/java/nio/ByteBufferImpl.h
deleted file mode 100644
index 12621a0c74f..00000000000
--- a/libjava/java/nio/ByteBufferImpl.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_ByteBufferImpl__
-#define __java_nio_ByteBufferImpl__
-
-#pragma interface
-
-#include <java/nio/ByteBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ByteBufferImpl;
-        class CharBuffer;
-        class DoubleBuffer;
-        class FloatBuffer;
-        class IntBuffer;
-        class LongBuffer;
-        class ShortBuffer;
-    }
-  }
-}
-
-class java::nio::ByteBufferImpl : public ::java::nio::ByteBuffer
-{
-
-public: // actually package-private
-  ByteBufferImpl(JArray< jbyte > *, jint, jint, jint, jint, jint, jboolean);
-public:
-  ::java::nio::CharBuffer * asCharBuffer();
-  ::java::nio::ShortBuffer * asShortBuffer();
-  ::java::nio::IntBuffer * asIntBuffer();
-  ::java::nio::LongBuffer * asLongBuffer();
-  ::java::nio::FloatBuffer * asFloatBuffer();
-  ::java::nio::DoubleBuffer * asDoubleBuffer();
-  jboolean isReadOnly();
-  ::java::nio::ByteBuffer * slice();
-  ::java::nio::ByteBuffer * duplicate();
-  ::java::nio::ByteBuffer * asReadOnlyBuffer();
-public: // actually package-private
-  void shiftDown(jint, jint, jint);
-public:
-  ::java::nio::ByteBuffer * compact();
-  jboolean isDirect();
-  jbyte get();
-  ::java::nio::ByteBuffer * get(JArray< jbyte > *, jint, jint);
-  ::java::nio::ByteBuffer * put(JArray< jbyte > *, jint, jint);
-  ::java::nio::ByteBuffer * put(jbyte);
-  jbyte get(jint);
-  ::java::nio::ByteBuffer * put(jint, jbyte);
-  jchar getChar();
-  ::java::nio::ByteBuffer * putChar(jchar);
-  jchar getChar(jint);
-  ::java::nio::ByteBuffer * putChar(jint, jchar);
-  jshort getShort();
-  ::java::nio::ByteBuffer * putShort(jshort);
-  jshort getShort(jint);
-  ::java::nio::ByteBuffer * putShort(jint, jshort);
-  jint getInt();
-  ::java::nio::ByteBuffer * putInt(jint);
-  jint getInt(jint);
-  ::java::nio::ByteBuffer * putInt(jint, jint);
-  jlong getLong();
-  ::java::nio::ByteBuffer * putLong(jlong);
-  jlong getLong(jint);
-  ::java::nio::ByteBuffer * putLong(jint, jlong);
-  jfloat getFloat();
-  ::java::nio::ByteBuffer * putFloat(jfloat);
-  jfloat getFloat(jint);
-  ::java::nio::ByteBuffer * putFloat(jint, jfloat);
-  jdouble getDouble();
-  ::java::nio::ByteBuffer * putDouble(jdouble);
-  jdouble getDouble(jint);
-  ::java::nio::ByteBuffer * putDouble(jint, jdouble);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::ByteBuffer)))) readOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_ByteBufferImpl__
diff --git a/libjava/java/nio/ByteOrder.h b/libjava/java/nio/ByteOrder.h
deleted file mode 100644
index 730cb7fd90a..00000000000
--- a/libjava/java/nio/ByteOrder.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_ByteOrder__
-#define __java_nio_ByteOrder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-    }
-  }
-}
-
-class java::nio::ByteOrder : public ::java::lang::Object
-{
-
-public:
-  static ::java::nio::ByteOrder * nativeOrder();
-  ::java::lang::String * toString();
-private:
-  ByteOrder();
-public:
-  static ::java::nio::ByteOrder * BIG_ENDIAN;
-  static ::java::nio::ByteOrder * LITTLE_ENDIAN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_ByteOrder__
diff --git a/libjava/java/nio/CharBuffer.h b/libjava/java/nio/CharBuffer.h
deleted file mode 100644
index 9ab6d7e21f1..00000000000
--- a/libjava/java/nio/CharBuffer.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_CharBuffer__
-#define __java_nio_CharBuffer__
-
-#pragma interface
-
-#include <java/nio/Buffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class CharBuffer;
-    }
-  }
-}
-
-class java::nio::CharBuffer : public ::java::nio::Buffer
-{
-
-public: // actually package-private
-  CharBuffer(jint, jint, jint, jint);
-public:
-  static ::java::nio::CharBuffer * allocate(jint);
-  static ::java::nio::CharBuffer * wrap(JArray< jchar > *, jint, jint);
-  static ::java::nio::CharBuffer * wrap(::java::lang::CharSequence *);
-  static ::java::nio::CharBuffer * wrap(::java::lang::CharSequence *, jint, jint);
-  static ::java::nio::CharBuffer * wrap(JArray< jchar > *);
-  virtual ::java::nio::CharBuffer * get(JArray< jchar > *, jint, jint);
-  virtual jint read(::java::nio::CharBuffer *);
-  virtual ::java::nio::CharBuffer * get(JArray< jchar > *);
-  virtual ::java::nio::CharBuffer * put(::java::nio::CharBuffer *);
-  virtual ::java::nio::CharBuffer * put(JArray< jchar > *, jint, jint);
-  virtual ::java::nio::CharBuffer * put(JArray< jchar > *);
-  virtual jboolean hasArray();
-  virtual JArray< jchar > * array();
-  virtual jint arrayOffset();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::CharBuffer *);
-  virtual ::java::nio::ByteOrder * order() = 0;
-  virtual jchar get() = 0;
-  virtual ::java::nio::CharBuffer * put(jchar) = 0;
-  virtual jchar get(jint) = 0;
-  virtual ::java::nio::CharBuffer * put(jint, jchar) = 0;
-  virtual ::java::nio::CharBuffer * compact() = 0;
-  virtual jboolean isDirect() = 0;
-  virtual ::java::nio::CharBuffer * slice() = 0;
-  virtual ::java::nio::CharBuffer * duplicate() = 0;
-  virtual ::java::nio::CharBuffer * asReadOnlyBuffer() = 0;
-  virtual ::java::lang::String * toString();
-  virtual jint length();
-  virtual ::java::lang::CharSequence * subSequence(jint, jint) = 0;
-  virtual ::java::nio::CharBuffer * put(::java::lang::String *, jint, jint);
-  virtual ::java::nio::CharBuffer * put(::java::lang::String *);
-  virtual jchar charAt(jint);
-  virtual ::java::nio::CharBuffer * target$append(jchar);
-  virtual ::java::nio::CharBuffer * target$append(::java::lang::CharSequence *);
-  virtual ::java::nio::CharBuffer * target$append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::lang::Appendable * append(jchar);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::nio::Buffer)))) array_offset;
-  JArray< jchar > * backing_buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_CharBuffer__
diff --git a/libjava/java/nio/CharBufferImpl.h b/libjava/java/nio/CharBufferImpl.h
deleted file mode 100644
index 4cbf50ec305..00000000000
--- a/libjava/java/nio/CharBufferImpl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_CharBufferImpl__
-#define __java_nio_CharBufferImpl__
-
-#pragma interface
-
-#include <java/nio/CharBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class CharBuffer;
-        class CharBufferImpl;
-    }
-  }
-}
-
-class java::nio::CharBufferImpl : public ::java::nio::CharBuffer
-{
-
-public: // actually package-private
-  CharBufferImpl(jint);
-  CharBufferImpl(JArray< jchar > *, jint, jint, jint, jint, jint, jboolean);
-public:
-  CharBufferImpl(::java::nio::CharBufferImpl *);
-  jboolean isReadOnly();
-  ::java::nio::CharBuffer * slice();
-  ::java::nio::CharBuffer * duplicate();
-  ::java::nio::CharBuffer * asReadOnlyBuffer();
-  ::java::nio::CharBuffer * compact();
-  jboolean isDirect();
-  ::java::lang::CharSequence * subSequence(jint, jint);
-  jchar get();
-  ::java::nio::CharBuffer * put(jchar);
-  jchar get(jint);
-  ::java::nio::CharBuffer * get(JArray< jchar > *, jint, jint);
-  ::java::nio::CharBuffer * put(JArray< jchar > *, jint, jint);
-  ::java::nio::CharBuffer * put(jint, jchar);
-  ::java::nio::ByteOrder * order();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::CharBuffer)))) readOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_CharBufferImpl__
diff --git a/libjava/java/nio/CharViewBufferImpl.h b/libjava/java/nio/CharViewBufferImpl.h
deleted file mode 100644
index fbde2de15ee..00000000000
--- a/libjava/java/nio/CharViewBufferImpl.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_CharViewBufferImpl__
-#define __java_nio_CharViewBufferImpl__
-
-#pragma interface
-
-#include <java/nio/CharBuffer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ByteOrder;
-        class CharBuffer;
-        class CharViewBufferImpl;
-    }
-  }
-}
-
-class java::nio::CharViewBufferImpl : public ::java::nio::CharBuffer
-{
-
-public: // actually package-private
-  CharViewBufferImpl(::java::nio::ByteBuffer *, jint);
-public:
-  CharViewBufferImpl(::java::nio::ByteBuffer *, jint, jint, jint, jint, jint, jboolean, ::java::nio::ByteOrder *);
-  virtual jchar get();
-  virtual jchar get(jint);
-  virtual ::java::nio::CharBuffer * put(jchar);
-  virtual ::java::nio::CharBuffer * put(jint, jchar);
-  virtual ::java::nio::CharBuffer * compact();
-  virtual ::java::nio::CharBuffer * slice();
-public: // actually package-private
-  virtual ::java::nio::CharBuffer * duplicate(jboolean);
-public:
-  virtual ::java::nio::CharBuffer * duplicate();
-  virtual ::java::nio::CharBuffer * asReadOnlyBuffer();
-  virtual ::java::lang::CharSequence * subSequence(jint, jint);
-  virtual jboolean isReadOnly();
-  virtual jboolean isDirect();
-  virtual ::java::nio::ByteOrder * order();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::nio::CharBuffer)))) offset;
-  ::java::nio::ByteBuffer * bb;
-  jboolean readOnly;
-  ::java::nio::ByteOrder * endian;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_CharViewBufferImpl__
diff --git a/libjava/java/nio/DirectByteBufferImpl$ReadOnly.h b/libjava/java/nio/DirectByteBufferImpl$ReadOnly.h
deleted file mode 100644
index f94c05ace88..00000000000
--- a/libjava/java/nio/DirectByteBufferImpl$ReadOnly.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_DirectByteBufferImpl$ReadOnly__
-#define __java_nio_DirectByteBufferImpl$ReadOnly__
-
-#pragma interface
-
-#include <java/nio/DirectByteBufferImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class DirectByteBufferImpl$ReadOnly;
-    }
-  }
-}
-
-class java::nio::DirectByteBufferImpl$ReadOnly : public ::java::nio::DirectByteBufferImpl
-{
-
-public: // actually package-private
-  DirectByteBufferImpl$ReadOnly(::java::lang::Object *, ::gnu::gcj::RawData *, jint, jint, jint);
-public:
-  ::java::nio::ByteBuffer * put(jbyte);
-  ::java::nio::ByteBuffer * put(jint, jbyte);
-  jboolean isReadOnly();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_DirectByteBufferImpl$ReadOnly__
diff --git a/libjava/java/nio/DirectByteBufferImpl$ReadWrite.h b/libjava/java/nio/DirectByteBufferImpl$ReadWrite.h
deleted file mode 100644
index aa8c5ad0a74..00000000000
--- a/libjava/java/nio/DirectByteBufferImpl$ReadWrite.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_DirectByteBufferImpl$ReadWrite__
-#define __java_nio_DirectByteBufferImpl$ReadWrite__
-
-#pragma interface
-
-#include <java/nio/DirectByteBufferImpl.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class DirectByteBufferImpl$ReadWrite;
-    }
-  }
-}
-
-class java::nio::DirectByteBufferImpl$ReadWrite : public ::java::nio::DirectByteBufferImpl
-{
-
-public: // actually package-private
-  DirectByteBufferImpl$ReadWrite(jint);
-  DirectByteBufferImpl$ReadWrite(::gnu::gcj::RawData *, jint);
-  DirectByteBufferImpl$ReadWrite(::java::lang::Object *, ::gnu::gcj::RawData *, jint, jint, jint);
-public:
-  jboolean isReadOnly();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_DirectByteBufferImpl$ReadWrite__
diff --git a/libjava/java/nio/DirectByteBufferImpl.h b/libjava/java/nio/DirectByteBufferImpl.h
deleted file mode 100644
index b5a566907e9..00000000000
--- a/libjava/java/nio/DirectByteBufferImpl.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_DirectByteBufferImpl__
-#define __java_nio_DirectByteBufferImpl__
-
-#pragma interface
-
-#include <java/nio/ByteBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-        class DirectByteBufferImpl;
-        class DoubleBuffer;
-        class FloatBuffer;
-        class IntBuffer;
-        class LongBuffer;
-        class ShortBuffer;
-    }
-  }
-}
-
-class java::nio::DirectByteBufferImpl : public ::java::nio::ByteBuffer
-{
-
-public: // actually package-private
-  DirectByteBufferImpl(jint);
-  DirectByteBufferImpl(::gnu::gcj::RawData *, jint);
-  DirectByteBufferImpl(::java::lang::Object *, ::gnu::gcj::RawData *, jint, jint, jint);
-public:
-  static ::java::nio::ByteBuffer * allocate(jint);
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual jbyte get();
-  virtual jbyte get(jint);
-  virtual ::java::nio::ByteBuffer * get(JArray< jbyte > *, jint, jint);
-  virtual ::java::nio::ByteBuffer * put(jbyte);
-  virtual ::java::nio::ByteBuffer * put(jint, jbyte);
-public: // actually package-private
-  virtual void shiftDown(jint, jint, jint);
-public:
-  virtual ::java::nio::ByteBuffer * compact();
-  virtual ::java::nio::ByteBuffer * slice();
-private:
-  ::java::nio::ByteBuffer * duplicate(jboolean);
-public:
-  virtual ::java::nio::ByteBuffer * duplicate();
-  virtual ::java::nio::ByteBuffer * asReadOnlyBuffer();
-  virtual jboolean isDirect();
-  virtual ::java::nio::CharBuffer * asCharBuffer();
-  virtual ::java::nio::ShortBuffer * asShortBuffer();
-  virtual ::java::nio::IntBuffer * asIntBuffer();
-  virtual ::java::nio::LongBuffer * asLongBuffer();
-  virtual ::java::nio::FloatBuffer * asFloatBuffer();
-  virtual ::java::nio::DoubleBuffer * asDoubleBuffer();
-  virtual jchar getChar();
-  virtual ::java::nio::ByteBuffer * putChar(jchar);
-  virtual jchar getChar(jint);
-  virtual ::java::nio::ByteBuffer * putChar(jint, jchar);
-  virtual jshort getShort();
-  virtual ::java::nio::ByteBuffer * putShort(jshort);
-  virtual jshort getShort(jint);
-  virtual ::java::nio::ByteBuffer * putShort(jint, jshort);
-  virtual jint getInt();
-  virtual ::java::nio::ByteBuffer * putInt(jint);
-  virtual jint getInt(jint);
-  virtual ::java::nio::ByteBuffer * putInt(jint, jint);
-  virtual jlong getLong();
-  virtual ::java::nio::ByteBuffer * putLong(jlong);
-  virtual jlong getLong(jint);
-  virtual ::java::nio::ByteBuffer * putLong(jint, jlong);
-  virtual jfloat getFloat();
-  virtual ::java::nio::ByteBuffer * putFloat(jfloat);
-  virtual jfloat getFloat(jint);
-  virtual ::java::nio::ByteBuffer * putFloat(jint, jfloat);
-  virtual jdouble getDouble();
-  virtual ::java::nio::ByteBuffer * putDouble(jdouble);
-  virtual jdouble getDouble(jint);
-  virtual ::java::nio::ByteBuffer * putDouble(jint, jdouble);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::nio::ByteBuffer)))) owner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_DirectByteBufferImpl__
diff --git a/libjava/java/nio/DoubleBuffer.h b/libjava/java/nio/DoubleBuffer.h
deleted file mode 100644
index 4fb0ef033e2..00000000000
--- a/libjava/java/nio/DoubleBuffer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_DoubleBuffer__
-#define __java_nio_DoubleBuffer__
-
-#pragma interface
-
-#include <java/nio/Buffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class DoubleBuffer;
-    }
-  }
-}
-
-class java::nio::DoubleBuffer : public ::java::nio::Buffer
-{
-
-public: // actually package-private
-  DoubleBuffer(jint, jint, jint, jint);
-public:
-  static ::java::nio::DoubleBuffer * allocate(jint);
-  static ::java::nio::DoubleBuffer * wrap(JArray< jdouble > *, jint, jint);
-  static ::java::nio::DoubleBuffer * wrap(JArray< jdouble > *);
-  virtual ::java::nio::DoubleBuffer * get(JArray< jdouble > *, jint, jint);
-  virtual ::java::nio::DoubleBuffer * get(JArray< jdouble > *);
-  virtual ::java::nio::DoubleBuffer * put(::java::nio::DoubleBuffer *);
-  virtual ::java::nio::DoubleBuffer * put(JArray< jdouble > *, jint, jint);
-  virtual ::java::nio::DoubleBuffer * put(JArray< jdouble > *);
-  virtual jboolean hasArray();
-  virtual JArray< jdouble > * array();
-  virtual jint arrayOffset();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::DoubleBuffer *);
-  virtual ::java::nio::ByteOrder * order() = 0;
-  virtual jdouble get() = 0;
-  virtual ::java::nio::DoubleBuffer * put(jdouble) = 0;
-  virtual jdouble get(jint) = 0;
-  virtual ::java::nio::DoubleBuffer * put(jint, jdouble) = 0;
-  virtual ::java::nio::DoubleBuffer * compact() = 0;
-  virtual jboolean isDirect() = 0;
-  virtual ::java::nio::DoubleBuffer * slice() = 0;
-  virtual ::java::nio::DoubleBuffer * duplicate() = 0;
-  virtual ::java::nio::DoubleBuffer * asReadOnlyBuffer() = 0;
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::nio::Buffer)))) array_offset;
-  JArray< jdouble > * backing_buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_DoubleBuffer__
diff --git a/libjava/java/nio/DoubleBufferImpl.h b/libjava/java/nio/DoubleBufferImpl.h
deleted file mode 100644
index f87e69c05f0..00000000000
--- a/libjava/java/nio/DoubleBufferImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_DoubleBufferImpl__
-#define __java_nio_DoubleBufferImpl__
-
-#pragma interface
-
-#include <java/nio/DoubleBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class DoubleBuffer;
-        class DoubleBufferImpl;
-    }
-  }
-}
-
-class java::nio::DoubleBufferImpl : public ::java::nio::DoubleBuffer
-{
-
-public: // actually package-private
-  DoubleBufferImpl(jint);
-  DoubleBufferImpl(JArray< jdouble > *, jint, jint, jint, jint, jint, jboolean);
-public:
-  jboolean isReadOnly();
-  ::java::nio::DoubleBuffer * slice();
-  ::java::nio::DoubleBuffer * duplicate();
-  ::java::nio::DoubleBuffer * asReadOnlyBuffer();
-  ::java::nio::DoubleBuffer * compact();
-  jboolean isDirect();
-  jdouble get();
-  ::java::nio::DoubleBuffer * put(jdouble);
-  jdouble get(jint);
-  ::java::nio::DoubleBuffer * put(jint, jdouble);
-  ::java::nio::ByteOrder * order();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::DoubleBuffer)))) readOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_DoubleBufferImpl__
diff --git a/libjava/java/nio/DoubleViewBufferImpl.h b/libjava/java/nio/DoubleViewBufferImpl.h
deleted file mode 100644
index 778a0aca25b..00000000000
--- a/libjava/java/nio/DoubleViewBufferImpl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_DoubleViewBufferImpl__
-#define __java_nio_DoubleViewBufferImpl__
-
-#pragma interface
-
-#include <java/nio/DoubleBuffer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ByteOrder;
-        class DoubleBuffer;
-        class DoubleViewBufferImpl;
-    }
-  }
-}
-
-class java::nio::DoubleViewBufferImpl : public ::java::nio::DoubleBuffer
-{
-
-public: // actually package-private
-  DoubleViewBufferImpl(::java::nio::ByteBuffer *, jint);
-public:
-  DoubleViewBufferImpl(::java::nio::ByteBuffer *, jint, jint, jint, jint, jint, jboolean, ::java::nio::ByteOrder *);
-  jdouble get();
-  jdouble get(jint);
-  ::java::nio::DoubleBuffer * put(jdouble);
-  ::java::nio::DoubleBuffer * put(jint, jdouble);
-  ::java::nio::DoubleBuffer * compact();
-  ::java::nio::DoubleBuffer * slice();
-public: // actually package-private
-  ::java::nio::DoubleBuffer * duplicate(jboolean);
-public:
-  ::java::nio::DoubleBuffer * duplicate();
-  ::java::nio::DoubleBuffer * asReadOnlyBuffer();
-  jboolean isReadOnly();
-  jboolean isDirect();
-  ::java::nio::ByteOrder * order();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::nio::DoubleBuffer)))) offset;
-  ::java::nio::ByteBuffer * bb;
-  jboolean readOnly;
-  ::java::nio::ByteOrder * endian;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_DoubleViewBufferImpl__
diff --git a/libjava/java/nio/FloatBuffer.h b/libjava/java/nio/FloatBuffer.h
deleted file mode 100644
index 61c02144b98..00000000000
--- a/libjava/java/nio/FloatBuffer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_FloatBuffer__
-#define __java_nio_FloatBuffer__
-
-#pragma interface
-
-#include <java/nio/Buffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class FloatBuffer;
-    }
-  }
-}
-
-class java::nio::FloatBuffer : public ::java::nio::Buffer
-{
-
-public: // actually package-private
-  FloatBuffer(jint, jint, jint, jint);
-public:
-  static ::java::nio::FloatBuffer * allocate(jint);
-  static ::java::nio::FloatBuffer * wrap(JArray< jfloat > *, jint, jint);
-  static ::java::nio::FloatBuffer * wrap(JArray< jfloat > *);
-  virtual ::java::nio::FloatBuffer * get(JArray< jfloat > *, jint, jint);
-  virtual ::java::nio::FloatBuffer * get(JArray< jfloat > *);
-  virtual ::java::nio::FloatBuffer * put(::java::nio::FloatBuffer *);
-  virtual ::java::nio::FloatBuffer * put(JArray< jfloat > *, jint, jint);
-  virtual ::java::nio::FloatBuffer * put(JArray< jfloat > *);
-  virtual jboolean hasArray();
-  virtual JArray< jfloat > * array();
-  virtual jint arrayOffset();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::FloatBuffer *);
-  virtual ::java::nio::ByteOrder * order() = 0;
-  virtual jfloat get() = 0;
-  virtual ::java::nio::FloatBuffer * put(jfloat) = 0;
-  virtual jfloat get(jint) = 0;
-  virtual ::java::nio::FloatBuffer * put(jint, jfloat) = 0;
-  virtual ::java::nio::FloatBuffer * compact() = 0;
-  virtual jboolean isDirect() = 0;
-  virtual ::java::nio::FloatBuffer * slice() = 0;
-  virtual ::java::nio::FloatBuffer * duplicate() = 0;
-  virtual ::java::nio::FloatBuffer * asReadOnlyBuffer() = 0;
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::nio::Buffer)))) array_offset;
-  JArray< jfloat > * backing_buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_FloatBuffer__
diff --git a/libjava/java/nio/FloatBufferImpl.h b/libjava/java/nio/FloatBufferImpl.h
deleted file mode 100644
index 6dad3a9b1d7..00000000000
--- a/libjava/java/nio/FloatBufferImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_FloatBufferImpl__
-#define __java_nio_FloatBufferImpl__
-
-#pragma interface
-
-#include <java/nio/FloatBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class FloatBuffer;
-        class FloatBufferImpl;
-    }
-  }
-}
-
-class java::nio::FloatBufferImpl : public ::java::nio::FloatBuffer
-{
-
-public: // actually package-private
-  FloatBufferImpl(jint);
-  FloatBufferImpl(JArray< jfloat > *, jint, jint, jint, jint, jint, jboolean);
-public:
-  jboolean isReadOnly();
-  ::java::nio::FloatBuffer * slice();
-  ::java::nio::FloatBuffer * duplicate();
-  ::java::nio::FloatBuffer * asReadOnlyBuffer();
-  ::java::nio::FloatBuffer * compact();
-  jboolean isDirect();
-  jfloat get();
-  ::java::nio::FloatBuffer * put(jfloat);
-  jfloat get(jint);
-  ::java::nio::FloatBuffer * put(jint, jfloat);
-  ::java::nio::ByteOrder * order();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::FloatBuffer)))) readOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_FloatBufferImpl__
diff --git a/libjava/java/nio/FloatViewBufferImpl.h b/libjava/java/nio/FloatViewBufferImpl.h
deleted file mode 100644
index 5ba181b5aec..00000000000
--- a/libjava/java/nio/FloatViewBufferImpl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_FloatViewBufferImpl__
-#define __java_nio_FloatViewBufferImpl__
-
-#pragma interface
-
-#include <java/nio/FloatBuffer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ByteOrder;
-        class FloatBuffer;
-        class FloatViewBufferImpl;
-    }
-  }
-}
-
-class java::nio::FloatViewBufferImpl : public ::java::nio::FloatBuffer
-{
-
-public: // actually package-private
-  FloatViewBufferImpl(::java::nio::ByteBuffer *, jint);
-public:
-  FloatViewBufferImpl(::java::nio::ByteBuffer *, jint, jint, jint, jint, jint, jboolean, ::java::nio::ByteOrder *);
-  jfloat get();
-  jfloat get(jint);
-  ::java::nio::FloatBuffer * put(jfloat);
-  ::java::nio::FloatBuffer * put(jint, jfloat);
-  ::java::nio::FloatBuffer * compact();
-  ::java::nio::FloatBuffer * slice();
-public: // actually package-private
-  ::java::nio::FloatBuffer * duplicate(jboolean);
-public:
-  ::java::nio::FloatBuffer * duplicate();
-  ::java::nio::FloatBuffer * asReadOnlyBuffer();
-  jboolean isReadOnly();
-  jboolean isDirect();
-  ::java::nio::ByteOrder * order();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::nio::FloatBuffer)))) offset;
-  ::java::nio::ByteBuffer * bb;
-  jboolean readOnly;
-  ::java::nio::ByteOrder * endian;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_FloatViewBufferImpl__
diff --git a/libjava/java/nio/IntBuffer.h b/libjava/java/nio/IntBuffer.h
deleted file mode 100644
index 0922342cb25..00000000000
--- a/libjava/java/nio/IntBuffer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_IntBuffer__
-#define __java_nio_IntBuffer__
-
-#pragma interface
-
-#include <java/nio/Buffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class IntBuffer;
-    }
-  }
-}
-
-class java::nio::IntBuffer : public ::java::nio::Buffer
-{
-
-public: // actually package-private
-  IntBuffer(jint, jint, jint, jint);
-public:
-  static ::java::nio::IntBuffer * allocate(jint);
-  static ::java::nio::IntBuffer * wrap(JArray< jint > *, jint, jint);
-  static ::java::nio::IntBuffer * wrap(JArray< jint > *);
-  virtual ::java::nio::IntBuffer * get(JArray< jint > *, jint, jint);
-  virtual ::java::nio::IntBuffer * get(JArray< jint > *);
-  virtual ::java::nio::IntBuffer * put(::java::nio::IntBuffer *);
-  virtual ::java::nio::IntBuffer * put(JArray< jint > *, jint, jint);
-  virtual ::java::nio::IntBuffer * put(JArray< jint > *);
-  virtual jboolean hasArray();
-  virtual JArray< jint > * array();
-  virtual jint arrayOffset();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::IntBuffer *);
-  virtual ::java::nio::ByteOrder * order() = 0;
-  virtual jint get() = 0;
-  virtual ::java::nio::IntBuffer * put(jint) = 0;
-  virtual jint get(jint) = 0;
-  virtual ::java::nio::IntBuffer * put(jint, jint) = 0;
-  virtual ::java::nio::IntBuffer * compact() = 0;
-  virtual jboolean isDirect() = 0;
-  virtual ::java::nio::IntBuffer * slice() = 0;
-  virtual ::java::nio::IntBuffer * duplicate() = 0;
-  virtual ::java::nio::IntBuffer * asReadOnlyBuffer() = 0;
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::nio::Buffer)))) array_offset;
-  JArray< jint > * backing_buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_IntBuffer__
diff --git a/libjava/java/nio/IntBufferImpl.h b/libjava/java/nio/IntBufferImpl.h
deleted file mode 100644
index 2492f028f10..00000000000
--- a/libjava/java/nio/IntBufferImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_IntBufferImpl__
-#define __java_nio_IntBufferImpl__
-
-#pragma interface
-
-#include <java/nio/IntBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class IntBuffer;
-        class IntBufferImpl;
-    }
-  }
-}
-
-class java::nio::IntBufferImpl : public ::java::nio::IntBuffer
-{
-
-public: // actually package-private
-  IntBufferImpl(jint);
-  IntBufferImpl(JArray< jint > *, jint, jint, jint, jint, jint, jboolean);
-public:
-  jboolean isReadOnly();
-  ::java::nio::IntBuffer * slice();
-  ::java::nio::IntBuffer * duplicate();
-  ::java::nio::IntBuffer * asReadOnlyBuffer();
-  ::java::nio::IntBuffer * compact();
-  jboolean isDirect();
-  jint get();
-  ::java::nio::IntBuffer * put(jint);
-  jint get(jint);
-  ::java::nio::IntBuffer * put(jint, jint);
-  ::java::nio::ByteOrder * order();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::IntBuffer)))) readOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_IntBufferImpl__
diff --git a/libjava/java/nio/IntViewBufferImpl.h b/libjava/java/nio/IntViewBufferImpl.h
deleted file mode 100644
index 8dfe695e25d..00000000000
--- a/libjava/java/nio/IntViewBufferImpl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_IntViewBufferImpl__
-#define __java_nio_IntViewBufferImpl__
-
-#pragma interface
-
-#include <java/nio/IntBuffer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ByteOrder;
-        class IntBuffer;
-        class IntViewBufferImpl;
-    }
-  }
-}
-
-class java::nio::IntViewBufferImpl : public ::java::nio::IntBuffer
-{
-
-public: // actually package-private
-  IntViewBufferImpl(::java::nio::ByteBuffer *, jint);
-public:
-  IntViewBufferImpl(::java::nio::ByteBuffer *, jint, jint, jint, jint, jint, jboolean, ::java::nio::ByteOrder *);
-  jint get();
-  jint get(jint);
-  ::java::nio::IntBuffer * put(jint);
-  ::java::nio::IntBuffer * put(jint, jint);
-  ::java::nio::IntBuffer * compact();
-  ::java::nio::IntBuffer * slice();
-public: // actually package-private
-  ::java::nio::IntBuffer * duplicate(jboolean);
-public:
-  ::java::nio::IntBuffer * duplicate();
-  ::java::nio::IntBuffer * asReadOnlyBuffer();
-  jboolean isReadOnly();
-  jboolean isDirect();
-  ::java::nio::ByteOrder * order();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::nio::IntBuffer)))) offset;
-  ::java::nio::ByteBuffer * bb;
-  jboolean readOnly;
-  ::java::nio::ByteOrder * endian;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_IntViewBufferImpl__
diff --git a/libjava/java/nio/InvalidMarkException.h b/libjava/java/nio/InvalidMarkException.h
deleted file mode 100644
index 7b095c2cdce..00000000000
--- a/libjava/java/nio/InvalidMarkException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_InvalidMarkException__
-#define __java_nio_InvalidMarkException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class InvalidMarkException;
-    }
-  }
-}
-
-class java::nio::InvalidMarkException : public ::java::lang::IllegalStateException
-{
-
-public:
-  InvalidMarkException();
-private:
-  static const jlong serialVersionUID = 1698329710438510774LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_InvalidMarkException__
diff --git a/libjava/java/nio/LongBuffer.h b/libjava/java/nio/LongBuffer.h
deleted file mode 100644
index f100e050e7f..00000000000
--- a/libjava/java/nio/LongBuffer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_LongBuffer__
-#define __java_nio_LongBuffer__
-
-#pragma interface
-
-#include <java/nio/Buffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class LongBuffer;
-    }
-  }
-}
-
-class java::nio::LongBuffer : public ::java::nio::Buffer
-{
-
-public: // actually package-private
-  LongBuffer(jint, jint, jint, jint);
-public:
-  static ::java::nio::LongBuffer * allocate(jint);
-  static ::java::nio::LongBuffer * wrap(JArray< jlong > *, jint, jint);
-  static ::java::nio::LongBuffer * wrap(JArray< jlong > *);
-  virtual ::java::nio::LongBuffer * get(JArray< jlong > *, jint, jint);
-  virtual ::java::nio::LongBuffer * get(JArray< jlong > *);
-  virtual ::java::nio::LongBuffer * put(::java::nio::LongBuffer *);
-  virtual ::java::nio::LongBuffer * put(JArray< jlong > *, jint, jint);
-  virtual ::java::nio::LongBuffer * put(JArray< jlong > *);
-  virtual jboolean hasArray();
-  virtual JArray< jlong > * array();
-  virtual jint arrayOffset();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::LongBuffer *);
-  virtual ::java::nio::ByteOrder * order() = 0;
-  virtual jlong get() = 0;
-  virtual ::java::nio::LongBuffer * put(jlong) = 0;
-  virtual jlong get(jint) = 0;
-  virtual ::java::nio::LongBuffer * put(jint, jlong) = 0;
-  virtual ::java::nio::LongBuffer * compact() = 0;
-  virtual jboolean isDirect() = 0;
-  virtual ::java::nio::LongBuffer * slice() = 0;
-  virtual ::java::nio::LongBuffer * duplicate() = 0;
-  virtual ::java::nio::LongBuffer * asReadOnlyBuffer() = 0;
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::nio::Buffer)))) array_offset;
-  JArray< jlong > * backing_buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_LongBuffer__
diff --git a/libjava/java/nio/LongBufferImpl.h b/libjava/java/nio/LongBufferImpl.h
deleted file mode 100644
index ad28128bd41..00000000000
--- a/libjava/java/nio/LongBufferImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_LongBufferImpl__
-#define __java_nio_LongBufferImpl__
-
-#pragma interface
-
-#include <java/nio/LongBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class LongBuffer;
-        class LongBufferImpl;
-    }
-  }
-}
-
-class java::nio::LongBufferImpl : public ::java::nio::LongBuffer
-{
-
-public: // actually package-private
-  LongBufferImpl(jint);
-  LongBufferImpl(JArray< jlong > *, jint, jint, jint, jint, jint, jboolean);
-public:
-  jboolean isReadOnly();
-  ::java::nio::LongBuffer * slice();
-  ::java::nio::LongBuffer * duplicate();
-  ::java::nio::LongBuffer * asReadOnlyBuffer();
-  ::java::nio::LongBuffer * compact();
-  jboolean isDirect();
-  jlong get();
-  ::java::nio::LongBuffer * put(jlong);
-  jlong get(jint);
-  ::java::nio::LongBuffer * put(jint, jlong);
-  ::java::nio::ByteOrder * order();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::LongBuffer)))) readOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_LongBufferImpl__
diff --git a/libjava/java/nio/LongViewBufferImpl.h b/libjava/java/nio/LongViewBufferImpl.h
deleted file mode 100644
index 59e678c0fdf..00000000000
--- a/libjava/java/nio/LongViewBufferImpl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_LongViewBufferImpl__
-#define __java_nio_LongViewBufferImpl__
-
-#pragma interface
-
-#include <java/nio/LongBuffer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ByteOrder;
-        class LongBuffer;
-        class LongViewBufferImpl;
-    }
-  }
-}
-
-class java::nio::LongViewBufferImpl : public ::java::nio::LongBuffer
-{
-
-public: // actually package-private
-  LongViewBufferImpl(::java::nio::ByteBuffer *, jint);
-public:
-  LongViewBufferImpl(::java::nio::ByteBuffer *, jint, jint, jint, jint, jint, jboolean, ::java::nio::ByteOrder *);
-  jlong get();
-  jlong get(jint);
-  ::java::nio::LongBuffer * put(jlong);
-  ::java::nio::LongBuffer * put(jint, jlong);
-  ::java::nio::LongBuffer * compact();
-  ::java::nio::LongBuffer * slice();
-public: // actually package-private
-  ::java::nio::LongBuffer * duplicate(jboolean);
-public:
-  ::java::nio::LongBuffer * duplicate();
-  ::java::nio::LongBuffer * asReadOnlyBuffer();
-  jboolean isReadOnly();
-  jboolean isDirect();
-  ::java::nio::ByteOrder * order();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::nio::LongBuffer)))) offset;
-  ::java::nio::ByteBuffer * bb;
-  jboolean readOnly;
-  ::java::nio::ByteOrder * endian;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_LongViewBufferImpl__
diff --git a/libjava/java/nio/MappedByteBuffer.h b/libjava/java/nio/MappedByteBuffer.h
deleted file mode 100644
index 563a9662e30..00000000000
--- a/libjava/java/nio/MappedByteBuffer.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_MappedByteBuffer__
-#define __java_nio_MappedByteBuffer__
-
-#pragma interface
-
-#include <java/nio/ByteBuffer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class MappedByteBuffer;
-    }
-  }
-}
-
-class java::nio::MappedByteBuffer : public ::java::nio::ByteBuffer
-{
-
-public: // actually package-private
-  MappedByteBuffer(jint, jint, jint, jint);
-  virtual void forceImpl();
-public:
-  virtual ::java::nio::MappedByteBuffer * force();
-public: // actually package-private
-  virtual jboolean isLoadedImpl();
-public:
-  virtual jboolean isLoaded();
-public: // actually package-private
-  virtual void loadImpl();
-public:
-  virtual ::java::nio::MappedByteBuffer * load();
-public: // actually package-private
-  virtual void unmapImpl();
-public:
-  virtual void finalize();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_MappedByteBuffer__
diff --git a/libjava/java/nio/MappedByteBufferImpl.h b/libjava/java/nio/MappedByteBufferImpl.h
deleted file mode 100644
index e678d49fb73..00000000000
--- a/libjava/java/nio/MappedByteBufferImpl.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_MappedByteBufferImpl__
-#define __java_nio_MappedByteBufferImpl__
-
-#pragma interface
-
-#include <java/nio/MappedByteBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-        class DoubleBuffer;
-        class FloatBuffer;
-        class IntBuffer;
-        class LongBuffer;
-        class MappedByteBufferImpl;
-        class ShortBuffer;
-    }
-  }
-}
-
-class java::nio::MappedByteBufferImpl : public ::java::nio::MappedByteBuffer
-{
-
-public:
-  MappedByteBufferImpl(::gnu::gcj::RawData *, jint, jboolean);
-  jboolean isReadOnly();
-  jbyte get();
-  ::java::nio::ByteBuffer * put(jbyte);
-  jbyte get(jint);
-  ::java::nio::ByteBuffer * get(JArray< jbyte > *, jint, jint);
-  ::java::nio::ByteBuffer * put(jint, jbyte);
-  ::java::nio::ByteBuffer * compact();
-  jboolean isDirect();
-  ::java::nio::ByteBuffer * slice();
-private:
-  ::java::nio::ByteBuffer * duplicate(jboolean);
-public:
-  ::java::nio::ByteBuffer * duplicate();
-  ::java::nio::ByteBuffer * asReadOnlyBuffer();
-  ::java::nio::CharBuffer * asCharBuffer();
-  ::java::nio::ShortBuffer * asShortBuffer();
-  ::java::nio::IntBuffer * asIntBuffer();
-  ::java::nio::LongBuffer * asLongBuffer();
-  ::java::nio::FloatBuffer * asFloatBuffer();
-  ::java::nio::DoubleBuffer * asDoubleBuffer();
-  jchar getChar();
-  ::java::nio::ByteBuffer * putChar(jchar);
-  jchar getChar(jint);
-  ::java::nio::ByteBuffer * putChar(jint, jchar);
-  jshort getShort();
-  ::java::nio::ByteBuffer * putShort(jshort);
-  jshort getShort(jint);
-  ::java::nio::ByteBuffer * putShort(jint, jshort);
-  jint getInt();
-  ::java::nio::ByteBuffer * putInt(jint);
-  jint getInt(jint);
-  ::java::nio::ByteBuffer * putInt(jint, jint);
-  jlong getLong();
-  ::java::nio::ByteBuffer * putLong(jlong);
-  jlong getLong(jint);
-  ::java::nio::ByteBuffer * putLong(jint, jlong);
-  jfloat getFloat();
-  ::java::nio::ByteBuffer * putFloat(jfloat);
-  jfloat getFloat(jint);
-  ::java::nio::ByteBuffer * putFloat(jint, jfloat);
-  jdouble getDouble();
-  ::java::nio::ByteBuffer * putDouble(jdouble);
-  jdouble getDouble(jint);
-  ::java::nio::ByteBuffer * putDouble(jint, jdouble);
-public: // actually package-private
-  void unmapImpl();
-  jboolean isLoadedImpl();
-  void loadImpl();
-  void forceImpl();
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::MappedByteBuffer)))) readOnly;
-public:
-  ::gnu::gcj::RawData * implPtr;
-  jlong implLen;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_MappedByteBufferImpl__
diff --git a/libjava/java/nio/ReadOnlyBufferException.h b/libjava/java/nio/ReadOnlyBufferException.h
deleted file mode 100644
index 58fe414ffb4..00000000000
--- a/libjava/java/nio/ReadOnlyBufferException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_ReadOnlyBufferException__
-#define __java_nio_ReadOnlyBufferException__
-
-#pragma interface
-
-#include <java/lang/UnsupportedOperationException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ReadOnlyBufferException;
-    }
-  }
-}
-
-class java::nio::ReadOnlyBufferException : public ::java::lang::UnsupportedOperationException
-{
-
-public:
-  ReadOnlyBufferException();
-private:
-  static const jlong serialVersionUID = -1210063976496234090LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_ReadOnlyBufferException__
diff --git a/libjava/java/nio/ShortBuffer.h b/libjava/java/nio/ShortBuffer.h
deleted file mode 100644
index 27b9814a811..00000000000
--- a/libjava/java/nio/ShortBuffer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_ShortBuffer__
-#define __java_nio_ShortBuffer__
-
-#pragma interface
-
-#include <java/nio/Buffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class ShortBuffer;
-    }
-  }
-}
-
-class java::nio::ShortBuffer : public ::java::nio::Buffer
-{
-
-public: // actually package-private
-  ShortBuffer(jint, jint, jint, jint);
-public:
-  static ::java::nio::ShortBuffer * allocate(jint);
-  static ::java::nio::ShortBuffer * wrap(JArray< jshort > *, jint, jint);
-  static ::java::nio::ShortBuffer * wrap(JArray< jshort > *);
-  virtual ::java::nio::ShortBuffer * get(JArray< jshort > *, jint, jint);
-  virtual ::java::nio::ShortBuffer * get(JArray< jshort > *);
-  virtual ::java::nio::ShortBuffer * put(::java::nio::ShortBuffer *);
-  virtual ::java::nio::ShortBuffer * put(JArray< jshort > *, jint, jint);
-  virtual ::java::nio::ShortBuffer * put(JArray< jshort > *);
-  virtual jboolean hasArray();
-  virtual JArray< jshort > * array();
-  virtual jint arrayOffset();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::ShortBuffer *);
-  virtual ::java::nio::ByteOrder * order() = 0;
-  virtual jshort get() = 0;
-  virtual ::java::nio::ShortBuffer * put(jshort) = 0;
-  virtual jshort get(jint) = 0;
-  virtual ::java::nio::ShortBuffer * put(jint, jshort) = 0;
-  virtual ::java::nio::ShortBuffer * compact() = 0;
-  virtual jboolean isDirect() = 0;
-  virtual ::java::nio::ShortBuffer * slice() = 0;
-  virtual ::java::nio::ShortBuffer * duplicate() = 0;
-  virtual ::java::nio::ShortBuffer * asReadOnlyBuffer() = 0;
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::nio::Buffer)))) array_offset;
-  JArray< jshort > * backing_buffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_ShortBuffer__
diff --git a/libjava/java/nio/ShortBufferImpl.h b/libjava/java/nio/ShortBufferImpl.h
deleted file mode 100644
index a4150a8e909..00000000000
--- a/libjava/java/nio/ShortBufferImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_ShortBufferImpl__
-#define __java_nio_ShortBufferImpl__
-
-#pragma interface
-
-#include <java/nio/ShortBuffer.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-        class ShortBuffer;
-        class ShortBufferImpl;
-    }
-  }
-}
-
-class java::nio::ShortBufferImpl : public ::java::nio::ShortBuffer
-{
-
-public: // actually package-private
-  ShortBufferImpl(jint);
-  ShortBufferImpl(JArray< jshort > *, jint, jint, jint, jint, jint, jboolean);
-public:
-  jboolean isReadOnly();
-  ::java::nio::ShortBuffer * slice();
-  ::java::nio::ShortBuffer * duplicate();
-  ::java::nio::ShortBuffer * asReadOnlyBuffer();
-  ::java::nio::ShortBuffer * compact();
-  jboolean isDirect();
-  jshort get();
-  ::java::nio::ShortBuffer * put(jshort);
-  jshort get(jint);
-  ::java::nio::ShortBuffer * put(jint, jshort);
-  ::java::nio::ByteOrder * order();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::ShortBuffer)))) readOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_ShortBufferImpl__
diff --git a/libjava/java/nio/ShortViewBufferImpl.h b/libjava/java/nio/ShortViewBufferImpl.h
deleted file mode 100644
index 179cc32c564..00000000000
--- a/libjava/java/nio/ShortViewBufferImpl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_ShortViewBufferImpl__
-#define __java_nio_ShortViewBufferImpl__
-
-#pragma interface
-
-#include <java/nio/ShortBuffer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class ByteOrder;
-        class ShortBuffer;
-        class ShortViewBufferImpl;
-    }
-  }
-}
-
-class java::nio::ShortViewBufferImpl : public ::java::nio::ShortBuffer
-{
-
-public: // actually package-private
-  ShortViewBufferImpl(::java::nio::ByteBuffer *, jint);
-public:
-  ShortViewBufferImpl(::java::nio::ByteBuffer *, jint, jint, jint, jint, jint, jboolean, ::java::nio::ByteOrder *);
-  jshort get();
-  jshort get(jint);
-  ::java::nio::ShortBuffer * put(jshort);
-  ::java::nio::ShortBuffer * put(jint, jshort);
-  ::java::nio::ShortBuffer * compact();
-  ::java::nio::ShortBuffer * slice();
-public: // actually package-private
-  ::java::nio::ShortBuffer * duplicate(jboolean);
-public:
-  ::java::nio::ShortBuffer * duplicate();
-  ::java::nio::ShortBuffer * asReadOnlyBuffer();
-  jboolean isReadOnly();
-  jboolean isDirect();
-  ::java::nio::ByteOrder * order();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::nio::ShortBuffer)))) offset;
-  ::java::nio::ByteBuffer * bb;
-  jboolean readOnly;
-  ::java::nio::ByteOrder * endian;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_ShortViewBufferImpl__
diff --git a/libjava/java/nio/VMDirectByteBuffer.h b/libjava/java/nio/VMDirectByteBuffer.h
deleted file mode 100644
index 2434caf194d..00000000000
--- a/libjava/java/nio/VMDirectByteBuffer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_VMDirectByteBuffer__
-#define __java_nio_VMDirectByteBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class VMDirectByteBuffer;
-    }
-  }
-}
-
-class java::nio::VMDirectByteBuffer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMDirectByteBuffer();
-  static ::gnu::gcj::RawData * allocate(jint);
-  static void free(::gnu::gcj::RawData *);
-  static jbyte get(::gnu::gcj::RawData *, jint);
-  static void get(::gnu::gcj::RawData *, jint, JArray< jbyte > *, jint, jint);
-  static void put(::gnu::gcj::RawData *, jint, jbyte);
-  static ::gnu::gcj::RawData * adjustAddress(::gnu::gcj::RawData *, jint);
-  static void shiftDown(::gnu::gcj::RawData *, jint, jint, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_VMDirectByteBuffer__
diff --git a/libjava/java/nio/channels/AlreadyConnectedException.h b/libjava/java/nio/channels/AlreadyConnectedException.h
deleted file mode 100644
index 08d6d479ea9..00000000000
--- a/libjava/java/nio/channels/AlreadyConnectedException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_AlreadyConnectedException__
-#define __java_nio_channels_AlreadyConnectedException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class AlreadyConnectedException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::AlreadyConnectedException : public ::java::lang::IllegalStateException
-{
-
-public:
-  AlreadyConnectedException();
-private:
-  static const jlong serialVersionUID = -7331895245053773357LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_AlreadyConnectedException__
diff --git a/libjava/java/nio/channels/AsynchronousCloseException.h b/libjava/java/nio/channels/AsynchronousCloseException.h
deleted file mode 100644
index bfcbf2eb46c..00000000000
--- a/libjava/java/nio/channels/AsynchronousCloseException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_AsynchronousCloseException__
-#define __java_nio_channels_AsynchronousCloseException__
-
-#pragma interface
-
-#include <java/nio/channels/ClosedChannelException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class AsynchronousCloseException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::AsynchronousCloseException : public ::java::nio::channels::ClosedChannelException
-{
-
-public:
-  AsynchronousCloseException();
-private:
-  static const jlong serialVersionUID = 6891178312432313966LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_AsynchronousCloseException__
diff --git a/libjava/java/nio/channels/ByteChannel.h b/libjava/java/nio/channels/ByteChannel.h
deleted file mode 100644
index a813648137a..00000000000
--- a/libjava/java/nio/channels/ByteChannel.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_ByteChannel__
-#define __java_nio_channels_ByteChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-          class ByteChannel;
-      }
-    }
-  }
-}
-
-class java::nio::channels::ByteChannel : public ::java::lang::Object
-{
-
-public:
-  virtual jint read(::java::nio::ByteBuffer *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void close() = 0;
-  virtual jint write(::java::nio::ByteBuffer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_nio_channels_ByteChannel__
diff --git a/libjava/java/nio/channels/CancelledKeyException.h b/libjava/java/nio/channels/CancelledKeyException.h
deleted file mode 100644
index 742185f1fd7..00000000000
--- a/libjava/java/nio/channels/CancelledKeyException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_CancelledKeyException__
-#define __java_nio_channels_CancelledKeyException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class CancelledKeyException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::CancelledKeyException : public ::java::lang::IllegalStateException
-{
-
-public:
-  CancelledKeyException();
-private:
-  static const jlong serialVersionUID = -8438032138028814268LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_CancelledKeyException__
diff --git a/libjava/java/nio/channels/Channel.h b/libjava/java/nio/channels/Channel.h
deleted file mode 100644
index fc0177d6f78..00000000000
--- a/libjava/java/nio/channels/Channel.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_Channel__
-#define __java_nio_channels_Channel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class Channel;
-      }
-    }
-  }
-}
-
-class java::nio::channels::Channel : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isOpen() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_nio_channels_Channel__
diff --git a/libjava/java/nio/channels/Channels.h b/libjava/java/nio/channels/Channels.h
deleted file mode 100644
index 384156483e0..00000000000
--- a/libjava/java/nio/channels/Channels.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_Channels__
-#define __java_nio_channels_Channels__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class Channels;
-          class ReadableByteChannel;
-          class WritableByteChannel;
-      }
-      namespace charset
-      {
-          class CharsetDecoder;
-          class CharsetEncoder;
-      }
-    }
-  }
-}
-
-class java::nio::channels::Channels : public ::java::lang::Object
-{
-
-  Channels();
-public:
-  static ::java::io::InputStream * newInputStream(::java::nio::channels::ReadableByteChannel *);
-  static ::java::io::OutputStream * newOutputStream(::java::nio::channels::WritableByteChannel *);
-  static ::java::nio::channels::ReadableByteChannel * newChannel(::java::io::InputStream *);
-  static ::java::nio::channels::WritableByteChannel * newChannel(::java::io::OutputStream *);
-  static ::java::io::Reader * newReader(::java::nio::channels::ReadableByteChannel *, ::java::nio::charset::CharsetDecoder *, jint);
-  static ::java::io::Reader * newReader(::java::nio::channels::ReadableByteChannel *, ::java::lang::String *);
-  static ::java::io::Writer * newWriter(::java::nio::channels::WritableByteChannel *, ::java::nio::charset::CharsetEncoder *, jint);
-  static ::java::io::Writer * newWriter(::java::nio::channels::WritableByteChannel *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_Channels__
diff --git a/libjava/java/nio/channels/ClosedByInterruptException.h b/libjava/java/nio/channels/ClosedByInterruptException.h
deleted file mode 100644
index 742dddc6048..00000000000
--- a/libjava/java/nio/channels/ClosedByInterruptException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_ClosedByInterruptException__
-#define __java_nio_channels_ClosedByInterruptException__
-
-#pragma interface
-
-#include <java/nio/channels/AsynchronousCloseException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class ClosedByInterruptException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::ClosedByInterruptException : public ::java::nio::channels::AsynchronousCloseException
-{
-
-public:
-  ClosedByInterruptException();
-private:
-  static const jlong serialVersionUID = -4488191543534286750LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_ClosedByInterruptException__
diff --git a/libjava/java/nio/channels/ClosedChannelException.h b/libjava/java/nio/channels/ClosedChannelException.h
deleted file mode 100644
index 3bca678e5a2..00000000000
--- a/libjava/java/nio/channels/ClosedChannelException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_ClosedChannelException__
-#define __java_nio_channels_ClosedChannelException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class ClosedChannelException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::ClosedChannelException : public ::java::io::IOException
-{
-
-public:
-  ClosedChannelException();
-private:
-  static const jlong serialVersionUID = 882777185433553857LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_ClosedChannelException__
diff --git a/libjava/java/nio/channels/ClosedSelectorException.h b/libjava/java/nio/channels/ClosedSelectorException.h
deleted file mode 100644
index 80b821ed41a..00000000000
--- a/libjava/java/nio/channels/ClosedSelectorException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_ClosedSelectorException__
-#define __java_nio_channels_ClosedSelectorException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class ClosedSelectorException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::ClosedSelectorException : public ::java::lang::IllegalStateException
-{
-
-public:
-  ClosedSelectorException();
-private:
-  static const jlong serialVersionUID = 6466297122317847835LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_ClosedSelectorException__
diff --git a/libjava/java/nio/channels/ConnectionPendingException.h b/libjava/java/nio/channels/ConnectionPendingException.h
deleted file mode 100644
index 29f48307124..00000000000
--- a/libjava/java/nio/channels/ConnectionPendingException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_ConnectionPendingException__
-#define __java_nio_channels_ConnectionPendingException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class ConnectionPendingException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::ConnectionPendingException : public ::java::lang::IllegalStateException
-{
-
-public:
-  ConnectionPendingException();
-private:
-  static const jlong serialVersionUID = 2008393366501760879LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_ConnectionPendingException__
diff --git a/libjava/java/nio/channels/DatagramChannel.h b/libjava/java/nio/channels/DatagramChannel.h
deleted file mode 100644
index cb2dabcc0fa..00000000000
--- a/libjava/java/nio/channels/DatagramChannel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_DatagramChannel__
-#define __java_nio_channels_DatagramChannel__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectableChannel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class DatagramSocket;
-        class SocketAddress;
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-          class DatagramChannel;
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::DatagramChannel : public ::java::nio::channels::spi::AbstractSelectableChannel
-{
-
-public: // actually protected
-  DatagramChannel(::java::nio::channels::spi::SelectorProvider *);
-public:
-  static ::java::nio::channels::DatagramChannel * open();
-  virtual jlong read(JArray< ::java::nio::ByteBuffer * > *);
-  virtual jlong write(JArray< ::java::nio::ByteBuffer * > *);
-  virtual ::java::nio::channels::DatagramChannel * connect(::java::net::SocketAddress *) = 0;
-  virtual ::java::nio::channels::DatagramChannel * disconnect() = 0;
-  virtual jboolean isConnected() = 0;
-  virtual jint read(::java::nio::ByteBuffer *) = 0;
-  virtual jlong read(JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual ::java::net::SocketAddress * receive(::java::nio::ByteBuffer *) = 0;
-  virtual jint send(::java::nio::ByteBuffer *, ::java::net::SocketAddress *) = 0;
-  virtual ::java::net::DatagramSocket * socket() = 0;
-  virtual jint write(::java::nio::ByteBuffer *) = 0;
-  virtual jlong write(JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual jint validOps();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_DatagramChannel__
diff --git a/libjava/java/nio/channels/FileChannel$MapMode.h b/libjava/java/nio/channels/FileChannel$MapMode.h
deleted file mode 100644
index 954e6979e96..00000000000
--- a/libjava/java/nio/channels/FileChannel$MapMode.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_FileChannel$MapMode__
-#define __java_nio_channels_FileChannel$MapMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class FileChannel$MapMode;
-      }
-    }
-  }
-}
-
-class java::nio::channels::FileChannel$MapMode : public ::java::lang::Object
-{
-
-public: // actually package-private
-  FileChannel$MapMode(jint);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) m;
-public:
-  static ::java::nio::channels::FileChannel$MapMode * READ_ONLY;
-  static ::java::nio::channels::FileChannel$MapMode * READ_WRITE;
-  static ::java::nio::channels::FileChannel$MapMode * PRIVATE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_FileChannel$MapMode__
diff --git a/libjava/java/nio/channels/FileChannel.h b/libjava/java/nio/channels/FileChannel.h
deleted file mode 100644
index 10cc314ccb9..00000000000
--- a/libjava/java/nio/channels/FileChannel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_FileChannel__
-#define __java_nio_channels_FileChannel__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractInterruptibleChannel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class MappedByteBuffer;
-      namespace channels
-      {
-          class FileChannel;
-          class FileChannel$MapMode;
-          class FileLock;
-          class ReadableByteChannel;
-          class WritableByteChannel;
-      }
-    }
-  }
-}
-
-class java::nio::channels::FileChannel : public ::java::nio::channels::spi::AbstractInterruptibleChannel
-{
-
-public: // actually protected
-  FileChannel();
-public:
-  virtual ::java::nio::MappedByteBuffer * map(::java::nio::channels::FileChannel$MapMode *, jlong, jlong) = 0;
-  virtual jlong size() = 0;
-  virtual jlong write(JArray< ::java::nio::ByteBuffer * > *);
-  virtual jint write(::java::nio::ByteBuffer *) = 0;
-  virtual jint write(::java::nio::ByteBuffer *, jlong) = 0;
-  virtual jlong write(JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual jlong read(JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual jlong read(JArray< ::java::nio::ByteBuffer * > *);
-  virtual jint read(::java::nio::ByteBuffer *) = 0;
-  virtual jint read(::java::nio::ByteBuffer *, jlong) = 0;
-public: // actually protected
-  virtual void implCloseChannel() = 0;
-public:
-  virtual void force(jboolean) = 0;
-  virtual ::java::nio::channels::FileLock * lock();
-  virtual ::java::nio::channels::FileLock * lock(jlong, jlong, jboolean) = 0;
-  virtual ::java::nio::channels::FileLock * tryLock();
-  virtual ::java::nio::channels::FileLock * tryLock(jlong, jlong, jboolean) = 0;
-  virtual jlong position() = 0;
-  virtual ::java::nio::channels::FileChannel * position(jlong) = 0;
-  virtual jlong transferTo(jlong, jlong, ::java::nio::channels::WritableByteChannel *) = 0;
-  virtual jlong transferFrom(::java::nio::channels::ReadableByteChannel *, jlong, jlong) = 0;
-  virtual ::java::nio::channels::FileChannel * truncate(jlong) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_FileChannel__
diff --git a/libjava/java/nio/channels/FileLock.h b/libjava/java/nio/channels/FileLock.h
deleted file mode 100644
index fb358583518..00000000000
--- a/libjava/java/nio/channels/FileLock.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_FileLock__
-#define __java_nio_channels_FileLock__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class FileChannel;
-          class FileLock;
-      }
-    }
-  }
-}
-
-class java::nio::channels::FileLock : public ::java::lang::Object
-{
-
-public: // actually protected
-  FileLock(::java::nio::channels::FileChannel *, jlong, jlong, jboolean);
-public:
-  virtual jboolean isValid() = 0;
-  virtual void release() = 0;
-  virtual ::java::nio::channels::FileChannel * channel();
-  virtual jboolean isShared();
-  virtual jboolean overlaps(jlong, jlong);
-  virtual jlong position();
-  virtual jlong size();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::nio::channels::FileChannel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) channel__;
-  jlong position__;
-  jlong size__;
-  jboolean shared;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_FileLock__
diff --git a/libjava/java/nio/channels/FileLockInterruptionException.h b/libjava/java/nio/channels/FileLockInterruptionException.h
deleted file mode 100644
index ad5e250765a..00000000000
--- a/libjava/java/nio/channels/FileLockInterruptionException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_FileLockInterruptionException__
-#define __java_nio_channels_FileLockInterruptionException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class FileLockInterruptionException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::FileLockInterruptionException : public ::java::io::IOException
-{
-
-public:
-  FileLockInterruptionException();
-private:
-  static const jlong serialVersionUID = 7104080643653532383LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_FileLockInterruptionException__
diff --git a/libjava/java/nio/channels/GatheringByteChannel.h b/libjava/java/nio/channels/GatheringByteChannel.h
deleted file mode 100644
index c69c1954aff..00000000000
--- a/libjava/java/nio/channels/GatheringByteChannel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_GatheringByteChannel__
-#define __java_nio_channels_GatheringByteChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-          class GatheringByteChannel;
-      }
-    }
-  }
-}
-
-class java::nio::channels::GatheringByteChannel : public ::java::lang::Object
-{
-
-public:
-  virtual jlong write(JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual jlong write(JArray< ::java::nio::ByteBuffer * > *) = 0;
-  virtual jint write(::java::nio::ByteBuffer *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_nio_channels_GatheringByteChannel__
diff --git a/libjava/java/nio/channels/IllegalBlockingModeException.h b/libjava/java/nio/channels/IllegalBlockingModeException.h
deleted file mode 100644
index 38eda03799b..00000000000
--- a/libjava/java/nio/channels/IllegalBlockingModeException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_IllegalBlockingModeException__
-#define __java_nio_channels_IllegalBlockingModeException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class IllegalBlockingModeException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::IllegalBlockingModeException : public ::java::lang::IllegalStateException
-{
-
-public:
-  IllegalBlockingModeException();
-private:
-  static const jlong serialVersionUID = -3335774961855590474LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_IllegalBlockingModeException__
diff --git a/libjava/java/nio/channels/IllegalSelectorException.h b/libjava/java/nio/channels/IllegalSelectorException.h
deleted file mode 100644
index 9f137e423b7..00000000000
--- a/libjava/java/nio/channels/IllegalSelectorException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_IllegalSelectorException__
-#define __java_nio_channels_IllegalSelectorException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class IllegalSelectorException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::IllegalSelectorException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  IllegalSelectorException();
-private:
-  static const jlong serialVersionUID = -8406323347253320987LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_IllegalSelectorException__
diff --git a/libjava/java/nio/channels/InterruptibleChannel.h b/libjava/java/nio/channels/InterruptibleChannel.h
deleted file mode 100644
index fa8a68385de..00000000000
--- a/libjava/java/nio/channels/InterruptibleChannel.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_InterruptibleChannel__
-#define __java_nio_channels_InterruptibleChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class InterruptibleChannel;
-      }
-    }
-  }
-}
-
-class java::nio::channels::InterruptibleChannel : public ::java::lang::Object
-{
-
-public:
-  virtual void close() = 0;
-  virtual jboolean isOpen() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_nio_channels_InterruptibleChannel__
diff --git a/libjava/java/nio/channels/NoConnectionPendingException.h b/libjava/java/nio/channels/NoConnectionPendingException.h
deleted file mode 100644
index 5be57aefd7c..00000000000
--- a/libjava/java/nio/channels/NoConnectionPendingException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_NoConnectionPendingException__
-#define __java_nio_channels_NoConnectionPendingException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class NoConnectionPendingException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::NoConnectionPendingException : public ::java::lang::IllegalStateException
-{
-
-public:
-  NoConnectionPendingException();
-private:
-  static const jlong serialVersionUID = -8296561183633134743LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_NoConnectionPendingException__
diff --git a/libjava/java/nio/channels/NonReadableChannelException.h b/libjava/java/nio/channels/NonReadableChannelException.h
deleted file mode 100644
index 210d8369b1d..00000000000
--- a/libjava/java/nio/channels/NonReadableChannelException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_NonReadableChannelException__
-#define __java_nio_channels_NonReadableChannelException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class NonReadableChannelException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::NonReadableChannelException : public ::java::lang::IllegalStateException
-{
-
-public:
-  NonReadableChannelException();
-private:
-  static const jlong serialVersionUID = -3200915679294993514LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_NonReadableChannelException__
diff --git a/libjava/java/nio/channels/NonWritableChannelException.h b/libjava/java/nio/channels/NonWritableChannelException.h
deleted file mode 100644
index 4a56ef98898..00000000000
--- a/libjava/java/nio/channels/NonWritableChannelException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_NonWritableChannelException__
-#define __java_nio_channels_NonWritableChannelException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class NonWritableChannelException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::NonWritableChannelException : public ::java::lang::IllegalStateException
-{
-
-public:
-  NonWritableChannelException();
-private:
-  static const jlong serialVersionUID = -7071230488279011621LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_NonWritableChannelException__
diff --git a/libjava/java/nio/channels/NotYetBoundException.h b/libjava/java/nio/channels/NotYetBoundException.h
deleted file mode 100644
index d4f1ad2d66e..00000000000
--- a/libjava/java/nio/channels/NotYetBoundException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_NotYetBoundException__
-#define __java_nio_channels_NotYetBoundException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class NotYetBoundException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::NotYetBoundException : public ::java::lang::IllegalStateException
-{
-
-public:
-  NotYetBoundException();
-private:
-  static const jlong serialVersionUID = 4640999303950202242LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_NotYetBoundException__
diff --git a/libjava/java/nio/channels/NotYetConnectedException.h b/libjava/java/nio/channels/NotYetConnectedException.h
deleted file mode 100644
index a38417a8271..00000000000
--- a/libjava/java/nio/channels/NotYetConnectedException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_NotYetConnectedException__
-#define __java_nio_channels_NotYetConnectedException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class NotYetConnectedException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::NotYetConnectedException : public ::java::lang::IllegalStateException
-{
-
-public:
-  NotYetConnectedException();
-private:
-  static const jlong serialVersionUID = 4697316551909513464LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_NotYetConnectedException__
diff --git a/libjava/java/nio/channels/OverlappingFileLockException.h b/libjava/java/nio/channels/OverlappingFileLockException.h
deleted file mode 100644
index b2551f9070c..00000000000
--- a/libjava/java/nio/channels/OverlappingFileLockException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_OverlappingFileLockException__
-#define __java_nio_channels_OverlappingFileLockException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class OverlappingFileLockException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::OverlappingFileLockException : public ::java::lang::IllegalStateException
-{
-
-public:
-  OverlappingFileLockException();
-private:
-  static const jlong serialVersionUID = 2047812138163068433LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_OverlappingFileLockException__
diff --git a/libjava/java/nio/channels/Pipe$SinkChannel.h b/libjava/java/nio/channels/Pipe$SinkChannel.h
deleted file mode 100644
index d6842b79b2b..00000000000
--- a/libjava/java/nio/channels/Pipe$SinkChannel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_Pipe$SinkChannel__
-#define __java_nio_channels_Pipe$SinkChannel__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectableChannel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-          class Pipe$SinkChannel;
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::Pipe$SinkChannel : public ::java::nio::channels::spi::AbstractSelectableChannel
-{
-
-public: // actually protected
-  Pipe$SinkChannel(::java::nio::channels::spi::SelectorProvider *);
-public:
-  virtual jint validOps();
-  virtual jint write(::java::nio::ByteBuffer *) = 0;
-  virtual jlong write(JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual jlong write(JArray< ::java::nio::ByteBuffer * > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_Pipe$SinkChannel__
diff --git a/libjava/java/nio/channels/Pipe$SourceChannel.h b/libjava/java/nio/channels/Pipe$SourceChannel.h
deleted file mode 100644
index 9bc78ea3bfa..00000000000
--- a/libjava/java/nio/channels/Pipe$SourceChannel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_Pipe$SourceChannel__
-#define __java_nio_channels_Pipe$SourceChannel__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectableChannel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-          class Pipe$SourceChannel;
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::Pipe$SourceChannel : public ::java::nio::channels::spi::AbstractSelectableChannel
-{
-
-public: // actually protected
-  Pipe$SourceChannel(::java::nio::channels::spi::SelectorProvider *);
-public:
-  virtual jint validOps();
-  virtual jint read(::java::nio::ByteBuffer *) = 0;
-  virtual jlong read(JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual jlong read(JArray< ::java::nio::ByteBuffer * > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_Pipe$SourceChannel__
diff --git a/libjava/java/nio/channels/Pipe.h b/libjava/java/nio/channels/Pipe.h
deleted file mode 100644
index 771dca23e3e..00000000000
--- a/libjava/java/nio/channels/Pipe.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_Pipe__
-#define __java_nio_channels_Pipe__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class Pipe;
-          class Pipe$SinkChannel;
-          class Pipe$SourceChannel;
-      }
-    }
-  }
-}
-
-class java::nio::channels::Pipe : public ::java::lang::Object
-{
-
-public: // actually protected
-  Pipe();
-public:
-  static ::java::nio::channels::Pipe * open();
-  virtual ::java::nio::channels::Pipe$SinkChannel * sink() = 0;
-  virtual ::java::nio::channels::Pipe$SourceChannel * source() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_Pipe__
diff --git a/libjava/java/nio/channels/ReadableByteChannel.h b/libjava/java/nio/channels/ReadableByteChannel.h
deleted file mode 100644
index 9f3e4cf0168..00000000000
--- a/libjava/java/nio/channels/ReadableByteChannel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_ReadableByteChannel__
-#define __java_nio_channels_ReadableByteChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-          class ReadableByteChannel;
-      }
-    }
-  }
-}
-
-class java::nio::channels::ReadableByteChannel : public ::java::lang::Object
-{
-
-public:
-  virtual jint read(::java::nio::ByteBuffer *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_nio_channels_ReadableByteChannel__
diff --git a/libjava/java/nio/channels/ScatteringByteChannel.h b/libjava/java/nio/channels/ScatteringByteChannel.h
deleted file mode 100644
index eeba864d41a..00000000000
--- a/libjava/java/nio/channels/ScatteringByteChannel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_ScatteringByteChannel__
-#define __java_nio_channels_ScatteringByteChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-          class ScatteringByteChannel;
-      }
-    }
-  }
-}
-
-class java::nio::channels::ScatteringByteChannel : public ::java::lang::Object
-{
-
-public:
-  virtual jlong read(JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual jlong read(JArray< ::java::nio::ByteBuffer * > *) = 0;
-  virtual jint read(::java::nio::ByteBuffer *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_nio_channels_ScatteringByteChannel__
diff --git a/libjava/java/nio/channels/SelectableChannel.h b/libjava/java/nio/channels/SelectableChannel.h
deleted file mode 100644
index 82cf8288007..00000000000
--- a/libjava/java/nio/channels/SelectableChannel.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_SelectableChannel__
-#define __java_nio_channels_SelectableChannel__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractInterruptibleChannel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::SelectableChannel : public ::java::nio::channels::spi::AbstractInterruptibleChannel
-{
-
-public: // actually protected
-  SelectableChannel();
-public:
-  virtual ::java::lang::Object * blockingLock() = 0;
-  virtual ::java::nio::channels::SelectableChannel * configureBlocking(jboolean) = 0;
-  virtual jboolean isBlocking() = 0;
-  virtual jboolean isRegistered() = 0;
-  virtual ::java::nio::channels::SelectionKey * keyFor(::java::nio::channels::Selector *) = 0;
-  virtual ::java::nio::channels::spi::SelectorProvider * provider() = 0;
-  virtual ::java::nio::channels::SelectionKey * register$(::java::nio::channels::Selector *, jint);
-  virtual ::java::nio::channels::SelectionKey * register$(::java::nio::channels::Selector *, jint, ::java::lang::Object *) = 0;
-  virtual jint validOps() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_SelectableChannel__
diff --git a/libjava/java/nio/channels/SelectionKey.h b/libjava/java/nio/channels/SelectionKey.h
deleted file mode 100644
index 1b6b0397467..00000000000
--- a/libjava/java/nio/channels/SelectionKey.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_SelectionKey__
-#define __java_nio_channels_SelectionKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-      }
-    }
-  }
-}
-
-class java::nio::channels::SelectionKey : public ::java::lang::Object
-{
-
-public: // actually protected
-  SelectionKey();
-public:
-  virtual ::java::lang::Object * attach(::java::lang::Object *);
-  virtual ::java::lang::Object * attachment();
-  virtual jboolean isAcceptable();
-  virtual jboolean isConnectable();
-  virtual jboolean isReadable();
-  virtual jboolean isWritable();
-  virtual void cancel() = 0;
-  virtual ::java::nio::channels::SelectableChannel * channel() = 0;
-  virtual jint interestOps() = 0;
-  virtual ::java::nio::channels::SelectionKey * interestOps(jint) = 0;
-  virtual jboolean isValid() = 0;
-  virtual jint readyOps() = 0;
-  virtual ::java::nio::channels::Selector * selector() = 0;
-  static const jint OP_ACCEPT = 16;
-  static const jint OP_CONNECT = 8;
-  static const jint OP_READ = 1;
-  static const jint OP_WRITE = 4;
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attached;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_SelectionKey__
diff --git a/libjava/java/nio/channels/Selector.h b/libjava/java/nio/channels/Selector.h
deleted file mode 100644
index 7d561adff4a..00000000000
--- a/libjava/java/nio/channels/Selector.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_Selector__
-#define __java_nio_channels_Selector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class Selector;
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::Selector : public ::java::lang::Object
-{
-
-public: // actually protected
-  Selector();
-public:
-  static ::java::nio::channels::Selector * open();
-  virtual void close() = 0;
-  virtual jboolean isOpen() = 0;
-  virtual ::java::util::Set * keys() = 0;
-  virtual ::java::nio::channels::spi::SelectorProvider * provider() = 0;
-  virtual jint select() = 0;
-  virtual jint select(jlong) = 0;
-  virtual ::java::util::Set * selectedKeys() = 0;
-  virtual jint selectNow() = 0;
-  virtual ::java::nio::channels::Selector * wakeup() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_Selector__
diff --git a/libjava/java/nio/channels/ServerSocketChannel.h b/libjava/java/nio/channels/ServerSocketChannel.h
deleted file mode 100644
index b68d0b9a5b8..00000000000
--- a/libjava/java/nio/channels/ServerSocketChannel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_ServerSocketChannel__
-#define __java_nio_channels_ServerSocketChannel__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectableChannel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-    }
-    namespace nio
-    {
-      namespace channels
-      {
-          class ServerSocketChannel;
-          class SocketChannel;
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::ServerSocketChannel : public ::java::nio::channels::spi::AbstractSelectableChannel
-{
-
-public: // actually protected
-  ServerSocketChannel(::java::nio::channels::spi::SelectorProvider *);
-public:
-  virtual ::java::nio::channels::SocketChannel * accept() = 0;
-  virtual ::java::net::ServerSocket * socket() = 0;
-  static ::java::nio::channels::ServerSocketChannel * open();
-  virtual jint validOps();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_ServerSocketChannel__
diff --git a/libjava/java/nio/channels/SocketChannel.h b/libjava/java/nio/channels/SocketChannel.h
deleted file mode 100644
index b742cdbdc53..00000000000
--- a/libjava/java/nio/channels/SocketChannel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_SocketChannel__
-#define __java_nio_channels_SocketChannel__
-
-#pragma interface
-
-#include <java/nio/channels/spi/AbstractSelectableChannel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-        class SocketAddress;
-    }
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-          class SocketChannel;
-        namespace spi
-        {
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::SocketChannel : public ::java::nio::channels::spi::AbstractSelectableChannel
-{
-
-public: // actually protected
-  SocketChannel(::java::nio::channels::spi::SelectorProvider *);
-public:
-  static ::java::nio::channels::SocketChannel * open();
-  static ::java::nio::channels::SocketChannel * open(::java::net::SocketAddress *);
-  virtual jlong read(JArray< ::java::nio::ByteBuffer * > *);
-  virtual jlong write(JArray< ::java::nio::ByteBuffer * > *);
-  virtual jint validOps();
-  virtual jint read(::java::nio::ByteBuffer *) = 0;
-  virtual jboolean connect(::java::net::SocketAddress *) = 0;
-  virtual jboolean finishConnect() = 0;
-  virtual jboolean isConnected() = 0;
-  virtual jboolean isConnectionPending() = 0;
-  virtual jlong read(JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual ::java::net::Socket * socket() = 0;
-  virtual jint write(::java::nio::ByteBuffer *) = 0;
-  virtual jlong write(JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_SocketChannel__
diff --git a/libjava/java/nio/channels/UnresolvedAddressException.h b/libjava/java/nio/channels/UnresolvedAddressException.h
deleted file mode 100644
index 2a3eefdce25..00000000000
--- a/libjava/java/nio/channels/UnresolvedAddressException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_UnresolvedAddressException__
-#define __java_nio_channels_UnresolvedAddressException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class UnresolvedAddressException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::UnresolvedAddressException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  UnresolvedAddressException();
-private:
-  static const jlong serialVersionUID = 6136959093620794148LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_UnresolvedAddressException__
diff --git a/libjava/java/nio/channels/UnsupportedAddressTypeException.h b/libjava/java/nio/channels/UnsupportedAddressTypeException.h
deleted file mode 100644
index 7f63dd76ede..00000000000
--- a/libjava/java/nio/channels/UnsupportedAddressTypeException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_UnsupportedAddressTypeException__
-#define __java_nio_channels_UnsupportedAddressTypeException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class UnsupportedAddressTypeException;
-      }
-    }
-  }
-}
-
-class java::nio::channels::UnsupportedAddressTypeException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  UnsupportedAddressTypeException();
-private:
-  static const jlong serialVersionUID = -2964323842829700493LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_UnsupportedAddressTypeException__
diff --git a/libjava/java/nio/channels/VMChannels.h b/libjava/java/nio/channels/VMChannels.h
deleted file mode 100644
index 3706d9d8510..00000000000
--- a/libjava/java/nio/channels/VMChannels.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_VMChannels__
-#define __java_nio_channels_VMChannels__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace nio
-      {
-        namespace channels
-        {
-            class FileChannelImpl;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class ReadableByteChannel;
-          class VMChannels;
-          class WritableByteChannel;
-      }
-    }
-  }
-}
-
-class java::nio::channels::VMChannels : public ::java::lang::Object
-{
-
-  VMChannels();
-public: // actually package-private
-  static ::java::io::FileInputStream * newInputStream(::gnu::java::nio::channels::FileChannelImpl *);
-  static ::java::io::FileOutputStream * newOutputStream(::gnu::java::nio::channels::FileChannelImpl *);
-  static ::java::io::InputStream * newInputStream(::java::nio::channels::ReadableByteChannel *);
-  static ::java::io::OutputStream * newOutputStream(::java::nio::channels::WritableByteChannel *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_VMChannels__
diff --git a/libjava/java/nio/channels/WritableByteChannel.h b/libjava/java/nio/channels/WritableByteChannel.h
deleted file mode 100644
index ff413d27aae..00000000000
--- a/libjava/java/nio/channels/WritableByteChannel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_WritableByteChannel__
-#define __java_nio_channels_WritableByteChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-      namespace channels
-      {
-          class WritableByteChannel;
-      }
-    }
-  }
-}
-
-class java::nio::channels::WritableByteChannel : public ::java::lang::Object
-{
-
-public:
-  virtual jint write(::java::nio::ByteBuffer *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_nio_channels_WritableByteChannel__
diff --git a/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.h b/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.h
deleted file mode 100644
index f830a752bfd..00000000000
--- a/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_spi_AbstractInterruptibleChannel__
-#define __java_nio_channels_spi_AbstractInterruptibleChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-        namespace spi
-        {
-            class AbstractInterruptibleChannel;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::spi::AbstractInterruptibleChannel : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractInterruptibleChannel();
-  virtual void begin();
-public:
-  virtual void close();
-public: // actually protected
-  virtual void end(jboolean);
-  virtual void implCloseChannel() = 0;
-public:
-  virtual jboolean isOpen();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) closed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_spi_AbstractInterruptibleChannel__
diff --git a/libjava/java/nio/channels/spi/AbstractSelectableChannel.h b/libjava/java/nio/channels/spi/AbstractSelectableChannel.h
deleted file mode 100644
index f126f441e22..00000000000
--- a/libjava/java/nio/channels/spi/AbstractSelectableChannel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_spi_AbstractSelectableChannel__
-#define __java_nio_channels_spi_AbstractSelectableChannel__
-
-#pragma interface
-
-#include <java/nio/channels/SelectableChannel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectableChannel;
-          class SelectionKey;
-          class Selector;
-        namespace spi
-        {
-            class AbstractSelectableChannel;
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::spi::AbstractSelectableChannel : public ::java::nio::channels::SelectableChannel
-{
-
-public: // actually protected
-  AbstractSelectableChannel(::java::nio::channels::spi::SelectorProvider *);
-public:
-  virtual ::java::lang::Object * blockingLock();
-  virtual ::java::nio::channels::SelectableChannel * configureBlocking(jboolean);
-public: // actually protected
-  virtual void implCloseChannel();
-  virtual void implCloseSelectableChannel() = 0;
-  virtual void implConfigureBlocking(jboolean) = 0;
-public:
-  virtual jboolean isBlocking();
-  virtual jboolean isRegistered();
-  virtual ::java::nio::channels::SelectionKey * keyFor(::java::nio::channels::Selector *);
-  virtual ::java::nio::channels::spi::SelectorProvider * provider();
-private:
-  ::java::nio::channels::SelectionKey * locate(::java::nio::channels::Selector *);
-public:
-  virtual ::java::nio::channels::SelectionKey * register$(::java::nio::channels::Selector *, jint, ::java::lang::Object *);
-public: // actually package-private
-  virtual void addSelectionKey(::java::nio::channels::SelectionKey *);
-  virtual void removeSelectionKey(::java::nio::channels::SelectionKey *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::channels::SelectableChannel)))) blocking;
-  ::java::lang::Object * LOCK;
-  ::java::nio::channels::spi::SelectorProvider * provider__;
-  ::java::util::LinkedList * keys;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_spi_AbstractSelectableChannel__
diff --git a/libjava/java/nio/channels/spi/AbstractSelectionKey.h b/libjava/java/nio/channels/spi/AbstractSelectionKey.h
deleted file mode 100644
index d64a73bfd31..00000000000
--- a/libjava/java/nio/channels/spi/AbstractSelectionKey.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_spi_AbstractSelectionKey__
-#define __java_nio_channels_spi_AbstractSelectionKey__
-
-#pragma interface
-
-#include <java/nio/channels/SelectionKey.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-        namespace spi
-        {
-            class AbstractSelectionKey;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::spi::AbstractSelectionKey : public ::java::nio::channels::SelectionKey
-{
-
-public: // actually protected
-  AbstractSelectionKey();
-public:
-  virtual void cancel();
-  virtual jboolean isValid();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::channels::SelectionKey)))) cancelled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_spi_AbstractSelectionKey__
diff --git a/libjava/java/nio/channels/spi/AbstractSelector.h b/libjava/java/nio/channels/spi/AbstractSelector.h
deleted file mode 100644
index cf3d2b7c414..00000000000
--- a/libjava/java/nio/channels/spi/AbstractSelector.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_spi_AbstractSelector__
-#define __java_nio_channels_spi_AbstractSelector__
-
-#pragma interface
-
-#include <java/nio/channels/Selector.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class SelectionKey;
-        namespace spi
-        {
-            class AbstractSelectableChannel;
-            class AbstractSelectionKey;
-            class AbstractSelector;
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::spi::AbstractSelector : public ::java::nio::channels::Selector
-{
-
-public: // actually protected
-  AbstractSelector(::java::nio::channels::spi::SelectorProvider *);
-public:
-  virtual void close();
-  virtual jboolean isOpen();
-public: // actually protected
-  virtual void begin();
-  virtual void end();
-public:
-  virtual ::java::nio::channels::spi::SelectorProvider * provider();
-public: // actually protected
-  virtual ::java::util::Set * cancelledKeys();
-public: // actually package-private
-  virtual void cancelKey(::java::nio::channels::spi::AbstractSelectionKey *);
-public: // actually protected
-  virtual void implCloseSelector() = 0;
-  virtual ::java::nio::channels::SelectionKey * register$(::java::nio::channels::spi::AbstractSelectableChannel *, jint, ::java::lang::Object *) = 0;
-  virtual void deregister(::java::nio::channels::spi::AbstractSelectionKey *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::nio::channels::Selector)))) closed;
-  ::java::nio::channels::spi::SelectorProvider * provider__;
-  ::java::util::HashSet * cancelledKeys__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_spi_AbstractSelector__
diff --git a/libjava/java/nio/channels/spi/SelectorProvider.h b/libjava/java/nio/channels/spi/SelectorProvider.h
deleted file mode 100644
index 6dcf15c5fb4..00000000000
--- a/libjava/java/nio/channels/spi/SelectorProvider.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_channels_spi_SelectorProvider__
-#define __java_nio_channels_spi_SelectorProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace channels
-      {
-          class DatagramChannel;
-          class Pipe;
-          class ServerSocketChannel;
-          class SocketChannel;
-        namespace spi
-        {
-            class AbstractSelector;
-            class SelectorProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::channels::spi::SelectorProvider : public ::java::lang::Object
-{
-
-public: // actually protected
-  SelectorProvider();
-public:
-  virtual ::java::nio::channels::DatagramChannel * openDatagramChannel() = 0;
-  virtual ::java::nio::channels::Pipe * openPipe() = 0;
-  virtual ::java::nio::channels::spi::AbstractSelector * openSelector() = 0;
-  virtual ::java::nio::channels::ServerSocketChannel * openServerSocketChannel() = 0;
-  virtual ::java::nio::channels::SocketChannel * openSocketChannel() = 0;
-  static ::java::nio::channels::spi::SelectorProvider * provider();
-private:
-  static ::java::nio::channels::spi::SelectorProvider * systemDefaultProvider;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_channels_spi_SelectorProvider__
diff --git a/libjava/java/nio/charset/CharacterCodingException.h b/libjava/java/nio/charset/CharacterCodingException.h
deleted file mode 100644
index 35935cd1fb3..00000000000
--- a/libjava/java/nio/charset/CharacterCodingException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_CharacterCodingException__
-#define __java_nio_charset_CharacterCodingException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class CharacterCodingException;
-      }
-    }
-  }
-}
-
-class java::nio::charset::CharacterCodingException : public ::java::io::IOException
-{
-
-public:
-  CharacterCodingException();
-private:
-  static const jlong serialVersionUID = 8421532232154627783LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_CharacterCodingException__
diff --git a/libjava/java/nio/charset/Charset.h b/libjava/java/nio/charset/Charset.h
deleted file mode 100644
index 62e4f647d7c..00000000000
--- a/libjava/java/nio/charset/Charset.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_Charset__
-#define __java_nio_charset_Charset__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-          class CharsetEncoder;
-        namespace spi
-        {
-            class CharsetProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::charset::Charset : public ::java::lang::Object
-{
-
-public: // actually protected
-  Charset(::java::lang::String *, JArray< ::java::lang::String * > *);
-private:
-  static void checkName(::java::lang::String *);
-public:
-  static ::java::nio::charset::Charset * defaultCharset();
-  static jboolean isSupported(::java::lang::String *);
-  static ::java::nio::charset::Charset * forName(::java::lang::String *);
-private:
-  static ::java::nio::charset::Charset * charsetForName(::java::lang::String *);
-public:
-  static ::java::util::SortedMap * availableCharsets();
-private:
-  static ::java::nio::charset::spi::CharsetProvider * provider();
-  static JArray< ::java::nio::charset::spi::CharsetProvider * > * providers2();
-public:
-  virtual ::java::lang::String * name();
-  virtual ::java::util::Set * aliases();
-  virtual ::java::lang::String * displayName();
-  virtual ::java::lang::String * displayName(::java::util::Locale *);
-  virtual jboolean isRegistered();
-  virtual jboolean contains(::java::nio::charset::Charset *) = 0;
-  virtual ::java::nio::charset::CharsetDecoder * newDecoder() = 0;
-  virtual ::java::nio::charset::CharsetEncoder * newEncoder() = 0;
-  virtual jboolean canEncode();
-  virtual ::java::nio::ByteBuffer * encode(::java::nio::CharBuffer *);
-  virtual ::java::nio::ByteBuffer * encode(::java::lang::String *);
-  virtual ::java::nio::CharBuffer * decode(::java::nio::ByteBuffer *);
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::nio::charset::CharsetEncoder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cachedEncoder;
-  ::java::nio::charset::CharsetDecoder * cachedDecoder;
-  static JArray< ::java::nio::charset::spi::CharsetProvider * > * providers;
-  ::java::lang::String * canonicalName;
-  JArray< ::java::lang::String * > * aliases__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_Charset__
diff --git a/libjava/java/nio/charset/CharsetDecoder.h b/libjava/java/nio/charset/CharsetDecoder.h
deleted file mode 100644
index fe75d48a532..00000000000
--- a/libjava/java/nio/charset/CharsetDecoder.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_CharsetDecoder__
-#define __java_nio_charset_CharsetDecoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-          class CoderResult;
-          class CodingErrorAction;
-      }
-    }
-  }
-}
-
-class java::nio::charset::CharsetDecoder : public ::java::lang::Object
-{
-
-  CharsetDecoder(::java::nio::charset::Charset *, jfloat, jfloat, ::java::lang::String *);
-public: // actually protected
-  CharsetDecoder(::java::nio::charset::Charset *, jfloat, jfloat);
-public:
-  virtual jfloat averageCharsPerByte();
-  virtual ::java::nio::charset::Charset * charset();
-  virtual ::java::nio::CharBuffer * decode(::java::nio::ByteBuffer *);
-  virtual ::java::nio::charset::CoderResult * decode(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *, jboolean);
-public: // actually protected
-  virtual ::java::nio::charset::CoderResult * decodeLoop(::java::nio::ByteBuffer *, ::java::nio::CharBuffer *) = 0;
-public:
-  virtual ::java::nio::charset::Charset * detectedCharset();
-  virtual ::java::nio::charset::CoderResult * flush(::java::nio::CharBuffer *);
-public: // actually protected
-  virtual ::java::nio::charset::CoderResult * implFlush(::java::nio::CharBuffer *);
-public:
-  virtual ::java::nio::charset::CharsetDecoder * onMalformedInput(::java::nio::charset::CodingErrorAction *);
-public: // actually protected
-  virtual void implOnMalformedInput(::java::nio::charset::CodingErrorAction *);
-  virtual void implOnUnmappableCharacter(::java::nio::charset::CodingErrorAction *);
-  virtual void implReplaceWith(::java::lang::String *);
-  virtual void implReset();
-public:
-  virtual jboolean isAutoDetecting();
-  virtual jboolean isCharsetDetected();
-  virtual ::java::nio::charset::CodingErrorAction * malformedInputAction();
-  virtual jfloat maxCharsPerByte();
-  virtual ::java::nio::charset::CharsetDecoder * onUnmappableCharacter(::java::nio::charset::CodingErrorAction *);
-  virtual ::java::lang::String * replacement();
-  virtual ::java::nio::charset::CharsetDecoder * replaceWith(::java::lang::String *);
-  virtual ::java::nio::charset::CharsetDecoder * reset();
-  virtual ::java::nio::charset::CodingErrorAction * unmappableCharacterAction();
-private:
-  static const jint STATE_RESET = 0;
-  static const jint STATE_CODING = 1;
-  static const jint STATE_END = 2;
-  static const jint STATE_FLUSHED = 3;
-  static ::java::lang::String * DEFAULT_REPLACEMENT;
-  ::java::nio::charset::Charset * __attribute__((aligned(__alignof__( ::java::lang::Object)))) charset__;
-  jfloat averageCharsPerByte__;
-  jfloat maxCharsPerByte__;
-  ::java::lang::String * replacement__;
-  jint state;
-  ::java::nio::charset::CodingErrorAction * malformedInputAction__;
-  ::java::nio::charset::CodingErrorAction * unmappableCharacterAction__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_CharsetDecoder__
diff --git a/libjava/java/nio/charset/CharsetEncoder.h b/libjava/java/nio/charset/CharsetEncoder.h
deleted file mode 100644
index 5a64e44f748..00000000000
--- a/libjava/java/nio/charset/CharsetEncoder.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_CharsetEncoder__
-#define __java_nio_charset_CharsetEncoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-        class CharBuffer;
-      namespace charset
-      {
-          class Charset;
-          class CharsetEncoder;
-          class CoderResult;
-          class CodingErrorAction;
-      }
-    }
-  }
-}
-
-class java::nio::charset::CharsetEncoder : public ::java::lang::Object
-{
-
-public: // actually protected
-  CharsetEncoder(::java::nio::charset::Charset *, jfloat, jfloat);
-  CharsetEncoder(::java::nio::charset::Charset *, jfloat, jfloat, JArray< jbyte > *);
-public:
-  virtual jfloat averageBytesPerChar();
-  virtual jboolean canEncode(jchar);
-  virtual jboolean canEncode(::java::lang::CharSequence *);
-private:
-  jboolean canEncode(::java::nio::CharBuffer *);
-public:
-  virtual ::java::nio::charset::Charset * charset();
-  virtual ::java::nio::ByteBuffer * encode(::java::nio::CharBuffer *);
-  virtual ::java::nio::charset::CoderResult * encode(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *, jboolean);
-public: // actually protected
-  virtual ::java::nio::charset::CoderResult * encodeLoop(::java::nio::CharBuffer *, ::java::nio::ByteBuffer *) = 0;
-public:
-  virtual ::java::nio::charset::CoderResult * flush(::java::nio::ByteBuffer *);
-public: // actually protected
-  virtual ::java::nio::charset::CoderResult * implFlush(::java::nio::ByteBuffer *);
-  virtual void implOnMalformedInput(::java::nio::charset::CodingErrorAction *);
-  virtual void implOnUnmappableCharacter(::java::nio::charset::CodingErrorAction *);
-  virtual void implReplaceWith(JArray< jbyte > *);
-  virtual void implReset();
-public:
-  virtual jboolean isLegalReplacement(JArray< jbyte > *);
-  virtual ::java::nio::charset::CodingErrorAction * malformedInputAction();
-  virtual jfloat maxBytesPerChar();
-  virtual ::java::nio::charset::CharsetEncoder * onMalformedInput(::java::nio::charset::CodingErrorAction *);
-  virtual ::java::nio::charset::CodingErrorAction * unmappableCharacterAction();
-  virtual ::java::nio::charset::CharsetEncoder * onUnmappableCharacter(::java::nio::charset::CodingErrorAction *);
-  virtual JArray< jbyte > * replacement();
-  virtual ::java::nio::charset::CharsetEncoder * replaceWith(JArray< jbyte > *);
-  virtual ::java::nio::charset::CharsetEncoder * reset();
-private:
-  static const jint STATE_RESET = 0;
-  static const jint STATE_CODING = 1;
-  static const jint STATE_END = 2;
-  static const jint STATE_FLUSHED = 3;
-  static JArray< jbyte > * DEFAULT_REPLACEMENT;
-  ::java::nio::charset::Charset * __attribute__((aligned(__alignof__( ::java::lang::Object)))) charset__;
-  jfloat averageBytesPerChar__;
-  jfloat maxBytesPerChar__;
-  JArray< jbyte > * replacement__;
-  jint state;
-  ::java::nio::charset::CodingErrorAction * malformedInputAction__;
-  ::java::nio::charset::CodingErrorAction * unmappableCharacterAction__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_CharsetEncoder__
diff --git a/libjava/java/nio/charset/CoderMalfunctionError.h b/libjava/java/nio/charset/CoderMalfunctionError.h
deleted file mode 100644
index b3ae83adf21..00000000000
--- a/libjava/java/nio/charset/CoderMalfunctionError.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_CoderMalfunctionError__
-#define __java_nio_charset_CoderMalfunctionError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class CoderMalfunctionError;
-      }
-    }
-  }
-}
-
-class java::nio::charset::CoderMalfunctionError : public ::java::lang::Error
-{
-
-public:
-  CoderMalfunctionError(::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = -1151412348057794301LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_CoderMalfunctionError__
diff --git a/libjava/java/nio/charset/CoderResult$1.h b/libjava/java/nio/charset/CoderResult$1.h
deleted file mode 100644
index a822a3fe1f9..00000000000
--- a/libjava/java/nio/charset/CoderResult$1.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_CoderResult$1__
-#define __java_nio_charset_CoderResult$1__
-
-#pragma interface
-
-#include <java/nio/charset/CoderResult$Cache.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class CoderResult;
-          class CoderResult$1;
-      }
-    }
-  }
-}
-
-class java::nio::charset::CoderResult$1 : public ::java::nio::charset::CoderResult$Cache
-{
-
-public: // actually package-private
-  CoderResult$1();
-public: // actually protected
-  ::java::nio::charset::CoderResult * make(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_CoderResult$1__
diff --git a/libjava/java/nio/charset/CoderResult$2.h b/libjava/java/nio/charset/CoderResult$2.h
deleted file mode 100644
index 15eae195815..00000000000
--- a/libjava/java/nio/charset/CoderResult$2.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_CoderResult$2__
-#define __java_nio_charset_CoderResult$2__
-
-#pragma interface
-
-#include <java/nio/charset/CoderResult$Cache.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class CoderResult;
-          class CoderResult$2;
-      }
-    }
-  }
-}
-
-class java::nio::charset::CoderResult$2 : public ::java::nio::charset::CoderResult$Cache
-{
-
-public: // actually package-private
-  CoderResult$2();
-public: // actually protected
-  ::java::nio::charset::CoderResult * make(jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_CoderResult$2__
diff --git a/libjava/java/nio/charset/CoderResult$Cache.h b/libjava/java/nio/charset/CoderResult$Cache.h
deleted file mode 100644
index 38416bd9e22..00000000000
--- a/libjava/java/nio/charset/CoderResult$Cache.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_CoderResult$Cache__
-#define __java_nio_charset_CoderResult$Cache__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class CoderResult;
-          class CoderResult$Cache;
-      }
-    }
-  }
-}
-
-class java::nio::charset::CoderResult$Cache : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CoderResult$Cache();
-  virtual ::java::nio::charset::CoderResult * get(jint);
-public: // actually protected
-  virtual ::java::nio::charset::CoderResult * make(jint) = 0;
-private:
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_CoderResult$Cache__
diff --git a/libjava/java/nio/charset/CoderResult.h b/libjava/java/nio/charset/CoderResult.h
deleted file mode 100644
index e2c84a61c16..00000000000
--- a/libjava/java/nio/charset/CoderResult.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_CoderResult__
-#define __java_nio_charset_CoderResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class CoderResult;
-          class CoderResult$Cache;
-      }
-    }
-  }
-}
-
-class java::nio::charset::CoderResult : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CoderResult(jint, jint);
-public:
-  virtual jboolean isError();
-  virtual jboolean isMalformed();
-  virtual jboolean isOverflow();
-  virtual jboolean isUnderflow();
-  virtual jboolean isUnmappable();
-  virtual jint length();
-  static ::java::nio::charset::CoderResult * malformedForLength(jint);
-  virtual void throwException();
-  virtual ::java::lang::String * toString();
-  static ::java::nio::charset::CoderResult * unmappableForLength(jint);
-private:
-  static const jint TYPE_MALFORMED = 0;
-  static const jint TYPE_OVERFLOW = 1;
-  static const jint TYPE_UNDERFLOW = 2;
-  static const jint TYPE_UNMAPPABLE = 3;
-public:
-  static ::java::nio::charset::CoderResult * OVERFLOW;
-  static ::java::nio::charset::CoderResult * UNDERFLOW;
-private:
-  static JArray< ::java::lang::String * > * names;
-  static ::java::nio::charset::CoderResult$Cache * malformedCache;
-  static ::java::nio::charset::CoderResult$Cache * unmappableCache;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jint length__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_CoderResult__
diff --git a/libjava/java/nio/charset/CodingErrorAction.h b/libjava/java/nio/charset/CodingErrorAction.h
deleted file mode 100644
index c0bf2aa666b..00000000000
--- a/libjava/java/nio/charset/CodingErrorAction.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_CodingErrorAction__
-#define __java_nio_charset_CodingErrorAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class CodingErrorAction;
-      }
-    }
-  }
-}
-
-class java::nio::charset::CodingErrorAction : public ::java::lang::Object
-{
-
-  CodingErrorAction(::java::lang::String *);
-public:
-  virtual ::java::lang::String * toString();
-  static ::java::nio::charset::CodingErrorAction * IGNORE;
-  static ::java::nio::charset::CodingErrorAction * REPLACE;
-  static ::java::nio::charset::CodingErrorAction * REPORT;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_CodingErrorAction__
diff --git a/libjava/java/nio/charset/IllegalCharsetNameException.h b/libjava/java/nio/charset/IllegalCharsetNameException.h
deleted file mode 100644
index c4b42474fc6..00000000000
--- a/libjava/java/nio/charset/IllegalCharsetNameException.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_IllegalCharsetNameException__
-#define __java_nio_charset_IllegalCharsetNameException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class IllegalCharsetNameException;
-      }
-    }
-  }
-}
-
-class java::nio::charset::IllegalCharsetNameException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  IllegalCharsetNameException(::java::lang::String *);
-  virtual ::java::lang::String * getCharsetName();
-private:
-  static const jlong serialVersionUID = 1457525358470002989LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::IllegalArgumentException)))) charsetName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_IllegalCharsetNameException__
diff --git a/libjava/java/nio/charset/MalformedInputException.h b/libjava/java/nio/charset/MalformedInputException.h
deleted file mode 100644
index 03a6d8d9860..00000000000
--- a/libjava/java/nio/charset/MalformedInputException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_MalformedInputException__
-#define __java_nio_charset_MalformedInputException__
-
-#pragma interface
-
-#include <java/nio/charset/CharacterCodingException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class MalformedInputException;
-      }
-    }
-  }
-}
-
-class java::nio::charset::MalformedInputException : public ::java::nio::charset::CharacterCodingException
-{
-
-public:
-  MalformedInputException(jint);
-  virtual jint getInputLength();
-  virtual ::java::lang::String * getMessage();
-private:
-  static const jlong serialVersionUID = -3438823399834806194LL;
-  jint __attribute__((aligned(__alignof__( ::java::nio::charset::CharacterCodingException)))) inputLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_MalformedInputException__
diff --git a/libjava/java/nio/charset/UnmappableCharacterException.h b/libjava/java/nio/charset/UnmappableCharacterException.h
deleted file mode 100644
index f0ced263f33..00000000000
--- a/libjava/java/nio/charset/UnmappableCharacterException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_UnmappableCharacterException__
-#define __java_nio_charset_UnmappableCharacterException__
-
-#pragma interface
-
-#include <java/nio/charset/CharacterCodingException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class UnmappableCharacterException;
-      }
-    }
-  }
-}
-
-class java::nio::charset::UnmappableCharacterException : public ::java::nio::charset::CharacterCodingException
-{
-
-public:
-  UnmappableCharacterException(jint);
-  virtual jint getInputLength();
-  virtual ::java::lang::String * getMessage();
-private:
-  static const jlong serialVersionUID = -7026962371537706123LL;
-  jint __attribute__((aligned(__alignof__( ::java::nio::charset::CharacterCodingException)))) inputLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_UnmappableCharacterException__
diff --git a/libjava/java/nio/charset/UnsupportedCharsetException.h b/libjava/java/nio/charset/UnsupportedCharsetException.h
deleted file mode 100644
index 7f09678feee..00000000000
--- a/libjava/java/nio/charset/UnsupportedCharsetException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_UnsupportedCharsetException__
-#define __java_nio_charset_UnsupportedCharsetException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class UnsupportedCharsetException;
-      }
-    }
-  }
-}
-
-class java::nio::charset::UnsupportedCharsetException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  UnsupportedCharsetException(::java::lang::String *);
-  virtual ::java::lang::String * getCharsetName();
-private:
-  static const jlong serialVersionUID = 1490765524727386367LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::IllegalArgumentException)))) charsetName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_UnsupportedCharsetException__
diff --git a/libjava/java/nio/charset/spi/CharsetProvider.h b/libjava/java/nio/charset/spi/CharsetProvider.h
deleted file mode 100644
index b194e106b4c..00000000000
--- a/libjava/java/nio/charset/spi/CharsetProvider.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_nio_charset_spi_CharsetProvider__
-#define __java_nio_charset_spi_CharsetProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-        namespace spi
-        {
-            class CharsetProvider;
-        }
-      }
-    }
-  }
-}
-
-class java::nio::charset::spi::CharsetProvider : public ::java::lang::Object
-{
-
-public: // actually protected
-  CharsetProvider();
-public:
-  virtual ::java::util::Iterator * charsets() = 0;
-  virtual ::java::nio::charset::Charset * charsetForName(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_nio_charset_spi_CharsetProvider__
diff --git a/libjava/java/rmi/AccessException.h b/libjava/java/rmi/AccessException.h
deleted file mode 100644
index 1b49620a9b3..00000000000
--- a/libjava/java/rmi/AccessException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_AccessException__
-#define __java_rmi_AccessException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class AccessException;
-    }
-  }
-}
-
-class java::rmi::AccessException : public ::java::rmi::RemoteException
-{
-
-public:
-  AccessException(::java::lang::String *);
-  AccessException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = 6314925228044966088LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_AccessException__
diff --git a/libjava/java/rmi/AlreadyBoundException.h b/libjava/java/rmi/AlreadyBoundException.h
deleted file mode 100644
index f24f4f906ff..00000000000
--- a/libjava/java/rmi/AlreadyBoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_AlreadyBoundException__
-#define __java_rmi_AlreadyBoundException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class AlreadyBoundException;
-    }
-  }
-}
-
-class java::rmi::AlreadyBoundException : public ::java::lang::Exception
-{
-
-public:
-  AlreadyBoundException();
-  AlreadyBoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 9218657361741657110LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_AlreadyBoundException__
diff --git a/libjava/java/rmi/ConnectException.h b/libjava/java/rmi/ConnectException.h
deleted file mode 100644
index a992a0471c6..00000000000
--- a/libjava/java/rmi/ConnectException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_ConnectException__
-#define __java_rmi_ConnectException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class ConnectException;
-    }
-  }
-}
-
-class java::rmi::ConnectException : public ::java::rmi::RemoteException
-{
-
-public:
-  ConnectException(::java::lang::String *);
-  ConnectException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = 4863550261346652506LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_ConnectException__
diff --git a/libjava/java/rmi/ConnectIOException.h b/libjava/java/rmi/ConnectIOException.h
deleted file mode 100644
index c841a61fd44..00000000000
--- a/libjava/java/rmi/ConnectIOException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_ConnectIOException__
-#define __java_rmi_ConnectIOException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class ConnectIOException;
-    }
-  }
-}
-
-class java::rmi::ConnectIOException : public ::java::rmi::RemoteException
-{
-
-public:
-  ConnectIOException(::java::lang::String *);
-  ConnectIOException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = -8087809532704668744LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_ConnectIOException__
diff --git a/libjava/java/rmi/MarshalException.h b/libjava/java/rmi/MarshalException.h
deleted file mode 100644
index db8ed5e1a81..00000000000
--- a/libjava/java/rmi/MarshalException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_MarshalException__
-#define __java_rmi_MarshalException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalException;
-    }
-  }
-}
-
-class java::rmi::MarshalException : public ::java::rmi::RemoteException
-{
-
-public:
-  MarshalException(::java::lang::String *);
-  MarshalException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = 6223554758134037936LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_MarshalException__
diff --git a/libjava/java/rmi/MarshalledObject.h b/libjava/java/rmi/MarshalledObject.h
deleted file mode 100644
index e287ab26c33..00000000000
--- a/libjava/java/rmi/MarshalledObject.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_MarshalledObject__
-#define __java_rmi_MarshalledObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-    }
-  }
-}
-
-class java::rmi::MarshalledObject : public ::java::lang::Object
-{
-
-public:
-  MarshalledObject(::java::lang::Object *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Object * get();
-  jint hashCode();
-private:
-  static const jlong serialVersionUID = 8988374069173025854LL;
-public: // actually package-private
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) objBytes;
-  JArray< jbyte > * locBytes;
-  jint hash;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_MarshalledObject__
diff --git a/libjava/java/rmi/Naming.h b/libjava/java/rmi/Naming.h
deleted file mode 100644
index ac47cea0d0c..00000000000
--- a/libjava/java/rmi/Naming.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_Naming__
-#define __java_rmi_Naming__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace rmi
-    {
-        class Naming;
-        class Remote;
-      namespace registry
-      {
-          class Registry;
-      }
-    }
-  }
-}
-
-class java::rmi::Naming : public ::java::lang::Object
-{
-
-  Naming();
-public:
-  static ::java::rmi::Remote * lookup(::java::lang::String *);
-  static void bind(::java::lang::String *, ::java::rmi::Remote *);
-  static void unbind(::java::lang::String *);
-  static void rebind(::java::lang::String *, ::java::rmi::Remote *);
-  static JArray< ::java::lang::String * > * list(::java::lang::String *);
-private:
-  static ::java::rmi::registry::Registry * getRegistry(::java::net::URL *);
-  static ::java::net::URL * parseURL(::java::lang::String *);
-  static ::java::lang::String * getName(::java::net::URL *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_Naming__
diff --git a/libjava/java/rmi/NoSuchObjectException.h b/libjava/java/rmi/NoSuchObjectException.h
deleted file mode 100644
index 0f02109e831..00000000000
--- a/libjava/java/rmi/NoSuchObjectException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_NoSuchObjectException__
-#define __java_rmi_NoSuchObjectException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class NoSuchObjectException;
-    }
-  }
-}
-
-class java::rmi::NoSuchObjectException : public ::java::rmi::RemoteException
-{
-
-public:
-  NoSuchObjectException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6619395951570472985LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_NoSuchObjectException__
diff --git a/libjava/java/rmi/NotBoundException.h b/libjava/java/rmi/NotBoundException.h
deleted file mode 100644
index 1bdb01737cc..00000000000
--- a/libjava/java/rmi/NotBoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_NotBoundException__
-#define __java_rmi_NotBoundException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class NotBoundException;
-    }
-  }
-}
-
-class java::rmi::NotBoundException : public ::java::lang::Exception
-{
-
-public:
-  NotBoundException();
-  NotBoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1857741824849069317LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_NotBoundException__
diff --git a/libjava/java/rmi/RMISecurityException.h b/libjava/java/rmi/RMISecurityException.h
deleted file mode 100644
index f3207f5e287..00000000000
--- a/libjava/java/rmi/RMISecurityException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_RMISecurityException__
-#define __java_rmi_RMISecurityException__
-
-#pragma interface
-
-#include <java/lang/SecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class RMISecurityException;
-    }
-  }
-}
-
-class java::rmi::RMISecurityException : public ::java::lang::SecurityException
-{
-
-public:
-  RMISecurityException(::java::lang::String *);
-  RMISecurityException(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8433406075740433514LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_RMISecurityException__
diff --git a/libjava/java/rmi/RMISecurityManager.h b/libjava/java/rmi/RMISecurityManager.h
deleted file mode 100644
index 267543e684d..00000000000
--- a/libjava/java/rmi/RMISecurityManager.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_RMISecurityManager__
-#define __java_rmi_RMISecurityManager__
-
-#pragma interface
-
-#include <java/lang/SecurityManager.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class RMISecurityManager;
-    }
-  }
-}
-
-class java::rmi::RMISecurityManager : public ::java::lang::SecurityManager
-{
-
-public:
-  RMISecurityManager();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_RMISecurityManager__
diff --git a/libjava/java/rmi/Remote.h b/libjava/java/rmi/Remote.h
deleted file mode 100644
index f74cf3cbaf0..00000000000
--- a/libjava/java/rmi/Remote.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_Remote__
-#define __java_rmi_Remote__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-    }
-  }
-}
-
-class java::rmi::Remote : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_Remote__
diff --git a/libjava/java/rmi/RemoteException.h b/libjava/java/rmi/RemoteException.h
deleted file mode 100644
index 1e52132141e..00000000000
--- a/libjava/java/rmi/RemoteException.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_RemoteException__
-#define __java_rmi_RemoteException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class RemoteException;
-    }
-  }
-}
-
-class java::rmi::RemoteException : public ::java::io::IOException
-{
-
-public:
-  RemoteException();
-  RemoteException(::java::lang::String *);
-  RemoteException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Throwable * getCause();
-private:
-  static const jlong serialVersionUID = -5148567311918794206LL;
-public:
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::io::IOException)))) detail;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_RemoteException__
diff --git a/libjava/java/rmi/ServerError.h b/libjava/java/rmi/ServerError.h
deleted file mode 100644
index 3c31a49495c..00000000000
--- a/libjava/java/rmi/ServerError.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_ServerError__
-#define __java_rmi_ServerError__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class ServerError;
-    }
-  }
-}
-
-class java::rmi::ServerError : public ::java::rmi::RemoteException
-{
-
-public:
-  ServerError(::java::lang::String *, ::java::lang::Error *);
-private:
-  static const jlong serialVersionUID = 8455284893909696482LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_ServerError__
diff --git a/libjava/java/rmi/ServerException.h b/libjava/java/rmi/ServerException.h
deleted file mode 100644
index 958445a88ae..00000000000
--- a/libjava/java/rmi/ServerException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_ServerException__
-#define __java_rmi_ServerException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class ServerException;
-    }
-  }
-}
-
-class java::rmi::ServerException : public ::java::rmi::RemoteException
-{
-
-public:
-  ServerException(::java::lang::String *);
-  ServerException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = -4775845313121906682LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_ServerException__
diff --git a/libjava/java/rmi/ServerRuntimeException.h b/libjava/java/rmi/ServerRuntimeException.h
deleted file mode 100644
index 42dff2da683..00000000000
--- a/libjava/java/rmi/ServerRuntimeException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_ServerRuntimeException__
-#define __java_rmi_ServerRuntimeException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class ServerRuntimeException;
-    }
-  }
-}
-
-class java::rmi::ServerRuntimeException : public ::java::rmi::RemoteException
-{
-
-public:
-  ServerRuntimeException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = 7054464920481467219LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_ServerRuntimeException__
diff --git a/libjava/java/rmi/StubNotFoundException.h b/libjava/java/rmi/StubNotFoundException.h
deleted file mode 100644
index 79fcaf43ddf..00000000000
--- a/libjava/java/rmi/StubNotFoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_StubNotFoundException__
-#define __java_rmi_StubNotFoundException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class StubNotFoundException;
-    }
-  }
-}
-
-class java::rmi::StubNotFoundException : public ::java::rmi::RemoteException
-{
-
-public:
-  StubNotFoundException(::java::lang::String *);
-  StubNotFoundException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = -7088199405468872373LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_StubNotFoundException__
diff --git a/libjava/java/rmi/UnexpectedException.h b/libjava/java/rmi/UnexpectedException.h
deleted file mode 100644
index e6154b47fb2..00000000000
--- a/libjava/java/rmi/UnexpectedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_UnexpectedException__
-#define __java_rmi_UnexpectedException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class UnexpectedException;
-    }
-  }
-}
-
-class java::rmi::UnexpectedException : public ::java::rmi::RemoteException
-{
-
-public:
-  UnexpectedException(::java::lang::String *);
-  UnexpectedException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = 1800467484195073863LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_UnexpectedException__
diff --git a/libjava/java/rmi/UnknownHostException.h b/libjava/java/rmi/UnknownHostException.h
deleted file mode 100644
index a516ebc2642..00000000000
--- a/libjava/java/rmi/UnknownHostException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_UnknownHostException__
-#define __java_rmi_UnknownHostException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class UnknownHostException;
-    }
-  }
-}
-
-class java::rmi::UnknownHostException : public ::java::rmi::RemoteException
-{
-
-public:
-  UnknownHostException(::java::lang::String *);
-  UnknownHostException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = -8152710247442114228LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_UnknownHostException__
diff --git a/libjava/java/rmi/UnmarshalException.h b/libjava/java/rmi/UnmarshalException.h
deleted file mode 100644
index 0e6c471c8a2..00000000000
--- a/libjava/java/rmi/UnmarshalException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_UnmarshalException__
-#define __java_rmi_UnmarshalException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class UnmarshalException;
-    }
-  }
-}
-
-class java::rmi::UnmarshalException : public ::java::rmi::RemoteException
-{
-
-public:
-  UnmarshalException(::java::lang::String *);
-  UnmarshalException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = 594380845140740218LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_UnmarshalException__
diff --git a/libjava/java/rmi/activation/Activatable.h b/libjava/java/rmi/activation/Activatable.h
deleted file mode 100644
index 63f82979fe8..00000000000
--- a/libjava/java/rmi/activation/Activatable.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_Activatable__
-#define __java_rmi_activation_Activatable__
-
-#pragma interface
-
-#include <java/rmi/server/RemoteServer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-        class Remote;
-      namespace activation
-      {
-          class Activatable;
-          class ActivationDesc;
-          class ActivationID;
-      }
-      namespace server
-      {
-          class ObjID;
-          class RMIClientSocketFactory;
-          class RMIServerSocketFactory;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::Activatable : public ::java::rmi::server::RemoteServer
-{
-
-public: // actually protected
-  Activatable(::java::lang::String *, ::java::rmi::MarshalledObject *, jboolean, jint);
-  Activatable(::java::lang::String *, ::java::rmi::MarshalledObject *, jboolean, jint, ::java::rmi::server::RMIClientSocketFactory *, ::java::rmi::server::RMIServerSocketFactory *);
-  Activatable(::java::rmi::activation::ActivationID *, jint);
-  Activatable(::java::rmi::activation::ActivationID *, jint, ::java::rmi::server::RMIClientSocketFactory *, ::java::rmi::server::RMIServerSocketFactory *);
-  virtual ::java::rmi::activation::ActivationID * getID();
-public: // actually package-private
-  static ::java::rmi::activation::ActivationID * obtainId(::java::rmi::activation::ActivationDesc *);
-public:
-  static ::java::rmi::Remote * register$(::java::rmi::activation::ActivationDesc *);
-  static jboolean inactive(::java::rmi::activation::ActivationID *);
-  static void unregister(::java::rmi::activation::ActivationID *);
-  static ::java::rmi::activation::ActivationID * exportObject(::java::rmi::Remote *, ::java::lang::String *, ::java::rmi::MarshalledObject *, jboolean, jint);
-  static ::java::rmi::activation::ActivationID * exportObject(::java::rmi::Remote *, ::java::lang::String *, ::java::rmi::MarshalledObject *, jboolean, jint, ::java::rmi::server::RMIClientSocketFactory *, ::java::rmi::server::RMIServerSocketFactory *);
-  static ::java::rmi::Remote * exportObject(::java::rmi::Remote *, ::java::rmi::activation::ActivationID *, jint);
-  static ::java::rmi::Remote * exportObject(::java::rmi::Remote *, ::java::rmi::activation::ActivationID *, jint, ::java::rmi::server::RMIClientSocketFactory *, ::java::rmi::server::RMIServerSocketFactory *);
-  static jboolean unexportObject(::java::rmi::Remote *, jboolean);
-public: // actually package-private
-  static ::java::rmi::Remote * exportObject(::java::rmi::Remote *, jint, ::java::rmi::server::RMIServerSocketFactory *);
-public:
-  static ::java::rmi::Remote * export$(::java::rmi::activation::ActivationID *, ::java::rmi::Remote *, jint, ::java::rmi::server::RMIServerSocketFactory *);
-  static ::java::rmi::server::ObjID * makeId(::java::rmi::activation::ActivationID *);
-public: // actually package-private
-  static ::java::rmi::Remote * toStub(::java::rmi::activation::ActivationID *, ::java::lang::Class *);
-  static const jlong serialVersionUID = -3120617863591563455LL;
-  ::java::rmi::activation::ActivationID * __attribute__((aligned(__alignof__( ::java::rmi::server::RemoteServer)))) id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_Activatable__
diff --git a/libjava/java/rmi/activation/ActivateFailedException.h b/libjava/java/rmi/activation/ActivateFailedException.h
deleted file mode 100644
index 7d231a245f2..00000000000
--- a/libjava/java/rmi/activation/ActivateFailedException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivateFailedException__
-#define __java_rmi_activation_ActivateFailedException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace activation
-      {
-          class ActivateFailedException;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivateFailedException : public ::java::rmi::RemoteException
-{
-
-public:
-  ActivateFailedException(::java::lang::String *);
-  ActivateFailedException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = 4863550261346652506LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_ActivateFailedException__
diff --git a/libjava/java/rmi/activation/ActivationDesc.h b/libjava/java/rmi/activation/ActivationDesc.h
deleted file mode 100644
index 618997bc392..00000000000
--- a/libjava/java/rmi/activation/ActivationDesc.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationDesc__
-#define __java_rmi_activation_ActivationDesc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-      namespace activation
-      {
-          class ActivationDesc;
-          class ActivationGroupID;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationDesc : public ::java::lang::Object
-{
-
-public:
-  ActivationDesc(::java::lang::String *, ::java::lang::String *, ::java::rmi::MarshalledObject *);
-  ActivationDesc(::java::lang::String *, ::java::lang::String *, ::java::rmi::MarshalledObject *, jboolean);
-  ActivationDesc(::java::rmi::activation::ActivationGroupID *, ::java::lang::String *, ::java::lang::String *, ::java::rmi::MarshalledObject *);
-  ActivationDesc(::java::rmi::activation::ActivationGroupID *, ::java::lang::String *, ::java::lang::String *, ::java::rmi::MarshalledObject *, jboolean);
-  ::java::rmi::activation::ActivationGroupID * getGroupID();
-  ::java::lang::String * getClassName();
-  ::java::lang::String * getLocation();
-  ::java::rmi::MarshalledObject * getData();
-  jboolean getRestartMode();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-public: // actually package-private
-  static jint hash(::java::lang::Object *);
-  static jboolean eq(::java::lang::Object *, ::java::lang::Object *);
-  static const jlong serialVersionUID = 7455834104417690957LL;
-private:
-  ::java::rmi::activation::ActivationGroupID * __attribute__((aligned(__alignof__( ::java::lang::Object)))) groupid;
-  ::java::lang::String * classname;
-  ::java::lang::String * location;
-  ::java::rmi::MarshalledObject * data;
-  jboolean restart;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_ActivationDesc__
diff --git a/libjava/java/rmi/activation/ActivationException.h b/libjava/java/rmi/activation/ActivationException.h
deleted file mode 100644
index 81f55e23e8e..00000000000
--- a/libjava/java/rmi/activation/ActivationException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationException__
-#define __java_rmi_activation_ActivationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace activation
-      {
-          class ActivationException;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationException : public ::java::lang::Exception
-{
-
-public:
-  ActivationException();
-  ActivationException(::java::lang::String *);
-  ActivationException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Throwable * getCause();
-private:
-  static const jlong serialVersionUID = -4320118837291406071LL;
-public:
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) detail;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_ActivationException__
diff --git a/libjava/java/rmi/activation/ActivationGroup.h b/libjava/java/rmi/activation/ActivationGroup.h
deleted file mode 100644
index b9bf86d28d1..00000000000
--- a/libjava/java/rmi/activation/ActivationGroup.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationGroup__
-#define __java_rmi_activation_ActivationGroup__
-
-#pragma interface
-
-#include <java/rmi/server/UnicastRemoteObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-        class Remote;
-      namespace activation
-      {
-          class ActivationDesc;
-          class ActivationGroup;
-          class ActivationGroupDesc;
-          class ActivationGroupID;
-          class ActivationID;
-          class ActivationMonitor;
-          class ActivationSystem;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationGroup : public ::java::rmi::server::UnicastRemoteObject
-{
-
-public: // actually protected
-  ActivationGroup(::java::rmi::activation::ActivationGroupID *);
-public:
-  virtual void activeObject(::java::rmi::activation::ActivationID *, ::java::rmi::Remote *) = 0;
-  virtual jboolean inactiveObject(::java::rmi::activation::ActivationID *);
-  static ::java::rmi::activation::ActivationGroup * createGroup(::java::rmi::activation::ActivationGroupID *, ::java::rmi::activation::ActivationGroupDesc *, jlong);
-  static ::java::rmi::activation::ActivationGroupID * currentGroupID();
-  static void setSystem(::java::rmi::activation::ActivationSystem *);
-  static ::java::rmi::activation::ActivationSystem * getSystem();
-public: // actually protected
-  virtual void activeObject(::java::rmi::activation::ActivationID *, ::java::rmi::MarshalledObject *);
-  virtual void inactiveGroup();
-public:
-  virtual ::java::rmi::MarshalledObject * newInstance(::java::rmi::activation::ActivationID *, ::java::rmi::activation::ActivationDesc *) = 0;
-public: // actually package-private
-  static const jlong serialVersionUID = -7696947875314805420LL;
-  static ::java::rmi::activation::ActivationGroupID * currentGroupId;
-  ::java::rmi::activation::ActivationGroupID * __attribute__((aligned(__alignof__( ::java::rmi::server::UnicastRemoteObject)))) groupId;
-  ::java::rmi::activation::ActivationMonitor * monitor;
-  jlong incarnation;
-  static ::java::rmi::activation::ActivationSystem * system;
-  static JArray< ::java::lang::Class * > * cConstructorTypes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_ActivationGroup__
diff --git a/libjava/java/rmi/activation/ActivationGroupDesc$CommandEnvironment.h b/libjava/java/rmi/activation/ActivationGroupDesc$CommandEnvironment.h
deleted file mode 100644
index f1cc4955817..00000000000
--- a/libjava/java/rmi/activation/ActivationGroupDesc$CommandEnvironment.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationGroupDesc$CommandEnvironment__
-#define __java_rmi_activation_ActivationGroupDesc$CommandEnvironment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace activation
-      {
-          class ActivationGroupDesc$CommandEnvironment;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationGroupDesc$CommandEnvironment : public ::java::lang::Object
-{
-
-public:
-  ActivationGroupDesc$CommandEnvironment(::java::lang::String *, JArray< ::java::lang::String * > *);
-  virtual ::java::lang::String * getCommandPath();
-  virtual JArray< ::java::lang::String * > * getCommandOptions();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-public: // actually package-private
-  static const jlong serialVersionUID = 6165754737887770191LL;
-private:
-  static JArray< ::java::lang::String * > * NO_ARGS;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) command;
-  JArray< ::java::lang::String * > * options;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_ActivationGroupDesc$CommandEnvironment__
diff --git a/libjava/java/rmi/activation/ActivationGroupDesc.h b/libjava/java/rmi/activation/ActivationGroupDesc.h
deleted file mode 100644
index 8229e57feb1..00000000000
--- a/libjava/java/rmi/activation/ActivationGroupDesc.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationGroupDesc__
-#define __java_rmi_activation_ActivationGroupDesc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-      namespace activation
-      {
-          class ActivationGroupDesc;
-          class ActivationGroupDesc$CommandEnvironment;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationGroupDesc : public ::java::lang::Object
-{
-
-public:
-  ActivationGroupDesc(::java::util::Properties *, ::java::rmi::activation::ActivationGroupDesc$CommandEnvironment *);
-  ActivationGroupDesc(::java::lang::String *, ::java::lang::String *, ::java::rmi::MarshalledObject *, ::java::util::Properties *, ::java::rmi::activation::ActivationGroupDesc$CommandEnvironment *);
-  ::java::lang::String * getClassName();
-  ::java::lang::String * getLocation();
-  ::java::rmi::MarshalledObject * getData();
-  ::java::util::Properties * getPropertyOverrides();
-  ::java::rmi::activation::ActivationGroupDesc$CommandEnvironment * getCommandEnvironment();
-  jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  static jboolean eq(::java::lang::Object *, ::java::lang::Object *);
-public:
-  jint hashCode();
-public: // actually package-private
-  static const jlong serialVersionUID = -4936225423168276595LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) className;
-  ::java::lang::String * location;
-  ::java::rmi::MarshalledObject * data;
-  ::java::rmi::activation::ActivationGroupDesc$CommandEnvironment * env;
-  ::java::util::Properties * props;
-  jlong hash;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_ActivationGroupDesc__
diff --git a/libjava/java/rmi/activation/ActivationGroupID.h b/libjava/java/rmi/activation/ActivationGroupID.h
deleted file mode 100644
index be942fef7c7..00000000000
--- a/libjava/java/rmi/activation/ActivationGroupID.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationGroupID__
-#define __java_rmi_activation_ActivationGroupID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace activation
-      {
-          class ActivationGroupID;
-          class ActivationSystem;
-      }
-      namespace server
-      {
-          class UID;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationGroupID : public ::java::lang::Object
-{
-
-public:
-  ActivationGroupID(::java::rmi::activation::ActivationSystem *);
-  virtual ::java::rmi::activation::ActivationSystem * getSystem();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = -1648432278909740833LL;
-  ::java::rmi::activation::ActivationSystem * __attribute__((aligned(__alignof__( ::java::lang::Object)))) system;
-  ::java::rmi::server::UID * uid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_ActivationGroupID__
diff --git a/libjava/java/rmi/activation/ActivationGroup_Stub.h b/libjava/java/rmi/activation/ActivationGroup_Stub.h
deleted file mode 100644
index 4dc223cb3aa..00000000000
--- a/libjava/java/rmi/activation/ActivationGroup_Stub.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationGroup_Stub__
-#define __java_rmi_activation_ActivationGroup_Stub__
-
-#pragma interface
-
-#include <java/rmi/server/RemoteStub.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-      namespace activation
-      {
-          class ActivationDesc;
-          class ActivationGroup_Stub;
-          class ActivationID;
-      }
-      namespace server
-      {
-          class RemoteRef;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationGroup_Stub : public ::java::rmi::server::RemoteStub
-{
-
-public:
-  ActivationGroup_Stub(::java::rmi::server::RemoteRef *);
-  ::java::rmi::MarshalledObject * newInstance(::java::rmi::activation::ActivationID *, ::java::rmi::activation::ActivationDesc *);
-private:
-  static const jlong serialVersionUID = 2LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_ActivationGroup_Stub__
diff --git a/libjava/java/rmi/activation/ActivationID.h b/libjava/java/rmi/activation/ActivationID.h
deleted file mode 100644
index 831962e7cab..00000000000
--- a/libjava/java/rmi/activation/ActivationID.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationID__
-#define __java_rmi_activation_ActivationID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace activation
-      {
-          class ActivationGroup;
-          class ActivationID;
-          class Activator;
-      }
-      namespace server
-      {
-          class UID;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationID : public ::java::lang::Object
-{
-
-public:
-  ActivationID(::java::rmi::activation::Activator *);
-  virtual ::java::rmi::Remote * activate(jboolean);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public: // actually package-private
-  static jboolean eq(::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = -4608673054848209235LL;
-  ::java::rmi::activation::Activator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) activator;
-  ::java::rmi::server::UID * uid;
-  ::java::rmi::activation::ActivationGroup * group;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_ActivationID__
diff --git a/libjava/java/rmi/activation/ActivationInstantiator.h b/libjava/java/rmi/activation/ActivationInstantiator.h
deleted file mode 100644
index 5249407e87f..00000000000
--- a/libjava/java/rmi/activation/ActivationInstantiator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationInstantiator__
-#define __java_rmi_activation_ActivationInstantiator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-      namespace activation
-      {
-          class ActivationDesc;
-          class ActivationID;
-          class ActivationInstantiator;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationInstantiator : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::rmi::MarshalledObject * newInstance(::java::rmi::activation::ActivationID *, ::java::rmi::activation::ActivationDesc *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_activation_ActivationInstantiator__
diff --git a/libjava/java/rmi/activation/ActivationMonitor.h b/libjava/java/rmi/activation/ActivationMonitor.h
deleted file mode 100644
index a41dc6340ad..00000000000
--- a/libjava/java/rmi/activation/ActivationMonitor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationMonitor__
-#define __java_rmi_activation_ActivationMonitor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-      namespace activation
-      {
-          class ActivationGroupID;
-          class ActivationID;
-          class ActivationMonitor;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationMonitor : public ::java::lang::Object
-{
-
-public:
-  virtual void activeObject(::java::rmi::activation::ActivationID *, ::java::rmi::MarshalledObject *) = 0;
-  virtual void inactiveObject(::java::rmi::activation::ActivationID *) = 0;
-  virtual void inactiveGroup(::java::rmi::activation::ActivationGroupID *, jlong) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_activation_ActivationMonitor__
diff --git a/libjava/java/rmi/activation/ActivationSystem.h b/libjava/java/rmi/activation/ActivationSystem.h
deleted file mode 100644
index cb4f1458e0a..00000000000
--- a/libjava/java/rmi/activation/ActivationSystem.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_ActivationSystem__
-#define __java_rmi_activation_ActivationSystem__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace activation
-      {
-          class ActivationDesc;
-          class ActivationGroupDesc;
-          class ActivationGroupID;
-          class ActivationID;
-          class ActivationInstantiator;
-          class ActivationMonitor;
-          class ActivationSystem;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::ActivationSystem : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::rmi::activation::ActivationID * registerObject(::java::rmi::activation::ActivationDesc *) = 0;
-  virtual void unregisterObject(::java::rmi::activation::ActivationID *) = 0;
-  virtual ::java::rmi::activation::ActivationGroupID * registerGroup(::java::rmi::activation::ActivationGroupDesc *) = 0;
-  virtual ::java::rmi::activation::ActivationMonitor * activeGroup(::java::rmi::activation::ActivationGroupID *, ::java::rmi::activation::ActivationInstantiator *, jlong) = 0;
-  virtual void unregisterGroup(::java::rmi::activation::ActivationGroupID *) = 0;
-  virtual void shutdown() = 0;
-  virtual ::java::rmi::activation::ActivationDesc * setActivationDesc(::java::rmi::activation::ActivationID *, ::java::rmi::activation::ActivationDesc *) = 0;
-  virtual ::java::rmi::activation::ActivationGroupDesc * setActivationGroupDesc(::java::rmi::activation::ActivationGroupID *, ::java::rmi::activation::ActivationGroupDesc *) = 0;
-  virtual ::java::rmi::activation::ActivationDesc * getActivationDesc(::java::rmi::activation::ActivationID *) = 0;
-  virtual ::java::rmi::activation::ActivationGroupDesc * getActivationGroupDesc(::java::rmi::activation::ActivationGroupID *) = 0;
-  static const jint SYSTEM_PORT = 1098;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_activation_ActivationSystem__
diff --git a/libjava/java/rmi/activation/Activator.h b/libjava/java/rmi/activation/Activator.h
deleted file mode 100644
index 7976abc8307..00000000000
--- a/libjava/java/rmi/activation/Activator.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_Activator__
-#define __java_rmi_activation_Activator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class MarshalledObject;
-      namespace activation
-      {
-          class ActivationID;
-          class Activator;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::Activator : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::rmi::MarshalledObject * activate(::java::rmi::activation::ActivationID *, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_activation_Activator__
diff --git a/libjava/java/rmi/activation/UnknownGroupException.h b/libjava/java/rmi/activation/UnknownGroupException.h
deleted file mode 100644
index 27afe4cfbcc..00000000000
--- a/libjava/java/rmi/activation/UnknownGroupException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_UnknownGroupException__
-#define __java_rmi_activation_UnknownGroupException__
-
-#pragma interface
-
-#include <java/rmi/activation/ActivationException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace activation
-      {
-          class UnknownGroupException;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::UnknownGroupException : public ::java::rmi::activation::ActivationException
-{
-
-public:
-  UnknownGroupException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7056094974750002460LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_UnknownGroupException__
diff --git a/libjava/java/rmi/activation/UnknownObjectException.h b/libjava/java/rmi/activation/UnknownObjectException.h
deleted file mode 100644
index 9bda5977cfd..00000000000
--- a/libjava/java/rmi/activation/UnknownObjectException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_activation_UnknownObjectException__
-#define __java_rmi_activation_UnknownObjectException__
-
-#pragma interface
-
-#include <java/rmi/activation/ActivationException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace activation
-      {
-          class UnknownObjectException;
-      }
-    }
-  }
-}
-
-class java::rmi::activation::UnknownObjectException : public ::java::rmi::activation::ActivationException
-{
-
-public:
-  UnknownObjectException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3425547551622251430LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_activation_UnknownObjectException__
diff --git a/libjava/java/rmi/dgc/DGC.h b/libjava/java/rmi/dgc/DGC.h
deleted file mode 100644
index b240c1acb5f..00000000000
--- a/libjava/java/rmi/dgc/DGC.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_dgc_DGC__
-#define __java_rmi_dgc_DGC__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace dgc
-      {
-          class DGC;
-          class Lease;
-          class VMID;
-      }
-      namespace server
-      {
-          class ObjID;
-      }
-    }
-  }
-}
-
-class java::rmi::dgc::DGC : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::rmi::dgc::Lease * dirty(JArray< ::java::rmi::server::ObjID * > *, jlong, ::java::rmi::dgc::Lease *) = 0;
-  virtual void clean(JArray< ::java::rmi::server::ObjID * > *, jlong, ::java::rmi::dgc::VMID *, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_dgc_DGC__
diff --git a/libjava/java/rmi/dgc/Lease.h b/libjava/java/rmi/dgc/Lease.h
deleted file mode 100644
index e3ad0bf4592..00000000000
--- a/libjava/java/rmi/dgc/Lease.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_dgc_Lease__
-#define __java_rmi_dgc_Lease__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace dgc
-      {
-          class Lease;
-          class VMID;
-      }
-    }
-  }
-}
-
-class java::rmi::dgc::Lease : public ::java::lang::Object
-{
-
-public:
-  Lease(::java::rmi::dgc::VMID *, jlong);
-  ::java::rmi::dgc::VMID * getVMID();
-  jlong getValue();
-  ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = -5713411624328831948LL;
-private:
-  ::java::rmi::dgc::VMID * __attribute__((aligned(__alignof__( ::java::lang::Object)))) vmid;
-  jlong value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_dgc_Lease__
diff --git a/libjava/java/rmi/dgc/VMID.h b/libjava/java/rmi/dgc/VMID.h
deleted file mode 100644
index 082553bc1c7..00000000000
--- a/libjava/java/rmi/dgc/VMID.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_dgc_VMID__
-#define __java_rmi_dgc_VMID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace dgc
-      {
-          class VMID;
-      }
-      namespace server
-      {
-          class UID;
-      }
-    }
-  }
-}
-
-class java::rmi::dgc::VMID : public ::java::lang::Object
-{
-
-public:
-  VMID();
-  static jboolean isUnique();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = -538642295484486218LL;
-  static jboolean areWeUnique;
-  static JArray< jbyte > * localAddr;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) addr;
-public: // actually package-private
-  jint hash;
-private:
-  ::java::rmi::server::UID * uid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_dgc_VMID__
diff --git a/libjava/java/rmi/registry/LocateRegistry.h b/libjava/java/rmi/registry/LocateRegistry.h
deleted file mode 100644
index 75b0b4a65b5..00000000000
--- a/libjava/java/rmi/registry/LocateRegistry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_registry_LocateRegistry__
-#define __java_rmi_registry_LocateRegistry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace registry
-      {
-          class LocateRegistry;
-          class Registry;
-      }
-      namespace server
-      {
-          class RMIClientSocketFactory;
-          class RMIServerSocketFactory;
-      }
-    }
-  }
-}
-
-class java::rmi::registry::LocateRegistry : public ::java::lang::Object
-{
-
-  LocateRegistry();
-public:
-  static ::java::rmi::registry::Registry * getRegistry();
-  static ::java::rmi::registry::Registry * getRegistry(jint);
-  static ::java::rmi::registry::Registry * getRegistry(::java::lang::String *);
-  static ::java::rmi::registry::Registry * getRegistry(::java::lang::String *, jint);
-  static ::java::rmi::registry::Registry * getRegistry(::java::lang::String *, jint, ::java::rmi::server::RMIClientSocketFactory *);
-  static ::java::rmi::registry::Registry * createRegistry(jint);
-  static ::java::rmi::registry::Registry * createRegistry(jint, ::java::rmi::server::RMIClientSocketFactory *, ::java::rmi::server::RMIServerSocketFactory *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_registry_LocateRegistry__
diff --git a/libjava/java/rmi/registry/Registry.h b/libjava/java/rmi/registry/Registry.h
deleted file mode 100644
index 470ef2bf4a1..00000000000
--- a/libjava/java/rmi/registry/Registry.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_registry_Registry__
-#define __java_rmi_registry_Registry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace registry
-      {
-          class Registry;
-      }
-    }
-  }
-}
-
-class java::rmi::registry::Registry : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::rmi::Remote * lookup(::java::lang::String *) = 0;
-  virtual void bind(::java::lang::String *, ::java::rmi::Remote *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::rmi::Remote *) = 0;
-  virtual JArray< ::java::lang::String * > * list() = 0;
-  static const jint REGISTRY_PORT = 1099;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_registry_Registry__
diff --git a/libjava/java/rmi/registry/RegistryHandler.h b/libjava/java/rmi/registry/RegistryHandler.h
deleted file mode 100644
index cd29094023e..00000000000
--- a/libjava/java/rmi/registry/RegistryHandler.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_registry_RegistryHandler__
-#define __java_rmi_registry_RegistryHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace registry
-      {
-          class Registry;
-          class RegistryHandler;
-      }
-    }
-  }
-}
-
-class java::rmi::registry::RegistryHandler : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::rmi::registry::Registry * registryStub(::java::lang::String *, jint) = 0;
-  virtual ::java::rmi::registry::Registry * registryImpl(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_registry_RegistryHandler__
diff --git a/libjava/java/rmi/server/ExportException.h b/libjava/java/rmi/server/ExportException.h
deleted file mode 100644
index 471a944d2f4..00000000000
--- a/libjava/java/rmi/server/ExportException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_ExportException__
-#define __java_rmi_server_ExportException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class ExportException;
-      }
-    }
-  }
-}
-
-class java::rmi::server::ExportException : public ::java::rmi::RemoteException
-{
-
-public:
-  ExportException(::java::lang::String *);
-  ExportException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = -9155485338494060170LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_ExportException__
diff --git a/libjava/java/rmi/server/LoaderHandler.h b/libjava/java/rmi/server/LoaderHandler.h
deleted file mode 100644
index 6b515f79599..00000000000
--- a/libjava/java/rmi/server/LoaderHandler.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_LoaderHandler__
-#define __java_rmi_server_LoaderHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace rmi
-    {
-      namespace server
-      {
-          class LoaderHandler;
-      }
-    }
-  }
-}
-
-class java::rmi::server::LoaderHandler : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * loadClass(::java::lang::String *) = 0;
-  virtual ::java::lang::Class * loadClass(::java::net::URL *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * getSecurityContext(::java::lang::ClassLoader *) = 0;
-  static ::java::lang::String * packagePrefix;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_server_LoaderHandler__
diff --git a/libjava/java/rmi/server/LogStream.h b/libjava/java/rmi/server/LogStream.h
deleted file mode 100644
index 6dfcfbf7392..00000000000
--- a/libjava/java/rmi/server/LogStream.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_LogStream__
-#define __java_rmi_server_LogStream__
-
-#pragma interface
-
-#include <java/io/PrintStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class LogStream;
-      }
-    }
-  }
-}
-
-class java::rmi::server::LogStream : public ::java::io::PrintStream
-{
-
-  LogStream(::java::io::OutputStream *);
-public:
-  static ::java::rmi::server::LogStream * log(::java::lang::String *);
-  static ::java::io::PrintStream * getDefaultStream();
-  static void setDefaultStream(::java::io::PrintStream *);
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual void setOutputStream(::java::io::OutputStream *);
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::String * toString();
-  static jint parseLevel(::java::lang::String *);
-  static const jint SILENT = 0;
-  static const jint BRIEF = 10;
-  static const jint VERBOSE = 20;
-private:
-  static ::java::io::PrintStream * defStream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_LogStream__
diff --git a/libjava/java/rmi/server/ObjID.h b/libjava/java/rmi/server/ObjID.h
deleted file mode 100644
index f830f0f4d41..00000000000
--- a/libjava/java/rmi/server/ObjID.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_ObjID__
-#define __java_rmi_server_ObjID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class ObjID;
-          class UID;
-      }
-    }
-  }
-}
-
-class java::rmi::server::ObjID : public ::java::lang::Object
-{
-
-public:
-  ObjID();
-  ObjID(jint);
-  void write(::java::io::ObjectOutput *);
-  static ::java::rmi::server::ObjID * read(::java::io::ObjectInput *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  static jboolean eq(::java::lang::Object *, ::java::lang::Object *);
-public:
-  ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = -6386392263968365220LL;
-private:
-  static jlong next;
-  static ::java::lang::Object * lock;
-public:
-  static const jint REGISTRY_ID = 0;
-  static const jint ACTIVATOR_ID = 1;
-  static const jint DGC_ID = 2;
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) objNum;
-  ::java::rmi::server::UID * space;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_ObjID__
diff --git a/libjava/java/rmi/server/Operation.h b/libjava/java/rmi/server/Operation.h
deleted file mode 100644
index e7b70ecd11d..00000000000
--- a/libjava/java/rmi/server/Operation.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_Operation__
-#define __java_rmi_server_Operation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class Operation;
-      }
-    }
-  }
-}
-
-class java::rmi::server::Operation : public ::java::lang::Object
-{
-
-public:
-  Operation(::java::lang::String *);
-  virtual ::java::lang::String * getOperation();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) operation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_Operation__
diff --git a/libjava/java/rmi/server/RMIClassLoader.h b/libjava/java/rmi/server/RMIClassLoader.h
deleted file mode 100644
index 1d29dfd6172..00000000000
--- a/libjava/java/rmi/server/RMIClassLoader.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RMIClassLoader__
-#define __java_rmi_server_RMIClassLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace rmi
-    {
-      namespace server
-      {
-          class RMIClassLoader;
-          class RMIClassLoaderSpi;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RMIClassLoader : public ::java::lang::Object
-{
-
-  RMIClassLoader();
-public:
-  static ::java::lang::Class * loadClass(::java::lang::String *);
-  static ::java::lang::Class * loadClass(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class * loadClass(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-  static ::java::lang::Class * loadProxyClass(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::lang::ClassLoader *);
-  static ::java::lang::Class * loadClass(::java::net::URL *, ::java::lang::String *);
-  static ::java::lang::ClassLoader * getClassLoader(::java::lang::String *);
-  static ::java::lang::String * getClassAnnotation(::java::lang::Class *);
-  static ::java::lang::Object * getSecurityContext(::java::lang::ClassLoader *);
-  static ::java::rmi::server::RMIClassLoaderSpi * getDefaultProviderInstance();
-private:
-  static ::java::rmi::server::RMIClassLoaderSpi * getProviderInstance();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_RMIClassLoader__
diff --git a/libjava/java/rmi/server/RMIClassLoaderSpi.h b/libjava/java/rmi/server/RMIClassLoaderSpi.h
deleted file mode 100644
index 978a11a0801..00000000000
--- a/libjava/java/rmi/server/RMIClassLoaderSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RMIClassLoaderSpi__
-#define __java_rmi_server_RMIClassLoaderSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class RMIClassLoaderSpi;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RMIClassLoaderSpi : public ::java::lang::Object
-{
-
-public:
-  RMIClassLoaderSpi();
-  virtual ::java::lang::Class * loadClass(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *) = 0;
-  virtual ::java::lang::Class * loadProxyClass(::java::lang::String *, JArray< ::java::lang::String * > *, ::java::lang::ClassLoader *) = 0;
-  virtual ::java::lang::ClassLoader * getClassLoader(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassAnnotation(::java::lang::Class *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_RMIClassLoaderSpi__
diff --git a/libjava/java/rmi/server/RMIClientSocketFactory.h b/libjava/java/rmi/server/RMIClientSocketFactory.h
deleted file mode 100644
index 4a0731962c3..00000000000
--- a/libjava/java/rmi/server/RMIClientSocketFactory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RMIClientSocketFactory__
-#define __java_rmi_server_RMIClientSocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-    namespace rmi
-    {
-      namespace server
-      {
-          class RMIClientSocketFactory;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RMIClientSocketFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_server_RMIClientSocketFactory__
diff --git a/libjava/java/rmi/server/RMIFailureHandler.h b/libjava/java/rmi/server/RMIFailureHandler.h
deleted file mode 100644
index da177a063b9..00000000000
--- a/libjava/java/rmi/server/RMIFailureHandler.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RMIFailureHandler__
-#define __java_rmi_server_RMIFailureHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class RMIFailureHandler;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RMIFailureHandler : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean failure(::java::lang::Exception *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_server_RMIFailureHandler__
diff --git a/libjava/java/rmi/server/RMIServerSocketFactory.h b/libjava/java/rmi/server/RMIServerSocketFactory.h
deleted file mode 100644
index daf42af5633..00000000000
--- a/libjava/java/rmi/server/RMIServerSocketFactory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RMIServerSocketFactory__
-#define __java_rmi_server_RMIServerSocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-    }
-    namespace rmi
-    {
-      namespace server
-      {
-          class RMIServerSocketFactory;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RMIServerSocketFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::net::ServerSocket * createServerSocket(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_server_RMIServerSocketFactory__
diff --git a/libjava/java/rmi/server/RMISocketFactory.h b/libjava/java/rmi/server/RMISocketFactory.h
deleted file mode 100644
index f79b04cc449..00000000000
--- a/libjava/java/rmi/server/RMISocketFactory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RMISocketFactory__
-#define __java_rmi_server_RMISocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-        class Socket;
-    }
-    namespace rmi
-    {
-      namespace server
-      {
-          class RMIFailureHandler;
-          class RMISocketFactory;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RMISocketFactory : public ::java::lang::Object
-{
-
-public:
-  RMISocketFactory();
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint) = 0;
-  virtual ::java::net::ServerSocket * createServerSocket(jint) = 0;
-  static void setSocketFactory(::java::rmi::server::RMISocketFactory *);
-  static ::java::rmi::server::RMISocketFactory * getSocketFactory();
-  static ::java::rmi::server::RMISocketFactory * getDefaultSocketFactory();
-  static void setFailureHandler(::java::rmi::server::RMIFailureHandler *);
-  static ::java::rmi::server::RMIFailureHandler * getFailureHandler();
-private:
-  static ::java::rmi::server::RMISocketFactory * defaultFactory;
-  static ::java::rmi::server::RMISocketFactory * currentFactory;
-  static ::java::rmi::server::RMIFailureHandler * currentHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_RMISocketFactory__
diff --git a/libjava/java/rmi/server/RemoteCall.h b/libjava/java/rmi/server/RemoteCall.h
deleted file mode 100644
index e416f0b81c0..00000000000
--- a/libjava/java/rmi/server/RemoteCall.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RemoteCall__
-#define __java_rmi_server_RemoteCall__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class RemoteCall;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RemoteCall : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::io::ObjectOutput * getOutputStream() = 0;
-  virtual void releaseOutputStream() = 0;
-  virtual ::java::io::ObjectInput * getInputStream() = 0;
-  virtual void releaseInputStream() = 0;
-  virtual ::java::io::ObjectOutput * getResultStream(jboolean) = 0;
-  virtual void executeCall() = 0;
-  virtual void done() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_server_RemoteCall__
diff --git a/libjava/java/rmi/server/RemoteObject.h b/libjava/java/rmi/server/RemoteObject.h
deleted file mode 100644
index 5a35b02c8ab..00000000000
--- a/libjava/java/rmi/server/RemoteObject.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RemoteObject__
-#define __java_rmi_server_RemoteObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace server
-      {
-          class RemoteObject;
-          class RemoteRef;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RemoteObject : public ::java::lang::Object
-{
-
-public: // actually protected
-  RemoteObject();
-  RemoteObject(::java::rmi::server::RemoteRef *);
-public:
-  virtual ::java::rmi::server::RemoteRef * getRef();
-public: // actually package-private
-  static void addStub(::java::rmi::Remote *, ::java::rmi::Remote *);
-  static void deleteStub(::java::rmi::Remote *);
-public:
-  static ::java::rmi::Remote * toStub(::java::rmi::Remote *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -3215090123894869218LL;
-public: // actually protected
-  ::java::rmi::server::RemoteRef * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ref;
-private:
-  static ::java::util::WeakHashMap * stubs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_RemoteObject__
diff --git a/libjava/java/rmi/server/RemoteObjectInvocationHandler.h b/libjava/java/rmi/server/RemoteObjectInvocationHandler.h
deleted file mode 100644
index babacb8b3bf..00000000000
--- a/libjava/java/rmi/server/RemoteObjectInvocationHandler.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RemoteObjectInvocationHandler__
-#define __java_rmi_server_RemoteObjectInvocationHandler__
-
-#pragma interface
-
-#include <java/rmi/server/RemoteObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class RemoteObjectInvocationHandler;
-          class RemoteRef;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RemoteObjectInvocationHandler : public ::java::rmi::server::RemoteObject
-{
-
-public:
-  RemoteObjectInvocationHandler(::java::rmi::server::RemoteRef *);
-  virtual ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *);
-public: // actually package-private
-  static const jlong serialVersionUID = 2LL;
-  static ::java::util::Hashtable * methodHashCodes;
-  static JArray< ::java::lang::Class * > * noArgsC;
-  static JArray< ::java::lang::Class * > * anObjectC;
-  static JArray< ::java::lang::Object * > * noArgs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_RemoteObjectInvocationHandler__
diff --git a/libjava/java/rmi/server/RemoteRef.h b/libjava/java/rmi/server/RemoteRef.h
deleted file mode 100644
index e73eb3ca676..00000000000
--- a/libjava/java/rmi/server/RemoteRef.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RemoteRef__
-#define __java_rmi_server_RemoteRef__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace server
-      {
-          class Operation;
-          class RemoteCall;
-          class RemoteObject;
-          class RemoteRef;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RemoteRef : public ::java::lang::Object
-{
-
-public:
-  virtual void invoke(::java::rmi::server::RemoteCall *) = 0;
-  virtual ::java::lang::Object * invoke(::java::rmi::Remote *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *, jlong) = 0;
-  virtual ::java::rmi::server::RemoteCall * newCall(::java::rmi::server::RemoteObject *, JArray< ::java::rmi::server::Operation * > *, jint, jlong) = 0;
-  virtual void done(::java::rmi::server::RemoteCall *) = 0;
-  virtual jboolean remoteEquals(::java::rmi::server::RemoteRef *) = 0;
-  virtual jint remoteHashCode() = 0;
-  virtual ::java::lang::String * getRefClass(::java::io::ObjectOutput *) = 0;
-  virtual ::java::lang::String * remoteToString() = 0;
-  virtual void readExternal(::java::io::ObjectInput *) = 0;
-  virtual void writeExternal(::java::io::ObjectOutput *) = 0;
-  static const jlong serialVersionUID = 3632638527362204081LL;
-  static ::java::lang::String * packagePrefix;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_server_RemoteRef__
diff --git a/libjava/java/rmi/server/RemoteServer.h b/libjava/java/rmi/server/RemoteServer.h
deleted file mode 100644
index 9822a79a825..00000000000
--- a/libjava/java/rmi/server/RemoteServer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RemoteServer__
-#define __java_rmi_server_RemoteServer__
-
-#pragma interface
-
-#include <java/rmi/server/RemoteObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class RemoteRef;
-          class RemoteServer;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RemoteServer : public ::java::rmi::server::RemoteObject
-{
-
-public: // actually protected
-  RemoteServer();
-  RemoteServer(::java::rmi::server::RemoteRef *);
-public:
-  static ::java::lang::String * getClientHost();
-  static void setLog(::java::io::OutputStream *);
-  static ::java::io::PrintStream * getLog();
-private:
-  static const jlong serialVersionUID = -4100238210092549637LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_RemoteServer__
diff --git a/libjava/java/rmi/server/RemoteStub.h b/libjava/java/rmi/server/RemoteStub.h
deleted file mode 100644
index 75e1a7fd7b1..00000000000
--- a/libjava/java/rmi/server/RemoteStub.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_RemoteStub__
-#define __java_rmi_server_RemoteStub__
-
-#pragma interface
-
-#include <java/rmi/server/RemoteObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class RemoteRef;
-          class RemoteStub;
-      }
-    }
-  }
-}
-
-class java::rmi::server::RemoteStub : public ::java::rmi::server::RemoteObject
-{
-
-public: // actually protected
-  RemoteStub();
-  RemoteStub(::java::rmi::server::RemoteRef *);
-  static void setRef(::java::rmi::server::RemoteStub *, ::java::rmi::server::RemoteRef *);
-public: // actually package-private
-  static const jlong serialVersionUID = -1585587260594494182LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_RemoteStub__
diff --git a/libjava/java/rmi/server/ServerCloneException.h b/libjava/java/rmi/server/ServerCloneException.h
deleted file mode 100644
index 37d027cd8fd..00000000000
--- a/libjava/java/rmi/server/ServerCloneException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_ServerCloneException__
-#define __java_rmi_server_ServerCloneException__
-
-#pragma interface
-
-#include <java/lang/CloneNotSupportedException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class ServerCloneException;
-      }
-    }
-  }
-}
-
-class java::rmi::server::ServerCloneException : public ::java::lang::CloneNotSupportedException
-{
-
-public:
-  ServerCloneException(::java::lang::String *);
-  ServerCloneException(::java::lang::String *, ::java::lang::Exception *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Throwable * getCause();
-private:
-  static const jlong serialVersionUID = 6617456357664815945LL;
-public:
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::lang::CloneNotSupportedException)))) detail;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_ServerCloneException__
diff --git a/libjava/java/rmi/server/ServerNotActiveException.h b/libjava/java/rmi/server/ServerNotActiveException.h
deleted file mode 100644
index 6064177a692..00000000000
--- a/libjava/java/rmi/server/ServerNotActiveException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_ServerNotActiveException__
-#define __java_rmi_server_ServerNotActiveException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class ServerNotActiveException;
-      }
-    }
-  }
-}
-
-class java::rmi::server::ServerNotActiveException : public ::java::lang::Exception
-{
-
-public:
-  ServerNotActiveException();
-  ServerNotActiveException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4687940720827538231LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_ServerNotActiveException__
diff --git a/libjava/java/rmi/server/ServerRef.h b/libjava/java/rmi/server/ServerRef.h
deleted file mode 100644
index d0c37822ed9..00000000000
--- a/libjava/java/rmi/server/ServerRef.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_ServerRef__
-#define __java_rmi_server_ServerRef__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace server
-      {
-          class Operation;
-          class RemoteCall;
-          class RemoteObject;
-          class RemoteRef;
-          class RemoteStub;
-          class ServerRef;
-      }
-    }
-  }
-}
-
-class java::rmi::server::ServerRef : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::rmi::server::RemoteStub * exportObject(::java::rmi::Remote *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::String * getClientHost() = 0;
-  virtual void invoke(::java::rmi::server::RemoteCall *) = 0;
-  virtual ::java::lang::Object * invoke(::java::rmi::Remote *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *, jlong) = 0;
-  virtual ::java::rmi::server::RemoteCall * newCall(::java::rmi::server::RemoteObject *, JArray< ::java::rmi::server::Operation * > *, jint, jlong) = 0;
-  virtual void done(::java::rmi::server::RemoteCall *) = 0;
-  virtual jboolean remoteEquals(::java::rmi::server::RemoteRef *) = 0;
-  virtual jint remoteHashCode() = 0;
-  virtual ::java::lang::String * getRefClass(::java::io::ObjectOutput *) = 0;
-  virtual ::java::lang::String * remoteToString() = 0;
-  virtual void readExternal(::java::io::ObjectInput *) = 0;
-  virtual void writeExternal(::java::io::ObjectOutput *) = 0;
-  static const jlong serialVersionUID = -4557750989390278438LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_server_ServerRef__
diff --git a/libjava/java/rmi/server/Skeleton.h b/libjava/java/rmi/server/Skeleton.h
deleted file mode 100644
index 492385b77c0..00000000000
--- a/libjava/java/rmi/server/Skeleton.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_Skeleton__
-#define __java_rmi_server_Skeleton__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace server
-      {
-          class Operation;
-          class RemoteCall;
-          class Skeleton;
-      }
-    }
-  }
-}
-
-class java::rmi::server::Skeleton : public ::java::lang::Object
-{
-
-public:
-  virtual void dispatch(::java::rmi::Remote *, ::java::rmi::server::RemoteCall *, jint, jlong) = 0;
-  virtual JArray< ::java::rmi::server::Operation * > * getOperations() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_server_Skeleton__
diff --git a/libjava/java/rmi/server/SkeletonMismatchException.h b/libjava/java/rmi/server/SkeletonMismatchException.h
deleted file mode 100644
index 6d5d49218bf..00000000000
--- a/libjava/java/rmi/server/SkeletonMismatchException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_SkeletonMismatchException__
-#define __java_rmi_server_SkeletonMismatchException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class SkeletonMismatchException;
-      }
-    }
-  }
-}
-
-class java::rmi::server::SkeletonMismatchException : public ::java::rmi::RemoteException
-{
-
-public:
-  SkeletonMismatchException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7780460454818859281LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_SkeletonMismatchException__
diff --git a/libjava/java/rmi/server/SkeletonNotFoundException.h b/libjava/java/rmi/server/SkeletonNotFoundException.h
deleted file mode 100644
index f4030294c2b..00000000000
--- a/libjava/java/rmi/server/SkeletonNotFoundException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_SkeletonNotFoundException__
-#define __java_rmi_server_SkeletonNotFoundException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class SkeletonNotFoundException;
-      }
-    }
-  }
-}
-
-class java::rmi::server::SkeletonNotFoundException : public ::java::rmi::RemoteException
-{
-
-public:
-  SkeletonNotFoundException(::java::lang::String *);
-  SkeletonNotFoundException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = -7860299673822761231LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_SkeletonNotFoundException__
diff --git a/libjava/java/rmi/server/SocketSecurityException.h b/libjava/java/rmi/server/SocketSecurityException.h
deleted file mode 100644
index 39c34411c55..00000000000
--- a/libjava/java/rmi/server/SocketSecurityException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_SocketSecurityException__
-#define __java_rmi_server_SocketSecurityException__
-
-#pragma interface
-
-#include <java/rmi/server/ExportException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class SocketSecurityException;
-      }
-    }
-  }
-}
-
-class java::rmi::server::SocketSecurityException : public ::java::rmi::server::ExportException
-{
-
-public:
-  SocketSecurityException(::java::lang::String *);
-  SocketSecurityException(::java::lang::String *, ::java::lang::Exception *);
-private:
-  static const jlong serialVersionUID = -7622072999407781979LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_SocketSecurityException__
diff --git a/libjava/java/rmi/server/UID.h b/libjava/java/rmi/server/UID.h
deleted file mode 100644
index 85887ea3f76..00000000000
--- a/libjava/java/rmi/server/UID.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_UID__
-#define __java_rmi_server_UID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class UID;
-      }
-    }
-  }
-}
-
-class java::rmi::server::UID : public ::java::lang::Object
-{
-
-public:
-  UID();
-  UID(jshort);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  static ::java::rmi::server::UID * read(::java::io::DataInput *);
-  void write(::java::io::DataOutput *);
-public: // actually package-private
-  static jint getMachineId();
-public:
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 1086053664494604050LL;
-  static jshort uidCounter;
-  static jlong last;
-  static jint machineId;
-  jshort __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  jint unique;
-  jlong time;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_UID__
diff --git a/libjava/java/rmi/server/UnicastRemoteObject.h b/libjava/java/rmi/server/UnicastRemoteObject.h
deleted file mode 100644
index 274507ff963..00000000000
--- a/libjava/java/rmi/server/UnicastRemoteObject.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_UnicastRemoteObject__
-#define __java_rmi_server_UnicastRemoteObject__
-
-#pragma interface
-
-#include <java/rmi/server/RemoteServer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-      namespace server
-      {
-          class RMIClientSocketFactory;
-          class RMIServerSocketFactory;
-          class RemoteRef;
-          class RemoteStub;
-          class UnicastRemoteObject;
-      }
-    }
-  }
-}
-
-class java::rmi::server::UnicastRemoteObject : public ::java::rmi::server::RemoteServer
-{
-
-public: // actually protected
-  UnicastRemoteObject();
-  UnicastRemoteObject(jint);
-  UnicastRemoteObject(jint, ::java::rmi::server::RMIClientSocketFactory *, ::java::rmi::server::RMIServerSocketFactory *);
-  UnicastRemoteObject(::java::rmi::server::RemoteRef *);
-public:
-  virtual ::java::lang::Object * clone();
-  static ::java::rmi::server::RemoteStub * exportObject(::java::rmi::Remote *);
-  static ::java::rmi::Remote * exportObject(::java::rmi::Remote *, jint);
-public: // actually package-private
-  static ::java::rmi::Remote * exportObject(::java::rmi::Remote *, jint, ::java::rmi::server::RMIServerSocketFactory *);
-public:
-  static ::java::rmi::Remote * exportObject(::java::rmi::Remote *, jint, ::java::rmi::server::RMIClientSocketFactory *, ::java::rmi::server::RMIServerSocketFactory *);
-  static jboolean unexportObject(::java::rmi::Remote *, jboolean);
-private:
-  static const jlong serialVersionUID = 4974527148936298033LL;
-  jint __attribute__((aligned(__alignof__( ::java::rmi::server::RemoteServer)))) port;
-  ::java::rmi::server::RMIClientSocketFactory * csf;
-  ::java::rmi::server::RMIServerSocketFactory * ssf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_rmi_server_UnicastRemoteObject__
diff --git a/libjava/java/rmi/server/Unreferenced.h b/libjava/java/rmi/server/Unreferenced.h
deleted file mode 100644
index 70f802a7a8d..00000000000
--- a/libjava/java/rmi/server/Unreferenced.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_rmi_server_Unreferenced__
-#define __java_rmi_server_Unreferenced__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-      namespace server
-      {
-          class Unreferenced;
-      }
-    }
-  }
-}
-
-class java::rmi::server::Unreferenced : public ::java::lang::Object
-{
-
-public:
-  virtual void unreferenced() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_rmi_server_Unreferenced__
diff --git a/libjava/java/security/AccessControlContext.h b/libjava/java/security/AccessControlContext.h
deleted file mode 100644
index e83852a7719..00000000000
--- a/libjava/java/security/AccessControlContext.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AccessControlContext__
-#define __java_security_AccessControlContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-        class DomainCombiner;
-        class Permission;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::security::AccessControlContext : public ::java::lang::Object
-{
-
-public:
-  AccessControlContext(JArray< ::java::security::ProtectionDomain * > *);
-  AccessControlContext(::java::security::AccessControlContext *, ::java::security::DomainCombiner *);
-public: // actually package-private
-  AccessControlContext(JArray< ::java::security::ProtectionDomain * > *, ::java::security::AccessControlContext *, ::java::security::DomainCombiner *);
-public:
-  ::java::security::DomainCombiner * getDomainCombiner();
-  void checkPermission(::java::security::Permission *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-public: // actually package-private
-  JArray< ::java::security::ProtectionDomain * > * getProtectionDomains();
-private:
-  JArray< ::java::security::ProtectionDomain * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) protectionDomains;
-  ::java::security::DomainCombiner * combiner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AccessControlContext__
diff --git a/libjava/java/security/AccessControlException.h b/libjava/java/security/AccessControlException.h
deleted file mode 100644
index 1dcd122cae2..00000000000
--- a/libjava/java/security/AccessControlException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AccessControlException__
-#define __java_security_AccessControlException__
-
-#pragma interface
-
-#include <java/lang/SecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlException;
-        class Permission;
-    }
-  }
-}
-
-class java::security::AccessControlException : public ::java::lang::SecurityException
-{
-
-public:
-  AccessControlException(::java::lang::String *);
-  AccessControlException(::java::lang::String *, ::java::security::Permission *);
-  virtual ::java::security::Permission * getPermission();
-private:
-  static const jlong serialVersionUID = 5138225684096988535LL;
-  ::java::security::Permission * __attribute__((aligned(__alignof__( ::java::lang::SecurityException)))) perm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AccessControlException__
diff --git a/libjava/java/security/AccessController.h b/libjava/java/security/AccessController.h
deleted file mode 100644
index 96cc367c718..00000000000
--- a/libjava/java/security/AccessController.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AccessController__
-#define __java_security_AccessController__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-        class AccessController;
-        class Permission;
-        class PrivilegedAction;
-        class PrivilegedExceptionAction;
-    }
-  }
-}
-
-class java::security::AccessController : public ::java::lang::Object
-{
-
-  AccessController();
-public:
-  static void checkPermission(::java::security::Permission *);
-  static ::java::lang::Object * doPrivileged(::java::security::PrivilegedAction *);
-  static ::java::lang::Object * doPrivileged(::java::security::PrivilegedAction *, ::java::security::AccessControlContext *);
-  static ::java::lang::Object * doPrivileged(::java::security::PrivilegedExceptionAction *);
-  static ::java::lang::Object * doPrivileged(::java::security::PrivilegedExceptionAction *, ::java::security::AccessControlContext *);
-  static ::java::security::AccessControlContext * getContext();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AccessController__
diff --git a/libjava/java/security/AlgorithmParameterGenerator.h b/libjava/java/security/AlgorithmParameterGenerator.h
deleted file mode 100644
index 02c9dbf3d7c..00000000000
--- a/libjava/java/security/AlgorithmParameterGenerator.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AlgorithmParameterGenerator__
-#define __java_security_AlgorithmParameterGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameterGenerator;
-        class AlgorithmParameterGeneratorSpi;
-        class AlgorithmParameters;
-        class Provider;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::AlgorithmParameterGenerator : public ::java::lang::Object
-{
-
-public: // actually protected
-  AlgorithmParameterGenerator(::java::security::AlgorithmParameterGeneratorSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  static ::java::security::AlgorithmParameterGenerator * getInstance(::java::lang::String *);
-  static ::java::security::AlgorithmParameterGenerator * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::AlgorithmParameterGenerator * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(jint);
-  virtual void init(jint, ::java::security::SecureRandom *);
-  virtual void init(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void init(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual ::java::security::AlgorithmParameters * generateParameters();
-private:
-  static ::java::lang::String * ALGORITHM_PARAMETER_GENERATOR;
-  ::java::security::AlgorithmParameterGeneratorSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) paramGenSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AlgorithmParameterGenerator__
diff --git a/libjava/java/security/AlgorithmParameterGeneratorSpi.h b/libjava/java/security/AlgorithmParameterGeneratorSpi.h
deleted file mode 100644
index c40dfd3df6d..00000000000
--- a/libjava/java/security/AlgorithmParameterGeneratorSpi.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AlgorithmParameterGeneratorSpi__
-#define __java_security_AlgorithmParameterGeneratorSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameterGeneratorSpi;
-        class AlgorithmParameters;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::AlgorithmParameterGeneratorSpi : public ::java::lang::Object
-{
-
-public:
-  AlgorithmParameterGeneratorSpi();
-public: // actually protected
-  virtual void engineInit(jint, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
-  virtual ::java::security::AlgorithmParameters * engineGenerateParameters() = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AlgorithmParameterGeneratorSpi__
diff --git a/libjava/java/security/AlgorithmParameters.h b/libjava/java/security/AlgorithmParameters.h
deleted file mode 100644
index 630b0431216..00000000000
--- a/libjava/java/security/AlgorithmParameters.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AlgorithmParameters__
-#define __java_security_AlgorithmParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class AlgorithmParametersSpi;
-        class Provider;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::AlgorithmParameters : public ::java::lang::Object
-{
-
-public: // actually protected
-  AlgorithmParameters(::java::security::AlgorithmParametersSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  static ::java::security::AlgorithmParameters * getInstance(::java::lang::String *);
-  static ::java::security::AlgorithmParameters * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::AlgorithmParameters * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void init(JArray< jbyte > *);
-  virtual void init(JArray< jbyte > *, ::java::lang::String *);
-  virtual ::java::security::spec::AlgorithmParameterSpec * getParameterSpec(::java::lang::Class *);
-  virtual JArray< jbyte > * getEncoded();
-  virtual JArray< jbyte > * getEncoded(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-private:
-  static ::java::lang::String * ALGORITHM_PARAMETERS;
-  ::java::security::AlgorithmParametersSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) paramSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AlgorithmParameters__
diff --git a/libjava/java/security/AlgorithmParametersSpi.h b/libjava/java/security/AlgorithmParametersSpi.h
deleted file mode 100644
index a3c26967758..00000000000
--- a/libjava/java/security/AlgorithmParametersSpi.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AlgorithmParametersSpi__
-#define __java_security_AlgorithmParametersSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParametersSpi;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::AlgorithmParametersSpi : public ::java::lang::Object
-{
-
-public:
-  AlgorithmParametersSpi();
-public: // actually protected
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *) = 0;
-  virtual void engineInit(JArray< jbyte > *) = 0;
-  virtual void engineInit(JArray< jbyte > *, ::java::lang::String *) = 0;
-  virtual ::java::security::spec::AlgorithmParameterSpec * engineGetParameterSpec(::java::lang::Class *) = 0;
-  virtual JArray< jbyte > * engineGetEncoded() = 0;
-  virtual JArray< jbyte > * engineGetEncoded(::java::lang::String *) = 0;
-  virtual ::java::lang::String * engineToString() = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AlgorithmParametersSpi__
diff --git a/libjava/java/security/AllPermission$AllPermissionCollection.h b/libjava/java/security/AllPermission$AllPermissionCollection.h
deleted file mode 100644
index bf88353dbca..00000000000
--- a/libjava/java/security/AllPermission$AllPermissionCollection.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AllPermission$AllPermissionCollection__
-#define __java_security_AllPermission$AllPermissionCollection__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AllPermission$AllPermissionCollection;
-        class Permission;
-    }
-  }
-}
-
-class java::security::AllPermission$AllPermissionCollection : public ::java::security::PermissionCollection
-{
-
-  AllPermission$AllPermissionCollection();
-public:
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
-public: // actually package-private
-  AllPermission$AllPermissionCollection(::java::security::AllPermission$AllPermissionCollection *);
-private:
-  static const jlong serialVersionUID = -4023755556366636806LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) all_allowed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AllPermission$AllPermissionCollection__
diff --git a/libjava/java/security/AllPermission.h b/libjava/java/security/AllPermission.h
deleted file mode 100644
index 7700a935029..00000000000
--- a/libjava/java/security/AllPermission.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_AllPermission__
-#define __java_security_AllPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AllPermission;
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::security::AllPermission : public ::java::security::Permission
-{
-
-public:
-  AllPermission();
-  AllPermission(::java::lang::String *, ::java::lang::String *);
-  jboolean implies(::java::security::Permission *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * getActions();
-  ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  static const jlong serialVersionUID = -2916474571451318075LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_AllPermission__
diff --git a/libjava/java/security/BasicPermission$BasicPermissionCollection.h b/libjava/java/security/BasicPermission$BasicPermissionCollection.h
deleted file mode 100644
index a2d14544ce5..00000000000
--- a/libjava/java/security/BasicPermission$BasicPermissionCollection.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_BasicPermission$BasicPermissionCollection__
-#define __java_security_BasicPermission$BasicPermissionCollection__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class BasicPermission$BasicPermissionCollection;
-        class Permission;
-    }
-  }
-}
-
-class java::security::BasicPermission$BasicPermissionCollection : public ::java::security::PermissionCollection
-{
-
-public: // actually package-private
-  BasicPermission$BasicPermissionCollection(::java::lang::Class *);
-public:
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
-private:
-  static const jlong serialVersionUID = 739301742472979399LL;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
-  jboolean all_allowed;
-  ::java::lang::Class * permClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_BasicPermission$BasicPermissionCollection__
diff --git a/libjava/java/security/BasicPermission.h b/libjava/java/security/BasicPermission.h
deleted file mode 100644
index 36838628717..00000000000
--- a/libjava/java/security/BasicPermission.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_BasicPermission__
-#define __java_security_BasicPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class BasicPermission;
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::security::BasicPermission : public ::java::security::Permission
-{
-
-public:
-  BasicPermission(::java::lang::String *);
-  BasicPermission(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean implies(::java::security::Permission *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getActions();
-  virtual ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  static const jlong serialVersionUID = 6279438298436773498LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_BasicPermission__
diff --git a/libjava/java/security/Certificate.h b/libjava/java/security/Certificate.h
deleted file mode 100644
index 9c7af28426c..00000000000
--- a/libjava/java/security/Certificate.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Certificate__
-#define __java_security_Certificate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Certificate;
-        class Principal;
-        class PublicKey;
-    }
-  }
-}
-
-class java::security::Certificate : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::security::Principal * getGuarantor() = 0;
-  virtual ::java::security::Principal * getPrincipal() = 0;
-  virtual ::java::security::PublicKey * getPublicKey() = 0;
-  virtual void encode(::java::io::OutputStream *) = 0;
-  virtual void decode(::java::io::InputStream *) = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual ::java::lang::String * toString(jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_Certificate__
diff --git a/libjava/java/security/CodeSource.h b/libjava/java/security/CodeSource.h
deleted file mode 100644
index 35dffd9ab59..00000000000
--- a/libjava/java/security/CodeSource.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_CodeSource__
-#define __java_security_CodeSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-        class CodeSource;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::CodeSource : public ::java::lang::Object
-{
-
-public:
-  CodeSource(::java::net::URL *, JArray< ::java::security::cert::Certificate * > *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::net::URL * getLocation();
-  virtual JArray< ::java::security::cert::Certificate * > * getCertificates();
-  virtual jboolean implies(::java::security::CodeSource *);
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 4977541819976013951LL;
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) location;
-  ::java::util::HashSet * certs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_CodeSource__
diff --git a/libjava/java/security/DigestException.h b/libjava/java/security/DigestException.h
deleted file mode 100644
index d216415c915..00000000000
--- a/libjava/java/security/DigestException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DigestException__
-#define __java_security_DigestException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DigestException;
-    }
-  }
-}
-
-class java::security::DigestException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  DigestException();
-  DigestException(::java::lang::String *);
-  DigestException(::java::lang::String *, ::java::lang::Throwable *);
-  DigestException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 5821450303093652515LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DigestException__
diff --git a/libjava/java/security/DigestInputStream.h b/libjava/java/security/DigestInputStream.h
deleted file mode 100644
index b112ad2c548..00000000000
--- a/libjava/java/security/DigestInputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DigestInputStream__
-#define __java_security_DigestInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DigestInputStream;
-        class MessageDigest;
-    }
-  }
-}
-
-class java::security::DigestInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  DigestInputStream(::java::io::InputStream *, ::java::security::MessageDigest *);
-  virtual ::java::security::MessageDigest * getMessageDigest();
-  virtual void setMessageDigest(::java::security::MessageDigest *);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void on(jboolean);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::security::MessageDigest * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) digest;
-private:
-  jboolean state;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DigestInputStream__
diff --git a/libjava/java/security/DigestOutputStream.h b/libjava/java/security/DigestOutputStream.h
deleted file mode 100644
index 5c1605c76f7..00000000000
--- a/libjava/java/security/DigestOutputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DigestOutputStream__
-#define __java_security_DigestOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DigestOutputStream;
-        class MessageDigest;
-    }
-  }
-}
-
-class java::security::DigestOutputStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  DigestOutputStream(::java::io::OutputStream *, ::java::security::MessageDigest *);
-  virtual ::java::security::MessageDigest * getMessageDigest();
-  virtual void setMessageDigest(::java::security::MessageDigest *);
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void on(jboolean);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::security::MessageDigest * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) digest;
-private:
-  jboolean state;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DigestOutputStream__
diff --git a/libjava/java/security/DomainCombiner.h b/libjava/java/security/DomainCombiner.h
deleted file mode 100644
index 18906b929b0..00000000000
--- a/libjava/java/security/DomainCombiner.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DomainCombiner__
-#define __java_security_DomainCombiner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DomainCombiner;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::security::DomainCombiner : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::security::ProtectionDomain * > * combine(JArray< ::java::security::ProtectionDomain * > *, JArray< ::java::security::ProtectionDomain * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_DomainCombiner__
diff --git a/libjava/java/security/DummyKeyPairGenerator.h b/libjava/java/security/DummyKeyPairGenerator.h
deleted file mode 100644
index c0f35818b54..00000000000
--- a/libjava/java/security/DummyKeyPairGenerator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DummyKeyPairGenerator__
-#define __java_security_DummyKeyPairGenerator__
-
-#pragma interface
-
-#include <java/security/KeyPairGenerator.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DummyKeyPairGenerator;
-        class KeyPair;
-        class KeyPairGeneratorSpi;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::DummyKeyPairGenerator : public ::java::security::KeyPairGenerator
-{
-
-public:
-  DummyKeyPairGenerator(::java::security::KeyPairGeneratorSpi *, ::java::lang::String *);
-  ::java::lang::Object * clone();
-  void initialize(jint, ::java::security::SecureRandom *);
-  void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  ::java::security::KeyPair * generateKeyPair();
-private:
-  ::java::security::KeyPairGeneratorSpi * __attribute__((aligned(__alignof__( ::java::security::KeyPairGenerator)))) kpgSpi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DummyKeyPairGenerator__
diff --git a/libjava/java/security/DummyMessageDigest.h b/libjava/java/security/DummyMessageDigest.h
deleted file mode 100644
index 431096dfe6b..00000000000
--- a/libjava/java/security/DummyMessageDigest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DummyMessageDigest__
-#define __java_security_DummyMessageDigest__
-
-#pragma interface
-
-#include <java/security/MessageDigest.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DummyMessageDigest;
-        class MessageDigestSpi;
-    }
-  }
-}
-
-class java::security::DummyMessageDigest : public ::java::security::MessageDigest
-{
-
-public:
-  DummyMessageDigest(::java::security::MessageDigestSpi *, ::java::lang::String *);
-  ::java::lang::Object * clone();
-  JArray< jbyte > * engineDigest();
-  jint engineDigest(JArray< jbyte > *, jint, jint);
-  jint engineGetDigestLength();
-  void engineReset();
-  void engineUpdate(jbyte);
-  void engineUpdate(JArray< jbyte > *, jint, jint);
-private:
-  ::java::security::MessageDigestSpi * __attribute__((aligned(__alignof__( ::java::security::MessageDigest)))) mdSpi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DummyMessageDigest__
diff --git a/libjava/java/security/DummySignature.h b/libjava/java/security/DummySignature.h
deleted file mode 100644
index 34547473fed..00000000000
--- a/libjava/java/security/DummySignature.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_DummySignature__
-#define __java_security_DummySignature__
-
-#pragma interface
-
-#include <java/security/Signature.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class DummySignature;
-        class PrivateKey;
-        class PublicKey;
-        class SignatureSpi;
-    }
-  }
-}
-
-class java::security::DummySignature : public ::java::security::Signature
-{
-
-public:
-  DummySignature(::java::security::SignatureSpi *, ::java::lang::String *);
-  ::java::lang::Object * clone();
-public: // actually protected
-  void engineInitVerify(::java::security::PublicKey *);
-  void engineInitSign(::java::security::PrivateKey *);
-  void engineUpdate(jbyte);
-  void engineUpdate(JArray< jbyte > *, jint, jint);
-  JArray< jbyte > * engineSign();
-  jboolean engineVerify(JArray< jbyte > *);
-  void engineSetParameter(::java::lang::String *, ::java::lang::Object *);
-  ::java::lang::Object * engineGetParameter(::java::lang::String *);
-private:
-  ::java::security::SignatureSpi * __attribute__((aligned(__alignof__( ::java::security::Signature)))) sigSpi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_DummySignature__
diff --git a/libjava/java/security/GeneralSecurityException.h b/libjava/java/security/GeneralSecurityException.h
deleted file mode 100644
index 6b309b5ebeb..00000000000
--- a/libjava/java/security/GeneralSecurityException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_GeneralSecurityException__
-#define __java_security_GeneralSecurityException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class GeneralSecurityException;
-    }
-  }
-}
-
-class java::security::GeneralSecurityException : public ::java::lang::Exception
-{
-
-public:
-  GeneralSecurityException();
-  GeneralSecurityException(::java::lang::String *);
-  GeneralSecurityException(::java::lang::String *, ::java::lang::Throwable *);
-  GeneralSecurityException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 894798122053539237LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_GeneralSecurityException__
diff --git a/libjava/java/security/Guard.h b/libjava/java/security/Guard.h
deleted file mode 100644
index 07cc6437d86..00000000000
--- a/libjava/java/security/Guard.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Guard__
-#define __java_security_Guard__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Guard;
-    }
-  }
-}
-
-class java::security::Guard : public ::java::lang::Object
-{
-
-public:
-  virtual void checkGuard(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_Guard__
diff --git a/libjava/java/security/GuardedObject.h b/libjava/java/security/GuardedObject.h
deleted file mode 100644
index 379651249b2..00000000000
--- a/libjava/java/security/GuardedObject.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_GuardedObject__
-#define __java_security_GuardedObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Guard;
-        class GuardedObject;
-    }
-  }
-}
-
-class java::security::GuardedObject : public ::java::lang::Object
-{
-
-public:
-  GuardedObject(::java::lang::Object *, ::java::security::Guard *);
-  virtual ::java::lang::Object * getObject();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -5240450096227834308LL;
-  ::java::security::Guard * __attribute__((aligned(__alignof__( ::java::lang::Object)))) guard;
-  ::java::lang::Object * object;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_GuardedObject__
diff --git a/libjava/java/security/Identity.h b/libjava/java/security/Identity.h
deleted file mode 100644
index 8208e7ff67e..00000000000
--- a/libjava/java/security/Identity.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Identity__
-#define __java_security_Identity__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Certificate;
-        class Identity;
-        class IdentityScope;
-        class PublicKey;
-    }
-  }
-}
-
-class java::security::Identity : public ::java::lang::Object
-{
-
-public: // actually protected
-  Identity();
-public:
-  Identity(::java::lang::String *, ::java::security::IdentityScope *);
-  Identity(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::security::IdentityScope * getScope();
-  virtual ::java::security::PublicKey * getPublicKey();
-  virtual void setPublicKey(::java::security::PublicKey *);
-  virtual void setInfo(::java::lang::String *);
-  virtual ::java::lang::String * getInfo();
-  virtual void addCertificate(::java::security::Certificate *);
-  virtual void removeCertificate(::java::security::Certificate *);
-  virtual JArray< ::java::security::Certificate * > * certificates();
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually protected
-  virtual jboolean identityEquals(::java::security::Identity *);
-public:
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jboolean);
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = 3609922007826600659LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::security::IdentityScope * scope;
-  ::java::security::PublicKey * publicKey;
-  ::java::lang::String * info;
-  ::java::util::Vector * certificates__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Identity__
diff --git a/libjava/java/security/IdentityScope.h b/libjava/java/security/IdentityScope.h
deleted file mode 100644
index 90a49303121..00000000000
--- a/libjava/java/security/IdentityScope.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_IdentityScope__
-#define __java_security_IdentityScope__
-
-#pragma interface
-
-#include <java/security/Identity.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Identity;
-        class IdentityScope;
-        class Principal;
-        class PublicKey;
-    }
-  }
-}
-
-class java::security::IdentityScope : public ::java::security::Identity
-{
-
-public: // actually protected
-  IdentityScope();
-public:
-  IdentityScope(::java::lang::String *);
-  IdentityScope(::java::lang::String *, ::java::security::IdentityScope *);
-  static ::java::security::IdentityScope * getSystemScope();
-public: // actually protected
-  static void setSystemScope(::java::security::IdentityScope *);
-public:
-  virtual jint size() = 0;
-  virtual ::java::security::Identity * getIdentity(::java::lang::String *) = 0;
-  virtual ::java::security::Identity * getIdentity(::java::security::Principal *);
-  virtual ::java::security::Identity * getIdentity(::java::security::PublicKey *) = 0;
-  virtual void addIdentity(::java::security::Identity *) = 0;
-  virtual void removeIdentity(::java::security::Identity *) = 0;
-  virtual ::java::util::Enumeration * identities() = 0;
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -2337346281189773310LL;
-  static ::java::security::IdentityScope * systemScope;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_IdentityScope__
diff --git a/libjava/java/security/IntersectingDomainCombiner.h b/libjava/java/security/IntersectingDomainCombiner.h
deleted file mode 100644
index f192c261511..00000000000
--- a/libjava/java/security/IntersectingDomainCombiner.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_IntersectingDomainCombiner__
-#define __java_security_IntersectingDomainCombiner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class IntersectingDomainCombiner;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::security::IntersectingDomainCombiner : public ::java::lang::Object
-{
-
-  IntersectingDomainCombiner();
-public:
-  JArray< ::java::security::ProtectionDomain * > * combine(JArray< ::java::security::ProtectionDomain * > *, JArray< ::java::security::ProtectionDomain * > *);
-public: // actually package-private
-  static ::java::security::IntersectingDomainCombiner * SINGLETON;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_IntersectingDomainCombiner__
diff --git a/libjava/java/security/InvalidAlgorithmParameterException.h b/libjava/java/security/InvalidAlgorithmParameterException.h
deleted file mode 100644
index 8ff0d7ed314..00000000000
--- a/libjava/java/security/InvalidAlgorithmParameterException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_InvalidAlgorithmParameterException__
-#define __java_security_InvalidAlgorithmParameterException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class InvalidAlgorithmParameterException;
-    }
-  }
-}
-
-class java::security::InvalidAlgorithmParameterException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  InvalidAlgorithmParameterException();
-  InvalidAlgorithmParameterException(::java::lang::String *);
-  InvalidAlgorithmParameterException(::java::lang::String *, ::java::lang::Throwable *);
-  InvalidAlgorithmParameterException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 2864672297499471472LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_InvalidAlgorithmParameterException__
diff --git a/libjava/java/security/InvalidKeyException.h b/libjava/java/security/InvalidKeyException.h
deleted file mode 100644
index f79473c40bc..00000000000
--- a/libjava/java/security/InvalidKeyException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_InvalidKeyException__
-#define __java_security_InvalidKeyException__
-
-#pragma interface
-
-#include <java/security/KeyException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class InvalidKeyException;
-    }
-  }
-}
-
-class java::security::InvalidKeyException : public ::java::security::KeyException
-{
-
-public:
-  InvalidKeyException();
-  InvalidKeyException(::java::lang::String *);
-  InvalidKeyException(::java::lang::String *, ::java::lang::Throwable *);
-  InvalidKeyException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 5698479920593359816LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_InvalidKeyException__
diff --git a/libjava/java/security/InvalidParameterException.h b/libjava/java/security/InvalidParameterException.h
deleted file mode 100644
index fd9c9a73279..00000000000
--- a/libjava/java/security/InvalidParameterException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_InvalidParameterException__
-#define __java_security_InvalidParameterException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class InvalidParameterException;
-    }
-  }
-}
-
-class java::security::InvalidParameterException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  InvalidParameterException();
-  InvalidParameterException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -857968536935667808LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_InvalidParameterException__
diff --git a/libjava/java/security/Key.h b/libjava/java/security/Key.h
deleted file mode 100644
index 630f8123b0f..00000000000
--- a/libjava/java/security/Key.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Key__
-#define __java_security_Key__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-    }
-  }
-}
-
-class java::security::Key : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 6603384152749567654LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_Key__
diff --git a/libjava/java/security/KeyException.h b/libjava/java/security/KeyException.h
deleted file mode 100644
index 0d3ce513843..00000000000
--- a/libjava/java/security/KeyException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyException__
-#define __java_security_KeyException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyException;
-    }
-  }
-}
-
-class java::security::KeyException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  KeyException();
-  KeyException(::java::lang::String *);
-  KeyException(::java::lang::String *, ::java::lang::Throwable *);
-  KeyException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -7483676942812432108LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyException__
diff --git a/libjava/java/security/KeyFactory.h b/libjava/java/security/KeyFactory.h
deleted file mode 100644
index adcec17f7ab..00000000000
--- a/libjava/java/security/KeyFactory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyFactory__
-#define __java_security_KeyFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class KeyFactory;
-        class KeyFactorySpi;
-        class PrivateKey;
-        class Provider;
-        class PublicKey;
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-}
-
-class java::security::KeyFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  KeyFactory(::java::security::KeyFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::security::KeyFactory * getInstance(::java::lang::String *);
-  static ::java::security::KeyFactory * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::KeyFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::PublicKey * generatePublic(::java::security::spec::KeySpec *);
-  virtual ::java::security::PrivateKey * generatePrivate(::java::security::spec::KeySpec *);
-  virtual ::java::security::spec::KeySpec * getKeySpec(::java::security::Key *, ::java::lang::Class *);
-  virtual ::java::security::Key * translateKey(::java::security::Key *);
-private:
-  static ::java::lang::String * KEY_FACTORY;
-  ::java::security::KeyFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyFacSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyFactory__
diff --git a/libjava/java/security/KeyFactorySpi.h b/libjava/java/security/KeyFactorySpi.h
deleted file mode 100644
index 518893b59a6..00000000000
--- a/libjava/java/security/KeyFactorySpi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyFactorySpi__
-#define __java_security_KeyFactorySpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class KeyFactorySpi;
-        class PrivateKey;
-        class PublicKey;
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-}
-
-class java::security::KeyFactorySpi : public ::java::lang::Object
-{
-
-public:
-  KeyFactorySpi();
-public: // actually protected
-  virtual ::java::security::PublicKey * engineGeneratePublic(::java::security::spec::KeySpec *) = 0;
-  virtual ::java::security::PrivateKey * engineGeneratePrivate(::java::security::spec::KeySpec *) = 0;
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::java::security::Key *, ::java::lang::Class *) = 0;
-  virtual ::java::security::Key * engineTranslateKey(::java::security::Key *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyFactorySpi__
diff --git a/libjava/java/security/KeyManagementException.h b/libjava/java/security/KeyManagementException.h
deleted file mode 100644
index 20d6964f98d..00000000000
--- a/libjava/java/security/KeyManagementException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyManagementException__
-#define __java_security_KeyManagementException__
-
-#pragma interface
-
-#include <java/security/KeyException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyManagementException;
-    }
-  }
-}
-
-class java::security::KeyManagementException : public ::java::security::KeyException
-{
-
-public:
-  KeyManagementException();
-  KeyManagementException(::java::lang::String *);
-  KeyManagementException(::java::lang::String *, ::java::lang::Throwable *);
-  KeyManagementException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 947674216157062695LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyManagementException__
diff --git a/libjava/java/security/KeyPair.h b/libjava/java/security/KeyPair.h
deleted file mode 100644
index c6c607bb0e6..00000000000
--- a/libjava/java/security/KeyPair.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyPair__
-#define __java_security_KeyPair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-        class PrivateKey;
-        class PublicKey;
-    }
-  }
-}
-
-class java::security::KeyPair : public ::java::lang::Object
-{
-
-public:
-  KeyPair(::java::security::PublicKey *, ::java::security::PrivateKey *);
-  ::java::security::PublicKey * getPublic();
-  ::java::security::PrivateKey * getPrivate();
-private:
-  static const jlong serialVersionUID = -7565189502268009837LL;
-  ::java::security::PublicKey * __attribute__((aligned(__alignof__( ::java::lang::Object)))) publicKey;
-  ::java::security::PrivateKey * privateKey;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyPair__
diff --git a/libjava/java/security/KeyPairGenerator.h b/libjava/java/security/KeyPairGenerator.h
deleted file mode 100644
index f1bef60c54c..00000000000
--- a/libjava/java/security/KeyPairGenerator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyPairGenerator__
-#define __java_security_KeyPairGenerator__
-
-#pragma interface
-
-#include <java/security/KeyPairGeneratorSpi.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-        class KeyPairGenerator;
-        class Provider;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::KeyPairGenerator : public ::java::security::KeyPairGeneratorSpi
-{
-
-public: // actually protected
-  KeyPairGenerator(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  static ::java::security::KeyPairGenerator * getInstance(::java::lang::String *);
-  static ::java::security::KeyPairGenerator * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::KeyPairGenerator * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual void initialize(jint);
-  virtual void initialize(jint, ::java::security::SecureRandom *);
-  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual ::java::security::KeyPair * genKeyPair();
-  virtual ::java::security::KeyPair * generateKeyPair();
-private:
-  static ::java::lang::String * KEY_PAIR_GENERATOR;
-public: // actually package-private
-  ::java::security::Provider * __attribute__((aligned(__alignof__( ::java::security::KeyPairGeneratorSpi)))) provider;
-private:
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyPairGenerator__
diff --git a/libjava/java/security/KeyPairGeneratorSpi.h b/libjava/java/security/KeyPairGeneratorSpi.h
deleted file mode 100644
index 0aa4389e5eb..00000000000
--- a/libjava/java/security/KeyPairGeneratorSpi.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyPairGeneratorSpi__
-#define __java_security_KeyPairGeneratorSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyPair;
-        class KeyPairGeneratorSpi;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::KeyPairGeneratorSpi : public ::java::lang::Object
-{
-
-public:
-  KeyPairGeneratorSpi();
-  virtual void initialize(jint, ::java::security::SecureRandom *) = 0;
-  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual ::java::security::KeyPair * generateKeyPair() = 0;
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyPairGeneratorSpi__
diff --git a/libjava/java/security/KeyStore.h b/libjava/java/security/KeyStore.h
deleted file mode 100644
index 80f79814aa4..00000000000
--- a/libjava/java/security/KeyStore.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyStore__
-#define __java_security_KeyStore__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class KeyStore;
-        class KeyStoreSpi;
-        class Provider;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::KeyStore : public ::java::lang::Object
-{
-
-public: // actually protected
-  KeyStore(::java::security::KeyStoreSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::security::KeyStore * getInstance(::java::lang::String *);
-  static ::java::security::KeyStore * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::KeyStore * getInstance(::java::lang::String *, ::java::security::Provider *);
-  static ::java::lang::String * getDefaultType();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::lang::String * getType();
-  virtual ::java::security::Key * getKey(::java::lang::String *, JArray< jchar > *);
-  virtual JArray< ::java::security::cert::Certificate * > * getCertificateChain(::java::lang::String *);
-  virtual ::java::security::cert::Certificate * getCertificate(::java::lang::String *);
-  virtual ::java::util::Date * getCreationDate(::java::lang::String *);
-  virtual void setKeyEntry(::java::lang::String *, ::java::security::Key *, JArray< jchar > *, JArray< ::java::security::cert::Certificate * > *);
-  virtual void setKeyEntry(::java::lang::String *, JArray< jbyte > *, JArray< ::java::security::cert::Certificate * > *);
-  virtual void setCertificateEntry(::java::lang::String *, ::java::security::cert::Certificate *);
-  virtual void deleteEntry(::java::lang::String *);
-  virtual ::java::util::Enumeration * aliases();
-  virtual jboolean containsAlias(::java::lang::String *);
-  virtual jint size();
-  virtual jboolean isKeyEntry(::java::lang::String *);
-  virtual jboolean isCertificateEntry(::java::lang::String *);
-  virtual ::java::lang::String * getCertificateAlias(::java::security::cert::Certificate *);
-  virtual void store(::java::io::OutputStream *, JArray< jchar > *);
-  virtual void load(::java::io::InputStream *, JArray< jchar > *);
-private:
-  static ::java::lang::String * KEY_STORE;
-  ::java::security::KeyStoreSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyStoreSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyStore__
diff --git a/libjava/java/security/KeyStoreException.h b/libjava/java/security/KeyStoreException.h
deleted file mode 100644
index e056a68a7bc..00000000000
--- a/libjava/java/security/KeyStoreException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyStoreException__
-#define __java_security_KeyStoreException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStoreException;
-    }
-  }
-}
-
-class java::security::KeyStoreException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  KeyStoreException();
-  KeyStoreException(::java::lang::String *);
-  KeyStoreException(::java::lang::String *, ::java::lang::Throwable *);
-  KeyStoreException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -1119353179322377262LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyStoreException__
diff --git a/libjava/java/security/KeyStoreSpi.h b/libjava/java/security/KeyStoreSpi.h
deleted file mode 100644
index 054cea6f125..00000000000
--- a/libjava/java/security/KeyStoreSpi.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_KeyStoreSpi__
-#define __java_security_KeyStoreSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class KeyStoreSpi;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::KeyStoreSpi : public ::java::lang::Object
-{
-
-public:
-  KeyStoreSpi();
-  virtual ::java::security::Key * engineGetKey(::java::lang::String *, JArray< jchar > *) = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * engineGetCertificateChain(::java::lang::String *) = 0;
-  virtual ::java::security::cert::Certificate * engineGetCertificate(::java::lang::String *) = 0;
-  virtual ::java::util::Date * engineGetCreationDate(::java::lang::String *) = 0;
-  virtual void engineSetKeyEntry(::java::lang::String *, ::java::security::Key *, JArray< jchar > *, JArray< ::java::security::cert::Certificate * > *) = 0;
-  virtual void engineSetKeyEntry(::java::lang::String *, JArray< jbyte > *, JArray< ::java::security::cert::Certificate * > *) = 0;
-  virtual void engineSetCertificateEntry(::java::lang::String *, ::java::security::cert::Certificate *) = 0;
-  virtual void engineDeleteEntry(::java::lang::String *) = 0;
-  virtual ::java::util::Enumeration * engineAliases() = 0;
-  virtual jboolean engineContainsAlias(::java::lang::String *) = 0;
-  virtual jint engineSize() = 0;
-  virtual jboolean engineIsKeyEntry(::java::lang::String *) = 0;
-  virtual jboolean engineIsCertificateEntry(::java::lang::String *) = 0;
-  virtual ::java::lang::String * engineGetCertificateAlias(::java::security::cert::Certificate *) = 0;
-  virtual void engineStore(::java::io::OutputStream *, JArray< jchar > *) = 0;
-  virtual void engineLoad(::java::io::InputStream *, JArray< jchar > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_KeyStoreSpi__
diff --git a/libjava/java/security/MessageDigest.h b/libjava/java/security/MessageDigest.h
deleted file mode 100644
index 5cd6cf3b1a5..00000000000
--- a/libjava/java/security/MessageDigest.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_MessageDigest__
-#define __java_security_MessageDigest__
-
-#pragma interface
-
-#include <java/security/MessageDigestSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class MessageDigest;
-        class Provider;
-    }
-  }
-}
-
-class java::security::MessageDigest : public ::java::security::MessageDigestSpi
-{
-
-public: // actually protected
-  MessageDigest(::java::lang::String *);
-public:
-  static ::java::security::MessageDigest * getInstance(::java::lang::String *);
-  static ::java::security::MessageDigest * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::MessageDigest * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual void update(JArray< jbyte > *);
-  virtual void update(::java::nio::ByteBuffer *);
-  virtual JArray< jbyte > * digest();
-  virtual jint digest(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * digest(JArray< jbyte > *);
-  virtual ::java::lang::String * toString();
-  static jboolean isEqual(JArray< jbyte > *, JArray< jbyte > *);
-  virtual void reset();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual jint getDigestLength();
-  virtual ::java::lang::Object * clone();
-private:
-  ::java::lang::String * digestToString();
-  static ::java::lang::String * MESSAGE_DIGEST;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::security::MessageDigestSpi)))) algorithm;
-public: // actually package-private
-  ::java::security::Provider * provider;
-private:
-  JArray< jbyte > * lastDigest;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_MessageDigest__
diff --git a/libjava/java/security/MessageDigestSpi.h b/libjava/java/security/MessageDigestSpi.h
deleted file mode 100644
index fea06bf497e..00000000000
--- a/libjava/java/security/MessageDigestSpi.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_MessageDigestSpi__
-#define __java_security_MessageDigestSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class MessageDigestSpi;
-    }
-  }
-}
-
-class java::security::MessageDigestSpi : public ::java::lang::Object
-{
-
-public:
-  MessageDigestSpi();
-public: // actually protected
-  virtual jint engineGetDigestLength();
-  virtual void engineUpdate(jbyte) = 0;
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint) = 0;
-  virtual void engineUpdate(::java::nio::ByteBuffer *);
-  virtual JArray< jbyte > * engineDigest() = 0;
-  virtual jint engineDigest(JArray< jbyte > *, jint, jint);
-  virtual void engineReset() = 0;
-public:
-  virtual ::java::lang::Object * clone();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_MessageDigestSpi__
diff --git a/libjava/java/security/NoSuchAlgorithmException.h b/libjava/java/security/NoSuchAlgorithmException.h
deleted file mode 100644
index 413821e727a..00000000000
--- a/libjava/java/security/NoSuchAlgorithmException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_NoSuchAlgorithmException__
-#define __java_security_NoSuchAlgorithmException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class NoSuchAlgorithmException;
-    }
-  }
-}
-
-class java::security::NoSuchAlgorithmException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  NoSuchAlgorithmException();
-  NoSuchAlgorithmException(::java::lang::String *);
-  NoSuchAlgorithmException(::java::lang::String *, ::java::lang::Throwable *);
-  NoSuchAlgorithmException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -7443947487218346562LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_NoSuchAlgorithmException__
diff --git a/libjava/java/security/NoSuchProviderException.h b/libjava/java/security/NoSuchProviderException.h
deleted file mode 100644
index 16878c33712..00000000000
--- a/libjava/java/security/NoSuchProviderException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_NoSuchProviderException__
-#define __java_security_NoSuchProviderException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class NoSuchProviderException;
-    }
-  }
-}
-
-class java::security::NoSuchProviderException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  NoSuchProviderException();
-  NoSuchProviderException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8488111756688534474LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_NoSuchProviderException__
diff --git a/libjava/java/security/Permission.h b/libjava/java/security/Permission.h
deleted file mode 100644
index c565f2b58e9..00000000000
--- a/libjava/java/security/Permission.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Permission__
-#define __java_security_Permission__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::security::Permission : public ::java::lang::Object
-{
-
-public:
-  Permission(::java::lang::String *);
-  virtual void checkGuard(::java::lang::Object *);
-  virtual jboolean implies(::java::security::Permission *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getActions() = 0;
-  virtual ::java::security::PermissionCollection * newPermissionCollection();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -5636570222231596674LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Permission__
diff --git a/libjava/java/security/PermissionCollection.h b/libjava/java/security/PermissionCollection.h
deleted file mode 100644
index 868c23e0e4e..00000000000
--- a/libjava/java/security/PermissionCollection.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PermissionCollection__
-#define __java_security_PermissionCollection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::security::PermissionCollection : public ::java::lang::Object
-{
-
-public:
-  PermissionCollection();
-  virtual void add(::java::security::Permission *) = 0;
-  virtual jboolean implies(::java::security::Permission *) = 0;
-  virtual ::java::util::Enumeration * elements() = 0;
-  virtual void setReadOnly();
-  virtual jboolean isReadOnly();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6727011328946861783LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) readOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_PermissionCollection__
diff --git a/libjava/java/security/Permissions$1.h b/libjava/java/security/Permissions$1.h
deleted file mode 100644
index d14b456d1f8..00000000000
--- a/libjava/java/security/Permissions$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Permissions$1__
-#define __java_security_Permissions$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permissions;
-        class Permissions$1;
-    }
-  }
-}
-
-class java::security::Permissions$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Permissions$1(::java::security::Permissions *);
-public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) main_enum;
-  ::java::util::Enumeration * sub_enum;
-  ::java::security::Permissions * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Permissions$1__
diff --git a/libjava/java/security/Permissions$PermissionsHash.h b/libjava/java/security/Permissions$PermissionsHash.h
deleted file mode 100644
index 870065a4bd3..00000000000
--- a/libjava/java/security/Permissions$PermissionsHash.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Permissions$PermissionsHash__
-#define __java_security_Permissions$PermissionsHash__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class Permissions$PermissionsHash;
-    }
-  }
-}
-
-class java::security::Permissions$PermissionsHash : public ::java::security::PermissionCollection
-{
-
-  Permissions$PermissionsHash();
-public:
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
-public: // actually package-private
-  Permissions$PermissionsHash(::java::security::Permissions$PermissionsHash *);
-private:
-  static const jlong serialVersionUID = -8491988220802933440LL;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) perms;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Permissions$PermissionsHash__
diff --git a/libjava/java/security/Permissions.h b/libjava/java/security/Permissions.h
deleted file mode 100644
index 5484fa980f9..00000000000
--- a/libjava/java/security/Permissions.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Permissions__
-#define __java_security_Permissions__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-        class Permissions;
-    }
-  }
-}
-
-class java::security::Permissions : public ::java::security::PermissionCollection
-{
-
-public:
-  Permissions();
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
-private:
-  static const jlong serialVersionUID = 4858622370623524688LL;
-  ::java::security::PermissionCollection * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) allPermission;
-public: // actually package-private
-  ::java::util::Hashtable * perms;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Permissions__
diff --git a/libjava/java/security/Policy.h b/libjava/java/security/Policy.h
deleted file mode 100644
index 11620954484..00000000000
--- a/libjava/java/security/Policy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Policy__
-#define __java_security_Policy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class CodeSource;
-        class Permission;
-        class PermissionCollection;
-        class Policy;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::security::Policy : public ::java::lang::Object
-{
-
-public:
-  Policy();
-  static ::java::security::Policy * getPolicy();
-  static void setPolicy(::java::security::Policy *);
-private:
-  static void setup(::java::security::Policy *);
-public: // actually package-private
-  static ::java::security::Policy * getCurrentPolicy();
-  static jboolean isLoaded();
-public:
-  virtual ::java::security::PermissionCollection * getPermissions(::java::security::CodeSource *) = 0;
-  virtual ::java::security::PermissionCollection * getPermissions(::java::security::ProtectionDomain *);
-  virtual jboolean implies(::java::security::ProtectionDomain *, ::java::security::Permission *);
-  virtual void refresh() = 0;
-private:
-  static ::java::security::Policy * currentPolicy;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pd2pc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Policy__
diff --git a/libjava/java/security/Principal.h b/libjava/java/security/Principal.h
deleted file mode 100644
index e3cfb312677..00000000000
--- a/libjava/java/security/Principal.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Principal__
-#define __java_security_Principal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-    }
-  }
-}
-
-class java::security::Principal : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_Principal__
diff --git a/libjava/java/security/PrivateKey.h b/libjava/java/security/PrivateKey.h
deleted file mode 100644
index 2be7e63955e..00000000000
--- a/libjava/java/security/PrivateKey.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PrivateKey__
-#define __java_security_PrivateKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-    }
-  }
-}
-
-class java::security::PrivateKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 6034044314589513430LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_PrivateKey__
diff --git a/libjava/java/security/PrivilegedAction.h b/libjava/java/security/PrivilegedAction.h
deleted file mode 100644
index 17481fd002a..00000000000
--- a/libjava/java/security/PrivilegedAction.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PrivilegedAction__
-#define __java_security_PrivilegedAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivilegedAction;
-    }
-  }
-}
-
-class java::security::PrivilegedAction : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * run() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_PrivilegedAction__
diff --git a/libjava/java/security/PrivilegedActionException.h b/libjava/java/security/PrivilegedActionException.h
deleted file mode 100644
index 165a1c59752..00000000000
--- a/libjava/java/security/PrivilegedActionException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PrivilegedActionException__
-#define __java_security_PrivilegedActionException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivilegedActionException;
-    }
-  }
-}
-
-class java::security::PrivilegedActionException : public ::java::lang::Exception
-{
-
-public:
-  PrivilegedActionException(::java::lang::Exception *);
-  virtual ::java::lang::Exception * getException();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4724086851538908602LL;
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_PrivilegedActionException__
diff --git a/libjava/java/security/PrivilegedExceptionAction.h b/libjava/java/security/PrivilegedExceptionAction.h
deleted file mode 100644
index bfb3046e567..00000000000
--- a/libjava/java/security/PrivilegedExceptionAction.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PrivilegedExceptionAction__
-#define __java_security_PrivilegedExceptionAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivilegedExceptionAction;
-    }
-  }
-}
-
-class java::security::PrivilegedExceptionAction : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * run() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_PrivilegedExceptionAction__
diff --git a/libjava/java/security/ProtectionDomain.h b/libjava/java/security/ProtectionDomain.h
deleted file mode 100644
index 7f204667a85..00000000000
--- a/libjava/java/security/ProtectionDomain.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_ProtectionDomain__
-#define __java_security_ProtectionDomain__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class CodeSource;
-        class Permission;
-        class PermissionCollection;
-        class Principal;
-        class ProtectionDomain;
-    }
-  }
-}
-
-class java::security::ProtectionDomain : public ::java::lang::Object
-{
-
-public:
-  ProtectionDomain(::java::security::CodeSource *, ::java::security::PermissionCollection *);
-  ProtectionDomain(::java::security::CodeSource *, ::java::security::PermissionCollection *, ::java::lang::ClassLoader *, JArray< ::java::security::Principal * > *);
-private:
-  ProtectionDomain(::java::security::CodeSource *, ::java::security::PermissionCollection *, ::java::lang::ClassLoader *, JArray< ::java::security::Principal * > *, jboolean);
-public:
-  virtual ::java::security::CodeSource * getCodeSource();
-  virtual ::java::lang::ClassLoader * getClassLoader();
-  virtual JArray< ::java::security::Principal * > * getPrincipals();
-  virtual ::java::security::PermissionCollection * getPermissions();
-  virtual jboolean implies(::java::security::Permission *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::security::CodeSource * __attribute__((aligned(__alignof__( ::java::lang::Object)))) code_source;
-  ::java::security::PermissionCollection * perms;
-  ::java::lang::ClassLoader * classloader;
-  JArray< ::java::security::Principal * > * principals;
-  jboolean staticBinding;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_ProtectionDomain__
diff --git a/libjava/java/security/Provider.h b/libjava/java/security/Provider.h
deleted file mode 100644
index 5954805f8d0..00000000000
--- a/libjava/java/security/Provider.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Provider__
-#define __java_security_Provider__
-
-#pragma interface
-
-#include <java/util/Properties.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-    }
-  }
-}
-
-class java::security::Provider : public ::java::util::Properties
-{
-
-public: // actually protected
-  Provider(::java::lang::String *, jdouble, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual jdouble getVersion();
-  virtual ::java::lang::String * getInfo();
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual void clear();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::Object * toCanonicalKey(::java::lang::Object *);
-  static const jlong serialVersionUID = -4298000515446427739LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::Properties)))) info;
-  ::java::lang::String * name;
-  jdouble version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Provider__
diff --git a/libjava/java/security/ProviderException.h b/libjava/java/security/ProviderException.h
deleted file mode 100644
index 843a100abdf..00000000000
--- a/libjava/java/security/ProviderException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_ProviderException__
-#define __java_security_ProviderException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class ProviderException;
-    }
-  }
-}
-
-class java::security::ProviderException : public ::java::lang::RuntimeException
-{
-
-public:
-  ProviderException();
-  ProviderException(::java::lang::String *);
-  ProviderException(::java::lang::String *, ::java::lang::Throwable *);
-  ProviderException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 5256023526693665674LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_ProviderException__
diff --git a/libjava/java/security/PublicKey.h b/libjava/java/security/PublicKey.h
deleted file mode 100644
index 6a2a72bd89a..00000000000
--- a/libjava/java/security/PublicKey.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_PublicKey__
-#define __java_security_PublicKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-    }
-  }
-}
-
-class java::security::PublicKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 7187392471159151072LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_PublicKey__
diff --git a/libjava/java/security/SecureClassLoader.h b/libjava/java/security/SecureClassLoader.h
deleted file mode 100644
index c8431a7bc7f..00000000000
--- a/libjava/java/security/SecureClassLoader.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SecureClassLoader__
-#define __java_security_SecureClassLoader__
-
-#pragma interface
-
-#include <java/lang/ClassLoader.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class CodeSource;
-        class PermissionCollection;
-        class ProtectionDomain;
-        class SecureClassLoader;
-    }
-  }
-}
-
-class java::security::SecureClassLoader : public ::java::lang::ClassLoader
-{
-
-public: // actually protected
-  SecureClassLoader(::java::lang::ClassLoader *);
-  SecureClassLoader();
-  virtual ::java::lang::Class * defineClass(::java::lang::String *, JArray< jbyte > *, jint, jint, ::java::security::CodeSource *);
-  virtual ::java::lang::Class * defineClass(::java::lang::String *, ::java::nio::ByteBuffer *, ::java::security::CodeSource *);
-private:
-  ::java::security::ProtectionDomain * getProtectionDomain(::java::security::CodeSource *);
-public: // actually protected
-  virtual ::java::security::PermissionCollection * getPermissions(::java::security::CodeSource *);
-private:
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::ClassLoader)))) protectionDomainCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SecureClassLoader__
diff --git a/libjava/java/security/SecureRandom.h b/libjava/java/security/SecureRandom.h
deleted file mode 100644
index 58561abbc1c..00000000000
--- a/libjava/java/security/SecureRandom.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SecureRandom__
-#define __java_security_SecureRandom__
-
-#pragma interface
-
-#include <java/util/Random.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-        class SecureRandom;
-        class SecureRandomSpi;
-    }
-  }
-}
-
-class java::security::SecureRandom : public ::java::util::Random
-{
-
-public:
-  SecureRandom();
-  SecureRandom(JArray< jbyte > *);
-public: // actually protected
-  SecureRandom(::java::security::SecureRandomSpi *, ::java::security::Provider *);
-private:
-  SecureRandom(::java::security::SecureRandomSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::security::SecureRandom * getInstance(::java::lang::String *);
-  static ::java::security::SecureRandom * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::SecureRandom * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual void setSeed(JArray< jbyte > *);
-  virtual void setSeed(jlong);
-  virtual void nextBytes(JArray< jbyte > *);
-public: // actually protected
-  virtual jint next(jint);
-public:
-  static JArray< jbyte > * getSeed(jint);
-  virtual JArray< jbyte > * generateSeed(jint);
-private:
-  static jint generateSeed(JArray< jbyte > *);
-  static jint generateSeed(JArray< jbyte > *, jint, jint);
-  static ::java::lang::String * SECURE_RANDOM;
-  static const jlong serialVersionUID = 4940670005562187LL;
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::java::util::Random)))) counter;
-  ::java::security::Provider * provider;
-  JArray< jbyte > * randomBytes;
-  jint randomBytesUsed;
-  ::java::security::SecureRandomSpi * secureRandomSpi;
-  JArray< jbyte > * state;
-private:
-  ::java::lang::String * algorithm;
-  jboolean isSeeded;
-  static ::java::lang::String * SECURERANDOM_SOURCE;
-  static ::java::lang::String * JAVA_SECURITY_EGD;
-  static ::java::util::logging::Logger * logger;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SecureRandom__
diff --git a/libjava/java/security/SecureRandomSpi.h b/libjava/java/security/SecureRandomSpi.h
deleted file mode 100644
index 8b2b6d7d1da..00000000000
--- a/libjava/java/security/SecureRandomSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SecureRandomSpi__
-#define __java_security_SecureRandomSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandomSpi;
-    }
-  }
-}
-
-class java::security::SecureRandomSpi : public ::java::lang::Object
-{
-
-public:
-  SecureRandomSpi();
-public: // actually protected
-  virtual void engineSetSeed(JArray< jbyte > *) = 0;
-  virtual void engineNextBytes(JArray< jbyte > *) = 0;
-  virtual JArray< jbyte > * engineGenerateSeed(jint) = 0;
-private:
-  static const jlong serialVersionUID = -2991854161009191830LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SecureRandomSpi__
diff --git a/libjava/java/security/Security.h b/libjava/java/security/Security.h
deleted file mode 100644
index 201c9957ded..00000000000
--- a/libjava/java/security/Security.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Security__
-#define __java_security_Security__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-        class Security;
-    }
-  }
-}
-
-class java::security::Security : public ::java::lang::Object
-{
-
-  Security();
-  static jboolean loadProviders(::java::lang::String *, ::java::lang::String *);
-public:
-  static ::java::lang::String * getAlgorithmProperty(::java::lang::String *, ::java::lang::String *);
-  static jint insertProviderAt(::java::security::Provider *, jint);
-  static jint addProvider(::java::security::Provider *);
-  static void removeProvider(::java::lang::String *);
-  static JArray< ::java::security::Provider * > * getProviders();
-  static ::java::security::Provider * getProvider(::java::lang::String *);
-  static ::java::lang::String * getProperty(::java::lang::String *);
-  static void setProperty(::java::lang::String *, ::java::lang::String *);
-  static ::java::util::Set * getAlgorithms(::java::lang::String *);
-  static JArray< ::java::security::Provider * > * getProviders(::java::lang::String *);
-  static JArray< ::java::security::Provider * > * getProviders(::java::util::Map *);
-private:
-  static void selectProviders(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::LinkedHashSet *, ::java::util::LinkedHashSet *);
-  static jboolean provides(::java::security::Provider *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * ALG_ALIAS;
-  static ::java::util::Vector * providers;
-  static ::java::util::Properties * secprops;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Security__
diff --git a/libjava/java/security/SecurityPermission.h b/libjava/java/security/SecurityPermission.h
deleted file mode 100644
index c28bdc6307d..00000000000
--- a/libjava/java/security/SecurityPermission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SecurityPermission__
-#define __java_security_SecurityPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SecurityPermission;
-    }
-  }
-}
-
-class java::security::SecurityPermission : public ::java::security::BasicPermission
-{
-
-public:
-  SecurityPermission(::java::lang::String *);
-  SecurityPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5236109936224050470LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SecurityPermission__
diff --git a/libjava/java/security/Signature.h b/libjava/java/security/Signature.h
deleted file mode 100644
index 43f4d5233f0..00000000000
--- a/libjava/java/security/Signature.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Signature__
-#define __java_security_Signature__
-
-#pragma interface
-
-#include <java/security/SignatureSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class AlgorithmParameters;
-        class PrivateKey;
-        class Provider;
-        class PublicKey;
-        class SecureRandom;
-        class Signature;
-      namespace cert
-      {
-          class Certificate;
-      }
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::Signature : public ::java::security::SignatureSpi
-{
-
-public: // actually protected
-  Signature(::java::lang::String *);
-public:
-  static ::java::security::Signature * getInstance(::java::lang::String *);
-  static ::java::security::Signature * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::Signature * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual void initVerify(::java::security::PublicKey *);
-  virtual void initVerify(::java::security::cert::Certificate *);
-  virtual void initSign(::java::security::PrivateKey *);
-  virtual void initSign(::java::security::PrivateKey *, ::java::security::SecureRandom *);
-  virtual JArray< jbyte > * sign();
-  virtual jint sign(JArray< jbyte > *, jint, jint);
-  virtual jboolean verify(JArray< jbyte > *);
-  virtual jboolean verify(JArray< jbyte > *, jint, jint);
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual void update(::java::nio::ByteBuffer *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::String * toString();
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *);
-  virtual void setParameter(::java::security::spec::AlgorithmParameterSpec *);
-  virtual ::java::security::AlgorithmParameters * getParameters();
-  virtual ::java::lang::Object * getParameter(::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-private:
-  static ::java::lang::String * SIGNATURE;
-public: // actually protected
-  static const jint UNINITIALIZED = 0;
-  static const jint SIGN = 2;
-  static const jint VERIFY = 3;
-  jint __attribute__((aligned(__alignof__( ::java::security::SignatureSpi)))) state;
-private:
-  ::java::lang::String * algorithm;
-public: // actually package-private
-  ::java::security::Provider * provider;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Signature__
diff --git a/libjava/java/security/SignatureException.h b/libjava/java/security/SignatureException.h
deleted file mode 100644
index 32e3d756270..00000000000
--- a/libjava/java/security/SignatureException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SignatureException__
-#define __java_security_SignatureException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SignatureException;
-    }
-  }
-}
-
-class java::security::SignatureException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  SignatureException();
-  SignatureException(::java::lang::String *);
-  SignatureException(::java::lang::String *, ::java::lang::Throwable *);
-  SignatureException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 7509989324975124438LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SignatureException__
diff --git a/libjava/java/security/SignatureSpi.h b/libjava/java/security/SignatureSpi.h
deleted file mode 100644
index 7e2406e5aac..00000000000
--- a/libjava/java/security/SignatureSpi.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SignatureSpi__
-#define __java_security_SignatureSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class AlgorithmParameters;
-        class PrivateKey;
-        class PublicKey;
-        class SecureRandom;
-        class SignatureSpi;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::SignatureSpi : public ::java::lang::Object
-{
-
-public:
-  SignatureSpi();
-public: // actually protected
-  virtual void engineInitVerify(::java::security::PublicKey *) = 0;
-  virtual void engineInitSign(::java::security::PrivateKey *) = 0;
-  virtual void engineInitSign(::java::security::PrivateKey *, ::java::security::SecureRandom *);
-  virtual void engineUpdate(jbyte) = 0;
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint) = 0;
-  virtual void engineUpdate(::java::nio::ByteBuffer *);
-  virtual JArray< jbyte > * engineSign() = 0;
-  virtual jint engineSign(JArray< jbyte > *, jint, jint);
-  virtual jboolean engineVerify(JArray< jbyte > *) = 0;
-  virtual jboolean engineVerify(JArray< jbyte > *, jint, jint);
-  virtual void engineSetParameter(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void engineSetParameter(::java::security::spec::AlgorithmParameterSpec *);
-  virtual ::java::security::AlgorithmParameters * engineGetParameters();
-  virtual ::java::lang::Object * engineGetParameter(::java::lang::String *) = 0;
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  ::java::security::SecureRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) appRandom;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SignatureSpi__
diff --git a/libjava/java/security/SignedObject.h b/libjava/java/security/SignedObject.h
deleted file mode 100644
index 430053721ba..00000000000
--- a/libjava/java/security/SignedObject.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_SignedObject__
-#define __java_security_SignedObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-        class PublicKey;
-        class Signature;
-        class SignedObject;
-    }
-  }
-}
-
-class java::security::SignedObject : public ::java::lang::Object
-{
-
-public:
-  SignedObject(::java::io::Serializable *, ::java::security::PrivateKey *, ::java::security::Signature *);
-  ::java::lang::Object * getObject();
-  JArray< jbyte > * getSignature();
-  ::java::lang::String * getAlgorithm();
-  jboolean verify(::java::security::PublicKey *, ::java::security::Signature *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 720502720485447167LL;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) content;
-  JArray< jbyte > * signature;
-  ::java::lang::String * thealgorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_SignedObject__
diff --git a/libjava/java/security/Signer.h b/libjava/java/security/Signer.h
deleted file mode 100644
index 080bc8a0b61..00000000000
--- a/libjava/java/security/Signer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_Signer__
-#define __java_security_Signer__
-
-#pragma interface
-
-#include <java/security/Identity.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class IdentityScope;
-        class KeyPair;
-        class PrivateKey;
-        class Signer;
-    }
-  }
-}
-
-class java::security::Signer : public ::java::security::Identity
-{
-
-public: // actually protected
-  Signer();
-public:
-  Signer(::java::lang::String *);
-  Signer(::java::lang::String *, ::java::security::IdentityScope *);
-  virtual ::java::security::PrivateKey * getPrivateKey();
-  virtual void setKeyPair(::java::security::KeyPair *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1763464102261361480LL;
-  ::java::security::PrivateKey * __attribute__((aligned(__alignof__( ::java::security::Identity)))) privateKey;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_Signer__
diff --git a/libjava/java/security/UnrecoverableKeyException.h b/libjava/java/security/UnrecoverableKeyException.h
deleted file mode 100644
index 51c0c8a0115..00000000000
--- a/libjava/java/security/UnrecoverableKeyException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_UnrecoverableKeyException__
-#define __java_security_UnrecoverableKeyException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class UnrecoverableKeyException;
-    }
-  }
-}
-
-class java::security::UnrecoverableKeyException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  UnrecoverableKeyException();
-  UnrecoverableKeyException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7275063078190151277LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_UnrecoverableKeyException__
diff --git a/libjava/java/security/UnresolvedPermission.h b/libjava/java/security/UnresolvedPermission.h
deleted file mode 100644
index ceebc5b72aa..00000000000
--- a/libjava/java/security/UnresolvedPermission.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_UnresolvedPermission__
-#define __java_security_UnresolvedPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-        class UnresolvedPermission;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::UnresolvedPermission : public ::java::security::Permission
-{
-
-public:
-  UnresolvedPermission(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::security::cert::Certificate * > *);
-  jboolean implies(::java::security::Permission *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * getActions();
-  ::java::lang::String * toString();
-  ::java::security::PermissionCollection * newPermissionCollection();
-  ::java::lang::String * getUnresolvedType();
-  ::java::lang::String * getUnresolvedName();
-  ::java::lang::String * getUnresolvedActions();
-  JArray< ::java::security::cert::Certificate * > * getUnresolvedCerts();
-private:
-  static const jlong serialVersionUID = -4821973115467008846LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::security::Permission)))) actions;
-  JArray< ::java::security::cert::Certificate * > * certs;
-public: // actually package-private
-  ::java::lang::String * type;
-private:
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_UnresolvedPermission__
diff --git a/libjava/java/security/UnresolvedPermissionCollection$1.h b/libjava/java/security/UnresolvedPermissionCollection$1.h
deleted file mode 100644
index 94cfec59123..00000000000
--- a/libjava/java/security/UnresolvedPermissionCollection$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_UnresolvedPermissionCollection$1__
-#define __java_security_UnresolvedPermissionCollection$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class UnresolvedPermissionCollection;
-        class UnresolvedPermissionCollection$1;
-    }
-  }
-}
-
-class java::security::UnresolvedPermissionCollection$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UnresolvedPermissionCollection$1(::java::security::UnresolvedPermissionCollection *);
-public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) main_enum;
-  ::java::util::Enumeration * sub_enum;
-  ::java::security::UnresolvedPermissionCollection * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_UnresolvedPermissionCollection$1__
diff --git a/libjava/java/security/UnresolvedPermissionCollection.h b/libjava/java/security/UnresolvedPermissionCollection.h
deleted file mode 100644
index 2d31d0e6cf8..00000000000
--- a/libjava/java/security/UnresolvedPermissionCollection.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_UnresolvedPermissionCollection__
-#define __java_security_UnresolvedPermissionCollection__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class UnresolvedPermissionCollection;
-    }
-  }
-}
-
-class java::security::UnresolvedPermissionCollection : public ::java::security::PermissionCollection
-{
-
-public: // actually package-private
-  UnresolvedPermissionCollection();
-public:
-  virtual void add(::java::security::Permission *);
-  virtual jboolean implies(::java::security::Permission *);
-  virtual ::java::util::Enumeration * elements();
-private:
-  static const jlong serialVersionUID = -7176153071733132400LL;
-public: // actually package-private
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_UnresolvedPermissionCollection__
diff --git a/libjava/java/security/VMAccessControlState.h b/libjava/java/security/VMAccessControlState.h
deleted file mode 100644
index 5c71033ca7c..00000000000
--- a/libjava/java/security/VMAccessControlState.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_VMAccessControlState__
-#define __java_security_VMAccessControlState__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class VMAccessControlState;
-    }
-  }
-}
-
-class java::security::VMAccessControlState : public ::java::lang::Object
-{
-
-  VMAccessControlState();
-public: // actually package-private
-  static ::java::security::VMAccessControlState * getThreadState();
-  virtual jboolean isInGetContext();
-  virtual void setInGetContext(jboolean);
-  virtual ::java::util::LinkedList * getContexts();
-private:
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) contexts;
-  jboolean inGetContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_VMAccessControlState__
diff --git a/libjava/java/security/VMAccessController.h b/libjava/java/security/VMAccessController.h
deleted file mode 100644
index 20cd9ce7338..00000000000
--- a/libjava/java/security/VMAccessController.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_VMAccessController__
-#define __java_security_VMAccessController__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-        class VMAccessController;
-    }
-  }
-}
-
-class java::security::VMAccessController : public ::java::lang::Object
-{
-
-  static void debug(::java::lang::String *);
-  VMAccessController();
-public: // actually package-private
-  static void pushContext(::java::security::AccessControlContext *);
-  static void popContext();
-  static ::java::security::AccessControlContext * getContext();
-private:
-  static JArray< ::java::lang::Object * > * getStack();
-  static ::java::security::AccessControlContext * DEFAULT_CONTEXT;
-  static jboolean DEBUG;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_VMAccessController__
diff --git a/libjava/java/security/VMSecureRandom$Spinner.h b/libjava/java/security/VMSecureRandom$Spinner.h
deleted file mode 100644
index 32a1e31acdf..00000000000
--- a/libjava/java/security/VMSecureRandom$Spinner.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_VMSecureRandom$Spinner__
-#define __java_security_VMSecureRandom$Spinner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class VMSecureRandom$Spinner;
-    }
-  }
-}
-
-class java::security::VMSecureRandom$Spinner : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMSecureRandom$Spinner(jbyte);
-public:
-  virtual void run();
-private:
-  void stop();
-public: // actually package-private
-  static void access$0(::java::security::VMSecureRandom$Spinner *);
-  volatile jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  volatile jboolean running;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_VMSecureRandom$Spinner__
diff --git a/libjava/java/security/VMSecureRandom.h b/libjava/java/security/VMSecureRandom.h
deleted file mode 100644
index 982bc0f1a88..00000000000
--- a/libjava/java/security/VMSecureRandom.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_VMSecureRandom__
-#define __java_security_VMSecureRandom__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class VMSecureRandom;
-    }
-  }
-}
-
-class java::security::VMSecureRandom : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMSecureRandom();
-  static jint generateSeed(JArray< jbyte > *, jint, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_VMSecureRandom__
diff --git a/libjava/java/security/acl/Acl.h b/libjava/java/security/acl/Acl.h
deleted file mode 100644
index 82c8d6de784..00000000000
--- a/libjava/java/security/acl/Acl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_Acl__
-#define __java_security_acl_Acl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace acl
-      {
-          class Acl;
-          class AclEntry;
-          class Permission;
-      }
-    }
-  }
-}
-
-class java::security::acl::Acl : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::security::Principal *, ::java::lang::String *) = 0;
-  virtual jboolean addEntry(::java::security::Principal *, ::java::security::acl::AclEntry *) = 0;
-  virtual jboolean removeEntry(::java::security::Principal *, ::java::security::acl::AclEntry *) = 0;
-  virtual ::java::util::Enumeration * entries() = 0;
-  virtual jboolean checkPermission(::java::security::Principal *, ::java::security::acl::Permission *) = 0;
-  virtual ::java::util::Enumeration * getPermissions(::java::security::Principal *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual jboolean addOwner(::java::security::Principal *, ::java::security::Principal *) = 0;
-  virtual jboolean deleteOwner(::java::security::Principal *, ::java::security::Principal *) = 0;
-  virtual jboolean isOwner(::java::security::Principal *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_acl_Acl__
diff --git a/libjava/java/security/acl/AclEntry.h b/libjava/java/security/acl/AclEntry.h
deleted file mode 100644
index 3b098b0f899..00000000000
--- a/libjava/java/security/acl/AclEntry.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_AclEntry__
-#define __java_security_acl_AclEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace acl
-      {
-          class AclEntry;
-          class Permission;
-      }
-    }
-  }
-}
-
-class java::security::acl::AclEntry : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::security::Principal * getPrincipal() = 0;
-  virtual jboolean setPrincipal(::java::security::Principal *) = 0;
-  virtual void setNegativePermissions() = 0;
-  virtual jboolean isNegative() = 0;
-  virtual jboolean addPermission(::java::security::acl::Permission *) = 0;
-  virtual jboolean removePermission(::java::security::acl::Permission *) = 0;
-  virtual jboolean checkPermission(::java::security::acl::Permission *) = 0;
-  virtual ::java::util::Enumeration * permissions() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_acl_AclEntry__
diff --git a/libjava/java/security/acl/AclNotFoundException.h b/libjava/java/security/acl/AclNotFoundException.h
deleted file mode 100644
index 9daea6522fa..00000000000
--- a/libjava/java/security/acl/AclNotFoundException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_AclNotFoundException__
-#define __java_security_acl_AclNotFoundException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace acl
-      {
-          class AclNotFoundException;
-      }
-    }
-  }
-}
-
-class java::security::acl::AclNotFoundException : public ::java::lang::Exception
-{
-
-public:
-  AclNotFoundException();
-private:
-  static const jlong serialVersionUID = 5684295034092681791LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_acl_AclNotFoundException__
diff --git a/libjava/java/security/acl/Group.h b/libjava/java/security/acl/Group.h
deleted file mode 100644
index 780774d4119..00000000000
--- a/libjava/java/security/acl/Group.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_Group__
-#define __java_security_acl_Group__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace acl
-      {
-          class Group;
-      }
-    }
-  }
-}
-
-class java::security::acl::Group : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean addMember(::java::security::Principal *) = 0;
-  virtual jboolean removeMember(::java::security::Principal *) = 0;
-  virtual jboolean isMember(::java::security::Principal *) = 0;
-  virtual ::java::util::Enumeration * members() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_acl_Group__
diff --git a/libjava/java/security/acl/LastOwnerException.h b/libjava/java/security/acl/LastOwnerException.h
deleted file mode 100644
index eb03366e040..00000000000
--- a/libjava/java/security/acl/LastOwnerException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_LastOwnerException__
-#define __java_security_acl_LastOwnerException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace acl
-      {
-          class LastOwnerException;
-      }
-    }
-  }
-}
-
-class java::security::acl::LastOwnerException : public ::java::lang::Exception
-{
-
-public:
-  LastOwnerException();
-private:
-  static const jlong serialVersionUID = -5141997548211140359LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_acl_LastOwnerException__
diff --git a/libjava/java/security/acl/NotOwnerException.h b/libjava/java/security/acl/NotOwnerException.h
deleted file mode 100644
index 627e4e57b98..00000000000
--- a/libjava/java/security/acl/NotOwnerException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_NotOwnerException__
-#define __java_security_acl_NotOwnerException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace acl
-      {
-          class NotOwnerException;
-      }
-    }
-  }
-}
-
-class java::security::acl::NotOwnerException : public ::java::lang::Exception
-{
-
-public:
-  NotOwnerException();
-private:
-  static const jlong serialVersionUID = -5555597911163362399LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_acl_NotOwnerException__
diff --git a/libjava/java/security/acl/Owner.h b/libjava/java/security/acl/Owner.h
deleted file mode 100644
index b8bc09bf25a..00000000000
--- a/libjava/java/security/acl/Owner.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_Owner__
-#define __java_security_acl_Owner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace acl
-      {
-          class Owner;
-      }
-    }
-  }
-}
-
-class java::security::acl::Owner : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean addOwner(::java::security::Principal *, ::java::security::Principal *) = 0;
-  virtual jboolean deleteOwner(::java::security::Principal *, ::java::security::Principal *) = 0;
-  virtual jboolean isOwner(::java::security::Principal *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_acl_Owner__
diff --git a/libjava/java/security/acl/Permission.h b/libjava/java/security/acl/Permission.h
deleted file mode 100644
index f1c9b252563..00000000000
--- a/libjava/java/security/acl/Permission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_acl_Permission__
-#define __java_security_acl_Permission__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace acl
-      {
-          class Permission;
-      }
-    }
-  }
-}
-
-class java::security::acl::Permission : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_acl_Permission__
diff --git a/libjava/java/security/cert/CRL.h b/libjava/java/security/cert/CRL.h
deleted file mode 100644
index e1b5298e023..00000000000
--- a/libjava/java/security/cert/CRL.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CRL__
-#define __java_security_cert_CRL__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRL;
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::cert::CRL : public ::java::lang::Object
-{
-
-public: // actually protected
-  CRL(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual ::java::lang::String * toString() = 0;
-  virtual jboolean isRevoked(::java::security::cert::Certificate *) = 0;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CRL__
diff --git a/libjava/java/security/cert/CRLException.h b/libjava/java/security/cert/CRLException.h
deleted file mode 100644
index 7e2401eb484..00000000000
--- a/libjava/java/security/cert/CRLException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CRLException__
-#define __java_security_cert_CRLException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRLException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CRLException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  CRLException();
-  CRLException(::java::lang::String *);
-  CRLException(::java::lang::String *, ::java::lang::Throwable *);
-  CRLException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -6694728944094197147LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CRLException__
diff --git a/libjava/java/security/cert/CRLSelector.h b/libjava/java/security/cert/CRLSelector.h
deleted file mode 100644
index fb5fe7a62a0..00000000000
--- a/libjava/java/security/cert/CRLSelector.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CRLSelector__
-#define __java_security_cert_CRLSelector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRL;
-          class CRLSelector;
-      }
-    }
-  }
-}
-
-class java::security::cert::CRLSelector : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  virtual jboolean match(::java::security::cert::CRL *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CRLSelector__
diff --git a/libjava/java/security/cert/CertPath$CertPathRep.h b/libjava/java/security/cert/CertPath$CertPathRep.h
deleted file mode 100644
index a688e1b6d78..00000000000
--- a/libjava/java/security/cert/CertPath$CertPathRep.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPath$CertPathRep__
-#define __java_security_cert_CertPath$CertPathRep__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPath$CertPathRep;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPath$CertPathRep : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertPath$CertPathRep(::java::lang::String *, JArray< jbyte > *);
-  virtual ::java::lang::Object * readResolve();
-private:
-  static const jlong serialVersionUID = 3015633072427920915LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  JArray< jbyte > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPath$CertPathRep__
diff --git a/libjava/java/security/cert/CertPath.h b/libjava/java/security/cert/CertPath.h
deleted file mode 100644
index ed7378982b8..00000000000
--- a/libjava/java/security/cert/CertPath.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPath__
-#define __java_security_cert_CertPath__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPath;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPath : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertPath(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual ::java::util::Iterator * getEncodings() = 0;
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual JArray< jbyte > * getEncoded(::java::lang::String *) = 0;
-  virtual ::java::util::List * getCertificates() = 0;
-public: // actually protected
-  virtual ::java::lang::Object * writeReplace();
-private:
-  static const jlong serialVersionUID = 6068470306649138683LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPath__
diff --git a/libjava/java/security/cert/CertPathBuilder.h b/libjava/java/security/cert/CertPathBuilder.h
deleted file mode 100644
index 2905f742308..00000000000
--- a/libjava/java/security/cert/CertPathBuilder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathBuilder__
-#define __java_security_cert_CertPathBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-      namespace cert
-      {
-          class CertPathBuilder;
-          class CertPathBuilderResult;
-          class CertPathBuilderSpi;
-          class CertPathParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathBuilder : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertPathBuilder(::java::security::cert::CertPathBuilderSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::lang::String * getDefaultType();
-  static ::java::security::cert::CertPathBuilder * getInstance(::java::lang::String *);
-  static ::java::security::cert::CertPathBuilder * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::cert::CertPathBuilder * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::security::cert::CertPathBuilderResult * build(::java::security::cert::CertPathParameters *);
-private:
-  static ::java::lang::String * CERT_PATH_BUILDER;
-  ::java::security::cert::CertPathBuilderSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cpbSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathBuilder__
diff --git a/libjava/java/security/cert/CertPathBuilderException.h b/libjava/java/security/cert/CertPathBuilderException.h
deleted file mode 100644
index c2cb71b8f8c..00000000000
--- a/libjava/java/security/cert/CertPathBuilderException.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathBuilderException__
-#define __java_security_cert_CertPathBuilderException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathBuilderException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathBuilderException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  CertPathBuilderException();
-  CertPathBuilderException(::java::lang::String *);
-  CertPathBuilderException(::java::lang::Throwable *);
-  CertPathBuilderException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::String * toString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = 5316471420178794402LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathBuilderException__
diff --git a/libjava/java/security/cert/CertPathBuilderResult.h b/libjava/java/security/cert/CertPathBuilderResult.h
deleted file mode 100644
index 74849e8df09..00000000000
--- a/libjava/java/security/cert/CertPathBuilderResult.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathBuilderResult__
-#define __java_security_cert_CertPathBuilderResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPath;
-          class CertPathBuilderResult;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathBuilderResult : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  virtual ::java::security::cert::CertPath * getCertPath() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CertPathBuilderResult__
diff --git a/libjava/java/security/cert/CertPathBuilderSpi.h b/libjava/java/security/cert/CertPathBuilderSpi.h
deleted file mode 100644
index 8b9524a5ac2..00000000000
--- a/libjava/java/security/cert/CertPathBuilderSpi.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathBuilderSpi__
-#define __java_security_cert_CertPathBuilderSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathBuilderResult;
-          class CertPathBuilderSpi;
-          class CertPathParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathBuilderSpi : public ::java::lang::Object
-{
-
-public:
-  CertPathBuilderSpi();
-  virtual ::java::security::cert::CertPathBuilderResult * engineBuild(::java::security::cert::CertPathParameters *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathBuilderSpi__
diff --git a/libjava/java/security/cert/CertPathParameters.h b/libjava/java/security/cert/CertPathParameters.h
deleted file mode 100644
index a6752dfaebc..00000000000
--- a/libjava/java/security/cert/CertPathParameters.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathParameters__
-#define __java_security_cert_CertPathParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathParameters : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CertPathParameters__
diff --git a/libjava/java/security/cert/CertPathValidator$1.h b/libjava/java/security/cert/CertPathValidator$1.h
deleted file mode 100644
index e24832084f0..00000000000
--- a/libjava/java/security/cert/CertPathValidator$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathValidator$1__
-#define __java_security_cert_CertPathValidator$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathValidator$1;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathValidator$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CertPathValidator$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathValidator$1__
diff --git a/libjava/java/security/cert/CertPathValidator.h b/libjava/java/security/cert/CertPathValidator.h
deleted file mode 100644
index 4424264fc72..00000000000
--- a/libjava/java/security/cert/CertPathValidator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathValidator__
-#define __java_security_cert_CertPathValidator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-      namespace cert
-      {
-          class CertPath;
-          class CertPathParameters;
-          class CertPathValidator;
-          class CertPathValidatorResult;
-          class CertPathValidatorSpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathValidator : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertPathValidator(::java::security::cert::CertPathValidatorSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::lang::String * getDefaultType();
-  static ::java::security::cert::CertPathValidator * getInstance(::java::lang::String *);
-  static ::java::security::cert::CertPathValidator * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::cert::CertPathValidator * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::security::cert::CertPathValidatorResult * validate(::java::security::cert::CertPath *, ::java::security::cert::CertPathParameters *);
-private:
-  static ::java::lang::String * CERT_PATH_VALIDATOR;
-  ::java::security::cert::CertPathValidatorSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) validatorSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathValidator__
diff --git a/libjava/java/security/cert/CertPathValidatorException.h b/libjava/java/security/cert/CertPathValidatorException.h
deleted file mode 100644
index 14289c79aab..00000000000
--- a/libjava/java/security/cert/CertPathValidatorException.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathValidatorException__
-#define __java_security_cert_CertPathValidatorException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPath;
-          class CertPathValidatorException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathValidatorException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  CertPathValidatorException();
-  CertPathValidatorException(::java::lang::String *);
-  CertPathValidatorException(::java::lang::Throwable *);
-  CertPathValidatorException(::java::lang::String *, ::java::lang::Throwable *);
-  CertPathValidatorException(::java::lang::String *, ::java::lang::Throwable *, ::java::security::cert::CertPath *, jint);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::security::cert::CertPath * getCertPath();
-  virtual jint getIndex();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::String * toString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = -3083180014971893139LL;
-  jint __attribute__((aligned(__alignof__( ::java::security::GeneralSecurityException)))) index;
-  ::java::security::cert::CertPath * certPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathValidatorException__
diff --git a/libjava/java/security/cert/CertPathValidatorResult.h b/libjava/java/security/cert/CertPathValidatorResult.h
deleted file mode 100644
index 1a453205dd6..00000000000
--- a/libjava/java/security/cert/CertPathValidatorResult.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathValidatorResult__
-#define __java_security_cert_CertPathValidatorResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathValidatorResult;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathValidatorResult : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CertPathValidatorResult__
diff --git a/libjava/java/security/cert/CertPathValidatorSpi.h b/libjava/java/security/cert/CertPathValidatorSpi.h
deleted file mode 100644
index cb737ef6402..00000000000
--- a/libjava/java/security/cert/CertPathValidatorSpi.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertPathValidatorSpi__
-#define __java_security_cert_CertPathValidatorSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPath;
-          class CertPathParameters;
-          class CertPathValidatorResult;
-          class CertPathValidatorSpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertPathValidatorSpi : public ::java::lang::Object
-{
-
-public:
-  CertPathValidatorSpi();
-  virtual ::java::security::cert::CertPathValidatorResult * engineValidate(::java::security::cert::CertPath *, ::java::security::cert::CertPathParameters *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertPathValidatorSpi__
diff --git a/libjava/java/security/cert/CertSelector.h b/libjava/java/security/cert/CertSelector.h
deleted file mode 100644
index 2288bcc29be..00000000000
--- a/libjava/java/security/cert/CertSelector.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertSelector__
-#define __java_security_cert_CertSelector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertSelector;
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertSelector : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  virtual jboolean match(::java::security::cert::Certificate *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CertSelector__
diff --git a/libjava/java/security/cert/CertStore$1.h b/libjava/java/security/cert/CertStore$1.h
deleted file mode 100644
index 16ae2325c9b..00000000000
--- a/libjava/java/security/cert/CertStore$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertStore$1__
-#define __java_security_cert_CertStore$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertStore$1;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertStore$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CertStore$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertStore$1__
diff --git a/libjava/java/security/cert/CertStore.h b/libjava/java/security/cert/CertStore.h
deleted file mode 100644
index af7e7488c6f..00000000000
--- a/libjava/java/security/cert/CertStore.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertStore__
-#define __java_security_cert_CertStore__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-      namespace cert
-      {
-          class CRLSelector;
-          class CertSelector;
-          class CertStore;
-          class CertStoreParameters;
-          class CertStoreSpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertStore : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertStore(::java::security::cert::CertStoreSpi *, ::java::security::Provider *, ::java::lang::String *, ::java::security::cert::CertStoreParameters *);
-public:
-  static ::java::lang::String * getDefaultType();
-  static ::java::security::cert::CertStore * getInstance(::java::lang::String *, ::java::security::cert::CertStoreParameters *);
-  static ::java::security::cert::CertStore * getInstance(::java::lang::String *, ::java::security::cert::CertStoreParameters *, ::java::lang::String *);
-  static ::java::security::cert::CertStore * getInstance(::java::lang::String *, ::java::security::cert::CertStoreParameters *, ::java::security::Provider *);
-  virtual ::java::lang::String * getType();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::security::cert::CertStoreParameters * getCertStoreParameters();
-  virtual ::java::util::Collection * getCertificates(::java::security::cert::CertSelector *);
-  virtual ::java::util::Collection * getCRLs(::java::security::cert::CRLSelector *);
-private:
-  static ::java::lang::String * CERT_STORE;
-  ::java::security::cert::CertStoreSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) storeSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * type;
-  ::java::security::cert::CertStoreParameters * params;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertStore__
diff --git a/libjava/java/security/cert/CertStoreException.h b/libjava/java/security/cert/CertStoreException.h
deleted file mode 100644
index 72e42f9ab40..00000000000
--- a/libjava/java/security/cert/CertStoreException.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertStoreException__
-#define __java_security_cert_CertStoreException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertStoreException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertStoreException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  CertStoreException();
-  CertStoreException(::java::lang::String *);
-  CertStoreException(::java::lang::Throwable *);
-  CertStoreException(::java::lang::String *, ::java::lang::Throwable *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::String * toString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = 2395296107471573245LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertStoreException__
diff --git a/libjava/java/security/cert/CertStoreParameters.h b/libjava/java/security/cert/CertStoreParameters.h
deleted file mode 100644
index 57eda812d76..00000000000
--- a/libjava/java/security/cert/CertStoreParameters.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertStoreParameters__
-#define __java_security_cert_CertStoreParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertStoreParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertStoreParameters : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_CertStoreParameters__
diff --git a/libjava/java/security/cert/CertStoreSpi.h b/libjava/java/security/cert/CertStoreSpi.h
deleted file mode 100644
index 30dc3a4dbf2..00000000000
--- a/libjava/java/security/cert/CertStoreSpi.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertStoreSpi__
-#define __java_security_cert_CertStoreSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRLSelector;
-          class CertSelector;
-          class CertStoreParameters;
-          class CertStoreSpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertStoreSpi : public ::java::lang::Object
-{
-
-public:
-  CertStoreSpi(::java::security::cert::CertStoreParameters *);
-  virtual ::java::util::Collection * engineGetCertificates(::java::security::cert::CertSelector *) = 0;
-  virtual ::java::util::Collection * engineGetCRLs(::java::security::cert::CRLSelector *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertStoreSpi__
diff --git a/libjava/java/security/cert/Certificate$CertificateRep.h b/libjava/java/security/cert/Certificate$CertificateRep.h
deleted file mode 100644
index 3eb75f2cb12..00000000000
--- a/libjava/java/security/cert/Certificate$CertificateRep.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_Certificate$CertificateRep__
-#define __java_security_cert_Certificate$CertificateRep__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate$CertificateRep;
-      }
-    }
-  }
-}
-
-class java::security::cert::Certificate$CertificateRep : public ::java::lang::Object
-{
-
-public: // actually protected
-  Certificate$CertificateRep(::java::lang::String *, JArray< jbyte > *);
-  virtual ::java::lang::Object * readResolve();
-private:
-  static const jlong serialVersionUID = -8563758940495660020LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  JArray< jbyte > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_Certificate$CertificateRep__
diff --git a/libjava/java/security/cert/Certificate.h b/libjava/java/security/cert/Certificate.h
deleted file mode 100644
index 350d78a9cf3..00000000000
--- a/libjava/java/security/cert/Certificate.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_Certificate__
-#define __java_security_cert_Certificate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::security::cert::Certificate : public ::java::lang::Object
-{
-
-public: // actually protected
-  Certificate(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual void verify(::java::security::PublicKey *) = 0;
-  virtual void verify(::java::security::PublicKey *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::security::PublicKey * getPublicKey() = 0;
-public: // actually protected
-  virtual ::java::lang::Object * writeReplace();
-private:
-  static const jlong serialVersionUID = -3585440601605666277LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_Certificate__
diff --git a/libjava/java/security/cert/CertificateEncodingException.h b/libjava/java/security/cert/CertificateEncodingException.h
deleted file mode 100644
index f97e40e163f..00000000000
--- a/libjava/java/security/cert/CertificateEncodingException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateEncodingException__
-#define __java_security_cert_CertificateEncodingException__
-
-#pragma interface
-
-#include <java/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateEncodingException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateEncodingException : public ::java::security::cert::CertificateException
-{
-
-public:
-  CertificateEncodingException();
-  CertificateEncodingException(::java::lang::String *);
-  CertificateEncodingException(::java::lang::String *, ::java::lang::Throwable *);
-  CertificateEncodingException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 6219492851589449162LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateEncodingException__
diff --git a/libjava/java/security/cert/CertificateException.h b/libjava/java/security/cert/CertificateException.h
deleted file mode 100644
index 11658e28953..00000000000
--- a/libjava/java/security/cert/CertificateException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateException__
-#define __java_security_cert_CertificateException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  CertificateException();
-  CertificateException(::java::lang::String *);
-  CertificateException(::java::lang::String *, ::java::lang::Throwable *);
-  CertificateException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 3192535253797119798LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateException__
diff --git a/libjava/java/security/cert/CertificateExpiredException.h b/libjava/java/security/cert/CertificateExpiredException.h
deleted file mode 100644
index a92013dc72f..00000000000
--- a/libjava/java/security/cert/CertificateExpiredException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateExpiredException__
-#define __java_security_cert_CertificateExpiredException__
-
-#pragma interface
-
-#include <java/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateExpiredException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateExpiredException : public ::java::security::cert::CertificateException
-{
-
-public:
-  CertificateExpiredException();
-  CertificateExpiredException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 9071001339691533771LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateExpiredException__
diff --git a/libjava/java/security/cert/CertificateFactory.h b/libjava/java/security/cert/CertificateFactory.h
deleted file mode 100644
index 184e3e4e971..00000000000
--- a/libjava/java/security/cert/CertificateFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateFactory__
-#define __java_security_cert_CertificateFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-      namespace cert
-      {
-          class CRL;
-          class CertPath;
-          class Certificate;
-          class CertificateFactory;
-          class CertificateFactorySpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  CertificateFactory(::java::security::cert::CertificateFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::security::cert::CertificateFactory * getInstance(::java::lang::String *);
-  static ::java::security::cert::CertificateFactory * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::java::security::cert::CertificateFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Provider * getProvider();
-  virtual ::java::lang::String * getType();
-  virtual ::java::security::cert::Certificate * generateCertificate(::java::io::InputStream *);
-  virtual ::java::util::Collection * generateCertificates(::java::io::InputStream *);
-  virtual ::java::security::cert::CRL * generateCRL(::java::io::InputStream *);
-  virtual ::java::util::Collection * generateCRLs(::java::io::InputStream *);
-  virtual ::java::security::cert::CertPath * generateCertPath(::java::io::InputStream *);
-  virtual ::java::security::cert::CertPath * generateCertPath(::java::io::InputStream *, ::java::lang::String *);
-  virtual ::java::security::cert::CertPath * generateCertPath(::java::util::List *);
-  virtual ::java::util::Iterator * getCertPathEncodings();
-private:
-  static ::java::lang::String * CERTIFICATE_FACTORY;
-  ::java::security::cert::CertificateFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) certFacSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateFactory__
diff --git a/libjava/java/security/cert/CertificateFactorySpi.h b/libjava/java/security/cert/CertificateFactorySpi.h
deleted file mode 100644
index 2370e67940c..00000000000
--- a/libjava/java/security/cert/CertificateFactorySpi.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateFactorySpi__
-#define __java_security_cert_CertificateFactorySpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CRL;
-          class CertPath;
-          class Certificate;
-          class CertificateFactorySpi;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateFactorySpi : public ::java::lang::Object
-{
-
-public:
-  CertificateFactorySpi();
-  virtual ::java::security::cert::Certificate * engineGenerateCertificate(::java::io::InputStream *) = 0;
-  virtual ::java::util::Collection * engineGenerateCertificates(::java::io::InputStream *) = 0;
-  virtual ::java::security::cert::CRL * engineGenerateCRL(::java::io::InputStream *) = 0;
-  virtual ::java::util::Collection * engineGenerateCRLs(::java::io::InputStream *) = 0;
-  virtual ::java::security::cert::CertPath * engineGenerateCertPath(::java::io::InputStream *);
-  virtual ::java::security::cert::CertPath * engineGenerateCertPath(::java::io::InputStream *, ::java::lang::String *);
-  virtual ::java::security::cert::CertPath * engineGenerateCertPath(::java::util::List *);
-  virtual ::java::util::Iterator * engineGetCertPathEncodings();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateFactorySpi__
diff --git a/libjava/java/security/cert/CertificateNotYetValidException.h b/libjava/java/security/cert/CertificateNotYetValidException.h
deleted file mode 100644
index 510bb39fe7a..00000000000
--- a/libjava/java/security/cert/CertificateNotYetValidException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateNotYetValidException__
-#define __java_security_cert_CertificateNotYetValidException__
-
-#pragma interface
-
-#include <java/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateNotYetValidException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateNotYetValidException : public ::java::security::cert::CertificateException
-{
-
-public:
-  CertificateNotYetValidException();
-  CertificateNotYetValidException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4355919900041064702LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateNotYetValidException__
diff --git a/libjava/java/security/cert/CertificateParsingException.h b/libjava/java/security/cert/CertificateParsingException.h
deleted file mode 100644
index 2827e896117..00000000000
--- a/libjava/java/security/cert/CertificateParsingException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CertificateParsingException__
-#define __java_security_cert_CertificateParsingException__
-
-#pragma interface
-
-#include <java/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateParsingException;
-      }
-    }
-  }
-}
-
-class java::security::cert::CertificateParsingException : public ::java::security::cert::CertificateException
-{
-
-public:
-  CertificateParsingException();
-  CertificateParsingException(::java::lang::String *);
-  CertificateParsingException(::java::lang::String *, ::java::lang::Throwable *);
-  CertificateParsingException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -7989222416793322029LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CertificateParsingException__
diff --git a/libjava/java/security/cert/CollectionCertStoreParameters.h b/libjava/java/security/cert/CollectionCertStoreParameters.h
deleted file mode 100644
index cabf8dfa337..00000000000
--- a/libjava/java/security/cert/CollectionCertStoreParameters.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_CollectionCertStoreParameters__
-#define __java_security_cert_CollectionCertStoreParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CollectionCertStoreParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::CollectionCertStoreParameters : public ::java::lang::Object
-{
-
-public:
-  CollectionCertStoreParameters();
-  CollectionCertStoreParameters(::java::util::Collection *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::Collection * getCollection();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::util::Collection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) collection;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_CollectionCertStoreParameters__
diff --git a/libjava/java/security/cert/LDAPCertStoreParameters.h b/libjava/java/security/cert/LDAPCertStoreParameters.h
deleted file mode 100644
index 2cdde192f8e..00000000000
--- a/libjava/java/security/cert/LDAPCertStoreParameters.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_LDAPCertStoreParameters__
-#define __java_security_cert_LDAPCertStoreParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class LDAPCertStoreParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::LDAPCertStoreParameters : public ::java::lang::Object
-{
-
-public:
-  LDAPCertStoreParameters();
-  LDAPCertStoreParameters(::java::lang::String *);
-  LDAPCertStoreParameters(::java::lang::String *, jint);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * getServerName();
-  virtual jint getPort();
-  virtual ::java::lang::String * toString();
-private:
-  static const jint LDAP_PORT = 389;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) serverName;
-  jint port;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_LDAPCertStoreParameters__
diff --git a/libjava/java/security/cert/PKIXBuilderParameters.h b/libjava/java/security/cert/PKIXBuilderParameters.h
deleted file mode 100644
index bb9ffd70774..00000000000
--- a/libjava/java/security/cert/PKIXBuilderParameters.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PKIXBuilderParameters__
-#define __java_security_cert_PKIXBuilderParameters__
-
-#pragma interface
-
-#include <java/security/cert/PKIXParameters.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-      namespace cert
-      {
-          class CertSelector;
-          class PKIXBuilderParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::PKIXBuilderParameters : public ::java::security::cert::PKIXParameters
-{
-
-public:
-  PKIXBuilderParameters(::java::security::KeyStore *, ::java::security::cert::CertSelector *);
-  PKIXBuilderParameters(::java::util::Set *, ::java::security::cert::CertSelector *);
-  virtual jint getMaxPathLength();
-  virtual void setMaxPathLength(jint);
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::security::cert::PKIXParameters)))) maxPathLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PKIXBuilderParameters__
diff --git a/libjava/java/security/cert/PKIXCertPathBuilderResult.h b/libjava/java/security/cert/PKIXCertPathBuilderResult.h
deleted file mode 100644
index ad6ee690b6b..00000000000
--- a/libjava/java/security/cert/PKIXCertPathBuilderResult.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PKIXCertPathBuilderResult__
-#define __java_security_cert_PKIXCertPathBuilderResult__
-
-#pragma interface
-
-#include <java/security/cert/PKIXCertPathValidatorResult.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class CertPath;
-          class PKIXCertPathBuilderResult;
-          class PolicyNode;
-          class TrustAnchor;
-      }
-    }
-  }
-}
-
-class java::security::cert::PKIXCertPathBuilderResult : public ::java::security::cert::PKIXCertPathValidatorResult
-{
-
-public:
-  PKIXCertPathBuilderResult(::java::security::cert::CertPath *, ::java::security::cert::TrustAnchor *, ::java::security::cert::PolicyNode *, ::java::security::PublicKey *);
-  virtual ::java::security::cert::CertPath * getCertPath();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::security::cert::CertPath * __attribute__((aligned(__alignof__( ::java::security::cert::PKIXCertPathValidatorResult)))) certPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PKIXCertPathBuilderResult__
diff --git a/libjava/java/security/cert/PKIXCertPathChecker.h b/libjava/java/security/cert/PKIXCertPathChecker.h
deleted file mode 100644
index 375e8f33cbe..00000000000
--- a/libjava/java/security/cert/PKIXCertPathChecker.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PKIXCertPathChecker__
-#define __java_security_cert_PKIXCertPathChecker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-          class PKIXCertPathChecker;
-      }
-    }
-  }
-}
-
-class java::security::cert::PKIXCertPathChecker : public ::java::lang::Object
-{
-
-public: // actually protected
-  PKIXCertPathChecker();
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void init(jboolean) = 0;
-  virtual jboolean isForwardCheckingSupported() = 0;
-  virtual ::java::util::Set * getSupportedExtensions() = 0;
-  virtual void check(::java::security::cert::Certificate *, ::java::util::Collection *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PKIXCertPathChecker__
diff --git a/libjava/java/security/cert/PKIXCertPathValidatorResult.h b/libjava/java/security/cert/PKIXCertPathValidatorResult.h
deleted file mode 100644
index 879bc2bf9dc..00000000000
--- a/libjava/java/security/cert/PKIXCertPathValidatorResult.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PKIXCertPathValidatorResult__
-#define __java_security_cert_PKIXCertPathValidatorResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class PKIXCertPathValidatorResult;
-          class PolicyNode;
-          class TrustAnchor;
-      }
-    }
-  }
-}
-
-class java::security::cert::PKIXCertPathValidatorResult : public ::java::lang::Object
-{
-
-public:
-  PKIXCertPathValidatorResult(::java::security::cert::TrustAnchor *, ::java::security::cert::PolicyNode *, ::java::security::PublicKey *);
-  virtual ::java::security::cert::TrustAnchor * getTrustAnchor();
-  virtual ::java::security::cert::PolicyNode * getPolicyTree();
-  virtual ::java::security::PublicKey * getPublicKey();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::security::cert::TrustAnchor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) trustAnchor;
-  ::java::security::cert::PolicyNode * policyTree;
-  ::java::security::PublicKey * subjectPublicKey;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PKIXCertPathValidatorResult__
diff --git a/libjava/java/security/cert/PKIXParameters.h b/libjava/java/security/cert/PKIXParameters.h
deleted file mode 100644
index 7a953696c2b..00000000000
--- a/libjava/java/security/cert/PKIXParameters.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PKIXParameters__
-#define __java_security_cert_PKIXParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-      namespace cert
-      {
-          class CertSelector;
-          class CertStore;
-          class PKIXCertPathChecker;
-          class PKIXParameters;
-      }
-    }
-  }
-}
-
-class java::security::cert::PKIXParameters : public ::java::lang::Object
-{
-
-public:
-  PKIXParameters(::java::security::KeyStore *);
-  PKIXParameters(::java::util::Set *);
-private:
-  PKIXParameters();
-  PKIXParameters(::java::security::cert::PKIXParameters *);
-public:
-  virtual ::java::util::Set * getTrustAnchors();
-  virtual void setTrustAnchors(::java::util::Set *);
-  virtual ::java::util::Set * getInitialPolicies();
-  virtual void setInitialPolicies(::java::util::Set *);
-  virtual void addCertStore(::java::security::cert::CertStore *);
-  virtual ::java::util::List * getCertStores();
-  virtual void setCertStores(::java::util::List *);
-  virtual jboolean isRevocationEnabled();
-  virtual void setRevocationEnabled(jboolean);
-  virtual jboolean isExplicitPolicyRequired();
-  virtual void setExplicitPolicyRequired(jboolean);
-  virtual jboolean isPolicyMappingInhibited();
-  virtual void setPolicyMappingInhibited(jboolean);
-  virtual jboolean isAnyPolicyInhibited();
-  virtual void setAnyPolicyInhibited(jboolean);
-  virtual jboolean getPolicyQualifiersRejected();
-  virtual void setPolicyQualifiersRejected(jboolean);
-  virtual ::java::util::Date * getDate();
-  virtual void setDate(::java::util::Date *);
-  virtual void addCertPathChecker(::java::security::cert::PKIXCertPathChecker *);
-  virtual ::java::util::List * getCertPathCheckers();
-  virtual void setCertPathCheckers(::java::util::List *);
-  virtual ::java::lang::String * getSigProvider();
-  virtual void setSigProvider(::java::lang::String *);
-  virtual ::java::security::cert::CertSelector * getTargetCertConstraints();
-  virtual void setTargetCertConstraints(::java::security::cert::CertSelector *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::lang::Object)))) trustAnchors;
-  ::java::util::Set * initPolicies;
-  ::java::util::List * certStores;
-  ::java::util::List * pathCheckers;
-  jboolean revocationEnabled;
-  jboolean exPolicyRequired;
-  jboolean policyMappingInhibited;
-  jboolean anyPolicyInhibited;
-  jboolean policyQualRejected;
-  ::java::util::Date * date;
-  ::java::lang::String * sigProvider;
-  ::java::security::cert::CertSelector * targetConstraints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PKIXParameters__
diff --git a/libjava/java/security/cert/PolicyNode.h b/libjava/java/security/cert/PolicyNode.h
deleted file mode 100644
index 04cadaf0528..00000000000
--- a/libjava/java/security/cert/PolicyNode.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PolicyNode__
-#define __java_security_cert_PolicyNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class PolicyNode;
-      }
-    }
-  }
-}
-
-class java::security::cert::PolicyNode : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Iterator * getChildren() = 0;
-  virtual jint getDepth() = 0;
-  virtual ::java::util::Set * getExpectedPolicies() = 0;
-  virtual ::java::security::cert::PolicyNode * getParent() = 0;
-  virtual ::java::util::Set * getPolicyQualifiers() = 0;
-  virtual ::java::lang::String * getValidPolicy() = 0;
-  virtual jboolean isCritical() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_cert_PolicyNode__
diff --git a/libjava/java/security/cert/PolicyQualifierInfo.h b/libjava/java/security/cert/PolicyQualifierInfo.h
deleted file mode 100644
index ed16d26f7cf..00000000000
--- a/libjava/java/security/cert/PolicyQualifierInfo.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_PolicyQualifierInfo__
-#define __java_security_cert_PolicyQualifierInfo__
-
-#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 java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class PolicyQualifierInfo;
-      }
-    }
-  }
-}
-
-class java::security::cert::PolicyQualifierInfo : public ::java::lang::Object
-{
-
-public:
-  PolicyQualifierInfo(JArray< jbyte > *);
-  virtual ::java::lang::String * getPolicyQualifierId();
-  virtual JArray< jbyte > * getEncoded();
-  virtual JArray< jbyte > * getPolicyQualifier();
-  virtual ::java::lang::String * toString();
-private:
-  ::gnu::java::security::OID * __attribute__((aligned(__alignof__( ::java::lang::Object)))) oid;
-  JArray< jbyte > * encoded;
-  ::gnu::java::security::der::DERValue * qualifier;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_PolicyQualifierInfo__
diff --git a/libjava/java/security/cert/TrustAnchor.h b/libjava/java/security/cert/TrustAnchor.h
deleted file mode 100644
index 3afc671bc0b..00000000000
--- a/libjava/java/security/cert/TrustAnchor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_TrustAnchor__
-#define __java_security_cert_TrustAnchor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-        namespace x509
-        {
-            class X500DistinguishedName;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class TrustAnchor;
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class java::security::cert::TrustAnchor : public ::java::lang::Object
-{
-
-public:
-  TrustAnchor(::java::security::cert::X509Certificate *, JArray< jbyte > *);
-  TrustAnchor(::java::lang::String *, ::java::security::PublicKey *, JArray< jbyte > *);
-  virtual ::java::security::cert::X509Certificate * getTrustedCert();
-  virtual ::java::lang::String * getCAName();
-  virtual ::java::security::PublicKey * getCAPublicKey();
-  virtual JArray< jbyte > * getNameConstraints();
-  virtual ::java::lang::String * toString();
-private:
-  ::gnu::java::security::x509::X500DistinguishedName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) caName;
-  ::java::security::PublicKey * caKey;
-  ::java::security::cert::X509Certificate * trustedCert;
-  JArray< jbyte > * nameConstraints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_TrustAnchor__
diff --git a/libjava/java/security/cert/X509CRL.h b/libjava/java/security/cert/X509CRL.h
deleted file mode 100644
index 1c92665020f..00000000000
--- a/libjava/java/security/cert/X509CRL.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509CRL__
-#define __java_security_cert_X509CRL__
-
-#pragma interface
-
-#include <java/security/cert/CRL.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Principal;
-        class PublicKey;
-      namespace cert
-      {
-          class X509CRL;
-          class X509CRLEntry;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class java::security::cert::X509CRL : public ::java::security::cert::CRL
-{
-
-public: // actually protected
-  X509CRL();
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual void verify(::java::security::PublicKey *) = 0;
-  virtual void verify(::java::security::PublicKey *, ::java::lang::String *) = 0;
-  virtual jint getVersion() = 0;
-  virtual ::java::security::Principal * getIssuerDN() = 0;
-  virtual ::java::util::Date * getThisUpdate() = 0;
-  virtual ::java::util::Date * getNextUpdate() = 0;
-  virtual ::java::security::cert::X509CRLEntry * getRevokedCertificate(::java::math::BigInteger *) = 0;
-  virtual ::java::util::Set * getRevokedCertificates() = 0;
-  virtual JArray< jbyte > * getTBSCertList() = 0;
-  virtual JArray< jbyte > * getSignature() = 0;
-  virtual ::java::lang::String * getSigAlgName() = 0;
-  virtual ::java::lang::String * getSigAlgOID() = 0;
-  virtual JArray< jbyte > * getSigAlgParams() = 0;
-  virtual ::javax::security::auth::x500::X500Principal * getIssuerX500Principal();
-  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$;
-};
-
-#endif // __java_security_cert_X509CRL__
diff --git a/libjava/java/security/cert/X509CRLEntry.h b/libjava/java/security/cert/X509CRLEntry.h
deleted file mode 100644
index 8d9c8d5f976..00000000000
--- a/libjava/java/security/cert/X509CRLEntry.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509CRLEntry__
-#define __java_security_cert_X509CRLEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class X509CRLEntry;
-      }
-    }
-  }
-}
-
-class java::security::cert::X509CRLEntry : public ::java::lang::Object
-{
-
-public:
-  X509CRLEntry();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual ::java::math::BigInteger * getSerialNumber() = 0;
-  virtual ::java::util::Date * getRevocationDate() = 0;
-  virtual jboolean hasExtensions() = 0;
-  virtual ::java::lang::String * toString() = 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$;
-};
-
-#endif // __java_security_cert_X509CRLEntry__
diff --git a/libjava/java/security/cert/X509CRLSelector.h b/libjava/java/security/cert/X509CRLSelector.h
deleted file mode 100644
index e888f633e1a..00000000000
--- a/libjava/java/security/cert/X509CRLSelector.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509CRLSelector__
-#define __java_security_cert_X509CRLSelector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class CRL;
-          class X509CRLSelector;
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class java::security::cert::X509CRLSelector : public ::java::lang::Object
-{
-
-public:
-  X509CRLSelector();
-  virtual void addIssuerName(JArray< jbyte > *);
-  virtual void addIssuerName(::java::lang::String *);
-  virtual void setIssuerNames(::java::util::Collection *);
-  virtual ::java::util::Collection * getIssuerNames();
-  virtual ::java::math::BigInteger * getMaxCRL();
-  virtual ::java::math::BigInteger * getMinCRL();
-  virtual void setMaxCRLNumber(::java::math::BigInteger *);
-  virtual void setMinCRLNumber(::java::math::BigInteger *);
-  virtual ::java::util::Date * getDateAndTime();
-  virtual void setDateAndTime(::java::util::Date *);
-  virtual ::java::security::cert::X509Certificate * getCertificateChecking();
-  virtual void setCertificateChecking(::java::security::cert::X509Certificate *);
-  virtual ::java::lang::String * toString();
-  virtual jboolean match(::java::security::cert::CRL *);
-  virtual ::java::lang::Object * clone();
-private:
-  static ::java::lang::String * CRL_NUMBER_ID;
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) issuerNames;
-  ::java::math::BigInteger * maxCrlNumber;
-  ::java::math::BigInteger * minCrlNumber;
-  ::java::util::Date * date;
-  ::java::security::cert::X509Certificate * cert;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_X509CRLSelector__
diff --git a/libjava/java/security/cert/X509CertSelector.h b/libjava/java/security/cert/X509CertSelector.h
deleted file mode 100644
index 69dd81e50eb..00000000000
--- a/libjava/java/security/cert/X509CertSelector.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509CertSelector__
-#define __java_security_cert_X509CertSelector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class PublicKey;
-      namespace cert
-      {
-          class Certificate;
-          class X509CertSelector;
-          class X509Certificate;
-      }
-      namespace spec
-      {
-          class X509EncodedKeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class java::security::cert::X509CertSelector : public ::java::lang::Object
-{
-
-public:
-  X509CertSelector();
-  virtual ::java::security::cert::X509Certificate * getCertificate();
-  virtual void setCertificate(::java::security::cert::X509Certificate *);
-  virtual ::java::math::BigInteger * getSerialNumber();
-  virtual void setSerialNumber(::java::math::BigInteger *);
-  virtual ::java::lang::String * getIssuerAsString();
-  virtual JArray< jbyte > * getIssuerAsBytes();
-  virtual void setIssuer(::java::lang::String *);
-  virtual void setIssuer(JArray< jbyte > *);
-  virtual ::java::lang::String * getSubjectAsString();
-  virtual JArray< jbyte > * getSubjectAsBytes();
-  virtual void setSubject(::java::lang::String *);
-  virtual void setSubject(JArray< jbyte > *);
-  virtual JArray< jbyte > * getSubjectKeyIdentifier();
-  virtual void setSubjectKeyIdentifier(JArray< jbyte > *);
-  virtual JArray< jbyte > * getAuthorityKeyIdentifier();
-  virtual void setAuthorityKeyIdentifier(JArray< jbyte > *);
-  virtual ::java::util::Date * getCertificateValid();
-  virtual void setCertificateValid(::java::util::Date *);
-  virtual ::java::util::Date * getPrivateKeyValid();
-  virtual void setPrivateKeyValid(::java::util::Date *);
-  virtual ::java::lang::String * getSubjectPublicKeyAlgID();
-  virtual void setSubjectPublicKeyAlgID(::java::lang::String *);
-  virtual ::java::security::PublicKey * getSubjectPublicKey();
-  virtual void setSubjectPublicKey(::java::security::PublicKey *);
-  virtual void setSubjectPublicKey(JArray< jbyte > *);
-  virtual JArray< jboolean > * getKeyUsage();
-  virtual void setKeyUsage(JArray< jboolean > *);
-  virtual ::java::util::Set * getExtendedKeyUsage();
-  virtual void setExtendedKeyUsage(::java::util::Set *);
-  virtual jboolean getMatchAllSubjectAltNames();
-  virtual void setMatchAllSubjectAltNames(jboolean);
-  virtual void setSubjectAlternativeNames(::java::util::Collection *);
-  virtual void addSubjectAlternativeName(jint, ::java::lang::String *);
-  virtual void addSubjectAlternativeName(jint, JArray< jbyte > *);
-  virtual JArray< jbyte > * getNameConstraints();
-  virtual void setNameConstraints(JArray< jbyte > *);
-  virtual jint getBasicConstraints();
-  virtual void setBasicConstraints(jint);
-  virtual jboolean match(::java::security::cert::Certificate *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::Object * clone();
-private:
-  static jboolean checkOid(JArray< jint > *);
-  static ::java::lang::String * AUTH_KEY_ID;
-  static ::java::lang::String * SUBJECT_KEY_ID;
-  static ::java::lang::String * NAME_CONSTRAINTS_ID;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) basicConstraints;
-  ::java::security::cert::X509Certificate * cert;
-  ::java::math::BigInteger * serialNo;
-  ::javax::security::auth::x500::X500Principal * issuer;
-  ::javax::security::auth::x500::X500Principal * subject;
-  JArray< jbyte > * subjectKeyId;
-  JArray< jbyte > * authKeyId;
-  JArray< jboolean > * keyUsage;
-  ::java::util::Date * certValid;
-  ::gnu::java::security::OID * sigId;
-  ::java::security::PublicKey * subjectKey;
-  ::java::security::spec::X509EncodedKeySpec * subjectKeySpec;
-  ::java::util::Set * keyPurposeSet;
-  ::java::util::List * altNames;
-  jboolean matchAllNames;
-  JArray< jbyte > * nameConstraints;
-  ::java::util::Set * policy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_X509CertSelector__
diff --git a/libjava/java/security/cert/X509Certificate.h b/libjava/java/security/cert/X509Certificate.h
deleted file mode 100644
index 9f8afe1f418..00000000000
--- a/libjava/java/security/cert/X509Certificate.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509Certificate__
-#define __java_security_cert_X509Certificate__
-
-#pragma interface
-
-#include <java/security/cert/Certificate.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Principal;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class java::security::cert::X509Certificate : public ::java::security::cert::Certificate
-{
-
-public: // actually protected
-  X509Certificate();
-public:
-  virtual void checkValidity() = 0;
-  virtual void checkValidity(::java::util::Date *) = 0;
-  virtual jint getVersion() = 0;
-  virtual ::java::math::BigInteger * getSerialNumber() = 0;
-  virtual ::java::security::Principal * getIssuerDN() = 0;
-  virtual ::java::security::Principal * getSubjectDN() = 0;
-  virtual ::java::util::Date * getNotBefore() = 0;
-  virtual ::java::util::Date * getNotAfter() = 0;
-  virtual JArray< jbyte > * getTBSCertificate() = 0;
-  virtual JArray< jbyte > * getSignature() = 0;
-  virtual ::java::lang::String * getSigAlgName() = 0;
-  virtual ::java::lang::String * getSigAlgOID() = 0;
-  virtual JArray< jbyte > * getSigAlgParams() = 0;
-  virtual JArray< jboolean > * getIssuerUniqueID() = 0;
-  virtual JArray< jboolean > * getSubjectUniqueID() = 0;
-  virtual JArray< jboolean > * getKeyUsage() = 0;
-  virtual jint getBasicConstraints() = 0;
-  virtual ::java::util::List * getExtendedKeyUsage();
-  virtual ::java::util::Collection * getSubjectAlternativeNames();
-  virtual ::java::util::Collection * getIssuerAlternativeNames();
-  virtual ::javax::security::auth::x500::X500Principal * getSubjectX500Principal();
-  virtual ::javax::security::auth::x500::X500Principal * getIssuerX500Principal();
-  virtual jboolean hasUnsupportedCriticalExtension() = 0;
-  virtual ::java::util::Set * getCriticalExtensionOIDs() = 0;
-  virtual ::java::util::Set * getNonCriticalExtensionOIDs() = 0;
-  virtual JArray< jbyte > * getExtensionValue(::java::lang::String *) = 0;
-private:
-  static const jlong serialVersionUID = -2491127588187038216LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_cert_X509Certificate__
diff --git a/libjava/java/security/cert/X509Extension.h b/libjava/java/security/cert/X509Extension.h
deleted file mode 100644
index 53eb5d1b699..00000000000
--- a/libjava/java/security/cert/X509Extension.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_cert_X509Extension__
-#define __java_security_cert_X509Extension__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Extension;
-      }
-    }
-  }
-}
-
-class java::security::cert::X509Extension : public ::java::lang::Object
-{
-
-public:
-  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 // __java_security_cert_X509Extension__
diff --git a/libjava/java/security/interfaces/DSAKey.h b/libjava/java/security/interfaces/DSAKey.h
deleted file mode 100644
index ee58f377dc1..00000000000
--- a/libjava/java/security/interfaces/DSAKey.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_DSAKey__
-#define __java_security_interfaces_DSAKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace interfaces
-      {
-          class DSAKey;
-          class DSAParams;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::DSAKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::security::interfaces::DSAParams * getParams() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_DSAKey__
diff --git a/libjava/java/security/interfaces/DSAKeyPairGenerator.h b/libjava/java/security/interfaces/DSAKeyPairGenerator.h
deleted file mode 100644
index 424348c80b6..00000000000
--- a/libjava/java/security/interfaces/DSAKeyPairGenerator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_DSAKeyPairGenerator__
-#define __java_security_interfaces_DSAKeyPairGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-      namespace interfaces
-      {
-          class DSAKeyPairGenerator;
-          class DSAParams;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::DSAKeyPairGenerator : public ::java::lang::Object
-{
-
-public:
-  virtual void initialize(::java::security::interfaces::DSAParams *, ::java::security::SecureRandom *) = 0;
-  virtual void initialize(jint, jboolean, ::java::security::SecureRandom *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_DSAKeyPairGenerator__
diff --git a/libjava/java/security/interfaces/DSAParams.h b/libjava/java/security/interfaces/DSAParams.h
deleted file mode 100644
index e6963fb115d..00000000000
--- a/libjava/java/security/interfaces/DSAParams.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_DSAParams__
-#define __java_security_interfaces_DSAParams__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class DSAParams;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::DSAParams : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getG() = 0;
-  virtual ::java::math::BigInteger * getP() = 0;
-  virtual ::java::math::BigInteger * getQ() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_DSAParams__
diff --git a/libjava/java/security/interfaces/DSAPrivateKey.h b/libjava/java/security/interfaces/DSAPrivateKey.h
deleted file mode 100644
index e1fb8e86c6d..00000000000
--- a/libjava/java/security/interfaces/DSAPrivateKey.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_DSAPrivateKey__
-#define __java_security_interfaces_DSAPrivateKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class DSAParams;
-          class DSAPrivateKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::DSAPrivateKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getX() = 0;
-  virtual ::java::security::interfaces::DSAParams * getParams() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 7776497482533790279LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_DSAPrivateKey__
diff --git a/libjava/java/security/interfaces/DSAPublicKey.h b/libjava/java/security/interfaces/DSAPublicKey.h
deleted file mode 100644
index 07916107483..00000000000
--- a/libjava/java/security/interfaces/DSAPublicKey.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_DSAPublicKey__
-#define __java_security_interfaces_DSAPublicKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class DSAParams;
-          class DSAPublicKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::DSAPublicKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getY() = 0;
-  virtual ::java::security::interfaces::DSAParams * getParams() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 1234526332779022332LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_DSAPublicKey__
diff --git a/libjava/java/security/interfaces/RSAKey.h b/libjava/java/security/interfaces/RSAKey.h
deleted file mode 100644
index 76985bdb64f..00000000000
--- a/libjava/java/security/interfaces/RSAKey.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_RSAKey__
-#define __java_security_interfaces_RSAKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::RSAKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getModulus() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_RSAKey__
diff --git a/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.h b/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.h
deleted file mode 100644
index 3e4ff331fbc..00000000000
--- a/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_RSAMultiPrimePrivateCrtKey__
-#define __java_security_interfaces_RSAMultiPrimePrivateCrtKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAMultiPrimePrivateCrtKey;
-      }
-      namespace spec
-      {
-          class RSAOtherPrimeInfo;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::RSAMultiPrimePrivateCrtKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getPublicExponent() = 0;
-  virtual ::java::math::BigInteger * getPrimeP() = 0;
-  virtual ::java::math::BigInteger * getPrimeQ() = 0;
-  virtual ::java::math::BigInteger * getPrimeExponentP() = 0;
-  virtual ::java::math::BigInteger * getPrimeExponentQ() = 0;
-  virtual ::java::math::BigInteger * getCrtCoefficient() = 0;
-  virtual JArray< ::java::security::spec::RSAOtherPrimeInfo * > * getOtherPrimeInfo() = 0;
-  virtual ::java::math::BigInteger * getPrivateExponent() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual ::java::math::BigInteger * getModulus() = 0;
-  static const jlong serialVersionUID = 618058533534628008LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_RSAMultiPrimePrivateCrtKey__
diff --git a/libjava/java/security/interfaces/RSAPrivateCrtKey.h b/libjava/java/security/interfaces/RSAPrivateCrtKey.h
deleted file mode 100644
index 7c6943d4342..00000000000
--- a/libjava/java/security/interfaces/RSAPrivateCrtKey.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_RSAPrivateCrtKey__
-#define __java_security_interfaces_RSAPrivateCrtKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAPrivateCrtKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::RSAPrivateCrtKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getPublicExponent() = 0;
-  virtual ::java::math::BigInteger * getPrimeP() = 0;
-  virtual ::java::math::BigInteger * getPrimeQ() = 0;
-  virtual ::java::math::BigInteger * getPrimeExponentP() = 0;
-  virtual ::java::math::BigInteger * getPrimeExponentQ() = 0;
-  virtual ::java::math::BigInteger * getCrtCoefficient() = 0;
-  virtual ::java::math::BigInteger * getPrivateExponent() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual ::java::math::BigInteger * getModulus() = 0;
-  static const jlong serialVersionUID = -5682214253527700368LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_RSAPrivateCrtKey__
diff --git a/libjava/java/security/interfaces/RSAPrivateKey.h b/libjava/java/security/interfaces/RSAPrivateKey.h
deleted file mode 100644
index b1e6139789c..00000000000
--- a/libjava/java/security/interfaces/RSAPrivateKey.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_RSAPrivateKey__
-#define __java_security_interfaces_RSAPrivateKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAPrivateKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::RSAPrivateKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getPrivateExponent() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual ::java::math::BigInteger * getModulus() = 0;
-  static const jlong serialVersionUID = 5187144804936595022LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_RSAPrivateKey__
diff --git a/libjava/java/security/interfaces/RSAPublicKey.h b/libjava/java/security/interfaces/RSAPublicKey.h
deleted file mode 100644
index d2cd7e7031c..00000000000
--- a/libjava/java/security/interfaces/RSAPublicKey.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_interfaces_RSAPublicKey__
-#define __java_security_interfaces_RSAPublicKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace interfaces
-      {
-          class RSAPublicKey;
-      }
-    }
-  }
-}
-
-class java::security::interfaces::RSAPublicKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getPublicExponent() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual ::java::math::BigInteger * getModulus() = 0;
-  static const jlong serialVersionUID = -8727434096241101194LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_interfaces_RSAPublicKey__
diff --git a/libjava/java/security/spec/AlgorithmParameterSpec.h b/libjava/java/security/spec/AlgorithmParameterSpec.h
deleted file mode 100644
index 9fa07b0a3bc..00000000000
--- a/libjava/java/security/spec/AlgorithmParameterSpec.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_AlgorithmParameterSpec__
-#define __java_security_spec_AlgorithmParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::AlgorithmParameterSpec : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_spec_AlgorithmParameterSpec__
diff --git a/libjava/java/security/spec/DSAParameterSpec.h b/libjava/java/security/spec/DSAParameterSpec.h
deleted file mode 100644
index 83a2cb8ec01..00000000000
--- a/libjava/java/security/spec/DSAParameterSpec.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_DSAParameterSpec__
-#define __java_security_spec_DSAParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class DSAParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::DSAParameterSpec : public ::java::lang::Object
-{
-
-public:
-  DSAParameterSpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getP();
-  virtual ::java::math::BigInteger * getQ();
-  virtual ::java::math::BigInteger * getG();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * g;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_DSAParameterSpec__
diff --git a/libjava/java/security/spec/DSAPrivateKeySpec.h b/libjava/java/security/spec/DSAPrivateKeySpec.h
deleted file mode 100644
index fe1cae312a4..00000000000
--- a/libjava/java/security/spec/DSAPrivateKeySpec.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_DSAPrivateKeySpec__
-#define __java_security_spec_DSAPrivateKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class DSAPrivateKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::DSAPrivateKeySpec : public ::java::lang::Object
-{
-
-public:
-  DSAPrivateKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getX();
-  virtual ::java::math::BigInteger * getP();
-  virtual ::java::math::BigInteger * getQ();
-  virtual ::java::math::BigInteger * getG();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * g;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_DSAPrivateKeySpec__
diff --git a/libjava/java/security/spec/DSAPublicKeySpec.h b/libjava/java/security/spec/DSAPublicKeySpec.h
deleted file mode 100644
index aa0cc5c2ac5..00000000000
--- a/libjava/java/security/spec/DSAPublicKeySpec.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_DSAPublicKeySpec__
-#define __java_security_spec_DSAPublicKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class DSAPublicKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::DSAPublicKeySpec : public ::java::lang::Object
-{
-
-public:
-  DSAPublicKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getY();
-  virtual ::java::math::BigInteger * getP();
-  virtual ::java::math::BigInteger * getQ();
-  virtual ::java::math::BigInteger * getG();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) y;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * q;
-  ::java::math::BigInteger * g;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_DSAPublicKeySpec__
diff --git a/libjava/java/security/spec/EncodedKeySpec.h b/libjava/java/security/spec/EncodedKeySpec.h
deleted file mode 100644
index bc913b1e568..00000000000
--- a/libjava/java/security/spec/EncodedKeySpec.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_EncodedKeySpec__
-#define __java_security_spec_EncodedKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class EncodedKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::EncodedKeySpec : public ::java::lang::Object
-{
-
-public:
-  EncodedKeySpec(JArray< jbyte > *);
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat() = 0;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) encodedKey;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_EncodedKeySpec__
diff --git a/libjava/java/security/spec/InvalidKeySpecException.h b/libjava/java/security/spec/InvalidKeySpecException.h
deleted file mode 100644
index ff2ea69fef3..00000000000
--- a/libjava/java/security/spec/InvalidKeySpecException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_InvalidKeySpecException__
-#define __java_security_spec_InvalidKeySpecException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class InvalidKeySpecException;
-      }
-    }
-  }
-}
-
-class java::security::spec::InvalidKeySpecException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  InvalidKeySpecException();
-  InvalidKeySpecException(::java::lang::String *);
-  InvalidKeySpecException(::java::lang::String *, ::java::lang::Throwable *);
-  InvalidKeySpecException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 3546139293998810778LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_InvalidKeySpecException__
diff --git a/libjava/java/security/spec/InvalidParameterSpecException.h b/libjava/java/security/spec/InvalidParameterSpecException.h
deleted file mode 100644
index e80550debc2..00000000000
--- a/libjava/java/security/spec/InvalidParameterSpecException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_InvalidParameterSpecException__
-#define __java_security_spec_InvalidParameterSpecException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class InvalidParameterSpecException;
-      }
-    }
-  }
-}
-
-class java::security::spec::InvalidParameterSpecException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  InvalidParameterSpecException();
-  InvalidParameterSpecException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -970468769593399342LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_InvalidParameterSpecException__
diff --git a/libjava/java/security/spec/KeySpec.h b/libjava/java/security/spec/KeySpec.h
deleted file mode 100644
index cdb7b40cfb4..00000000000
--- a/libjava/java/security/spec/KeySpec.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_KeySpec__
-#define __java_security_spec_KeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::KeySpec : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_security_spec_KeySpec__
diff --git a/libjava/java/security/spec/PKCS8EncodedKeySpec.h b/libjava/java/security/spec/PKCS8EncodedKeySpec.h
deleted file mode 100644
index 20e7007e139..00000000000
--- a/libjava/java/security/spec/PKCS8EncodedKeySpec.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_PKCS8EncodedKeySpec__
-#define __java_security_spec_PKCS8EncodedKeySpec__
-
-#pragma interface
-
-#include <java/security/spec/EncodedKeySpec.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class PKCS8EncodedKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::PKCS8EncodedKeySpec : public ::java::security::spec::EncodedKeySpec
-{
-
-public:
-  PKCS8EncodedKeySpec(JArray< jbyte > *);
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_PKCS8EncodedKeySpec__
diff --git a/libjava/java/security/spec/PSSParameterSpec.h b/libjava/java/security/spec/PSSParameterSpec.h
deleted file mode 100644
index 01253a2ca05..00000000000
--- a/libjava/java/security/spec/PSSParameterSpec.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_PSSParameterSpec__
-#define __java_security_spec_PSSParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class PSSParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::PSSParameterSpec : public ::java::lang::Object
-{
-
-public:
-  PSSParameterSpec(jint);
-  virtual jint getSaltLength();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) saltLen;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_PSSParameterSpec__
diff --git a/libjava/java/security/spec/RSAKeyGenParameterSpec.h b/libjava/java/security/spec/RSAKeyGenParameterSpec.h
deleted file mode 100644
index a047dd668e6..00000000000
--- a/libjava/java/security/spec/RSAKeyGenParameterSpec.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAKeyGenParameterSpec__
-#define __java_security_spec_RSAKeyGenParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAKeyGenParameterSpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAKeyGenParameterSpec : public ::java::lang::Object
-{
-
-public:
-  RSAKeyGenParameterSpec(jint, ::java::math::BigInteger *);
-  virtual jint getKeysize();
-  virtual ::java::math::BigInteger * getPublicExponent();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) keysize;
-  ::java::math::BigInteger * publicExponent;
-public:
-  static ::java::math::BigInteger * F0;
-  static ::java::math::BigInteger * F4;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAKeyGenParameterSpec__
diff --git a/libjava/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.h b/libjava/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.h
deleted file mode 100644
index bebb3d3a9e8..00000000000
--- a/libjava/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAMultiPrimePrivateCrtKeySpec__
-#define __java_security_spec_RSAMultiPrimePrivateCrtKeySpec__
-
-#pragma interface
-
-#include <java/security/spec/RSAPrivateKeySpec.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAMultiPrimePrivateCrtKeySpec;
-          class RSAOtherPrimeInfo;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAMultiPrimePrivateCrtKeySpec : public ::java::security::spec::RSAPrivateKeySpec
-{
-
-public:
-  RSAMultiPrimePrivateCrtKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, JArray< ::java::security::spec::RSAOtherPrimeInfo * > *);
-  virtual ::java::math::BigInteger * getPublicExponent();
-  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 JArray< ::java::security::spec::RSAOtherPrimeInfo * > * getOtherPrimeInfo();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::security::spec::RSAPrivateKeySpec)))) publicExponent;
-  ::java::math::BigInteger * primeP;
-  ::java::math::BigInteger * primeQ;
-  ::java::math::BigInteger * primeExponentP;
-  ::java::math::BigInteger * primeExponentQ;
-  ::java::math::BigInteger * crtCoefficient;
-  JArray< ::java::security::spec::RSAOtherPrimeInfo * > * otherPrimeInfo;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAMultiPrimePrivateCrtKeySpec__
diff --git a/libjava/java/security/spec/RSAOtherPrimeInfo.h b/libjava/java/security/spec/RSAOtherPrimeInfo.h
deleted file mode 100644
index 878e3e58e04..00000000000
--- a/libjava/java/security/spec/RSAOtherPrimeInfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAOtherPrimeInfo__
-#define __java_security_spec_RSAOtherPrimeInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAOtherPrimeInfo;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAOtherPrimeInfo : public ::java::lang::Object
-{
-
-public:
-  RSAOtherPrimeInfo(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getPrime();
-  virtual ::java::math::BigInteger * getExponent();
-  virtual ::java::math::BigInteger * getCrtCoefficient();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prime;
-  ::java::math::BigInteger * primeExponent;
-  ::java::math::BigInteger * crtCoefficient;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAOtherPrimeInfo__
diff --git a/libjava/java/security/spec/RSAPrivateCrtKeySpec.h b/libjava/java/security/spec/RSAPrivateCrtKeySpec.h
deleted file mode 100644
index 4f25ac6789e..00000000000
--- a/libjava/java/security/spec/RSAPrivateCrtKeySpec.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAPrivateCrtKeySpec__
-#define __java_security_spec_RSAPrivateCrtKeySpec__
-
-#pragma interface
-
-#include <java/security/spec/RSAPrivateKeySpec.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAPrivateCrtKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAPrivateCrtKeySpec : public ::java::security::spec::RSAPrivateKeySpec
-{
-
-public:
-  RSAPrivateCrtKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getPublicExponent();
-  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();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::security::spec::RSAPrivateKeySpec)))) publicExponent;
-  ::java::math::BigInteger * primeP;
-  ::java::math::BigInteger * primeQ;
-  ::java::math::BigInteger * primeExponentP;
-  ::java::math::BigInteger * primeExponentQ;
-  ::java::math::BigInteger * crtCoefficient;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAPrivateCrtKeySpec__
diff --git a/libjava/java/security/spec/RSAPrivateKeySpec.h b/libjava/java/security/spec/RSAPrivateKeySpec.h
deleted file mode 100644
index 4b0136b45f1..00000000000
--- a/libjava/java/security/spec/RSAPrivateKeySpec.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAPrivateKeySpec__
-#define __java_security_spec_RSAPrivateKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAPrivateKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAPrivateKeySpec : public ::java::lang::Object
-{
-
-public:
-  RSAPrivateKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getModulus();
-  virtual ::java::math::BigInteger * getPrivateExponent();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) modulus;
-  ::java::math::BigInteger * privateExponent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAPrivateKeySpec__
diff --git a/libjava/java/security/spec/RSAPublicKeySpec.h b/libjava/java/security/spec/RSAPublicKeySpec.h
deleted file mode 100644
index d6f80a3160c..00000000000
--- a/libjava/java/security/spec/RSAPublicKeySpec.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_RSAPublicKeySpec__
-#define __java_security_spec_RSAPublicKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-      namespace spec
-      {
-          class RSAPublicKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::RSAPublicKeySpec : public ::java::lang::Object
-{
-
-public:
-  RSAPublicKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getModulus();
-  virtual ::java::math::BigInteger * getPublicExponent();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) modulus;
-  ::java::math::BigInteger * publicExponent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_RSAPublicKeySpec__
diff --git a/libjava/java/security/spec/X509EncodedKeySpec.h b/libjava/java/security/spec/X509EncodedKeySpec.h
deleted file mode 100644
index 426ea1be7b7..00000000000
--- a/libjava/java/security/spec/X509EncodedKeySpec.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_security_spec_X509EncodedKeySpec__
-#define __java_security_spec_X509EncodedKeySpec__
-
-#pragma interface
-
-#include <java/security/spec/EncodedKeySpec.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class X509EncodedKeySpec;
-      }
-    }
-  }
-}
-
-class java::security::spec::X509EncodedKeySpec : public ::java::security::spec::EncodedKeySpec
-{
-
-public:
-  X509EncodedKeySpec(JArray< jbyte > *);
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::java::lang::String * getFormat();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_security_spec_X509EncodedKeySpec__
diff --git a/libjava/java/sql/Array.h b/libjava/java/sql/Array.h
deleted file mode 100644
index 34a1e840cc8..00000000000
--- a/libjava/java/sql/Array.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Array__
-#define __java_sql_Array__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Array;
-        class ResultSet;
-    }
-  }
-}
-
-class java::sql::Array : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getBaseTypeName() = 0;
-  virtual jint getBaseType() = 0;
-  virtual ::java::lang::Object * getArray() = 0;
-  virtual ::java::lang::Object * getArray(::java::util::Map *) = 0;
-  virtual ::java::lang::Object * getArray(jlong, jint) = 0;
-  virtual ::java::lang::Object * getArray(jlong, jint, ::java::util::Map *) = 0;
-  virtual ::java::sql::ResultSet * getResultSet() = 0;
-  virtual ::java::sql::ResultSet * getResultSet(::java::util::Map *) = 0;
-  virtual ::java::sql::ResultSet * getResultSet(jlong, jint) = 0;
-  virtual ::java::sql::ResultSet * getResultSet(jlong, jint, ::java::util::Map *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Array__
diff --git a/libjava/java/sql/BatchUpdateException.h b/libjava/java/sql/BatchUpdateException.h
deleted file mode 100644
index b9d28cf88d9..00000000000
--- a/libjava/java/sql/BatchUpdateException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_BatchUpdateException__
-#define __java_sql_BatchUpdateException__
-
-#pragma interface
-
-#include <java/sql/SQLException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class BatchUpdateException;
-    }
-  }
-}
-
-class java::sql::BatchUpdateException : public ::java::sql::SQLException
-{
-
-public:
-  BatchUpdateException(::java::lang::String *, ::java::lang::String *, jint, JArray< jint > *);
-  BatchUpdateException(::java::lang::String *, ::java::lang::String *, JArray< jint > *);
-  BatchUpdateException(::java::lang::String *, JArray< jint > *);
-  BatchUpdateException(JArray< jint > *);
-  BatchUpdateException();
-  virtual JArray< jint > * getUpdateCounts();
-public: // actually package-private
-  static const jlong serialVersionUID = 5977529877145521757LL;
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::sql::SQLException)))) updateCounts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_BatchUpdateException__
diff --git a/libjava/java/sql/Blob.h b/libjava/java/sql/Blob.h
deleted file mode 100644
index a1b00c2eda0..00000000000
--- a/libjava/java/sql/Blob.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Blob__
-#define __java_sql_Blob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Blob;
-    }
-  }
-}
-
-class java::sql::Blob : public ::java::lang::Object
-{
-
-public:
-  virtual jlong length() = 0;
-  virtual JArray< jbyte > * getBytes(jlong, jint) = 0;
-  virtual ::java::io::InputStream * getBinaryStream() = 0;
-  virtual jlong position(JArray< jbyte > *, jlong) = 0;
-  virtual jlong position(::java::sql::Blob *, jlong) = 0;
-  virtual jint setBytes(jlong, JArray< jbyte > *) = 0;
-  virtual jint setBytes(jlong, JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::io::OutputStream * setBinaryStream(jlong) = 0;
-  virtual void truncate(jlong) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Blob__
diff --git a/libjava/java/sql/CallableStatement.h b/libjava/java/sql/CallableStatement.h
deleted file mode 100644
index 143184e5c8b..00000000000
--- a/libjava/java/sql/CallableStatement.h
+++ /dev/null
@@ -1,203 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_CallableStatement__
-#define __java_sql_CallableStatement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class CallableStatement;
-        class Clob;
-        class Connection;
-        class Date;
-        class ParameterMetaData;
-        class Ref;
-        class ResultSet;
-        class ResultSetMetaData;
-        class SQLWarning;
-        class Time;
-        class Timestamp;
-    }
-  }
-}
-
-class java::sql::CallableStatement : public ::java::lang::Object
-{
-
-public:
-  virtual void registerOutParameter(jint, jint) = 0;
-  virtual void registerOutParameter(jint, jint, jint) = 0;
-  virtual jboolean wasNull() = 0;
-  virtual ::java::lang::String * getString(jint) = 0;
-  virtual jboolean getBoolean(jint) = 0;
-  virtual jbyte getByte(jint) = 0;
-  virtual jshort getShort(jint) = 0;
-  virtual jint getInt(jint) = 0;
-  virtual jlong getLong(jint) = 0;
-  virtual jfloat getFloat(jint) = 0;
-  virtual jdouble getDouble(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint, jint) = 0;
-  virtual JArray< jbyte > * getBytes(jint) = 0;
-  virtual ::java::sql::Date * getDate(jint) = 0;
-  virtual ::java::sql::Time * getTime(jint) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint) = 0;
-  virtual ::java::lang::Object * getObject(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint) = 0;
-  virtual ::java::lang::Object * getObject(jint, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(jint) = 0;
-  virtual ::java::sql::Blob * getBlob(jint) = 0;
-  virtual ::java::sql::Clob * getClob(jint) = 0;
-  virtual ::java::sql::Array * getArray(jint) = 0;
-  virtual ::java::sql::Date * getDate(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint, ::java::util::Calendar *) = 0;
-  virtual void registerOutParameter(jint, jint, ::java::lang::String *) = 0;
-  virtual void registerOutParameter(::java::lang::String *, jint) = 0;
-  virtual void registerOutParameter(::java::lang::String *, jint, jint) = 0;
-  virtual void registerOutParameter(::java::lang::String *, jint, ::java::lang::String *) = 0;
-  virtual ::java::net::URL * getURL(jint) = 0;
-  virtual void setURL(::java::lang::String *, ::java::net::URL *) = 0;
-  virtual void setNull(::java::lang::String *, jint) = 0;
-  virtual void setBoolean(::java::lang::String *, jboolean) = 0;
-  virtual void setByte(::java::lang::String *, jbyte) = 0;
-  virtual void setShort(::java::lang::String *, jshort) = 0;
-  virtual void setInt(::java::lang::String *, jint) = 0;
-  virtual void setLong(::java::lang::String *, jlong) = 0;
-  virtual void setFloat(::java::lang::String *, jfloat) = 0;
-  virtual void setDouble(::java::lang::String *, jdouble) = 0;
-  virtual void setBigDecimal(::java::lang::String *, ::java::math::BigDecimal *) = 0;
-  virtual void setString(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setBytes(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual void setDate(::java::lang::String *, ::java::sql::Date *) = 0;
-  virtual void setTime(::java::lang::String *, ::java::sql::Time *) = 0;
-  virtual void setTimestamp(::java::lang::String *, ::java::sql::Timestamp *) = 0;
-  virtual void setAsciiStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void setBinaryStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void setObject(::java::lang::String *, ::java::lang::Object *, jint, jint) = 0;
-  virtual void setObject(::java::lang::String *, ::java::lang::Object *, jint) = 0;
-  virtual void setObject(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void setCharacterStream(::java::lang::String *, ::java::io::Reader *, jint) = 0;
-  virtual void setDate(::java::lang::String *, ::java::sql::Date *, ::java::util::Calendar *) = 0;
-  virtual void setTime(::java::lang::String *, ::java::sql::Time *, ::java::util::Calendar *) = 0;
-  virtual void setTimestamp(::java::lang::String *, ::java::sql::Timestamp *, ::java::util::Calendar *) = 0;
-  virtual void setNull(::java::lang::String *, jint, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getString(::java::lang::String *) = 0;
-  virtual jboolean getBoolean(::java::lang::String *) = 0;
-  virtual jbyte getByte(::java::lang::String *) = 0;
-  virtual jshort getShort(::java::lang::String *) = 0;
-  virtual jint getInt(::java::lang::String *) = 0;
-  virtual jlong getLong(::java::lang::String *) = 0;
-  virtual jfloat getFloat(::java::lang::String *) = 0;
-  virtual jdouble getDouble(::java::lang::String *) = 0;
-  virtual JArray< jbyte > * getBytes(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(::java::lang::String *) = 0;
-  virtual ::java::sql::Blob * getBlob(::java::lang::String *) = 0;
-  virtual ::java::sql::Clob * getClob(::java::lang::String *) = 0;
-  virtual ::java::sql::Array * getArray(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::net::URL * getURL(::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * executeQuery() = 0;
-  virtual jint executeUpdate() = 0;
-  virtual void setNull(jint, jint) = 0;
-  virtual void setBoolean(jint, jboolean) = 0;
-  virtual void setByte(jint, jbyte) = 0;
-  virtual void setShort(jint, jshort) = 0;
-  virtual void setInt(jint, jint) = 0;
-  virtual void setLong(jint, jlong) = 0;
-  virtual void setFloat(jint, jfloat) = 0;
-  virtual void setDouble(jint, jdouble) = 0;
-  virtual void setBigDecimal(jint, ::java::math::BigDecimal *) = 0;
-  virtual void setString(jint, ::java::lang::String *) = 0;
-  virtual void setBytes(jint, JArray< jbyte > *) = 0;
-  virtual void setDate(jint, ::java::sql::Date *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *) = 0;
-  virtual void setAsciiStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setUnicodeStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setBinaryStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void clearParameters() = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *) = 0;
-  virtual jboolean execute() = 0;
-  virtual void addBatch() = 0;
-  virtual void setCharacterStream(jint, ::java::io::Reader *, jint) = 0;
-  virtual void setRef(jint, ::java::sql::Ref *) = 0;
-  virtual void setBlob(jint, ::java::sql::Blob *) = 0;
-  virtual void setClob(jint, ::java::sql::Clob *) = 0;
-  virtual void setArray(jint, ::java::sql::Array *) = 0;
-  virtual ::java::sql::ResultSetMetaData * getMetaData() = 0;
-  virtual void setDate(jint, ::java::sql::Date *, ::java::util::Calendar *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *, ::java::util::Calendar *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *, ::java::util::Calendar *) = 0;
-  virtual void setNull(jint, jint, ::java::lang::String *) = 0;
-  virtual void setURL(jint, ::java::net::URL *) = 0;
-  virtual ::java::sql::ParameterMetaData * getParameterMetaData() = 0;
-  virtual ::java::sql::ResultSet * executeQuery(::java::lang::String *) = 0;
-  virtual jint executeUpdate(::java::lang::String *) = 0;
-  virtual void close() = 0;
-  virtual jint getMaxFieldSize() = 0;
-  virtual void setMaxFieldSize(jint) = 0;
-  virtual jint getMaxRows() = 0;
-  virtual void setMaxRows(jint) = 0;
-  virtual void setEscapeProcessing(jboolean) = 0;
-  virtual jint getQueryTimeout() = 0;
-  virtual void setQueryTimeout(jint) = 0;
-  virtual void cancel() = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual void setCursorName(::java::lang::String *) = 0;
-  virtual jboolean execute(::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getResultSet() = 0;
-  virtual jint getUpdateCount() = 0;
-  virtual jboolean getMoreResults() = 0;
-  virtual void setFetchDirection(jint) = 0;
-  virtual jint getFetchDirection() = 0;
-  virtual void setFetchSize(jint) = 0;
-  virtual jint getFetchSize() = 0;
-  virtual jint getResultSetConcurrency() = 0;
-  virtual jint getResultSetType() = 0;
-  virtual void addBatch(::java::lang::String *) = 0;
-  virtual void clearBatch() = 0;
-  virtual JArray< jint > * executeBatch() = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual jboolean getMoreResults(jint) = 0;
-  virtual ::java::sql::ResultSet * getGeneratedKeys() = 0;
-  virtual jint executeUpdate(::java::lang::String *, jint) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean execute(::java::lang::String *, jint) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jint getResultSetHoldability() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_CallableStatement__
diff --git a/libjava/java/sql/Clob.h b/libjava/java/sql/Clob.h
deleted file mode 100644
index a402a030861..00000000000
--- a/libjava/java/sql/Clob.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Clob__
-#define __java_sql_Clob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Clob;
-    }
-  }
-}
-
-class java::sql::Clob : public ::java::lang::Object
-{
-
-public:
-  virtual jlong length() = 0;
-  virtual ::java::lang::String * getSubString(jlong, jint) = 0;
-  virtual ::java::io::Reader * getCharacterStream() = 0;
-  virtual ::java::io::InputStream * getAsciiStream() = 0;
-  virtual jlong position(::java::lang::String *, jlong) = 0;
-  virtual jlong position(::java::sql::Clob *, jlong) = 0;
-  virtual jint setString(jlong, ::java::lang::String *) = 0;
-  virtual jint setString(jlong, ::java::lang::String *, jint, jint) = 0;
-  virtual ::java::io::OutputStream * setAsciiStream(jlong) = 0;
-  virtual ::java::io::Writer * setCharacterStream(jlong) = 0;
-  virtual void truncate(jlong) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Clob__
diff --git a/libjava/java/sql/Connection.h b/libjava/java/sql/Connection.h
deleted file mode 100644
index 3ce236fc84a..00000000000
--- a/libjava/java/sql/Connection.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Connection__
-#define __java_sql_Connection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class CallableStatement;
-        class Connection;
-        class DatabaseMetaData;
-        class PreparedStatement;
-        class SQLWarning;
-        class Savepoint;
-        class Statement;
-    }
-  }
-}
-
-class java::sql::Connection : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::Statement * createStatement() = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *) = 0;
-  virtual ::java::sql::CallableStatement * prepareCall(::java::lang::String *) = 0;
-  virtual ::java::lang::String * nativeSQL(::java::lang::String *) = 0;
-  virtual void setAutoCommit(jboolean) = 0;
-  virtual jboolean getAutoCommit() = 0;
-  virtual void commit() = 0;
-  virtual void rollback() = 0;
-  virtual void close() = 0;
-  virtual jboolean isClosed() = 0;
-  virtual ::java::sql::DatabaseMetaData * getMetaData() = 0;
-  virtual void setReadOnly(jboolean) = 0;
-  virtual jboolean isReadOnly() = 0;
-  virtual void setCatalog(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCatalog() = 0;
-  virtual void setTransactionIsolation(jint) = 0;
-  virtual jint getTransactionIsolation() = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual ::java::sql::Statement * createStatement(jint, jint) = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *, jint, jint) = 0;
-  virtual ::java::sql::CallableStatement * prepareCall(::java::lang::String *, jint, jint) = 0;
-  virtual ::java::util::Map * getTypeMap() = 0;
-  virtual void setTypeMap(::java::util::Map *) = 0;
-  virtual void setHoldability(jint) = 0;
-  virtual jint getHoldability() = 0;
-  virtual ::java::sql::Savepoint * setSavepoint() = 0;
-  virtual ::java::sql::Savepoint * setSavepoint(::java::lang::String *) = 0;
-  virtual void rollback(::java::sql::Savepoint *) = 0;
-  virtual void releaseSavepoint(::java::sql::Savepoint *) = 0;
-  virtual ::java::sql::Statement * createStatement(jint, jint, jint) = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *, jint, jint, jint) = 0;
-  virtual ::java::sql::CallableStatement * prepareCall(::java::lang::String *, jint, jint, jint) = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *, jint) = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *, JArray< jint > *) = 0;
-  virtual ::java::sql::PreparedStatement * prepareStatement(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  static const jint TRANSACTION_NONE = 0;
-  static const jint TRANSACTION_READ_UNCOMMITTED = 1;
-  static const jint TRANSACTION_READ_COMMITTED = 2;
-  static const jint TRANSACTION_REPEATABLE_READ = 4;
-  static const jint TRANSACTION_SERIALIZABLE = 8;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Connection__
diff --git a/libjava/java/sql/DataTruncation.h b/libjava/java/sql/DataTruncation.h
deleted file mode 100644
index 584c65bcf48..00000000000
--- a/libjava/java/sql/DataTruncation.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_DataTruncation__
-#define __java_sql_DataTruncation__
-
-#pragma interface
-
-#include <java/sql/SQLWarning.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class DataTruncation;
-    }
-  }
-}
-
-class java::sql::DataTruncation : public ::java::sql::SQLWarning
-{
-
-public:
-  DataTruncation(jint, jboolean, jboolean, jint, jint);
-  virtual jint getIndex();
-  virtual jboolean getParameter();
-  virtual jboolean getRead();
-  virtual jint getDataSize();
-  virtual jint getTransferSize();
-public: // actually package-private
-  static const jlong serialVersionUID = 6464298989504059473LL;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::sql::SQLWarning)))) dataSize;
-  jint index;
-  jboolean parameter;
-  jboolean read;
-  jint transferSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_DataTruncation__
diff --git a/libjava/java/sql/DatabaseMetaData.h b/libjava/java/sql/DatabaseMetaData.h
deleted file mode 100644
index 0d1feb748ca..00000000000
--- a/libjava/java/sql/DatabaseMetaData.h
+++ /dev/null
@@ -1,245 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_DatabaseMetaData__
-#define __java_sql_DatabaseMetaData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-        class DatabaseMetaData;
-        class ResultSet;
-    }
-  }
-}
-
-class java::sql::DatabaseMetaData : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean allProceduresAreCallable() = 0;
-  virtual jboolean allTablesAreSelectable() = 0;
-  virtual ::java::lang::String * getURL() = 0;
-  virtual ::java::lang::String * getUserName() = 0;
-  virtual jboolean isReadOnly() = 0;
-  virtual jboolean nullsAreSortedHigh() = 0;
-  virtual jboolean nullsAreSortedLow() = 0;
-  virtual jboolean nullsAreSortedAtStart() = 0;
-  virtual jboolean nullsAreSortedAtEnd() = 0;
-  virtual ::java::lang::String * getDatabaseProductName() = 0;
-  virtual ::java::lang::String * getDatabaseProductVersion() = 0;
-  virtual ::java::lang::String * getDriverName() = 0;
-  virtual ::java::lang::String * getDriverVersion() = 0;
-  virtual jint getDriverMajorVersion() = 0;
-  virtual jint getDriverMinorVersion() = 0;
-  virtual jboolean usesLocalFiles() = 0;
-  virtual jboolean usesLocalFilePerTable() = 0;
-  virtual jboolean supportsMixedCaseIdentifiers() = 0;
-  virtual jboolean storesUpperCaseIdentifiers() = 0;
-  virtual jboolean storesLowerCaseIdentifiers() = 0;
-  virtual jboolean storesMixedCaseIdentifiers() = 0;
-  virtual jboolean supportsMixedCaseQuotedIdentifiers() = 0;
-  virtual jboolean storesUpperCaseQuotedIdentifiers() = 0;
-  virtual jboolean storesLowerCaseQuotedIdentifiers() = 0;
-  virtual jboolean storesMixedCaseQuotedIdentifiers() = 0;
-  virtual ::java::lang::String * getIdentifierQuoteString() = 0;
-  virtual ::java::lang::String * getSQLKeywords() = 0;
-  virtual ::java::lang::String * getNumericFunctions() = 0;
-  virtual ::java::lang::String * getStringFunctions() = 0;
-  virtual ::java::lang::String * getSystemFunctions() = 0;
-  virtual ::java::lang::String * getTimeDateFunctions() = 0;
-  virtual ::java::lang::String * getSearchStringEscape() = 0;
-  virtual ::java::lang::String * getExtraNameCharacters() = 0;
-  virtual jboolean supportsAlterTableWithAddColumn() = 0;
-  virtual jboolean supportsAlterTableWithDropColumn() = 0;
-  virtual jboolean supportsColumnAliasing() = 0;
-  virtual jboolean nullPlusNonNullIsNull() = 0;
-  virtual jboolean supportsConvert() = 0;
-  virtual jboolean supportsConvert(jint, jint) = 0;
-  virtual jboolean supportsTableCorrelationNames() = 0;
-  virtual jboolean supportsDifferentTableCorrelationNames() = 0;
-  virtual jboolean supportsExpressionsInOrderBy() = 0;
-  virtual jboolean supportsOrderByUnrelated() = 0;
-  virtual jboolean supportsGroupBy() = 0;
-  virtual jboolean supportsGroupByUnrelated() = 0;
-  virtual jboolean supportsGroupByBeyondSelect() = 0;
-  virtual jboolean supportsLikeEscapeClause() = 0;
-  virtual jboolean supportsMultipleResultSets() = 0;
-  virtual jboolean supportsMultipleTransactions() = 0;
-  virtual jboolean supportsNonNullableColumns() = 0;
-  virtual jboolean supportsMinimumSQLGrammar() = 0;
-  virtual jboolean supportsCoreSQLGrammar() = 0;
-  virtual jboolean supportsExtendedSQLGrammar() = 0;
-  virtual jboolean supportsANSI92EntryLevelSQL() = 0;
-  virtual jboolean supportsANSI92IntermediateSQL() = 0;
-  virtual jboolean supportsANSI92FullSQL() = 0;
-  virtual jboolean supportsIntegrityEnhancementFacility() = 0;
-  virtual jboolean supportsOuterJoins() = 0;
-  virtual jboolean supportsFullOuterJoins() = 0;
-  virtual jboolean supportsLimitedOuterJoins() = 0;
-  virtual ::java::lang::String * getSchemaTerm() = 0;
-  virtual ::java::lang::String * getProcedureTerm() = 0;
-  virtual ::java::lang::String * getCatalogTerm() = 0;
-  virtual jboolean isCatalogAtStart() = 0;
-  virtual ::java::lang::String * getCatalogSeparator() = 0;
-  virtual jboolean supportsSchemasInDataManipulation() = 0;
-  virtual jboolean supportsSchemasInProcedureCalls() = 0;
-  virtual jboolean supportsSchemasInTableDefinitions() = 0;
-  virtual jboolean supportsSchemasInIndexDefinitions() = 0;
-  virtual jboolean supportsSchemasInPrivilegeDefinitions() = 0;
-  virtual jboolean supportsCatalogsInDataManipulation() = 0;
-  virtual jboolean supportsCatalogsInProcedureCalls() = 0;
-  virtual jboolean supportsCatalogsInTableDefinitions() = 0;
-  virtual jboolean supportsCatalogsInIndexDefinitions() = 0;
-  virtual jboolean supportsCatalogsInPrivilegeDefinitions() = 0;
-  virtual jboolean supportsPositionedDelete() = 0;
-  virtual jboolean supportsPositionedUpdate() = 0;
-  virtual jboolean supportsSelectForUpdate() = 0;
-  virtual jboolean supportsStoredProcedures() = 0;
-  virtual jboolean supportsSubqueriesInComparisons() = 0;
-  virtual jboolean supportsSubqueriesInExists() = 0;
-  virtual jboolean supportsSubqueriesInIns() = 0;
-  virtual jboolean supportsSubqueriesInQuantifieds() = 0;
-  virtual jboolean supportsCorrelatedSubqueries() = 0;
-  virtual jboolean supportsUnion() = 0;
-  virtual jboolean supportsUnionAll() = 0;
-  virtual jboolean supportsOpenCursorsAcrossCommit() = 0;
-  virtual jboolean supportsOpenCursorsAcrossRollback() = 0;
-  virtual jboolean supportsOpenStatementsAcrossCommit() = 0;
-  virtual jboolean supportsOpenStatementsAcrossRollback() = 0;
-  virtual jint getMaxBinaryLiteralLength() = 0;
-  virtual jint getMaxCharLiteralLength() = 0;
-  virtual jint getMaxColumnNameLength() = 0;
-  virtual jint getMaxColumnsInGroupBy() = 0;
-  virtual jint getMaxColumnsInIndex() = 0;
-  virtual jint getMaxColumnsInOrderBy() = 0;
-  virtual jint getMaxColumnsInSelect() = 0;
-  virtual jint getMaxColumnsInTable() = 0;
-  virtual jint getMaxConnections() = 0;
-  virtual jint getMaxCursorNameLength() = 0;
-  virtual jint getMaxIndexLength() = 0;
-  virtual jint getMaxSchemaNameLength() = 0;
-  virtual jint getMaxProcedureNameLength() = 0;
-  virtual jint getMaxCatalogNameLength() = 0;
-  virtual jint getMaxRowSize() = 0;
-  virtual jboolean doesMaxRowSizeIncludeBlobs() = 0;
-  virtual jint getMaxStatementLength() = 0;
-  virtual jint getMaxStatements() = 0;
-  virtual jint getMaxTableNameLength() = 0;
-  virtual jint getMaxTablesInSelect() = 0;
-  virtual jint getMaxUserNameLength() = 0;
-  virtual jint getDefaultTransactionIsolation() = 0;
-  virtual jboolean supportsTransactions() = 0;
-  virtual jboolean supportsTransactionIsolationLevel(jint) = 0;
-  virtual jboolean supportsDataDefinitionAndDataManipulationTransactions() = 0;
-  virtual jboolean supportsDataManipulationTransactionsOnly() = 0;
-  virtual jboolean dataDefinitionCausesTransactionCommit() = 0;
-  virtual jboolean dataDefinitionIgnoredInTransactions() = 0;
-  virtual ::java::sql::ResultSet * getProcedures(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getProcedureColumns(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getTables(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::sql::ResultSet * getSchemas() = 0;
-  virtual ::java::sql::ResultSet * getCatalogs() = 0;
-  virtual ::java::sql::ResultSet * getTableTypes() = 0;
-  virtual ::java::sql::ResultSet * getColumns(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getColumnPrivileges(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getTablePrivileges(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getBestRowIdentifier(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jint, jboolean) = 0;
-  virtual ::java::sql::ResultSet * getVersionColumns(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getPrimaryKeys(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getImportedKeys(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getExportedKeys(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getCrossReference(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getTypeInfo() = 0;
-  virtual ::java::sql::ResultSet * getIndexInfo(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean) = 0;
-  virtual jboolean supportsResultSetType(jint) = 0;
-  virtual jboolean supportsResultSetConcurrency(jint, jint) = 0;
-  virtual jboolean ownUpdatesAreVisible(jint) = 0;
-  virtual jboolean ownDeletesAreVisible(jint) = 0;
-  virtual jboolean ownInsertsAreVisible(jint) = 0;
-  virtual jboolean othersUpdatesAreVisible(jint) = 0;
-  virtual jboolean othersDeletesAreVisible(jint) = 0;
-  virtual jboolean othersInsertsAreVisible(jint) = 0;
-  virtual jboolean updatesAreDetected(jint) = 0;
-  virtual jboolean deletesAreDetected(jint) = 0;
-  virtual jboolean insertsAreDetected(jint) = 0;
-  virtual jboolean supportsBatchUpdates() = 0;
-  virtual ::java::sql::ResultSet * getUDTs(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< jint > *) = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual jboolean supportsSavepoints() = 0;
-  virtual jboolean supportsNamedParameters() = 0;
-  virtual jboolean supportsMultipleOpenResults() = 0;
-  virtual jboolean supportsGetGeneratedKeys() = 0;
-  virtual ::java::sql::ResultSet * getSuperTypes(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getSuperTables(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getAttributes(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean supportsResultSetHoldability(jint) = 0;
-  virtual jint getResultSetHoldability() = 0;
-  virtual jint getDatabaseMajorVersion() = 0;
-  virtual jint getDatabaseMinorVersion() = 0;
-  virtual jint getJDBCMajorVersion() = 0;
-  virtual jint getJDBCMinorVersion() = 0;
-  virtual jint getSQLStateType() = 0;
-  virtual jboolean locatorsUpdateCopy() = 0;
-  virtual jboolean supportsStatementPooling() = 0;
-  static const jint procedureResultUnknown = 0;
-  static const jint procedureNoResult = 1;
-  static const jint procedureReturnsResult = 2;
-  static const jint procedureColumnUnknown = 0;
-  static const jint procedureColumnIn = 1;
-  static const jint procedureColumnInOut = 2;
-  static const jint procedureColumnOut = 4;
-  static const jint procedureColumnReturn = 5;
-  static const jint procedureColumnResult = 3;
-  static const jint procedureNoNulls = 0;
-  static const jint procedureNullable = 1;
-  static const jint procedureNullableUnknown = 2;
-  static const jint columnNoNulls = 0;
-  static const jint columnNullable = 1;
-  static const jint columnNullableUnknown = 2;
-  static const jint bestRowTemporary = 0;
-  static const jint bestRowTransaction = 1;
-  static const jint bestRowSession = 2;
-  static const jint bestRowUnknown = 0;
-  static const jint bestRowNotPseudo = 1;
-  static const jint bestRowPseudo = 2;
-  static const jint versionColumnUnknown = 0;
-  static const jint versionColumnNotPseudo = 1;
-  static const jint versionColumnPseudo = 2;
-  static const jint importedKeyCascade = 0;
-  static const jint importedKeyRestrict = 1;
-  static const jint importedKeySetNull = 2;
-  static const jint importedKeyNoAction = 3;
-  static const jint importedKeySetDefault = 4;
-  static const jint importedKeyInitiallyDeferred = 5;
-  static const jint importedKeyInitiallyImmediate = 6;
-  static const jint importedKeyNotDeferrable = 7;
-  static const jint typeNoNulls = 0;
-  static const jint typeNullable = 1;
-  static const jint typeNullableUnknown = 2;
-  static const jint typePredNone = 0;
-  static const jint typePredChar = 1;
-  static const jint typePredBasic = 2;
-  static const jint typeSearchable = 3;
-  static const jshort tableIndexStatistic = 0;
-  static const jshort tableIndexClustered = 1;
-  static const jshort tableIndexHashed = 2;
-  static const jshort tableIndexOther = 3;
-  static const jshort attributeNoNulls = 0;
-  static const jshort attributeNullable = 1;
-  static const jshort attributeNullableUnknown = 2;
-  static const jint sqlStateXOpen = 1;
-  static const jint sqlStateSQL99 = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_DatabaseMetaData__
diff --git a/libjava/java/sql/Date.h b/libjava/java/sql/Date.h
deleted file mode 100644
index 8a7939b3102..00000000000
--- a/libjava/java/sql/Date.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Date__
-#define __java_sql_Date__
-
-#pragma interface
-
-#include <java/util/Date.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Date;
-    }
-    namespace text
-    {
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class java::sql::Date : public ::java::util::Date
-{
-
-public:
-  Date(jint, jint, jint);
-  Date(jlong);
-  virtual jint getHours();
-  virtual jint getMinutes();
-  virtual jint getSeconds();
-  virtual void setHours(jint);
-  virtual void setMinutes(jint);
-  virtual void setSeconds(jint);
-  static ::java::sql::Date * valueOf(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = 1511598038487230103LL;
-private:
-  static ::java::text::SimpleDateFormat * sdf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_Date__
diff --git a/libjava/java/sql/Driver.h b/libjava/java/sql/Driver.h
deleted file mode 100644
index f9800b06079..00000000000
--- a/libjava/java/sql/Driver.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Driver__
-#define __java_sql_Driver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-        class Driver;
-        class DriverPropertyInfo;
-    }
-  }
-}
-
-class java::sql::Driver : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::Connection * connect(::java::lang::String *, ::java::util::Properties *) = 0;
-  virtual jboolean acceptsURL(::java::lang::String *) = 0;
-  virtual JArray< ::java::sql::DriverPropertyInfo * > * getPropertyInfo(::java::lang::String *, ::java::util::Properties *) = 0;
-  virtual jint getMajorVersion() = 0;
-  virtual jint getMinorVersion() = 0;
-  virtual jboolean jdbcCompliant() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Driver__
diff --git a/libjava/java/sql/DriverManager.h b/libjava/java/sql/DriverManager.h
deleted file mode 100644
index f9d87eabe5b..00000000000
--- a/libjava/java/sql/DriverManager.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_DriverManager__
-#define __java_sql_DriverManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-        class Driver;
-        class DriverManager;
-    }
-  }
-}
-
-class java::sql::DriverManager : public ::java::lang::Object
-{
-
-  DriverManager();
-public:
-  static ::java::io::PrintWriter * getLogWriter();
-  static void setLogWriter(::java::io::PrintWriter *);
-  static ::java::sql::Connection * getConnection(::java::lang::String *, ::java::util::Properties *);
-  static ::java::sql::Connection * getConnection(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static ::java::sql::Connection * getConnection(::java::lang::String *);
-  static ::java::sql::Driver * getDriver(::java::lang::String *);
-  static void registerDriver(::java::sql::Driver *);
-  static void deregisterDriver(::java::sql::Driver *);
-  static ::java::util::Enumeration * getDrivers();
-  static void setLoginTimeout(jint);
-  static jint getLoginTimeout();
-  static void setLogStream(::java::io::PrintStream *);
-  static ::java::io::PrintStream * getLogStream();
-  static void println(::java::lang::String *);
-private:
-  static ::java::io::PrintStream * log_stream;
-  static ::java::io::PrintWriter * log_writer;
-  static jint login_timeout;
-  static ::java::util::Vector * drivers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_DriverManager__
diff --git a/libjava/java/sql/DriverPropertyInfo.h b/libjava/java/sql/DriverPropertyInfo.h
deleted file mode 100644
index 46e21af135b..00000000000
--- a/libjava/java/sql/DriverPropertyInfo.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_DriverPropertyInfo__
-#define __java_sql_DriverPropertyInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class DriverPropertyInfo;
-    }
-  }
-}
-
-class java::sql::DriverPropertyInfo : public ::java::lang::Object
-{
-
-public:
-  DriverPropertyInfo(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * description;
-  jboolean required;
-  ::java::lang::String * value;
-  JArray< ::java::lang::String * > * choices;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_DriverPropertyInfo__
diff --git a/libjava/java/sql/ParameterMetaData.h b/libjava/java/sql/ParameterMetaData.h
deleted file mode 100644
index a377668eae2..00000000000
--- a/libjava/java/sql/ParameterMetaData.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_ParameterMetaData__
-#define __java_sql_ParameterMetaData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class ParameterMetaData;
-    }
-  }
-}
-
-class java::sql::ParameterMetaData : public ::java::lang::Object
-{
-
-public:
-  virtual jint getParameterCount() = 0;
-  virtual jint isNullable(jint) = 0;
-  virtual jboolean isSigned(jint) = 0;
-  virtual jint getPrecision(jint) = 0;
-  virtual jint getScale(jint) = 0;
-  virtual jint getParameterType(jint) = 0;
-  virtual ::java::lang::String * getParameterTypeName(jint) = 0;
-  virtual ::java::lang::String * getParameterClassName(jint) = 0;
-  virtual jint getParameterMode(jint) = 0;
-  static const jint parameterNoNulls = 0;
-  static const jint parameterNullable = 1;
-  static const jint parameterNullableUnknown = 2;
-  static const jint parameterModeUnknown = 0;
-  static const jint parameterModeIn = 1;
-  static const jint parameterModeInOut = 2;
-  static const jint parameterModeOut = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_ParameterMetaData__
diff --git a/libjava/java/sql/PreparedStatement.h b/libjava/java/sql/PreparedStatement.h
deleted file mode 100644
index dcb2e5dea44..00000000000
--- a/libjava/java/sql/PreparedStatement.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_PreparedStatement__
-#define __java_sql_PreparedStatement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class Clob;
-        class Connection;
-        class Date;
-        class ParameterMetaData;
-        class PreparedStatement;
-        class Ref;
-        class ResultSet;
-        class ResultSetMetaData;
-        class SQLWarning;
-        class Time;
-        class Timestamp;
-    }
-  }
-}
-
-class java::sql::PreparedStatement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::ResultSet * executeQuery() = 0;
-  virtual jint executeUpdate() = 0;
-  virtual void setNull(jint, jint) = 0;
-  virtual void setBoolean(jint, jboolean) = 0;
-  virtual void setByte(jint, jbyte) = 0;
-  virtual void setShort(jint, jshort) = 0;
-  virtual void setInt(jint, jint) = 0;
-  virtual void setLong(jint, jlong) = 0;
-  virtual void setFloat(jint, jfloat) = 0;
-  virtual void setDouble(jint, jdouble) = 0;
-  virtual void setBigDecimal(jint, ::java::math::BigDecimal *) = 0;
-  virtual void setString(jint, ::java::lang::String *) = 0;
-  virtual void setBytes(jint, JArray< jbyte > *) = 0;
-  virtual void setDate(jint, ::java::sql::Date *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *) = 0;
-  virtual void setAsciiStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setUnicodeStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setBinaryStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void clearParameters() = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *) = 0;
-  virtual jboolean execute() = 0;
-  virtual void addBatch() = 0;
-  virtual void setCharacterStream(jint, ::java::io::Reader *, jint) = 0;
-  virtual void setRef(jint, ::java::sql::Ref *) = 0;
-  virtual void setBlob(jint, ::java::sql::Blob *) = 0;
-  virtual void setClob(jint, ::java::sql::Clob *) = 0;
-  virtual void setArray(jint, ::java::sql::Array *) = 0;
-  virtual ::java::sql::ResultSetMetaData * getMetaData() = 0;
-  virtual void setDate(jint, ::java::sql::Date *, ::java::util::Calendar *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *, ::java::util::Calendar *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *, ::java::util::Calendar *) = 0;
-  virtual void setNull(jint, jint, ::java::lang::String *) = 0;
-  virtual void setURL(jint, ::java::net::URL *) = 0;
-  virtual ::java::sql::ParameterMetaData * getParameterMetaData() = 0;
-  virtual ::java::sql::ResultSet * executeQuery(::java::lang::String *) = 0;
-  virtual jint executeUpdate(::java::lang::String *) = 0;
-  virtual void close() = 0;
-  virtual jint getMaxFieldSize() = 0;
-  virtual void setMaxFieldSize(jint) = 0;
-  virtual jint getMaxRows() = 0;
-  virtual void setMaxRows(jint) = 0;
-  virtual void setEscapeProcessing(jboolean) = 0;
-  virtual jint getQueryTimeout() = 0;
-  virtual void setQueryTimeout(jint) = 0;
-  virtual void cancel() = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual void setCursorName(::java::lang::String *) = 0;
-  virtual jboolean execute(::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getResultSet() = 0;
-  virtual jint getUpdateCount() = 0;
-  virtual jboolean getMoreResults() = 0;
-  virtual void setFetchDirection(jint) = 0;
-  virtual jint getFetchDirection() = 0;
-  virtual void setFetchSize(jint) = 0;
-  virtual jint getFetchSize() = 0;
-  virtual jint getResultSetConcurrency() = 0;
-  virtual jint getResultSetType() = 0;
-  virtual void addBatch(::java::lang::String *) = 0;
-  virtual void clearBatch() = 0;
-  virtual JArray< jint > * executeBatch() = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual jboolean getMoreResults(jint) = 0;
-  virtual ::java::sql::ResultSet * getGeneratedKeys() = 0;
-  virtual jint executeUpdate(::java::lang::String *, jint) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean execute(::java::lang::String *, jint) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jint getResultSetHoldability() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_PreparedStatement__
diff --git a/libjava/java/sql/Ref.h b/libjava/java/sql/Ref.h
deleted file mode 100644
index 79cfc9a9cf9..00000000000
--- a/libjava/java/sql/Ref.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Ref__
-#define __java_sql_Ref__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Ref;
-    }
-  }
-}
-
-class java::sql::Ref : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getBaseTypeName() = 0;
-  virtual ::java::lang::Object * getObject(::java::util::Map *) = 0;
-  virtual ::java::lang::Object * getObject() = 0;
-  virtual void setObject(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Ref__
diff --git a/libjava/java/sql/ResultSet.h b/libjava/java/sql/ResultSet.h
deleted file mode 100644
index 969c0ecc3e7..00000000000
--- a/libjava/java/sql/ResultSet.h
+++ /dev/null
@@ -1,197 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_ResultSet__
-#define __java_sql_ResultSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class Clob;
-        class Date;
-        class Ref;
-        class ResultSet;
-        class ResultSetMetaData;
-        class SQLWarning;
-        class Statement;
-        class Time;
-        class Timestamp;
-    }
-  }
-}
-
-class java::sql::ResultSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean next() = 0;
-  virtual void close() = 0;
-  virtual jboolean wasNull() = 0;
-  virtual ::java::lang::String * getString(jint) = 0;
-  virtual jboolean getBoolean(jint) = 0;
-  virtual jbyte getByte(jint) = 0;
-  virtual jshort getShort(jint) = 0;
-  virtual jint getInt(jint) = 0;
-  virtual jlong getLong(jint) = 0;
-  virtual jfloat getFloat(jint) = 0;
-  virtual jdouble getDouble(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint, jint) = 0;
-  virtual JArray< jbyte > * getBytes(jint) = 0;
-  virtual ::java::sql::Date * getDate(jint) = 0;
-  virtual ::java::sql::Time * getTime(jint) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint) = 0;
-  virtual ::java::io::InputStream * getAsciiStream(jint) = 0;
-  virtual ::java::io::InputStream * getUnicodeStream(jint) = 0;
-  virtual ::java::io::InputStream * getBinaryStream(jint) = 0;
-  virtual ::java::lang::String * getString(::java::lang::String *) = 0;
-  virtual jboolean getBoolean(::java::lang::String *) = 0;
-  virtual jbyte getByte(::java::lang::String *) = 0;
-  virtual jshort getShort(::java::lang::String *) = 0;
-  virtual jint getInt(::java::lang::String *) = 0;
-  virtual jlong getLong(::java::lang::String *) = 0;
-  virtual jfloat getFloat(::java::lang::String *) = 0;
-  virtual jdouble getDouble(::java::lang::String *) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(::java::lang::String *, jint) = 0;
-  virtual JArray< jbyte > * getBytes(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getAsciiStream(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getUnicodeStream(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getBinaryStream(::java::lang::String *) = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual ::java::lang::String * getCursorName() = 0;
-  virtual ::java::sql::ResultSetMetaData * getMetaData() = 0;
-  virtual ::java::lang::Object * getObject(jint) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *) = 0;
-  virtual jint findColumn(::java::lang::String *) = 0;
-  virtual ::java::io::Reader * getCharacterStream(jint) = 0;
-  virtual ::java::io::Reader * getCharacterStream(::java::lang::String *) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(::java::lang::String *) = 0;
-  virtual jboolean isBeforeFirst() = 0;
-  virtual jboolean isAfterLast() = 0;
-  virtual jboolean isFirst() = 0;
-  virtual jboolean isLast() = 0;
-  virtual void beforeFirst() = 0;
-  virtual void afterLast() = 0;
-  virtual jboolean first() = 0;
-  virtual jboolean last() = 0;
-  virtual jint getRow() = 0;
-  virtual jboolean absolute(jint) = 0;
-  virtual jboolean relative(jint) = 0;
-  virtual jboolean previous() = 0;
-  virtual void setFetchDirection(jint) = 0;
-  virtual jint getFetchDirection() = 0;
-  virtual void setFetchSize(jint) = 0;
-  virtual jint getFetchSize() = 0;
-  virtual jint getType() = 0;
-  virtual jint getConcurrency() = 0;
-  virtual jboolean rowUpdated() = 0;
-  virtual jboolean rowInserted() = 0;
-  virtual jboolean rowDeleted() = 0;
-  virtual void updateNull(jint) = 0;
-  virtual void updateBoolean(jint, jboolean) = 0;
-  virtual void updateByte(jint, jbyte) = 0;
-  virtual void updateShort(jint, jshort) = 0;
-  virtual void updateInt(jint, jint) = 0;
-  virtual void updateLong(jint, jlong) = 0;
-  virtual void updateFloat(jint, jfloat) = 0;
-  virtual void updateDouble(jint, jdouble) = 0;
-  virtual void updateBigDecimal(jint, ::java::math::BigDecimal *) = 0;
-  virtual void updateString(jint, ::java::lang::String *) = 0;
-  virtual void updateBytes(jint, JArray< jbyte > *) = 0;
-  virtual void updateDate(jint, ::java::sql::Date *) = 0;
-  virtual void updateTime(jint, ::java::sql::Time *) = 0;
-  virtual void updateTimestamp(jint, ::java::sql::Timestamp *) = 0;
-  virtual void updateAsciiStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void updateBinaryStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void updateCharacterStream(jint, ::java::io::Reader *, jint) = 0;
-  virtual void updateObject(jint, ::java::lang::Object *, jint) = 0;
-  virtual void updateObject(jint, ::java::lang::Object *) = 0;
-  virtual void updateNull(::java::lang::String *) = 0;
-  virtual void updateBoolean(::java::lang::String *, jboolean) = 0;
-  virtual void updateByte(::java::lang::String *, jbyte) = 0;
-  virtual void updateShort(::java::lang::String *, jshort) = 0;
-  virtual void updateInt(::java::lang::String *, jint) = 0;
-  virtual void updateLong(::java::lang::String *, jlong) = 0;
-  virtual void updateFloat(::java::lang::String *, jfloat) = 0;
-  virtual void updateDouble(::java::lang::String *, jdouble) = 0;
-  virtual void updateBigDecimal(::java::lang::String *, ::java::math::BigDecimal *) = 0;
-  virtual void updateString(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void updateBytes(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual void updateDate(::java::lang::String *, ::java::sql::Date *) = 0;
-  virtual void updateTime(::java::lang::String *, ::java::sql::Time *) = 0;
-  virtual void updateTimestamp(::java::lang::String *, ::java::sql::Timestamp *) = 0;
-  virtual void updateAsciiStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void updateBinaryStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void updateCharacterStream(::java::lang::String *, ::java::io::Reader *, jint) = 0;
-  virtual void updateObject(::java::lang::String *, ::java::lang::Object *, jint) = 0;
-  virtual void updateObject(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void insertRow() = 0;
-  virtual void updateRow() = 0;
-  virtual void deleteRow() = 0;
-  virtual void refreshRow() = 0;
-  virtual void cancelRowUpdates() = 0;
-  virtual void moveToInsertRow() = 0;
-  virtual void moveToCurrentRow() = 0;
-  virtual ::java::sql::Statement * getStatement() = 0;
-  virtual ::java::lang::Object * getObject(jint, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(jint) = 0;
-  virtual ::java::sql::Blob * getBlob(jint) = 0;
-  virtual ::java::sql::Clob * getClob(jint) = 0;
-  virtual ::java::sql::Array * getArray(jint) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(::java::lang::String *) = 0;
-  virtual ::java::sql::Blob * getBlob(::java::lang::String *) = 0;
-  virtual ::java::sql::Clob * getClob(::java::lang::String *) = 0;
-  virtual ::java::sql::Array * getArray(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::net::URL * getURL(jint) = 0;
-  virtual ::java::net::URL * getURL(::java::lang::String *) = 0;
-  virtual void updateRef(jint, ::java::sql::Ref *) = 0;
-  virtual void updateRef(::java::lang::String *, ::java::sql::Ref *) = 0;
-  virtual void updateBlob(jint, ::java::sql::Blob *) = 0;
-  virtual void updateBlob(::java::lang::String *, ::java::sql::Blob *) = 0;
-  virtual void updateClob(jint, ::java::sql::Clob *) = 0;
-  virtual void updateClob(::java::lang::String *, ::java::sql::Clob *) = 0;
-  virtual void updateArray(jint, ::java::sql::Array *) = 0;
-  virtual void updateArray(::java::lang::String *, ::java::sql::Array *) = 0;
-  static const jint FETCH_FORWARD = 1000;
-  static const jint FETCH_REVERSE = 1001;
-  static const jint FETCH_UNKNOWN = 1002;
-  static const jint TYPE_FORWARD_ONLY = 1003;
-  static const jint TYPE_SCROLL_INSENSITIVE = 1004;
-  static const jint TYPE_SCROLL_SENSITIVE = 1005;
-  static const jint CONCUR_READ_ONLY = 1007;
-  static const jint CONCUR_UPDATABLE = 1008;
-  static const jint HOLD_CURSORS_OVER_COMMIT = 1;
-  static const jint CLOSE_CURSORS_AT_COMMIT = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_ResultSet__
diff --git a/libjava/java/sql/ResultSetMetaData.h b/libjava/java/sql/ResultSetMetaData.h
deleted file mode 100644
index d871adee6c6..00000000000
--- a/libjava/java/sql/ResultSetMetaData.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_ResultSetMetaData__
-#define __java_sql_ResultSetMetaData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class ResultSetMetaData;
-    }
-  }
-}
-
-class java::sql::ResultSetMetaData : public ::java::lang::Object
-{
-
-public:
-  virtual jint getColumnCount() = 0;
-  virtual jboolean isAutoIncrement(jint) = 0;
-  virtual jboolean isCaseSensitive(jint) = 0;
-  virtual jboolean isSearchable(jint) = 0;
-  virtual jboolean isCurrency(jint) = 0;
-  virtual jint isNullable(jint) = 0;
-  virtual jboolean isSigned(jint) = 0;
-  virtual jint getColumnDisplaySize(jint) = 0;
-  virtual ::java::lang::String * getColumnLabel(jint) = 0;
-  virtual ::java::lang::String * getColumnName(jint) = 0;
-  virtual ::java::lang::String * getSchemaName(jint) = 0;
-  virtual jint getPrecision(jint) = 0;
-  virtual jint getScale(jint) = 0;
-  virtual ::java::lang::String * getTableName(jint) = 0;
-  virtual ::java::lang::String * getCatalogName(jint) = 0;
-  virtual jint getColumnType(jint) = 0;
-  virtual ::java::lang::String * getColumnTypeName(jint) = 0;
-  virtual jboolean isReadOnly(jint) = 0;
-  virtual jboolean isWritable(jint) = 0;
-  virtual jboolean isDefinitelyWritable(jint) = 0;
-  virtual ::java::lang::String * getColumnClassName(jint) = 0;
-  static const jint columnNoNulls = 0;
-  static const jint columnNullable = 1;
-  static const jint columnNullableUnknown = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_ResultSetMetaData__
diff --git a/libjava/java/sql/SQLData.h b/libjava/java/sql/SQLData.h
deleted file mode 100644
index d63205a7266..00000000000
--- a/libjava/java/sql/SQLData.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLData__
-#define __java_sql_SQLData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class SQLData;
-        class SQLInput;
-        class SQLOutput;
-    }
-  }
-}
-
-class java::sql::SQLData : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getSQLTypeName() = 0;
-  virtual void readSQL(::java::sql::SQLInput *, ::java::lang::String *) = 0;
-  virtual void writeSQL(::java::sql::SQLOutput *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_SQLData__
diff --git a/libjava/java/sql/SQLException.h b/libjava/java/sql/SQLException.h
deleted file mode 100644
index 3f88d94562b..00000000000
--- a/libjava/java/sql/SQLException.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLException__
-#define __java_sql_SQLException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class SQLException;
-    }
-  }
-}
-
-class java::sql::SQLException : public ::java::lang::Exception
-{
-
-public:
-  SQLException(::java::lang::String *, ::java::lang::String *, jint);
-  SQLException(::java::lang::String *, ::java::lang::String *);
-  SQLException(::java::lang::String *);
-  SQLException();
-  virtual ::java::lang::String * getSQLState();
-  virtual jint getErrorCode();
-  virtual ::java::sql::SQLException * getNextException();
-  virtual void setNextException(::java::sql::SQLException *);
-public: // actually package-private
-  static const jlong serialVersionUID = 2135244094396331484LL;
-private:
-  ::java::sql::SQLException * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) next;
-  ::java::lang::String * SQLState;
-  jint vendorCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_SQLException__
diff --git a/libjava/java/sql/SQLInput.h b/libjava/java/sql/SQLInput.h
deleted file mode 100644
index d19ffc03c64..00000000000
--- a/libjava/java/sql/SQLInput.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLInput__
-#define __java_sql_SQLInput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class Clob;
-        class Date;
-        class Ref;
-        class SQLInput;
-        class Time;
-        class Timestamp;
-    }
-  }
-}
-
-class java::sql::SQLInput : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * readString() = 0;
-  virtual jboolean readBoolean() = 0;
-  virtual jbyte readByte() = 0;
-  virtual jshort readShort() = 0;
-  virtual jint readInt() = 0;
-  virtual jlong readLong() = 0;
-  virtual jfloat readFloat() = 0;
-  virtual jdouble readDouble() = 0;
-  virtual ::java::math::BigDecimal * readBigDecimal() = 0;
-  virtual JArray< jbyte > * readBytes() = 0;
-  virtual ::java::sql::Date * readDate() = 0;
-  virtual ::java::sql::Time * readTime() = 0;
-  virtual ::java::sql::Timestamp * readTimestamp() = 0;
-  virtual ::java::io::Reader * readCharacterStream() = 0;
-  virtual ::java::io::InputStream * readAsciiStream() = 0;
-  virtual ::java::io::InputStream * readBinaryStream() = 0;
-  virtual ::java::lang::Object * readObject() = 0;
-  virtual ::java::sql::Ref * readRef() = 0;
-  virtual ::java::sql::Blob * readBlob() = 0;
-  virtual ::java::sql::Clob * readClob() = 0;
-  virtual ::java::sql::Array * readArray() = 0;
-  virtual jboolean wasNull() = 0;
-  virtual ::java::net::URL * readURL() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_SQLInput__
diff --git a/libjava/java/sql/SQLOutput.h b/libjava/java/sql/SQLOutput.h
deleted file mode 100644
index f0be2db5933..00000000000
--- a/libjava/java/sql/SQLOutput.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLOutput__
-#define __java_sql_SQLOutput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class Clob;
-        class Date;
-        class Ref;
-        class SQLData;
-        class SQLOutput;
-        class Struct;
-        class Time;
-        class Timestamp;
-    }
-  }
-}
-
-class java::sql::SQLOutput : public ::java::lang::Object
-{
-
-public:
-  virtual void writeString(::java::lang::String *) = 0;
-  virtual void writeBoolean(jboolean) = 0;
-  virtual void writeByte(jbyte) = 0;
-  virtual void writeShort(jshort) = 0;
-  virtual void writeInt(jint) = 0;
-  virtual void writeLong(jlong) = 0;
-  virtual void writeFloat(jfloat) = 0;
-  virtual void writeDouble(jdouble) = 0;
-  virtual void writeBigDecimal(::java::math::BigDecimal *) = 0;
-  virtual void writeBytes(JArray< jbyte > *) = 0;
-  virtual void writeDate(::java::sql::Date *) = 0;
-  virtual void writeTime(::java::sql::Time *) = 0;
-  virtual void writeTimestamp(::java::sql::Timestamp *) = 0;
-  virtual void writeCharacterStream(::java::io::Reader *) = 0;
-  virtual void writeAsciiStream(::java::io::InputStream *) = 0;
-  virtual void writeBinaryStream(::java::io::InputStream *) = 0;
-  virtual void writeObject(::java::sql::SQLData *) = 0;
-  virtual void writeRef(::java::sql::Ref *) = 0;
-  virtual void writeBlob(::java::sql::Blob *) = 0;
-  virtual void writeClob(::java::sql::Clob *) = 0;
-  virtual void writeStruct(::java::sql::Struct *) = 0;
-  virtual void writeArray(::java::sql::Array *) = 0;
-  virtual void writeURL(::java::net::URL *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_SQLOutput__
diff --git a/libjava/java/sql/SQLPermission.h b/libjava/java/sql/SQLPermission.h
deleted file mode 100644
index a426f31a098..00000000000
--- a/libjava/java/sql/SQLPermission.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLPermission__
-#define __java_sql_SQLPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class SQLPermission;
-    }
-  }
-}
-
-class java::sql::SQLPermission : public ::java::security::BasicPermission
-{
-
-public:
-  SQLPermission(::java::lang::String *);
-  SQLPermission(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_SQLPermission__
diff --git a/libjava/java/sql/SQLWarning.h b/libjava/java/sql/SQLWarning.h
deleted file mode 100644
index 5cb2572ff9f..00000000000
--- a/libjava/java/sql/SQLWarning.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_SQLWarning__
-#define __java_sql_SQLWarning__
-
-#pragma interface
-
-#include <java/sql/SQLException.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class SQLWarning;
-    }
-  }
-}
-
-class java::sql::SQLWarning : public ::java::sql::SQLException
-{
-
-public:
-  SQLWarning(::java::lang::String *, ::java::lang::String *, jint);
-  SQLWarning(::java::lang::String *, ::java::lang::String *);
-  SQLWarning(::java::lang::String *);
-  SQLWarning();
-  virtual ::java::sql::SQLWarning * getNextWarning();
-  virtual void setNextWarning(::java::sql::SQLWarning *);
-public: // actually package-private
-  static const jlong serialVersionUID = 3917336774604784856LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_SQLWarning__
diff --git a/libjava/java/sql/Savepoint.h b/libjava/java/sql/Savepoint.h
deleted file mode 100644
index d22773c9f18..00000000000
--- a/libjava/java/sql/Savepoint.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Savepoint__
-#define __java_sql_Savepoint__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Savepoint;
-    }
-  }
-}
-
-class java::sql::Savepoint : public ::java::lang::Object
-{
-
-public:
-  virtual jint getSavepointId() = 0;
-  virtual ::java::lang::String * getSavepointName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Savepoint__
diff --git a/libjava/java/sql/Statement.h b/libjava/java/sql/Statement.h
deleted file mode 100644
index b4cba44893e..00000000000
--- a/libjava/java/sql/Statement.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Statement__
-#define __java_sql_Statement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-        class ResultSet;
-        class SQLWarning;
-        class Statement;
-    }
-  }
-}
-
-class java::sql::Statement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::ResultSet * executeQuery(::java::lang::String *) = 0;
-  virtual jint executeUpdate(::java::lang::String *) = 0;
-  virtual void close() = 0;
-  virtual jint getMaxFieldSize() = 0;
-  virtual void setMaxFieldSize(jint) = 0;
-  virtual jint getMaxRows() = 0;
-  virtual void setMaxRows(jint) = 0;
-  virtual void setEscapeProcessing(jboolean) = 0;
-  virtual jint getQueryTimeout() = 0;
-  virtual void setQueryTimeout(jint) = 0;
-  virtual void cancel() = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual void setCursorName(::java::lang::String *) = 0;
-  virtual jboolean execute(::java::lang::String *) = 0;
-  virtual ::java::sql::ResultSet * getResultSet() = 0;
-  virtual jint getUpdateCount() = 0;
-  virtual jboolean getMoreResults() = 0;
-  virtual void setFetchDirection(jint) = 0;
-  virtual jint getFetchDirection() = 0;
-  virtual void setFetchSize(jint) = 0;
-  virtual jint getFetchSize() = 0;
-  virtual jint getResultSetConcurrency() = 0;
-  virtual jint getResultSetType() = 0;
-  virtual void addBatch(::java::lang::String *) = 0;
-  virtual void clearBatch() = 0;
-  virtual JArray< jint > * executeBatch() = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual jboolean getMoreResults(jint) = 0;
-  virtual ::java::sql::ResultSet * getGeneratedKeys() = 0;
-  virtual jint executeUpdate(::java::lang::String *, jint) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jint executeUpdate(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean execute(::java::lang::String *, jint) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< jint > *) = 0;
-  virtual jboolean execute(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual jint getResultSetHoldability() = 0;
-  static const jint CLOSE_CURRENT_RESULT = 1;
-  static const jint KEEP_CURRENT_RESULT = 2;
-  static const jint CLOSE_ALL_RESULTS = 3;
-  static const jint SUCCESS_NO_INFO = -2;
-  static const jint EXECUTE_FAILED = -3;
-  static const jint RETURN_GENERATED_KEYS = 1;
-  static const jint NO_GENERATED_KEYS = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Statement__
diff --git a/libjava/java/sql/Struct.h b/libjava/java/sql/Struct.h
deleted file mode 100644
index ff9be27b93e..00000000000
--- a/libjava/java/sql/Struct.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Struct__
-#define __java_sql_Struct__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Struct;
-    }
-  }
-}
-
-class java::sql::Struct : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getSQLTypeName() = 0;
-  virtual JArray< ::java::lang::Object * > * getAttributes() = 0;
-  virtual JArray< ::java::lang::Object * > * getAttributes(::java::util::Map *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_sql_Struct__
diff --git a/libjava/java/sql/Time.h b/libjava/java/sql/Time.h
deleted file mode 100644
index a9c5d12af6c..00000000000
--- a/libjava/java/sql/Time.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Time__
-#define __java_sql_Time__
-
-#pragma interface
-
-#include <java/util/Date.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Time;
-    }
-    namespace text
-    {
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class java::sql::Time : public ::java::util::Date
-{
-
-public:
-  virtual jint getDate();
-  virtual jint getDay();
-  virtual jint getMonth();
-  virtual jint getYear();
-  virtual void setDate(jint);
-  virtual void setMonth(jint);
-  virtual void setYear(jint);
-  static ::java::sql::Time * valueOf(::java::lang::String *);
-  Time(jint, jint, jint);
-  Time(jlong);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = 8397324403548013681LL;
-private:
-  static ::java::text::SimpleDateFormat * sdf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_Time__
diff --git a/libjava/java/sql/Timestamp.h b/libjava/java/sql/Timestamp.h
deleted file mode 100644
index 2b27498c843..00000000000
--- a/libjava/java/sql/Timestamp.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Timestamp__
-#define __java_sql_Timestamp__
-
-#pragma interface
-
-#include <java/util/Date.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Timestamp;
-    }
-    namespace text
-    {
-        class DecimalFormat;
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class java::sql::Timestamp : public ::java::util::Date
-{
-
-public:
-  static ::java::sql::Timestamp * valueOf(::java::lang::String *);
-  Timestamp(jint, jint, jint, jint, jint, jint, jint);
-  Timestamp(jlong);
-  virtual jlong getTime();
-  virtual ::java::lang::String * toString();
-  virtual jint getNanos();
-  virtual void setNanos(jint);
-  virtual jboolean before(::java::sql::Timestamp *);
-  virtual jboolean after(::java::sql::Timestamp *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean equals(::java::sql::Timestamp *);
-  virtual jint compareTo(::java::sql::Timestamp *);
-  virtual jint target$compareTo(::java::util::Date *);
-public: // actually package-private
-  static const jlong serialVersionUID = 2745179027874758501LL;
-private:
-  static ::java::text::SimpleDateFormat * dateFormat;
-  static ::java::text::DecimalFormat * decimalFormat;
-  static ::java::lang::StringBuffer * sbuf;
-  jint __attribute__((aligned(__alignof__( ::java::util::Date)))) nanos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_Timestamp__
diff --git a/libjava/java/sql/Types.h b/libjava/java/sql/Types.h
deleted file mode 100644
index 8f6388fe269..00000000000
--- a/libjava/java/sql/Types.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_sql_Types__
-#define __java_sql_Types__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Types;
-    }
-  }
-}
-
-class java::sql::Types : public ::java::lang::Object
-{
-
-  Types();
-public:
-  static const jint BIT = -7;
-  static const jint TINYINT = -6;
-  static const jint SMALLINT = 5;
-  static const jint INTEGER = 4;
-  static const jint BIGINT = -5;
-  static const jint FLOAT = 6;
-  static const jint REAL = 7;
-  static const jint DOUBLE = 8;
-  static const jint NUMERIC = 2;
-  static const jint DECIMAL = 3;
-  static const jint CHAR = 1;
-  static const jint VARCHAR = 12;
-  static const jint LONGVARCHAR = -1;
-  static const jint DATE = 91;
-  static const jint TIME = 92;
-  static const jint TIMESTAMP = 93;
-  static const jint BINARY = -2;
-  static const jint VARBINARY = -3;
-  static const jint LONGVARBINARY = -4;
-  static const jint NULL = 0;
-  static const jint OTHER = 1111;
-  static const jint JAVA_OBJECT = 2000;
-  static const jint DISTINCT = 2001;
-  static const jint STRUCT = 2002;
-  static const jint ARRAY = 2003;
-  static const jint BLOB = 2004;
-  static const jint CLOB = 2005;
-  static const jint REF = 2006;
-  static const jint DATALINK = 70;
-  static const jint BOOLEAN = 16;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_sql_Types__
diff --git a/libjava/java/text/Annotation.h b/libjava/java/text/Annotation.h
deleted file mode 100644
index 7170a3f91c3..00000000000
--- a/libjava/java/text/Annotation.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_Annotation__
-#define __java_text_Annotation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class Annotation;
-    }
-  }
-}
-
-class java::text::Annotation : public ::java::lang::Object
-{
-
-public:
-  Annotation(::java::lang::Object *);
-  virtual ::java::lang::Object * getValue();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrib;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_Annotation__
diff --git a/libjava/java/text/AttributedCharacterIterator$Attribute.h b/libjava/java/text/AttributedCharacterIterator$Attribute.h
deleted file mode 100644
index f4722404425..00000000000
--- a/libjava/java/text/AttributedCharacterIterator$Attribute.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_AttributedCharacterIterator$Attribute__
-#define __java_text_AttributedCharacterIterator$Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-}
-
-class java::text::AttributedCharacterIterator$Attribute : public ::java::lang::Object
-{
-
-public: // actually protected
-  AttributedCharacterIterator$Attribute(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::Object * readResolve();
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -9142742483513960612LL;
-public:
-  static ::java::text::AttributedCharacterIterator$Attribute * LANGUAGE;
-  static ::java::text::AttributedCharacterIterator$Attribute * READING;
-  static ::java::text::AttributedCharacterIterator$Attribute * INPUT_METHOD_SEGMENT;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_AttributedCharacterIterator$Attribute__
diff --git a/libjava/java/text/AttributedCharacterIterator.h b/libjava/java/text/AttributedCharacterIterator.h
deleted file mode 100644
index c5b04f6fa94..00000000000
--- a/libjava/java/text/AttributedCharacterIterator.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_AttributedCharacterIterator__
-#define __java_text_AttributedCharacterIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class AttributedCharacterIterator$Attribute;
-    }
-  }
-}
-
-class java::text::AttributedCharacterIterator : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Set * getAllAttributeKeys() = 0;
-  virtual ::java::util::Map * getAttributes() = 0;
-  virtual ::java::lang::Object * getAttribute(::java::text::AttributedCharacterIterator$Attribute *) = 0;
-  virtual jint getRunStart() = 0;
-  virtual jint getRunStart(::java::util::Set *) = 0;
-  virtual jint getRunStart(::java::text::AttributedCharacterIterator$Attribute *) = 0;
-  virtual jint getRunLimit() = 0;
-  virtual jint getRunLimit(::java::util::Set *) = 0;
-  virtual jint getRunLimit(::java::text::AttributedCharacterIterator$Attribute *) = 0;
-  virtual jchar current() = 0;
-  virtual jchar next() = 0;
-  virtual jchar previous() = 0;
-  virtual jchar first() = 0;
-  virtual jchar last() = 0;
-  virtual jint getIndex() = 0;
-  virtual jchar setIndex(jint) = 0;
-  virtual jint getBeginIndex() = 0;
-  virtual jint getEndIndex() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_text_AttributedCharacterIterator__
diff --git a/libjava/java/text/AttributedString$AttributeRange.h b/libjava/java/text/AttributedString$AttributeRange.h
deleted file mode 100644
index 49e33d1ad08..00000000000
--- a/libjava/java/text/AttributedString$AttributeRange.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_AttributedString$AttributeRange__
-#define __java_text_AttributedString$AttributeRange__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedString;
-        class AttributedString$AttributeRange;
-    }
-  }
-}
-
-class java::text::AttributedString$AttributeRange : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AttributedString$AttributeRange(::java::text::AttributedString *, ::java::util::Map *, jint, jint);
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attribs;
-  jint beginIndex;
-  jint endIndex;
-  ::java::text::AttributedString * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_AttributedString$AttributeRange__
diff --git a/libjava/java/text/AttributedString.h b/libjava/java/text/AttributedString.h
deleted file mode 100644
index 51b4c0bc2fa..00000000000
--- a/libjava/java/text/AttributedString.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_AttributedString__
-#define __java_text_AttributedString__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class AttributedCharacterIterator$Attribute;
-        class AttributedString;
-        class AttributedString$AttributeRange;
-        class StringCharacterIterator;
-    }
-  }
-}
-
-class java::text::AttributedString : public ::java::lang::Object
-{
-
-public:
-  AttributedString(::java::lang::String *);
-  AttributedString(::java::lang::String *, ::java::util::Map *);
-  AttributedString(::java::text::AttributedCharacterIterator *);
-  AttributedString(::java::text::AttributedCharacterIterator *, jint, jint);
-  AttributedString(::java::text::AttributedCharacterIterator *, jint, jint, JArray< ::java::text::AttributedCharacterIterator$Attribute * > *);
-  virtual void addAttribute(::java::text::AttributedCharacterIterator$Attribute *, ::java::lang::Object *);
-  virtual void addAttribute(::java::text::AttributedCharacterIterator$Attribute *, ::java::lang::Object *, jint, jint);
-  virtual void addAttributes(::java::util::Map *, jint, jint);
-  virtual ::java::text::AttributedCharacterIterator * getIterator();
-  virtual ::java::text::AttributedCharacterIterator * getIterator(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *);
-  virtual ::java::text::AttributedCharacterIterator * getIterator(JArray< ::java::text::AttributedCharacterIterator$Attribute * > *, jint, jint);
-private:
-  ::java::text::StringCharacterIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sci;
-  JArray< ::java::text::AttributedString$AttributeRange * > * attribs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_AttributedString__
diff --git a/libjava/java/text/AttributedStringIterator.h b/libjava/java/text/AttributedStringIterator.h
deleted file mode 100644
index bc2e77f89ab..00000000000
--- a/libjava/java/text/AttributedStringIterator.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_AttributedStringIterator__
-#define __java_text_AttributedStringIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator$Attribute;
-        class AttributedString$AttributeRange;
-        class AttributedStringIterator;
-        class CharacterIterator;
-        class StringCharacterIterator;
-    }
-  }
-}
-
-class java::text::AttributedStringIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AttributedStringIterator(::java::text::StringCharacterIterator *, JArray< ::java::text::AttributedString$AttributeRange * > *, jint, jint, JArray< ::java::text::AttributedCharacterIterator$Attribute * > *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual jchar current();
-  virtual jchar next();
-  virtual jchar previous();
-  virtual jchar first();
-  virtual jchar last();
-  virtual jint getIndex();
-  virtual jchar setIndex(jint);
-  virtual jint getBeginIndex();
-  virtual jint getEndIndex();
-  virtual ::java::util::Set * getAllAttributeKeys();
-  virtual jint getRunLimit();
-  virtual jint getRunLimit(::java::text::AttributedCharacterIterator$Attribute *);
-  virtual jint getRunLimit(::java::util::Set *);
-  virtual jint getRunStart();
-  virtual jint getRunStart(::java::text::AttributedCharacterIterator$Attribute *);
-  virtual jint getRunStart(::java::util::Set *);
-private:
-  ::java::lang::Object * getAttribute(::java::text::AttributedCharacterIterator$Attribute *, jint);
-public:
-  virtual ::java::lang::Object * getAttribute(::java::text::AttributedCharacterIterator$Attribute *);
-  virtual ::java::util::Map * getAttributes();
-private:
-  ::java::text::CharacterIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ci;
-  JArray< ::java::text::AttributedString$AttributeRange * > * attribs;
-  JArray< ::java::text::AttributedCharacterIterator$Attribute * > * restricts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_AttributedStringIterator__
diff --git a/libjava/java/text/Bidi.h b/libjava/java/text/Bidi.h
deleted file mode 100644
index 59b80ed5a71..00000000000
--- a/libjava/java/text/Bidi.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_Bidi__
-#define __java_text_Bidi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class Bidi;
-    }
-  }
-}
-
-class java::text::Bidi : public ::java::lang::Object
-{
-
-public:
-  Bidi(::java::text::AttributedCharacterIterator *);
-  Bidi(JArray< jchar > *, jint, JArray< jbyte > *, jint, jint, jint);
-  Bidi(::java::lang::String *, jint);
-private:
-  void computeTypes();
-  jint computeParagraphEmbeddingLevel();
-  void computeExplicitLevels();
-  void computeRuns();
-  void resolveWeakTypes();
-  void resolveNeutralTypes();
-  void resolveImplicitLevels();
-  void reinsertFormattingCodes();
-  void runBidi();
-public:
-  jboolean baseIsLeftToRight();
-  ::java::text::Bidi * createLineBidi(jint, jint);
-  jint getBaseLevel();
-  jint getLength();
-  jint getLevelAt(jint);
-  jint getRunCount();
-  jint getRunLevel(jint);
-  jint getRunLimit(jint);
-  jint getRunStart(jint);
-  jboolean isLeftToRight();
-  jboolean isMixed();
-  jboolean isRightToLeft();
-  ::java::lang::String * toString();
-  static void reorderVisually(JArray< jbyte > *, jint, JArray< ::java::lang::Object * > *, jint, jint);
-  static jboolean requiresBidi(JArray< jchar > *, jint, jint);
-  static const jint DIRECTION_DEFAULT_LEFT_TO_RIGHT = -2;
-  static const jint DIRECTION_DEFAULT_RIGHT_TO_LEFT = -1;
-  static const jint DIRECTION_LEFT_TO_RIGHT = 0;
-  static const jint DIRECTION_RIGHT_TO_LEFT = 1;
-private:
-  static const jint LTOR = 1;
-  static const jint RTOL = 2;
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
-  jint textOffset;
-  JArray< jbyte > * embeddings;
-  jint embeddingOffset;
-  jint length;
-  jint flags;
-  jint baseEmbedding;
-  JArray< jbyte > * types;
-  JArray< jbyte > * levels;
-  ::java::util::ArrayList * formatterIndices;
-  JArray< jint > * runs;
-  jint resultFlags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_Bidi__
diff --git a/libjava/java/text/BreakIterator.h b/libjava/java/text/BreakIterator.h
deleted file mode 100644
index 2c6f90ea187..00000000000
--- a/libjava/java/text/BreakIterator.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_BreakIterator__
-#define __java_text_BreakIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class BreakIterator;
-        class CharacterIterator;
-    }
-  }
-}
-
-class java::text::BreakIterator : public ::java::lang::Object
-{
-
-public: // actually protected
-  BreakIterator();
-public:
-  virtual ::java::lang::Object * clone();
-  virtual jint current() = 0;
-  virtual jint first() = 0;
-  virtual jint following(jint) = 0;
-  static JArray< ::java::util::Locale * > * getAvailableLocales();
-private:
-  static ::java::text::BreakIterator * getInstance(::java::lang::String *, ::java::util::Locale *);
-public:
-  static ::java::text::BreakIterator * getCharacterInstance();
-  static ::java::text::BreakIterator * getCharacterInstance(::java::util::Locale *);
-  static ::java::text::BreakIterator * getLineInstance();
-  static ::java::text::BreakIterator * getLineInstance(::java::util::Locale *);
-  static ::java::text::BreakIterator * getSentenceInstance();
-  static ::java::text::BreakIterator * getSentenceInstance(::java::util::Locale *);
-  virtual ::java::text::CharacterIterator * getText() = 0;
-  static ::java::text::BreakIterator * getWordInstance();
-  static ::java::text::BreakIterator * getWordInstance(::java::util::Locale *);
-  virtual jboolean isBoundary(jint);
-  virtual jint last() = 0;
-  virtual jint next() = 0;
-  virtual jint next(jint) = 0;
-  virtual jint preceding(jint);
-  virtual jint previous() = 0;
-  virtual void setText(::java::lang::String *);
-  virtual void setText(::java::text::CharacterIterator *) = 0;
-  static const jint DONE = -1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_BreakIterator__
diff --git a/libjava/java/text/CharacterIterator.h b/libjava/java/text/CharacterIterator.h
deleted file mode 100644
index d13612ff3bd..00000000000
--- a/libjava/java/text/CharacterIterator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_CharacterIterator__
-#define __java_text_CharacterIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class CharacterIterator;
-    }
-  }
-}
-
-class java::text::CharacterIterator : public ::java::lang::Object
-{
-
-public:
-  virtual jchar current() = 0;
-  virtual jchar next() = 0;
-  virtual jchar previous() = 0;
-  virtual jchar first() = 0;
-  virtual jchar last() = 0;
-  virtual jint getIndex() = 0;
-  virtual jchar setIndex(jint) = 0;
-  virtual jint getBeginIndex() = 0;
-  virtual jint getEndIndex() = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static const jchar DONE = 65535;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_text_CharacterIterator__
diff --git a/libjava/java/text/ChoiceFormat.h b/libjava/java/text/ChoiceFormat.h
deleted file mode 100644
index 30aa77a6788..00000000000
--- a/libjava/java/text/ChoiceFormat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_ChoiceFormat__
-#define __java_text_ChoiceFormat__
-
-#pragma interface
-
-#include <java/text/NumberFormat.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class ChoiceFormat;
-        class FieldPosition;
-        class ParsePosition;
-    }
-  }
-}
-
-class java::text::ChoiceFormat : public ::java::text::NumberFormat
-{
-
-public:
-  virtual void applyPattern(::java::lang::String *);
-  ChoiceFormat(::java::lang::String *);
-  ChoiceFormat(JArray< jdouble > *, JArray< ::java::lang::String * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::StringBuffer * format(jlong, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  virtual ::java::lang::StringBuffer * format(jdouble, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  virtual JArray< ::java::lang::Object * > * getFormats();
-  virtual JArray< jdouble > * getLimits();
-  virtual jint hashCode();
-  static jdouble nextDouble(jdouble);
-  static jdouble nextDouble(jdouble, jboolean);
-  virtual ::java::lang::Number * parse(::java::lang::String *, ::java::text::ParsePosition *);
-  static jdouble previousDouble(jdouble);
-  virtual void setChoices(JArray< jdouble > *, JArray< ::java::lang::String * > *);
-private:
-  void quoteString(::java::lang::StringBuffer *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * toPattern();
-private:
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::text::NumberFormat)))) choiceFormats;
-  JArray< jdouble > * choiceLimits;
-  static const jint mantissaBits = 52;
-  static const jint exponentBits = 11;
-  static const jlong serialVersionUID = 1795184449645032964LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_ChoiceFormat__
diff --git a/libjava/java/text/CollationElementIterator.h b/libjava/java/text/CollationElementIterator.h
deleted file mode 100644
index 19d92b8cab6..00000000000
--- a/libjava/java/text/CollationElementIterator.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_CollationElementIterator__
-#define __java_text_CollationElementIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class CharacterIterator;
-        class CollationElementIterator;
-        class RuleBasedCollator;
-        class RuleBasedCollator$CollationElement;
-    }
-  }
-}
-
-class java::text::CollationElementIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CollationElementIterator(::java::text::RuleBasedCollator *, ::java::lang::String *);
-  ::java::text::RuleBasedCollator$CollationElement * nextBlock();
-  ::java::text::RuleBasedCollator$CollationElement * previousBlock();
-public:
-  jint next();
-  jint previous();
-  static jint primaryOrder(jint);
-  void reset();
-  static jshort secondaryOrder(jint);
-  static jshort tertiaryOrder(jint);
-  void setText(::java::lang::String *);
-  void setText(::java::text::CharacterIterator *);
-  jint getOffset();
-  void setOffset(jint);
-  jint getMaxExpansion(jint);
-  static const jint NULLORDER = -1;
-public: // actually package-private
-  ::java::text::RuleBasedCollator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) collator;
-  ::java::lang::String * text;
-  jint index;
-  jint textIndex;
-private:
-  JArray< ::java::text::RuleBasedCollator$CollationElement * > * text_decomposition;
-  JArray< jint > * text_indexes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_CollationElementIterator__
diff --git a/libjava/java/text/CollationKey.h b/libjava/java/text/CollationKey.h
deleted file mode 100644
index 83a6c5ae5dd..00000000000
--- a/libjava/java/text/CollationKey.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_CollationKey__
-#define __java_text_CollationKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class CollationKey;
-        class Collator;
-    }
-  }
-}
-
-class java::text::CollationKey : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CollationKey(::java::text::Collator *, ::java::lang::String *, JArray< jbyte > *);
-public:
-  virtual jint target$compareTo(::java::text::CollationKey *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getSourceString();
-  virtual jint hashCode();
-  virtual JArray< jbyte > * toByteArray();
-  virtual jint compareTo(::java::lang::Object *);
-private:
-  ::java::text::Collator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) collator;
-  ::java::lang::String * originalText;
-  JArray< jbyte > * key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_CollationKey__
diff --git a/libjava/java/text/Collator.h b/libjava/java/text/Collator.h
deleted file mode 100644
index 075dcb2b1d4..00000000000
--- a/libjava/java/text/Collator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_Collator__
-#define __java_text_Collator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class CollationKey;
-        class Collator;
-    }
-  }
-}
-
-class java::text::Collator : public ::java::lang::Object
-{
-
-public: // actually protected
-  Collator();
-public:
-  virtual jint compare(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  static JArray< ::java::util::Locale * > * getAvailableLocales();
-  virtual ::java::text::CollationKey * getCollationKey(::java::lang::String *) = 0;
-  virtual jint getDecomposition();
-  static ::java::text::Collator * getInstance();
-  static ::java::text::Collator * getInstance(::java::util::Locale *);
-  virtual jint getStrength();
-  virtual jint hashCode() = 0;
-  virtual void setDecomposition(jint);
-  virtual void setStrength(jint);
-public: // actually package-private
-  virtual void decomposeCharacter(jchar, ::java::lang::StringBuffer *);
-public:
-  static const jint PRIMARY = 0;
-  static const jint SECONDARY = 1;
-  static const jint TERTIARY = 2;
-  static const jint IDENTICAL = 3;
-  static const jint NO_DECOMPOSITION = 0;
-  static const jint CANONICAL_DECOMPOSITION = 1;
-  static const jint FULL_DECOMPOSITION = 2;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) decmp;
-  jint strength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_Collator__
diff --git a/libjava/java/text/DateFormat$Field.h b/libjava/java/text/DateFormat$Field.h
deleted file mode 100644
index e586d22fe62..00000000000
--- a/libjava/java/text/DateFormat$Field.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_DateFormat$Field__
-#define __java_text_DateFormat$Field__
-
-#pragma interface
-
-#include <java/text/Format$Field.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class DateFormat$Field;
-    }
-  }
-}
-
-class java::text::DateFormat$Field : public ::java::text::Format$Field
-{
-
-  DateFormat$Field();
-public: // actually protected
-  DateFormat$Field(::java::lang::String *, jint);
-public:
-  virtual jint getCalendarField();
-  static ::java::text::DateFormat$Field * ofCalendarField(jint);
-public: // actually protected
-  virtual ::java::lang::Object * readResolve();
-public: // actually package-private
-  static const jlong serialVersionUID = 7441350119349544720LL;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::text::Format$Field)))) calendarField;
-public:
-  static ::java::text::DateFormat$Field * ERA;
-  static ::java::text::DateFormat$Field * YEAR;
-  static ::java::text::DateFormat$Field * MONTH;
-  static ::java::text::DateFormat$Field * DAY_OF_MONTH;
-  static ::java::text::DateFormat$Field * HOUR_OF_DAY1;
-  static ::java::text::DateFormat$Field * HOUR_OF_DAY0;
-  static ::java::text::DateFormat$Field * MINUTE;
-  static ::java::text::DateFormat$Field * SECOND;
-  static ::java::text::DateFormat$Field * MILLISECOND;
-  static ::java::text::DateFormat$Field * DAY_OF_WEEK;
-  static ::java::text::DateFormat$Field * DAY_OF_YEAR;
-  static ::java::text::DateFormat$Field * DAY_OF_WEEK_IN_MONTH;
-  static ::java::text::DateFormat$Field * WEEK_OF_YEAR;
-  static ::java::text::DateFormat$Field * WEEK_OF_MONTH;
-  static ::java::text::DateFormat$Field * AM_PM;
-  static ::java::text::DateFormat$Field * HOUR1;
-  static ::java::text::DateFormat$Field * HOUR0;
-  static ::java::text::DateFormat$Field * TIME_ZONE;
-  static ::java::text::DateFormat$Field * ISO_YEAR;
-  static ::java::text::DateFormat$Field * LOCALIZED_DAY_OF_WEEK;
-  static ::java::text::DateFormat$Field * EXTENDED_YEAR;
-  static ::java::text::DateFormat$Field * MODIFIED_JULIAN_DAY;
-  static ::java::text::DateFormat$Field * MILLISECOND_IN_DAY;
-  static ::java::text::DateFormat$Field * RFC822_TIME_ZONE;
-public: // actually package-private
-  static JArray< ::java::text::DateFormat$Field * > * allFields;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_DateFormat$Field__
diff --git a/libjava/java/text/DateFormat.h b/libjava/java/text/DateFormat.h
deleted file mode 100644
index 447fef3b3ce..00000000000
--- a/libjava/java/text/DateFormat.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_DateFormat__
-#define __java_text_DateFormat__
-
-#pragma interface
-
-#include <java/text/Format.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class DateFormat;
-        class FieldPosition;
-        class NumberFormat;
-        class ParsePosition;
-    }
-  }
-}
-
-class java::text::DateFormat : public ::java::text::Format
-{
-
-public: // actually protected
-  DateFormat();
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  virtual ::java::lang::String * format(::java::util::Date *);
-  virtual ::java::lang::StringBuffer * format(::java::util::Date *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *) = 0;
-  static JArray< ::java::util::Locale * > * getAvailableLocales();
-  virtual ::java::util::Calendar * getCalendar();
-private:
-  static ::java::text::DateFormat * computeInstance(jint, ::java::util::Locale *, jboolean, jboolean);
-  static ::java::text::DateFormat * computeInstance(jint, jint, ::java::util::Locale *, jboolean, jboolean);
-public:
-  static ::java::text::DateFormat * getDateInstance();
-  static ::java::text::DateFormat * getDateInstance(jint);
-  static ::java::text::DateFormat * getDateInstance(jint, ::java::util::Locale *);
-  static ::java::text::DateFormat * getDateTimeInstance();
-  static ::java::text::DateFormat * getDateTimeInstance(jint, jint);
-  static ::java::text::DateFormat * getDateTimeInstance(jint, jint, ::java::util::Locale *);
-  static ::java::text::DateFormat * getInstance();
-  virtual ::java::text::NumberFormat * getNumberFormat();
-  static ::java::text::DateFormat * getTimeInstance();
-  static ::java::text::DateFormat * getTimeInstance(jint);
-  static ::java::text::DateFormat * getTimeInstance(jint, ::java::util::Locale *);
-  virtual ::java::util::TimeZone * getTimeZone();
-  virtual jint hashCode();
-  virtual jboolean isLenient();
-  virtual ::java::util::Date * parse(::java::lang::String *);
-  virtual ::java::util::Date * parse(::java::lang::String *, ::java::text::ParsePosition *) = 0;
-  virtual ::java::lang::Object * parseObject(::java::lang::String *, ::java::text::ParsePosition *);
-  virtual void setCalendar(::java::util::Calendar *);
-  virtual void setLenient(jboolean);
-  virtual void setNumberFormat(::java::text::NumberFormat *);
-  virtual void setTimeZone(::java::util::TimeZone *);
-private:
-  static const jlong serialVersionUID = 7218322306649953788LL;
-public: // actually protected
-  ::java::util::Calendar * __attribute__((aligned(__alignof__( ::java::text::Format)))) calendar;
-  ::java::text::NumberFormat * numberFormat;
-public:
-  static const jint FULL = 0;
-  static const jint LONG = 1;
-  static const jint MEDIUM = 2;
-  static const jint SHORT = 3;
-  static const jint DEFAULT = 2;
-  static const jint ERA_FIELD = 0;
-  static const jint YEAR_FIELD = 1;
-  static const jint MONTH_FIELD = 2;
-  static const jint DATE_FIELD = 3;
-  static const jint HOUR_OF_DAY1_FIELD = 4;
-  static const jint HOUR_OF_DAY0_FIELD = 5;
-  static const jint MINUTE_FIELD = 6;
-  static const jint SECOND_FIELD = 7;
-  static const jint MILLISECOND_FIELD = 8;
-  static const jint DAY_OF_WEEK_FIELD = 9;
-  static const jint DAY_OF_YEAR_FIELD = 10;
-  static const jint DAY_OF_WEEK_IN_MONTH_FIELD = 11;
-  static const jint WEEK_OF_YEAR_FIELD = 12;
-  static const jint WEEK_OF_MONTH_FIELD = 13;
-  static const jint AM_PM_FIELD = 14;
-  static const jint HOUR1_FIELD = 15;
-  static const jint HOUR0_FIELD = 16;
-  static const jint TIMEZONE_FIELD = 17;
-  static const jint ISO_YEAR_FIELD = 18;
-  static const jint LOCALIZED_DAY_OF_WEEK_FIELD = 19;
-  static const jint EXTENDED_YEAR_FIELD = 20;
-  static const jint MODIFIED_JULIAN_DAY_FIELD = 21;
-  static const jint MILLISECOND_IN_DAY_FIELD = 22;
-  static const jint RFC822_TIMEZONE_FIELD = 23;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_DateFormat__
diff --git a/libjava/java/text/DateFormatSymbols.h b/libjava/java/text/DateFormatSymbols.h
deleted file mode 100644
index 1ef65b7cabd..00000000000
--- a/libjava/java/text/DateFormatSymbols.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_DateFormatSymbols__
-#define __java_text_DateFormatSymbols__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class DateFormatSymbols;
-    }
-  }
-}
-
-class java::text::DateFormatSymbols : public ::java::lang::Object
-{
-
-  JArray< ::java::lang::String * > * formatsForKey(::java::util::ResourceBundle *, ::java::lang::String *);
-public:
-  DateFormatSymbols(::java::util::Locale *);
-  DateFormatSymbols();
-  virtual JArray< ::java::lang::String * > * getAmPmStrings();
-  virtual JArray< ::java::lang::String * > * getEras();
-  virtual ::java::lang::String * getLocalPatternChars();
-  virtual JArray< ::java::lang::String * > * getMonths();
-  virtual JArray< ::java::lang::String * > * getShortMonths();
-  virtual JArray< ::java::lang::String * > * getShortWeekdays();
-  virtual JArray< ::java::lang::String * > * getWeekdays();
-  virtual JArray< JArray< ::java::lang::String * > * > * getZoneStrings();
-  virtual void setAmPmStrings(JArray< ::java::lang::String * > *);
-  virtual void setEras(JArray< ::java::lang::String * > *);
-  virtual void setLocalPatternChars(::java::lang::String *);
-  virtual void setMonths(JArray< ::java::lang::String * > *);
-  virtual void setShortMonths(JArray< ::java::lang::String * > *);
-  virtual void setShortWeekdays(JArray< ::java::lang::String * > *);
-  virtual void setWeekdays(JArray< ::java::lang::String * > *);
-  virtual void setZoneStrings(JArray< JArray< ::java::lang::String * > * > *);
-private:
-  static jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-  static jint hashCode(::java::lang::Object *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * clone();
-  virtual jint hashCode();
-public: // actually package-private
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ampms;
-  JArray< ::java::lang::String * > * eras;
-private:
-  ::java::lang::String * localPatternChars;
-public: // actually package-private
-  JArray< ::java::lang::String * > * months;
-  JArray< ::java::lang::String * > * shortMonths;
-  JArray< ::java::lang::String * > * shortWeekdays;
-  JArray< ::java::lang::String * > * weekdays;
-private:
-  JArray< JArray< ::java::lang::String * > * > * zoneStrings;
-  static const jlong serialVersionUID = -5987973545549424702LL;
-  static JArray< ::java::lang::String * > * formatPrefixes;
-public: // actually package-private
-  JArray< ::java::lang::String * > * dateFormats;
-  JArray< ::java::lang::String * > * timeFormats;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_DateFormatSymbols__
diff --git a/libjava/java/text/DecimalFormat.h b/libjava/java/text/DecimalFormat.h
deleted file mode 100644
index 14cf9d2f59b..00000000000
--- a/libjava/java/text/DecimalFormat.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_DecimalFormat__
-#define __java_text_DecimalFormat__
-
-#pragma interface
-
-#include <java/text/NumberFormat.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class DecimalFormat;
-        class DecimalFormatSymbols;
-        class FieldPosition;
-        class NumberFormat$Field;
-        class ParsePosition;
-    }
-  }
-}
-
-class java::text::DecimalFormat : public ::java::text::NumberFormat
-{
-
-public:
-  DecimalFormat();
-  DecimalFormat(::java::lang::String *);
-  DecimalFormat(::java::lang::String *, ::java::text::DecimalFormatSymbols *);
-  virtual void applyLocalizedPattern(::java::lang::String *);
-  virtual void applyPattern(::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  virtual ::java::lang::StringBuffer * format(jdouble, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  virtual ::java::lang::StringBuffer * format(jlong, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  virtual ::java::text::AttributedCharacterIterator * formatToCharacterIterator(::java::lang::Object *);
-  virtual ::java::util::Currency * getCurrency();
-  virtual ::java::text::DecimalFormatSymbols * getDecimalFormatSymbols();
-  virtual jint getGroupingSize();
-  virtual jint getMultiplier();
-  virtual ::java::lang::String * getNegativePrefix();
-  virtual ::java::lang::String * getNegativeSuffix();
-  virtual ::java::lang::String * getPositivePrefix();
-  virtual ::java::lang::String * getPositiveSuffix();
-  virtual jboolean isDecimalSeparatorAlwaysShown();
-  virtual void setParseBigDecimal(jboolean);
-  virtual jboolean isParseBigDecimal();
-  virtual ::java::lang::Number * parse(::java::lang::String *, ::java::text::ParsePosition *);
-  virtual void setCurrency(::java::util::Currency *);
-  virtual void setDecimalFormatSymbols(::java::text::DecimalFormatSymbols *);
-  virtual void setDecimalSeparatorAlwaysShown(jboolean);
-  virtual void setGroupingSize(jint);
-  virtual void setMaximumIntegerDigits(jint);
-  virtual void setMinimumIntegerDigits(jint);
-  virtual void setMaximumFractionDigits(jint);
-  virtual void setMinimumFractionDigits(jint);
-  virtual void setMultiplier(jint);
-  virtual void setNegativePrefix(::java::lang::String *);
-  virtual void setNegativeSuffix(::java::lang::String *);
-  virtual void setPositivePrefix(::java::lang::String *);
-  virtual void setPositiveSuffix(::java::lang::String *);
-  virtual ::java::lang::String * toLocalizedPattern();
-  virtual ::java::lang::String * toPattern();
-private:
-  jboolean equals(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * patternChars(::java::text::DecimalFormatSymbols *);
-  ::java::lang::StringBuffer * quoteFix(::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * computePattern(::java::text::DecimalFormatSymbols *);
-  void applyPatternWithSymbols(::java::lang::String *, ::java::text::DecimalFormatSymbols *);
-  jint scanFix(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint, jboolean);
-  jint scanNumberInteger(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint);
-  jint scanFractionalPortion(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint);
-  jint scanExponent(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint);
-  void scanNegativePattern(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint);
-  void formatInternal(::java::math::BigDecimal *, jboolean, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  void handleFractionalPart(::java::lang::StringBuffer *, ::java::lang::String *, ::java::text::FieldPosition *, jboolean);
-  void appendZero(::java::lang::StringBuffer *, jint, jint);
-  void appendDigit(::java::lang::String *, ::java::lang::StringBuffer *, jboolean);
-  jlong getExponent(::java::math::BigDecimal *);
-  ::java::lang::String * adjustTrailingZeros(::java::lang::String *, jint);
-  void addAttribute(::java::text::NumberFormat$Field *, jint, jint);
-  void setDefaultValues();
-  static const jlong serialVersionUID = 864413376551465018LL;
-  static const jint DEFAULT_INTEGER_DIGITS = 309;
-  static const jint DEFAULT_FRACTION_DIGITS = 340;
-  static ::java::text::DecimalFormatSymbols * nonLocalizedSymbols;
-  jboolean __attribute__((aligned(__alignof__( ::java::text::NumberFormat)))) parseBigDecimal;
-  jboolean useCurrencySeparator;
-  jboolean decimalSeparatorAlwaysShown;
-  jboolean showDecimalSeparator;
-  jboolean groupingSeparatorInPattern;
-  jbyte groupingSize;
-  jbyte minExponentDigits;
-  jint exponentRound;
-  jint multiplier;
-  jint negativePatternMultiplier;
-  ::java::lang::String * negativePrefix;
-  ::java::lang::String * negativeSuffix;
-  ::java::lang::String * positivePrefix;
-  ::java::lang::String * positiveSuffix;
-  ::java::text::DecimalFormatSymbols * symbols;
-  jboolean useExponentialNotation;
-  jint maxIntegerDigitsExponent;
-  jboolean hasNegativePrefix;
-  jboolean hasFractionalPattern;
-  ::java::util::ArrayList * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_DecimalFormat__
diff --git a/libjava/java/text/DecimalFormatSymbols.h b/libjava/java/text/DecimalFormatSymbols.h
deleted file mode 100644
index 96bd2861693..00000000000
--- a/libjava/java/text/DecimalFormatSymbols.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_DecimalFormatSymbols__
-#define __java_text_DecimalFormatSymbols__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class DecimalFormatSymbols;
-    }
-  }
-}
-
-class java::text::DecimalFormatSymbols : public ::java::lang::Object
-{
-
-public:
-  ::java::lang::Object * clone();
-  DecimalFormatSymbols();
-private:
-  ::java::lang::String * safeGetString(::java::util::ResourceBundle *, ::java::lang::String *, ::java::lang::String *);
-  jchar safeGetChar(::java::util::ResourceBundle *, ::java::lang::String *, jchar);
-public:
-  DecimalFormatSymbols(::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::util::Currency * getCurrency();
-  ::java::lang::String * getCurrencySymbol();
-  jchar getDecimalSeparator();
-  jchar getDigit();
-public: // actually package-private
-  jchar getExponential();
-public:
-  jchar getGroupingSeparator();
-  ::java::lang::String * getInfinity();
-  ::java::lang::String * getInternationalCurrencySymbol();
-  jchar getMinusSign();
-  jchar getMonetaryDecimalSeparator();
-  ::java::lang::String * getNaN();
-  jchar getPatternSeparator();
-  jchar getPercent();
-  jchar getPerMill();
-  jchar getZeroDigit();
-  jint hashCode();
-  void setCurrency(::java::util::Currency *);
-  void setCurrencySymbol(::java::lang::String *);
-  void setDecimalSeparator(jchar);
-  void setDigit(jchar);
-public: // actually package-private
-  void setExponential(jchar);
-public:
-  void setGroupingSeparator(jchar);
-  void setInfinity(::java::lang::String *);
-  void setInternationalCurrencySymbol(::java::lang::String *);
-  void setMinusSign(jchar);
-  void setMonetaryDecimalSeparator(jchar);
-  void setNaN(::java::lang::String *);
-  void setPatternSeparator(jchar);
-  void setPercent(jchar);
-  void setPerMill(jchar);
-  void setZeroDigit(jchar);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) currencySymbol;
-  jchar decimalSeparator;
-  jchar digit;
-  jchar exponential;
-  jchar groupingSeparator;
-  ::java::lang::String * infinity;
-  ::java::lang::String * intlCurrencySymbol;
-  jchar minusSign;
-  jchar monetarySeparator;
-  ::java::lang::String * NaN;
-  jchar patternSeparator;
-  jchar percent;
-  jchar perMill;
-  jint serialVersionOnStream;
-  jchar zeroDigit;
-  ::java::util::Locale * locale;
-  static const jlong serialVersionUID = 5772796243397350300LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_DecimalFormatSymbols__
diff --git a/libjava/java/text/FieldPosition.h b/libjava/java/text/FieldPosition.h
deleted file mode 100644
index d61f9115fcd..00000000000
--- a/libjava/java/text/FieldPosition.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_FieldPosition__
-#define __java_text_FieldPosition__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class FieldPosition;
-        class Format$Field;
-    }
-  }
-}
-
-class java::text::FieldPosition : public ::java::lang::Object
-{
-
-public:
-  FieldPosition(::java::text::Format$Field *);
-  FieldPosition(::java::text::Format$Field *, jint);
-  FieldPosition(jint);
-  virtual jint getField();
-  virtual ::java::text::Format$Field * getFieldAttribute();
-  virtual jint getBeginIndex();
-  virtual void setBeginIndex(jint);
-  virtual jint getEndIndex();
-  virtual void setEndIndex(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) field_id;
-  jint begin;
-  jint end;
-  ::java::text::Format$Field * field_attribute;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_FieldPosition__
diff --git a/libjava/java/text/Format$Field.h b/libjava/java/text/Format$Field.h
deleted file mode 100644
index 197dd7dce66..00000000000
--- a/libjava/java/text/Format$Field.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_Format$Field__
-#define __java_text_Format$Field__
-
-#pragma interface
-
-#include <java/text/AttributedCharacterIterator$Attribute.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class Format$Field;
-    }
-  }
-}
-
-class java::text::Format$Field : public ::java::text::AttributedCharacterIterator$Attribute
-{
-
-public: // actually protected
-  Format$Field(::java::lang::String *);
-public: // actually package-private
-  static const jlong serialVersionUID = 276966692217360283LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_Format$Field__
diff --git a/libjava/java/text/Format.h b/libjava/java/text/Format.h
deleted file mode 100644
index 5813bd0d40c..00000000000
--- a/libjava/java/text/Format.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_Format__
-#define __java_text_Format__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class FieldPosition;
-        class Format;
-        class ParsePosition;
-    }
-  }
-}
-
-class java::text::Format : public ::java::lang::Object
-{
-
-public:
-  Format();
-  virtual ::java::lang::String * format(::java::lang::Object *);
-  virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *) = 0;
-  virtual ::java::lang::Object * parseObject(::java::lang::String *);
-  virtual ::java::lang::Object * parseObject(::java::lang::String *, ::java::text::ParsePosition *) = 0;
-  virtual ::java::text::AttributedCharacterIterator * formatToCharacterIterator(::java::lang::Object *);
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  static const jlong serialVersionUID = -299282585814624189LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_Format__
diff --git a/libjava/java/text/MessageFormat$Field.h b/libjava/java/text/MessageFormat$Field.h
deleted file mode 100644
index 78a9bebba91..00000000000
--- a/libjava/java/text/MessageFormat$Field.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_MessageFormat$Field__
-#define __java_text_MessageFormat$Field__
-
-#pragma interface
-
-#include <java/text/Format$Field.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class MessageFormat$Field;
-    }
-  }
-}
-
-class java::text::MessageFormat$Field : public ::java::text::Format$Field
-{
-
-  MessageFormat$Field();
-public: // actually protected
-  MessageFormat$Field(::java::lang::String *);
-  virtual ::java::lang::Object * readResolve();
-public: // actually package-private
-  static const jlong serialVersionUID = 7899943957617360810LL;
-public:
-  static ::java::text::MessageFormat$Field * ARGUMENT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_MessageFormat$Field__
diff --git a/libjava/java/text/MessageFormat$MessageFormatElement.h b/libjava/java/text/MessageFormat$MessageFormatElement.h
deleted file mode 100644
index 9a95f1f7f8e..00000000000
--- a/libjava/java/text/MessageFormat$MessageFormatElement.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_MessageFormat$MessageFormatElement__
-#define __java_text_MessageFormat$MessageFormatElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class Format;
-        class MessageFormat$MessageFormatElement;
-    }
-  }
-}
-
-class java::text::MessageFormat$MessageFormatElement : public ::java::lang::Object
-{
-
-  MessageFormat$MessageFormatElement();
-public: // actually package-private
-  void setLocale(::java::util::Locale *);
-  MessageFormat$MessageFormatElement(::java::text::MessageFormat$MessageFormatElement *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) argNumber;
-  ::java::text::Format * setFormat;
-  ::java::text::Format * format;
-  ::java::lang::Class * formatClass;
-  ::java::lang::String * type;
-  ::java::lang::String * style;
-  ::java::lang::String * trailer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_MessageFormat$MessageFormatElement__
diff --git a/libjava/java/text/MessageFormat.h b/libjava/java/text/MessageFormat.h
deleted file mode 100644
index 47d476fb521..00000000000
--- a/libjava/java/text/MessageFormat.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_MessageFormat__
-#define __java_text_MessageFormat__
-
-#pragma interface
-
-#include <java/text/Format.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace text
-      {
-          class FormatCharacterIterator;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class FieldPosition;
-        class Format;
-        class MessageFormat;
-        class MessageFormat$MessageFormatElement;
-        class ParsePosition;
-    }
-  }
-}
-
-class java::text::MessageFormat : public ::java::text::Format
-{
-
-  static jint scanString(::java::lang::String *, jint, ::java::lang::StringBuffer *);
-  static jint scanFormatElement(::java::lang::String *, jint, ::java::lang::StringBuffer *, jchar);
-  static jint scanFormat(::java::lang::String *, jint, ::java::lang::StringBuffer *, ::java::util::Vector *, ::java::util::Locale *);
-public:
-  virtual void applyPattern(::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::text::AttributedCharacterIterator * formatToCharacterIterator(::java::lang::Object *);
-  static ::java::lang::String * format(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::StringBuffer * format(JArray< ::java::lang::Object * > *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-private:
-  ::java::lang::StringBuffer * formatInternal(JArray< ::java::lang::Object * > *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *, ::gnu::java::text::FormatCharacterIterator *);
-public:
-  virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  virtual JArray< ::java::text::Format * > * getFormats();
-  virtual ::java::util::Locale * getLocale();
-  virtual jint hashCode();
-private:
-  MessageFormat();
-public:
-  MessageFormat(::java::lang::String *);
-  MessageFormat(::java::lang::String *, ::java::util::Locale *);
-  virtual JArray< ::java::lang::Object * > * parse(::java::lang::String *, ::java::text::ParsePosition *);
-  virtual JArray< ::java::lang::Object * > * parse(::java::lang::String *);
-  virtual ::java::lang::Object * parseObject(::java::lang::String *, ::java::text::ParsePosition *);
-  virtual void setFormat(jint, ::java::text::Format *);
-  virtual void setFormats(JArray< ::java::text::Format * > *);
-  virtual void setLocale(::java::util::Locale *);
-  virtual ::java::lang::String * toPattern();
-  virtual JArray< ::java::text::Format * > * getFormatsByArgumentIndex();
-  virtual void setFormatByArgumentIndex(jint, ::java::text::Format *);
-  virtual void setFormatsByArgumentIndex(JArray< ::java::text::Format * > *);
-private:
-  static const jlong serialVersionUID = 6479157306784022952LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::text::Format)))) pattern;
-  ::java::util::Locale * locale;
-  JArray< ::java::text::MessageFormat$MessageFormatElement * > * elements;
-  ::java::lang::String * leader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_MessageFormat__
diff --git a/libjava/java/text/NumberFormat$Field.h b/libjava/java/text/NumberFormat$Field.h
deleted file mode 100644
index 6b72af0a406..00000000000
--- a/libjava/java/text/NumberFormat$Field.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_NumberFormat$Field__
-#define __java_text_NumberFormat$Field__
-
-#pragma interface
-
-#include <java/text/Format$Field.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class NumberFormat$Field;
-    }
-  }
-}
-
-class java::text::NumberFormat$Field : public ::java::text::Format$Field
-{
-
-  NumberFormat$Field();
-public: // actually protected
-  NumberFormat$Field(::java::lang::String *);
-  virtual ::java::lang::Object * readResolve();
-public: // actually package-private
-  static const jlong serialVersionUID = 7494728892700160890LL;
-public:
-  static ::java::text::NumberFormat$Field * INTEGER;
-  static ::java::text::NumberFormat$Field * FRACTION;
-  static ::java::text::NumberFormat$Field * EXPONENT;
-  static ::java::text::NumberFormat$Field * DECIMAL_SEPARATOR;
-  static ::java::text::NumberFormat$Field * SIGN;
-  static ::java::text::NumberFormat$Field * GROUPING_SEPARATOR;
-  static ::java::text::NumberFormat$Field * EXPONENT_SYMBOL;
-  static ::java::text::NumberFormat$Field * PERCENT;
-  static ::java::text::NumberFormat$Field * PERMILLE;
-  static ::java::text::NumberFormat$Field * CURRENCY;
-  static ::java::text::NumberFormat$Field * EXPONENT_SIGN;
-private:
-  static JArray< ::java::text::NumberFormat$Field * > * allFields;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_NumberFormat$Field__
diff --git a/libjava/java/text/NumberFormat.h b/libjava/java/text/NumberFormat.h
deleted file mode 100644
index c800b99a97f..00000000000
--- a/libjava/java/text/NumberFormat.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_NumberFormat__
-#define __java_text_NumberFormat__
-
-#pragma interface
-
-#include <java/text/Format.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class FieldPosition;
-        class NumberFormat;
-        class ParsePosition;
-    }
-  }
-}
-
-class java::text::NumberFormat : public ::java::text::Format
-{
-
-public:
-  virtual ::java::lang::String * format(jlong);
-  virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  virtual ::java::lang::StringBuffer * format(jdouble, ::java::lang::StringBuffer *, ::java::text::FieldPosition *) = 0;
-  virtual ::java::lang::StringBuffer * format(jlong, ::java::lang::StringBuffer *, ::java::text::FieldPosition *) = 0;
-  virtual jboolean equals(::java::lang::Object *);
-  static JArray< ::java::util::Locale * > * getAvailableLocales();
-private:
-  static ::java::text::NumberFormat * computeInstance(::java::util::Locale *, ::java::lang::String *, ::java::lang::String *);
-public:
-  static ::java::text::NumberFormat * getCurrencyInstance();
-  static ::java::text::NumberFormat * getCurrencyInstance(::java::util::Locale *);
-  static ::java::text::NumberFormat * getInstance();
-  static ::java::text::NumberFormat * getInstance(::java::util::Locale *);
-  virtual jint getMaximumFractionDigits();
-  virtual jint getMaximumIntegerDigits();
-  virtual jint getMinimumFractionDigits();
-  virtual jint getMinimumIntegerDigits();
-  static ::java::text::NumberFormat * getNumberInstance();
-  static ::java::text::NumberFormat * getNumberInstance(::java::util::Locale *);
-  static ::java::text::NumberFormat * getIntegerInstance();
-  static ::java::text::NumberFormat * getIntegerInstance(::java::util::Locale *);
-  static ::java::text::NumberFormat * getPercentInstance();
-  static ::java::text::NumberFormat * getPercentInstance(::java::util::Locale *);
-  virtual jint hashCode();
-  virtual jboolean isGroupingUsed();
-  virtual jboolean isParseIntegerOnly();
-  NumberFormat();
-  virtual ::java::lang::Number * parse(::java::lang::String *, ::java::text::ParsePosition *) = 0;
-  virtual ::java::lang::Number * parse(::java::lang::String *);
-  virtual ::java::lang::Object * parseObject(::java::lang::String *, ::java::text::ParsePosition *);
-  virtual void setGroupingUsed(jboolean);
-  virtual void setMaximumFractionDigits(jint);
-  virtual void setMaximumIntegerDigits(jint);
-  virtual void setMinimumFractionDigits(jint);
-  virtual void setMinimumIntegerDigits(jint);
-  virtual void setParseIntegerOnly(jboolean);
-  virtual ::java::lang::String * format(jdouble);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  virtual ::java::util::Currency * getCurrency();
-  virtual void setCurrency(::java::util::Currency *);
-  static const jint INTEGER_FIELD = 0;
-  static const jint FRACTION_FIELD = 1;
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::java::text::Format)))) groupingUsed;
-  jint maximumFractionDigits;
-private:
-  jbyte maxFractionDigits;
-public: // actually package-private
-  jint maximumIntegerDigits;
-private:
-  jbyte maxIntegerDigits;
-public: // actually package-private
-  jint minimumFractionDigits;
-private:
-  jbyte minFractionDigits;
-public: // actually package-private
-  jint minimumIntegerDigits;
-private:
-  jbyte minIntegerDigits;
-public: // actually package-private
-  jboolean parseIntegerOnly;
-private:
-  jint serialVersionOnStream;
-  static const jlong serialVersionUID = -2308460125733713944LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_NumberFormat__
diff --git a/libjava/java/text/ParseException.h b/libjava/java/text/ParseException.h
deleted file mode 100644
index e8b314fa2d1..00000000000
--- a/libjava/java/text/ParseException.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_ParseException__
-#define __java_text_ParseException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class ParseException;
-    }
-  }
-}
-
-class java::text::ParseException : public ::java::lang::Exception
-{
-
-public:
-  ParseException(::java::lang::String *, jint);
-  virtual jint getErrorOffset();
-private:
-  static const jlong serialVersionUID = 2703218443322787634LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) errorOffset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_ParseException__
diff --git a/libjava/java/text/ParsePosition.h b/libjava/java/text/ParsePosition.h
deleted file mode 100644
index 4f7970cea94..00000000000
--- a/libjava/java/text/ParsePosition.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_ParsePosition__
-#define __java_text_ParsePosition__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class ParsePosition;
-    }
-  }
-}
-
-class java::text::ParsePosition : public ::java::lang::Object
-{
-
-public:
-  ParsePosition(jint);
-  virtual jint getIndex();
-  virtual void setIndex(jint);
-  virtual jint getErrorIndex();
-  virtual void setErrorIndex(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-  jint error_index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_ParsePosition__
diff --git a/libjava/java/text/RuleBasedCollator$CollationElement.h b/libjava/java/text/RuleBasedCollator$CollationElement.h
deleted file mode 100644
index 8baa2a46d84..00000000000
--- a/libjava/java/text/RuleBasedCollator$CollationElement.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_RuleBasedCollator$CollationElement__
-#define __java_text_RuleBasedCollator$CollationElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class RuleBasedCollator$CollationElement;
-    }
-  }
-}
-
-class java::text::RuleBasedCollator$CollationElement : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RuleBasedCollator$CollationElement(::java::lang::String *, jint, jshort, jshort, jshort, ::java::lang::String *, jboolean);
-  jint getValue();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  jint primary;
-  jshort secondary;
-  jshort tertiary;
-  jshort equality;
-  jboolean ignore;
-  ::java::lang::String * expansion;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_RuleBasedCollator$CollationElement__
diff --git a/libjava/java/text/RuleBasedCollator$CollationSorter.h b/libjava/java/text/RuleBasedCollator$CollationSorter.h
deleted file mode 100644
index 4436ec955bc..00000000000
--- a/libjava/java/text/RuleBasedCollator$CollationSorter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_RuleBasedCollator$CollationSorter__
-#define __java_text_RuleBasedCollator$CollationSorter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class RuleBasedCollator$CollationSorter;
-    }
-  }
-}
-
-class java::text::RuleBasedCollator$CollationSorter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  RuleBasedCollator$CollationSorter();
-  static const jint GREATERP = 0;
-  static const jint GREATERS = 1;
-  static const jint GREATERT = 2;
-  static const jint EQUAL = 3;
-  static const jint RESET = 4;
-  static const jint INVERSE_SECONDARY = 5;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) comparisonType;
-  ::java::lang::String * textElement;
-  jint hashText;
-  jint offset;
-  jboolean ignore;
-  ::java::lang::String * expansionOrdering;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_RuleBasedCollator$CollationSorter__
diff --git a/libjava/java/text/RuleBasedCollator.h b/libjava/java/text/RuleBasedCollator.h
deleted file mode 100644
index 06803c8514a..00000000000
--- a/libjava/java/text/RuleBasedCollator.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_RuleBasedCollator__
-#define __java_text_RuleBasedCollator__
-
-#pragma interface
-
-#include <java/text/Collator.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class CharacterIterator;
-        class CollationElementIterator;
-        class CollationKey;
-        class RuleBasedCollator;
-        class RuleBasedCollator$CollationElement;
-    }
-  }
-}
-
-class java::text::RuleBasedCollator : public ::java::text::Collator
-{
-
-public:
-  RuleBasedCollator(::java::lang::String *);
-public: // actually package-private
-  static jint findPrefixLength(::java::lang::String *, ::java::lang::String *);
-private:
-  void mergeRules(jint, ::java::lang::String *, ::java::util::ArrayList *, ::java::util::ArrayList *);
-  jint subParseString(jboolean, ::java::util::ArrayList *, jint, ::java::lang::String *);
-public:
-  virtual ::java::lang::Object * clone();
-private:
-  ::java::util::ArrayList * parseString(::java::lang::String *);
-  void buildCollationVector(::java::util::ArrayList *);
-  void buildPrefixAccess();
-public:
-  virtual jint compare(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  virtual ::java::text::RuleBasedCollator$CollationElement * getDefaultElement(jchar);
-  virtual ::java::text::RuleBasedCollator$CollationElement * getDefaultAccentedElement(jchar);
-public:
-  virtual ::java::text::CollationElementIterator * getCollationElementIterator(::java::lang::String *);
-  virtual ::java::text::CollationElementIterator * getCollationElementIterator(::java::text::CharacterIterator *);
-  virtual ::java::text::CollationKey * getCollationKey(::java::lang::String *);
-  virtual ::java::lang::String * getRules();
-  virtual jint hashCode();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::text::Collator)))) rules;
-  JArray< ::java::lang::Object * > * ce_table;
-public: // actually package-private
-  ::java::util::HashMap * prefix_tree;
-private:
-  jint last_primary_value;
-  jint last_tertiary_value;
-  jboolean inverseAccentComparison;
-public: // actually package-private
-  static ::java::text::RuleBasedCollator$CollationElement * SPECIAL_UNKNOWN_SEQ;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_RuleBasedCollator__
diff --git a/libjava/java/text/SimpleDateFormat$CompiledField.h b/libjava/java/text/SimpleDateFormat$CompiledField.h
deleted file mode 100644
index b188792018a..00000000000
--- a/libjava/java/text/SimpleDateFormat$CompiledField.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_SimpleDateFormat$CompiledField__
-#define __java_text_SimpleDateFormat$CompiledField__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class SimpleDateFormat;
-        class SimpleDateFormat$CompiledField;
-    }
-  }
-}
-
-class java::text::SimpleDateFormat$CompiledField : public ::java::lang::Object
-{
-
-public:
-  SimpleDateFormat$CompiledField(::java::text::SimpleDateFormat *, jint, jint, jchar);
-  virtual jint getField();
-  virtual jint getSize();
-  virtual jchar getCharacter();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) field;
-  jint size;
-private:
-  jchar character;
-public: // actually package-private
-  ::java::text::SimpleDateFormat * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_SimpleDateFormat$CompiledField__
diff --git a/libjava/java/text/SimpleDateFormat.h b/libjava/java/text/SimpleDateFormat.h
deleted file mode 100644
index a6ffbf50718..00000000000
--- a/libjava/java/text/SimpleDateFormat.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_SimpleDateFormat__
-#define __java_text_SimpleDateFormat__
-
-#pragma interface
-
-#include <java/text/DateFormat.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace text
-      {
-          class FormatBuffer;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace text
-    {
-        class AttributedCharacterIterator;
-        class DateFormatSymbols;
-        class FieldPosition;
-        class ParsePosition;
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class java::text::SimpleDateFormat : public ::java::text::DateFormat
-{
-
-  void readObject(::java::io::ObjectInputStream *);
-  void compileFormat(::java::lang::String *);
-public:
-  virtual ::java::lang::String * toString();
-  SimpleDateFormat();
-  SimpleDateFormat(::java::lang::String *);
-  SimpleDateFormat(::java::lang::String *, ::java::util::Locale *);
-  SimpleDateFormat(::java::lang::String *, ::java::text::DateFormatSymbols *);
-  virtual ::java::lang::String * toPattern();
-  virtual ::java::lang::String * toLocalizedPattern();
-  virtual void applyPattern(::java::lang::String *);
-  virtual void applyLocalizedPattern(::java::lang::String *);
-private:
-  ::java::lang::String * translateLocalizedPattern(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::util::Date * get2DigitYearStart();
-  virtual void set2DigitYearStart(::java::util::Date *);
-  virtual ::java::text::DateFormatSymbols * getDateFormatSymbols();
-  virtual void setDateFormatSymbols(::java::text::DateFormatSymbols *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  void formatWithAttribute(::java::util::Date *, ::gnu::java::text::FormatBuffer *, ::java::text::FieldPosition *);
-public:
-  virtual ::java::lang::StringBuffer * format(::java::util::Date *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *);
-  virtual ::java::text::AttributedCharacterIterator * formatToCharacterIterator(::java::lang::Object *);
-private:
-  void withLeadingZeros(jint, jint, ::gnu::java::text::FormatBuffer *);
-  jboolean expect(::java::lang::String *, ::java::text::ParsePosition *, jchar);
-public:
-  virtual ::java::util::Date * parse(::java::lang::String *, ::java::text::ParsePosition *);
-private:
-  ::java::lang::Integer * computeOffset(::java::lang::String *, ::java::text::ParsePosition *);
-  void computeCenturyStart();
-public:
-  virtual ::java::lang::Object * clone();
-private:
-  ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::text::DateFormat)))) tokens;
-  ::java::text::DateFormatSymbols * formatData;
-  ::java::util::Date * defaultCenturyStart;
-  jint defaultCentury;
-  ::java::lang::String * pattern;
-  jint serialVersionOnStream;
-  static const jlong serialVersionUID = 4774881970558875024LL;
-  static ::java::lang::String * standardChars;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_SimpleDateFormat__
diff --git a/libjava/java/text/StringCharacterIterator.h b/libjava/java/text/StringCharacterIterator.h
deleted file mode 100644
index d1769635609..00000000000
--- a/libjava/java/text/StringCharacterIterator.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_text_StringCharacterIterator__
-#define __java_text_StringCharacterIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class StringCharacterIterator;
-    }
-  }
-}
-
-class java::text::StringCharacterIterator : public ::java::lang::Object
-{
-
-public:
-  StringCharacterIterator(::java::lang::String *);
-  StringCharacterIterator(::java::lang::String *, jint);
-  StringCharacterIterator(::java::lang::String *, jint, jint, jint);
-public: // actually package-private
-  StringCharacterIterator(::java::text::StringCharacterIterator *, jint, jint);
-public:
-  jchar current();
-  jchar next();
-  jchar previous();
-  jchar first();
-  jchar last();
-  jint getIndex();
-  jchar setIndex(jint);
-  jint getBeginIndex();
-  jint getEndIndex();
-  ::java::lang::Object * clone();
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  void setText(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
-  jint begin;
-  jint end;
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_text_StringCharacterIterator__
diff --git a/libjava/java/util/AbstractCollection.h b/libjava/java/util/AbstractCollection.h
deleted file mode 100644
index 15d129d1cde..00000000000
--- a/libjava/java/util/AbstractCollection.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractCollection__
-#define __java_util_AbstractCollection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::AbstractCollection : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractCollection();
-public:
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual jint size() = 0;
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual void clear();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean containsAll(::java::util::Collection *);
-  virtual jboolean isEmpty();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean removeAll(::java::util::Collection *);
-public: // actually package-private
-  virtual jboolean removeAllInternal(::java::util::Collection *);
-public:
-  virtual jboolean retainAll(::java::util::Collection *);
-public: // actually package-private
-  virtual jboolean retainAllInternal(::java::util::Collection *);
-public:
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-  static jint hashCode(::java::lang::Object *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractCollection__
diff --git a/libjava/java/util/AbstractList$1.h b/libjava/java/util/AbstractList$1.h
deleted file mode 100644
index 996ce73572e..00000000000
--- a/libjava/java/util/AbstractList$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractList$1__
-#define __java_util_AbstractList$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::AbstractList$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractList$1(::java::util::AbstractList$SubList *, jint);
-public:
-  jboolean hasNext();
-  jboolean hasPrevious();
-  ::java::lang::Object * next();
-  ::java::lang::Object * previous();
-  jint nextIndex();
-  jint previousIndex();
-  void remove();
-  void set(::java::lang::Object *);
-  void add(::java::lang::Object *);
-private:
-  ::java::util::ListIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
-  jint position;
-public: // actually package-private
-  ::java::util::AbstractList$SubList * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractList$1__
diff --git a/libjava/java/util/AbstractList$2.h b/libjava/java/util/AbstractList$2.h
deleted file mode 100644
index 6971dc802bb..00000000000
--- a/libjava/java/util/AbstractList$2.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractList$2__
-#define __java_util_AbstractList$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::AbstractList$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractList$2(::java::util::AbstractList *);
-private:
-  void checkMod();
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) pos;
-  jint size;
-  jint last;
-  jint knownMod;
-public: // actually package-private
-  ::java::util::AbstractList * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractList$2__
diff --git a/libjava/java/util/AbstractList$3.h b/libjava/java/util/AbstractList$3.h
deleted file mode 100644
index 0bf2bda682d..00000000000
--- a/libjava/java/util/AbstractList$3.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractList$3__
-#define __java_util_AbstractList$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::AbstractList$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractList$3(::java::util::AbstractList *, jint);
-private:
-  void checkMod();
-public:
-  jboolean hasNext();
-  jboolean hasPrevious();
-  ::java::lang::Object * next();
-  ::java::lang::Object * previous();
-  jint nextIndex();
-  jint previousIndex();
-  void remove();
-  void set(::java::lang::Object *);
-  void add(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) knownMod;
-  jint position;
-  jint lastReturned;
-  jint size;
-public: // actually package-private
-  ::java::util::AbstractList * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractList$3__
diff --git a/libjava/java/util/AbstractList$RandomAccessSubList.h b/libjava/java/util/AbstractList$RandomAccessSubList.h
deleted file mode 100644
index 49b23bc399d..00000000000
--- a/libjava/java/util/AbstractList$RandomAccessSubList.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractList$RandomAccessSubList__
-#define __java_util_AbstractList$RandomAccessSubList__
-
-#pragma interface
-
-#include <java/util/AbstractList$SubList.h>
-
-class java::util::AbstractList$RandomAccessSubList : public ::java::util::AbstractList$SubList
-{
-
-public: // actually package-private
-  AbstractList$RandomAccessSubList(::java::util::AbstractList *, jint, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractList$RandomAccessSubList__
diff --git a/libjava/java/util/AbstractList$SubList.h b/libjava/java/util/AbstractList$SubList.h
deleted file mode 100644
index e258ed4df22..00000000000
--- a/libjava/java/util/AbstractList$SubList.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractList$SubList__
-#define __java_util_AbstractList$SubList__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-
-class java::util::AbstractList$SubList : public ::java::util::AbstractList
-{
-
-public: // actually package-private
-  AbstractList$SubList(::java::util::AbstractList *, jint, jint);
-  virtual void checkMod();
-private:
-  void checkBoundsInclusive(jint);
-  void checkBoundsExclusive(jint);
-public:
-  virtual jint size();
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual void add(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * remove(jint);
-public: // actually protected
-  virtual void removeRange(jint, jint);
-public:
-  virtual jboolean addAll(jint, ::java::util::Collection *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::util::ListIterator * listIterator(jint);
-public: // actually package-private
-  ::java::util::AbstractList * __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) backingList;
-  jint offset;
-  jint size__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractList$SubList__
diff --git a/libjava/java/util/AbstractList.h b/libjava/java/util/AbstractList.h
deleted file mode 100644
index ace35d68d08..00000000000
--- a/libjava/java/util/AbstractList.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractList__
-#define __java_util_AbstractList__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::AbstractList : public ::java::util::AbstractCollection
-{
-
-public: // actually protected
-  AbstractList();
-public:
-  virtual ::java::lang::Object * get(jint) = 0;
-  virtual void add(jint, ::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean addAll(jint, ::java::util::Collection *);
-  virtual void clear();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jint indexOf(::java::lang::Object *);
-  virtual ::java::util::Iterator * iterator();
-  virtual jint lastIndexOf(::java::lang::Object *);
-  virtual ::java::util::ListIterator * listIterator();
-  virtual ::java::util::ListIterator * listIterator(jint);
-  virtual ::java::lang::Object * remove(jint);
-public: // actually protected
-  virtual void removeRange(jint, jint);
-public:
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual ::java::util::List * subList(jint, jint);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) modCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractList__
diff --git a/libjava/java/util/AbstractMap$1.h b/libjava/java/util/AbstractMap$1.h
deleted file mode 100644
index bf27fc1adaa..00000000000
--- a/libjava/java/util/AbstractMap$1.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractMap$1__
-#define __java_util_AbstractMap$1__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::AbstractMap$1 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  AbstractMap$1(::java::util::AbstractMap *);
-public:
-  jint size();
-  jboolean contains(::java::lang::Object *);
-  ::java::util::Iterator * iterator();
-public: // actually package-private
-  static ::java::util::AbstractMap * access$0(::java::util::AbstractMap$1 *);
-  ::java::util::AbstractMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractMap$1__
diff --git a/libjava/java/util/AbstractMap$2.h b/libjava/java/util/AbstractMap$2.h
deleted file mode 100644
index 048cfa70ceb..00000000000
--- a/libjava/java/util/AbstractMap$2.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractMap$2__
-#define __java_util_AbstractMap$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::AbstractMap$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractMap$2(::java::util::AbstractMap$1 *);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-private:
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) map_iterator;
-public: // actually package-private
-  ::java::util::AbstractMap$1 * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractMap$2__
diff --git a/libjava/java/util/AbstractMap$3.h b/libjava/java/util/AbstractMap$3.h
deleted file mode 100644
index 5797790df9f..00000000000
--- a/libjava/java/util/AbstractMap$3.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractMap$3__
-#define __java_util_AbstractMap$3__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::AbstractMap$3 : public ::java::util::AbstractCollection
-{
-
-public: // actually package-private
-  AbstractMap$3(::java::util::AbstractMap *);
-public:
-  jint size();
-  jboolean contains(::java::lang::Object *);
-  ::java::util::Iterator * iterator();
-public: // actually package-private
-  static ::java::util::AbstractMap * access$0(::java::util::AbstractMap$3 *);
-  ::java::util::AbstractMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractMap$3__
diff --git a/libjava/java/util/AbstractMap$4.h b/libjava/java/util/AbstractMap$4.h
deleted file mode 100644
index 4bf28865916..00000000000
--- a/libjava/java/util/AbstractMap$4.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractMap$4__
-#define __java_util_AbstractMap$4__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::AbstractMap$4 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractMap$4(::java::util::AbstractMap$3 *);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-private:
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) map_iterator;
-public: // actually package-private
-  ::java::util::AbstractMap$3 * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractMap$4__
diff --git a/libjava/java/util/AbstractMap$SimpleEntry.h b/libjava/java/util/AbstractMap$SimpleEntry.h
deleted file mode 100644
index 0cc266dfe0a..00000000000
--- a/libjava/java/util/AbstractMap$SimpleEntry.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractMap$SimpleEntry__
-#define __java_util_AbstractMap$SimpleEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::AbstractMap$SimpleEntry : public ::java::lang::Object
-{
-
-public:
-  AbstractMap$SimpleEntry(::java::lang::Object *, ::java::lang::Object *);
-  AbstractMap$SimpleEntry(::java::util::Map$Entry *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getKey();
-  virtual ::java::lang::Object * getValue();
-  virtual jint hashCode();
-  virtual ::java::lang::Object * setValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::lang::Object * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractMap$SimpleEntry__
diff --git a/libjava/java/util/AbstractMap$SimpleImmutableEntry.h b/libjava/java/util/AbstractMap$SimpleImmutableEntry.h
deleted file mode 100644
index 540d5f49f4a..00000000000
--- a/libjava/java/util/AbstractMap$SimpleImmutableEntry.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractMap$SimpleImmutableEntry__
-#define __java_util_AbstractMap$SimpleImmutableEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::AbstractMap$SimpleImmutableEntry : public ::java::lang::Object
-{
-
-public:
-  AbstractMap$SimpleImmutableEntry(::java::lang::Object *, ::java::lang::Object *);
-  AbstractMap$SimpleImmutableEntry(::java::util::Map$Entry *);
-  virtual ::java::lang::Object * getKey();
-  virtual ::java::lang::Object * getValue();
-  virtual ::java::lang::Object * setValue(::java::lang::Object *);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::lang::Object * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractMap$SimpleImmutableEntry__
diff --git a/libjava/java/util/AbstractMap.h b/libjava/java/util/AbstractMap.h
deleted file mode 100644
index fba927661e7..00000000000
--- a/libjava/java/util/AbstractMap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractMap__
-#define __java_util_AbstractMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::AbstractMap : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractMap();
-public:
-  virtual ::java::util::Set * entrySet() = 0;
-  virtual void clear();
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-public:
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::util::Set * keySet();
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::Collection * values();
-public: // actually package-private
-  static jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-  static jint hashCode(::java::lang::Object *);
-  static const jint KEYS = 0;
-  static const jint VALUES = 1;
-  static const jint ENTRIES = 2;
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keys;
-  ::java::util::Collection * values__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractMap__
diff --git a/libjava/java/util/AbstractQueue.h b/libjava/java/util/AbstractQueue.h
deleted file mode 100644
index f194c25d6d6..00000000000
--- a/libjava/java/util/AbstractQueue.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractQueue__
-#define __java_util_AbstractQueue__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::AbstractQueue : public ::java::util::AbstractCollection
-{
-
-public: // actually protected
-  AbstractQueue();
-public:
-  virtual jboolean add(::java::lang::Object *);
-  virtual ::java::lang::Object * remove();
-  virtual ::java::lang::Object * element();
-  virtual void clear();
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual jboolean offer(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * poll() = 0;
-  virtual ::java::lang::Object * peek() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractQueue__
diff --git a/libjava/java/util/AbstractSequentialList.h b/libjava/java/util/AbstractSequentialList.h
deleted file mode 100644
index 7763024e5a2..00000000000
--- a/libjava/java/util/AbstractSequentialList.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractSequentialList__
-#define __java_util_AbstractSequentialList__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-
-class java::util::AbstractSequentialList : public ::java::util::AbstractList
-{
-
-public: // actually protected
-  AbstractSequentialList();
-public:
-  virtual ::java::util::ListIterator * listIterator(jint) = 0;
-  virtual void add(jint, ::java::lang::Object *);
-  virtual jboolean addAll(jint, ::java::util::Collection *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::lang::Object * remove(jint);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractSequentialList__
diff --git a/libjava/java/util/AbstractSet.h b/libjava/java/util/AbstractSet.h
deleted file mode 100644
index b3ec3993931..00000000000
--- a/libjava/java/util/AbstractSet.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_AbstractSet__
-#define __java_util_AbstractSet__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::AbstractSet : public ::java::util::AbstractCollection
-{
-
-public: // actually protected
-  AbstractSet();
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean removeAll(::java::util::Collection *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_AbstractSet__
diff --git a/libjava/java/util/ArrayDeque$DeqIterator.h b/libjava/java/util/ArrayDeque$DeqIterator.h
deleted file mode 100644
index bbe30bc5376..00000000000
--- a/libjava/java/util/ArrayDeque$DeqIterator.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_ArrayDeque$DeqIterator__
-#define __java_util_ArrayDeque$DeqIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::ArrayDeque$DeqIterator : public ::java::lang::Object
-{
-
-  ArrayDeque$DeqIterator(::java::util::ArrayDeque *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-public: // actually package-private
-  ArrayDeque$DeqIterator(::java::util::ArrayDeque *, ::java::util::ArrayDeque$DeqIterator *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) cursor;
-  jint fence;
-  jint lastRet;
-public: // actually package-private
-  ::java::util::ArrayDeque * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_ArrayDeque$DeqIterator__
diff --git a/libjava/java/util/ArrayDeque$DescendingIterator.h b/libjava/java/util/ArrayDeque$DescendingIterator.h
deleted file mode 100644
index ee72fd7b695..00000000000
--- a/libjava/java/util/ArrayDeque$DescendingIterator.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_ArrayDeque$DescendingIterator__
-#define __java_util_ArrayDeque$DescendingIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::ArrayDeque$DescendingIterator : public ::java::lang::Object
-{
-
-  ArrayDeque$DescendingIterator(::java::util::ArrayDeque *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-public: // actually package-private
-  ArrayDeque$DescendingIterator(::java::util::ArrayDeque *, ::java::util::ArrayDeque$DescendingIterator *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) cursor;
-  jint fence;
-  jint lastRet;
-public: // actually package-private
-  ::java::util::ArrayDeque * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_ArrayDeque$DescendingIterator__
diff --git a/libjava/java/util/ArrayDeque.h b/libjava/java/util/ArrayDeque.h
deleted file mode 100644
index 6154213dd7e..00000000000
--- a/libjava/java/util/ArrayDeque.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_ArrayDeque__
-#define __java_util_ArrayDeque__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-#include <gcj/array.h>
-
-
-class java::util::ArrayDeque : public ::java::util::AbstractCollection
-{
-
-  void allocateElements(jint);
-  void doubleCapacity();
-  JArray< ::java::lang::Object * > * copyElements(JArray< ::java::lang::Object * > *);
-public:
-  ArrayDeque();
-  ArrayDeque(jint);
-  ArrayDeque(::java::util::Collection *);
-  virtual void addFirst(::java::lang::Object *);
-  virtual void addLast(::java::lang::Object *);
-  virtual jboolean offerFirst(::java::lang::Object *);
-  virtual jboolean offerLast(::java::lang::Object *);
-  virtual ::java::lang::Object * removeFirst();
-  virtual ::java::lang::Object * removeLast();
-  virtual ::java::lang::Object * pollFirst();
-  virtual ::java::lang::Object * pollLast();
-  virtual ::java::lang::Object * getFirst();
-  virtual ::java::lang::Object * getLast();
-  virtual ::java::lang::Object * peekFirst();
-  virtual ::java::lang::Object * peekLast();
-  virtual jboolean removeFirstOccurrence(::java::lang::Object *);
-  virtual jboolean removeLastOccurrence(::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean offer(::java::lang::Object *);
-  virtual ::java::lang::Object * remove();
-  virtual ::java::lang::Object * poll();
-  virtual ::java::lang::Object * element();
-  virtual ::java::lang::Object * peek();
-  virtual void push(::java::lang::Object *);
-  virtual ::java::lang::Object * pop();
-private:
-  void checkInvariants();
-  jboolean delete$(jint);
-public:
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::util::Iterator * descendingIterator();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual void clear();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::util::ArrayDeque * target$clone();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  virtual ::java::lang::Object * clone();
-public: // actually package-private
-  static jint access$1(::java::util::ArrayDeque *);
-  static jint access$2(::java::util::ArrayDeque *);
-  static JArray< ::java::lang::Object * > * access$3(::java::util::ArrayDeque *);
-  static jboolean access$4(::java::util::ArrayDeque *, jint);
-private:
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) elements;
-  jint head;
-  jint tail;
-  static const jint MIN_INITIAL_CAPACITY = 8;
-  static const jlong serialVersionUID = 2340985798034038923LL;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_ArrayDeque__
diff --git a/libjava/java/util/ArrayList.h b/libjava/java/util/ArrayList.h
deleted file mode 100644
index 755e7c5a98d..00000000000
--- a/libjava/java/util/ArrayList.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_ArrayList__
-#define __java_util_ArrayList__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-#include <gcj/array.h>
-
-
-class java::util::ArrayList : public ::java::util::AbstractList
-{
-
-public:
-  ArrayList(jint);
-  ArrayList();
-  ArrayList(::java::util::Collection *);
-  virtual void trimToSize();
-  virtual void ensureCapacity(jint);
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jint indexOf(::java::lang::Object *);
-  virtual jint lastIndexOf(::java::lang::Object *);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual void add(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * remove(jint);
-  virtual void clear();
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual jboolean addAll(jint, ::java::util::Collection *);
-public: // actually protected
-  virtual void removeRange(jint, jint);
-private:
-  void checkBoundInclusive(jint);
-  void checkBoundExclusive(jint);
-public: // actually package-private
-  virtual jboolean removeAllInternal(::java::util::Collection *);
-  virtual jboolean retainAllInternal(::java::util::Collection *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 8683452581122892189LL;
-  static const jint DEFAULT_CAPACITY = 10;
-  jint __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) size__;
-  JArray< ::java::lang::Object * > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_ArrayList__
diff --git a/libjava/java/util/Arrays$ArrayList.h b/libjava/java/util/Arrays$ArrayList.h
deleted file mode 100644
index 3fe96863995..00000000000
--- a/libjava/java/util/Arrays$ArrayList.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Arrays$ArrayList__
-#define __java_util_Arrays$ArrayList__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-#include <gcj/array.h>
-
-
-class java::util::Arrays$ArrayList : public ::java::util::AbstractList
-{
-
-public: // actually package-private
-  Arrays$ArrayList(JArray< ::java::lang::Object * > *);
-public:
-  ::java::lang::Object * get(jint);
-  jint size();
-  ::java::lang::Object * set(jint, ::java::lang::Object *);
-  jboolean contains(::java::lang::Object *);
-  jint indexOf(::java::lang::Object *);
-  jint lastIndexOf(::java::lang::Object *);
-  JArray< ::java::lang::Object * > * toArray();
-  JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-private:
-  static const jlong serialVersionUID = -2764017481108945198LL;
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) a;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Arrays$ArrayList__
diff --git a/libjava/java/util/Arrays.h b/libjava/java/util/Arrays.h
deleted file mode 100644
index 6b4941db0ea..00000000000
--- a/libjava/java/util/Arrays.h
+++ /dev/null
@@ -1,144 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Arrays__
-#define __java_util_Arrays__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Arrays : public ::java::lang::Object
-{
-
-  Arrays();
-public:
-  static jint binarySearch(JArray< jbyte > *, jbyte);
-  static jint binarySearch(JArray< jchar > *, jchar);
-  static jint binarySearch(JArray< jshort > *, jshort);
-  static jint binarySearch(JArray< jint > *, jint);
-  static jint binarySearch(JArray< jlong > *, jlong);
-  static jint binarySearch(JArray< jfloat > *, jfloat);
-  static jint binarySearch(JArray< jdouble > *, jdouble);
-  static jint binarySearch(JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  static jint binarySearch(JArray< ::java::lang::Object * > *, ::java::lang::Object *, ::java::util::Comparator *);
-  static jboolean equals(JArray< jboolean > *, JArray< jboolean > *);
-  static jboolean equals(JArray< jbyte > *, JArray< jbyte > *);
-  static jboolean equals(JArray< jchar > *, JArray< jchar > *);
-  static jboolean equals(JArray< jshort > *, JArray< jshort > *);
-  static jboolean equals(JArray< jint > *, JArray< jint > *);
-  static jboolean equals(JArray< jlong > *, JArray< jlong > *);
-  static jboolean equals(JArray< jfloat > *, JArray< jfloat > *);
-  static jboolean equals(JArray< jdouble > *, JArray< jdouble > *);
-  static jboolean equals(JArray< ::java::lang::Object * > *, JArray< ::java::lang::Object * > *);
-  static void fill(JArray< jboolean > *, jboolean);
-  static void fill(JArray< jboolean > *, jint, jint, jboolean);
-  static void fill(JArray< jbyte > *, jbyte);
-  static void fill(JArray< jbyte > *, jint, jint, jbyte);
-  static void fill(JArray< jchar > *, jchar);
-  static void fill(JArray< jchar > *, jint, jint, jchar);
-  static void fill(JArray< jshort > *, jshort);
-  static void fill(JArray< jshort > *, jint, jint, jshort);
-  static void fill(JArray< jint > *, jint);
-  static void fill(JArray< jint > *, jint, jint, jint);
-  static void fill(JArray< jlong > *, jlong);
-  static void fill(JArray< jlong > *, jint, jint, jlong);
-  static void fill(JArray< jfloat > *, jfloat);
-  static void fill(JArray< jfloat > *, jint, jint, jfloat);
-  static void fill(JArray< jdouble > *, jdouble);
-  static void fill(JArray< jdouble > *, jint, jint, jdouble);
-  static void fill(JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  static void fill(JArray< ::java::lang::Object * > *, jint, jint, ::java::lang::Object *);
-  static void sort(JArray< jbyte > *);
-  static void sort(JArray< jbyte > *, jint, jint);
-private:
-  static jint med3(jint, jint, jint, JArray< jbyte > *);
-  static void swap(jint, jint, JArray< jbyte > *);
-  static void vecswap(jint, jint, jint, JArray< jbyte > *);
-  static void qsort(JArray< jbyte > *, jint, jint);
-public:
-  static void sort(JArray< jchar > *);
-  static void sort(JArray< jchar > *, jint, jint);
-private:
-  static jint med3(jint, jint, jint, JArray< jchar > *);
-  static void swap(jint, jint, JArray< jchar > *);
-  static void vecswap(jint, jint, jint, JArray< jchar > *);
-  static void qsort(JArray< jchar > *, jint, jint);
-public:
-  static void sort(JArray< jshort > *);
-  static void sort(JArray< jshort > *, jint, jint);
-private:
-  static jint med3(jint, jint, jint, JArray< jshort > *);
-  static void swap(jint, jint, JArray< jshort > *);
-  static void vecswap(jint, jint, jint, JArray< jshort > *);
-  static void qsort(JArray< jshort > *, jint, jint);
-public:
-  static void sort(JArray< jint > *);
-  static void sort(JArray< jint > *, jint, jint);
-private:
-  static jint med3(jint, jint, jint, JArray< jint > *);
-  static void swap(jint, jint, JArray< jint > *);
-  static void vecswap(jint, jint, jint, JArray< jint > *);
-  static jint compare(jint, jint);
-  static void qsort(JArray< jint > *, jint, jint);
-public:
-  static void sort(JArray< jlong > *);
-  static void sort(JArray< jlong > *, jint, jint);
-private:
-  static jint med3(jint, jint, jint, JArray< jlong > *);
-  static void swap(jint, jint, JArray< jlong > *);
-  static void vecswap(jint, jint, jint, JArray< jlong > *);
-  static jint compare(jlong, jlong);
-  static void qsort(JArray< jlong > *, jint, jint);
-public:
-  static void sort(JArray< jfloat > *);
-  static void sort(JArray< jfloat > *, jint, jint);
-private:
-  static jint med3(jint, jint, jint, JArray< jfloat > *);
-  static void swap(jint, jint, JArray< jfloat > *);
-  static void vecswap(jint, jint, jint, JArray< jfloat > *);
-  static void qsort(JArray< jfloat > *, jint, jint);
-public:
-  static void sort(JArray< jdouble > *);
-  static void sort(JArray< jdouble > *, jint, jint);
-private:
-  static jint med3(jint, jint, jint, JArray< jdouble > *);
-  static void swap(jint, jint, JArray< jdouble > *);
-  static void vecswap(jint, jint, jint, JArray< jdouble > *);
-  static void qsort(JArray< jdouble > *, jint, jint);
-public:
-  static void sort(JArray< ::java::lang::Object * > *);
-  static void sort(JArray< ::java::lang::Object * > *, ::java::util::Comparator *);
-  static void sort(JArray< ::java::lang::Object * > *, jint, jint);
-  static void sort(JArray< ::java::lang::Object * > *, jint, jint, ::java::util::Comparator *);
-  static ::java::util::List * asList(JArray< ::java::lang::Object * > *);
-  static jint hashCode(JArray< jlong > *);
-  static jint hashCode(JArray< jint > *);
-  static jint hashCode(JArray< jshort > *);
-  static jint hashCode(JArray< jchar > *);
-  static jint hashCode(JArray< jbyte > *);
-  static jint hashCode(JArray< jboolean > *);
-  static jint hashCode(JArray< jfloat > *);
-  static jint hashCode(JArray< jdouble > *);
-  static jint hashCode(JArray< ::java::lang::Object * > *);
-  static jint deepHashCode(JArray< ::java::lang::Object * > *);
-  static jboolean deepEquals(JArray< ::java::lang::Object * > *, JArray< ::java::lang::Object * > *);
-  static ::java::lang::String * toString(JArray< jboolean > *);
-  static ::java::lang::String * toString(JArray< jbyte > *);
-  static ::java::lang::String * toString(JArray< jchar > *);
-  static ::java::lang::String * toString(JArray< jshort > *);
-  static ::java::lang::String * toString(JArray< jint > *);
-  static ::java::lang::String * toString(JArray< jlong > *);
-  static ::java::lang::String * toString(JArray< jfloat > *);
-  static ::java::lang::String * toString(JArray< jdouble > *);
-  static ::java::lang::String * toString(JArray< ::java::lang::Object * > *);
-private:
-  static void deepToString(JArray< ::java::lang::Object * > *, ::java::lang::StringBuilder *, ::java::util::HashSet *);
-public:
-  static ::java::lang::String * deepToString(JArray< ::java::lang::Object * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Arrays__
diff --git a/libjava/java/util/BitSet.h b/libjava/java/util/BitSet.h
deleted file mode 100644
index 1470ca0b2c8..00000000000
--- a/libjava/java/util/BitSet.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_BitSet__
-#define __java_util_BitSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::BitSet : public ::java::lang::Object
-{
-
-public:
-  BitSet();
-  BitSet(jint);
-  virtual void and$(::java::util::BitSet *);
-  virtual void andNot(::java::util::BitSet *);
-  virtual jint cardinality();
-  virtual void clear();
-  virtual void clear(jint);
-  virtual void clear(jint, jint);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual void flip(jint);
-  virtual void flip(jint, jint);
-  virtual jboolean get(jint);
-  virtual ::java::util::BitSet * get(jint, jint);
-  virtual jint hashCode();
-  virtual jboolean intersects(::java::util::BitSet *);
-  virtual jboolean isEmpty();
-  virtual jint length();
-  virtual jint nextClearBit(jint);
-  virtual jint nextSetBit(jint);
-  virtual void or$(::java::util::BitSet *);
-  virtual void set(jint);
-  virtual void set(jint, jboolean);
-  virtual void set(jint, jint);
-  virtual void set(jint, jint, jboolean);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-  virtual void xor$(::java::util::BitSet *);
-private:
-  void ensure(jint);
-public: // actually package-private
-  virtual jboolean containsAll(::java::util::BitSet *);
-private:
-  static const jlong serialVersionUID = 7997698588986878753LL;
-  static const jint LONG_MASK = 63;
-  JArray< jlong > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) bits;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_BitSet__
diff --git a/libjava/java/util/Calendar.h b/libjava/java/util/Calendar.h
deleted file mode 100644
index 2cc0bef37bb..00000000000
--- a/libjava/java/util/Calendar.h
+++ /dev/null
@@ -1,140 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Calendar__
-#define __java_util_Calendar__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Calendar : public ::java::lang::Object
-{
-
-  static ::java::util::ResourceBundle * getBundle(::java::util::Locale *);
-public: // actually protected
-  Calendar();
-  Calendar(::java::util::TimeZone *, ::java::util::Locale *);
-public:
-  static ::java::util::Calendar * getInstance();
-  static ::java::util::Calendar * getInstance(::java::util::TimeZone *);
-  static ::java::util::Calendar * getInstance(::java::util::Locale *);
-  static ::java::util::Calendar * getInstance(::java::util::TimeZone *, ::java::util::Locale *);
-  static JArray< ::java::util::Locale * > * getAvailableLocales();
-public: // actually protected
-  virtual void computeTime() = 0;
-  virtual void computeFields() = 0;
-public:
-  virtual ::java::util::Date * getTime();
-  virtual void setTime(::java::util::Date *);
-  virtual jlong getTimeInMillis();
-  virtual void setTimeInMillis(jlong);
-  virtual jint get(jint);
-public: // actually protected
-  virtual jint internalGet(jint);
-public:
-  virtual void set(jint, jint);
-  virtual void set(jint, jint, jint);
-  virtual void set(jint, jint, jint, jint, jint);
-  virtual void set(jint, jint, jint, jint, jint, jint);
-  virtual void clear();
-  virtual void clear(jint);
-  virtual jboolean isSet(jint);
-public: // actually protected
-  virtual void complete();
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean before(::java::lang::Object *);
-  virtual jboolean after(::java::lang::Object *);
-  virtual void add(jint, jint) = 0;
-  virtual void roll(jint, jboolean) = 0;
-  virtual void roll(jint, jint);
-  virtual void setTimeZone(::java::util::TimeZone *);
-  virtual ::java::util::TimeZone * getTimeZone();
-  virtual void setLenient(jboolean);
-  virtual jboolean isLenient();
-  virtual void setFirstDayOfWeek(jint);
-  virtual jint getFirstDayOfWeek();
-  virtual void setMinimalDaysInFirstWeek(jint);
-  virtual jint getMinimalDaysInFirstWeek();
-  virtual jint getMinimum(jint) = 0;
-  virtual jint getMaximum(jint) = 0;
-  virtual jint getGreatestMinimum(jint) = 0;
-  virtual jint getLeastMaximum(jint) = 0;
-  virtual jint getActualMinimum(jint);
-  virtual jint getActualMaximum(jint);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  static const jint ERA = 0;
-  static const jint YEAR = 1;
-  static const jint MONTH = 2;
-  static const jint WEEK_OF_YEAR = 3;
-  static const jint WEEK_OF_MONTH = 4;
-  static const jint DATE = 5;
-  static const jint DAY_OF_MONTH = 5;
-  static const jint DAY_OF_YEAR = 6;
-  static const jint DAY_OF_WEEK = 7;
-  static const jint DAY_OF_WEEK_IN_MONTH = 8;
-  static const jint AM_PM = 9;
-  static const jint HOUR = 10;
-  static const jint HOUR_OF_DAY = 11;
-  static const jint MINUTE = 12;
-  static const jint SECOND = 13;
-  static const jint MILLISECOND = 14;
-  static const jint ZONE_OFFSET = 15;
-  static const jint DST_OFFSET = 16;
-  static const jint FIELD_COUNT = 17;
-  static const jint SUNDAY = 1;
-  static const jint MONDAY = 2;
-  static const jint TUESDAY = 3;
-  static const jint WEDNESDAY = 4;
-  static const jint THURSDAY = 5;
-  static const jint FRIDAY = 6;
-  static const jint SATURDAY = 7;
-  static const jint JANUARY = 0;
-  static const jint FEBRUARY = 1;
-  static const jint MARCH = 2;
-  static const jint APRIL = 3;
-  static const jint MAY = 4;
-  static const jint JUNE = 5;
-  static const jint JULY = 6;
-  static const jint AUGUST = 7;
-  static const jint SEPTEMBER = 8;
-  static const jint OCTOBER = 9;
-  static const jint NOVEMBER = 10;
-  static const jint DECEMBER = 11;
-  static const jint UNDECIMBER = 12;
-  static const jint AM = 0;
-  static const jint PM = 1;
-public: // actually protected
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) fields;
-  JArray< jboolean > * isSet__;
-  jlong time;
-  jboolean isTimeSet;
-  jboolean areFieldsSet;
-private:
-  ::java::util::TimeZone * zone;
-  jboolean lenient;
-  jint firstDayOfWeek;
-  jint minimalDaysInFirstWeek;
-  jboolean explicitDSTOffset;
-  jint serialVersionOnStream;
-public: // actually package-private
-  static const jlong serialVersionUID = -1807547505821590642LL;
-private:
-  static ::java::lang::String * bundleName;
-  static ::java::util::HashMap * cache;
-  static JArray< ::java::lang::Class * > * ctorArgTypes;
-  static JArray< ::java::lang::String * > * fieldNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Calendar__
diff --git a/libjava/java/util/Collection.h b/libjava/java/util/Collection.h
deleted file mode 100644
index afeb7ffee12..00000000000
--- a/libjava/java/util/Collection.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collection__
-#define __java_util_Collection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Collection : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Collection__
diff --git a/libjava/java/util/Collections$1$SynchronizedMapEntry.h b/libjava/java/util/Collections$1$SynchronizedMapEntry.h
deleted file mode 100644
index 75489874972..00000000000
--- a/libjava/java/util/Collections$1$SynchronizedMapEntry.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$1$SynchronizedMapEntry__
-#define __java_util_Collections$1$SynchronizedMapEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$1$SynchronizedMapEntry : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$1$SynchronizedMapEntry(::java::util::Collections$SynchronizedMap *, ::java::util::Map$Entry *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getKey();
-  virtual ::java::lang::Object * getValue();
-  virtual jint hashCode();
-  virtual ::java::lang::Object * setValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::util::Map$Entry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) e;
-  ::java::util::Collections$SynchronizedMap * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$1$SynchronizedMapEntry__
diff --git a/libjava/java/util/Collections$1.h b/libjava/java/util/Collections$1.h
deleted file mode 100644
index bd8fda524bb..00000000000
--- a/libjava/java/util/Collections$1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$1__
-#define __java_util_Collections$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$1(::java::util::Collections$SingletonSet *);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) hasNext__;
-public: // actually package-private
-  ::java::util::Collections$SingletonSet * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$1__
diff --git a/libjava/java/util/Collections$2.h b/libjava/java/util/Collections$2.h
deleted file mode 100644
index baf1d14ae25..00000000000
--- a/libjava/java/util/Collections$2.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$2__
-#define __java_util_Collections$2__
-
-#pragma interface
-
-#include <java/util/AbstractMap$SimpleEntry.h>
-
-class java::util::Collections$2 : public ::java::util::AbstractMap$SimpleEntry
-{
-
-public: // actually package-private
-  Collections$2(::java::util::Collections$SingletonMap *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  ::java::lang::Object * setValue(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::Collections$SingletonMap * __attribute__((aligned(__alignof__( ::java::util::AbstractMap$SimpleEntry)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$2__
diff --git a/libjava/java/util/Collections$3.h b/libjava/java/util/Collections$3.h
deleted file mode 100644
index 9c0a2bf8ccb..00000000000
--- a/libjava/java/util/Collections$3.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$3__
-#define __java_util_Collections$3__
-
-#pragma interface
-
-#include <java/util/Collections$SynchronizedSet.h>
-
-class java::util::Collections$3 : public ::java::util::Collections$SynchronizedSet
-{
-
-public: // actually package-private
-  Collections$3(::java::util::Collections$SynchronizedMap *, ::java::lang::Object *, ::java::util::Set *);
-public:
-  ::java::util::Iterator * iterator();
-public: // actually package-private
-  static ::java::util::Collections$SynchronizedMap * access$0(::java::util::Collections$3 *);
-  ::java::util::Collections$SynchronizedMap * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedSet)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$3__
diff --git a/libjava/java/util/Collections$4.h b/libjava/java/util/Collections$4.h
deleted file mode 100644
index eb7699b0da2..00000000000
--- a/libjava/java/util/Collections$4.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$4__
-#define __java_util_Collections$4__
-
-#pragma interface
-
-#include <java/util/Collections$SynchronizedIterator.h>
-
-class java::util::Collections$4 : public ::java::util::Collections$SynchronizedIterator
-{
-
-public: // actually package-private
-  Collections$4(::java::util::Collections$3 *, ::java::lang::Object *, ::java::util::Iterator *);
-public:
-  ::java::util::Map$Entry * target$next();
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::Collections$3 * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedIterator)))) this$2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$4__
diff --git a/libjava/java/util/Collections$5.h b/libjava/java/util/Collections$5.h
deleted file mode 100644
index b57ee4f03cc..00000000000
--- a/libjava/java/util/Collections$5.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$5__
-#define __java_util_Collections$5__
-
-#pragma interface
-
-#include <java/util/Collections$UnmodifiableIterator.h>
-
-class java::util::Collections$5 : public ::java::util::Collections$UnmodifiableIterator
-{
-
-public: // actually package-private
-  Collections$5(::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet *, ::java::util::Iterator *);
-public:
-  ::java::util::Map$Entry * target$next();
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet * __attribute__((aligned(__alignof__( ::java::util::Collections$UnmodifiableIterator)))) this$2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$5__
diff --git a/libjava/java/util/Collections$6.h b/libjava/java/util/Collections$6.h
deleted file mode 100644
index ec450292155..00000000000
--- a/libjava/java/util/Collections$6.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$6__
-#define __java_util_Collections$6__
-
-#pragma interface
-
-#include <java/util/Collections$CheckedIterator.h>
-
-class java::util::Collections$6 : public ::java::util::Collections$CheckedIterator
-{
-
-public: // actually package-private
-  Collections$6(::java::util::Collections$CheckedMap$CheckedEntrySet *, ::java::util::Iterator *, ::java::lang::Class *);
-public:
-  ::java::lang::Object * next();
-public: // actually package-private
-  static ::java::util::Collections$CheckedMap$CheckedEntrySet * access$0(::java::util::Collections$6 *);
-  ::java::util::Collections$CheckedMap$CheckedEntrySet * __attribute__((aligned(__alignof__( ::java::util::Collections$CheckedIterator)))) this$2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$6__
diff --git a/libjava/java/util/Collections$7.h b/libjava/java/util/Collections$7.h
deleted file mode 100644
index ba27fbfe6ce..00000000000
--- a/libjava/java/util/Collections$7.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$7__
-#define __java_util_Collections$7__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$7 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$7(::java::util::Collections$6 *, ::java::util::Map$Entry *);
-public:
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Object * getKey();
-  ::java::lang::Object * getValue();
-  jint hashCode();
-  ::java::lang::Object * setValue(::java::lang::Object *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  ::java::util::Collections$6 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$3;
-private:
-  ::java::util::Map$Entry * val$e;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$7__
diff --git a/libjava/java/util/Collections$8.h b/libjava/java/util/Collections$8.h
deleted file mode 100644
index 9662cca129c..00000000000
--- a/libjava/java/util/Collections$8.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$8__
-#define __java_util_Collections$8__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$8 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$8(::java::util::Iterator *);
-public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
-private:
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$i;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$8__
diff --git a/libjava/java/util/Collections$9.h b/libjava/java/util/Collections$9.h
deleted file mode 100644
index 303ea40f51c..00000000000
--- a/libjava/java/util/Collections$9.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$9__
-#define __java_util_Collections$9__
-
-#pragma interface
-
-#include <java/util/Collections$ReverseComparator.h>
-
-class java::util::Collections$9 : public ::java::util::Collections$ReverseComparator
-{
-
-public: // actually package-private
-  Collections$9(::java::util::Comparator *);
-public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
-private:
-  ::java::util::Comparator * __attribute__((aligned(__alignof__( ::java::util::Collections$ReverseComparator)))) val$c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$9__
diff --git a/libjava/java/util/Collections$CheckedCollection.h b/libjava/java/util/Collections$CheckedCollection.h
deleted file mode 100644
index 688439f0450..00000000000
--- a/libjava/java/util/Collections$CheckedCollection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CheckedCollection__
-#define __java_util_Collections$CheckedCollection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Collections$CheckedCollection : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$CheckedCollection(::java::util::Collection *, ::java::lang::Class *);
-public:
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual void clear();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean containsAll(::java::util::Collection *);
-  virtual jboolean isEmpty();
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual jboolean retainAll(::java::util::Collection *);
-  virtual jint size();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 1578914078182001775LL;
-public: // actually package-private
-  ::java::util::Collection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) c;
-  ::java::lang::Class * type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CheckedCollection__
diff --git a/libjava/java/util/Collections$CheckedIterator.h b/libjava/java/util/Collections$CheckedIterator.h
deleted file mode 100644
index cce1f0bcce9..00000000000
--- a/libjava/java/util/Collections$CheckedIterator.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CheckedIterator__
-#define __java_util_Collections$CheckedIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$CheckedIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$CheckedIterator(::java::util::Iterator *, ::java::lang::Class *);
-public:
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasNext();
-  virtual void remove();
-private:
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
-public: // actually package-private
-  ::java::lang::Class * type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CheckedIterator__
diff --git a/libjava/java/util/Collections$CheckedList.h b/libjava/java/util/Collections$CheckedList.h
deleted file mode 100644
index 6158bc2a794..00000000000
--- a/libjava/java/util/Collections$CheckedList.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CheckedList__
-#define __java_util_Collections$CheckedList__
-
-#pragma interface
-
-#include <java/util/Collections$CheckedCollection.h>
-
-class java::util::Collections$CheckedList : public ::java::util::Collections$CheckedCollection
-{
-
-public: // actually package-private
-  Collections$CheckedList(::java::util::List *, ::java::lang::Class *);
-public:
-  virtual void add(jint, ::java::lang::Object *);
-  virtual jboolean addAll(jint, ::java::util::Collection *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual jint hashCode();
-  virtual jint indexOf(::java::lang::Object *);
-  virtual jint lastIndexOf(::java::lang::Object *);
-  virtual ::java::util::ListIterator * listIterator();
-  virtual ::java::util::ListIterator * listIterator(jint);
-  virtual ::java::lang::Object * remove(jint);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual ::java::util::List * subList(jint, jint);
-private:
-  static const jlong serialVersionUID = 65247728283967356LL;
-public: // actually package-private
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::util::Collections$CheckedCollection)))) list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CheckedList__
diff --git a/libjava/java/util/Collections$CheckedListIterator.h b/libjava/java/util/Collections$CheckedListIterator.h
deleted file mode 100644
index 2c1b9f03d1c..00000000000
--- a/libjava/java/util/Collections$CheckedListIterator.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CheckedListIterator__
-#define __java_util_Collections$CheckedListIterator__
-
-#pragma interface
-
-#include <java/util/Collections$CheckedIterator.h>
-
-class java::util::Collections$CheckedListIterator : public ::java::util::Collections$CheckedIterator
-{
-
-public: // actually package-private
-  Collections$CheckedListIterator(::java::util::ListIterator *, ::java::lang::Class *);
-public:
-  void add(::java::lang::Object *);
-  jboolean hasPrevious();
-  jint nextIndex();
-  ::java::lang::Object * previous();
-  jint previousIndex();
-  void set(::java::lang::Object *);
-private:
-  ::java::util::ListIterator * __attribute__((aligned(__alignof__( ::java::util::Collections$CheckedIterator)))) li;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CheckedListIterator__
diff --git a/libjava/java/util/Collections$CheckedMap$CheckedEntrySet.h b/libjava/java/util/Collections$CheckedMap$CheckedEntrySet.h
deleted file mode 100644
index 1882b9a9ba4..00000000000
--- a/libjava/java/util/Collections$CheckedMap$CheckedEntrySet.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CheckedMap$CheckedEntrySet__
-#define __java_util_Collections$CheckedMap$CheckedEntrySet__
-
-#pragma interface
-
-#include <java/util/Collections$CheckedSet.h>
-
-class java::util::Collections$CheckedMap$CheckedEntrySet : public ::java::util::Collections$CheckedSet
-{
-
-public: // actually package-private
-  Collections$CheckedMap$CheckedEntrySet(::java::util::Set *, ::java::lang::Class *, ::java::lang::Class *, ::java::lang::Class *);
-public:
-  ::java::util::Iterator * iterator();
-public: // actually package-private
-  static ::java::lang::Class * access$0(::java::util::Collections$CheckedMap$CheckedEntrySet *);
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::util::Collections$CheckedSet)))) keyType;
-  ::java::lang::Class * valueType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CheckedMap$CheckedEntrySet__
diff --git a/libjava/java/util/Collections$CheckedMap.h b/libjava/java/util/Collections$CheckedMap.h
deleted file mode 100644
index e32b255f7b0..00000000000
--- a/libjava/java/util/Collections$CheckedMap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CheckedMap__
-#define __java_util_Collections$CheckedMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$CheckedMap : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$CheckedMap(::java::util::Map *, ::java::lang::Class *, ::java::lang::Class *);
-public:
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::util::Set * keySet();
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::Collection * values();
-private:
-  static const jlong serialVersionUID = 5742860141034234728LL;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) m;
-public: // actually package-private
-  ::java::lang::Class * keyType;
-  ::java::lang::Class * valueType;
-private:
-  ::java::util::Set * entries;
-  ::java::util::Set * keys;
-  ::java::util::Collection * values__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CheckedMap__
diff --git a/libjava/java/util/Collections$CheckedRandomAccessList.h b/libjava/java/util/Collections$CheckedRandomAccessList.h
deleted file mode 100644
index 4fad9a793b6..00000000000
--- a/libjava/java/util/Collections$CheckedRandomAccessList.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CheckedRandomAccessList__
-#define __java_util_Collections$CheckedRandomAccessList__
-
-#pragma interface
-
-#include <java/util/Collections$CheckedList.h>
-
-class java::util::Collections$CheckedRandomAccessList : public ::java::util::Collections$CheckedList
-{
-
-public: // actually package-private
-  Collections$CheckedRandomAccessList(::java::util::List *, ::java::lang::Class *);
-private:
-  static const jlong serialVersionUID = 1638200125423088369LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CheckedRandomAccessList__
diff --git a/libjava/java/util/Collections$CheckedSet.h b/libjava/java/util/Collections$CheckedSet.h
deleted file mode 100644
index e58a98d2eaa..00000000000
--- a/libjava/java/util/Collections$CheckedSet.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CheckedSet__
-#define __java_util_Collections$CheckedSet__
-
-#pragma interface
-
-#include <java/util/Collections$CheckedCollection.h>
-
-class java::util::Collections$CheckedSet : public ::java::util::Collections$CheckedCollection
-{
-
-public: // actually package-private
-  Collections$CheckedSet(::java::util::Set *, ::java::lang::Class *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = 4694047833775013803LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CheckedSet__
diff --git a/libjava/java/util/Collections$CheckedSortedMap.h b/libjava/java/util/Collections$CheckedSortedMap.h
deleted file mode 100644
index 54d83056984..00000000000
--- a/libjava/java/util/Collections$CheckedSortedMap.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CheckedSortedMap__
-#define __java_util_Collections$CheckedSortedMap__
-
-#pragma interface
-
-#include <java/util/Collections$CheckedMap.h>
-
-class java::util::Collections$CheckedSortedMap : public ::java::util::Collections$CheckedMap
-{
-
-public: // actually package-private
-  Collections$CheckedSortedMap(::java::util::SortedMap *, ::java::lang::Class *, ::java::lang::Class *);
-public:
-  virtual ::java::util::Comparator * comparator();
-  virtual ::java::lang::Object * firstKey();
-  virtual ::java::util::SortedMap * headMap(::java::lang::Object *);
-  virtual ::java::lang::Object * lastKey();
-  virtual ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::SortedMap * tailMap(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1599671320688067438LL;
-  ::java::util::SortedMap * __attribute__((aligned(__alignof__( ::java::util::Collections$CheckedMap)))) sm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CheckedSortedMap__
diff --git a/libjava/java/util/Collections$CheckedSortedSet.h b/libjava/java/util/Collections$CheckedSortedSet.h
deleted file mode 100644
index f65817529d7..00000000000
--- a/libjava/java/util/Collections$CheckedSortedSet.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CheckedSortedSet__
-#define __java_util_Collections$CheckedSortedSet__
-
-#pragma interface
-
-#include <java/util/Collections$CheckedSet.h>
-
-class java::util::Collections$CheckedSortedSet : public ::java::util::Collections$CheckedSet
-{
-
-public: // actually package-private
-  Collections$CheckedSortedSet(::java::util::SortedSet *, ::java::lang::Class *);
-public:
-  virtual ::java::util::Comparator * comparator();
-  virtual ::java::lang::Object * first();
-  virtual ::java::util::SortedSet * headSet(::java::lang::Object *);
-  virtual ::java::lang::Object * last();
-  virtual ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::SortedSet * tailSet(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1599911165492914959LL;
-  ::java::util::SortedSet * __attribute__((aligned(__alignof__( ::java::util::Collections$CheckedSet)))) ss;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CheckedSortedSet__
diff --git a/libjava/java/util/Collections$CopiesList.h b/libjava/java/util/Collections$CopiesList.h
deleted file mode 100644
index 3ff503da424..00000000000
--- a/libjava/java/util/Collections$CopiesList.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$CopiesList__
-#define __java_util_Collections$CopiesList__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-#include <gcj/array.h>
-
-
-class java::util::Collections$CopiesList : public ::java::util::AbstractList
-{
-
-public: // actually package-private
-  Collections$CopiesList(jint, ::java::lang::Object *);
-public:
-  jint size();
-  ::java::lang::Object * get(jint);
-  jboolean contains(::java::lang::Object *);
-  jint indexOf(::java::lang::Object *);
-  jint lastIndexOf(::java::lang::Object *);
-  ::java::util::List * subList(jint, jint);
-  JArray< ::java::lang::Object * > * toArray();
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 2739099268398711800LL;
-  jint __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) n;
-  ::java::lang::Object * element;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$CopiesList__
diff --git a/libjava/java/util/Collections$EmptyList.h b/libjava/java/util/Collections$EmptyList.h
deleted file mode 100644
index 8133e1643f3..00000000000
--- a/libjava/java/util/Collections$EmptyList.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$EmptyList__
-#define __java_util_Collections$EmptyList__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-#include <gcj/array.h>
-
-
-class java::util::Collections$EmptyList : public ::java::util::AbstractList
-{
-
-public: // actually package-private
-  Collections$EmptyList();
-public:
-  jint size();
-  ::java::lang::Object * get(jint);
-  jboolean contains(::java::lang::Object *);
-  jboolean containsAll(::java::util::Collection *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  jint indexOf(::java::lang::Object *);
-  jint lastIndexOf(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-  jboolean removeAll(::java::util::Collection *);
-  jboolean retainAll(::java::util::Collection *);
-  JArray< ::java::lang::Object * > * toArray();
-  JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 8842843931221139166LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$EmptyList__
diff --git a/libjava/java/util/Collections$EmptyMap.h b/libjava/java/util/Collections$EmptyMap.h
deleted file mode 100644
index 6b09265c4c8..00000000000
--- a/libjava/java/util/Collections$EmptyMap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$EmptyMap__
-#define __java_util_Collections$EmptyMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-
-class java::util::Collections$EmptyMap : public ::java::util::AbstractMap
-{
-
-public: // actually package-private
-  Collections$EmptyMap();
-public:
-  ::java::util::Set * entrySet();
-  jboolean containsKey(::java::lang::Object *);
-  jboolean containsValue(::java::lang::Object *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Object * get(::java::lang::Object *);
-  jint hashCode();
-  ::java::util::Set * keySet();
-  ::java::lang::Object * remove(::java::lang::Object *);
-  jint size();
-  ::java::util::Collection * values();
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 6428348081105594320LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$EmptyMap__
diff --git a/libjava/java/util/Collections$EmptySet.h b/libjava/java/util/Collections$EmptySet.h
deleted file mode 100644
index cbd01262f88..00000000000
--- a/libjava/java/util/Collections$EmptySet.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$EmptySet__
-#define __java_util_Collections$EmptySet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-#include <gcj/array.h>
-
-
-class java::util::Collections$EmptySet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  Collections$EmptySet();
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  jboolean contains(::java::lang::Object *);
-  jboolean containsAll(::java::util::Collection *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  jboolean remove(::java::lang::Object *);
-  jboolean removeAll(::java::util::Collection *);
-  jboolean retainAll(::java::util::Collection *);
-  JArray< ::java::lang::Object * > * toArray();
-  JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 1582296315990362920LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$EmptySet__
diff --git a/libjava/java/util/Collections$ReverseComparator.h b/libjava/java/util/Collections$ReverseComparator.h
deleted file mode 100644
index 006c27cbfc1..00000000000
--- a/libjava/java/util/Collections$ReverseComparator.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$ReverseComparator__
-#define __java_util_Collections$ReverseComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$ReverseComparator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$ReverseComparator();
-public:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 7207038068494060240LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$ReverseComparator__
diff --git a/libjava/java/util/Collections$SingletonList.h b/libjava/java/util/Collections$SingletonList.h
deleted file mode 100644
index 03340f1d9cb..00000000000
--- a/libjava/java/util/Collections$SingletonList.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SingletonList__
-#define __java_util_Collections$SingletonList__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-#include <gcj/array.h>
-
-
-class java::util::Collections$SingletonList : public ::java::util::AbstractList
-{
-
-public: // actually package-private
-  Collections$SingletonList(::java::lang::Object *);
-public:
-  jint size();
-  ::java::lang::Object * get(jint);
-  jboolean contains(::java::lang::Object *);
-  jboolean containsAll(::java::util::Collection *);
-  jint hashCode();
-  jint indexOf(::java::lang::Object *);
-  jint lastIndexOf(::java::lang::Object *);
-  ::java::util::List * subList(jint, jint);
-  JArray< ::java::lang::Object * > * toArray();
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 3093736618740652951LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) element;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SingletonList__
diff --git a/libjava/java/util/Collections$SingletonMap.h b/libjava/java/util/Collections$SingletonMap.h
deleted file mode 100644
index a5b07689a43..00000000000
--- a/libjava/java/util/Collections$SingletonMap.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SingletonMap__
-#define __java_util_Collections$SingletonMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-
-class java::util::Collections$SingletonMap : public ::java::util::AbstractMap
-{
-
-public: // actually package-private
-  Collections$SingletonMap(::java::lang::Object *, ::java::lang::Object *);
-public:
-  ::java::util::Set * entrySet();
-  jboolean containsKey(::java::lang::Object *);
-  jboolean containsValue(::java::lang::Object *);
-  ::java::lang::Object * get(::java::lang::Object *);
-  jint hashCode();
-  ::java::util::Set * keySet();
-  jint size();
-  ::java::util::Collection * values();
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6979724477215052911LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) k;
-  ::java::lang::Object * v;
-  ::java::util::Set * entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SingletonMap__
diff --git a/libjava/java/util/Collections$SingletonSet.h b/libjava/java/util/Collections$SingletonSet.h
deleted file mode 100644
index 51deccdd38a..00000000000
--- a/libjava/java/util/Collections$SingletonSet.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SingletonSet__
-#define __java_util_Collections$SingletonSet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-#include <gcj/array.h>
-
-
-class java::util::Collections$SingletonSet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  Collections$SingletonSet(::java::lang::Object *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  jboolean contains(::java::lang::Object *);
-  jboolean containsAll(::java::util::Collection *);
-  jint hashCode();
-  JArray< ::java::lang::Object * > * toArray();
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 3193687207550431679LL;
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) element;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SingletonSet__
diff --git a/libjava/java/util/Collections$SynchronizedCollection.h b/libjava/java/util/Collections$SynchronizedCollection.h
deleted file mode 100644
index a41b8d2b138..00000000000
--- a/libjava/java/util/Collections$SynchronizedCollection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SynchronizedCollection__
-#define __java_util_Collections$SynchronizedCollection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Collections$SynchronizedCollection : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$SynchronizedCollection(::java::util::Collection *);
-  Collections$SynchronizedCollection(::java::lang::Object *, ::java::util::Collection *);
-public:
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual void clear();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean containsAll(::java::util::Collection *);
-  virtual jboolean isEmpty();
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual jboolean retainAll(::java::util::Collection *);
-  virtual jint size();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 3053995032091335093LL;
-public: // actually package-private
-  ::java::util::Collection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) c;
-  ::java::lang::Object * mutex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SynchronizedCollection__
diff --git a/libjava/java/util/Collections$SynchronizedIterator.h b/libjava/java/util/Collections$SynchronizedIterator.h
deleted file mode 100644
index bc0950b6d2e..00000000000
--- a/libjava/java/util/Collections$SynchronizedIterator.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SynchronizedIterator__
-#define __java_util_Collections$SynchronizedIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$SynchronizedIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$SynchronizedIterator(::java::lang::Object *, ::java::util::Iterator *);
-public:
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasNext();
-  virtual void remove();
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mutex;
-private:
-  ::java::util::Iterator * i;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SynchronizedIterator__
diff --git a/libjava/java/util/Collections$SynchronizedList.h b/libjava/java/util/Collections$SynchronizedList.h
deleted file mode 100644
index 3404a091d4d..00000000000
--- a/libjava/java/util/Collections$SynchronizedList.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SynchronizedList__
-#define __java_util_Collections$SynchronizedList__
-
-#pragma interface
-
-#include <java/util/Collections$SynchronizedCollection.h>
-
-class java::util::Collections$SynchronizedList : public ::java::util::Collections$SynchronizedCollection
-{
-
-public: // actually package-private
-  Collections$SynchronizedList(::java::util::List *);
-  Collections$SynchronizedList(::java::lang::Object *, ::java::util::List *);
-public:
-  virtual void add(jint, ::java::lang::Object *);
-  virtual jboolean addAll(jint, ::java::util::Collection *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual jint hashCode();
-  virtual jint indexOf(::java::lang::Object *);
-  virtual jint lastIndexOf(::java::lang::Object *);
-  virtual ::java::util::ListIterator * listIterator();
-  virtual ::java::util::ListIterator * listIterator(jint);
-  virtual ::java::lang::Object * remove(jint);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual ::java::util::List * subList(jint, jint);
-private:
-  static const jlong serialVersionUID = -7754090372962971524LL;
-public: // actually package-private
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedCollection)))) list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SynchronizedList__
diff --git a/libjava/java/util/Collections$SynchronizedListIterator.h b/libjava/java/util/Collections$SynchronizedListIterator.h
deleted file mode 100644
index 87cd16b0b21..00000000000
--- a/libjava/java/util/Collections$SynchronizedListIterator.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SynchronizedListIterator__
-#define __java_util_Collections$SynchronizedListIterator__
-
-#pragma interface
-
-#include <java/util/Collections$SynchronizedIterator.h>
-
-class java::util::Collections$SynchronizedListIterator : public ::java::util::Collections$SynchronizedIterator
-{
-
-public: // actually package-private
-  Collections$SynchronizedListIterator(::java::lang::Object *, ::java::util::ListIterator *);
-public:
-  void add(::java::lang::Object *);
-  jboolean hasPrevious();
-  jint nextIndex();
-  ::java::lang::Object * previous();
-  jint previousIndex();
-  void set(::java::lang::Object *);
-private:
-  ::java::util::ListIterator * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedIterator)))) li;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SynchronizedListIterator__
diff --git a/libjava/java/util/Collections$SynchronizedMap.h b/libjava/java/util/Collections$SynchronizedMap.h
deleted file mode 100644
index 6232204d14b..00000000000
--- a/libjava/java/util/Collections$SynchronizedMap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SynchronizedMap__
-#define __java_util_Collections$SynchronizedMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$SynchronizedMap : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$SynchronizedMap(::java::util::Map *);
-  Collections$SynchronizedMap(::java::lang::Object *, ::java::util::Map *);
-public:
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::util::Set * keySet();
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::Collection * values();
-private:
-  static const jlong serialVersionUID = 1978198479659022715LL;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) m;
-public: // actually package-private
-  ::java::lang::Object * mutex;
-private:
-  ::java::util::Set * entries;
-  ::java::util::Set * keys;
-  ::java::util::Collection * values__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SynchronizedMap__
diff --git a/libjava/java/util/Collections$SynchronizedRandomAccessList.h b/libjava/java/util/Collections$SynchronizedRandomAccessList.h
deleted file mode 100644
index 3bf085ee121..00000000000
--- a/libjava/java/util/Collections$SynchronizedRandomAccessList.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SynchronizedRandomAccessList__
-#define __java_util_Collections$SynchronizedRandomAccessList__
-
-#pragma interface
-
-#include <java/util/Collections$SynchronizedList.h>
-
-class java::util::Collections$SynchronizedRandomAccessList : public ::java::util::Collections$SynchronizedList
-{
-
-public: // actually package-private
-  Collections$SynchronizedRandomAccessList(::java::util::List *);
-  Collections$SynchronizedRandomAccessList(::java::lang::Object *, ::java::util::List *);
-public:
-  ::java::util::List * subList(jint, jint);
-private:
-  static const jlong serialVersionUID = 1530674583602358482LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SynchronizedRandomAccessList__
diff --git a/libjava/java/util/Collections$SynchronizedSet.h b/libjava/java/util/Collections$SynchronizedSet.h
deleted file mode 100644
index bb5b6769799..00000000000
--- a/libjava/java/util/Collections$SynchronizedSet.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SynchronizedSet__
-#define __java_util_Collections$SynchronizedSet__
-
-#pragma interface
-
-#include <java/util/Collections$SynchronizedCollection.h>
-
-class java::util::Collections$SynchronizedSet : public ::java::util::Collections$SynchronizedCollection
-{
-
-public: // actually package-private
-  Collections$SynchronizedSet(::java::util::Set *);
-  Collections$SynchronizedSet(::java::lang::Object *, ::java::util::Set *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = 487447009682186044LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SynchronizedSet__
diff --git a/libjava/java/util/Collections$SynchronizedSortedMap.h b/libjava/java/util/Collections$SynchronizedSortedMap.h
deleted file mode 100644
index d31025f26fd..00000000000
--- a/libjava/java/util/Collections$SynchronizedSortedMap.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SynchronizedSortedMap__
-#define __java_util_Collections$SynchronizedSortedMap__
-
-#pragma interface
-
-#include <java/util/Collections$SynchronizedMap.h>
-
-class java::util::Collections$SynchronizedSortedMap : public ::java::util::Collections$SynchronizedMap
-{
-
-public: // actually package-private
-  Collections$SynchronizedSortedMap(::java::util::SortedMap *);
-  Collections$SynchronizedSortedMap(::java::lang::Object *, ::java::util::SortedMap *);
-public:
-  ::java::util::Comparator * comparator();
-  ::java::lang::Object * firstKey();
-  ::java::util::SortedMap * headMap(::java::lang::Object *);
-  ::java::lang::Object * lastKey();
-  ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::SortedMap * tailMap(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -8798146769416483793LL;
-  ::java::util::SortedMap * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedMap)))) sm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SynchronizedSortedMap__
diff --git a/libjava/java/util/Collections$SynchronizedSortedSet.h b/libjava/java/util/Collections$SynchronizedSortedSet.h
deleted file mode 100644
index dd25a17b704..00000000000
--- a/libjava/java/util/Collections$SynchronizedSortedSet.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$SynchronizedSortedSet__
-#define __java_util_Collections$SynchronizedSortedSet__
-
-#pragma interface
-
-#include <java/util/Collections$SynchronizedSet.h>
-
-class java::util::Collections$SynchronizedSortedSet : public ::java::util::Collections$SynchronizedSet
-{
-
-public: // actually package-private
-  Collections$SynchronizedSortedSet(::java::util::SortedSet *);
-  Collections$SynchronizedSortedSet(::java::lang::Object *, ::java::util::SortedSet *);
-public:
-  ::java::util::Comparator * comparator();
-  ::java::lang::Object * first();
-  ::java::util::SortedSet * headSet(::java::lang::Object *);
-  ::java::lang::Object * last();
-  ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::SortedSet * tailSet(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 8695801310862127406LL;
-  ::java::util::SortedSet * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedSet)))) ss;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$SynchronizedSortedSet__
diff --git a/libjava/java/util/Collections$UnmodifiableCollection.h b/libjava/java/util/Collections$UnmodifiableCollection.h
deleted file mode 100644
index 2241b880a68..00000000000
--- a/libjava/java/util/Collections$UnmodifiableCollection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableCollection__
-#define __java_util_Collections$UnmodifiableCollection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Collections$UnmodifiableCollection : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$UnmodifiableCollection(::java::util::Collection *);
-public:
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual void clear();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean containsAll(::java::util::Collection *);
-  virtual jboolean isEmpty();
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual jboolean retainAll(::java::util::Collection *);
-  virtual jint size();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 1820017752578914078LL;
-public: // actually package-private
-  ::java::util::Collection * __attribute__((aligned(__alignof__( ::java::lang::Object)))) c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableCollection__
diff --git a/libjava/java/util/Collections$UnmodifiableIterator.h b/libjava/java/util/Collections$UnmodifiableIterator.h
deleted file mode 100644
index 3782626aa7a..00000000000
--- a/libjava/java/util/Collections$UnmodifiableIterator.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableIterator__
-#define __java_util_Collections$UnmodifiableIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$UnmodifiableIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$UnmodifiableIterator(::java::util::Iterator *);
-public:
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasNext();
-  virtual void remove();
-private:
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableIterator__
diff --git a/libjava/java/util/Collections$UnmodifiableList.h b/libjava/java/util/Collections$UnmodifiableList.h
deleted file mode 100644
index e1da4773050..00000000000
--- a/libjava/java/util/Collections$UnmodifiableList.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableList__
-#define __java_util_Collections$UnmodifiableList__
-
-#pragma interface
-
-#include <java/util/Collections$UnmodifiableCollection.h>
-
-class java::util::Collections$UnmodifiableList : public ::java::util::Collections$UnmodifiableCollection
-{
-
-public: // actually package-private
-  Collections$UnmodifiableList(::java::util::List *);
-public:
-  virtual void add(jint, ::java::lang::Object *);
-  virtual jboolean addAll(jint, ::java::util::Collection *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(jint);
-  virtual jint hashCode();
-  virtual jint indexOf(::java::lang::Object *);
-  virtual jint lastIndexOf(::java::lang::Object *);
-  virtual ::java::util::ListIterator * listIterator();
-  virtual ::java::util::ListIterator * listIterator(jint);
-  virtual ::java::lang::Object * remove(jint);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual ::java::util::List * subList(jint, jint);
-private:
-  static const jlong serialVersionUID = -283967356065247728LL;
-public: // actually package-private
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::util::Collections$UnmodifiableCollection)))) list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableList__
diff --git a/libjava/java/util/Collections$UnmodifiableListIterator.h b/libjava/java/util/Collections$UnmodifiableListIterator.h
deleted file mode 100644
index f921a5c0b39..00000000000
--- a/libjava/java/util/Collections$UnmodifiableListIterator.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableListIterator__
-#define __java_util_Collections$UnmodifiableListIterator__
-
-#pragma interface
-
-#include <java/util/Collections$UnmodifiableIterator.h>
-
-class java::util::Collections$UnmodifiableListIterator : public ::java::util::Collections$UnmodifiableIterator
-{
-
-public: // actually package-private
-  Collections$UnmodifiableListIterator(::java::util::ListIterator *);
-public:
-  void add(::java::lang::Object *);
-  jboolean hasPrevious();
-  jint nextIndex();
-  ::java::lang::Object * previous();
-  jint previousIndex();
-  void set(::java::lang::Object *);
-private:
-  ::java::util::ListIterator * __attribute__((aligned(__alignof__( ::java::util::Collections$UnmodifiableIterator)))) li;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableListIterator__
diff --git a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry.h b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry.h
deleted file mode 100644
index c0358c9b86f..00000000000
--- a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry__
-#define __java_util_Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry : public ::java::lang::Object
-{
-
-  Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry(::java::util::Map$Entry *);
-public:
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Object * getKey();
-  ::java::lang::Object * getValue();
-  jint hashCode();
-  ::java::lang::Object * setValue(::java::lang::Object *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry(::java::util::Map$Entry *, ::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry *);
-private:
-  ::java::util::Map$Entry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) e;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry__
diff --git a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h
deleted file mode 100644
index cf49d7fce32..00000000000
--- a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableMap$UnmodifiableEntrySet__
-#define __java_util_Collections$UnmodifiableMap$UnmodifiableEntrySet__
-
-#pragma interface
-
-#include <java/util/Collections$UnmodifiableSet.h>
-#include <gcj/array.h>
-
-
-class java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet : public ::java::util::Collections$UnmodifiableSet
-{
-
-public: // actually package-private
-  Collections$UnmodifiableMap$UnmodifiableEntrySet(::java::util::Set *);
-public:
-  ::java::util::Iterator * iterator();
-  JArray< ::java::util::Map$Entry * > * target$toArray();
-  JArray< ::java::util::Map$Entry * > * toArray(JArray< ::java::util::Map$Entry * > *);
-  JArray< ::java::lang::Object * > * toArray();
-private:
-  static const jlong serialVersionUID = 7854390611657943733LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableMap$UnmodifiableEntrySet__
diff --git a/libjava/java/util/Collections$UnmodifiableMap.h b/libjava/java/util/Collections$UnmodifiableMap.h
deleted file mode 100644
index 3aaee0a7b67..00000000000
--- a/libjava/java/util/Collections$UnmodifiableMap.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableMap__
-#define __java_util_Collections$UnmodifiableMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Collections$UnmodifiableMap : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Collections$UnmodifiableMap(::java::util::Map *);
-public:
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::util::Set * keySet();
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::Collection * values();
-private:
-  static const jlong serialVersionUID = -1034234728574286014LL;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) m;
-  ::java::util::Set * entries;
-  ::java::util::Set * keys;
-  ::java::util::Collection * values__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableMap__
diff --git a/libjava/java/util/Collections$UnmodifiableRandomAccessList.h b/libjava/java/util/Collections$UnmodifiableRandomAccessList.h
deleted file mode 100644
index 62a310b4168..00000000000
--- a/libjava/java/util/Collections$UnmodifiableRandomAccessList.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableRandomAccessList__
-#define __java_util_Collections$UnmodifiableRandomAccessList__
-
-#pragma interface
-
-#include <java/util/Collections$UnmodifiableList.h>
-
-class java::util::Collections$UnmodifiableRandomAccessList : public ::java::util::Collections$UnmodifiableList
-{
-
-public: // actually package-private
-  Collections$UnmodifiableRandomAccessList(::java::util::List *);
-private:
-  static const jlong serialVersionUID = -2542308836966382001LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableRandomAccessList__
diff --git a/libjava/java/util/Collections$UnmodifiableSet.h b/libjava/java/util/Collections$UnmodifiableSet.h
deleted file mode 100644
index 3633ae29985..00000000000
--- a/libjava/java/util/Collections$UnmodifiableSet.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableSet__
-#define __java_util_Collections$UnmodifiableSet__
-
-#pragma interface
-
-#include <java/util/Collections$UnmodifiableCollection.h>
-
-class java::util::Collections$UnmodifiableSet : public ::java::util::Collections$UnmodifiableCollection
-{
-
-public: // actually package-private
-  Collections$UnmodifiableSet(::java::util::Set *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = -9215047833775013803LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableSet__
diff --git a/libjava/java/util/Collections$UnmodifiableSortedMap.h b/libjava/java/util/Collections$UnmodifiableSortedMap.h
deleted file mode 100644
index 6c5a3742609..00000000000
--- a/libjava/java/util/Collections$UnmodifiableSortedMap.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableSortedMap__
-#define __java_util_Collections$UnmodifiableSortedMap__
-
-#pragma interface
-
-#include <java/util/Collections$UnmodifiableMap.h>
-
-class java::util::Collections$UnmodifiableSortedMap : public ::java::util::Collections$UnmodifiableMap
-{
-
-public: // actually package-private
-  Collections$UnmodifiableSortedMap(::java::util::SortedMap *);
-public:
-  virtual ::java::util::Comparator * comparator();
-  virtual ::java::lang::Object * firstKey();
-  virtual ::java::util::SortedMap * headMap(::java::lang::Object *);
-  virtual ::java::lang::Object * lastKey();
-  virtual ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::SortedMap * tailMap(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -8806743815996713206LL;
-  ::java::util::SortedMap * __attribute__((aligned(__alignof__( ::java::util::Collections$UnmodifiableMap)))) sm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableSortedMap__
diff --git a/libjava/java/util/Collections$UnmodifiableSortedSet.h b/libjava/java/util/Collections$UnmodifiableSortedSet.h
deleted file mode 100644
index 50d776d6d42..00000000000
--- a/libjava/java/util/Collections$UnmodifiableSortedSet.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections$UnmodifiableSortedSet__
-#define __java_util_Collections$UnmodifiableSortedSet__
-
-#pragma interface
-
-#include <java/util/Collections$UnmodifiableSet.h>
-
-class java::util::Collections$UnmodifiableSortedSet : public ::java::util::Collections$UnmodifiableSet
-{
-
-public: // actually package-private
-  Collections$UnmodifiableSortedSet(::java::util::SortedSet *);
-public:
-  virtual ::java::util::Comparator * comparator();
-  virtual ::java::lang::Object * first();
-  virtual ::java::util::SortedSet * headSet(::java::lang::Object *);
-  virtual ::java::lang::Object * last();
-  virtual ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::SortedSet * tailSet(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -4929149591599911165LL;
-  ::java::util::SortedSet * __attribute__((aligned(__alignof__( ::java::util::Collections$UnmodifiableSet)))) ss;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections$UnmodifiableSortedSet__
diff --git a/libjava/java/util/Collections.h b/libjava/java/util/Collections.h
deleted file mode 100644
index 6e11724394a..00000000000
--- a/libjava/java/util/Collections.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Collections__
-#define __java_util_Collections__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Collections : public ::java::lang::Object
-{
-
-  static jboolean isSequential(::java::util::List *);
-  Collections();
-public:
-  static ::java::util::Set * emptySet();
-  static ::java::util::List * emptyList();
-  static ::java::util::Map * emptyMap();
-public: // actually package-private
-  static jint compare(::java::lang::Object *, ::java::lang::Object *, ::java::util::Comparator *);
-public:
-  static jint binarySearch(::java::util::List *, ::java::lang::Object *);
-  static jint binarySearch(::java::util::List *, ::java::lang::Object *, ::java::util::Comparator *);
-  static void copy(::java::util::List *, ::java::util::List *);
-  static ::java::util::Enumeration * enumeration(::java::util::Collection *);
-  static void fill(::java::util::List *, ::java::lang::Object *);
-  static jint indexOfSubList(::java::util::List *, ::java::util::List *);
-  static jint lastIndexOfSubList(::java::util::List *, ::java::util::List *);
-  static ::java::util::ArrayList * list(::java::util::Enumeration *);
-  static ::java::lang::Object * max(::java::util::Collection *);
-  static ::java::lang::Object * max(::java::util::Collection *, ::java::util::Comparator *);
-  static ::java::lang::Object * min(::java::util::Collection *);
-  static ::java::lang::Object * min(::java::util::Collection *, ::java::util::Comparator *);
-  static ::java::util::List * nCopies(jint, ::java::lang::Object *);
-  static jboolean replaceAll(::java::util::List *, ::java::lang::Object *, ::java::lang::Object *);
-  static void reverse(::java::util::List *);
-  static ::java::util::Comparator * reverseOrder(::java::util::Comparator *);
-  static ::java::util::Comparator * reverseOrder();
-  static void rotate(::java::util::List *, jint);
-  static void shuffle(::java::util::List *);
-  static void shuffle(::java::util::List *, ::java::util::Random *);
-  static jint frequency(::java::util::Collection *, ::java::lang::Object *);
-  static jboolean addAll(::java::util::Collection *, JArray< ::java::lang::Object * > *);
-  static jboolean disjoint(::java::util::Collection *, ::java::util::Collection *);
-  static ::java::util::Set * singleton(::java::lang::Object *);
-  static ::java::util::List * singletonList(::java::lang::Object *);
-  static ::java::util::Map * singletonMap(::java::lang::Object *, ::java::lang::Object *);
-  static void sort(::java::util::List *);
-  static void sort(::java::util::List *, ::java::util::Comparator *);
-  static void swap(::java::util::List *, jint, jint);
-  static ::java::util::Collection * synchronizedCollection(::java::util::Collection *);
-  static ::java::util::List * synchronizedList(::java::util::List *);
-  static ::java::util::Map * synchronizedMap(::java::util::Map *);
-  static ::java::util::Set * synchronizedSet(::java::util::Set *);
-  static ::java::util::SortedMap * synchronizedSortedMap(::java::util::SortedMap *);
-  static ::java::util::SortedSet * synchronizedSortedSet(::java::util::SortedSet *);
-  static ::java::util::Collection * unmodifiableCollection(::java::util::Collection *);
-  static ::java::util::List * unmodifiableList(::java::util::List *);
-  static ::java::util::Map * unmodifiableMap(::java::util::Map *);
-  static ::java::util::Set * unmodifiableSet(::java::util::Set *);
-  static ::java::util::SortedMap * unmodifiableSortedMap(::java::util::SortedMap *);
-  static ::java::util::SortedSet * unmodifiableSortedSet(::java::util::SortedSet *);
-  static ::java::util::Collection * checkedCollection(::java::util::Collection *, ::java::lang::Class *);
-  static ::java::util::List * checkedList(::java::util::List *, ::java::lang::Class *);
-  static ::java::util::Map * checkedMap(::java::util::Map *, ::java::lang::Class *, ::java::lang::Class *);
-  static ::java::util::Set * checkedSet(::java::util::Set *, ::java::lang::Class *);
-  static ::java::util::SortedMap * checkedSortedMap(::java::util::SortedMap *, ::java::lang::Class *, ::java::lang::Class *);
-  static ::java::util::SortedSet * checkedSortedSet(::java::util::SortedSet *, ::java::lang::Class *);
-private:
-  static const jint LARGE_LIST_SIZE = 16;
-public:
-  static ::java::util::Set * EMPTY_SET;
-  static ::java::util::List * EMPTY_LIST;
-  static ::java::util::Map * EMPTY_MAP;
-private:
-  static ::java::util::Collections$ReverseComparator * rcInstance;
-  static ::java::util::Random * defaultRandom;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Collections__
diff --git a/libjava/java/util/Comparator.h b/libjava/java/util/Comparator.h
deleted file mode 100644
index f14275e58ce..00000000000
--- a/libjava/java/util/Comparator.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Comparator__
-#define __java_util_Comparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Comparator : public ::java::lang::Object
-{
-
-public:
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Comparator__
diff --git a/libjava/java/util/ConcurrentModificationException.h b/libjava/java/util/ConcurrentModificationException.h
deleted file mode 100644
index 012ab658d95..00000000000
--- a/libjava/java/util/ConcurrentModificationException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_ConcurrentModificationException__
-#define __java_util_ConcurrentModificationException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::util::ConcurrentModificationException : public ::java::lang::RuntimeException
-{
-
-public:
-  ConcurrentModificationException();
-  ConcurrentModificationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3666751008965953603LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_ConcurrentModificationException__
diff --git a/libjava/java/util/Currency.h b/libjava/java/util/Currency.h
deleted file mode 100644
index c868cef9ca3..00000000000
--- a/libjava/java/util/Currency.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Currency__
-#define __java_util_Currency__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Currency : public ::java::lang::Object
-{
-
-  Currency();
-  Currency(::java::util::Locale *);
-public:
-  ::java::lang::String * getCurrencyCode();
-  jint getDefaultFractionDigits();
-  static ::java::util::Currency * getInstance(::java::util::Locale *);
-  static ::java::util::Currency * getInstance(::java::lang::String *);
-  ::java::lang::String * getSymbol();
-  ::java::lang::String * getSymbol(::java::util::Locale *);
-  ::java::lang::String * toString();
-private:
-  ::java::lang::Object * readResolve();
-public: // actually package-private
-  static const jlong serialVersionUID = -158308464356906721LL;
-private:
-  ::java::util::Locale * __attribute__((aligned(__alignof__( ::java::lang::Object)))) locale;
-  ::java::util::ResourceBundle * res;
-  ::java::lang::String * currencyCode;
-  static ::java::util::Map * cache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Currency__
diff --git a/libjava/java/util/Date.h b/libjava/java/util/Date.h
deleted file mode 100644
index e9814834457..00000000000
--- a/libjava/java/util/Date.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Date__
-#define __java_util_Date__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Date : public ::java::lang::Object
-{
-
-public:
-  Date();
-  Date(jlong);
-  Date(jint, jint, jint);
-  Date(jint, jint, jint, jint, jint);
-  Date(jint, jint, jint, jint, jint, jint);
-  Date(::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  static jlong UTC(jint, jint, jint, jint, jint, jint);
-  virtual jlong getTime();
-  virtual jint getTimezoneOffset();
-  virtual void setTime(jlong);
-  virtual jboolean after(::java::util::Date *);
-  virtual jboolean before(::java::util::Date *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::util::Date *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toLocaleString();
-  virtual ::java::lang::String * toGMTString();
-private:
-  static jint parseTz(::java::lang::String *, jchar);
-  static jint parseMonth(::java::lang::String *);
-  static jboolean parseDayOfWeek(::java::lang::String *);
-public:
-  static jlong parse(::java::lang::String *);
-  virtual jint getYear();
-  virtual void setYear(jint);
-  virtual jint getMonth();
-  virtual void setMonth(jint);
-  virtual jint getDate();
-  virtual void setDate(jint);
-  virtual jint getDay();
-  virtual jint getHours();
-  virtual void setHours(jint);
-  virtual jint getMinutes();
-  virtual void setMinutes(jint);
-  virtual jint getSeconds();
-  virtual void setSeconds(jint);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  virtual jint compareTo(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 7523967970034938905LL;
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) time;
-  static JArray< ::java::lang::String * > * weekNames;
-  static JArray< ::java::lang::String * > * monthNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Date__
diff --git a/libjava/java/util/Deque.h b/libjava/java/util/Deque.h
deleted file mode 100644
index 0ceb91f8245..00000000000
--- a/libjava/java/util/Deque.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Deque__
-#define __java_util_Deque__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Deque : public ::java::lang::Object
-{
-
-public:
-  virtual void addFirst(::java::lang::Object *) = 0;
-  virtual void addLast(::java::lang::Object *) = 0;
-  virtual jboolean offerFirst(::java::lang::Object *) = 0;
-  virtual jboolean offerLast(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFirst() = 0;
-  virtual ::java::lang::Object * removeLast() = 0;
-  virtual ::java::lang::Object * pollFirst() = 0;
-  virtual ::java::lang::Object * pollLast() = 0;
-  virtual ::java::lang::Object * getFirst() = 0;
-  virtual ::java::lang::Object * getLast() = 0;
-  virtual ::java::lang::Object * peekFirst() = 0;
-  virtual ::java::lang::Object * peekLast() = 0;
-  virtual jboolean removeFirstOccurrence(::java::lang::Object *) = 0;
-  virtual jboolean removeLastOccurrence(::java::lang::Object *) = 0;
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean offer(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * remove() = 0;
-  virtual ::java::lang::Object * poll() = 0;
-  virtual ::java::lang::Object * element() = 0;
-  virtual ::java::lang::Object * peek() = 0;
-  virtual void push(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * pop() = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual ::java::util::Iterator * descendingIterator() = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Deque__
diff --git a/libjava/java/util/Dictionary.h b/libjava/java/util/Dictionary.h
deleted file mode 100644
index 5f02531a5cf..00000000000
--- a/libjava/java/util/Dictionary.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Dictionary__
-#define __java_util_Dictionary__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Dictionary : public ::java::lang::Object
-{
-
-public:
-  Dictionary();
-  virtual ::java::util::Enumeration * elements() = 0;
-  virtual ::java::lang::Object * get(::java::lang::Object *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Enumeration * keys() = 0;
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * remove(::java::lang::Object *) = 0;
-  virtual jint size() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Dictionary__
diff --git a/libjava/java/util/DuplicateFormatFlagsException.h b/libjava/java/util/DuplicateFormatFlagsException.h
deleted file mode 100644
index c384bc02655..00000000000
--- a/libjava/java/util/DuplicateFormatFlagsException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_DuplicateFormatFlagsException__
-#define __java_util_DuplicateFormatFlagsException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::DuplicateFormatFlagsException : public ::java::util::IllegalFormatException
-{
-
-public:
-  DuplicateFormatFlagsException(::java::lang::String *);
-  virtual ::java::lang::String * getFlags();
-private:
-  static const jlong serialVersionUID = 18890531LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_DuplicateFormatFlagsException__
diff --git a/libjava/java/util/EmptyStackException.h b/libjava/java/util/EmptyStackException.h
deleted file mode 100644
index 7b5b1675994..00000000000
--- a/libjava/java/util/EmptyStackException.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EmptyStackException__
-#define __java_util_EmptyStackException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::util::EmptyStackException : public ::java::lang::RuntimeException
-{
-
-public:
-  EmptyStackException();
-private:
-  static const jlong serialVersionUID = 5084686378493302095LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EmptyStackException__
diff --git a/libjava/java/util/EnumMap$1.h b/libjava/java/util/EnumMap$1.h
deleted file mode 100644
index 372f25f62db..00000000000
--- a/libjava/java/util/EnumMap$1.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EnumMap$1__
-#define __java_util_EnumMap$1__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::EnumMap$1 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  EnumMap$1(::java::util::EnumMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  static ::java::util::EnumMap * access$0(::java::util::EnumMap$1 *);
-  ::java::util::EnumMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EnumMap$1__
diff --git a/libjava/java/util/EnumMap$2.h b/libjava/java/util/EnumMap$2.h
deleted file mode 100644
index 325d8ad583d..00000000000
--- a/libjava/java/util/EnumMap$2.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EnumMap$2__
-#define __java_util_EnumMap$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::EnumMap$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  EnumMap$2(::java::util::EnumMap$1 *);
-public:
-  jboolean hasNext();
-  ::java::lang::Enum * target$next();
-  void remove();
-  ::java::lang::Object * next();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  jint index;
-  ::java::util::EnumMap$1 * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EnumMap$2__
diff --git a/libjava/java/util/EnumMap$3.h b/libjava/java/util/EnumMap$3.h
deleted file mode 100644
index 56824265c18..00000000000
--- a/libjava/java/util/EnumMap$3.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EnumMap$3__
-#define __java_util_EnumMap$3__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::EnumMap$3 : public ::java::util::AbstractCollection
-{
-
-public: // actually package-private
-  EnumMap$3(::java::util::EnumMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-public: // actually package-private
-  static ::java::util::EnumMap * access$0(::java::util::EnumMap$3 *);
-  ::java::util::EnumMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EnumMap$3__
diff --git a/libjava/java/util/EnumMap$4.h b/libjava/java/util/EnumMap$4.h
deleted file mode 100644
index 4ea6286dc89..00000000000
--- a/libjava/java/util/EnumMap$4.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EnumMap$4__
-#define __java_util_EnumMap$4__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::EnumMap$4 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  EnumMap$4(::java::util::EnumMap$3 *);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  jint index;
-  ::java::util::EnumMap$3 * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EnumMap$4__
diff --git a/libjava/java/util/EnumMap$5.h b/libjava/java/util/EnumMap$5.h
deleted file mode 100644
index d38ef915114..00000000000
--- a/libjava/java/util/EnumMap$5.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EnumMap$5__
-#define __java_util_EnumMap$5__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::EnumMap$5 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  EnumMap$5(::java::util::EnumMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  static ::java::util::EnumMap * access$0(::java::util::EnumMap$5 *);
-  ::java::util::EnumMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EnumMap$5__
diff --git a/libjava/java/util/EnumMap$6.h b/libjava/java/util/EnumMap$6.h
deleted file mode 100644
index fde1cbd4d82..00000000000
--- a/libjava/java/util/EnumMap$6.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EnumMap$6__
-#define __java_util_EnumMap$6__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::EnumMap$6 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  EnumMap$6(::java::util::EnumMap$5 *);
-public:
-  jboolean hasNext();
-  ::java::util::Map$Entry * target$next();
-  void remove();
-  ::java::lang::Object * next();
-public: // actually package-private
-  static ::java::util::EnumMap$5 * access$1(::java::util::EnumMap$6 *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  jint index;
-  ::java::util::EnumMap$5 * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EnumMap$6__
diff --git a/libjava/java/util/EnumMap$7.h b/libjava/java/util/EnumMap$7.h
deleted file mode 100644
index 3e9439f38f9..00000000000
--- a/libjava/java/util/EnumMap$7.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EnumMap$7__
-#define __java_util_EnumMap$7__
-
-#pragma interface
-
-#include <java/util/AbstractMap$SimpleEntry.h>
-
-class java::util::EnumMap$7 : public ::java::util::AbstractMap$SimpleEntry
-{
-
-public: // actually package-private
-  EnumMap$7(::java::util::EnumMap$6 *, ::java::lang::Enum *, ::java::lang::Object *);
-public:
-  ::java::lang::Object * setValue(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::EnumMap$6 * __attribute__((aligned(__alignof__( ::java::util::AbstractMap$SimpleEntry)))) this$2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EnumMap$7__
diff --git a/libjava/java/util/EnumMap.h b/libjava/java/util/EnumMap.h
deleted file mode 100644
index 0c303d82529..00000000000
--- a/libjava/java/util/EnumMap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EnumMap__
-#define __java_util_EnumMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-#include <gcj/array.h>
-
-
-class java::util::EnumMap : public ::java::util::AbstractMap
-{
-
-public:
-  EnumMap(::java::lang::Class *);
-  EnumMap(::java::util::EnumMap *);
-  EnumMap(::java::util::Map *);
-  virtual jint size();
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * target$put(::java::lang::Enum *, ::java::lang::Object *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual void putAll(::java::util::Map *);
-  virtual void clear();
-  virtual ::java::util::Set * keySet();
-  virtual ::java::util::Collection * values();
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::util::EnumMap * target$clone();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 458661240069192865LL;
-public: // actually package-private
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) store;
-  jint cardinality;
-  ::java::lang::Class * enumClass;
-  ::java::util::Set * entries;
-  static ::java::lang::Object * emptySlot;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EnumMap__
diff --git a/libjava/java/util/EnumSet$1.h b/libjava/java/util/EnumSet$1.h
deleted file mode 100644
index 38088dc013f..00000000000
--- a/libjava/java/util/EnumSet$1.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EnumSet$1__
-#define __java_util_EnumSet$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::EnumSet$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  EnumSet$1(::java::util::EnumSet *);
-public:
-  jboolean hasNext();
-  ::java::lang::Enum * target$next();
-  void remove();
-  ::java::lang::Object * next();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) next__;
-  jint count;
-  ::java::util::EnumSet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EnumSet$1__
diff --git a/libjava/java/util/EnumSet.h b/libjava/java/util/EnumSet.h
deleted file mode 100644
index f0e2a7af3a6..00000000000
--- a/libjava/java/util/EnumSet.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EnumSet__
-#define __java_util_EnumSet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-#include <gcj/array.h>
-
-
-class java::util::EnumSet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  EnumSet();
-public:
-  virtual ::java::util::EnumSet * target$clone();
-  virtual jint size();
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean target$add(::java::lang::Enum *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual void clear();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean containsAll(::java::util::Collection *);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual jboolean retainAll(::java::util::Collection *);
-  static ::java::util::EnumSet * allOf(::java::lang::Class *);
-  static ::java::util::EnumSet * noneOf(::java::lang::Class *);
-  static ::java::util::EnumSet * copyOf(::java::util::EnumSet *);
-  static ::java::util::EnumSet * copyOf(::java::util::Collection *);
-  static ::java::util::EnumSet * complementOf(::java::util::EnumSet *);
-  static ::java::util::EnumSet * of(::java::lang::Enum *);
-  static ::java::util::EnumSet * of(::java::lang::Enum *, ::java::lang::Enum *);
-  static ::java::util::EnumSet * of(::java::lang::Enum *, ::java::lang::Enum *, ::java::lang::Enum *);
-  static ::java::util::EnumSet * of(::java::lang::Enum *, ::java::lang::Enum *, ::java::lang::Enum *, ::java::lang::Enum *);
-  static ::java::util::EnumSet * of(::java::lang::Enum *, ::java::lang::Enum *, ::java::lang::Enum *, ::java::lang::Enum *, ::java::lang::Enum *);
-  static ::java::util::EnumSet * of(::java::lang::Enum *, JArray< ::java::lang::Enum * > *);
-  static ::java::util::EnumSet * range(::java::lang::Enum *, ::java::lang::Enum *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean add(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 4782406773684236311LL;
-public: // actually package-private
-  ::java::util::BitSet * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) store;
-  jint cardinality;
-  ::java::lang::Class * enumClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EnumSet__
diff --git a/libjava/java/util/Enumeration.h b/libjava/java/util/Enumeration.h
deleted file mode 100644
index a79045f0e72..00000000000
--- a/libjava/java/util/Enumeration.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Enumeration__
-#define __java_util_Enumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Enumeration : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean hasMoreElements() = 0;
-  virtual ::java::lang::Object * nextElement() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Enumeration__
diff --git a/libjava/java/util/EventListener.h b/libjava/java/util/EventListener.h
deleted file mode 100644
index 7ab4585c91c..00000000000
--- a/libjava/java/util/EventListener.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EventListener__
-#define __java_util_EventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::EventListener : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_EventListener__
diff --git a/libjava/java/util/EventListenerProxy.h b/libjava/java/util/EventListenerProxy.h
deleted file mode 100644
index 06f16509723..00000000000
--- a/libjava/java/util/EventListenerProxy.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EventListenerProxy__
-#define __java_util_EventListenerProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::EventListenerProxy : public ::java::lang::Object
-{
-
-public:
-  EventListenerProxy(::java::util::EventListener *);
-  virtual ::java::util::EventListener * getListener();
-private:
-  ::java::util::EventListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EventListenerProxy__
diff --git a/libjava/java/util/EventObject.h b/libjava/java/util/EventObject.h
deleted file mode 100644
index bd1862b95e3..00000000000
--- a/libjava/java/util/EventObject.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_EventObject__
-#define __java_util_EventObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::EventObject : public ::java::lang::Object
-{
-
-public:
-  EventObject(::java::lang::Object *);
-  virtual ::java::lang::Object * getSource();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 5516075349620653480LL;
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) source;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_EventObject__
diff --git a/libjava/java/util/FormatFlagsConversionMismatchException.h b/libjava/java/util/FormatFlagsConversionMismatchException.h
deleted file mode 100644
index ce0d3fe3d6b..00000000000
--- a/libjava/java/util/FormatFlagsConversionMismatchException.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_FormatFlagsConversionMismatchException__
-#define __java_util_FormatFlagsConversionMismatchException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::FormatFlagsConversionMismatchException : public ::java::util::IllegalFormatException
-{
-
-public:
-  FormatFlagsConversionMismatchException(::java::lang::String *, jchar);
-  virtual jchar getConversion();
-  virtual ::java::lang::String * getFlags();
-private:
-  static const jlong serialVersionUID = 19120414LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) f;
-  jchar c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_FormatFlagsConversionMismatchException__
diff --git a/libjava/java/util/Formattable.h b/libjava/java/util/Formattable.h
deleted file mode 100644
index 7af1df738cc..00000000000
--- a/libjava/java/util/Formattable.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Formattable__
-#define __java_util_Formattable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Formattable : public ::java::lang::Object
-{
-
-public:
-  virtual void formatTo(::java::util::Formatter *, jint, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Formattable__
diff --git a/libjava/java/util/FormattableFlags.h b/libjava/java/util/FormattableFlags.h
deleted file mode 100644
index 36fba012b33..00000000000
--- a/libjava/java/util/FormattableFlags.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_FormattableFlags__
-#define __java_util_FormattableFlags__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::FormattableFlags : public ::java::lang::Object
-{
-
-  FormattableFlags();
-public:
-  static const jint LEFT_JUSTIFY = 1;
-  static const jint UPPERCASE = 2;
-  static const jint ALTERNATE = 4;
-public: // actually package-private
-  static const jint PLUS = 8;
-  static const jint SPACE = 16;
-  static const jint ZERO = 32;
-  static const jint COMMA = 64;
-  static const jint PAREN = 128;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_FormattableFlags__
diff --git a/libjava/java/util/Formatter$BigDecimalLayoutForm.h b/libjava/java/util/Formatter$BigDecimalLayoutForm.h
deleted file mode 100644
index a6ea3a893cd..00000000000
--- a/libjava/java/util/Formatter$BigDecimalLayoutForm.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Formatter$BigDecimalLayoutForm__
-#define __java_util_Formatter$BigDecimalLayoutForm__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-
-class java::util::Formatter$BigDecimalLayoutForm : public ::java::lang::Enum
-{
-
-  Formatter$BigDecimalLayoutForm(::java::lang::String *, jint);
-public:
-  static JArray< ::java::util::Formatter$BigDecimalLayoutForm * > * values();
-  static ::java::util::Formatter$BigDecimalLayoutForm * valueOf(::java::lang::String *);
-  static ::java::util::Formatter$BigDecimalLayoutForm * DECIMAL_FLOAT;
-  static ::java::util::Formatter$BigDecimalLayoutForm * SCIENTIFIC;
-private:
-  static JArray< ::java::util::Formatter$BigDecimalLayoutForm * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Formatter$BigDecimalLayoutForm__
diff --git a/libjava/java/util/Formatter.h b/libjava/java/util/Formatter.h
deleted file mode 100644
index 5d513ed786d..00000000000
--- a/libjava/java/util/Formatter.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Formatter__
-#define __java_util_Formatter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class DateFormatSymbols;
-    }
-  }
-}
-
-class java::util::Formatter : public ::java::lang::Object
-{
-
-public:
-  Formatter();
-  Formatter(::java::util::Locale *);
-  Formatter(::java::lang::Appendable *);
-  Formatter(::java::lang::Appendable *, ::java::util::Locale *);
-  Formatter(::java::io::File *);
-  Formatter(::java::io::File *, ::java::lang::String *);
-  Formatter(::java::io::File *, ::java::lang::String *, ::java::util::Locale *);
-  Formatter(::java::io::OutputStream *);
-  Formatter(::java::io::OutputStream *, ::java::lang::String *);
-  Formatter(::java::io::OutputStream *, ::java::lang::String *, ::java::util::Locale *);
-  Formatter(::java::io::PrintStream *);
-  Formatter(::java::lang::String *);
-  Formatter(::java::lang::String *, ::java::lang::String *);
-  Formatter(::java::lang::String *, ::java::lang::String *, ::java::util::Locale *);
-  void close();
-  void flush();
-private:
-  ::java::lang::String * getName(jint);
-  void checkFlags(jint, jint, jchar);
-  void noPrecision(jint);
-  void applyLocalization(::java::lang::StringBuilder *, jint, jint, jboolean);
-  void genericFormat(::java::lang::String *, jint, jint, jint);
-  void booleanFormat(::java::lang::Object *, jint, jint, jint, jchar);
-  void hashCodeFormat(::java::lang::Object *, jint, jint, jint, jchar);
-  void stringFormat(::java::lang::Object *, jint, jint, jint, jchar);
-  void characterFormat(::java::lang::Object *, jint, jint, jint, jchar);
-  void percentFormat(jint, jint, jint);
-  void newLineFormat(jint, jint, jint);
-  ::java::lang::StringBuilder * basicIntegralConversion(::java::lang::Object *, jint, jint, jint, jint, jchar);
-  void hexOrOctalConversion(::java::lang::Object *, jint, jint, jint, jint, jchar);
-  void decimalConversion(::java::lang::Object *, jint, jint, jint, jchar);
-  void singleDateTimeConversion(::java::lang::StringBuilder *, ::java::util::Calendar *, jchar, ::java::text::DateFormatSymbols *);
-  void dateTimeConversion(::java::lang::Object *, jint, jint, jint, jchar, jchar);
-  void advance();
-  jint parseInt();
-  jint parseArgumentIndex();
-  jint parseFlags();
-  jint parseWidth();
-  jint parsePrecision();
-public:
-  ::java::util::Formatter * format(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  ::java::util::Formatter * format(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  ::java::io::IOException * ioException();
-  ::java::util::Locale * locale();
-  ::java::lang::Appendable * out();
-  ::java::lang::String * toString();
-private:
-  ::java::lang::Appendable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) out__;
-  ::java::util::Locale * locale__;
-  jboolean closed;
-  ::java::io::IOException * ioException__;
-  ::java::lang::String * format__;
-  jint index;
-  jint length;
-  ::java::util::Locale * fmtLocale;
-  static ::java::lang::String * FLAGS;
-  static ::java::lang::String * lineSeparator;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Formatter__
diff --git a/libjava/java/util/FormatterClosedException.h b/libjava/java/util/FormatterClosedException.h
deleted file mode 100644
index e4e950bca72..00000000000
--- a/libjava/java/util/FormatterClosedException.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_FormatterClosedException__
-#define __java_util_FormatterClosedException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-
-class java::util::FormatterClosedException : public ::java::lang::IllegalStateException
-{
-
-public:
-  FormatterClosedException();
-private:
-  static const jlong serialVersionUID = 18111216LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_FormatterClosedException__
diff --git a/libjava/java/util/GregorianCalendar.h b/libjava/java/util/GregorianCalendar.h
deleted file mode 100644
index 46fb48e0133..00000000000
--- a/libjava/java/util/GregorianCalendar.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_GregorianCalendar__
-#define __java_util_GregorianCalendar__
-
-#pragma interface
-
-#include <java/util/Calendar.h>
-#include <gcj/array.h>
-
-
-class java::util::GregorianCalendar : public ::java::util::Calendar
-{
-
-public:
-  GregorianCalendar();
-  GregorianCalendar(::java::util::TimeZone *);
-  GregorianCalendar(::java::util::Locale *);
-  GregorianCalendar(::java::util::TimeZone *, ::java::util::Locale *);
-private:
-  GregorianCalendar(::java::util::TimeZone *, ::java::util::Locale *, jboolean);
-public:
-  GregorianCalendar(jint, jint, jint);
-  GregorianCalendar(jint, jint, jint, jint, jint);
-  GregorianCalendar(jint, jint, jint, jint, jint, jint);
-  virtual void setGregorianChange(::java::util::Date *);
-  virtual ::java::util::Date * getGregorianChange();
-  virtual jboolean isLeapYear(jint);
-private:
-  jint getWeekDay(jint, jint);
-  jint getFirstDayOfMonth(jint, jint);
-  jboolean isGregorian(jint, jint);
-  void nonLeniencyCheck();
-public: // actually protected
-  virtual void computeTime();
-private:
-  jlong getLinearDay(jint, jint, jboolean);
-  void calculateDay(JArray< jint > *, jlong, jboolean);
-public: // actually protected
-  virtual void computeFields();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual void add(jint, jint);
-  virtual void roll(jint, jboolean);
-private:
-  void cleanUpAfterRoll(jint, jint);
-public:
-  virtual void roll(jint, jint);
-  virtual jint getMinimum(jint);
-  virtual jint getMaximum(jint);
-  virtual jint getGreatestMinimum(jint);
-  virtual jint getLeastMaximum(jint);
-  virtual jint getActualMinimum(jint);
-  virtual jint getActualMaximum(jint);
-  static const jint BC = 0;
-  static const jint AD = 1;
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::util::Calendar)))) gregorianCutover;
-public: // actually package-private
-  static const jlong serialVersionUID = -8125100834729963327LL;
-private:
-  static ::java::lang::String * bundleName;
-  static const jint EPOCH_DAYS = 719162;
-  static JArray< jint > * minimums;
-  static JArray< jint > * maximums;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_GregorianCalendar__
diff --git a/libjava/java/util/HashMap$1.h b/libjava/java/util/HashMap$1.h
deleted file mode 100644
index 216fc615996..00000000000
--- a/libjava/java/util/HashMap$1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_HashMap$1__
-#define __java_util_HashMap$1__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::HashMap$1 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  HashMap$1(::java::util::HashMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_HashMap$1__
diff --git a/libjava/java/util/HashMap$2.h b/libjava/java/util/HashMap$2.h
deleted file mode 100644
index 3baedc5debb..00000000000
--- a/libjava/java/util/HashMap$2.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_HashMap$2__
-#define __java_util_HashMap$2__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::HashMap$2 : public ::java::util::AbstractCollection
-{
-
-public: // actually package-private
-  HashMap$2(::java::util::HashMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-public: // actually package-private
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_HashMap$2__
diff --git a/libjava/java/util/HashMap$3.h b/libjava/java/util/HashMap$3.h
deleted file mode 100644
index b08e4649f8a..00000000000
--- a/libjava/java/util/HashMap$3.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_HashMap$3__
-#define __java_util_HashMap$3__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::HashMap$3 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  HashMap$3(::java::util::HashMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_HashMap$3__
diff --git a/libjava/java/util/HashMap$HashEntry.h b/libjava/java/util/HashMap$HashEntry.h
deleted file mode 100644
index 9f0093d7f27..00000000000
--- a/libjava/java/util/HashMap$HashEntry.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_HashMap$HashEntry__
-#define __java_util_HashMap$HashEntry__
-
-#pragma interface
-
-#include <java/util/AbstractMap$SimpleEntry.h>
-
-class java::util::HashMap$HashEntry : public ::java::util::AbstractMap$SimpleEntry
-{
-
-public: // actually package-private
-  HashMap$HashEntry(::java::lang::Object *, ::java::lang::Object *);
-  virtual void access();
-  virtual ::java::lang::Object * cleanup();
-  ::java::util::HashMap$HashEntry * __attribute__((aligned(__alignof__( ::java::util::AbstractMap$SimpleEntry)))) next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_HashMap$HashEntry__
diff --git a/libjava/java/util/HashMap$HashIterator.h b/libjava/java/util/HashMap$HashIterator.h
deleted file mode 100644
index b56fb350c47..00000000000
--- a/libjava/java/util/HashMap$HashIterator.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_HashMap$HashIterator__
-#define __java_util_HashMap$HashIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::HashMap$HashIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  HashMap$HashIterator(::java::util::HashMap *, jint);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jint knownMod;
-  jint count;
-  jint idx;
-  ::java::util::HashMap$HashEntry * last;
-  ::java::util::HashMap$HashEntry * next__;
-public: // actually package-private
-  ::java::util::HashMap * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_HashMap$HashIterator__
diff --git a/libjava/java/util/HashMap.h b/libjava/java/util/HashMap.h
deleted file mode 100644
index 5b8c77f105e..00000000000
--- a/libjava/java/util/HashMap.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_HashMap__
-#define __java_util_HashMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-#include <gcj/array.h>
-
-
-class java::util::HashMap : public ::java::util::AbstractMap
-{
-
-public:
-  HashMap();
-  HashMap(::java::util::Map *);
-  HashMap(jint);
-  HashMap(jint, jfloat);
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual void clear();
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::Set * keySet();
-  virtual ::java::util::Collection * values();
-  virtual ::java::util::Set * entrySet();
-public: // actually package-private
-  virtual void addEntry(::java::lang::Object *, ::java::lang::Object *, jint, jboolean);
-  virtual ::java::util::HashMap$HashEntry * getEntry(::java::lang::Object *);
-  virtual jint hash(::java::lang::Object *);
-  virtual ::java::util::Iterator * iterator(jint);
-  virtual void putAllInternal(::java::util::Map *);
-private:
-  void rehash();
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public: // actually package-private
-  static const jint DEFAULT_CAPACITY = 11;
-  static jfloat DEFAULT_LOAD_FACTOR;
-private:
-  static const jlong serialVersionUID = 362498820763181265LL;
-  jint __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) threshold;
-public: // actually package-private
-  jfloat loadFactor;
-  JArray< ::java::util::HashMap$HashEntry * > * buckets;
-  jint modCount;
-  jint size__;
-private:
-  ::java::util::Set * entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_HashMap__
diff --git a/libjava/java/util/HashSet.h b/libjava/java/util/HashSet.h
deleted file mode 100644
index 0d96ab91c01..00000000000
--- a/libjava/java/util/HashSet.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_HashSet__
-#define __java_util_HashSet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::HashSet : public ::java::util::AbstractSet
-{
-
-public:
-  HashSet();
-  HashSet(jint);
-  HashSet(jint, jfloat);
-  HashSet(::java::util::Collection *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean isEmpty();
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jint size();
-public: // actually package-private
-  virtual ::java::util::HashMap * init(jint, jfloat);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -5024744406713321676LL;
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) map;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_HashSet__
diff --git a/libjava/java/util/Hashtable$1.h b/libjava/java/util/Hashtable$1.h
deleted file mode 100644
index 3400f04391e..00000000000
--- a/libjava/java/util/Hashtable$1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable$1__
-#define __java_util_Hashtable$1__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::Hashtable$1 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  Hashtable$1(::java::util::Hashtable *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable$1__
diff --git a/libjava/java/util/Hashtable$2.h b/libjava/java/util/Hashtable$2.h
deleted file mode 100644
index 7f099d570a5..00000000000
--- a/libjava/java/util/Hashtable$2.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable$2__
-#define __java_util_Hashtable$2__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::Hashtable$2 : public ::java::util::AbstractCollection
-{
-
-public: // actually package-private
-  Hashtable$2(::java::util::Hashtable *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-public: // actually package-private
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable$2__
diff --git a/libjava/java/util/Hashtable$3.h b/libjava/java/util/Hashtable$3.h
deleted file mode 100644
index bb8bd28c1f1..00000000000
--- a/libjava/java/util/Hashtable$3.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable$3__
-#define __java_util_Hashtable$3__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::Hashtable$3 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  Hashtable$3(::java::util::Hashtable *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable$3__
diff --git a/libjava/java/util/Hashtable$EntryEnumerator.h b/libjava/java/util/Hashtable$EntryEnumerator.h
deleted file mode 100644
index 1480d182e3b..00000000000
--- a/libjava/java/util/Hashtable$EntryEnumerator.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable$EntryEnumerator__
-#define __java_util_Hashtable$EntryEnumerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Hashtable$EntryEnumerator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Hashtable$EntryEnumerator(::java::util::Hashtable *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::util::Map$Entry * target$nextElement();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  jint idx;
-  ::java::util::Hashtable$HashEntry * next;
-  ::java::util::Hashtable * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable$EntryEnumerator__
diff --git a/libjava/java/util/Hashtable$EntryIterator.h b/libjava/java/util/Hashtable$EntryIterator.h
deleted file mode 100644
index d70d486c70a..00000000000
--- a/libjava/java/util/Hashtable$EntryIterator.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable$EntryIterator__
-#define __java_util_Hashtable$EntryIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Hashtable$EntryIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Hashtable$EntryIterator(::java::util::Hashtable *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::util::Map$Entry * target$next();
-  virtual void remove();
-  virtual ::java::lang::Object * next();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) knownMod;
-  jint count;
-  jint idx;
-  ::java::util::Hashtable$HashEntry * last;
-  ::java::util::Hashtable$HashEntry * next__;
-  ::java::util::Hashtable * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable$EntryIterator__
diff --git a/libjava/java/util/Hashtable$HashEntry.h b/libjava/java/util/Hashtable$HashEntry.h
deleted file mode 100644
index c0a1c581b1e..00000000000
--- a/libjava/java/util/Hashtable$HashEntry.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable$HashEntry__
-#define __java_util_Hashtable$HashEntry__
-
-#pragma interface
-
-#include <java/util/AbstractMap$SimpleEntry.h>
-
-class java::util::Hashtable$HashEntry : public ::java::util::AbstractMap$SimpleEntry
-{
-
-public: // actually package-private
-  Hashtable$HashEntry(::java::lang::Object *, ::java::lang::Object *);
-public:
-  ::java::lang::Object * setValue(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::Hashtable$HashEntry * __attribute__((aligned(__alignof__( ::java::util::AbstractMap$SimpleEntry)))) next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable$HashEntry__
diff --git a/libjava/java/util/Hashtable$KeyEnumerator.h b/libjava/java/util/Hashtable$KeyEnumerator.h
deleted file mode 100644
index db4765da729..00000000000
--- a/libjava/java/util/Hashtable$KeyEnumerator.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable$KeyEnumerator__
-#define __java_util_Hashtable$KeyEnumerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Hashtable$KeyEnumerator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Hashtable$KeyEnumerator(::java::util::Hashtable *);
-public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
-private:
-  ::java::util::Hashtable$EntryEnumerator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enumerator;
-public: // actually package-private
-  ::java::util::Hashtable * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable$KeyEnumerator__
diff --git a/libjava/java/util/Hashtable$KeyIterator.h b/libjava/java/util/Hashtable$KeyIterator.h
deleted file mode 100644
index faf1d932276..00000000000
--- a/libjava/java/util/Hashtable$KeyIterator.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable$KeyIterator__
-#define __java_util_Hashtable$KeyIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Hashtable$KeyIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Hashtable$KeyIterator(::java::util::Hashtable *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-private:
-  ::java::util::Hashtable$EntryIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iterator;
-public: // actually package-private
-  ::java::util::Hashtable * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable$KeyIterator__
diff --git a/libjava/java/util/Hashtable$ValueEnumerator.h b/libjava/java/util/Hashtable$ValueEnumerator.h
deleted file mode 100644
index 4dce71ab72b..00000000000
--- a/libjava/java/util/Hashtable$ValueEnumerator.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable$ValueEnumerator__
-#define __java_util_Hashtable$ValueEnumerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Hashtable$ValueEnumerator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Hashtable$ValueEnumerator(::java::util::Hashtable *);
-public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
-private:
-  ::java::util::Hashtable$EntryEnumerator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enumerator;
-public: // actually package-private
-  ::java::util::Hashtable * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable$ValueEnumerator__
diff --git a/libjava/java/util/Hashtable$ValueIterator.h b/libjava/java/util/Hashtable$ValueIterator.h
deleted file mode 100644
index d25279837e7..00000000000
--- a/libjava/java/util/Hashtable$ValueIterator.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable$ValueIterator__
-#define __java_util_Hashtable$ValueIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Hashtable$ValueIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Hashtable$ValueIterator(::java::util::Hashtable *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-private:
-  ::java::util::Hashtable$EntryIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iterator;
-public: // actually package-private
-  ::java::util::Hashtable * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable$ValueIterator__
diff --git a/libjava/java/util/Hashtable.h b/libjava/java/util/Hashtable.h
deleted file mode 100644
index bc33cb14985..00000000000
--- a/libjava/java/util/Hashtable.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Hashtable__
-#define __java_util_Hashtable__
-
-#pragma interface
-
-#include <java/util/Dictionary.h>
-#include <gcj/array.h>
-
-
-class java::util::Hashtable : public ::java::util::Dictionary
-{
-
-public:
-  Hashtable();
-  Hashtable(::java::util::Map *);
-  Hashtable(jint);
-  Hashtable(jint, jfloat);
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual ::java::util::Enumeration * keys();
-  virtual ::java::util::Enumeration * elements();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  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 void putAll(::java::util::Map *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::Set * keySet();
-  virtual ::java::util::Collection * values();
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  jint hash(::java::lang::Object *);
-public: // actually package-private
-  virtual ::java::util::Hashtable$HashEntry * getEntry(::java::lang::Object *);
-  virtual void putAllInternal(::java::util::Map *);
-public: // actually protected
-  virtual void rehash();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jint DEFAULT_CAPACITY = 11;
-  static jfloat DEFAULT_LOAD_FACTOR;
-  static const jlong serialVersionUID = 1421746759512286392LL;
-  jint __attribute__((aligned(__alignof__( ::java::util::Dictionary)))) threshold;
-  jfloat loadFactor;
-public: // actually package-private
-  JArray< ::java::util::Hashtable$HashEntry * > * buckets;
-  jint modCount;
-  jint size__;
-private:
-  ::java::util::Set * keys__;
-  ::java::util::Collection * values__;
-  ::java::util::Set * entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Hashtable__
diff --git a/libjava/java/util/IdentityHashMap$1.h b/libjava/java/util/IdentityHashMap$1.h
deleted file mode 100644
index 6db083c47bc..00000000000
--- a/libjava/java/util/IdentityHashMap$1.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IdentityHashMap$1__
-#define __java_util_IdentityHashMap$1__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::IdentityHashMap$1 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  IdentityHashMap$1(::java::util::IdentityHashMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jint hashCode();
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::IdentityHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IdentityHashMap$1__
diff --git a/libjava/java/util/IdentityHashMap$2.h b/libjava/java/util/IdentityHashMap$2.h
deleted file mode 100644
index b8d6ab663c2..00000000000
--- a/libjava/java/util/IdentityHashMap$2.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IdentityHashMap$2__
-#define __java_util_IdentityHashMap$2__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::IdentityHashMap$2 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  IdentityHashMap$2(::java::util::IdentityHashMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jint hashCode();
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::IdentityHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IdentityHashMap$2__
diff --git a/libjava/java/util/IdentityHashMap$3.h b/libjava/java/util/IdentityHashMap$3.h
deleted file mode 100644
index d2a39754a8f..00000000000
--- a/libjava/java/util/IdentityHashMap$3.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IdentityHashMap$3__
-#define __java_util_IdentityHashMap$3__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::IdentityHashMap$3 : public ::java::util::AbstractCollection
-{
-
-public: // actually package-private
-  IdentityHashMap$3(::java::util::IdentityHashMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::IdentityHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IdentityHashMap$3__
diff --git a/libjava/java/util/IdentityHashMap$IdentityEntry.h b/libjava/java/util/IdentityHashMap$IdentityEntry.h
deleted file mode 100644
index be9fa72daaf..00000000000
--- a/libjava/java/util/IdentityHashMap$IdentityEntry.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IdentityHashMap$IdentityEntry__
-#define __java_util_IdentityHashMap$IdentityEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::IdentityHashMap$IdentityEntry : public ::java::lang::Object
-{
-
-public: // actually package-private
-  IdentityHashMap$IdentityEntry(::java::util::IdentityHashMap *, jint);
-public:
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Object * getKey();
-  ::java::lang::Object * getValue();
-  jint hashCode();
-  ::java::lang::Object * setValue(::java::lang::Object *);
-  ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) loc;
-  jint knownMod;
-  ::java::util::IdentityHashMap * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IdentityHashMap$IdentityEntry__
diff --git a/libjava/java/util/IdentityHashMap$IdentityIterator.h b/libjava/java/util/IdentityHashMap$IdentityIterator.h
deleted file mode 100644
index d2ab43e4819..00000000000
--- a/libjava/java/util/IdentityHashMap$IdentityIterator.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IdentityHashMap$IdentityIterator__
-#define __java_util_IdentityHashMap$IdentityIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::IdentityHashMap$IdentityIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  IdentityHashMap$IdentityIterator(::java::util::IdentityHashMap *, jint);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jint knownMod;
-  jint count;
-  jint loc;
-  ::java::util::IdentityHashMap * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IdentityHashMap$IdentityIterator__
diff --git a/libjava/java/util/IdentityHashMap.h b/libjava/java/util/IdentityHashMap.h
deleted file mode 100644
index 9e77a4b291d..00000000000
--- a/libjava/java/util/IdentityHashMap.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IdentityHashMap__
-#define __java_util_IdentityHashMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-#include <gcj/array.h>
-
-
-class java::util::IdentityHashMap : public ::java::util::AbstractMap
-{
-
-public:
-  IdentityHashMap();
-  IdentityHashMap(jint);
-  IdentityHashMap(::java::util::Map *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::util::Set * keySet();
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putAll(::java::util::Map *);
-public: // actually package-private
-  virtual void removeAtIndex(jint);
-public:
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::util::Collection * values();
-public: // actually package-private
-  virtual ::java::lang::Object * xform(::java::lang::Object *);
-  virtual ::java::lang::Object * unxform(::java::lang::Object *);
-  virtual jint hash(::java::lang::Object *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jint DEFAULT_CAPACITY = 21;
-public: // actually package-private
-  static ::java::lang::Object * nullslot;
-private:
-  static const jlong serialVersionUID = 8188218128353913216LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) size__;
-  JArray< ::java::lang::Object * > * table;
-  jint modCount;
-private:
-  ::java::util::Set * entries;
-  jint threshold;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IdentityHashMap__
diff --git a/libjava/java/util/IllegalFormatCodePointException.h b/libjava/java/util/IllegalFormatCodePointException.h
deleted file mode 100644
index 30801b6d2b8..00000000000
--- a/libjava/java/util/IllegalFormatCodePointException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IllegalFormatCodePointException__
-#define __java_util_IllegalFormatCodePointException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::IllegalFormatCodePointException : public ::java::util::IllegalFormatException
-{
-
-public:
-  IllegalFormatCodePointException(jint);
-  virtual jint getCodePoint();
-private:
-  static const jlong serialVersionUID = 19080630LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IllegalFormatCodePointException__
diff --git a/libjava/java/util/IllegalFormatConversionException.h b/libjava/java/util/IllegalFormatConversionException.h
deleted file mode 100644
index b6b7e8124e3..00000000000
--- a/libjava/java/util/IllegalFormatConversionException.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IllegalFormatConversionException__
-#define __java_util_IllegalFormatConversionException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::IllegalFormatConversionException : public ::java::util::IllegalFormatException
-{
-
-public:
-  IllegalFormatConversionException(jchar, ::java::lang::Class *);
-  virtual jchar getConversion();
-  virtual ::java::lang::Class * getArgumentClass();
-private:
-  static const jlong serialVersionUID = 17000126LL;
-public: // actually package-private
-  jchar __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) c;
-  ::java::lang::Class * arg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IllegalFormatConversionException__
diff --git a/libjava/java/util/IllegalFormatException.h b/libjava/java/util/IllegalFormatException.h
deleted file mode 100644
index bf5f4088fdd..00000000000
--- a/libjava/java/util/IllegalFormatException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IllegalFormatException__
-#define __java_util_IllegalFormatException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-
-class java::util::IllegalFormatException : public ::java::lang::IllegalArgumentException
-{
-
-public: // actually package-private
-  IllegalFormatException();
-  IllegalFormatException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 18830826LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IllegalFormatException__
diff --git a/libjava/java/util/IllegalFormatFlagsException.h b/libjava/java/util/IllegalFormatFlagsException.h
deleted file mode 100644
index c5c13c01b9f..00000000000
--- a/libjava/java/util/IllegalFormatFlagsException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IllegalFormatFlagsException__
-#define __java_util_IllegalFormatFlagsException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::IllegalFormatFlagsException : public ::java::util::IllegalFormatException
-{
-
-public:
-  IllegalFormatFlagsException(::java::lang::String *);
-  virtual ::java::lang::String * getFlags();
-private:
-  static const jlong serialVersionUID = 790824LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IllegalFormatFlagsException__
diff --git a/libjava/java/util/IllegalFormatPrecisionException.h b/libjava/java/util/IllegalFormatPrecisionException.h
deleted file mode 100644
index a4ca0ec23dc..00000000000
--- a/libjava/java/util/IllegalFormatPrecisionException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IllegalFormatPrecisionException__
-#define __java_util_IllegalFormatPrecisionException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::IllegalFormatPrecisionException : public ::java::util::IllegalFormatException
-{
-
-public:
-  IllegalFormatPrecisionException(jint);
-  virtual jint getPrecision();
-private:
-  static const jlong serialVersionUID = 18711008LL;
-  jint __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) p;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IllegalFormatPrecisionException__
diff --git a/libjava/java/util/IllegalFormatWidthException.h b/libjava/java/util/IllegalFormatWidthException.h
deleted file mode 100644
index e278642db68..00000000000
--- a/libjava/java/util/IllegalFormatWidthException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_IllegalFormatWidthException__
-#define __java_util_IllegalFormatWidthException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::IllegalFormatWidthException : public ::java::util::IllegalFormatException
-{
-
-public:
-  IllegalFormatWidthException(jint);
-  virtual jint getWidth();
-private:
-  static const jlong serialVersionUID = 16660902LL;
-  jint __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) w;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_IllegalFormatWidthException__
diff --git a/libjava/java/util/InputMismatchException.h b/libjava/java/util/InputMismatchException.h
deleted file mode 100644
index d1d7216bfb7..00000000000
--- a/libjava/java/util/InputMismatchException.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_InputMismatchException__
-#define __java_util_InputMismatchException__
-
-#pragma interface
-
-#include <java/util/NoSuchElementException.h>
-
-class java::util::InputMismatchException : public ::java::util::NoSuchElementException
-{
-
-public:
-  InputMismatchException();
-  InputMismatchException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_InputMismatchException__
diff --git a/libjava/java/util/InvalidPropertiesFormatException.h b/libjava/java/util/InvalidPropertiesFormatException.h
deleted file mode 100644
index 0380e88d6b1..00000000000
--- a/libjava/java/util/InvalidPropertiesFormatException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_InvalidPropertiesFormatException__
-#define __java_util_InvalidPropertiesFormatException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-
-class java::util::InvalidPropertiesFormatException : public ::java::io::IOException
-{
-
-public:
-  InvalidPropertiesFormatException(::java::lang::String *);
-  InvalidPropertiesFormatException(::java::lang::Throwable *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 7763056076009360219LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_InvalidPropertiesFormatException__
diff --git a/libjava/java/util/Iterator.h b/libjava/java/util/Iterator.h
deleted file mode 100644
index 27343a5b8a7..00000000000
--- a/libjava/java/util/Iterator.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Iterator__
-#define __java_util_Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Iterator : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean hasNext() = 0;
-  virtual ::java::lang::Object * next() = 0;
-  virtual void remove() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Iterator__
diff --git a/libjava/java/util/LinkedHashMap$1.h b/libjava/java/util/LinkedHashMap$1.h
deleted file mode 100644
index ce2d6255b2d..00000000000
--- a/libjava/java/util/LinkedHashMap$1.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_LinkedHashMap$1__
-#define __java_util_LinkedHashMap$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::LinkedHashMap$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LinkedHashMap$1(::java::util::LinkedHashMap *, jint);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-public: // actually package-private
-  ::java::util::LinkedHashMap$LinkedHashEntry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-  ::java::util::LinkedHashMap$LinkedHashEntry * last;
-  jint knownMod;
-  ::java::util::LinkedHashMap * this$0;
-private:
-  jint val$type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_LinkedHashMap$1__
diff --git a/libjava/java/util/LinkedHashMap$LinkedHashEntry.h b/libjava/java/util/LinkedHashMap$LinkedHashEntry.h
deleted file mode 100644
index 8db632b32e9..00000000000
--- a/libjava/java/util/LinkedHashMap$LinkedHashEntry.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_LinkedHashMap$LinkedHashEntry__
-#define __java_util_LinkedHashMap$LinkedHashEntry__
-
-#pragma interface
-
-#include <java/util/HashMap$HashEntry.h>
-
-class java::util::LinkedHashMap$LinkedHashEntry : public ::java::util::HashMap$HashEntry
-{
-
-public: // actually package-private
-  LinkedHashMap$LinkedHashEntry(::java::util::LinkedHashMap *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void access();
-  virtual ::java::lang::Object * cleanup();
-  ::java::util::LinkedHashMap$LinkedHashEntry * __attribute__((aligned(__alignof__( ::java::util::HashMap$HashEntry)))) pred;
-  ::java::util::LinkedHashMap$LinkedHashEntry * succ;
-  ::java::util::LinkedHashMap * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_LinkedHashMap$LinkedHashEntry__
diff --git a/libjava/java/util/LinkedHashMap.h b/libjava/java/util/LinkedHashMap.h
deleted file mode 100644
index d57308875ed..00000000000
--- a/libjava/java/util/LinkedHashMap.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_LinkedHashMap__
-#define __java_util_LinkedHashMap__
-
-#pragma interface
-
-#include <java/util/HashMap.h>
-
-class java::util::LinkedHashMap : public ::java::util::HashMap
-{
-
-public:
-  LinkedHashMap();
-  LinkedHashMap(::java::util::Map *);
-  LinkedHashMap(jint);
-  LinkedHashMap(jint, jfloat);
-  LinkedHashMap(jint, jfloat, jboolean);
-  virtual void clear();
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-public: // actually protected
-  virtual jboolean removeEldestEntry(::java::util::Map$Entry *);
-public: // actually package-private
-  virtual void addEntry(::java::lang::Object *, ::java::lang::Object *, jint, jboolean);
-  virtual void putAllInternal(::java::util::Map *);
-  virtual ::java::util::Iterator * iterator(jint);
-private:
-  static const jlong serialVersionUID = 3801124242820219131LL;
-public: // actually package-private
-  ::java::util::LinkedHashMap$LinkedHashEntry * __attribute__((aligned(__alignof__( ::java::util::HashMap)))) root;
-  jboolean accessOrder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_LinkedHashMap__
diff --git a/libjava/java/util/LinkedHashSet.h b/libjava/java/util/LinkedHashSet.h
deleted file mode 100644
index d63aec8e699..00000000000
--- a/libjava/java/util/LinkedHashSet.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_LinkedHashSet__
-#define __java_util_LinkedHashSet__
-
-#pragma interface
-
-#include <java/util/HashSet.h>
-
-class java::util::LinkedHashSet : public ::java::util::HashSet
-{
-
-public:
-  LinkedHashSet();
-  LinkedHashSet(jint);
-  LinkedHashSet(jint, jfloat);
-  LinkedHashSet(::java::util::Collection *);
-public: // actually package-private
-  virtual ::java::util::HashMap * init(jint, jfloat);
-private:
-  static const jlong serialVersionUID = -2851667679971038690LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_LinkedHashSet__
diff --git a/libjava/java/util/LinkedList$Entry.h b/libjava/java/util/LinkedList$Entry.h
deleted file mode 100644
index c44d48c3eaa..00000000000
--- a/libjava/java/util/LinkedList$Entry.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_LinkedList$Entry__
-#define __java_util_LinkedList$Entry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::LinkedList$Entry : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LinkedList$Entry(::java::lang::Object *);
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
-  ::java::util::LinkedList$Entry * next;
-  ::java::util::LinkedList$Entry * previous;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_LinkedList$Entry__
diff --git a/libjava/java/util/LinkedList$LinkedListItr.h b/libjava/java/util/LinkedList$LinkedListItr.h
deleted file mode 100644
index 2756e206eb6..00000000000
--- a/libjava/java/util/LinkedList$LinkedListItr.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_LinkedList$LinkedListItr__
-#define __java_util_LinkedList$LinkedListItr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::LinkedList$LinkedListItr : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LinkedList$LinkedListItr(::java::util::LinkedList *, jint);
-private:
-  void checkMod();
-public:
-  jint nextIndex();
-  jint previousIndex();
-  jboolean hasNext();
-  jboolean hasPrevious();
-  ::java::lang::Object * next();
-  ::java::lang::Object * previous();
-  void remove();
-  void add(::java::lang::Object *);
-  void set(::java::lang::Object *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) knownMod;
-  ::java::util::LinkedList$Entry * next__;
-  ::java::util::LinkedList$Entry * previous__;
-  ::java::util::LinkedList$Entry * lastReturned;
-  jint position;
-public: // actually package-private
-  ::java::util::LinkedList * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_LinkedList$LinkedListItr__
diff --git a/libjava/java/util/LinkedList.h b/libjava/java/util/LinkedList.h
deleted file mode 100644
index aee4f09d2d3..00000000000
--- a/libjava/java/util/LinkedList.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_LinkedList__
-#define __java_util_LinkedList__
-
-#pragma interface
-
-#include <java/util/AbstractSequentialList.h>
-#include <gcj/array.h>
-
-
-class java::util::LinkedList : public ::java::util::AbstractSequentialList
-{
-
-public: // actually package-private
-  virtual ::java::util::LinkedList$Entry * getEntry(jint);
-  virtual void removeEntry(::java::util::LinkedList$Entry *);
-private:
-  void checkBoundsInclusive(jint);
-  void checkBoundsExclusive(jint);
-public:
-  LinkedList();
-  LinkedList(::java::util::Collection *);
-  virtual ::java::lang::Object * getFirst();
-  virtual ::java::lang::Object * getLast();
-  virtual ::java::lang::Object * removeFirst();
-  virtual ::java::lang::Object * removeLast();
-  virtual void addFirst(::java::lang::Object *);
-  virtual void addLast(::java::lang::Object *);
-private:
-  void addLastEntry(::java::util::LinkedList$Entry *);
-public:
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jint size();
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual jboolean addAll(jint, ::java::util::Collection *);
-  virtual void clear();
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual void add(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint indexOf(::java::lang::Object *);
-  virtual jint lastIndexOf(::java::lang::Object *);
-  virtual ::java::util::ListIterator * listIterator(jint);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual jboolean offer(::java::lang::Object *);
-  virtual ::java::lang::Object * element();
-  virtual ::java::lang::Object * peek();
-  virtual ::java::lang::Object * poll();
-  virtual ::java::lang::Object * remove();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 876323262645176354LL;
-public: // actually package-private
-  ::java::util::LinkedList$Entry * __attribute__((aligned(__alignof__( ::java::util::AbstractSequentialList)))) first;
-  ::java::util::LinkedList$Entry * last;
-  jint size__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_LinkedList__
diff --git a/libjava/java/util/List.h b/libjava/java/util/List.h
deleted file mode 100644
index 89e637b091d..00000000000
--- a/libjava/java/util/List.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_List__
-#define __java_util_List__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::List : public ::java::lang::Object
-{
-
-public:
-  virtual void add(jint, ::java::lang::Object *) = 0;
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean addAll(jint, ::java::util::Collection *) = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * get(jint) = 0;
-  virtual jint hashCode() = 0;
-  virtual jint indexOf(::java::lang::Object *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual jint lastIndexOf(::java::lang::Object *) = 0;
-  virtual ::java::util::ListIterator * listIterator() = 0;
-  virtual ::java::util::ListIterator * listIterator(jint) = 0;
-  virtual ::java::lang::Object * remove(jint) = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *) = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::List * subList(jint, jint) = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_List__
diff --git a/libjava/java/util/ListIterator.h b/libjava/java/util/ListIterator.h
deleted file mode 100644
index 947ad3ccf7b..00000000000
--- a/libjava/java/util/ListIterator.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_ListIterator__
-#define __java_util_ListIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::ListIterator : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean hasNext() = 0;
-  virtual jboolean hasPrevious() = 0;
-  virtual ::java::lang::Object * next() = 0;
-  virtual ::java::lang::Object * previous() = 0;
-  virtual jint nextIndex() = 0;
-  virtual jint previousIndex() = 0;
-  virtual void add(::java::lang::Object *) = 0;
-  virtual void remove() = 0;
-  virtual void set(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_ListIterator__
diff --git a/libjava/java/util/ListResourceBundle.h b/libjava/java/util/ListResourceBundle.h
deleted file mode 100644
index 216d14b4d84..00000000000
--- a/libjava/java/util/ListResourceBundle.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_ListResourceBundle__
-#define __java_util_ListResourceBundle__
-
-#pragma interface
-
-#include <java/util/ResourceBundle.h>
-#include <gcj/array.h>
-
-
-class java::util::ListResourceBundle : public ::java::util::ResourceBundle
-{
-
-public:
-  ListResourceBundle();
-  virtual ::java::lang::Object * handleGetObject(::java::lang::String *);
-  virtual ::java::util::Enumeration * getKeys();
-public: // actually protected
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents() = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_ListResourceBundle__
diff --git a/libjava/java/util/Locale.h b/libjava/java/util/Locale.h
deleted file mode 100644
index 6868aa1712f..00000000000
--- a/libjava/java/util/Locale.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Locale__
-#define __java_util_Locale__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Locale : public ::java::lang::Object
-{
-
-  static ::java::util::Locale * getLocale(::java::lang::String *);
-  static ::java::util::Locale * getLocale(::java::lang::String *, ::java::lang::String *);
-  static ::java::util::Locale * getLocale(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  ::java::lang::String * convertLanguage(::java::lang::String *);
-public:
-  Locale(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  Locale(::java::lang::String *, ::java::lang::String *);
-  Locale(::java::lang::String *);
-  static ::java::util::Locale * getDefault();
-  static void setDefault(::java::util::Locale *);
-  static JArray< ::java::util::Locale * > * getAvailableLocales();
-  static JArray< ::java::lang::String * > * getISOCountries();
-  static JArray< ::java::lang::String * > * getISOLanguages();
-  ::java::lang::String * getLanguage();
-  ::java::lang::String * getCountry();
-  ::java::lang::String * getVariant();
-  ::java::lang::String * toString();
-  ::java::lang::String * getISO3Language();
-  ::java::lang::String * getISO3Country();
-  ::java::lang::String * getDisplayLanguage();
-  ::java::lang::String * getDisplayLanguage(::java::util::Locale *);
-  ::java::lang::String * getDisplayCountry();
-  ::java::lang::String * getDisplayCountry(::java::util::Locale *);
-  ::java::lang::String * getDisplayVariant();
-  ::java::lang::String * getDisplayVariant(::java::util::Locale *);
-  ::java::lang::String * getDisplayName();
-  ::java::lang::String * getDisplayName(::java::util::Locale *);
-  ::java::lang::Object * clone();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  static ::java::util::Locale * ENGLISH;
-  static ::java::util::Locale * FRENCH;
-  static ::java::util::Locale * GERMAN;
-  static ::java::util::Locale * ITALIAN;
-  static ::java::util::Locale * JAPANESE;
-  static ::java::util::Locale * KOREAN;
-  static ::java::util::Locale * CHINESE;
-  static ::java::util::Locale * SIMPLIFIED_CHINESE;
-  static ::java::util::Locale * TRADITIONAL_CHINESE;
-  static ::java::util::Locale * FRANCE;
-  static ::java::util::Locale * GERMANY;
-  static ::java::util::Locale * ITALY;
-  static ::java::util::Locale * JAPAN;
-  static ::java::util::Locale * KOREA;
-  static ::java::util::Locale * CHINA;
-  static ::java::util::Locale * PRC;
-  static ::java::util::Locale * TAIWAN;
-  static ::java::util::Locale * UK;
-  static ::java::util::Locale * US;
-  static ::java::util::Locale * CANADA;
-  static ::java::util::Locale * CANADA_FRENCH;
-private:
-  static const jlong serialVersionUID = 9149081749638150636LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) language;
-  ::java::lang::String * country;
-  ::java::lang::String * variant;
-  jint hashcode;
-  static ::java::util::Locale * defaultLocale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Locale__
diff --git a/libjava/java/util/Map$Entry.h b/libjava/java/util/Map$Entry.h
deleted file mode 100644
index 694a37e7ab9..00000000000
--- a/libjava/java/util/Map$Entry.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Map$Entry__
-#define __java_util_Map$Entry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Map$Entry : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getKey() = 0;
-  virtual ::java::lang::Object * getValue() = 0;
-  virtual ::java::lang::Object * setValue(::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Map$Entry__
diff --git a/libjava/java/util/Map.h b/libjava/java/util/Map.h
deleted file mode 100644
index 05cc5e900cc..00000000000
--- a/libjava/java/util/Map.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Map__
-#define __java_util_Map__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Map : public ::java::lang::Object
-{
-
-public:
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Object *) = 0;
-  virtual jboolean containsValue(::java::lang::Object *) = 0;
-  virtual ::java::util::Set * entrySet() = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * get(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Set * keySet() = 0;
-  virtual void putAll(::java::util::Map *) = 0;
-  virtual ::java::lang::Object * remove(::java::lang::Object *) = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::Collection * values() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Map__
diff --git a/libjava/java/util/MissingFormatArgumentException.h b/libjava/java/util/MissingFormatArgumentException.h
deleted file mode 100644
index d0908d2d47a..00000000000
--- a/libjava/java/util/MissingFormatArgumentException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_MissingFormatArgumentException__
-#define __java_util_MissingFormatArgumentException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::MissingFormatArgumentException : public ::java::util::IllegalFormatException
-{
-
-public:
-  MissingFormatArgumentException(::java::lang::String *);
-  virtual ::java::lang::String * getFormatSpecifier();
-private:
-  static const jlong serialVersionUID = 19190115LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) s;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_MissingFormatArgumentException__
diff --git a/libjava/java/util/MissingFormatWidthException.h b/libjava/java/util/MissingFormatWidthException.h
deleted file mode 100644
index dac93c0c4cc..00000000000
--- a/libjava/java/util/MissingFormatWidthException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_MissingFormatWidthException__
-#define __java_util_MissingFormatWidthException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::MissingFormatWidthException : public ::java::util::IllegalFormatException
-{
-
-public:
-  MissingFormatWidthException(::java::lang::String *);
-  virtual ::java::lang::String * getFormatSpecifier();
-private:
-  static const jlong serialVersionUID = 15560123LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) s;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_MissingFormatWidthException__
diff --git a/libjava/java/util/MissingResourceException.h b/libjava/java/util/MissingResourceException.h
deleted file mode 100644
index 0523e031ab4..00000000000
--- a/libjava/java/util/MissingResourceException.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_MissingResourceException__
-#define __java_util_MissingResourceException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::util::MissingResourceException : public ::java::lang::RuntimeException
-{
-
-public:
-  MissingResourceException(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getKey();
-private:
-  static const jlong serialVersionUID = -4876345176062000401LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) className;
-  ::java::lang::String * key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_MissingResourceException__
diff --git a/libjava/java/util/NavigableMap.h b/libjava/java/util/NavigableMap.h
deleted file mode 100644
index 9e483483484..00000000000
--- a/libjava/java/util/NavigableMap.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_NavigableMap__
-#define __java_util_NavigableMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::NavigableMap : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Map$Entry * lowerEntry(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lowerKey(::java::lang::Object *) = 0;
-  virtual ::java::util::Map$Entry * floorEntry(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * floorKey(::java::lang::Object *) = 0;
-  virtual ::java::util::Map$Entry * ceilingEntry(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * ceilingKey(::java::lang::Object *) = 0;
-  virtual ::java::util::Map$Entry * higherEntry(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * higherKey(::java::lang::Object *) = 0;
-  virtual ::java::util::Map$Entry * firstEntry() = 0;
-  virtual ::java::util::Map$Entry * lastEntry() = 0;
-  virtual ::java::util::Map$Entry * pollFirstEntry() = 0;
-  virtual ::java::util::Map$Entry * pollLastEntry() = 0;
-  virtual ::java::util::NavigableMap * descendingMap() = 0;
-  virtual ::java::util::NavigableSet * navigableKeySet() = 0;
-  virtual ::java::util::NavigableSet * descendingKeySet() = 0;
-  virtual ::java::util::NavigableMap * subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::NavigableMap * headMap(::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::NavigableMap * tailMap(::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::util::SortedMap * headMap(::java::lang::Object *) = 0;
-  virtual ::java::util::SortedMap * tailMap(::java::lang::Object *) = 0;
-  virtual ::java::util::Comparator * comparator() = 0;
-  virtual ::java::lang::Object * firstKey() = 0;
-  virtual ::java::lang::Object * lastKey() = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Object *) = 0;
-  virtual jboolean containsValue(::java::lang::Object *) = 0;
-  virtual ::java::util::Set * entrySet() = 0;
-  virtual ::java::lang::Object * get(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Set * keySet() = 0;
-  virtual void putAll(::java::util::Map *) = 0;
-  virtual ::java::lang::Object * remove(::java::lang::Object *) = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::Collection * values() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_NavigableMap__
diff --git a/libjava/java/util/NavigableSet.h b/libjava/java/util/NavigableSet.h
deleted file mode 100644
index c7e228ea12f..00000000000
--- a/libjava/java/util/NavigableSet.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_NavigableSet__
-#define __java_util_NavigableSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::NavigableSet : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * lower(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * floor(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * ceiling(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * higher(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * pollFirst() = 0;
-  virtual ::java::lang::Object * pollLast() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual ::java::util::NavigableSet * descendingSet() = 0;
-  virtual ::java::util::Iterator * descendingIterator() = 0;
-  virtual ::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::util::SortedSet * headSet(::java::lang::Object *) = 0;
-  virtual ::java::util::SortedSet * tailSet(::java::lang::Object *) = 0;
-  virtual ::java::util::Comparator * comparator() = 0;
-  virtual ::java::lang::Object * first() = 0;
-  virtual ::java::lang::Object * last() = 0;
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_NavigableSet__
diff --git a/libjava/java/util/NoSuchElementException.h b/libjava/java/util/NoSuchElementException.h
deleted file mode 100644
index 43cd646768f..00000000000
--- a/libjava/java/util/NoSuchElementException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_NoSuchElementException__
-#define __java_util_NoSuchElementException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::util::NoSuchElementException : public ::java::lang::RuntimeException
-{
-
-public:
-  NoSuchElementException();
-  NoSuchElementException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6769829250639411880LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_NoSuchElementException__
diff --git a/libjava/java/util/Observable.h b/libjava/java/util/Observable.h
deleted file mode 100644
index 070e97d2349..00000000000
--- a/libjava/java/util/Observable.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Observable__
-#define __java_util_Observable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Observable : public ::java::lang::Object
-{
-
-public:
-  Observable();
-  virtual void addObserver(::java::util::Observer *);
-public: // actually protected
-  virtual void clearChanged();
-public:
-  virtual jint countObservers();
-  virtual void deleteObserver(::java::util::Observer *);
-  virtual void deleteObservers();
-  virtual jboolean hasChanged();
-  virtual void notifyObservers();
-  virtual void notifyObservers(::java::lang::Object *);
-public: // actually protected
-  virtual void setChanged();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) changed;
-  ::java::util::LinkedHashSet * observers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Observable__
diff --git a/libjava/java/util/Observer.h b/libjava/java/util/Observer.h
deleted file mode 100644
index 05964feea38..00000000000
--- a/libjava/java/util/Observer.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Observer__
-#define __java_util_Observer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Observer : public ::java::lang::Object
-{
-
-public:
-  virtual void update(::java::util::Observable *, ::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Observer__
diff --git a/libjava/java/util/PriorityQueue$1.h b/libjava/java/util/PriorityQueue$1.h
deleted file mode 100644
index 1977dea91c8..00000000000
--- a/libjava/java/util/PriorityQueue$1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_PriorityQueue$1__
-#define __java_util_PriorityQueue$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::PriorityQueue$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PriorityQueue$1(::java::util::PriorityQueue *);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-  jint count;
-  ::java::util::PriorityQueue * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_PriorityQueue$1__
diff --git a/libjava/java/util/PriorityQueue.h b/libjava/java/util/PriorityQueue.h
deleted file mode 100644
index 7072486a11d..00000000000
--- a/libjava/java/util/PriorityQueue.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_PriorityQueue__
-#define __java_util_PriorityQueue__
-
-#pragma interface
-
-#include <java/util/AbstractQueue.h>
-#include <gcj/array.h>
-
-
-class java::util::PriorityQueue : public ::java::util::AbstractQueue
-{
-
-public:
-  PriorityQueue();
-  PriorityQueue(::java::util::Collection *);
-  PriorityQueue(jint);
-  PriorityQueue(jint, ::java::util::Comparator *);
-  PriorityQueue(::java::util::PriorityQueue *);
-  PriorityQueue(::java::util::SortedSet *);
-  virtual void clear();
-  virtual ::java::util::Comparator * comparator();
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean offer(::java::lang::Object *);
-  virtual ::java::lang::Object * peek();
-  virtual ::java::lang::Object * poll();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jint size();
-  virtual jboolean addAll(::java::util::Collection *);
-public: // actually package-private
-  virtual jint findSlot(jint);
-  virtual void remove(jint);
-  virtual void bubbleUp(jint);
-  virtual void resize();
-private:
-  static const jint DEFAULT_CAPACITY = 11;
-  static const jlong serialVersionUID = -7720805057305804111LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) used;
-  JArray< ::java::lang::Object * > * storage;
-  ::java::util::Comparator * comparator__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_PriorityQueue__
diff --git a/libjava/java/util/Properties.h b/libjava/java/util/Properties.h
deleted file mode 100644
index 5075e347c80..00000000000
--- a/libjava/java/util/Properties.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Properties__
-#define __java_util_Properties__
-
-#pragma interface
-
-#include <java/util/Hashtable.h>
-
-class java::util::Properties : public ::java::util::Hashtable
-{
-
-public:
-  Properties();
-  Properties(::java::util::Properties *);
-  virtual ::java::lang::Object * setProperty(::java::lang::String *, ::java::lang::String *);
-  virtual void load(::java::io::InputStream *);
-  virtual void save(::java::io::OutputStream *, ::java::lang::String *);
-  virtual void store(::java::io::OutputStream *, ::java::lang::String *);
-  virtual ::java::lang::String * getProperty(::java::lang::String *);
-  virtual ::java::lang::String * getProperty(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::util::Enumeration * propertyNames();
-  virtual void list(::java::io::PrintStream *);
-  virtual void list(::java::io::PrintWriter *);
-private:
-  void formatForOutput(::java::lang::String *, ::java::lang::StringBuilder *, jboolean);
-public:
-  virtual void storeToXML(::java::io::OutputStream *, ::java::lang::String *);
-  virtual void storeToXML(::java::io::OutputStream *, ::java::lang::String *, ::java::lang::String *);
-  virtual void loadFromXML(::java::io::InputStream *);
-public: // actually protected
-  ::java::util::Properties * __attribute__((aligned(__alignof__( ::java::util::Hashtable)))) defaults;
-private:
-  static const jlong serialVersionUID = 4112578634029874840LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Properties__
diff --git a/libjava/java/util/PropertyPermission.h b/libjava/java/util/PropertyPermission.h
deleted file mode 100644
index afd55144752..00000000000
--- a/libjava/java/util/PropertyPermission.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_PropertyPermission__
-#define __java_util_PropertyPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-}
-
-class java::util::PropertyPermission : public ::java::security::BasicPermission
-{
-
-public:
-  PropertyPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  void setActions(::java::lang::String *);
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  jboolean implies(::java::security::Permission *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * getActions();
-  ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  static JArray< ::java::io::ObjectStreamField * > * serialPersistentFields;
-  static const jlong serialVersionUID = 885438825399942851LL;
-  static const jint READ = 1;
-  static const jint WRITE = 2;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::security::BasicPermission)))) actions;
-private:
-  static JArray< ::java::lang::String * > * actionStrings;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_PropertyPermission__
diff --git a/libjava/java/util/PropertyPermissionCollection.h b/libjava/java/util/PropertyPermissionCollection.h
deleted file mode 100644
index 0c00a4e0bb9..00000000000
--- a/libjava/java/util/PropertyPermissionCollection.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_PropertyPermissionCollection__
-#define __java_util_PropertyPermissionCollection__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-}
-
-class java::util::PropertyPermissionCollection : public ::java::security::PermissionCollection
-{
-
-public: // actually package-private
-  PropertyPermissionCollection();
-public:
-  virtual void add(::java::security::Permission *);
-  virtual jboolean implies(::java::security::Permission *);
-  virtual ::java::util::Enumeration * elements();
-private:
-  static const jlong serialVersionUID = 7015263904581634791LL;
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
-  jboolean all_allowed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_PropertyPermissionCollection__
diff --git a/libjava/java/util/PropertyResourceBundle.h b/libjava/java/util/PropertyResourceBundle.h
deleted file mode 100644
index a0f0726be78..00000000000
--- a/libjava/java/util/PropertyResourceBundle.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_PropertyResourceBundle__
-#define __java_util_PropertyResourceBundle__
-
-#pragma interface
-
-#include <java/util/ResourceBundle.h>
-
-class java::util::PropertyResourceBundle : public ::java::util::ResourceBundle
-{
-
-public:
-  PropertyResourceBundle(::java::io::InputStream *);
-  virtual ::java::lang::Object * handleGetObject(::java::lang::String *);
-  virtual ::java::util::Enumeration * getKeys();
-private:
-  ::java::util::Properties * __attribute__((aligned(__alignof__( ::java::util::ResourceBundle)))) properties;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_PropertyResourceBundle__
diff --git a/libjava/java/util/Queue.h b/libjava/java/util/Queue.h
deleted file mode 100644
index c4e8f05736b..00000000000
--- a/libjava/java/util/Queue.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Queue__
-#define __java_util_Queue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Queue : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean offer(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * remove() = 0;
-  virtual ::java::lang::Object * poll() = 0;
-  virtual ::java::lang::Object * element() = 0;
-  virtual ::java::lang::Object * peek() = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Queue__
diff --git a/libjava/java/util/Random.h b/libjava/java/util/Random.h
deleted file mode 100644
index 93bcf2e6c40..00000000000
--- a/libjava/java/util/Random.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Random__
-#define __java_util_Random__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Random : public ::java::lang::Object
-{
-
-public:
-  Random();
-  Random(jlong);
-  virtual void setSeed(jlong);
-public: // actually protected
-  virtual jint next(jint);
-public:
-  virtual void nextBytes(JArray< jbyte > *);
-  virtual jint nextInt();
-  virtual jint nextInt(jint);
-  virtual jlong nextLong();
-  virtual jboolean nextBoolean();
-  virtual jfloat nextFloat();
-  virtual jdouble nextDouble();
-  virtual jdouble nextGaussian();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) haveNextNextGaussian;
-  jdouble nextNextGaussian;
-  jlong seed;
-  static const jlong serialVersionUID = 3905348978240129619LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Random__
diff --git a/libjava/java/util/RandomAccess.h b/libjava/java/util/RandomAccess.h
deleted file mode 100644
index e2bfce76120..00000000000
--- a/libjava/java/util/RandomAccess.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_RandomAccess__
-#define __java_util_RandomAccess__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::RandomAccess : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_RandomAccess__
diff --git a/libjava/java/util/ResourceBundle$1.h b/libjava/java/util/ResourceBundle$1.h
deleted file mode 100644
index fd5b3f70818..00000000000
--- a/libjava/java/util/ResourceBundle$1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_ResourceBundle$1__
-#define __java_util_ResourceBundle$1__
-
-#pragma interface
-
-#include <java/util/LinkedHashMap.h>
-
-class java::util::ResourceBundle$1 : public ::java::util::LinkedHashMap
-{
-
-public: // actually package-private
-  ResourceBundle$1(jint, jfloat, jboolean);
-public:
-  jboolean removeEldestEntry(::java::util::Map$Entry *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_ResourceBundle$1__
diff --git a/libjava/java/util/ResourceBundle$BundleKey.h b/libjava/java/util/ResourceBundle$BundleKey.h
deleted file mode 100644
index 62c08b38f3c..00000000000
--- a/libjava/java/util/ResourceBundle$BundleKey.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_ResourceBundle$BundleKey__
-#define __java_util_ResourceBundle$BundleKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::ResourceBundle$BundleKey : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ResourceBundle$BundleKey();
-  ResourceBundle$BundleKey(::java::util::Locale *, ::java::lang::String *, ::java::util::Locale *, ::java::lang::ClassLoader *);
-  virtual void set(::java::util::Locale *, ::java::lang::String *, ::java::util::Locale *, ::java::lang::ClassLoader *);
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::Locale * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultLocale;
-  ::java::lang::String * baseName;
-  ::java::util::Locale * locale;
-  ::java::lang::ClassLoader * classLoader;
-  jint hashcode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_ResourceBundle$BundleKey__
diff --git a/libjava/java/util/ResourceBundle.h b/libjava/java/util/ResourceBundle.h
deleted file mode 100644
index 98a87e679fd..00000000000
--- a/libjava/java/util/ResourceBundle.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_ResourceBundle__
-#define __java_util_ResourceBundle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::ResourceBundle : public ::java::lang::Object
-{
-
-public:
-  ResourceBundle();
-  virtual ::java::lang::String * getString(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getStringArray(::java::lang::String *);
-  virtual ::java::lang::Object * getObject(::java::lang::String *);
-  virtual ::java::util::Locale * getLocale();
-public: // actually protected
-  virtual void setParent(::java::util::ResourceBundle *);
-public:
-  static ::java::util::ResourceBundle * getBundle(::java::lang::String *);
-  static ::java::util::ResourceBundle * getBundle(::java::lang::String *, ::java::util::Locale *);
-  static ::java::util::ResourceBundle * getBundle(::java::lang::String *, ::java::util::Locale *, ::java::lang::ClassLoader *);
-public: // actually protected
-  virtual ::java::lang::Object * handleGetObject(::java::lang::String *) = 0;
-public:
-  virtual ::java::util::Enumeration * getKeys() = 0;
-private:
-  static ::java::util::ResourceBundle * tryBundle(::java::lang::String *, ::java::lang::ClassLoader *);
-  static ::java::util::ResourceBundle * tryBundle(::java::lang::String *, ::java::util::Locale *, ::java::lang::ClassLoader *, jboolean);
-  static const jint CACHE_SIZE = 100;
-public: // actually protected
-  ::java::util::ResourceBundle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
-private:
-  ::java::util::Locale * locale;
-  static ::java::util::Map * bundleCache;
-  static ::java::util::ResourceBundle$BundleKey * lookupKey;
-  static ::java::lang::Object * nullEntry;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_ResourceBundle__
diff --git a/libjava/java/util/Set.h b/libjava/java/util/Set.h
deleted file mode 100644
index a5634721811..00000000000
--- a/libjava/java/util/Set.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Set__
-#define __java_util_Set__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Set : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_Set__
diff --git a/libjava/java/util/SimpleTimeZone.h b/libjava/java/util/SimpleTimeZone.h
deleted file mode 100644
index 311e31f32b1..00000000000
--- a/libjava/java/util/SimpleTimeZone.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_SimpleTimeZone__
-#define __java_util_SimpleTimeZone__
-
-#pragma interface
-
-#include <java/util/TimeZone.h>
-#include <gcj/array.h>
-
-
-class java::util::SimpleTimeZone : public ::java::util::TimeZone
-{
-
-public:
-  SimpleTimeZone(jint, ::java::lang::String *);
-  SimpleTimeZone(jint, ::java::lang::String *, jint, jint, jint, jint, jint, jint, jint, jint);
-  SimpleTimeZone(jint, ::java::lang::String *, jint, jint, jint, jint, jint, jint, jint, jint, jint);
-  SimpleTimeZone(jint, ::java::lang::String *, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint);
-  virtual void setStartYear(jint);
-private:
-  jint checkRule(jint, jint, jint);
-public:
-  virtual void setStartRule(jint, jint, jint, jint);
-  virtual void setStartRule(jint, jint, jint, jint, jboolean);
-  virtual void setStartRule(jint, jint, jint);
-  virtual void setEndRule(jint, jint, jint, jint);
-  virtual void setEndRule(jint, jint, jint, jint, jboolean);
-  virtual void setEndRule(jint, jint, jint);
-  virtual jint getOffset(jint, jint, jint, jint, jint, jint);
-  virtual jint getRawOffset();
-  virtual void setRawOffset(jint);
-  virtual jint getDSTSavings();
-  virtual void setDSTSavings(jint);
-  virtual jboolean useDaylightTime();
-private:
-  jint getDaysInMonth(jint, jint);
-  jboolean isBefore(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint);
-public:
-  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();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  jint __attribute__((aligned(__alignof__( ::java::util::TimeZone)))) rawOffset;
-  jboolean useDaylight;
-  jint dstSavings;
-  jint startYear;
-  static const jint DOM_MODE = 1;
-  static const jint DOW_IN_MONTH_MODE = 2;
-  static const jint DOW_GE_DOM_MODE = 3;
-  static const jint DOW_LE_DOM_MODE = 4;
-  jint startMode;
-  jint startMonth;
-  jint startDay;
-  jint startDayOfWeek;
-  jint startTime;
-  jint startTimeMode;
-  jint endMonth;
-  jint endMode;
-  jint endDay;
-  jint endDayOfWeek;
-  jint endTime;
-  jint endTimeMode;
-  JArray< jbyte > * monthLength;
-  static JArray< jbyte > * monthArr;
-  jint serialVersionOnStream;
-  static const jlong serialVersionUID = -403250971215465050LL;
-public:
-  static const jint STANDARD_TIME = 1;
-  static const jint WALL_TIME = 0;
-  static const jint UTC_TIME = 2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_SimpleTimeZone__
diff --git a/libjava/java/util/SortedMap.h b/libjava/java/util/SortedMap.h
deleted file mode 100644
index 881489248b3..00000000000
--- a/libjava/java/util/SortedMap.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_SortedMap__
-#define __java_util_SortedMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::SortedMap : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Comparator * comparator() = 0;
-  virtual ::java::lang::Object * firstKey() = 0;
-  virtual ::java::util::SortedMap * headMap(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lastKey() = 0;
-  virtual ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::util::SortedMap * tailMap(::java::lang::Object *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Object *) = 0;
-  virtual jboolean containsValue(::java::lang::Object *) = 0;
-  virtual ::java::util::Set * entrySet() = 0;
-  virtual ::java::lang::Object * get(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Set * keySet() = 0;
-  virtual void putAll(::java::util::Map *) = 0;
-  virtual ::java::lang::Object * remove(::java::lang::Object *) = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::Collection * values() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_SortedMap__
diff --git a/libjava/java/util/SortedSet.h b/libjava/java/util/SortedSet.h
deleted file mode 100644
index 157019a55a1..00000000000
--- a/libjava/java/util/SortedSet.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_SortedSet__
-#define __java_util_SortedSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::SortedSet : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Comparator * comparator() = 0;
-  virtual ::java::lang::Object * first() = 0;
-  virtual ::java::util::SortedSet * headSet(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * last() = 0;
-  virtual ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::util::SortedSet * tailSet(::java::lang::Object *) = 0;
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_SortedSet__
diff --git a/libjava/java/util/Stack.h b/libjava/java/util/Stack.h
deleted file mode 100644
index b6e25f26833..00000000000
--- a/libjava/java/util/Stack.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Stack__
-#define __java_util_Stack__
-
-#pragma interface
-
-#include <java/util/Vector.h>
-
-class java::util::Stack : public ::java::util::Vector
-{
-
-public:
-  Stack();
-  virtual ::java::lang::Object * push(::java::lang::Object *);
-  virtual ::java::lang::Object * pop();
-  virtual ::java::lang::Object * peek();
-  virtual jboolean empty();
-  virtual jint search(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 1224463164541339165LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Stack__
diff --git a/libjava/java/util/StringTokenizer.h b/libjava/java/util/StringTokenizer.h
deleted file mode 100644
index 45d8cb89342..00000000000
--- a/libjava/java/util/StringTokenizer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_StringTokenizer__
-#define __java_util_StringTokenizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::StringTokenizer : public ::java::lang::Object
-{
-
-public:
-  StringTokenizer(::java::lang::String *);
-  StringTokenizer(::java::lang::String *, ::java::lang::String *);
-  StringTokenizer(::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual jboolean hasMoreTokens();
-  virtual ::java::lang::String * nextToken(::java::lang::String *);
-  virtual ::java::lang::String * nextToken();
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-  virtual jint countTokens();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) pos;
-  ::java::lang::String * str;
-  jint len;
-  ::java::lang::String * delim;
-  jboolean retDelims;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_StringTokenizer__
diff --git a/libjava/java/util/TimeZone$1.h b/libjava/java/util/TimeZone$1.h
deleted file mode 100644
index 500d909dddf..00000000000
--- a/libjava/java/util/TimeZone$1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TimeZone$1__
-#define __java_util_TimeZone$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::TimeZone$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TimeZone$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TimeZone$1__
diff --git a/libjava/java/util/TimeZone.h b/libjava/java/util/TimeZone.h
deleted file mode 100644
index 3eb30ad5ff5..00000000000
--- a/libjava/java/util/TimeZone.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TimeZone__
-#define __java_util_TimeZone__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::TimeZone : public ::java::lang::Object
-{
-
-public:
-  TimeZone();
-private:
-  static ::java::util::TimeZone * defaultZone();
-public: // actually package-private
-  static ::java::util::HashMap * timezones();
-  static ::java::util::TimeZone * getDefaultTimeZone(::java::lang::String *);
-private:
-  static JArray< jint > * getDateParams(::java::lang::String *);
-  static jint parseTime(::java::lang::String *);
-public:
-  virtual jint getOffset(jint, jint, jint, jint, jint, jint) = 0;
-  virtual jint getOffset(jlong);
-  virtual jint getRawOffset() = 0;
-  virtual void setRawOffset(jint) = 0;
-  virtual ::java::lang::String * getID();
-  virtual void setID(::java::lang::String *);
-  virtual ::java::lang::String * getDisplayName();
-  virtual ::java::lang::String * getDisplayName(::java::util::Locale *);
-  virtual ::java::lang::String * getDisplayName(jboolean, jint);
-  virtual ::java::lang::String * getDisplayName(jboolean, jint, ::java::util::Locale *);
-private:
-  ::java::lang::String * getDefaultDisplayName(jboolean);
-public:
-  virtual jboolean useDaylightTime() = 0;
-  virtual jboolean inDaylightTime(::java::util::Date *) = 0;
-  virtual jint getDSTSavings();
-  static ::java::util::TimeZone * getTimeZone(::java::lang::String *);
-  static JArray< ::java::lang::String * > * getAvailableIDs(jint);
-  static JArray< ::java::lang::String * > * getAvailableIDs();
-  static ::java::util::TimeZone * getDefault();
-  static void setDefault(::java::util::TimeZone *);
-  virtual jboolean hasSameRules(::java::util::TimeZone *);
-  virtual ::java::lang::Object * clone();
-  static const jint SHORT = 0;
-  static const jint LONG = 1;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ID;
-  static ::java::util::TimeZone * defaultZone0;
-  static const jlong serialVersionUID = 3581463369166924961LL;
-  static ::java::util::HashMap * timezones0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TimeZone__
diff --git a/libjava/java/util/Timer$Scheduler.h b/libjava/java/util/Timer$Scheduler.h
deleted file mode 100644
index ca61c0f76d9..00000000000
--- a/libjava/java/util/Timer$Scheduler.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Timer$Scheduler__
-#define __java_util_Timer$Scheduler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Timer$Scheduler : public ::java::lang::Object
-{
-
-public:
-  Timer$Scheduler(::java::util::Timer$TaskQueue *);
-  void run();
-private:
-  ::java::util::Timer$TaskQueue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Timer$Scheduler__
diff --git a/libjava/java/util/Timer$TaskQueue.h b/libjava/java/util/Timer$TaskQueue.h
deleted file mode 100644
index 13416d32ede..00000000000
--- a/libjava/java/util/Timer$TaskQueue.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Timer$TaskQueue__
-#define __java_util_Timer$TaskQueue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::Timer$TaskQueue : public ::java::lang::Object
-{
-
-public:
-  Timer$TaskQueue();
-private:
-  void add(::java::util::TimerTask *);
-  void remove();
-public:
-  void enqueue(::java::util::TimerTask *);
-private:
-  ::java::util::TimerTask * top();
-public:
-  ::java::util::TimerTask * serve();
-  void setNullOnEmpty(jboolean);
-  void stop();
-  jint purge();
-private:
-  static const jint DEFAULT_SIZE = 32;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) nullOnEmpty;
-  JArray< ::java::util::TimerTask * > * heap;
-  jint elements;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Timer$TaskQueue__
diff --git a/libjava/java/util/Timer.h b/libjava/java/util/Timer.h
deleted file mode 100644
index 2246cfd3054..00000000000
--- a/libjava/java/util/Timer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Timer__
-#define __java_util_Timer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Timer : public ::java::lang::Object
-{
-
-public:
-  Timer();
-  Timer(jboolean);
-  Timer(::java::lang::String *);
-  Timer(::java::lang::String *, jboolean);
-private:
-  Timer(jboolean, jint);
-  Timer(jboolean, jint, ::java::lang::String *);
-public:
-  virtual void cancel();
-private:
-  void schedule(::java::util::TimerTask *, jlong, jlong, jboolean);
-  static void positiveDelay(jlong);
-  static void positivePeriod(jlong);
-public:
-  virtual void schedule(::java::util::TimerTask *, ::java::util::Date *);
-  virtual void schedule(::java::util::TimerTask *, ::java::util::Date *, jlong);
-  virtual void schedule(::java::util::TimerTask *, jlong);
-  virtual void schedule(::java::util::TimerTask *, jlong, jlong);
-  virtual void scheduleAtFixedRate(::java::util::TimerTask *, ::java::util::Date *, jlong);
-  virtual void scheduleAtFixedRate(::java::util::TimerTask *, jlong, jlong);
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual jint purge();
-private:
-  static jint nr;
-  ::java::util::Timer$TaskQueue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queue;
-  ::java::util::Timer$Scheduler * scheduler;
-  ::java::lang::Thread * thread;
-  jboolean canceled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Timer__
diff --git a/libjava/java/util/TimerTask.h b/libjava/java/util/TimerTask.h
deleted file mode 100644
index a38b66ed8b1..00000000000
--- a/libjava/java/util/TimerTask.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TimerTask__
-#define __java_util_TimerTask__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::TimerTask : public ::java::lang::Object
-{
-
-public: // actually protected
-  TimerTask();
-public:
-  virtual jboolean cancel();
-  virtual void run() = 0;
-  virtual jlong scheduledExecutionTime();
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) scheduled;
-  jlong lastExecutionTime;
-  jlong period;
-  jboolean fixed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TimerTask__
diff --git a/libjava/java/util/TooManyListenersException.h b/libjava/java/util/TooManyListenersException.h
deleted file mode 100644
index da5e72a0e7a..00000000000
--- a/libjava/java/util/TooManyListenersException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TooManyListenersException__
-#define __java_util_TooManyListenersException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::util::TooManyListenersException : public ::java::lang::Exception
-{
-
-public:
-  TooManyListenersException();
-  TooManyListenersException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5074640544770687831LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TooManyListenersException__
diff --git a/libjava/java/util/TreeMap$1.h b/libjava/java/util/TreeMap$1.h
deleted file mode 100644
index d181072f09a..00000000000
--- a/libjava/java/util/TreeMap$1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeMap$1__
-#define __java_util_TreeMap$1__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::TreeMap$1 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  TreeMap$1(::java::util::TreeMap$SubMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::TreeMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeMap$1__
diff --git a/libjava/java/util/TreeMap$2.h b/libjava/java/util/TreeMap$2.h
deleted file mode 100644
index 0ea21a8863d..00000000000
--- a/libjava/java/util/TreeMap$2.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeMap$2__
-#define __java_util_TreeMap$2__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::TreeMap$2 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  TreeMap$2(::java::util::TreeMap$SubMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::TreeMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeMap$2__
diff --git a/libjava/java/util/TreeMap$3.h b/libjava/java/util/TreeMap$3.h
deleted file mode 100644
index 47ece2a0334..00000000000
--- a/libjava/java/util/TreeMap$3.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeMap$3__
-#define __java_util_TreeMap$3__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::TreeMap$3 : public ::java::util::AbstractCollection
-{
-
-public: // actually package-private
-  TreeMap$3(::java::util::TreeMap$SubMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-public: // actually package-private
-  ::java::util::TreeMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeMap$3__
diff --git a/libjava/java/util/TreeMap$4.h b/libjava/java/util/TreeMap$4.h
deleted file mode 100644
index 5665ffd20ad..00000000000
--- a/libjava/java/util/TreeMap$4.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeMap$4__
-#define __java_util_TreeMap$4__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::TreeMap$4 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  TreeMap$4(::java::util::TreeMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::TreeMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeMap$4__
diff --git a/libjava/java/util/TreeMap$5.h b/libjava/java/util/TreeMap$5.h
deleted file mode 100644
index b615001e52a..00000000000
--- a/libjava/java/util/TreeMap$5.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeMap$5__
-#define __java_util_TreeMap$5__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::TreeMap$5 : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  TreeMap$5(::java::util::TreeMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::TreeMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeMap$5__
diff --git a/libjava/java/util/TreeMap$6.h b/libjava/java/util/TreeMap$6.h
deleted file mode 100644
index 45e7802ffac..00000000000
--- a/libjava/java/util/TreeMap$6.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeMap$6__
-#define __java_util_TreeMap$6__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::TreeMap$6 : public ::java::util::AbstractCollection
-{
-
-public: // actually package-private
-  TreeMap$6(::java::util::TreeMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-  void clear();
-public: // actually package-private
-  ::java::util::TreeMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeMap$6__
diff --git a/libjava/java/util/TreeMap$Node.h b/libjava/java/util/TreeMap$Node.h
deleted file mode 100644
index 1f0740099e9..00000000000
--- a/libjava/java/util/TreeMap$Node.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeMap$Node__
-#define __java_util_TreeMap$Node__
-
-#pragma interface
-
-#include <java/util/AbstractMap$SimpleEntry.h>
-
-class java::util::TreeMap$Node : public ::java::util::AbstractMap$SimpleEntry
-{
-
-public: // actually package-private
-  TreeMap$Node(::java::lang::Object *, ::java::lang::Object *, jint);
-  jint __attribute__((aligned(__alignof__( ::java::util::AbstractMap$SimpleEntry)))) color;
-  ::java::util::TreeMap$Node * left;
-  ::java::util::TreeMap$Node * right;
-  ::java::util::TreeMap$Node * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeMap$Node__
diff --git a/libjava/java/util/TreeMap$SubMap.h b/libjava/java/util/TreeMap$SubMap.h
deleted file mode 100644
index ef206c8a8b8..00000000000
--- a/libjava/java/util/TreeMap$SubMap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeMap$SubMap__
-#define __java_util_TreeMap$SubMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-
-class java::util::TreeMap$SubMap : public ::java::util::AbstractMap
-{
-
-public: // actually package-private
-  TreeMap$SubMap(::java::util::TreeMap *, ::java::lang::Object *, ::java::lang::Object *);
-  jboolean keyInRange(::java::lang::Object *);
-public:
-  void clear();
-  ::java::util::Comparator * comparator();
-  jboolean containsKey(::java::lang::Object *);
-  jboolean containsValue(::java::lang::Object *);
-  ::java::util::Set * entrySet();
-  ::java::lang::Object * firstKey();
-  ::java::lang::Object * get(::java::lang::Object *);
-  ::java::util::SortedMap * headMap(::java::lang::Object *);
-  ::java::util::Set * keySet();
-  ::java::lang::Object * lastKey();
-  ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  ::java::lang::Object * remove(::java::lang::Object *);
-  jint size();
-  ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::SortedMap * tailMap(::java::lang::Object *);
-  ::java::util::Collection * values();
-public: // actually package-private
-  static ::java::util::TreeMap * access$0(::java::util::TreeMap$SubMap *);
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) minKey;
-  ::java::lang::Object * maxKey;
-private:
-  ::java::util::Set * entries;
-public: // actually package-private
-  ::java::util::TreeMap * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeMap$SubMap__
diff --git a/libjava/java/util/TreeMap$TreeIterator.h b/libjava/java/util/TreeMap$TreeIterator.h
deleted file mode 100644
index 5d8603eedb5..00000000000
--- a/libjava/java/util/TreeMap$TreeIterator.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeMap$TreeIterator__
-#define __java_util_TreeMap$TreeIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::TreeMap$TreeIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TreeMap$TreeIterator(::java::util::TreeMap *, jint);
-  TreeMap$TreeIterator(::java::util::TreeMap *, jint, ::java::util::TreeMap$Node *, ::java::util::TreeMap$Node *);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jint knownMod;
-  ::java::util::TreeMap$Node * last;
-  ::java::util::TreeMap$Node * next__;
-  ::java::util::TreeMap$Node * max;
-public: // actually package-private
-  ::java::util::TreeMap * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeMap$TreeIterator__
diff --git a/libjava/java/util/TreeMap.h b/libjava/java/util/TreeMap.h
deleted file mode 100644
index a68bcf6252c..00000000000
--- a/libjava/java/util/TreeMap.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeMap__
-#define __java_util_TreeMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-
-class java::util::TreeMap : public ::java::util::AbstractMap
-{
-
-public:
-  TreeMap();
-  TreeMap(::java::util::Comparator *);
-  TreeMap(::java::util::Map *);
-  TreeMap(::java::util::SortedMap *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::Comparator * comparator();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::util::Set * entrySet();
-  virtual ::java::lang::Object * firstKey();
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::util::SortedMap * headMap(::java::lang::Object *);
-  virtual ::java::util::Set * keySet();
-  virtual ::java::lang::Object * lastKey();
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::SortedMap * tailMap(::java::lang::Object *);
-  virtual ::java::util::Collection * values();
-public: // actually package-private
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-private:
-  void deleteFixup(::java::util::TreeMap$Node *, ::java::util::TreeMap$Node *);
-  void fabricateTree(jint);
-public: // actually package-private
-  virtual ::java::util::TreeMap$Node * firstNode();
-  virtual ::java::util::TreeMap$Node * getNode(::java::lang::Object *);
-  virtual ::java::util::TreeMap$Node * highestLessThan(::java::lang::Object *);
-private:
-  void insertFixup(::java::util::TreeMap$Node *);
-  ::java::util::TreeMap$Node * lastNode();
-public: // actually package-private
-  virtual ::java::util::TreeMap$Node * lowestGreaterThan(::java::lang::Object *, jboolean);
-private:
-  ::java::util::TreeMap$Node * predecessor(::java::util::TreeMap$Node *);
-public: // actually package-private
-  virtual void putFromObjStream(::java::io::ObjectInputStream *, jint, jboolean);
-  virtual void putKeysLinear(::java::util::Iterator *, jint);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-public: // actually package-private
-  virtual void removeNode(::java::util::TreeMap$Node *);
-private:
-  void rotateLeft(::java::util::TreeMap$Node *);
-  void rotateRight(::java::util::TreeMap$Node *);
-public: // actually package-private
-  virtual ::java::util::TreeMap$Node * successor(::java::util::TreeMap$Node *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 919286545866124006LL;
-public: // actually package-private
-  static const jint RED = -1;
-  static const jint BLACK = 1;
-  static ::java::util::TreeMap$Node * nil;
-private:
-  ::java::util::TreeMap$Node * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) root;
-public: // actually package-private
-  jint size__;
-private:
-  ::java::util::Set * entries;
-public: // actually package-private
-  jint modCount;
-  ::java::util::Comparator * comparator__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeMap__
diff --git a/libjava/java/util/TreeSet.h b/libjava/java/util/TreeSet.h
deleted file mode 100644
index 565d828c4ad..00000000000
--- a/libjava/java/util/TreeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_TreeSet__
-#define __java_util_TreeSet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::TreeSet : public ::java::util::AbstractSet
-{
-
-public:
-  TreeSet();
-  TreeSet(::java::util::Comparator *);
-  TreeSet(::java::util::Collection *);
-  TreeSet(::java::util::SortedSet *);
-private:
-  TreeSet(::java::util::SortedMap *);
-public:
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::Comparator * comparator();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual ::java::lang::Object * first();
-  virtual ::java::util::SortedSet * headSet(::java::lang::Object *);
-  virtual jboolean isEmpty();
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::lang::Object * last();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::SortedSet * tailSet(::java::lang::Object *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -2479143000061671589LL;
-  ::java::util::SortedMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) map;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_TreeSet__
diff --git a/libjava/java/util/UUID.h b/libjava/java/util/UUID.h
deleted file mode 100644
index 86cb4bc476e..00000000000
--- a/libjava/java/util/UUID.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_UUID__
-#define __java_util_UUID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::UUID : public ::java::lang::Object
-{
-
-public:
-  UUID(jlong, jlong);
-  jint clockSequence();
-  jint target$compareTo(::java::util::UUID *);
-  jboolean equals(::java::lang::Object *);
-  static ::java::util::UUID * fromString(::java::lang::String *);
-  ::java::lang::String * toString();
-  jlong getLeastSignificantBits();
-  jlong getMostSignificantBits();
-  jint hashCode();
-  static ::java::util::UUID * nameUUIDFromBytes(JArray< jbyte > *);
-  jlong node();
-  jlong timestamp();
-  static ::java::util::UUID * randomUUID();
-private:
-  ::java::lang::String * padHex(jlong, jint);
-public:
-  jint variant();
-  jint version();
-  jint compareTo(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -4856846361193249489LL;
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) mostSigBits;
-  jlong leastSigBits;
-  static ::java::util::Random * r;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_UUID__
diff --git a/libjava/java/util/UnknownFormatConversionException.h b/libjava/java/util/UnknownFormatConversionException.h
deleted file mode 100644
index 53f8917becc..00000000000
--- a/libjava/java/util/UnknownFormatConversionException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_UnknownFormatConversionException__
-#define __java_util_UnknownFormatConversionException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::UnknownFormatConversionException : public ::java::util::IllegalFormatException
-{
-
-public:
-  UnknownFormatConversionException(::java::lang::String *);
-  virtual ::java::lang::String * getConversion();
-private:
-  static const jlong serialVersionUID = 19060418LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) s;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_UnknownFormatConversionException__
diff --git a/libjava/java/util/UnknownFormatFlagsException.h b/libjava/java/util/UnknownFormatFlagsException.h
deleted file mode 100644
index 62c277a2fe2..00000000000
--- a/libjava/java/util/UnknownFormatFlagsException.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_UnknownFormatFlagsException__
-#define __java_util_UnknownFormatFlagsException__
-
-#pragma interface
-
-#include <java/util/IllegalFormatException.h>
-
-class java::util::UnknownFormatFlagsException : public ::java::util::IllegalFormatException
-{
-
-public:
-  UnknownFormatFlagsException(::java::lang::String *);
-  virtual ::java::lang::String * getFlags();
-private:
-  static const jlong serialVersionUID = 19370506LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::IllegalFormatException)))) flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_UnknownFormatFlagsException__
diff --git a/libjava/java/util/VMTimeZone.h b/libjava/java/util/VMTimeZone.h
deleted file mode 100644
index 6e571143dd0..00000000000
--- a/libjava/java/util/VMTimeZone.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_VMTimeZone__
-#define __java_util_VMTimeZone__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::VMTimeZone : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VMTimeZone();
-  static ::java::util::TimeZone * getDefaultTimeZoneId();
-private:
-  static ::java::lang::String * readTimeZoneFile(::java::lang::String *);
-  static ::java::lang::String * readtzFile(::java::lang::String *);
-  static void skipFully(::java::io::InputStream *, jlong);
-  static ::java::lang::String * getSystemTimeZoneId();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_VMTimeZone__
diff --git a/libjava/java/util/Vector$1.h b/libjava/java/util/Vector$1.h
deleted file mode 100644
index f7dec7ef196..00000000000
--- a/libjava/java/util/Vector$1.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Vector$1__
-#define __java_util_Vector$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::Vector$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Vector$1(::java::util::Vector *);
-public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
-public: // actually package-private
-  ::java::util::Vector * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Vector$1__
diff --git a/libjava/java/util/Vector.h b/libjava/java/util/Vector.h
deleted file mode 100644
index 8330b2a18ff..00000000000
--- a/libjava/java/util/Vector.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_Vector__
-#define __java_util_Vector__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-#include <gcj/array.h>
-
-
-class java::util::Vector : public ::java::util::AbstractList
-{
-
-public:
-  Vector();
-  Vector(::java::util::Collection *);
-  Vector(jint, jint);
-  Vector(jint);
-  virtual void copyInto(JArray< ::java::lang::Object * > *);
-  virtual void trimToSize();
-  virtual void ensureCapacity(jint);
-  virtual void setSize(jint);
-  virtual jint capacity();
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual ::java::util::Enumeration * elements();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jint indexOf(::java::lang::Object *);
-  virtual jint indexOf(::java::lang::Object *, jint);
-  virtual jint lastIndexOf(::java::lang::Object *);
-  virtual jint lastIndexOf(::java::lang::Object *, jint);
-  virtual ::java::lang::Object * elementAt(jint);
-  virtual ::java::lang::Object * firstElement();
-  virtual ::java::lang::Object * lastElement();
-  virtual void setElementAt(::java::lang::Object *, jint);
-  virtual void removeElementAt(jint);
-  virtual void insertElementAt(::java::lang::Object *, jint);
-  virtual void addElement(::java::lang::Object *);
-  virtual jboolean removeElement(::java::lang::Object *);
-  virtual void removeAllElements();
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual void add(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * remove(jint);
-  virtual void clear();
-  virtual jboolean containsAll(::java::util::Collection *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual jboolean retainAll(::java::util::Collection *);
-  virtual jboolean addAll(jint, ::java::util::Collection *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::List * subList(jint, jint);
-public: // actually protected
-  virtual void removeRange(jint, jint);
-private:
-  void checkBoundInclusive(jint);
-  void checkBoundExclusive(jint);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -2767605614048989439LL;
-public: // actually protected
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) elementData;
-  jint elementCount;
-  jint capacityIncrement;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_Vector__
diff --git a/libjava/java/util/WeakHashMap$1.h b/libjava/java/util/WeakHashMap$1.h
deleted file mode 100644
index 312c75f29eb..00000000000
--- a/libjava/java/util/WeakHashMap$1.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_WeakHashMap$1__
-#define __java_util_WeakHashMap$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::WeakHashMap$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  WeakHashMap$1();
-public:
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_WeakHashMap$1__
diff --git a/libjava/java/util/WeakHashMap$2.h b/libjava/java/util/WeakHashMap$2.h
deleted file mode 100644
index 8b40ae09248..00000000000
--- a/libjava/java/util/WeakHashMap$2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_WeakHashMap$2__
-#define __java_util_WeakHashMap$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::WeakHashMap$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  WeakHashMap$2(::java::util::WeakHashMap$WeakEntrySet *);
-private:
-  void checkMod();
-  ::java::util::WeakHashMap$WeakBucket$WeakEntry * findNext(::java::util::WeakHashMap$WeakBucket$WeakEntry *);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-public: // actually package-private
-  ::java::util::WeakHashMap$WeakBucket$WeakEntry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastEntry;
-  ::java::util::WeakHashMap$WeakBucket$WeakEntry * nextEntry;
-  jint knownMod;
-  ::java::util::WeakHashMap$WeakEntrySet * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_WeakHashMap$2__
diff --git a/libjava/java/util/WeakHashMap$WeakBucket$WeakEntry.h b/libjava/java/util/WeakHashMap$WeakBucket$WeakEntry.h
deleted file mode 100644
index 5ddfa8738ed..00000000000
--- a/libjava/java/util/WeakHashMap$WeakBucket$WeakEntry.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_WeakHashMap$WeakBucket$WeakEntry__
-#define __java_util_WeakHashMap$WeakBucket$WeakEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::WeakHashMap$WeakBucket$WeakEntry : public ::java::lang::Object
-{
-
-public:
-  WeakHashMap$WeakBucket$WeakEntry(::java::util::WeakHashMap$WeakBucket *, ::java::lang::Object *);
-  virtual ::java::util::WeakHashMap$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;
-  ::java::util::WeakHashMap$WeakBucket * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_WeakHashMap$WeakBucket$WeakEntry__
diff --git a/libjava/java/util/WeakHashMap$WeakBucket.h b/libjava/java/util/WeakHashMap$WeakBucket.h
deleted file mode 100644
index 9fc29d8dc7a..00000000000
--- a/libjava/java/util/WeakHashMap$WeakBucket.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_WeakHashMap$WeakBucket__
-#define __java_util_WeakHashMap$WeakBucket__
-
-#pragma interface
-
-#include <java/lang/ref/WeakReference.h>
-
-class java::util::WeakHashMap$WeakBucket : public ::java::lang::ref::WeakReference
-{
-
-public:
-  WeakHashMap$WeakBucket(::java::lang::Object *, ::java::lang::ref::ReferenceQueue *, ::java::lang::Object *, jint);
-public: // actually package-private
-  virtual ::java::util::WeakHashMap$WeakBucket$WeakEntry * getEntry();
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::ref::WeakReference)))) value;
-  ::java::util::WeakHashMap$WeakBucket * next;
-  jint slot;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_WeakHashMap$WeakBucket__
diff --git a/libjava/java/util/WeakHashMap$WeakEntrySet.h b/libjava/java/util/WeakHashMap$WeakEntrySet.h
deleted file mode 100644
index cfd558e4228..00000000000
--- a/libjava/java/util/WeakHashMap$WeakEntrySet.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_WeakHashMap$WeakEntrySet__
-#define __java_util_WeakHashMap$WeakEntrySet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::WeakHashMap$WeakEntrySet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  WeakHashMap$WeakEntrySet(::java::util::WeakHashMap *);
-public:
-  jint size();
-  ::java::util::Iterator * iterator();
-public: // actually package-private
-  static ::java::util::WeakHashMap * access$0(::java::util::WeakHashMap$WeakEntrySet *);
-  ::java::util::WeakHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_WeakHashMap$WeakEntrySet__
diff --git a/libjava/java/util/WeakHashMap.h b/libjava/java/util/WeakHashMap.h
deleted file mode 100644
index e5875adf628..00000000000
--- a/libjava/java/util/WeakHashMap.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_WeakHashMap__
-#define __java_util_WeakHashMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-#include <gcj/array.h>
-
-
-class java::util::WeakHashMap : public ::java::util::AbstractMap
-{
-
-public:
-  WeakHashMap();
-  WeakHashMap(jint);
-  WeakHashMap(jint, jfloat);
-  WeakHashMap(::java::util::Map *);
-private:
-  jint hash(::java::lang::Object *);
-public: // actually package-private
-  virtual void cleanQueue();
-private:
-  void rehash();
-  ::java::util::WeakHashMap$WeakBucket$WeakEntry * internalGet(::java::lang::Object *);
-  void internalAdd(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  virtual void internalRemove(::java::util::WeakHashMap$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:
-  ::java::util::WeakHashMap$WeakEntrySet * theEntrySet;
-public: // actually package-private
-  JArray< ::java::util::WeakHashMap$WeakBucket * > * buckets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_WeakHashMap__
diff --git a/libjava/java/util/concurrent/AbstractExecutorService.h b/libjava/java/util/concurrent/AbstractExecutorService.h
deleted file mode 100644
index 796171e6196..00000000000
--- a/libjava/java/util/concurrent/AbstractExecutorService.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_AbstractExecutorService__
-#define __java_util_concurrent_AbstractExecutorService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::AbstractExecutorService : public ::java::lang::Object
-{
-
-public:
-  AbstractExecutorService();
-public: // actually protected
-  virtual ::java::util::concurrent::RunnableFuture * newTaskFor(::java::lang::Runnable *, ::java::lang::Object *);
-  virtual ::java::util::concurrent::RunnableFuture * newTaskFor(::java::util::concurrent::Callable *);
-public:
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *);
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *, ::java::lang::Object *);
-  virtual ::java::util::concurrent::Future * submit(::java::util::concurrent::Callable *);
-private:
-  ::java::lang::Object * doInvokeAny(::java::util::Collection *, jboolean, jlong);
-public:
-  virtual ::java::lang::Object * invokeAny(::java::util::Collection *);
-  virtual ::java::lang::Object * invokeAny(::java::util::Collection *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::List * invokeAll(::java::util::Collection *);
-  virtual ::java::util::List * invokeAll(::java::util::Collection *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual void shutdown() = 0;
-  virtual ::java::util::List * shutdownNow() = 0;
-  virtual jboolean isShutdown() = 0;
-  virtual jboolean isTerminated() = 0;
-  virtual jboolean awaitTermination(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual void execute(::java::lang::Runnable *) = 0;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_AbstractExecutorService__
diff --git a/libjava/java/util/concurrent/ArrayBlockingQueue$Itr.h b/libjava/java/util/concurrent/ArrayBlockingQueue$Itr.h
deleted file mode 100644
index fdddf6c3122..00000000000
--- a/libjava/java/util/concurrent/ArrayBlockingQueue$Itr.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ArrayBlockingQueue$Itr__
-#define __java_util_concurrent_ArrayBlockingQueue$Itr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ArrayBlockingQueue$Itr : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ArrayBlockingQueue$Itr(::java::util::concurrent::ArrayBlockingQueue *);
-public:
-  virtual jboolean hasNext();
-private:
-  void checkNext();
-public:
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) nextIndex;
-  ::java::lang::Object * nextItem;
-  jint lastRet;
-public: // actually package-private
-  ::java::util::concurrent::ArrayBlockingQueue * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ArrayBlockingQueue$Itr__
diff --git a/libjava/java/util/concurrent/ArrayBlockingQueue.h b/libjava/java/util/concurrent/ArrayBlockingQueue.h
deleted file mode 100644
index a431043c671..00000000000
--- a/libjava/java/util/concurrent/ArrayBlockingQueue.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ArrayBlockingQueue__
-#define __java_util_concurrent_ArrayBlockingQueue__
-
-#pragma interface
-
-#include <java/util/AbstractQueue.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::ArrayBlockingQueue : public ::java::util::AbstractQueue
-{
-
-public: // actually package-private
-  virtual jint inc(jint);
-private:
-  void insert(::java::lang::Object *);
-  ::java::lang::Object * extract();
-public: // actually package-private
-  virtual void removeAt(jint);
-public:
-  ArrayBlockingQueue(jint);
-  ArrayBlockingQueue(jint, jboolean);
-  ArrayBlockingQueue(jint, jboolean, ::java::util::Collection *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean offer(::java::lang::Object *);
-  virtual void put(::java::lang::Object *);
-  virtual jboolean offer(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * poll();
-  virtual ::java::lang::Object * take();
-  virtual ::java::lang::Object * poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * peek();
-  virtual jint size();
-  virtual jint remainingCapacity();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean contains(::java::lang::Object *);
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::String * toString();
-  virtual void clear();
-  virtual jint drainTo(::java::util::Collection *);
-  virtual jint drainTo(::java::util::Collection *, jint);
-  virtual ::java::util::Iterator * iterator();
-public: // actually package-private
-  static jint access$0(::java::util::concurrent::ArrayBlockingQueue *);
-  static jint access$1(::java::util::concurrent::ArrayBlockingQueue *);
-  static JArray< ::java::lang::Object * > * access$2(::java::util::concurrent::ArrayBlockingQueue *);
-  static jint access$3(::java::util::concurrent::ArrayBlockingQueue *);
-  static ::java::util::concurrent::locks::ReentrantLock * access$4(::java::util::concurrent::ArrayBlockingQueue *);
-private:
-  static const jlong serialVersionUID = -817911632652898426LL;
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) items;
-  jint takeIndex;
-  jint putIndex;
-  jint count;
-  ::java::util::concurrent::locks::ReentrantLock * lock;
-  ::java::util::concurrent::locks::Condition * notEmpty;
-  ::java::util::concurrent::locks::Condition * notFull;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ArrayBlockingQueue__
diff --git a/libjava/java/util/concurrent/BlockingDeque.h b/libjava/java/util/concurrent/BlockingDeque.h
deleted file mode 100644
index 4aa4cb53327..00000000000
--- a/libjava/java/util/concurrent/BlockingDeque.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_BlockingDeque__
-#define __java_util_concurrent_BlockingDeque__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::BlockingDeque : public ::java::lang::Object
-{
-
-public:
-  virtual void addFirst(::java::lang::Object *) = 0;
-  virtual void addLast(::java::lang::Object *) = 0;
-  virtual jboolean offerFirst(::java::lang::Object *) = 0;
-  virtual jboolean offerLast(::java::lang::Object *) = 0;
-  virtual void putFirst(::java::lang::Object *) = 0;
-  virtual void putLast(::java::lang::Object *) = 0;
-  virtual jboolean offerFirst(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual jboolean offerLast(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::lang::Object * takeFirst() = 0;
-  virtual ::java::lang::Object * takeLast() = 0;
-  virtual ::java::lang::Object * pollFirst(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::lang::Object * pollLast(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual jboolean removeFirstOccurrence(::java::lang::Object *) = 0;
-  virtual jboolean removeLastOccurrence(::java::lang::Object *) = 0;
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean offer(::java::lang::Object *) = 0;
-  virtual void put(::java::lang::Object *) = 0;
-  virtual jboolean offer(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::lang::Object * remove() = 0;
-  virtual ::java::lang::Object * poll() = 0;
-  virtual ::java::lang::Object * take() = 0;
-  virtual ::java::lang::Object * poll(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::lang::Object * element() = 0;
-  virtual ::java::lang::Object * peek() = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual void push(::java::lang::Object *) = 0;
-  virtual jint remainingCapacity() = 0;
-  virtual jint drainTo(::java::util::Collection *) = 0;
-  virtual jint drainTo(::java::util::Collection *, jint) = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  virtual ::java::lang::Object * removeFirst() = 0;
-  virtual ::java::lang::Object * removeLast() = 0;
-  virtual ::java::lang::Object * pollFirst() = 0;
-  virtual ::java::lang::Object * pollLast() = 0;
-  virtual ::java::lang::Object * getFirst() = 0;
-  virtual ::java::lang::Object * getLast() = 0;
-  virtual ::java::lang::Object * peekFirst() = 0;
-  virtual ::java::lang::Object * peekLast() = 0;
-  virtual ::java::lang::Object * pop() = 0;
-  virtual ::java::util::Iterator * descendingIterator() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_BlockingDeque__
diff --git a/libjava/java/util/concurrent/BlockingQueue.h b/libjava/java/util/concurrent/BlockingQueue.h
deleted file mode 100644
index 66cc905fb42..00000000000
--- a/libjava/java/util/concurrent/BlockingQueue.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_BlockingQueue__
-#define __java_util_concurrent_BlockingQueue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::BlockingQueue : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean offer(::java::lang::Object *) = 0;
-  virtual void put(::java::lang::Object *) = 0;
-  virtual jboolean offer(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::lang::Object * take() = 0;
-  virtual ::java::lang::Object * poll(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual jint remainingCapacity() = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jint drainTo(::java::util::Collection *) = 0;
-  virtual jint drainTo(::java::util::Collection *, jint) = 0;
-  virtual ::java::lang::Object * remove() = 0;
-  virtual ::java::lang::Object * poll() = 0;
-  virtual ::java::lang::Object * element() = 0;
-  virtual ::java::lang::Object * peek() = 0;
-  virtual jboolean addAll(::java::util::Collection *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsAll(::java::util::Collection *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Iterator * iterator() = 0;
-  virtual jboolean removeAll(::java::util::Collection *) = 0;
-  virtual jboolean retainAll(::java::util::Collection *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray() = 0;
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_BlockingQueue__
diff --git a/libjava/java/util/concurrent/BrokenBarrierException.h b/libjava/java/util/concurrent/BrokenBarrierException.h
deleted file mode 100644
index e5930d5d523..00000000000
--- a/libjava/java/util/concurrent/BrokenBarrierException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_BrokenBarrierException__
-#define __java_util_concurrent_BrokenBarrierException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::util::concurrent::BrokenBarrierException : public ::java::lang::Exception
-{
-
-public:
-  BrokenBarrierException();
-  BrokenBarrierException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7117394618823254244LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_BrokenBarrierException__
diff --git a/libjava/java/util/concurrent/Callable.h b/libjava/java/util/concurrent/Callable.h
deleted file mode 100644
index 636260e0336..00000000000
--- a/libjava/java/util/concurrent/Callable.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Callable__
-#define __java_util_concurrent_Callable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Callable : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * call() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_Callable__
diff --git a/libjava/java/util/concurrent/CancellationException.h b/libjava/java/util/concurrent/CancellationException.h
deleted file mode 100644
index 7695b0162f2..00000000000
--- a/libjava/java/util/concurrent/CancellationException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_CancellationException__
-#define __java_util_concurrent_CancellationException__
-
-#pragma interface
-
-#include <java/lang/IllegalStateException.h>
-
-class java::util::concurrent::CancellationException : public ::java::lang::IllegalStateException
-{
-
-public:
-  CancellationException();
-  CancellationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -9202173006928992231LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_CancellationException__
diff --git a/libjava/java/util/concurrent/CompletionService.h b/libjava/java/util/concurrent/CompletionService.h
deleted file mode 100644
index 90d79023cda..00000000000
--- a/libjava/java/util/concurrent/CompletionService.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_CompletionService__
-#define __java_util_concurrent_CompletionService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::CompletionService : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::concurrent::Future * submit(::java::util::concurrent::Callable *) = 0;
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *, ::java::lang::Object *) = 0;
-  virtual ::java::util::concurrent::Future * take() = 0;
-  virtual ::java::util::concurrent::Future * poll() = 0;
-  virtual ::java::util::concurrent::Future * poll(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_CompletionService__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h b/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h
deleted file mode 100644
index 5044f070ab8..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap$EntryIterator__
-#define __java_util_concurrent_ConcurrentHashMap$EntryIterator__
-
-#pragma interface
-
-#include <java/util/concurrent/ConcurrentHashMap$HashIterator.h>
-
-class java::util::concurrent::ConcurrentHashMap$EntryIterator : public ::java::util::concurrent::ConcurrentHashMap$HashIterator
-{
-
-public: // actually package-private
-  ConcurrentHashMap$EntryIterator(::java::util::concurrent::ConcurrentHashMap *);
-public:
-  ::java::util::Map$Entry * target$next();
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentHashMap$HashIterator)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap$EntryIterator__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$EntrySet.h b/libjava/java/util/concurrent/ConcurrentHashMap$EntrySet.h
deleted file mode 100644
index 999c022833e..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap$EntrySet.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap$EntrySet__
-#define __java_util_concurrent_ConcurrentHashMap$EntrySet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::concurrent::ConcurrentHashMap$EntrySet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  ConcurrentHashMap$EntrySet(::java::util::concurrent::ConcurrentHashMap *);
-public:
-  ::java::util::Iterator * iterator();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-  jint size();
-  void clear();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap$EntrySet__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h b/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h
deleted file mode 100644
index 730394d1c23..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap$HashEntry__
-#define __java_util_concurrent_ConcurrentHashMap$HashEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::ConcurrentHashMap$HashEntry : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConcurrentHashMap$HashEntry(::java::lang::Object *, jint, ::java::util::concurrent::ConcurrentHashMap$HashEntry *, ::java::lang::Object *);
-  static JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * newArray(jint);
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  jint hash;
-  volatile ::java::lang::Object * value;
-  ::java::util::concurrent::ConcurrentHashMap$HashEntry * next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap$HashEntry__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$HashIterator.h b/libjava/java/util/concurrent/ConcurrentHashMap$HashIterator.h
deleted file mode 100644
index 2a3895cb1c0..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap$HashIterator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap$HashIterator__
-#define __java_util_concurrent_ConcurrentHashMap$HashIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::ConcurrentHashMap$HashIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConcurrentHashMap$HashIterator(::java::util::concurrent::ConcurrentHashMap *);
-public:
-  virtual jboolean hasMoreElements();
-public: // actually package-private
-  virtual void advance();
-public:
-  virtual jboolean hasNext();
-public: // actually package-private
-  virtual ::java::util::concurrent::ConcurrentHashMap$HashEntry * nextEntry();
-public:
-  virtual void remove();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) nextSegmentIndex;
-  jint nextTableIndex;
-  JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * currentTable;
-  ::java::util::concurrent::ConcurrentHashMap$HashEntry * nextEntry__;
-  ::java::util::concurrent::ConcurrentHashMap$HashEntry * lastReturned;
-  ::java::util::concurrent::ConcurrentHashMap * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap$HashIterator__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$KeyIterator.h b/libjava/java/util/concurrent/ConcurrentHashMap$KeyIterator.h
deleted file mode 100644
index afa1b8a0dc1..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap$KeyIterator.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap$KeyIterator__
-#define __java_util_concurrent_ConcurrentHashMap$KeyIterator__
-
-#pragma interface
-
-#include <java/util/concurrent/ConcurrentHashMap$HashIterator.h>
-
-class java::util::concurrent::ConcurrentHashMap$KeyIterator : public ::java::util::concurrent::ConcurrentHashMap$HashIterator
-{
-
-public: // actually package-private
-  ConcurrentHashMap$KeyIterator(::java::util::concurrent::ConcurrentHashMap *);
-public:
-  ::java::lang::Object * next();
-  ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentHashMap$HashIterator)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap$KeyIterator__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$KeySet.h b/libjava/java/util/concurrent/ConcurrentHashMap$KeySet.h
deleted file mode 100644
index 31b002fed7d..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap$KeySet.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap$KeySet__
-#define __java_util_concurrent_ConcurrentHashMap$KeySet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-
-class java::util::concurrent::ConcurrentHashMap$KeySet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  ConcurrentHashMap$KeySet(::java::util::concurrent::ConcurrentHashMap *);
-public:
-  ::java::util::Iterator * iterator();
-  jint size();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-  void clear();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap$KeySet__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h b/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h
deleted file mode 100644
index aaa2a7ae10d..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap$Segment__
-#define __java_util_concurrent_ConcurrentHashMap$Segment__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/ReentrantLock.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::ConcurrentHashMap$Segment : public ::java::util::concurrent::locks::ReentrantLock
-{
-
-public: // actually package-private
-  ConcurrentHashMap$Segment(jint, jfloat);
-  static JArray< ::java::util::concurrent::ConcurrentHashMap$Segment * > * newArray(jint);
-  void setTable(JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > *);
-  ::java::util::concurrent::ConcurrentHashMap$HashEntry * getFirst(jint);
-  ::java::lang::Object * readValueUnderLock(::java::util::concurrent::ConcurrentHashMap$HashEntry *);
-  ::java::lang::Object * get(::java::lang::Object *, jint);
-  jboolean containsKey(::java::lang::Object *, jint);
-  jboolean containsValue(::java::lang::Object *);
-  jboolean replace(::java::lang::Object *, jint, ::java::lang::Object *, ::java::lang::Object *);
-  ::java::lang::Object * replace(::java::lang::Object *, jint, ::java::lang::Object *);
-  ::java::lang::Object * put(::java::lang::Object *, jint, ::java::lang::Object *, jboolean);
-  void rehash();
-  ::java::lang::Object * remove(::java::lang::Object *, jint, ::java::lang::Object *);
-  void clear();
-private:
-  static const jlong serialVersionUID = 2249069246763182397LL;
-public: // actually package-private
-  volatile jint __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::ReentrantLock)))) count;
-  jint modCount;
-  jint threshold;
-  volatile JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * table;
-  jfloat loadFactor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap$Segment__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$ValueIterator.h b/libjava/java/util/concurrent/ConcurrentHashMap$ValueIterator.h
deleted file mode 100644
index 6ccd9057ccf..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap$ValueIterator.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap$ValueIterator__
-#define __java_util_concurrent_ConcurrentHashMap$ValueIterator__
-
-#pragma interface
-
-#include <java/util/concurrent/ConcurrentHashMap$HashIterator.h>
-
-class java::util::concurrent::ConcurrentHashMap$ValueIterator : public ::java::util::concurrent::ConcurrentHashMap$HashIterator
-{
-
-public: // actually package-private
-  ConcurrentHashMap$ValueIterator(::java::util::concurrent::ConcurrentHashMap *);
-public:
-  ::java::lang::Object * next();
-  ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentHashMap$HashIterator)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap$ValueIterator__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$Values.h b/libjava/java/util/concurrent/ConcurrentHashMap$Values.h
deleted file mode 100644
index 9470ec45221..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap$Values.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap$Values__
-#define __java_util_concurrent_ConcurrentHashMap$Values__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-
-class java::util::concurrent::ConcurrentHashMap$Values : public ::java::util::AbstractCollection
-{
-
-public: // actually package-private
-  ConcurrentHashMap$Values(::java::util::concurrent::ConcurrentHashMap *);
-public:
-  ::java::util::Iterator * iterator();
-  jint size();
-  jboolean contains(::java::lang::Object *);
-  void clear();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap$Values__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$WriteThroughEntry.h b/libjava/java/util/concurrent/ConcurrentHashMap$WriteThroughEntry.h
deleted file mode 100644
index 9c7398ee99a..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap$WriteThroughEntry.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap$WriteThroughEntry__
-#define __java_util_concurrent_ConcurrentHashMap$WriteThroughEntry__
-
-#pragma interface
-
-#include <java/util/AbstractMap$SimpleEntry.h>
-
-class java::util::concurrent::ConcurrentHashMap$WriteThroughEntry : public ::java::util::AbstractMap$SimpleEntry
-{
-
-public: // actually package-private
-  ConcurrentHashMap$WriteThroughEntry(::java::util::concurrent::ConcurrentHashMap *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  ::java::lang::Object * setValue(::java::lang::Object *);
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::AbstractMap$SimpleEntry)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap$WriteThroughEntry__
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap.h b/libjava/java/util/concurrent/ConcurrentHashMap.h
deleted file mode 100644
index 0e733c065e4..00000000000
--- a/libjava/java/util/concurrent/ConcurrentHashMap.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentHashMap__
-#define __java_util_concurrent_ConcurrentHashMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::ConcurrentHashMap : public ::java::util::AbstractMap
-{
-
-  static jint hash(jint);
-public: // actually package-private
-  virtual ::java::util::concurrent::ConcurrentHashMap$Segment * segmentFor(jint);
-public:
-  ConcurrentHashMap(jint, jfloat, jint);
-  ConcurrentHashMap(jint, jfloat);
-  ConcurrentHashMap(jint);
-  ConcurrentHashMap();
-  ConcurrentHashMap(::java::util::Map *);
-  virtual jboolean isEmpty();
-  virtual jint size();
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual jboolean contains(::java::lang::Object *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * putIfAbsent(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual jboolean remove(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean replace(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * replace(::java::lang::Object *, ::java::lang::Object *);
-  virtual void clear();
-  virtual ::java::util::Set * keySet();
-  virtual ::java::util::Collection * values();
-  virtual ::java::util::Set * entrySet();
-  virtual ::java::util::Enumeration * keys();
-  virtual ::java::util::Enumeration * elements();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 7249069246763182397LL;
-public: // actually package-private
-  static const jint DEFAULT_INITIAL_CAPACITY = 16;
-  static jfloat DEFAULT_LOAD_FACTOR;
-  static const jint DEFAULT_CONCURRENCY_LEVEL = 16;
-  static const jint MAXIMUM_CAPACITY = 1073741824;
-  static const jint MAX_SEGMENTS = 65536;
-  static const jint RETRIES_BEFORE_LOCK = 2;
-  jint __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) segmentMask;
-  jint segmentShift;
-  JArray< ::java::util::concurrent::ConcurrentHashMap$Segment * > * segments;
-  ::java::util::Set * keySet__;
-  ::java::util::Set * entrySet__;
-  ::java::util::Collection * values__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentHashMap__
diff --git a/libjava/java/util/concurrent/ConcurrentLinkedQueue$Itr.h b/libjava/java/util/concurrent/ConcurrentLinkedQueue$Itr.h
deleted file mode 100644
index ddf3f7e88c1..00000000000
--- a/libjava/java/util/concurrent/ConcurrentLinkedQueue$Itr.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentLinkedQueue$Itr__
-#define __java_util_concurrent_ConcurrentLinkedQueue$Itr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ConcurrentLinkedQueue$Itr : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConcurrentLinkedQueue$Itr(::java::util::concurrent::ConcurrentLinkedQueue *);
-private:
-  ::java::lang::Object * advance();
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-private:
-  ::java::util::concurrent::ConcurrentLinkedQueue$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nextNode;
-  ::java::lang::Object * nextItem;
-  ::java::util::concurrent::ConcurrentLinkedQueue$Node * lastRet;
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentLinkedQueue * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentLinkedQueue$Itr__
diff --git a/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h b/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h
deleted file mode 100644
index 60fee41a4d0..00000000000
--- a/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentLinkedQueue$Node__
-#define __java_util_concurrent_ConcurrentLinkedQueue$Node__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ConcurrentLinkedQueue$Node : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConcurrentLinkedQueue$Node(::java::lang::Object *);
-  ConcurrentLinkedQueue$Node(::java::lang::Object *, ::java::util::concurrent::ConcurrentLinkedQueue$Node *);
-  virtual ::java::lang::Object * getItem();
-  virtual jboolean casItem(::java::lang::Object *, ::java::lang::Object *);
-  virtual void setItem(::java::lang::Object *);
-  virtual ::java::util::concurrent::ConcurrentLinkedQueue$Node * getNext();
-  virtual jboolean casNext(::java::util::concurrent::ConcurrentLinkedQueue$Node *, ::java::util::concurrent::ConcurrentLinkedQueue$Node *);
-  virtual void setNext(::java::util::concurrent::ConcurrentLinkedQueue$Node *);
-private:
-  volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) item;
-  volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * next;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * itemUpdater;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentLinkedQueue$Node__
diff --git a/libjava/java/util/concurrent/ConcurrentLinkedQueue.h b/libjava/java/util/concurrent/ConcurrentLinkedQueue.h
deleted file mode 100644
index 281690e36fb..00000000000
--- a/libjava/java/util/concurrent/ConcurrentLinkedQueue.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentLinkedQueue__
-#define __java_util_concurrent_ConcurrentLinkedQueue__
-
-#pragma interface
-
-#include <java/util/AbstractQueue.h>
-
-class java::util::concurrent::ConcurrentLinkedQueue : public ::java::util::AbstractQueue
-{
-
-  jboolean casTail(::java::util::concurrent::ConcurrentLinkedQueue$Node *, ::java::util::concurrent::ConcurrentLinkedQueue$Node *);
-  jboolean casHead(::java::util::concurrent::ConcurrentLinkedQueue$Node *, ::java::util::concurrent::ConcurrentLinkedQueue$Node *);
-public:
-  ConcurrentLinkedQueue();
-  ConcurrentLinkedQueue(::java::util::Collection *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean offer(::java::lang::Object *);
-  virtual ::java::lang::Object * poll();
-  virtual ::java::lang::Object * peek();
-public: // actually package-private
-  virtual ::java::util::concurrent::ConcurrentLinkedQueue$Node * first();
-public:
-  virtual jboolean isEmpty();
-  virtual jint size();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual ::java::util::Iterator * iterator();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 196745693267521676LL;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * tailUpdater;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater;
-  volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) head;
-  volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * tail;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentLinkedQueue__
diff --git a/libjava/java/util/concurrent/ConcurrentMap.h b/libjava/java/util/concurrent/ConcurrentMap.h
deleted file mode 100644
index a3357e30438..00000000000
--- a/libjava/java/util/concurrent/ConcurrentMap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentMap__
-#define __java_util_concurrent_ConcurrentMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ConcurrentMap : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * putIfAbsent(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean remove(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean replace(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * replace(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Object *) = 0;
-  virtual jboolean containsValue(::java::lang::Object *) = 0;
-  virtual ::java::util::Set * entrySet() = 0;
-  virtual ::java::lang::Object * get(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Set * keySet() = 0;
-  virtual void putAll(::java::util::Map *) = 0;
-  virtual ::java::lang::Object * remove(::java::lang::Object *) = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::Collection * values() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_ConcurrentMap__
diff --git a/libjava/java/util/concurrent/ConcurrentNavigableMap.h b/libjava/java/util/concurrent/ConcurrentNavigableMap.h
deleted file mode 100644
index 68f4d01c91a..00000000000
--- a/libjava/java/util/concurrent/ConcurrentNavigableMap.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentNavigableMap__
-#define __java_util_concurrent_ConcurrentNavigableMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ConcurrentNavigableMap : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * headMap(::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * tailMap(::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * subMap(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * headMap(::java::lang::Object *) = 0;
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * tailMap(::java::lang::Object *) = 0;
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * descendingMap() = 0;
-  virtual ::java::util::NavigableSet * navigableKeySet() = 0;
-  virtual ::java::util::NavigableSet * keySet() = 0;
-  virtual ::java::util::NavigableSet * descendingKeySet() = 0;
-  virtual ::java::lang::Object * putIfAbsent(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean remove(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean replace(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * replace(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Object *) = 0;
-  virtual jboolean containsValue(::java::lang::Object *) = 0;
-  virtual ::java::util::Set * entrySet() = 0;
-  virtual ::java::lang::Object * get(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Set * keySet() = 0;
-  virtual void putAll(::java::util::Map *) = 0;
-  virtual ::java::lang::Object * remove(::java::lang::Object *) = 0;
-  virtual jint size() = 0;
-  virtual ::java::util::Collection * values() = 0;
-  virtual ::java::util::Map$Entry * lowerEntry(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lowerKey(::java::lang::Object *) = 0;
-  virtual ::java::util::Map$Entry * floorEntry(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * floorKey(::java::lang::Object *) = 0;
-  virtual ::java::util::Map$Entry * ceilingEntry(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * ceilingKey(::java::lang::Object *) = 0;
-  virtual ::java::util::Map$Entry * higherEntry(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * higherKey(::java::lang::Object *) = 0;
-  virtual ::java::util::Map$Entry * firstEntry() = 0;
-  virtual ::java::util::Map$Entry * lastEntry() = 0;
-  virtual ::java::util::Map$Entry * pollFirstEntry() = 0;
-  virtual ::java::util::Map$Entry * pollLastEntry() = 0;
-  virtual ::java::util::NavigableMap * descendingMap() = 0;
-  virtual ::java::util::NavigableMap * subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::NavigableMap * headMap(::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::NavigableMap * tailMap(::java::lang::Object *, jboolean) = 0;
-  virtual ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::util::SortedMap * headMap(::java::lang::Object *) = 0;
-  virtual ::java::util::SortedMap * tailMap(::java::lang::Object *) = 0;
-  virtual ::java::util::Comparator * comparator() = 0;
-  virtual ::java::lang::Object * firstKey() = 0;
-  virtual ::java::lang::Object * lastKey() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_ConcurrentNavigableMap__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$ComparableUsingComparator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$ComparableUsingComparator.h
deleted file mode 100644
index b64afd55434..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$ComparableUsingComparator.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$ComparableUsingComparator__
-#define __java_util_concurrent_ConcurrentSkipListMap$ComparableUsingComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$ComparableUsingComparator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$ComparableUsingComparator(::java::lang::Object *, ::java::util::Comparator *);
-public:
-  jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) actualKey;
-  ::java::util::Comparator * cmp;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$ComparableUsingComparator__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h
deleted file mode 100644
index 1949e5ac617..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$EntryIterator__
-#define __java_util_concurrent_ConcurrentSkipListMap$EntryIterator__
-
-#pragma interface
-
-#include <java/util/concurrent/ConcurrentSkipListMap$Iter.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$EntryIterator : public ::java::util::concurrent::ConcurrentSkipListMap$Iter
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$EntryIterator(::java::util::concurrent::ConcurrentSkipListMap *);
-public:
-  ::java::util::Map$Entry * target$next();
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentSkipListMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$Iter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$EntryIterator__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$EntrySet.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$EntrySet.h
deleted file mode 100644
index e235ffc8d54..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$EntrySet.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$EntrySet__
-#define __java_util_concurrent_ConcurrentSkipListMap$EntrySet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::ConcurrentSkipListMap$EntrySet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$EntrySet(::java::util::concurrent::ConcurrentNavigableMap *);
-public:
-  ::java::util::Iterator * iterator();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-  jboolean isEmpty();
-  jint size();
-  void clear();
-  jboolean equals(::java::lang::Object *);
-  JArray< ::java::lang::Object * > * toArray();
-  JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-private:
-  ::java::util::concurrent::ConcurrentNavigableMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) m;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$EntrySet__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$HeadIndex.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$HeadIndex.h
deleted file mode 100644
index f20214ce645..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$HeadIndex.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$HeadIndex__
-#define __java_util_concurrent_ConcurrentSkipListMap$HeadIndex__
-
-#pragma interface
-
-#include <java/util/concurrent/ConcurrentSkipListMap$Index.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$HeadIndex : public ::java::util::concurrent::ConcurrentSkipListMap$Index
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$HeadIndex(::java::util::concurrent::ConcurrentSkipListMap$Node *, ::java::util::concurrent::ConcurrentSkipListMap$Index *, ::java::util::concurrent::ConcurrentSkipListMap$Index *, jint);
-  jint __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$Index)))) level;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$HeadIndex__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h
deleted file mode 100644
index c71b25bd327..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$Index__
-#define __java_util_concurrent_ConcurrentSkipListMap$Index__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$Index : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$Index(::java::util::concurrent::ConcurrentSkipListMap$Node *, ::java::util::concurrent::ConcurrentSkipListMap$Index *, ::java::util::concurrent::ConcurrentSkipListMap$Index *);
-  virtual jboolean casRight(::java::util::concurrent::ConcurrentSkipListMap$Index *, ::java::util::concurrent::ConcurrentSkipListMap$Index *);
-  virtual jboolean indexesDeletedNode();
-  virtual jboolean link(::java::util::concurrent::ConcurrentSkipListMap$Index *, ::java::util::concurrent::ConcurrentSkipListMap$Index *);
-  virtual jboolean unlink(::java::util::concurrent::ConcurrentSkipListMap$Index *);
-  ::java::util::concurrent::ConcurrentSkipListMap$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node;
-  ::java::util::concurrent::ConcurrentSkipListMap$Index * down;
-  volatile ::java::util::concurrent::ConcurrentSkipListMap$Index * right;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * rightUpdater;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$Index__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$Iter.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$Iter.h
deleted file mode 100644
index f9170b31718..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$Iter.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$Iter__
-#define __java_util_concurrent_ConcurrentSkipListMap$Iter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$Iter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$Iter(::java::util::concurrent::ConcurrentSkipListMap *);
-public:
-  virtual jboolean hasNext();
-public: // actually package-private
-  virtual void advance();
-public:
-  virtual void remove();
-  virtual ::java::lang::Object * next() = 0;
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentSkipListMap$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastReturned;
-  ::java::util::concurrent::ConcurrentSkipListMap$Node * next;
-  ::java::lang::Object * nextValue;
-  ::java::util::concurrent::ConcurrentSkipListMap * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$Iter__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$KeyIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$KeyIterator.h
deleted file mode 100644
index 03eb3e84a93..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$KeyIterator.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$KeyIterator__
-#define __java_util_concurrent_ConcurrentSkipListMap$KeyIterator__
-
-#pragma interface
-
-#include <java/util/concurrent/ConcurrentSkipListMap$Iter.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$KeyIterator : public ::java::util::concurrent::ConcurrentSkipListMap$Iter
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$KeyIterator(::java::util::concurrent::ConcurrentSkipListMap *);
-public:
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentSkipListMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$Iter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$KeyIterator__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h
deleted file mode 100644
index c2372f8b491..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$KeySet__
-#define __java_util_concurrent_ConcurrentSkipListMap$KeySet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::ConcurrentSkipListMap$KeySet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$KeySet(::java::util::concurrent::ConcurrentNavigableMap *);
-public:
-  jint size();
-  jboolean isEmpty();
-  jboolean contains(::java::lang::Object *);
-  jboolean remove(::java::lang::Object *);
-  void clear();
-  ::java::lang::Object * lower(::java::lang::Object *);
-  ::java::lang::Object * floor(::java::lang::Object *);
-  ::java::lang::Object * ceiling(::java::lang::Object *);
-  ::java::lang::Object * higher(::java::lang::Object *);
-  ::java::util::Comparator * comparator();
-  ::java::lang::Object * first();
-  ::java::lang::Object * last();
-  ::java::lang::Object * pollFirst();
-  ::java::lang::Object * pollLast();
-  ::java::util::Iterator * iterator();
-  jboolean equals(::java::lang::Object *);
-  JArray< ::java::lang::Object * > * toArray();
-  JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  ::java::util::Iterator * descendingIterator();
-  ::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  ::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean);
-  ::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean);
-  ::java::util::NavigableSet * target$subSet(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::NavigableSet * target$headSet(::java::lang::Object *);
-  ::java::util::NavigableSet * target$tailSet(::java::lang::Object *);
-  ::java::util::NavigableSet * descendingSet();
-  ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::SortedSet * tailSet(::java::lang::Object *);
-  ::java::util::SortedSet * headSet(::java::lang::Object *);
-private:
-  ::java::util::concurrent::ConcurrentNavigableMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) m;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$KeySet__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h
deleted file mode 100644
index 1b94c359071..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$Node__
-#define __java_util_concurrent_ConcurrentSkipListMap$Node__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$Node : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$Node(::java::lang::Object *, ::java::lang::Object *, ::java::util::concurrent::ConcurrentSkipListMap$Node *);
-  ConcurrentSkipListMap$Node(::java::util::concurrent::ConcurrentSkipListMap$Node *);
-  jboolean casValue(::java::lang::Object *, ::java::lang::Object *);
-  jboolean casNext(::java::util::concurrent::ConcurrentSkipListMap$Node *, ::java::util::concurrent::ConcurrentSkipListMap$Node *);
-  jboolean isMarker();
-  jboolean isBaseHeader();
-  jboolean appendMarker(::java::util::concurrent::ConcurrentSkipListMap$Node *);
-  void helpDelete(::java::util::concurrent::ConcurrentSkipListMap$Node *, ::java::util::concurrent::ConcurrentSkipListMap$Node *);
-  ::java::lang::Object * getValidValue();
-  ::java::util::AbstractMap$SimpleImmutableEntry * createSnapshot();
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  volatile ::java::lang::Object * value;
-  volatile ::java::util::concurrent::ConcurrentSkipListMap$Node * next;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * valueUpdater;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$Node__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h
deleted file mode 100644
index 8b01d994082..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapEntryIterator__
-#define __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapEntryIterator__
-
-#pragma interface
-
-#include <java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapIter.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapEntryIterator : public ::java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$SubMap$SubMapEntryIterator(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
-public:
-  ::java::util::Map$Entry * target$next();
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapEntryIterator__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapIter.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapIter.h
deleted file mode 100644
index a4f569348ae..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapIter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapIter__
-#define __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapIter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$SubMap$SubMapIter(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
-public:
-  virtual jboolean hasNext();
-public: // actually package-private
-  virtual void advance();
-private:
-  void ascend();
-  void descend();
-public:
-  virtual void remove();
-  virtual ::java::lang::Object * next() = 0;
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentSkipListMap$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastReturned;
-  ::java::util::concurrent::ConcurrentSkipListMap$Node * next;
-  ::java::lang::Object * nextValue;
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapIter__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapKeyIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapKeyIterator.h
deleted file mode 100644
index 5af0bca1d4e..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapKeyIterator.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapKeyIterator__
-#define __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapKeyIterator__
-
-#pragma interface
-
-#include <java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapIter.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapKeyIterator : public ::java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$SubMap$SubMapKeyIterator(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
-public:
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapKeyIterator__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapValueIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapValueIterator.h
deleted file mode 100644
index deefc73c9b6..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapValueIterator.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapValueIterator__
-#define __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapValueIterator__
-
-#pragma interface
-
-#include <java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapIter.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapValueIterator : public ::java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$SubMap$SubMapValueIterator(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
-public:
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$SubMap$SubMapValueIterator__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h
deleted file mode 100644
index e065dbe6caa..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h
+++ /dev/null
@@ -1,118 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$SubMap__
-#define __java_util_concurrent_ConcurrentSkipListMap$SubMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$SubMap : public ::java::util::AbstractMap
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$SubMap(::java::util::concurrent::ConcurrentSkipListMap *, ::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean, jboolean);
-private:
-  jboolean tooLow(::java::lang::Object *);
-  jboolean tooHigh(::java::lang::Object *);
-  jboolean inBounds(::java::lang::Object *);
-  void checkKeyBounds(::java::lang::Object *);
-  jboolean isBeforeEnd(::java::util::concurrent::ConcurrentSkipListMap$Node *);
-  ::java::util::concurrent::ConcurrentSkipListMap$Node * loNode();
-  ::java::util::concurrent::ConcurrentSkipListMap$Node * hiNode();
-  ::java::lang::Object * lowestKey();
-  ::java::lang::Object * highestKey();
-  ::java::util::Map$Entry * lowestEntry();
-  ::java::util::Map$Entry * highestEntry();
-  ::java::util::Map$Entry * removeLowest();
-  ::java::util::Map$Entry * removeHighest();
-  ::java::util::Map$Entry * getNearEntry(::java::lang::Object *, jint);
-  ::java::lang::Object * getNearKey(::java::lang::Object *, jint);
-public:
-  jboolean containsKey(::java::lang::Object *);
-  ::java::lang::Object * get(::java::lang::Object *);
-  ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  ::java::lang::Object * remove(::java::lang::Object *);
-  jint size();
-  jboolean isEmpty();
-  jboolean containsValue(::java::lang::Object *);
-  void clear();
-  ::java::lang::Object * putIfAbsent(::java::lang::Object *, ::java::lang::Object *);
-  jboolean remove(::java::lang::Object *, ::java::lang::Object *);
-  jboolean replace(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-  ::java::lang::Object * replace(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::Comparator * comparator();
-private:
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * newSubMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-public:
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$headMap(::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$tailMap(::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$subMap(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$headMap(::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$tailMap(::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$descendingMap();
-  ::java::util::Map$Entry * ceilingEntry(::java::lang::Object *);
-  ::java::lang::Object * ceilingKey(::java::lang::Object *);
-  ::java::util::Map$Entry * lowerEntry(::java::lang::Object *);
-  ::java::lang::Object * lowerKey(::java::lang::Object *);
-  ::java::util::Map$Entry * floorEntry(::java::lang::Object *);
-  ::java::lang::Object * floorKey(::java::lang::Object *);
-  ::java::util::Map$Entry * higherEntry(::java::lang::Object *);
-  ::java::lang::Object * higherKey(::java::lang::Object *);
-  ::java::lang::Object * firstKey();
-  ::java::lang::Object * lastKey();
-  ::java::util::Map$Entry * firstEntry();
-  ::java::util::Map$Entry * lastEntry();
-  ::java::util::Map$Entry * pollFirstEntry();
-  ::java::util::Map$Entry * pollLastEntry();
-  ::java::util::NavigableSet * target$keySet();
-  ::java::util::NavigableSet * navigableKeySet();
-  ::java::util::Collection * values();
-  ::java::util::Set * entrySet();
-  ::java::util::NavigableSet * descendingKeySet();
-public: // actually package-private
-  ::java::util::Iterator * keyIterator();
-  ::java::util::Iterator * valueIterator();
-  ::java::util::Iterator * entryIterator();
-public:
-  ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentNavigableMap * subMap(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::NavigableMap * subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentNavigableMap * subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  ::java::util::SortedMap * tailMap(::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentNavigableMap * tailMap(::java::lang::Object *);
-  ::java::util::NavigableMap * tailMap(::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentNavigableMap * tailMap(::java::lang::Object *, jboolean);
-  ::java::util::SortedMap * headMap(::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentNavigableMap * headMap(::java::lang::Object *);
-  ::java::util::NavigableMap * headMap(::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentNavigableMap * headMap(::java::lang::Object *, jboolean);
-  ::java::util::Set * keySet();
-  ::java::util::NavigableMap * descendingMap();
-  ::java::util::concurrent::ConcurrentNavigableMap * descendingMap();
-public: // actually package-private
-  static jboolean access$15(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
-  static ::java::util::concurrent::ConcurrentSkipListMap$Node * access$16(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
-  static ::java::util::concurrent::ConcurrentSkipListMap$Node * access$17(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
-  static jboolean access$18(::java::util::concurrent::ConcurrentSkipListMap$SubMap *, ::java::lang::Object *);
-  static jboolean access$19(::java::util::concurrent::ConcurrentSkipListMap$SubMap *, ::java::lang::Object *);
-  static ::java::util::concurrent::ConcurrentSkipListMap * access$20(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
-  static jboolean access$21(::java::util::concurrent::ConcurrentSkipListMap$SubMap *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -7647078645895051609LL;
-  ::java::util::concurrent::ConcurrentSkipListMap * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) m;
-  ::java::lang::Object * lo;
-  ::java::lang::Object * hi;
-  jboolean loInclusive;
-  jboolean hiInclusive;
-  jboolean isDescending;
-  ::java::util::concurrent::ConcurrentSkipListMap$KeySet * keySetView;
-  ::java::util::Set * entrySetView;
-  ::java::util::Collection * valuesView;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$SubMap__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$ValueIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$ValueIterator.h
deleted file mode 100644
index fa671d81484..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$ValueIterator.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$ValueIterator__
-#define __java_util_concurrent_ConcurrentSkipListMap$ValueIterator__
-
-#pragma interface
-
-#include <java/util/concurrent/ConcurrentSkipListMap$Iter.h>
-
-class java::util::concurrent::ConcurrentSkipListMap$ValueIterator : public ::java::util::concurrent::ConcurrentSkipListMap$Iter
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$ValueIterator(::java::util::concurrent::ConcurrentSkipListMap *);
-public:
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::concurrent::ConcurrentSkipListMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$Iter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$ValueIterator__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$Values.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$Values.h
deleted file mode 100644
index 1fc3b1b8ee4..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$Values.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap$Values__
-#define __java_util_concurrent_ConcurrentSkipListMap$Values__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::ConcurrentSkipListMap$Values : public ::java::util::AbstractCollection
-{
-
-public: // actually package-private
-  ConcurrentSkipListMap$Values(::java::util::concurrent::ConcurrentNavigableMap *);
-public:
-  ::java::util::Iterator * iterator();
-  jboolean isEmpty();
-  jint size();
-  jboolean contains(::java::lang::Object *);
-  void clear();
-  JArray< ::java::lang::Object * > * toArray();
-  JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-private:
-  ::java::util::concurrent::ConcurrentNavigableMap * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) m;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap$Values__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap.h
deleted file mode 100644
index 4d42f54688a..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap.h
+++ /dev/null
@@ -1,136 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListMap__
-#define __java_util_concurrent_ConcurrentSkipListMap__
-
-#pragma interface
-
-#include <java/util/AbstractMap.h>
-
-class java::util::concurrent::ConcurrentSkipListMap : public ::java::util::AbstractMap
-{
-
-public: // actually package-private
-  virtual void initialize();
-private:
-  jboolean casHead(::java::util::concurrent::ConcurrentSkipListMap$HeadIndex *, ::java::util::concurrent::ConcurrentSkipListMap$HeadIndex *);
-  ::java::lang::Comparable * comparable(::java::lang::Object *);
-public: // actually package-private
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean inHalfOpenRange(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean inOpenRange(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-private:
-  ::java::util::concurrent::ConcurrentSkipListMap$Node * findPredecessor(::java::lang::Comparable *);
-  ::java::util::concurrent::ConcurrentSkipListMap$Node * findNode(::java::lang::Comparable *);
-  ::java::lang::Object * doGet(::java::lang::Object *);
-  ::java::lang::Object * getUsingFindNode(::java::lang::Comparable *);
-  ::java::lang::Object * doPut(::java::lang::Object *, ::java::lang::Object *, jboolean);
-  jint randomLevel();
-  void insertIndex(::java::util::concurrent::ConcurrentSkipListMap$Node *, jint);
-  void addIndex(::java::util::concurrent::ConcurrentSkipListMap$Index *, ::java::util::concurrent::ConcurrentSkipListMap$HeadIndex *, jint);
-public: // actually package-private
-  virtual ::java::lang::Object * doRemove(::java::lang::Object *, ::java::lang::Object *);
-private:
-  void tryReduceLevel();
-public: // actually package-private
-  virtual ::java::util::concurrent::ConcurrentSkipListMap$Node * findFirst();
-  virtual ::java::util::Map$Entry * doRemoveFirstEntry();
-private:
-  void clearIndexToFirst();
-public: // actually package-private
-  virtual ::java::util::concurrent::ConcurrentSkipListMap$Node * findLast();
-private:
-  ::java::util::concurrent::ConcurrentSkipListMap$Node * findPredecessorOfLast();
-public: // actually package-private
-  virtual ::java::util::Map$Entry * doRemoveLastEntry();
-  virtual ::java::util::concurrent::ConcurrentSkipListMap$Node * findNear(::java::lang::Object *, jint);
-  virtual ::java::util::AbstractMap$SimpleImmutableEntry * getNear(::java::lang::Object *, jint);
-public:
-  ConcurrentSkipListMap();
-  ConcurrentSkipListMap(::java::util::Comparator *);
-  ConcurrentSkipListMap(::java::util::Map *);
-  ConcurrentSkipListMap(::java::util::SortedMap *);
-  virtual ::java::util::concurrent::ConcurrentSkipListMap * target$clone();
-private:
-  void buildFromSorted(::java::util::SortedMap *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  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 jboolean containsValue(::java::lang::Object *);
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual void clear();
-  virtual ::java::util::NavigableSet * target$keySet();
-  virtual ::java::util::NavigableSet * navigableKeySet();
-  virtual ::java::util::Collection * values();
-  virtual ::java::util::Set * entrySet();
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$descendingMap();
-  virtual ::java::util::NavigableSet * descendingKeySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * putIfAbsent(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean remove(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean replace(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * replace(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::Comparator * comparator();
-  virtual ::java::lang::Object * firstKey();
-  virtual ::java::lang::Object * lastKey();
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$headMap(::java::lang::Object *, jboolean);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$tailMap(::java::lang::Object *, jboolean);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$subMap(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$headMap(::java::lang::Object *);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$tailMap(::java::lang::Object *);
-  virtual ::java::util::Map$Entry * lowerEntry(::java::lang::Object *);
-  virtual ::java::lang::Object * lowerKey(::java::lang::Object *);
-  virtual ::java::util::Map$Entry * floorEntry(::java::lang::Object *);
-  virtual ::java::lang::Object * floorKey(::java::lang::Object *);
-  virtual ::java::util::Map$Entry * ceilingEntry(::java::lang::Object *);
-  virtual ::java::lang::Object * ceilingKey(::java::lang::Object *);
-  virtual ::java::util::Map$Entry * higherEntry(::java::lang::Object *);
-  virtual ::java::lang::Object * higherKey(::java::lang::Object *);
-  virtual ::java::util::Map$Entry * firstEntry();
-  virtual ::java::util::Map$Entry * lastEntry();
-  virtual ::java::util::Map$Entry * pollFirstEntry();
-  virtual ::java::util::Map$Entry * pollLastEntry();
-public: // actually package-private
-  virtual ::java::util::Iterator * keyIterator();
-  virtual ::java::util::Iterator * valueIterator();
-  virtual ::java::util::Iterator * entryIterator();
-  static ::java::util::List * toList(::java::util::Collection *);
-public:
-  virtual ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::NavigableMap * subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::SortedMap * tailMap(::java::lang::Object *);
-  virtual ::java::util::NavigableMap * tailMap(::java::lang::Object *, jboolean);
-  virtual ::java::util::SortedMap * headMap(::java::lang::Object *);
-  virtual ::java::util::NavigableMap * headMap(::java::lang::Object *, jboolean);
-  virtual ::java::util::Set * keySet();
-  virtual ::java::util::NavigableMap * descendingMap();
-public: // actually package-private
-  static ::java::lang::Object * access$9();
-private:
-  static const jlong serialVersionUID = -8627078645895051609LL;
-  static ::java::util::Random * seedGenerator;
-  static ::java::lang::Object * BASE_HEADER;
-  volatile ::java::util::concurrent::ConcurrentSkipListMap$HeadIndex * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) head;
-  ::java::util::Comparator * comparator__;
-  jint randomSeed;
-  ::java::util::concurrent::ConcurrentSkipListMap$KeySet * keySet__;
-  ::java::util::concurrent::ConcurrentSkipListMap$EntrySet * entrySet__;
-  ::java::util::concurrent::ConcurrentSkipListMap$Values * values__;
-  ::java::util::concurrent::ConcurrentNavigableMap * descendingMap__;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater;
-  static const jint EQ = 1;
-  static const jint LT = 2;
-  static const jint GT = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListMap__
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListSet.h b/libjava/java/util/concurrent/ConcurrentSkipListSet.h
deleted file mode 100644
index 75afde92de6..00000000000
--- a/libjava/java/util/concurrent/ConcurrentSkipListSet.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ConcurrentSkipListSet__
-#define __java_util_concurrent_ConcurrentSkipListSet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::ConcurrentSkipListSet : public ::java::util::AbstractSet
-{
-
-public:
-  ConcurrentSkipListSet();
-  ConcurrentSkipListSet(::java::util::Comparator *);
-  ConcurrentSkipListSet(::java::util::Collection *);
-  ConcurrentSkipListSet(::java::util::SortedSet *);
-public: // actually package-private
-  ConcurrentSkipListSet(::java::util::concurrent::ConcurrentNavigableMap *);
-public:
-  virtual ::java::util::concurrent::ConcurrentSkipListSet * target$clone();
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual void clear();
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::util::Iterator * descendingIterator();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual ::java::lang::Object * lower(::java::lang::Object *);
-  virtual ::java::lang::Object * floor(::java::lang::Object *);
-  virtual ::java::lang::Object * ceiling(::java::lang::Object *);
-  virtual ::java::lang::Object * higher(::java::lang::Object *);
-  virtual ::java::lang::Object * pollFirst();
-  virtual ::java::lang::Object * pollLast();
-  virtual ::java::util::Comparator * comparator();
-  virtual ::java::lang::Object * first();
-  virtual ::java::lang::Object * last();
-  virtual ::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  virtual ::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean);
-  virtual ::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean);
-  virtual ::java::util::NavigableSet * target$subSet(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::NavigableSet * target$headSet(::java::lang::Object *);
-  virtual ::java::util::NavigableSet * target$tailSet(::java::lang::Object *);
-  virtual ::java::util::NavigableSet * descendingSet();
-private:
-  void setMap(::java::util::concurrent::ConcurrentNavigableMap *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::SortedSet * tailSet(::java::lang::Object *);
-  virtual ::java::util::SortedSet * headSet(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -2479143111061671589LL;
-  ::java::util::concurrent::ConcurrentNavigableMap * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) m;
-  static ::sun::misc::Unsafe * unsafe;
-  static jlong mapOffset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ConcurrentSkipListSet__
diff --git a/libjava/java/util/concurrent/CopyOnWriteArrayList.h b/libjava/java/util/concurrent/CopyOnWriteArrayList.h
deleted file mode 100644
index 924ba480e96..00000000000
--- a/libjava/java/util/concurrent/CopyOnWriteArrayList.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_CopyOnWriteArrayList__
-#define __java_util_concurrent_CopyOnWriteArrayList__
-
-#pragma interface
-
-#include <java/util/AbstractList.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::CopyOnWriteArrayList : public ::java::util::AbstractList
-{
-
-public:
-  CopyOnWriteArrayList();
-  CopyOnWriteArrayList(::java::util::Collection *);
-  CopyOnWriteArrayList(JArray< ::java::lang::Object * > *);
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jint indexOf(::java::lang::Object *);
-  virtual jint indexOf(::java::lang::Object *, jint);
-  virtual jint lastIndexOf(::java::lang::Object *);
-  virtual jint lastIndexOf(::java::lang::Object *, jint);
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual void add(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * remove(jint);
-  virtual void clear();
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual jboolean addAll(jint, ::java::util::Collection *);
-  virtual jboolean addIfAbsent(::java::lang::Object *);
-  virtual jint addAllAbsent(::java::util::Collection *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public: // actually package-private
-  static jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-  virtual JArray< ::java::lang::Object * > * getArray();
-private:
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_CopyOnWriteArrayList__
diff --git a/libjava/java/util/concurrent/CopyOnWriteArraySet.h b/libjava/java/util/concurrent/CopyOnWriteArraySet.h
deleted file mode 100644
index 9fb8c8396a6..00000000000
--- a/libjava/java/util/concurrent/CopyOnWriteArraySet.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_CopyOnWriteArraySet__
-#define __java_util_concurrent_CopyOnWriteArraySet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::CopyOnWriteArraySet : public ::java::util::AbstractSet
-{
-
-public:
-  CopyOnWriteArraySet();
-  CopyOnWriteArraySet(::java::util::Collection *);
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual void clear();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean containsAll(::java::util::Collection *);
-  virtual jboolean addAll(::java::util::Collection *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual jboolean retainAll(::java::util::Collection *);
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean equals(::java::lang::Object *);
-private:
-  static jboolean eq(::java::lang::Object *, ::java::lang::Object *);
-  static const jlong serialVersionUID = 5457747651344034263LL;
-  ::java::util::concurrent::CopyOnWriteArrayList * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) al;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_CopyOnWriteArraySet__
diff --git a/libjava/java/util/concurrent/CountDownLatch$Sync.h b/libjava/java/util/concurrent/CountDownLatch$Sync.h
deleted file mode 100644
index ee8e75126bc..00000000000
--- a/libjava/java/util/concurrent/CountDownLatch$Sync.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_CountDownLatch$Sync__
-#define __java_util_concurrent_CountDownLatch$Sync__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/AbstractQueuedSynchronizer.h>
-
-class java::util::concurrent::CountDownLatch$Sync : public ::java::util::concurrent::locks::AbstractQueuedSynchronizer
-{
-
-public: // actually package-private
-  CountDownLatch$Sync(jint);
-  jint getCount();
-public:
-  jint tryAcquireShared(jint);
-  jboolean tryReleaseShared(jint);
-private:
-  static const jlong serialVersionUID = 4982264981922014374LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_CountDownLatch$Sync__
diff --git a/libjava/java/util/concurrent/CountDownLatch.h b/libjava/java/util/concurrent/CountDownLatch.h
deleted file mode 100644
index 68609d3133a..00000000000
--- a/libjava/java/util/concurrent/CountDownLatch.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_CountDownLatch__
-#define __java_util_concurrent_CountDownLatch__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::CountDownLatch : public ::java::lang::Object
-{
-
-public:
-  CountDownLatch(jint);
-  virtual void await();
-  virtual jboolean await(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual void countDown();
-  virtual jlong getCount();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::util::concurrent::CountDownLatch$Sync * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sync;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_CountDownLatch__
diff --git a/libjava/java/util/concurrent/CyclicBarrier$Generation.h b/libjava/java/util/concurrent/CyclicBarrier$Generation.h
deleted file mode 100644
index c3d7e4ab111..00000000000
--- a/libjava/java/util/concurrent/CyclicBarrier$Generation.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_CyclicBarrier$Generation__
-#define __java_util_concurrent_CyclicBarrier$Generation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::CyclicBarrier$Generation : public ::java::lang::Object
-{
-
-  CyclicBarrier$Generation();
-public: // actually package-private
-  CyclicBarrier$Generation(::java::util::concurrent::CyclicBarrier$Generation *);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) broken;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_CyclicBarrier$Generation__
diff --git a/libjava/java/util/concurrent/CyclicBarrier.h b/libjava/java/util/concurrent/CyclicBarrier.h
deleted file mode 100644
index c6c4b3e4fb1..00000000000
--- a/libjava/java/util/concurrent/CyclicBarrier.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_CyclicBarrier__
-#define __java_util_concurrent_CyclicBarrier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::CyclicBarrier : public ::java::lang::Object
-{
-
-  void nextGeneration();
-  void breakBarrier();
-  jint dowait(jboolean, jlong);
-public:
-  CyclicBarrier(jint, ::java::lang::Runnable *);
-  CyclicBarrier(jint);
-  virtual jint getParties();
-  virtual jint await();
-  virtual jint await(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jboolean isBroken();
-  virtual void reset();
-  virtual jint getNumberWaiting();
-private:
-  ::java::util::concurrent::locks::ReentrantLock * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lock;
-  ::java::util::concurrent::locks::Condition * trip;
-  jint parties;
-  ::java::lang::Runnable * barrierCommand;
-  ::java::util::concurrent::CyclicBarrier$Generation * generation;
-  jint count;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_CyclicBarrier__
diff --git a/libjava/java/util/concurrent/DelayQueue$Itr.h b/libjava/java/util/concurrent/DelayQueue$Itr.h
deleted file mode 100644
index ab7af20e87b..00000000000
--- a/libjava/java/util/concurrent/DelayQueue$Itr.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_DelayQueue$Itr__
-#define __java_util_concurrent_DelayQueue$Itr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::DelayQueue$Itr : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DelayQueue$Itr(::java::util::concurrent::DelayQueue *, JArray< ::java::lang::Object * > *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::util::concurrent::Delayed * target$next();
-  virtual void remove();
-  virtual ::java::lang::Object * next();
-public: // actually package-private
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) array;
-  jint cursor;
-  jint lastRet;
-  ::java::util::concurrent::DelayQueue * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_DelayQueue$Itr__
diff --git a/libjava/java/util/concurrent/DelayQueue.h b/libjava/java/util/concurrent/DelayQueue.h
deleted file mode 100644
index 76dd489f298..00000000000
--- a/libjava/java/util/concurrent/DelayQueue.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_DelayQueue__
-#define __java_util_concurrent_DelayQueue__
-
-#pragma interface
-
-#include <java/util/AbstractQueue.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::DelayQueue : public ::java::util::AbstractQueue
-{
-
-public:
-  DelayQueue();
-  DelayQueue(::java::util::Collection *);
-  virtual jboolean target$add(::java::util::concurrent::Delayed *);
-  virtual jboolean target$offer(::java::util::concurrent::Delayed *);
-  virtual void target$put(::java::util::concurrent::Delayed *);
-  virtual jboolean target$offer(::java::util::concurrent::Delayed *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::Delayed * target$poll();
-  virtual ::java::util::concurrent::Delayed * target$take();
-  virtual ::java::util::concurrent::Delayed * target$poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::Delayed * target$peek();
-  virtual jint size();
-  virtual jint drainTo(::java::util::Collection *);
-  virtual jint drainTo(::java::util::Collection *, jint);
-  virtual void clear();
-  virtual jint remainingCapacity();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::lang::Object * poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * poll();
-  virtual ::java::lang::Object * take();
-  virtual jboolean offer(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jboolean offer(::java::lang::Object *);
-  virtual ::java::lang::Object * peek();
-  virtual jboolean add(::java::lang::Object *);
-  virtual void put(::java::lang::Object *);
-public: // actually package-private
-  static ::java::util::concurrent::locks::ReentrantLock * access$8(::java::util::concurrent::DelayQueue *);
-  static ::java::util::PriorityQueue * access$9(::java::util::concurrent::DelayQueue *);
-private:
-  ::java::util::concurrent::locks::ReentrantLock * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) lock;
-  ::java::util::concurrent::locks::Condition * available;
-  ::java::util::PriorityQueue * q;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_DelayQueue__
diff --git a/libjava/java/util/concurrent/Delayed.h b/libjava/java/util/concurrent/Delayed.h
deleted file mode 100644
index 2a8d4e5d1a5..00000000000
--- a/libjava/java/util/concurrent/Delayed.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Delayed__
-#define __java_util_concurrent_Delayed__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Delayed : public ::java::lang::Object
-{
-
-public:
-  virtual jlong getDelay(::java::util::concurrent::TimeUnit *) = 0;
-  virtual jint compareTo(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_Delayed__
diff --git a/libjava/java/util/concurrent/Exchanger$Node.h b/libjava/java/util/concurrent/Exchanger$Node.h
deleted file mode 100644
index 5e1087b7611..00000000000
--- a/libjava/java/util/concurrent/Exchanger$Node.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Exchanger$Node__
-#define __java_util_concurrent_Exchanger$Node__
-
-#pragma interface
-
-#include <java/util/concurrent/atomic/AtomicReference.h>
-
-class java::util::concurrent::Exchanger$Node : public ::java::util::concurrent::atomic::AtomicReference
-{
-
-public:
-  Exchanger$Node(::java::lang::Object *);
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::concurrent::atomic::AtomicReference)))) item;
-  volatile ::java::lang::Thread * waiter;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Exchanger$Node__
diff --git a/libjava/java/util/concurrent/Exchanger$Slot.h b/libjava/java/util/concurrent/Exchanger$Slot.h
deleted file mode 100644
index 4d1d4165412..00000000000
--- a/libjava/java/util/concurrent/Exchanger$Slot.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Exchanger$Slot__
-#define __java_util_concurrent_Exchanger$Slot__
-
-#pragma interface
-
-#include <java/util/concurrent/atomic/AtomicReference.h>
-
-class java::util::concurrent::Exchanger$Slot : public ::java::util::concurrent::atomic::AtomicReference
-{
-
-  Exchanger$Slot();
-public: // actually package-private
-  Exchanger$Slot(::java::util::concurrent::Exchanger$Slot *);
-  jlong __attribute__((aligned(__alignof__( ::java::util::concurrent::atomic::AtomicReference)))) q0;
-  jlong q1;
-  jlong q2;
-  jlong q3;
-  jlong q4;
-  jlong q5;
-  jlong q6;
-  jlong q7;
-  jlong q8;
-  jlong q9;
-  jlong qa;
-  jlong qb;
-  jlong qc;
-  jlong qd;
-  jlong qe;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Exchanger$Slot__
diff --git a/libjava/java/util/concurrent/Exchanger.h b/libjava/java/util/concurrent/Exchanger.h
deleted file mode 100644
index 5ed4d252a90..00000000000
--- a/libjava/java/util/concurrent/Exchanger.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Exchanger__
-#define __java_util_concurrent_Exchanger__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::Exchanger : public ::java::lang::Object
-{
-
-  ::java::lang::Object * doExchange(::java::lang::Object *, jboolean, jlong);
-  jint hashIndex();
-  void createSlot(jint);
-  static jboolean tryCancel(::java::util::concurrent::Exchanger$Node *, ::java::util::concurrent::Exchanger$Slot *);
-  static ::java::lang::Object * spinWait(::java::util::concurrent::Exchanger$Node *, ::java::util::concurrent::Exchanger$Slot *);
-  static ::java::lang::Object * await(::java::util::concurrent::Exchanger$Node *, ::java::util::concurrent::Exchanger$Slot *);
-  ::java::lang::Object * awaitNanos(::java::util::concurrent::Exchanger$Node *, ::java::util::concurrent::Exchanger$Slot *, jlong);
-  ::java::lang::Object * scanOnTimeout(::java::util::concurrent::Exchanger$Node *);
-public:
-  Exchanger();
-  virtual ::java::lang::Object * exchange(::java::lang::Object *);
-  virtual ::java::lang::Object * exchange(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *);
-private:
-  static jint NCPU;
-  static const jint CAPACITY = 32;
-  static jint FULL;
-  static jint SPINS;
-  static jint TIMED_SPINS;
-  static ::java::lang::Object * CANCEL;
-  static ::java::lang::Object * NULL_ITEM;
-  volatile JArray< ::java::util::concurrent::Exchanger$Slot * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) arena;
-  ::java::util::concurrent::atomic::AtomicInteger * max;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Exchanger__
diff --git a/libjava/java/util/concurrent/ExecutionException.h b/libjava/java/util/concurrent/ExecutionException.h
deleted file mode 100644
index 3f210c7df2d..00000000000
--- a/libjava/java/util/concurrent/ExecutionException.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ExecutionException__
-#define __java_util_concurrent_ExecutionException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::util::concurrent::ExecutionException : public ::java::lang::Exception
-{
-
-public: // actually protected
-  ExecutionException();
-  ExecutionException(::java::lang::String *);
-public:
-  ExecutionException(::java::lang::String *, ::java::lang::Throwable *);
-  ExecutionException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 7830266012832686185LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ExecutionException__
diff --git a/libjava/java/util/concurrent/Executor.h b/libjava/java/util/concurrent/Executor.h
deleted file mode 100644
index 2e59bc4666a..00000000000
--- a/libjava/java/util/concurrent/Executor.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executor__
-#define __java_util_concurrent_Executor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Executor : public ::java::lang::Object
-{
-
-public:
-  virtual void execute(::java::lang::Runnable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_Executor__
diff --git a/libjava/java/util/concurrent/ExecutorCompletionService$QueueingFuture.h b/libjava/java/util/concurrent/ExecutorCompletionService$QueueingFuture.h
deleted file mode 100644
index 806cecfe218..00000000000
--- a/libjava/java/util/concurrent/ExecutorCompletionService$QueueingFuture.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ExecutorCompletionService$QueueingFuture__
-#define __java_util_concurrent_ExecutorCompletionService$QueueingFuture__
-
-#pragma interface
-
-#include <java/util/concurrent/FutureTask.h>
-
-class java::util::concurrent::ExecutorCompletionService$QueueingFuture : public ::java::util::concurrent::FutureTask
-{
-
-public: // actually package-private
-  ExecutorCompletionService$QueueingFuture(::java::util::concurrent::ExecutorCompletionService *, ::java::util::concurrent::RunnableFuture *);
-public: // actually protected
-  virtual void done();
-private:
-  ::java::util::concurrent::Future * __attribute__((aligned(__alignof__( ::java::util::concurrent::FutureTask)))) task;
-public: // actually package-private
-  ::java::util::concurrent::ExecutorCompletionService * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ExecutorCompletionService$QueueingFuture__
diff --git a/libjava/java/util/concurrent/ExecutorCompletionService.h b/libjava/java/util/concurrent/ExecutorCompletionService.h
deleted file mode 100644
index 922e2d98e20..00000000000
--- a/libjava/java/util/concurrent/ExecutorCompletionService.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ExecutorCompletionService__
-#define __java_util_concurrent_ExecutorCompletionService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ExecutorCompletionService : public ::java::lang::Object
-{
-
-  ::java::util::concurrent::RunnableFuture * newTaskFor(::java::util::concurrent::Callable *);
-  ::java::util::concurrent::RunnableFuture * newTaskFor(::java::lang::Runnable *, ::java::lang::Object *);
-public:
-  ExecutorCompletionService(::java::util::concurrent::Executor *);
-  ExecutorCompletionService(::java::util::concurrent::Executor *, ::java::util::concurrent::BlockingQueue *);
-  virtual ::java::util::concurrent::Future * submit(::java::util::concurrent::Callable *);
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *, ::java::lang::Object *);
-  virtual ::java::util::concurrent::Future * take();
-  virtual ::java::util::concurrent::Future * poll();
-  virtual ::java::util::concurrent::Future * poll(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually package-private
-  static ::java::util::concurrent::BlockingQueue * access$0(::java::util::concurrent::ExecutorCompletionService *);
-private:
-  ::java::util::concurrent::Executor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) executor;
-  ::java::util::concurrent::AbstractExecutorService * aes;
-  ::java::util::concurrent::BlockingQueue * completionQueue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ExecutorCompletionService__
diff --git a/libjava/java/util/concurrent/ExecutorService.h b/libjava/java/util/concurrent/ExecutorService.h
deleted file mode 100644
index 3c2431495f6..00000000000
--- a/libjava/java/util/concurrent/ExecutorService.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ExecutorService__
-#define __java_util_concurrent_ExecutorService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ExecutorService : public ::java::lang::Object
-{
-
-public:
-  virtual void shutdown() = 0;
-  virtual ::java::util::List * shutdownNow() = 0;
-  virtual jboolean isShutdown() = 0;
-  virtual jboolean isTerminated() = 0;
-  virtual jboolean awaitTermination(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::util::concurrent::Future * submit(::java::util::concurrent::Callable *) = 0;
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *, ::java::lang::Object *) = 0;
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *) = 0;
-  virtual ::java::util::List * invokeAll(::java::util::Collection *) = 0;
-  virtual ::java::util::List * invokeAll(::java::util::Collection *, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::lang::Object * invokeAny(::java::util::Collection *) = 0;
-  virtual ::java::lang::Object * invokeAny(::java::util::Collection *, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual void execute(::java::lang::Runnable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_ExecutorService__
diff --git a/libjava/java/util/concurrent/Executors$1.h b/libjava/java/util/concurrent/Executors$1.h
deleted file mode 100644
index 9935b610697..00000000000
--- a/libjava/java/util/concurrent/Executors$1.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$1__
-#define __java_util_concurrent_Executors$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Executors$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Executors$1(::java::util::concurrent::Executors$PrivilegedCallable *);
-public:
-  ::java::lang::Object * run();
-public: // actually package-private
-  ::java::util::concurrent::Executors$PrivilegedCallable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$1__
diff --git a/libjava/java/util/concurrent/Executors$2.h b/libjava/java/util/concurrent/Executors$2.h
deleted file mode 100644
index ad363bd6c99..00000000000
--- a/libjava/java/util/concurrent/Executors$2.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$2__
-#define __java_util_concurrent_Executors$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Executors$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Executors$2(::java::util::concurrent::Executors$PrivilegedCallableUsingCurrentClassLoader *);
-public:
-  ::java::lang::Object * run();
-public: // actually package-private
-  ::java::util::concurrent::Executors$PrivilegedCallableUsingCurrentClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$2__
diff --git a/libjava/java/util/concurrent/Executors$3.h b/libjava/java/util/concurrent/Executors$3.h
deleted file mode 100644
index 66dbb89e7fc..00000000000
--- a/libjava/java/util/concurrent/Executors$3.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$3__
-#define __java_util_concurrent_Executors$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Executors$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Executors$3(::java::util::concurrent::Executors$PrivilegedThreadFactory *, ::java::lang::Runnable *);
-public:
-  void run();
-public: // actually package-private
-  static ::java::util::concurrent::Executors$PrivilegedThreadFactory * access$0(::java::util::concurrent::Executors$3 *);
-  ::java::util::concurrent::Executors$PrivilegedThreadFactory * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::java::lang::Runnable * val$r;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$3__
diff --git a/libjava/java/util/concurrent/Executors$4.h b/libjava/java/util/concurrent/Executors$4.h
deleted file mode 100644
index daab0bb1ba9..00000000000
--- a/libjava/java/util/concurrent/Executors$4.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$4__
-#define __java_util_concurrent_Executors$4__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Executors$4 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Executors$4(::java::util::concurrent::Executors$3 *, ::java::lang::Runnable *);
-public:
-  ::java::lang::Object * run();
-public: // actually package-private
-  ::java::util::concurrent::Executors$3 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$2;
-private:
-  ::java::lang::Runnable * val$r;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$4__
diff --git a/libjava/java/util/concurrent/Executors$5.h b/libjava/java/util/concurrent/Executors$5.h
deleted file mode 100644
index 9c1d1bee3c9..00000000000
--- a/libjava/java/util/concurrent/Executors$5.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$5__
-#define __java_util_concurrent_Executors$5__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivilegedAction;
-    }
-  }
-}
-
-class java::util::concurrent::Executors$5 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Executors$5(::java::security::PrivilegedAction *);
-public:
-  ::java::lang::Object * call();
-private:
-  ::java::security::PrivilegedAction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$action;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$5__
diff --git a/libjava/java/util/concurrent/Executors$6.h b/libjava/java/util/concurrent/Executors$6.h
deleted file mode 100644
index 30f58c8c88f..00000000000
--- a/libjava/java/util/concurrent/Executors$6.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$6__
-#define __java_util_concurrent_Executors$6__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivilegedExceptionAction;
-    }
-  }
-}
-
-class java::util::concurrent::Executors$6 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Executors$6(::java::security::PrivilegedExceptionAction *);
-public:
-  ::java::lang::Object * call();
-private:
-  ::java::security::PrivilegedExceptionAction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$action;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$6__
diff --git a/libjava/java/util/concurrent/Executors$DefaultThreadFactory.h b/libjava/java/util/concurrent/Executors$DefaultThreadFactory.h
deleted file mode 100644
index 7a2d8a757f6..00000000000
--- a/libjava/java/util/concurrent/Executors$DefaultThreadFactory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$DefaultThreadFactory__
-#define __java_util_concurrent_Executors$DefaultThreadFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Executors$DefaultThreadFactory : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Executors$DefaultThreadFactory();
-public:
-  virtual ::java::lang::Thread * newThread(::java::lang::Runnable *);
-public: // actually package-private
-  static ::java::util::concurrent::atomic::AtomicInteger * poolNumber;
-  ::java::lang::ThreadGroup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) group;
-  ::java::util::concurrent::atomic::AtomicInteger * threadNumber;
-  ::java::lang::String * namePrefix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$DefaultThreadFactory__
diff --git a/libjava/java/util/concurrent/Executors$DelegatedExecutorService.h b/libjava/java/util/concurrent/Executors$DelegatedExecutorService.h
deleted file mode 100644
index 6bca4b1f255..00000000000
--- a/libjava/java/util/concurrent/Executors$DelegatedExecutorService.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$DelegatedExecutorService__
-#define __java_util_concurrent_Executors$DelegatedExecutorService__
-
-#pragma interface
-
-#include <java/util/concurrent/AbstractExecutorService.h>
-
-class java::util::concurrent::Executors$DelegatedExecutorService : public ::java::util::concurrent::AbstractExecutorService
-{
-
-public: // actually package-private
-  Executors$DelegatedExecutorService(::java::util::concurrent::ExecutorService *);
-public:
-  virtual void execute(::java::lang::Runnable *);
-  virtual void shutdown();
-  virtual ::java::util::List * shutdownNow();
-  virtual jboolean isShutdown();
-  virtual jboolean isTerminated();
-  virtual jboolean awaitTermination(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *);
-  virtual ::java::util::concurrent::Future * submit(::java::util::concurrent::Callable *);
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *, ::java::lang::Object *);
-  virtual ::java::util::List * invokeAll(::java::util::Collection *);
-  virtual ::java::util::List * invokeAll(::java::util::Collection *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * invokeAny(::java::util::Collection *);
-  virtual ::java::lang::Object * invokeAny(::java::util::Collection *, jlong, ::java::util::concurrent::TimeUnit *);
-private:
-  ::java::util::concurrent::ExecutorService * __attribute__((aligned(__alignof__( ::java::util::concurrent::AbstractExecutorService)))) e;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$DelegatedExecutorService__
diff --git a/libjava/java/util/concurrent/Executors$DelegatedScheduledExecutorService.h b/libjava/java/util/concurrent/Executors$DelegatedScheduledExecutorService.h
deleted file mode 100644
index a7efdb0711a..00000000000
--- a/libjava/java/util/concurrent/Executors$DelegatedScheduledExecutorService.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$DelegatedScheduledExecutorService__
-#define __java_util_concurrent_Executors$DelegatedScheduledExecutorService__
-
-#pragma interface
-
-#include <java/util/concurrent/Executors$DelegatedExecutorService.h>
-
-class java::util::concurrent::Executors$DelegatedScheduledExecutorService : public ::java::util::concurrent::Executors$DelegatedExecutorService
-{
-
-public: // actually package-private
-  Executors$DelegatedScheduledExecutorService(::java::util::concurrent::ScheduledExecutorService *);
-public:
-  virtual ::java::util::concurrent::ScheduledFuture * schedule(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::ScheduledFuture * schedule(::java::util::concurrent::Callable *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::ScheduledFuture * scheduleAtFixedRate(::java::lang::Runnable *, jlong, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::ScheduledFuture * scheduleWithFixedDelay(::java::lang::Runnable *, jlong, jlong, ::java::util::concurrent::TimeUnit *);
-private:
-  ::java::util::concurrent::ScheduledExecutorService * __attribute__((aligned(__alignof__( ::java::util::concurrent::Executors$DelegatedExecutorService)))) e;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$DelegatedScheduledExecutorService__
diff --git a/libjava/java/util/concurrent/Executors$FinalizableDelegatedExecutorService.h b/libjava/java/util/concurrent/Executors$FinalizableDelegatedExecutorService.h
deleted file mode 100644
index fd4f2bd762b..00000000000
--- a/libjava/java/util/concurrent/Executors$FinalizableDelegatedExecutorService.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$FinalizableDelegatedExecutorService__
-#define __java_util_concurrent_Executors$FinalizableDelegatedExecutorService__
-
-#pragma interface
-
-#include <java/util/concurrent/Executors$DelegatedExecutorService.h>
-
-class java::util::concurrent::Executors$FinalizableDelegatedExecutorService : public ::java::util::concurrent::Executors$DelegatedExecutorService
-{
-
-public: // actually package-private
-  Executors$FinalizableDelegatedExecutorService(::java::util::concurrent::ExecutorService *);
-public: // actually protected
-  virtual void finalize();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$FinalizableDelegatedExecutorService__
diff --git a/libjava/java/util/concurrent/Executors$PrivilegedCallable.h b/libjava/java/util/concurrent/Executors$PrivilegedCallable.h
deleted file mode 100644
index 09609857d5e..00000000000
--- a/libjava/java/util/concurrent/Executors$PrivilegedCallable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$PrivilegedCallable__
-#define __java_util_concurrent_Executors$PrivilegedCallable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-    }
-  }
-}
-
-class java::util::concurrent::Executors$PrivilegedCallable : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Executors$PrivilegedCallable(::java::util::concurrent::Callable *);
-public:
-  ::java::lang::Object * call();
-public: // actually package-private
-  static ::java::util::concurrent::Callable * access$0(::java::util::concurrent::Executors$PrivilegedCallable *);
-  static void access$1(::java::util::concurrent::Executors$PrivilegedCallable *, ::java::lang::Object *);
-  static void access$2(::java::util::concurrent::Executors$PrivilegedCallable *, ::java::lang::Exception *);
-private:
-  ::java::security::AccessControlContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) acc;
-  ::java::util::concurrent::Callable * task;
-  ::java::lang::Object * result;
-  ::java::lang::Exception * exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$PrivilegedCallable__
diff --git a/libjava/java/util/concurrent/Executors$PrivilegedCallableUsingCurrentClassLoader.h b/libjava/java/util/concurrent/Executors$PrivilegedCallableUsingCurrentClassLoader.h
deleted file mode 100644
index 452f6ef250d..00000000000
--- a/libjava/java/util/concurrent/Executors$PrivilegedCallableUsingCurrentClassLoader.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$PrivilegedCallableUsingCurrentClassLoader__
-#define __java_util_concurrent_Executors$PrivilegedCallableUsingCurrentClassLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-    }
-  }
-}
-
-class java::util::concurrent::Executors$PrivilegedCallableUsingCurrentClassLoader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Executors$PrivilegedCallableUsingCurrentClassLoader(::java::util::concurrent::Callable *);
-public:
-  ::java::lang::Object * call();
-public: // actually package-private
-  static ::java::lang::ClassLoader * access$0(::java::util::concurrent::Executors$PrivilegedCallableUsingCurrentClassLoader *);
-  static ::java::util::concurrent::Callable * access$1(::java::util::concurrent::Executors$PrivilegedCallableUsingCurrentClassLoader *);
-  static void access$2(::java::util::concurrent::Executors$PrivilegedCallableUsingCurrentClassLoader *, ::java::lang::Object *);
-  static void access$3(::java::util::concurrent::Executors$PrivilegedCallableUsingCurrentClassLoader *, ::java::lang::Exception *);
-private:
-  ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ccl;
-  ::java::security::AccessControlContext * acc;
-  ::java::util::concurrent::Callable * task;
-  ::java::lang::Object * result;
-  ::java::lang::Exception * exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$PrivilegedCallableUsingCurrentClassLoader__
diff --git a/libjava/java/util/concurrent/Executors$PrivilegedThreadFactory.h b/libjava/java/util/concurrent/Executors$PrivilegedThreadFactory.h
deleted file mode 100644
index 0258eea5e73..00000000000
--- a/libjava/java/util/concurrent/Executors$PrivilegedThreadFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$PrivilegedThreadFactory__
-#define __java_util_concurrent_Executors$PrivilegedThreadFactory__
-
-#pragma interface
-
-#include <java/util/concurrent/Executors$DefaultThreadFactory.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-    }
-  }
-}
-
-class java::util::concurrent::Executors$PrivilegedThreadFactory : public ::java::util::concurrent::Executors$DefaultThreadFactory
-{
-
-public: // actually package-private
-  Executors$PrivilegedThreadFactory();
-public:
-  virtual ::java::lang::Thread * newThread(::java::lang::Runnable *);
-public: // actually package-private
-  static ::java::lang::ClassLoader * access$0(::java::util::concurrent::Executors$PrivilegedThreadFactory *);
-  static ::java::security::AccessControlContext * access$1(::java::util::concurrent::Executors$PrivilegedThreadFactory *);
-private:
-  ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::util::concurrent::Executors$DefaultThreadFactory)))) ccl;
-  ::java::security::AccessControlContext * acc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$PrivilegedThreadFactory__
diff --git a/libjava/java/util/concurrent/Executors$RunnableAdapter.h b/libjava/java/util/concurrent/Executors$RunnableAdapter.h
deleted file mode 100644
index 5d75fe83518..00000000000
--- a/libjava/java/util/concurrent/Executors$RunnableAdapter.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors$RunnableAdapter__
-#define __java_util_concurrent_Executors$RunnableAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Executors$RunnableAdapter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Executors$RunnableAdapter(::java::lang::Runnable *, ::java::lang::Object *);
-public:
-  ::java::lang::Object * call();
-public: // actually package-private
-  ::java::lang::Runnable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) task;
-  ::java::lang::Object * result;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors$RunnableAdapter__
diff --git a/libjava/java/util/concurrent/Executors.h b/libjava/java/util/concurrent/Executors.h
deleted file mode 100644
index 8e6a428a11b..00000000000
--- a/libjava/java/util/concurrent/Executors.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Executors__
-#define __java_util_concurrent_Executors__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivilegedAction;
-        class PrivilegedExceptionAction;
-    }
-  }
-}
-
-class java::util::concurrent::Executors : public ::java::lang::Object
-{
-
-public:
-  static ::java::util::concurrent::ExecutorService * newFixedThreadPool(jint);
-  static ::java::util::concurrent::ExecutorService * newFixedThreadPool(jint, ::java::util::concurrent::ThreadFactory *);
-  static ::java::util::concurrent::ExecutorService * newSingleThreadExecutor();
-  static ::java::util::concurrent::ExecutorService * newSingleThreadExecutor(::java::util::concurrent::ThreadFactory *);
-  static ::java::util::concurrent::ExecutorService * newCachedThreadPool();
-  static ::java::util::concurrent::ExecutorService * newCachedThreadPool(::java::util::concurrent::ThreadFactory *);
-  static ::java::util::concurrent::ScheduledExecutorService * newSingleThreadScheduledExecutor();
-  static ::java::util::concurrent::ScheduledExecutorService * newSingleThreadScheduledExecutor(::java::util::concurrent::ThreadFactory *);
-  static ::java::util::concurrent::ScheduledExecutorService * newScheduledThreadPool(jint);
-  static ::java::util::concurrent::ScheduledExecutorService * newScheduledThreadPool(jint, ::java::util::concurrent::ThreadFactory *);
-  static ::java::util::concurrent::ExecutorService * unconfigurableExecutorService(::java::util::concurrent::ExecutorService *);
-  static ::java::util::concurrent::ScheduledExecutorService * unconfigurableScheduledExecutorService(::java::util::concurrent::ScheduledExecutorService *);
-  static ::java::util::concurrent::ThreadFactory * defaultThreadFactory();
-  static ::java::util::concurrent::ThreadFactory * privilegedThreadFactory();
-  static ::java::util::concurrent::Callable * callable(::java::lang::Runnable *, ::java::lang::Object *);
-  static ::java::util::concurrent::Callable * callable(::java::lang::Runnable *);
-  static ::java::util::concurrent::Callable * callable(::java::security::PrivilegedAction *);
-  static ::java::util::concurrent::Callable * callable(::java::security::PrivilegedExceptionAction *);
-  static ::java::util::concurrent::Callable * privilegedCallable(::java::util::concurrent::Callable *);
-  static ::java::util::concurrent::Callable * privilegedCallableUsingCurrentClassLoader(::java::util::concurrent::Callable *);
-private:
-  Executors();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Executors__
diff --git a/libjava/java/util/concurrent/Future.h b/libjava/java/util/concurrent/Future.h
deleted file mode 100644
index 9f70627a748..00000000000
--- a/libjava/java/util/concurrent/Future.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Future__
-#define __java_util_concurrent_Future__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Future : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean cancel(jboolean) = 0;
-  virtual jboolean isCancelled() = 0;
-  virtual jboolean isDone() = 0;
-  virtual ::java::lang::Object * get() = 0;
-  virtual ::java::lang::Object * get(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_Future__
diff --git a/libjava/java/util/concurrent/FutureTask$Sync.h b/libjava/java/util/concurrent/FutureTask$Sync.h
deleted file mode 100644
index 18808697181..00000000000
--- a/libjava/java/util/concurrent/FutureTask$Sync.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_FutureTask$Sync__
-#define __java_util_concurrent_FutureTask$Sync__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/AbstractQueuedSynchronizer.h>
-
-class java::util::concurrent::FutureTask$Sync : public ::java::util::concurrent::locks::AbstractQueuedSynchronizer
-{
-
-public: // actually package-private
-  FutureTask$Sync(::java::util::concurrent::FutureTask *, ::java::util::concurrent::Callable *);
-private:
-  jboolean ranOrCancelled(jint);
-public: // actually protected
-  jint tryAcquireShared(jint);
-  jboolean tryReleaseShared(jint);
-public: // actually package-private
-  jboolean innerIsCancelled();
-  jboolean innerIsDone();
-  ::java::lang::Object * innerGet();
-  ::java::lang::Object * innerGet(jlong);
-  void innerSet(::java::lang::Object *);
-  void innerSetException(::java::lang::Throwable *);
-  jboolean innerCancel(jboolean);
-  void innerRun();
-  jboolean innerRunAndReset();
-private:
-  static const jlong serialVersionUID = -7828117401763700385LL;
-  static const jint RUNNING = 1;
-  static const jint RAN = 2;
-  static const jint CANCELLED = 4;
-  ::java::util::concurrent::Callable * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractQueuedSynchronizer)))) callable;
-  ::java::lang::Object * result;
-  ::java::lang::Throwable * exception;
-  volatile ::java::lang::Thread * runner;
-public: // actually package-private
-  ::java::util::concurrent::FutureTask * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_FutureTask$Sync__
diff --git a/libjava/java/util/concurrent/FutureTask.h b/libjava/java/util/concurrent/FutureTask.h
deleted file mode 100644
index a86215f4387..00000000000
--- a/libjava/java/util/concurrent/FutureTask.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_FutureTask__
-#define __java_util_concurrent_FutureTask__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::FutureTask : public ::java::lang::Object
-{
-
-public:
-  FutureTask(::java::util::concurrent::Callable *);
-  FutureTask(::java::lang::Runnable *, ::java::lang::Object *);
-  virtual jboolean isCancelled();
-  virtual jboolean isDone();
-  virtual jboolean cancel(jboolean);
-  virtual ::java::lang::Object * get();
-  virtual ::java::lang::Object * get(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually protected
-  virtual void done();
-  virtual void set(::java::lang::Object *);
-  virtual void setException(::java::lang::Throwable *);
-public:
-  virtual void run();
-public: // actually protected
-  virtual jboolean runAndReset();
-private:
-  ::java::util::concurrent::FutureTask$Sync * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sync;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_FutureTask__
diff --git a/libjava/java/util/concurrent/LinkedBlockingDeque$AbstractItr.h b/libjava/java/util/concurrent/LinkedBlockingDeque$AbstractItr.h
deleted file mode 100644
index 2aeec8a97ac..00000000000
--- a/libjava/java/util/concurrent/LinkedBlockingDeque$AbstractItr.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_LinkedBlockingDeque$AbstractItr__
-#define __java_util_concurrent_LinkedBlockingDeque$AbstractItr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::LinkedBlockingDeque$AbstractItr : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LinkedBlockingDeque$AbstractItr(::java::util::concurrent::LinkedBlockingDeque *);
-  virtual void advance() = 0;
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-public: // actually package-private
-  ::java::util::concurrent::LinkedBlockingDeque$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next__;
-  ::java::lang::Object * nextItem;
-private:
-  ::java::util::concurrent::LinkedBlockingDeque$Node * lastRet;
-public: // actually package-private
-  ::java::util::concurrent::LinkedBlockingDeque * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_LinkedBlockingDeque$AbstractItr__
diff --git a/libjava/java/util/concurrent/LinkedBlockingDeque$DescendingItr.h b/libjava/java/util/concurrent/LinkedBlockingDeque$DescendingItr.h
deleted file mode 100644
index a18b4d97923..00000000000
--- a/libjava/java/util/concurrent/LinkedBlockingDeque$DescendingItr.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_LinkedBlockingDeque$DescendingItr__
-#define __java_util_concurrent_LinkedBlockingDeque$DescendingItr__
-
-#pragma interface
-
-#include <java/util/concurrent/LinkedBlockingDeque$AbstractItr.h>
-
-class java::util::concurrent::LinkedBlockingDeque$DescendingItr : public ::java::util::concurrent::LinkedBlockingDeque$AbstractItr
-{
-
-  LinkedBlockingDeque$DescendingItr(::java::util::concurrent::LinkedBlockingDeque *);
-public: // actually package-private
-  virtual void advance();
-  LinkedBlockingDeque$DescendingItr(::java::util::concurrent::LinkedBlockingDeque *, ::java::util::concurrent::LinkedBlockingDeque$DescendingItr *);
-  ::java::util::concurrent::LinkedBlockingDeque * __attribute__((aligned(__alignof__( ::java::util::concurrent::LinkedBlockingDeque$AbstractItr)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_LinkedBlockingDeque$DescendingItr__
diff --git a/libjava/java/util/concurrent/LinkedBlockingDeque$Itr.h b/libjava/java/util/concurrent/LinkedBlockingDeque$Itr.h
deleted file mode 100644
index ad17e7a5ee3..00000000000
--- a/libjava/java/util/concurrent/LinkedBlockingDeque$Itr.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_LinkedBlockingDeque$Itr__
-#define __java_util_concurrent_LinkedBlockingDeque$Itr__
-
-#pragma interface
-
-#include <java/util/concurrent/LinkedBlockingDeque$AbstractItr.h>
-
-class java::util::concurrent::LinkedBlockingDeque$Itr : public ::java::util::concurrent::LinkedBlockingDeque$AbstractItr
-{
-
-  LinkedBlockingDeque$Itr(::java::util::concurrent::LinkedBlockingDeque *);
-public: // actually package-private
-  virtual void advance();
-  LinkedBlockingDeque$Itr(::java::util::concurrent::LinkedBlockingDeque *, ::java::util::concurrent::LinkedBlockingDeque$Itr *);
-  ::java::util::concurrent::LinkedBlockingDeque * __attribute__((aligned(__alignof__( ::java::util::concurrent::LinkedBlockingDeque$AbstractItr)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_LinkedBlockingDeque$Itr__
diff --git a/libjava/java/util/concurrent/LinkedBlockingDeque$Node.h b/libjava/java/util/concurrent/LinkedBlockingDeque$Node.h
deleted file mode 100644
index 423279f4778..00000000000
--- a/libjava/java/util/concurrent/LinkedBlockingDeque$Node.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_LinkedBlockingDeque$Node__
-#define __java_util_concurrent_LinkedBlockingDeque$Node__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::LinkedBlockingDeque$Node : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LinkedBlockingDeque$Node(::java::lang::Object *, ::java::util::concurrent::LinkedBlockingDeque$Node *, ::java::util::concurrent::LinkedBlockingDeque$Node *);
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) item;
-  ::java::util::concurrent::LinkedBlockingDeque$Node * prev;
-  ::java::util::concurrent::LinkedBlockingDeque$Node * next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_LinkedBlockingDeque$Node__
diff --git a/libjava/java/util/concurrent/LinkedBlockingDeque.h b/libjava/java/util/concurrent/LinkedBlockingDeque.h
deleted file mode 100644
index 43d3adf4acc..00000000000
--- a/libjava/java/util/concurrent/LinkedBlockingDeque.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_LinkedBlockingDeque__
-#define __java_util_concurrent_LinkedBlockingDeque__
-
-#pragma interface
-
-#include <java/util/AbstractQueue.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::LinkedBlockingDeque : public ::java::util::AbstractQueue
-{
-
-public:
-  LinkedBlockingDeque();
-  LinkedBlockingDeque(jint);
-  LinkedBlockingDeque(::java::util::Collection *);
-private:
-  jboolean linkFirst(::java::lang::Object *);
-  jboolean linkLast(::java::lang::Object *);
-  ::java::lang::Object * unlinkFirst();
-  ::java::lang::Object * unlinkLast();
-  void unlink(::java::util::concurrent::LinkedBlockingDeque$Node *);
-public:
-  virtual void addFirst(::java::lang::Object *);
-  virtual void addLast(::java::lang::Object *);
-  virtual jboolean offerFirst(::java::lang::Object *);
-  virtual jboolean offerLast(::java::lang::Object *);
-  virtual void putFirst(::java::lang::Object *);
-  virtual void putLast(::java::lang::Object *);
-  virtual jboolean offerFirst(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jboolean offerLast(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * removeFirst();
-  virtual ::java::lang::Object * removeLast();
-  virtual ::java::lang::Object * pollFirst();
-  virtual ::java::lang::Object * pollLast();
-  virtual ::java::lang::Object * takeFirst();
-  virtual ::java::lang::Object * takeLast();
-  virtual ::java::lang::Object * pollFirst(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * pollLast(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * getFirst();
-  virtual ::java::lang::Object * getLast();
-  virtual ::java::lang::Object * peekFirst();
-  virtual ::java::lang::Object * peekLast();
-  virtual jboolean removeFirstOccurrence(::java::lang::Object *);
-  virtual jboolean removeLastOccurrence(::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean offer(::java::lang::Object *);
-  virtual void put(::java::lang::Object *);
-  virtual jboolean offer(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * remove();
-  virtual ::java::lang::Object * poll();
-  virtual ::java::lang::Object * take();
-  virtual ::java::lang::Object * poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * element();
-  virtual ::java::lang::Object * peek();
-  virtual jint remainingCapacity();
-  virtual jint drainTo(::java::util::Collection *);
-  virtual jint drainTo(::java::util::Collection *, jint);
-  virtual void push(::java::lang::Object *);
-  virtual ::java::lang::Object * pop();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jint size();
-  virtual jboolean contains(::java::lang::Object *);
-public: // actually package-private
-  virtual jboolean removeNode(::java::util::concurrent::LinkedBlockingDeque$Node *);
-public:
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::String * toString();
-  virtual void clear();
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::util::Iterator * descendingIterator();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public: // actually package-private
-  static ::java::util::concurrent::locks::ReentrantLock * access$0(::java::util::concurrent::LinkedBlockingDeque *);
-  static ::java::util::concurrent::LinkedBlockingDeque$Node * access$1(::java::util::concurrent::LinkedBlockingDeque *);
-  static ::java::util::concurrent::LinkedBlockingDeque$Node * access$2(::java::util::concurrent::LinkedBlockingDeque *);
-private:
-  static const jlong serialVersionUID = -387911632671998426LL;
-  ::java::util::concurrent::LinkedBlockingDeque$Node * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) first;
-  ::java::util::concurrent::LinkedBlockingDeque$Node * last;
-  jint count;
-  jint capacity;
-  ::java::util::concurrent::locks::ReentrantLock * lock;
-  ::java::util::concurrent::locks::Condition * notEmpty;
-  ::java::util::concurrent::locks::Condition * notFull;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_LinkedBlockingDeque__
diff --git a/libjava/java/util/concurrent/LinkedBlockingQueue$Itr.h b/libjava/java/util/concurrent/LinkedBlockingQueue$Itr.h
deleted file mode 100644
index e7e0e526d7e..00000000000
--- a/libjava/java/util/concurrent/LinkedBlockingQueue$Itr.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_LinkedBlockingQueue$Itr__
-#define __java_util_concurrent_LinkedBlockingQueue$Itr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::LinkedBlockingQueue$Itr : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LinkedBlockingQueue$Itr(::java::util::concurrent::LinkedBlockingQueue *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-private:
-  ::java::util::concurrent::LinkedBlockingQueue$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
-  ::java::util::concurrent::LinkedBlockingQueue$Node * lastRet;
-  ::java::lang::Object * currentElement;
-public: // actually package-private
-  ::java::util::concurrent::LinkedBlockingQueue * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_LinkedBlockingQueue$Itr__
diff --git a/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h b/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h
deleted file mode 100644
index 36d1f654a64..00000000000
--- a/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_LinkedBlockingQueue$Node__
-#define __java_util_concurrent_LinkedBlockingQueue$Node__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::LinkedBlockingQueue$Node : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LinkedBlockingQueue$Node(::java::lang::Object *);
-  volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) item;
-  ::java::util::concurrent::LinkedBlockingQueue$Node * next;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_LinkedBlockingQueue$Node__
diff --git a/libjava/java/util/concurrent/LinkedBlockingQueue.h b/libjava/java/util/concurrent/LinkedBlockingQueue.h
deleted file mode 100644
index 42028ec3841..00000000000
--- a/libjava/java/util/concurrent/LinkedBlockingQueue.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_LinkedBlockingQueue__
-#define __java_util_concurrent_LinkedBlockingQueue__
-
-#pragma interface
-
-#include <java/util/AbstractQueue.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::LinkedBlockingQueue : public ::java::util::AbstractQueue
-{
-
-  void signalNotEmpty();
-  void signalNotFull();
-  void insert(::java::lang::Object *);
-  ::java::lang::Object * extract();
-  void fullyLock();
-  void fullyUnlock();
-public:
-  LinkedBlockingQueue();
-  LinkedBlockingQueue(jint);
-  LinkedBlockingQueue(::java::util::Collection *);
-  virtual jint size();
-  virtual jint remainingCapacity();
-  virtual void put(::java::lang::Object *);
-  virtual jboolean offer(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jboolean offer(::java::lang::Object *);
-  virtual ::java::lang::Object * take();
-  virtual ::java::lang::Object * poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * poll();
-  virtual ::java::lang::Object * peek();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::String * toString();
-  virtual void clear();
-  virtual jint drainTo(::java::util::Collection *);
-  virtual jint drainTo(::java::util::Collection *, jint);
-  virtual ::java::util::Iterator * iterator();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public: // actually package-private
-  static ::java::util::concurrent::locks::ReentrantLock * access$0(::java::util::concurrent::LinkedBlockingQueue *);
-  static ::java::util::concurrent::locks::ReentrantLock * access$1(::java::util::concurrent::LinkedBlockingQueue *);
-  static ::java::util::concurrent::LinkedBlockingQueue$Node * access$2(::java::util::concurrent::LinkedBlockingQueue *);
-  static ::java::util::concurrent::LinkedBlockingQueue$Node * access$3(::java::util::concurrent::LinkedBlockingQueue *);
-  static void access$4(::java::util::concurrent::LinkedBlockingQueue *, ::java::util::concurrent::LinkedBlockingQueue$Node *);
-  static ::java::util::concurrent::atomic::AtomicInteger * access$5(::java::util::concurrent::LinkedBlockingQueue *);
-  static jint access$6(::java::util::concurrent::LinkedBlockingQueue *);
-  static ::java::util::concurrent::locks::Condition * access$7(::java::util::concurrent::LinkedBlockingQueue *);
-private:
-  static const jlong serialVersionUID = -6903933977591709194LL;
-  jint __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) capacity;
-  ::java::util::concurrent::atomic::AtomicInteger * count;
-  ::java::util::concurrent::LinkedBlockingQueue$Node * head;
-  ::java::util::concurrent::LinkedBlockingQueue$Node * last;
-  ::java::util::concurrent::locks::ReentrantLock * takeLock;
-  ::java::util::concurrent::locks::Condition * notEmpty;
-  ::java::util::concurrent::locks::ReentrantLock * putLock;
-  ::java::util::concurrent::locks::Condition * notFull;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_LinkedBlockingQueue__
diff --git a/libjava/java/util/concurrent/PriorityBlockingQueue$Itr.h b/libjava/java/util/concurrent/PriorityBlockingQueue$Itr.h
deleted file mode 100644
index c6440718212..00000000000
--- a/libjava/java/util/concurrent/PriorityBlockingQueue$Itr.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_PriorityBlockingQueue$Itr__
-#define __java_util_concurrent_PriorityBlockingQueue$Itr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::PriorityBlockingQueue$Itr : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PriorityBlockingQueue$Itr(::java::util::concurrent::PriorityBlockingQueue *, JArray< ::java::lang::Object * > *);
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-public: // actually package-private
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) array;
-  jint cursor;
-  jint lastRet;
-  ::java::util::concurrent::PriorityBlockingQueue * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_PriorityBlockingQueue$Itr__
diff --git a/libjava/java/util/concurrent/PriorityBlockingQueue.h b/libjava/java/util/concurrent/PriorityBlockingQueue.h
deleted file mode 100644
index ad5d8bb40dc..00000000000
--- a/libjava/java/util/concurrent/PriorityBlockingQueue.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_PriorityBlockingQueue__
-#define __java_util_concurrent_PriorityBlockingQueue__
-
-#pragma interface
-
-#include <java/util/AbstractQueue.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::PriorityBlockingQueue : public ::java::util::AbstractQueue
-{
-
-public:
-  PriorityBlockingQueue();
-  PriorityBlockingQueue(jint);
-  PriorityBlockingQueue(jint, ::java::util::Comparator *);
-  PriorityBlockingQueue(::java::util::Collection *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean offer(::java::lang::Object *);
-  virtual void put(::java::lang::Object *);
-  virtual jboolean offer(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * poll();
-  virtual ::java::lang::Object * take();
-  virtual ::java::lang::Object * poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * peek();
-  virtual ::java::util::Comparator * comparator();
-  virtual jint size();
-  virtual jint remainingCapacity();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean contains(::java::lang::Object *);
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual ::java::lang::String * toString();
-  virtual jint drainTo(::java::util::Collection *);
-  virtual jint drainTo(::java::util::Collection *, jint);
-  virtual void clear();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::util::Iterator * iterator();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-public: // actually package-private
-  static ::java::util::concurrent::locks::ReentrantLock * access$0(::java::util::concurrent::PriorityBlockingQueue *);
-  static ::java::util::PriorityQueue * access$1(::java::util::concurrent::PriorityBlockingQueue *);
-private:
-  static const jlong serialVersionUID = 5595510919245408276LL;
-  ::java::util::PriorityQueue * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) q;
-  ::java::util::concurrent::locks::ReentrantLock * lock;
-  ::java::util::concurrent::locks::Condition * notEmpty;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_PriorityBlockingQueue__
diff --git a/libjava/java/util/concurrent/RejectedExecutionException.h b/libjava/java/util/concurrent/RejectedExecutionException.h
deleted file mode 100644
index 4606d2d943f..00000000000
--- a/libjava/java/util/concurrent/RejectedExecutionException.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_RejectedExecutionException__
-#define __java_util_concurrent_RejectedExecutionException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-
-class java::util::concurrent::RejectedExecutionException : public ::java::lang::RuntimeException
-{
-
-public:
-  RejectedExecutionException();
-  RejectedExecutionException(::java::lang::String *);
-  RejectedExecutionException(::java::lang::String *, ::java::lang::Throwable *);
-  RejectedExecutionException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -375805702767069545LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_RejectedExecutionException__
diff --git a/libjava/java/util/concurrent/RejectedExecutionHandler.h b/libjava/java/util/concurrent/RejectedExecutionHandler.h
deleted file mode 100644
index 8e1ac4f3f80..00000000000
--- a/libjava/java/util/concurrent/RejectedExecutionHandler.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_RejectedExecutionHandler__
-#define __java_util_concurrent_RejectedExecutionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::RejectedExecutionHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void rejectedExecution(::java::lang::Runnable *, ::java::util::concurrent::ThreadPoolExecutor *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_RejectedExecutionHandler__
diff --git a/libjava/java/util/concurrent/RunnableFuture.h b/libjava/java/util/concurrent/RunnableFuture.h
deleted file mode 100644
index 281dccc837f..00000000000
--- a/libjava/java/util/concurrent/RunnableFuture.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_RunnableFuture__
-#define __java_util_concurrent_RunnableFuture__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::RunnableFuture : public ::java::lang::Object
-{
-
-public:
-  virtual void run() = 0;
-  virtual jboolean cancel(jboolean) = 0;
-  virtual jboolean isCancelled() = 0;
-  virtual jboolean isDone() = 0;
-  virtual ::java::lang::Object * get() = 0;
-  virtual ::java::lang::Object * get(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_RunnableFuture__
diff --git a/libjava/java/util/concurrent/RunnableScheduledFuture.h b/libjava/java/util/concurrent/RunnableScheduledFuture.h
deleted file mode 100644
index 0846d65c99c..00000000000
--- a/libjava/java/util/concurrent/RunnableScheduledFuture.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_RunnableScheduledFuture__
-#define __java_util_concurrent_RunnableScheduledFuture__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::RunnableScheduledFuture : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isPeriodic() = 0;
-  virtual void run() = 0;
-  virtual jboolean cancel(jboolean) = 0;
-  virtual jboolean isCancelled() = 0;
-  virtual jboolean isDone() = 0;
-  virtual ::java::lang::Object * get() = 0;
-  virtual ::java::lang::Object * get(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual jlong getDelay(::java::util::concurrent::TimeUnit *) = 0;
-  virtual jint compareTo(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_RunnableScheduledFuture__
diff --git a/libjava/java/util/concurrent/ScheduledExecutorService.h b/libjava/java/util/concurrent/ScheduledExecutorService.h
deleted file mode 100644
index 9041e395be5..00000000000
--- a/libjava/java/util/concurrent/ScheduledExecutorService.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ScheduledExecutorService__
-#define __java_util_concurrent_ScheduledExecutorService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ScheduledExecutorService : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::concurrent::ScheduledFuture * schedule(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::util::concurrent::ScheduledFuture * schedule(::java::util::concurrent::Callable *, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::util::concurrent::ScheduledFuture * scheduleAtFixedRate(::java::lang::Runnable *, jlong, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::util::concurrent::ScheduledFuture * scheduleWithFixedDelay(::java::lang::Runnable *, jlong, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual void shutdown() = 0;
-  virtual ::java::util::List * shutdownNow() = 0;
-  virtual jboolean isShutdown() = 0;
-  virtual jboolean isTerminated() = 0;
-  virtual jboolean awaitTermination(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::util::concurrent::Future * submit(::java::util::concurrent::Callable *) = 0;
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *, ::java::lang::Object *) = 0;
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *) = 0;
-  virtual ::java::util::List * invokeAll(::java::util::Collection *) = 0;
-  virtual ::java::util::List * invokeAll(::java::util::Collection *, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual ::java::lang::Object * invokeAny(::java::util::Collection *) = 0;
-  virtual ::java::lang::Object * invokeAny(::java::util::Collection *, jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual void execute(::java::lang::Runnable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_ScheduledExecutorService__
diff --git a/libjava/java/util/concurrent/ScheduledFuture.h b/libjava/java/util/concurrent/ScheduledFuture.h
deleted file mode 100644
index 4cbf3b0fb8b..00000000000
--- a/libjava/java/util/concurrent/ScheduledFuture.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ScheduledFuture__
-#define __java_util_concurrent_ScheduledFuture__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ScheduledFuture : public ::java::lang::Object
-{
-
-public:
-  virtual jlong getDelay(::java::util::concurrent::TimeUnit *) = 0;
-  virtual jint compareTo(::java::lang::Object *) = 0;
-  virtual jboolean cancel(jboolean) = 0;
-  virtual jboolean isCancelled() = 0;
-  virtual jboolean isDone() = 0;
-  virtual ::java::lang::Object * get() = 0;
-  virtual ::java::lang::Object * get(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_ScheduledFuture__
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h
deleted file mode 100644
index cd6608f955e..00000000000
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ScheduledThreadPoolExecutor$1__
-#define __java_util_concurrent_ScheduledThreadPoolExecutor$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ScheduledThreadPoolExecutor$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ScheduledThreadPoolExecutor$1(::java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue *);
-public:
-  jboolean hasNext();
-  ::java::lang::Runnable * target$next();
-  void remove();
-  ::java::lang::Object * next();
-private:
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) it;
-public: // actually package-private
-  ::java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ScheduledThreadPoolExecutor$1__
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h
deleted file mode 100644
index fd5871a6a72..00000000000
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ScheduledThreadPoolExecutor$DelayedWorkQueue__
-#define __java_util_concurrent_ScheduledThreadPoolExecutor$DelayedWorkQueue__
-
-#pragma interface
-
-#include <java/util/AbstractCollection.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue : public ::java::util::AbstractCollection
-{
-
-  ScheduledThreadPoolExecutor$DelayedWorkQueue();
-public:
-  virtual ::java::lang::Runnable * target$poll();
-  virtual ::java::lang::Runnable * target$peek();
-  virtual ::java::lang::Runnable * target$take();
-  virtual ::java::lang::Runnable * target$poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jboolean target$add(::java::lang::Runnable *);
-  virtual jboolean target$offer(::java::lang::Runnable *);
-  virtual void target$put(::java::lang::Runnable *);
-  virtual jboolean target$offer(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Runnable * target$remove();
-  virtual ::java::lang::Runnable * target$element();
-  virtual void clear();
-  virtual jint drainTo(::java::util::Collection *);
-  virtual jint drainTo(::java::util::Collection *, jint);
-  virtual jint remainingCapacity();
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jint size();
-  virtual jboolean isEmpty();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::util::Iterator * iterator();
-  virtual ::java::lang::Object * element();
-  virtual ::java::lang::Object * poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * poll();
-  virtual ::java::lang::Object * take();
-  virtual jboolean offer(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jboolean offer(::java::lang::Object *);
-  virtual ::java::lang::Object * peek();
-  virtual jboolean add(::java::lang::Object *);
-  virtual ::java::lang::Object * remove();
-  virtual void put(::java::lang::Object *);
-public: // actually package-private
-  static ::java::util::concurrent::DelayQueue * access$10(::java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue *);
-  ScheduledThreadPoolExecutor$DelayedWorkQueue(::java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue *);
-private:
-  ::java::util::concurrent::DelayQueue * __attribute__((aligned(__alignof__( ::java::util::AbstractCollection)))) dq;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ScheduledThreadPoolExecutor$DelayedWorkQueue__
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h
deleted file mode 100644
index 1bd4e3bdacb..00000000000
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ScheduledThreadPoolExecutor$ScheduledFutureTask__
-#define __java_util_concurrent_ScheduledThreadPoolExecutor$ScheduledFutureTask__
-
-#pragma interface
-
-#include <java/util/concurrent/FutureTask.h>
-
-class java::util::concurrent::ScheduledThreadPoolExecutor$ScheduledFutureTask : public ::java::util::concurrent::FutureTask
-{
-
-public: // actually package-private
-  ScheduledThreadPoolExecutor$ScheduledFutureTask(::java::util::concurrent::ScheduledThreadPoolExecutor *, ::java::lang::Runnable *, ::java::lang::Object *, jlong);
-  ScheduledThreadPoolExecutor$ScheduledFutureTask(::java::util::concurrent::ScheduledThreadPoolExecutor *, ::java::lang::Runnable *, ::java::lang::Object *, jlong, jlong);
-  ScheduledThreadPoolExecutor$ScheduledFutureTask(::java::util::concurrent::ScheduledThreadPoolExecutor *, ::java::util::concurrent::Callable *, jlong);
-public:
-  virtual jlong getDelay(::java::util::concurrent::TimeUnit *);
-  virtual jint target$compareTo(::java::util::concurrent::Delayed *);
-  virtual jboolean isPeriodic();
-private:
-  void runPeriodic();
-public:
-  virtual void run();
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  static jboolean access$1(::java::util::concurrent::ScheduledThreadPoolExecutor$ScheduledFutureTask *);
-  static void access$2(::java::util::concurrent::ScheduledThreadPoolExecutor$ScheduledFutureTask *);
-private:
-  jlong __attribute__((aligned(__alignof__( ::java::util::concurrent::FutureTask)))) sequenceNumber;
-  jlong time;
-  jlong period;
-public: // actually package-private
-  ::java::util::concurrent::ScheduledThreadPoolExecutor * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ScheduledThreadPoolExecutor$ScheduledFutureTask__
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h
deleted file mode 100644
index e01b42074bf..00000000000
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ScheduledThreadPoolExecutor__
-#define __java_util_concurrent_ScheduledThreadPoolExecutor__
-
-#pragma interface
-
-#include <java/util/concurrent/ThreadPoolExecutor.h>
-
-class java::util::concurrent::ScheduledThreadPoolExecutor : public ::java::util::concurrent::ThreadPoolExecutor
-{
-
-public: // actually package-private
-  virtual jlong now();
-private:
-  void delayedExecute(::java::lang::Runnable *);
-  void cancelUnwantedTasks();
-public:
-  virtual jboolean remove(::java::lang::Runnable *);
-public: // actually protected
-  virtual ::java::util::concurrent::RunnableScheduledFuture * decorateTask(::java::lang::Runnable *, ::java::util::concurrent::RunnableScheduledFuture *);
-  virtual ::java::util::concurrent::RunnableScheduledFuture * decorateTask(::java::util::concurrent::Callable *, ::java::util::concurrent::RunnableScheduledFuture *);
-public:
-  ScheduledThreadPoolExecutor(jint);
-  ScheduledThreadPoolExecutor(jint, ::java::util::concurrent::ThreadFactory *);
-  ScheduledThreadPoolExecutor(jint, ::java::util::concurrent::RejectedExecutionHandler *);
-  ScheduledThreadPoolExecutor(jint, ::java::util::concurrent::ThreadFactory *, ::java::util::concurrent::RejectedExecutionHandler *);
-  virtual ::java::util::concurrent::ScheduledFuture * schedule(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::ScheduledFuture * schedule(::java::util::concurrent::Callable *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::ScheduledFuture * scheduleAtFixedRate(::java::lang::Runnable *, jlong, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::ScheduledFuture * scheduleWithFixedDelay(::java::lang::Runnable *, jlong, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual void execute(::java::lang::Runnable *);
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *);
-  virtual ::java::util::concurrent::Future * submit(::java::lang::Runnable *, ::java::lang::Object *);
-  virtual ::java::util::concurrent::Future * submit(::java::util::concurrent::Callable *);
-  virtual void setContinueExistingPeriodicTasksAfterShutdownPolicy(jboolean);
-  virtual jboolean getContinueExistingPeriodicTasksAfterShutdownPolicy();
-  virtual void setExecuteExistingDelayedTasksAfterShutdownPolicy(jboolean);
-  virtual jboolean getExecuteExistingDelayedTasksAfterShutdownPolicy();
-  virtual void shutdown();
-  virtual ::java::util::List * shutdownNow();
-  virtual ::java::util::concurrent::BlockingQueue * getQueue();
-public: // actually package-private
-  static ::java::util::concurrent::atomic::AtomicLong * access$0();
-  static ::java::util::concurrent::BlockingQueue * access$1(::java::util::concurrent::ScheduledThreadPoolExecutor *);
-private:
-  volatile jboolean __attribute__((aligned(__alignof__( ::java::util::concurrent::ThreadPoolExecutor)))) continueExistingPeriodicTasksAfterShutdown;
-  volatile jboolean executeExistingDelayedTasksAfterShutdown;
-  static ::java::util::concurrent::atomic::AtomicLong * sequencer;
-  static jlong NANO_ORIGIN;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ScheduledThreadPoolExecutor__
diff --git a/libjava/java/util/concurrent/Semaphore$FairSync.h b/libjava/java/util/concurrent/Semaphore$FairSync.h
deleted file mode 100644
index ac323695ba1..00000000000
--- a/libjava/java/util/concurrent/Semaphore$FairSync.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Semaphore$FairSync__
-#define __java_util_concurrent_Semaphore$FairSync__
-
-#pragma interface
-
-#include <java/util/concurrent/Semaphore$Sync.h>
-
-class java::util::concurrent::Semaphore$FairSync : public ::java::util::concurrent::Semaphore$Sync
-{
-
-public: // actually package-private
-  Semaphore$FairSync(jint);
-public: // actually protected
-  jint tryAcquireShared(jint);
-private:
-  static const jlong serialVersionUID = 2014338818796000944LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Semaphore$FairSync__
diff --git a/libjava/java/util/concurrent/Semaphore$NonfairSync.h b/libjava/java/util/concurrent/Semaphore$NonfairSync.h
deleted file mode 100644
index 2a03f1ac268..00000000000
--- a/libjava/java/util/concurrent/Semaphore$NonfairSync.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Semaphore$NonfairSync__
-#define __java_util_concurrent_Semaphore$NonfairSync__
-
-#pragma interface
-
-#include <java/util/concurrent/Semaphore$Sync.h>
-
-class java::util::concurrent::Semaphore$NonfairSync : public ::java::util::concurrent::Semaphore$Sync
-{
-
-public: // actually package-private
-  Semaphore$NonfairSync(jint);
-public: // actually protected
-  jint tryAcquireShared(jint);
-private:
-  static const jlong serialVersionUID = -2694183684443567898LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Semaphore$NonfairSync__
diff --git a/libjava/java/util/concurrent/Semaphore$Sync.h b/libjava/java/util/concurrent/Semaphore$Sync.h
deleted file mode 100644
index 98464b2e5e3..00000000000
--- a/libjava/java/util/concurrent/Semaphore$Sync.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Semaphore$Sync__
-#define __java_util_concurrent_Semaphore$Sync__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/AbstractQueuedSynchronizer.h>
-
-class java::util::concurrent::Semaphore$Sync : public ::java::util::concurrent::locks::AbstractQueuedSynchronizer
-{
-
-public: // actually package-private
-  Semaphore$Sync(jint);
-  virtual jint getPermits();
-  virtual jint nonfairTryAcquireShared(jint);
-public: // actually protected
-  virtual jboolean tryReleaseShared(jint);
-public: // actually package-private
-  virtual void reducePermits(jint);
-  virtual jint drainPermits();
-private:
-  static const jlong serialVersionUID = 1192457210091910933LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Semaphore$Sync__
diff --git a/libjava/java/util/concurrent/Semaphore.h b/libjava/java/util/concurrent/Semaphore.h
deleted file mode 100644
index 41755ddcd5f..00000000000
--- a/libjava/java/util/concurrent/Semaphore.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_Semaphore__
-#define __java_util_concurrent_Semaphore__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::Semaphore : public ::java::lang::Object
-{
-
-public:
-  Semaphore(jint);
-  Semaphore(jint, jboolean);
-  virtual void acquire();
-  virtual void acquireUninterruptibly();
-  virtual jboolean tryAcquire();
-  virtual jboolean tryAcquire(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual void release();
-  virtual void acquire(jint);
-  virtual void acquireUninterruptibly(jint);
-  virtual jboolean tryAcquire(jint);
-  virtual jboolean tryAcquire(jint, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual void release(jint);
-  virtual jint availablePermits();
-  virtual jint drainPermits();
-public: // actually protected
-  virtual void reducePermits(jint);
-public:
-  virtual jboolean isFair();
-  virtual jboolean hasQueuedThreads();
-  virtual jint getQueueLength();
-public: // actually protected
-  virtual ::java::util::Collection * getQueuedThreads();
-public:
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -3222578661600680210LL;
-  ::java::util::concurrent::Semaphore$Sync * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sync;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_Semaphore__
diff --git a/libjava/java/util/concurrent/SynchronousQueue$EmptyIterator.h b/libjava/java/util/concurrent/SynchronousQueue$EmptyIterator.h
deleted file mode 100644
index 793fb9a10a2..00000000000
--- a/libjava/java/util/concurrent/SynchronousQueue$EmptyIterator.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_SynchronousQueue$EmptyIterator__
-#define __java_util_concurrent_SynchronousQueue$EmptyIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::SynchronousQueue$EmptyIterator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SynchronousQueue$EmptyIterator();
-public:
-  virtual jboolean hasNext();
-  virtual ::java::lang::Object * next();
-  virtual void remove();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_SynchronousQueue$EmptyIterator__
diff --git a/libjava/java/util/concurrent/SynchronousQueue$FifoWaitQueue.h b/libjava/java/util/concurrent/SynchronousQueue$FifoWaitQueue.h
deleted file mode 100644
index ba636900d6a..00000000000
--- a/libjava/java/util/concurrent/SynchronousQueue$FifoWaitQueue.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_SynchronousQueue$FifoWaitQueue__
-#define __java_util_concurrent_SynchronousQueue$FifoWaitQueue__
-
-#pragma interface
-
-#include <java/util/concurrent/SynchronousQueue$WaitQueue.h>
-
-class java::util::concurrent::SynchronousQueue$FifoWaitQueue : public ::java::util::concurrent::SynchronousQueue$WaitQueue
-{
-
-public: // actually package-private
-  SynchronousQueue$FifoWaitQueue();
-private:
-  static const jlong serialVersionUID = -3623113410248163686LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_SynchronousQueue$FifoWaitQueue__
diff --git a/libjava/java/util/concurrent/SynchronousQueue$LifoWaitQueue.h b/libjava/java/util/concurrent/SynchronousQueue$LifoWaitQueue.h
deleted file mode 100644
index dedfaca8ca0..00000000000
--- a/libjava/java/util/concurrent/SynchronousQueue$LifoWaitQueue.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_SynchronousQueue$LifoWaitQueue__
-#define __java_util_concurrent_SynchronousQueue$LifoWaitQueue__
-
-#pragma interface
-
-#include <java/util/concurrent/SynchronousQueue$WaitQueue.h>
-
-class java::util::concurrent::SynchronousQueue$LifoWaitQueue : public ::java::util::concurrent::SynchronousQueue$WaitQueue
-{
-
-public: // actually package-private
-  SynchronousQueue$LifoWaitQueue();
-private:
-  static const jlong serialVersionUID = -3633113410248163686LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_SynchronousQueue$LifoWaitQueue__
diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h
deleted file mode 100644
index 07486a9abf8..00000000000
--- a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_SynchronousQueue$TransferQueue$QNode__
-#define __java_util_concurrent_SynchronousQueue$TransferQueue$QNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::SynchronousQueue$TransferQueue$QNode : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SynchronousQueue$TransferQueue$QNode(::java::lang::Object *, jboolean);
-  jboolean casNext(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *);
-  jboolean casItem(::java::lang::Object *, ::java::lang::Object *);
-  void tryCancel(::java::lang::Object *);
-  jboolean isCancelled();
-  jboolean isOffList();
-  volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
-  volatile ::java::lang::Object * item;
-  volatile ::java::lang::Thread * waiter;
-  jboolean isData;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * itemUpdater;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_SynchronousQueue$TransferQueue$QNode__
diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h
deleted file mode 100644
index d1b55c99983..00000000000
--- a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_SynchronousQueue$TransferQueue__
-#define __java_util_concurrent_SynchronousQueue$TransferQueue__
-
-#pragma interface
-
-#include <java/util/concurrent/SynchronousQueue$Transferer.h>
-
-class java::util::concurrent::SynchronousQueue$TransferQueue : public ::java::util::concurrent::SynchronousQueue$Transferer
-{
-
-public: // actually package-private
-  SynchronousQueue$TransferQueue();
-  void advanceHead(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *);
-  void advanceTail(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *);
-  jboolean casCleanMe(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *);
-  ::java::lang::Object * transfer(::java::lang::Object *, jboolean, jlong);
-  ::java::lang::Object * awaitFulfill(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::lang::Object *, jboolean, jlong);
-  void clean(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *);
-  volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head;
-  volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * tail;
-  volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * cleanMe;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * tailUpdater;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * cleanMeUpdater;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_SynchronousQueue$TransferQueue__
diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h b/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h
deleted file mode 100644
index 77af8cb17f4..00000000000
--- a/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_SynchronousQueue$TransferStack$SNode__
-#define __java_util_concurrent_SynchronousQueue$TransferStack$SNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::SynchronousQueue$TransferStack$SNode : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SynchronousQueue$TransferStack$SNode(::java::lang::Object *);
-  jboolean casNext(::java::util::concurrent::SynchronousQueue$TransferStack$SNode *, ::java::util::concurrent::SynchronousQueue$TransferStack$SNode *);
-  jboolean tryMatch(::java::util::concurrent::SynchronousQueue$TransferStack$SNode *);
-  void tryCancel();
-  jboolean isCancelled();
-  volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
-  volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * match;
-  volatile ::java::lang::Thread * waiter;
-  ::java::lang::Object * item;
-  jint mode;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * matchUpdater;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_SynchronousQueue$TransferStack$SNode__
diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h b/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h
deleted file mode 100644
index b29138fede4..00000000000
--- a/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_SynchronousQueue$TransferStack__
-#define __java_util_concurrent_SynchronousQueue$TransferStack__
-
-#pragma interface
-
-#include <java/util/concurrent/SynchronousQueue$Transferer.h>
-
-class java::util::concurrent::SynchronousQueue$TransferStack : public ::java::util::concurrent::SynchronousQueue$Transferer
-{
-
-public: // actually package-private
-  SynchronousQueue$TransferStack();
-  static jboolean isFulfilling(jint);
-  jboolean casHead(::java::util::concurrent::SynchronousQueue$TransferStack$SNode *, ::java::util::concurrent::SynchronousQueue$TransferStack$SNode *);
-  static ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * snode(::java::util::concurrent::SynchronousQueue$TransferStack$SNode *, ::java::lang::Object *, ::java::util::concurrent::SynchronousQueue$TransferStack$SNode *, jint);
-  ::java::lang::Object * transfer(::java::lang::Object *, jboolean, jlong);
-  ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * awaitFulfill(::java::util::concurrent::SynchronousQueue$TransferStack$SNode *, jboolean, jlong);
-  jboolean shouldSpin(::java::util::concurrent::SynchronousQueue$TransferStack$SNode *);
-  void clean(::java::util::concurrent::SynchronousQueue$TransferStack$SNode *);
-  static const jint REQUEST = 0;
-  static const jint DATA = 1;
-  static const jint FULFILLING = 2;
-  volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head;
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_SynchronousQueue$TransferStack__
diff --git a/libjava/java/util/concurrent/SynchronousQueue$Transferer.h b/libjava/java/util/concurrent/SynchronousQueue$Transferer.h
deleted file mode 100644
index 1b135af58ae..00000000000
--- a/libjava/java/util/concurrent/SynchronousQueue$Transferer.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_SynchronousQueue$Transferer__
-#define __java_util_concurrent_SynchronousQueue$Transferer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::SynchronousQueue$Transferer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SynchronousQueue$Transferer();
-  virtual ::java::lang::Object * transfer(::java::lang::Object *, jboolean, jlong) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_SynchronousQueue$Transferer__
diff --git a/libjava/java/util/concurrent/SynchronousQueue$WaitQueue.h b/libjava/java/util/concurrent/SynchronousQueue$WaitQueue.h
deleted file mode 100644
index 36f384d32e9..00000000000
--- a/libjava/java/util/concurrent/SynchronousQueue$WaitQueue.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_SynchronousQueue$WaitQueue__
-#define __java_util_concurrent_SynchronousQueue$WaitQueue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::SynchronousQueue$WaitQueue : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SynchronousQueue$WaitQueue();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_SynchronousQueue$WaitQueue__
diff --git a/libjava/java/util/concurrent/SynchronousQueue.h b/libjava/java/util/concurrent/SynchronousQueue.h
deleted file mode 100644
index 82ecce492c1..00000000000
--- a/libjava/java/util/concurrent/SynchronousQueue.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_SynchronousQueue__
-#define __java_util_concurrent_SynchronousQueue__
-
-#pragma interface
-
-#include <java/util/AbstractQueue.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::SynchronousQueue : public ::java::util::AbstractQueue
-{
-
-public:
-  SynchronousQueue();
-  SynchronousQueue(jboolean);
-  virtual void put(::java::lang::Object *);
-  virtual jboolean offer(::java::lang::Object *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jboolean offer(::java::lang::Object *);
-  virtual ::java::lang::Object * take();
-  virtual ::java::lang::Object * poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Object * poll();
-  virtual jboolean isEmpty();
-  virtual jint size();
-  virtual jint remainingCapacity();
-  virtual void clear();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean containsAll(::java::util::Collection *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual jboolean retainAll(::java::util::Collection *);
-  virtual ::java::lang::Object * peek();
-  virtual ::java::util::Iterator * iterator();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual jint drainTo(::java::util::Collection *);
-  virtual jint drainTo(::java::util::Collection *, jint);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -3223113410248163686LL;
-public: // actually package-private
-  static jint NCPUS;
-  static jint maxTimedSpins;
-  static jint maxUntimedSpins;
-  static const jlong spinForTimeoutThreshold = 1000LL;
-private:
-  volatile ::java::util::concurrent::SynchronousQueue$Transferer * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) transferer;
-  ::java::util::concurrent::locks::ReentrantLock * qlock;
-  ::java::util::concurrent::SynchronousQueue$WaitQueue * waitingProducers;
-  ::java::util::concurrent::SynchronousQueue$WaitQueue * waitingConsumers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_SynchronousQueue__
diff --git a/libjava/java/util/concurrent/ThreadFactory.h b/libjava/java/util/concurrent/ThreadFactory.h
deleted file mode 100644
index c1037df60c1..00000000000
--- a/libjava/java/util/concurrent/ThreadFactory.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ThreadFactory__
-#define __java_util_concurrent_ThreadFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ThreadFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Thread * newThread(::java::lang::Runnable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_ThreadFactory__
diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor$AbortPolicy.h b/libjava/java/util/concurrent/ThreadPoolExecutor$AbortPolicy.h
deleted file mode 100644
index 9f61c798b45..00000000000
--- a/libjava/java/util/concurrent/ThreadPoolExecutor$AbortPolicy.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ThreadPoolExecutor$AbortPolicy__
-#define __java_util_concurrent_ThreadPoolExecutor$AbortPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ThreadPoolExecutor$AbortPolicy : public ::java::lang::Object
-{
-
-public:
-  ThreadPoolExecutor$AbortPolicy();
-  virtual void rejectedExecution(::java::lang::Runnable *, ::java::util::concurrent::ThreadPoolExecutor *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ThreadPoolExecutor$AbortPolicy__
diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor$CallerRunsPolicy.h b/libjava/java/util/concurrent/ThreadPoolExecutor$CallerRunsPolicy.h
deleted file mode 100644
index 169a9c3b966..00000000000
--- a/libjava/java/util/concurrent/ThreadPoolExecutor$CallerRunsPolicy.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ThreadPoolExecutor$CallerRunsPolicy__
-#define __java_util_concurrent_ThreadPoolExecutor$CallerRunsPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ThreadPoolExecutor$CallerRunsPolicy : public ::java::lang::Object
-{
-
-public:
-  ThreadPoolExecutor$CallerRunsPolicy();
-  virtual void rejectedExecution(::java::lang::Runnable *, ::java::util::concurrent::ThreadPoolExecutor *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ThreadPoolExecutor$CallerRunsPolicy__
diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor$DiscardOldestPolicy.h b/libjava/java/util/concurrent/ThreadPoolExecutor$DiscardOldestPolicy.h
deleted file mode 100644
index 77b8e053595..00000000000
--- a/libjava/java/util/concurrent/ThreadPoolExecutor$DiscardOldestPolicy.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ThreadPoolExecutor$DiscardOldestPolicy__
-#define __java_util_concurrent_ThreadPoolExecutor$DiscardOldestPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ThreadPoolExecutor$DiscardOldestPolicy : public ::java::lang::Object
-{
-
-public:
-  ThreadPoolExecutor$DiscardOldestPolicy();
-  virtual void rejectedExecution(::java::lang::Runnable *, ::java::util::concurrent::ThreadPoolExecutor *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ThreadPoolExecutor$DiscardOldestPolicy__
diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor$DiscardPolicy.h b/libjava/java/util/concurrent/ThreadPoolExecutor$DiscardPolicy.h
deleted file mode 100644
index 771f828c61a..00000000000
--- a/libjava/java/util/concurrent/ThreadPoolExecutor$DiscardPolicy.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ThreadPoolExecutor$DiscardPolicy__
-#define __java_util_concurrent_ThreadPoolExecutor$DiscardPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ThreadPoolExecutor$DiscardPolicy : public ::java::lang::Object
-{
-
-public:
-  ThreadPoolExecutor$DiscardPolicy();
-  virtual void rejectedExecution(::java::lang::Runnable *, ::java::util::concurrent::ThreadPoolExecutor *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ThreadPoolExecutor$DiscardPolicy__
diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h b/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h
deleted file mode 100644
index 18d3f3204a3..00000000000
--- a/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ThreadPoolExecutor$Worker__
-#define __java_util_concurrent_ThreadPoolExecutor$Worker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::ThreadPoolExecutor$Worker : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ThreadPoolExecutor$Worker(::java::util::concurrent::ThreadPoolExecutor *, ::java::lang::Runnable *);
-  virtual jboolean isActive();
-  virtual void interruptIfIdle();
-  virtual void interruptNow();
-private:
-  void runTask(::java::lang::Runnable *);
-public:
-  virtual void run();
-private:
-  ::java::util::concurrent::locks::ReentrantLock * __attribute__((aligned(__alignof__( ::java::lang::Object)))) runLock;
-  ::java::lang::Runnable * firstTask;
-public: // actually package-private
-  volatile jlong completedTasks;
-  ::java::lang::Thread * thread;
-  ::java::util::concurrent::ThreadPoolExecutor * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ThreadPoolExecutor$Worker__
diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor.h b/libjava/java/util/concurrent/ThreadPoolExecutor.h
deleted file mode 100644
index 00b9dde7c9f..00000000000
--- a/libjava/java/util/concurrent/ThreadPoolExecutor.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_ThreadPoolExecutor__
-#define __java_util_concurrent_ThreadPoolExecutor__
-
-#pragma interface
-
-#include <java/util/concurrent/AbstractExecutorService.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::ThreadPoolExecutor : public ::java::util::concurrent::AbstractExecutorService
-{
-
-public: // actually package-private
-  virtual void reject(::java::lang::Runnable *);
-private:
-  ::java::lang::Thread * addThread(::java::lang::Runnable *);
-  jboolean addIfUnderCorePoolSize(::java::lang::Runnable *);
-  jint addIfUnderMaximumPoolSize(::java::lang::Runnable *);
-public: // actually package-private
-  virtual ::java::lang::Runnable * getTask();
-  virtual void interruptIdleWorkers();
-  virtual void workerDone(::java::util::concurrent::ThreadPoolExecutor$Worker *);
-public:
-  ThreadPoolExecutor(jint, jint, jlong, ::java::util::concurrent::TimeUnit *, ::java::util::concurrent::BlockingQueue *);
-  ThreadPoolExecutor(jint, jint, jlong, ::java::util::concurrent::TimeUnit *, ::java::util::concurrent::BlockingQueue *, ::java::util::concurrent::ThreadFactory *);
-  ThreadPoolExecutor(jint, jint, jlong, ::java::util::concurrent::TimeUnit *, ::java::util::concurrent::BlockingQueue *, ::java::util::concurrent::RejectedExecutionHandler *);
-  ThreadPoolExecutor(jint, jint, jlong, ::java::util::concurrent::TimeUnit *, ::java::util::concurrent::BlockingQueue *, ::java::util::concurrent::ThreadFactory *, ::java::util::concurrent::RejectedExecutionHandler *);
-  virtual void execute(::java::lang::Runnable *);
-  virtual void shutdown();
-  virtual ::java::util::List * shutdownNow();
-  virtual jboolean isShutdown();
-  virtual jboolean isTerminating();
-  virtual jboolean isTerminated();
-  virtual jboolean awaitTermination(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual void setThreadFactory(::java::util::concurrent::ThreadFactory *);
-  virtual ::java::util::concurrent::ThreadFactory * getThreadFactory();
-  virtual void setRejectedExecutionHandler(::java::util::concurrent::RejectedExecutionHandler *);
-  virtual ::java::util::concurrent::RejectedExecutionHandler * getRejectedExecutionHandler();
-  virtual ::java::util::concurrent::BlockingQueue * getQueue();
-  virtual jboolean remove(::java::lang::Runnable *);
-  virtual void purge();
-  virtual void setCorePoolSize(jint);
-  virtual jint getCorePoolSize();
-  virtual jboolean prestartCoreThread();
-  virtual jint prestartAllCoreThreads();
-  virtual jboolean allowsCoreThreadTimeOut();
-  virtual void allowCoreThreadTimeOut(jboolean);
-  virtual void setMaximumPoolSize(jint);
-  virtual jint getMaximumPoolSize();
-  virtual void setKeepAliveTime(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jlong getKeepAliveTime(::java::util::concurrent::TimeUnit *);
-  virtual jint getPoolSize();
-  virtual jint getActiveCount();
-  virtual jint getLargestPoolSize();
-  virtual jlong getTaskCount();
-  virtual jlong getCompletedTaskCount();
-public: // actually protected
-  virtual void beforeExecute(::java::lang::Thread *, ::java::lang::Runnable *);
-  virtual void afterExecute(::java::lang::Runnable *, ::java::lang::Throwable *);
-  virtual void terminated();
-private:
-  static JArray< ::java::lang::Runnable * > * EMPTY_RUNNABLE_ARRAY;
-  static ::java::lang::RuntimePermission * shutdownPerm;
-  ::java::util::concurrent::BlockingQueue * __attribute__((aligned(__alignof__( ::java::util::concurrent::AbstractExecutorService)))) workQueue;
-  ::java::util::concurrent::locks::ReentrantLock * mainLock;
-  ::java::util::concurrent::locks::Condition * termination;
-  ::java::util::HashSet * workers;
-  volatile jlong keepAliveTime;
-  volatile jboolean allowCoreThreadTimeOut__;
-  volatile jint corePoolSize;
-  volatile jint maximumPoolSize;
-  volatile jint poolSize;
-public: // actually package-private
-  volatile jint runState;
-  static const jint RUNNING = 0;
-  static const jint SHUTDOWN = 1;
-  static const jint STOP = 2;
-  static const jint TERMINATED = 3;
-private:
-  volatile ::java::util::concurrent::RejectedExecutionHandler * handler;
-  volatile ::java::util::concurrent::ThreadFactory * threadFactory;
-  jint largestPoolSize;
-  jlong completedTaskCount;
-  static ::java::util::concurrent::RejectedExecutionHandler * defaultHandler;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_ThreadPoolExecutor__
diff --git a/libjava/java/util/concurrent/TimeUnit$1.h b/libjava/java/util/concurrent/TimeUnit$1.h
deleted file mode 100644
index 85b2bfbb06e..00000000000
--- a/libjava/java/util/concurrent/TimeUnit$1.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_TimeUnit$1__
-#define __java_util_concurrent_TimeUnit$1__
-
-#pragma interface
-
-#include <java/util/concurrent/TimeUnit.h>
-
-class java::util::concurrent::TimeUnit$1 : public ::java::util::concurrent::TimeUnit
-{
-
-public: // actually package-private
-  TimeUnit$1(::java::lang::String *, jint);
-public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually package-private
-  jint excessNanos(jlong, jlong);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_TimeUnit$1__
diff --git a/libjava/java/util/concurrent/TimeUnit$2.h b/libjava/java/util/concurrent/TimeUnit$2.h
deleted file mode 100644
index 6392a88296a..00000000000
--- a/libjava/java/util/concurrent/TimeUnit$2.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_TimeUnit$2__
-#define __java_util_concurrent_TimeUnit$2__
-
-#pragma interface
-
-#include <java/util/concurrent/TimeUnit.h>
-
-class java::util::concurrent::TimeUnit$2 : public ::java::util::concurrent::TimeUnit
-{
-
-public: // actually package-private
-  TimeUnit$2(::java::lang::String *, jint);
-public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually package-private
-  jint excessNanos(jlong, jlong);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_TimeUnit$2__
diff --git a/libjava/java/util/concurrent/TimeUnit$3.h b/libjava/java/util/concurrent/TimeUnit$3.h
deleted file mode 100644
index 0e80899da9a..00000000000
--- a/libjava/java/util/concurrent/TimeUnit$3.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_TimeUnit$3__
-#define __java_util_concurrent_TimeUnit$3__
-
-#pragma interface
-
-#include <java/util/concurrent/TimeUnit.h>
-
-class java::util::concurrent::TimeUnit$3 : public ::java::util::concurrent::TimeUnit
-{
-
-public: // actually package-private
-  TimeUnit$3(::java::lang::String *, jint);
-public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually package-private
-  jint excessNanos(jlong, jlong);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_TimeUnit$3__
diff --git a/libjava/java/util/concurrent/TimeUnit$4.h b/libjava/java/util/concurrent/TimeUnit$4.h
deleted file mode 100644
index fca74d3dbce..00000000000
--- a/libjava/java/util/concurrent/TimeUnit$4.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_TimeUnit$4__
-#define __java_util_concurrent_TimeUnit$4__
-
-#pragma interface
-
-#include <java/util/concurrent/TimeUnit.h>
-
-class java::util::concurrent::TimeUnit$4 : public ::java::util::concurrent::TimeUnit
-{
-
-public: // actually package-private
-  TimeUnit$4(::java::lang::String *, jint);
-public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually package-private
-  jint excessNanos(jlong, jlong);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_TimeUnit$4__
diff --git a/libjava/java/util/concurrent/TimeUnit$5.h b/libjava/java/util/concurrent/TimeUnit$5.h
deleted file mode 100644
index 54bf7dd61ac..00000000000
--- a/libjava/java/util/concurrent/TimeUnit$5.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_TimeUnit$5__
-#define __java_util_concurrent_TimeUnit$5__
-
-#pragma interface
-
-#include <java/util/concurrent/TimeUnit.h>
-
-class java::util::concurrent::TimeUnit$5 : public ::java::util::concurrent::TimeUnit
-{
-
-public: // actually package-private
-  TimeUnit$5(::java::lang::String *, jint);
-public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually package-private
-  jint excessNanos(jlong, jlong);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_TimeUnit$5__
diff --git a/libjava/java/util/concurrent/TimeUnit$6.h b/libjava/java/util/concurrent/TimeUnit$6.h
deleted file mode 100644
index 8439a71793d..00000000000
--- a/libjava/java/util/concurrent/TimeUnit$6.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_TimeUnit$6__
-#define __java_util_concurrent_TimeUnit$6__
-
-#pragma interface
-
-#include <java/util/concurrent/TimeUnit.h>
-
-class java::util::concurrent::TimeUnit$6 : public ::java::util::concurrent::TimeUnit
-{
-
-public: // actually package-private
-  TimeUnit$6(::java::lang::String *, jint);
-public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually package-private
-  jint excessNanos(jlong, jlong);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_TimeUnit$6__
diff --git a/libjava/java/util/concurrent/TimeUnit$7.h b/libjava/java/util/concurrent/TimeUnit$7.h
deleted file mode 100644
index e7bac28508d..00000000000
--- a/libjava/java/util/concurrent/TimeUnit$7.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_TimeUnit$7__
-#define __java_util_concurrent_TimeUnit$7__
-
-#pragma interface
-
-#include <java/util/concurrent/TimeUnit.h>
-
-class java::util::concurrent::TimeUnit$7 : public ::java::util::concurrent::TimeUnit
-{
-
-public: // actually package-private
-  TimeUnit$7(::java::lang::String *, jint);
-public:
-  jlong toNanos(jlong);
-  jlong toMicros(jlong);
-  jlong toMillis(jlong);
-  jlong toSeconds(jlong);
-  jlong toMinutes(jlong);
-  jlong toHours(jlong);
-  jlong toDays(jlong);
-  jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually package-private
-  jint excessNanos(jlong, jlong);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_TimeUnit$7__
diff --git a/libjava/java/util/concurrent/TimeUnit.h b/libjava/java/util/concurrent/TimeUnit.h
deleted file mode 100644
index fa6d497f697..00000000000
--- a/libjava/java/util/concurrent/TimeUnit.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_TimeUnit__
-#define __java_util_concurrent_TimeUnit__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::TimeUnit : public ::java::lang::Enum
-{
-
-  TimeUnit(::java::lang::String *, jint);
-public: // actually package-private
-  static jlong x(jlong, jlong, jlong);
-public:
-  virtual jlong convert(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jlong toNanos(jlong);
-  virtual jlong toMicros(jlong);
-  virtual jlong toMillis(jlong);
-  virtual jlong toSeconds(jlong);
-  virtual jlong toMinutes(jlong);
-  virtual jlong toHours(jlong);
-  virtual jlong toDays(jlong);
-public: // actually package-private
-  virtual jint excessNanos(jlong, jlong) = 0;
-public:
-  virtual void timedWait(::java::lang::Object *, jlong);
-  virtual void timedJoin(::java::lang::Thread *, jlong);
-  virtual void sleep(jlong);
-  static JArray< ::java::util::concurrent::TimeUnit * > * values();
-  static ::java::util::concurrent::TimeUnit * valueOf(::java::lang::String *);
-public: // actually package-private
-  TimeUnit(::java::lang::String *, jint, ::java::util::concurrent::TimeUnit *);
-public:
-  static ::java::util::concurrent::TimeUnit * NANOSECONDS;
-  static ::java::util::concurrent::TimeUnit * MICROSECONDS;
-  static ::java::util::concurrent::TimeUnit * MILLISECONDS;
-  static ::java::util::concurrent::TimeUnit * SECONDS;
-  static ::java::util::concurrent::TimeUnit * MINUTES;
-  static ::java::util::concurrent::TimeUnit * HOURS;
-  static ::java::util::concurrent::TimeUnit * DAYS;
-public: // actually package-private
-  static const jlong C0 = 1LL;
-  static const jlong C1 = 1000LL;
-  static const jlong C2 = 1000000LL;
-  static const jlong C3 = 1000000000LL;
-  static const jlong C4 = 60000000000LL;
-  static const jlong C5 = 3600000000000LL;
-  static const jlong C6 = 86400000000000LL;
-  static const jlong MAX = 9223372036854775807LL;
-private:
-  static JArray< ::java::util::concurrent::TimeUnit * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_TimeUnit__
diff --git a/libjava/java/util/concurrent/TimeoutException.h b/libjava/java/util/concurrent/TimeoutException.h
deleted file mode 100644
index 6ce42b18071..00000000000
--- a/libjava/java/util/concurrent/TimeoutException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_TimeoutException__
-#define __java_util_concurrent_TimeoutException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::util::concurrent::TimeoutException : public ::java::lang::Exception
-{
-
-public:
-  TimeoutException();
-  TimeoutException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1900926677490660714LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_TimeoutException__
diff --git a/libjava/java/util/concurrent/atomic/AtomicBoolean.h b/libjava/java/util/concurrent/atomic/AtomicBoolean.h
deleted file mode 100644
index 08a6d597e14..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicBoolean.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicBoolean__
-#define __java_util_concurrent_atomic_AtomicBoolean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicBoolean : public ::java::lang::Object
-{
-
-public:
-  AtomicBoolean(jboolean);
-  AtomicBoolean();
-  virtual jboolean get();
-  virtual jboolean compareAndSet(jboolean, jboolean);
-  virtual jboolean weakCompareAndSet(jboolean, jboolean);
-  virtual void set(jboolean);
-  virtual void lazySet(jboolean);
-  virtual jboolean getAndSet(jboolean);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4654671469794556979LL;
-  static ::sun::misc::Unsafe * unsafe;
-  static jlong valueOffset;
-  volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicBoolean__
diff --git a/libjava/java/util/concurrent/atomic/AtomicInteger.h b/libjava/java/util/concurrent/atomic/AtomicInteger.h
deleted file mode 100644
index 286aff1d003..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicInteger.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicInteger__
-#define __java_util_concurrent_atomic_AtomicInteger__
-
-#pragma interface
-
-#include <java/lang/Number.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicInteger : public ::java::lang::Number
-{
-
-public:
-  AtomicInteger(jint);
-  AtomicInteger();
-  virtual jint get();
-  virtual void set(jint);
-  virtual void lazySet(jint);
-  virtual jint getAndSet(jint);
-  virtual jboolean compareAndSet(jint, jint);
-  virtual jboolean weakCompareAndSet(jint, jint);
-  virtual jint getAndIncrement();
-  virtual jint getAndDecrement();
-  virtual jint getAndAdd(jint);
-  virtual jint incrementAndGet();
-  virtual jint decrementAndGet();
-  virtual jint addAndGet(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint intValue();
-  virtual jlong longValue();
-  virtual jfloat floatValue();
-  virtual jdouble doubleValue();
-private:
-  static const jlong serialVersionUID = 6214790243416807050LL;
-  static ::sun::misc::Unsafe * unsafe;
-  static jlong valueOffset;
-  volatile jint __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicInteger__
diff --git a/libjava/java/util/concurrent/atomic/AtomicIntegerArray.h b/libjava/java/util/concurrent/atomic/AtomicIntegerArray.h
deleted file mode 100644
index f8db2173f1d..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicIntegerArray.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicIntegerArray__
-#define __java_util_concurrent_atomic_AtomicIntegerArray__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicIntegerArray : public ::java::lang::Object
-{
-
-  jlong rawIndex(jint);
-public:
-  AtomicIntegerArray(jint);
-  AtomicIntegerArray(JArray< jint > *);
-  virtual jint length();
-  virtual jint get(jint);
-  virtual void set(jint, jint);
-  virtual void lazySet(jint, jint);
-  virtual jint getAndSet(jint, jint);
-  virtual jboolean compareAndSet(jint, jint, jint);
-  virtual jboolean weakCompareAndSet(jint, jint, jint);
-  virtual jint getAndIncrement(jint);
-  virtual jint getAndDecrement(jint);
-  virtual jint getAndAdd(jint, jint);
-  virtual jint incrementAndGet(jint);
-  virtual jint decrementAndGet(jint);
-  virtual jint addAndGet(jint, jint);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 2862133569453604235LL;
-  static ::sun::misc::Unsafe * unsafe;
-  static jint base;
-  static jint scale;
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) array;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicIntegerArray__
diff --git a/libjava/java/util/concurrent/atomic/AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl.h b/libjava/java/util/concurrent/atomic/AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl.h
deleted file mode 100644
index ba2b7a5dc1a..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl__
-#define __java_util_concurrent_atomic_AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl__
-
-#pragma interface
-
-#include <java/util/concurrent/atomic/AtomicIntegerFieldUpdater.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl : public ::java::util::concurrent::atomic::AtomicIntegerFieldUpdater
-{
-
-public: // actually package-private
-  AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl(::java::lang::Class *, ::java::lang::String *);
-private:
-  void fullCheck(::java::lang::Object *);
-public:
-  virtual jboolean compareAndSet(::java::lang::Object *, jint, jint);
-  virtual jboolean weakCompareAndSet(::java::lang::Object *, jint, jint);
-  virtual void set(::java::lang::Object *, jint);
-  virtual void lazySet(::java::lang::Object *, jint);
-  virtual jint get(::java::lang::Object *);
-private:
-  void ensureProtectedAccess(::java::lang::Object *);
-  static ::sun::misc::Unsafe * unsafe;
-  jlong __attribute__((aligned(__alignof__( ::java::util::concurrent::atomic::AtomicIntegerFieldUpdater)))) offset;
-  ::java::lang::Class * tclass;
-  ::java::lang::Class * cclass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl__
diff --git a/libjava/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.h b/libjava/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.h
deleted file mode 100644
index e72055006cc..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicIntegerFieldUpdater__
-#define __java_util_concurrent_atomic_AtomicIntegerFieldUpdater__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::atomic::AtomicIntegerFieldUpdater : public ::java::lang::Object
-{
-
-public:
-  static ::java::util::concurrent::atomic::AtomicIntegerFieldUpdater * newUpdater(::java::lang::Class *, ::java::lang::String *);
-public: // actually protected
-  AtomicIntegerFieldUpdater();
-public:
-  virtual jboolean compareAndSet(::java::lang::Object *, jint, jint) = 0;
-  virtual jboolean weakCompareAndSet(::java::lang::Object *, jint, jint) = 0;
-  virtual void set(::java::lang::Object *, jint) = 0;
-  virtual void lazySet(::java::lang::Object *, jint) = 0;
-  virtual jint get(::java::lang::Object *) = 0;
-  virtual jint getAndSet(::java::lang::Object *, jint);
-  virtual jint getAndIncrement(::java::lang::Object *);
-  virtual jint getAndDecrement(::java::lang::Object *);
-  virtual jint getAndAdd(::java::lang::Object *, jint);
-  virtual jint incrementAndGet(::java::lang::Object *);
-  virtual jint decrementAndGet(::java::lang::Object *);
-  virtual jint addAndGet(::java::lang::Object *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicIntegerFieldUpdater__
diff --git a/libjava/java/util/concurrent/atomic/AtomicLong.h b/libjava/java/util/concurrent/atomic/AtomicLong.h
deleted file mode 100644
index c70a4e6d839..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicLong.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicLong__
-#define __java_util_concurrent_atomic_AtomicLong__
-
-#pragma interface
-
-#include <java/lang/Number.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicLong : public ::java::lang::Number
-{
-
-  static jboolean VMSupportsCS8();
-public:
-  AtomicLong(jlong);
-  AtomicLong();
-  virtual jlong get();
-  virtual void set(jlong);
-  virtual void lazySet(jlong);
-  virtual jlong getAndSet(jlong);
-  virtual jboolean compareAndSet(jlong, jlong);
-  virtual jboolean weakCompareAndSet(jlong, jlong);
-  virtual jlong getAndIncrement();
-  virtual jlong getAndDecrement();
-  virtual jlong getAndAdd(jlong);
-  virtual jlong incrementAndGet();
-  virtual jlong decrementAndGet();
-  virtual jlong addAndGet(jlong);
-  virtual ::java::lang::String * toString();
-  virtual jint intValue();
-  virtual jlong longValue();
-  virtual jfloat floatValue();
-  virtual jdouble doubleValue();
-private:
-  static const jlong serialVersionUID = 1927816293512124184LL;
-  static ::sun::misc::Unsafe * unsafe;
-  static jlong valueOffset;
-public: // actually package-private
-  static jboolean VM_SUPPORTS_LONG_CAS;
-private:
-  volatile jlong __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicLong__
diff --git a/libjava/java/util/concurrent/atomic/AtomicLongArray.h b/libjava/java/util/concurrent/atomic/AtomicLongArray.h
deleted file mode 100644
index 797c6094368..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicLongArray.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicLongArray__
-#define __java_util_concurrent_atomic_AtomicLongArray__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicLongArray : public ::java::lang::Object
-{
-
-  jlong rawIndex(jint);
-public:
-  AtomicLongArray(jint);
-  AtomicLongArray(JArray< jlong > *);
-  virtual jint length();
-  virtual jlong get(jint);
-  virtual void set(jint, jlong);
-  virtual void lazySet(jint, jlong);
-  virtual jlong getAndSet(jint, jlong);
-  virtual jboolean compareAndSet(jint, jlong, jlong);
-  virtual jboolean weakCompareAndSet(jint, jlong, jlong);
-  virtual jlong getAndIncrement(jint);
-  virtual jlong getAndDecrement(jint);
-  virtual jlong getAndAdd(jint, jlong);
-  virtual jlong incrementAndGet(jint);
-  virtual jlong decrementAndGet(jint);
-  virtual jlong addAndGet(jint, jlong);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -2308431214976778248LL;
-  static ::sun::misc::Unsafe * unsafe;
-  static jint base;
-  static jint scale;
-  JArray< jlong > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) array;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicLongArray__
diff --git a/libjava/java/util/concurrent/atomic/AtomicLongFieldUpdater$CASUpdater.h b/libjava/java/util/concurrent/atomic/AtomicLongFieldUpdater$CASUpdater.h
deleted file mode 100644
index 465b5333eb1..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicLongFieldUpdater$CASUpdater.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicLongFieldUpdater$CASUpdater__
-#define __java_util_concurrent_atomic_AtomicLongFieldUpdater$CASUpdater__
-
-#pragma interface
-
-#include <java/util/concurrent/atomic/AtomicLongFieldUpdater.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicLongFieldUpdater$CASUpdater : public ::java::util::concurrent::atomic::AtomicLongFieldUpdater
-{
-
-public: // actually package-private
-  AtomicLongFieldUpdater$CASUpdater(::java::lang::Class *, ::java::lang::String *);
-private:
-  void fullCheck(::java::lang::Object *);
-public:
-  virtual jboolean compareAndSet(::java::lang::Object *, jlong, jlong);
-  virtual jboolean weakCompareAndSet(::java::lang::Object *, jlong, jlong);
-  virtual void set(::java::lang::Object *, jlong);
-  virtual void lazySet(::java::lang::Object *, jlong);
-  virtual jlong get(::java::lang::Object *);
-private:
-  void ensureProtectedAccess(::java::lang::Object *);
-  static ::sun::misc::Unsafe * unsafe;
-  jlong __attribute__((aligned(__alignof__( ::java::util::concurrent::atomic::AtomicLongFieldUpdater)))) offset;
-  ::java::lang::Class * tclass;
-  ::java::lang::Class * cclass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicLongFieldUpdater$CASUpdater__
diff --git a/libjava/java/util/concurrent/atomic/AtomicLongFieldUpdater$LockedUpdater.h b/libjava/java/util/concurrent/atomic/AtomicLongFieldUpdater$LockedUpdater.h
deleted file mode 100644
index f13fb1817bb..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicLongFieldUpdater$LockedUpdater.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicLongFieldUpdater$LockedUpdater__
-#define __java_util_concurrent_atomic_AtomicLongFieldUpdater$LockedUpdater__
-
-#pragma interface
-
-#include <java/util/concurrent/atomic/AtomicLongFieldUpdater.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicLongFieldUpdater$LockedUpdater : public ::java::util::concurrent::atomic::AtomicLongFieldUpdater
-{
-
-public: // actually package-private
-  AtomicLongFieldUpdater$LockedUpdater(::java::lang::Class *, ::java::lang::String *);
-private:
-  void fullCheck(::java::lang::Object *);
-public:
-  virtual jboolean compareAndSet(::java::lang::Object *, jlong, jlong);
-  virtual jboolean weakCompareAndSet(::java::lang::Object *, jlong, jlong);
-  virtual void set(::java::lang::Object *, jlong);
-  virtual void lazySet(::java::lang::Object *, jlong);
-  virtual jlong get(::java::lang::Object *);
-private:
-  void ensureProtectedAccess(::java::lang::Object *);
-  static ::sun::misc::Unsafe * unsafe;
-  jlong __attribute__((aligned(__alignof__( ::java::util::concurrent::atomic::AtomicLongFieldUpdater)))) offset;
-  ::java::lang::Class * tclass;
-  ::java::lang::Class * cclass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicLongFieldUpdater$LockedUpdater__
diff --git a/libjava/java/util/concurrent/atomic/AtomicLongFieldUpdater.h b/libjava/java/util/concurrent/atomic/AtomicLongFieldUpdater.h
deleted file mode 100644
index 4fb8137d1a7..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicLongFieldUpdater.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicLongFieldUpdater__
-#define __java_util_concurrent_atomic_AtomicLongFieldUpdater__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::atomic::AtomicLongFieldUpdater : public ::java::lang::Object
-{
-
-public:
-  static ::java::util::concurrent::atomic::AtomicLongFieldUpdater * newUpdater(::java::lang::Class *, ::java::lang::String *);
-public: // actually protected
-  AtomicLongFieldUpdater();
-public:
-  virtual jboolean compareAndSet(::java::lang::Object *, jlong, jlong) = 0;
-  virtual jboolean weakCompareAndSet(::java::lang::Object *, jlong, jlong) = 0;
-  virtual void set(::java::lang::Object *, jlong) = 0;
-  virtual void lazySet(::java::lang::Object *, jlong) = 0;
-  virtual jlong get(::java::lang::Object *) = 0;
-  virtual jlong getAndSet(::java::lang::Object *, jlong);
-  virtual jlong getAndIncrement(::java::lang::Object *);
-  virtual jlong getAndDecrement(::java::lang::Object *);
-  virtual jlong getAndAdd(::java::lang::Object *, jlong);
-  virtual jlong incrementAndGet(::java::lang::Object *);
-  virtual jlong decrementAndGet(::java::lang::Object *);
-  virtual jlong addAndGet(::java::lang::Object *, jlong);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicLongFieldUpdater__
diff --git a/libjava/java/util/concurrent/atomic/AtomicMarkableReference$ReferenceBooleanPair.h b/libjava/java/util/concurrent/atomic/AtomicMarkableReference$ReferenceBooleanPair.h
deleted file mode 100644
index 499b73b521b..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicMarkableReference$ReferenceBooleanPair.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicMarkableReference$ReferenceBooleanPair__
-#define __java_util_concurrent_atomic_AtomicMarkableReference$ReferenceBooleanPair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::atomic::AtomicMarkableReference$ReferenceBooleanPair : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AtomicMarkableReference$ReferenceBooleanPair(::java::lang::Object *, jboolean);
-  static ::java::lang::Object * access$0(::java::util::concurrent::atomic::AtomicMarkableReference$ReferenceBooleanPair *);
-  static jboolean access$1(::java::util::concurrent::atomic::AtomicMarkableReference$ReferenceBooleanPair *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) reference;
-  jboolean bit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicMarkableReference$ReferenceBooleanPair__
diff --git a/libjava/java/util/concurrent/atomic/AtomicMarkableReference.h b/libjava/java/util/concurrent/atomic/AtomicMarkableReference.h
deleted file mode 100644
index fe97809c558..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicMarkableReference.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicMarkableReference__
-#define __java_util_concurrent_atomic_AtomicMarkableReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::atomic::AtomicMarkableReference : public ::java::lang::Object
-{
-
-public:
-  AtomicMarkableReference(::java::lang::Object *, jboolean);
-  virtual ::java::lang::Object * getReference();
-  virtual jboolean isMarked();
-  virtual ::java::lang::Object * get(JArray< jboolean > *);
-  virtual jboolean weakCompareAndSet(::java::lang::Object *, ::java::lang::Object *, jboolean, jboolean);
-  virtual jboolean compareAndSet(::java::lang::Object *, ::java::lang::Object *, jboolean, jboolean);
-  virtual void set(::java::lang::Object *, jboolean);
-  virtual jboolean attemptMark(::java::lang::Object *, jboolean);
-private:
-  ::java::util::concurrent::atomic::AtomicReference * __attribute__((aligned(__alignof__( ::java::lang::Object)))) atomicRef;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicMarkableReference__
diff --git a/libjava/java/util/concurrent/atomic/AtomicReference.h b/libjava/java/util/concurrent/atomic/AtomicReference.h
deleted file mode 100644
index e8862e8433f..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicReference.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicReference__
-#define __java_util_concurrent_atomic_AtomicReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicReference : public ::java::lang::Object
-{
-
-public:
-  AtomicReference(::java::lang::Object *);
-  AtomicReference();
-  virtual ::java::lang::Object * get();
-  virtual void set(::java::lang::Object *);
-  virtual void lazySet(::java::lang::Object *);
-  virtual jboolean compareAndSet(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean weakCompareAndSet(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getAndSet(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1848883965231344442LL;
-  static ::sun::misc::Unsafe * unsafe;
-  static jlong valueOffset;
-  volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicReference__
diff --git a/libjava/java/util/concurrent/atomic/AtomicReferenceArray.h b/libjava/java/util/concurrent/atomic/AtomicReferenceArray.h
deleted file mode 100644
index 4715f0cbaea..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicReferenceArray.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicReferenceArray__
-#define __java_util_concurrent_atomic_AtomicReferenceArray__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicReferenceArray : public ::java::lang::Object
-{
-
-  jlong rawIndex(jint);
-public:
-  AtomicReferenceArray(jint);
-  AtomicReferenceArray(JArray< ::java::lang::Object * > *);
-  virtual jint length();
-  virtual ::java::lang::Object * get(jint);
-  virtual void set(jint, ::java::lang::Object *);
-  virtual void lazySet(jint, ::java::lang::Object *);
-  virtual ::java::lang::Object * getAndSet(jint, ::java::lang::Object *);
-  virtual jboolean compareAndSet(jint, ::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean weakCompareAndSet(jint, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6209656149925076980LL;
-  static ::sun::misc::Unsafe * unsafe;
-  static jint base;
-  static jint scale;
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) array;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicReferenceArray__
diff --git a/libjava/java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl.h b/libjava/java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl.h
deleted file mode 100644
index e74a4507ee6..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl__
-#define __java_util_concurrent_atomic_AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl__
-
-#pragma interface
-
-#include <java/util/concurrent/atomic/AtomicReferenceFieldUpdater.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::atomic::AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl : public ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater
-{
-
-public: // actually package-private
-  AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl(::java::lang::Class *, ::java::lang::Class *, ::java::lang::String *);
-  void targetCheck(::java::lang::Object *);
-  void updateCheck(::java::lang::Object *, ::java::lang::Object *);
-public:
-  jboolean compareAndSet(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-  jboolean weakCompareAndSet(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *);
-  void set(::java::lang::Object *, ::java::lang::Object *);
-  void lazySet(::java::lang::Object *, ::java::lang::Object *);
-  ::java::lang::Object * get(::java::lang::Object *);
-private:
-  void ensureProtectedAccess(::java::lang::Object *);
-  static ::sun::misc::Unsafe * unsafe;
-  jlong __attribute__((aligned(__alignof__( ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater)))) offset;
-  ::java::lang::Class * tclass;
-  ::java::lang::Class * vclass;
-  ::java::lang::Class * cclass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl__
diff --git a/libjava/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.h b/libjava/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.h
deleted file mode 100644
index d7e91e977e0..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicReferenceFieldUpdater__
-#define __java_util_concurrent_atomic_AtomicReferenceFieldUpdater__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::atomic::AtomicReferenceFieldUpdater : public ::java::lang::Object
-{
-
-public:
-  static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * newUpdater(::java::lang::Class *, ::java::lang::Class *, ::java::lang::String *);
-public: // actually protected
-  AtomicReferenceFieldUpdater();
-public:
-  virtual jboolean compareAndSet(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean weakCompareAndSet(::java::lang::Object *, ::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void set(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void lazySet(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * get(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getAndSet(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicReferenceFieldUpdater__
diff --git a/libjava/java/util/concurrent/atomic/AtomicStampedReference$ReferenceIntegerPair.h b/libjava/java/util/concurrent/atomic/AtomicStampedReference$ReferenceIntegerPair.h
deleted file mode 100644
index d76e45b1d95..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicStampedReference$ReferenceIntegerPair.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicStampedReference$ReferenceIntegerPair__
-#define __java_util_concurrent_atomic_AtomicStampedReference$ReferenceIntegerPair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::atomic::AtomicStampedReference$ReferenceIntegerPair : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AtomicStampedReference$ReferenceIntegerPair(::java::lang::Object *, jint);
-  static ::java::lang::Object * access$0(::java::util::concurrent::atomic::AtomicStampedReference$ReferenceIntegerPair *);
-  static jint access$1(::java::util::concurrent::atomic::AtomicStampedReference$ReferenceIntegerPair *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) reference;
-  jint integer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicStampedReference$ReferenceIntegerPair__
diff --git a/libjava/java/util/concurrent/atomic/AtomicStampedReference.h b/libjava/java/util/concurrent/atomic/AtomicStampedReference.h
deleted file mode 100644
index 8e116929900..00000000000
--- a/libjava/java/util/concurrent/atomic/AtomicStampedReference.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_atomic_AtomicStampedReference__
-#define __java_util_concurrent_atomic_AtomicStampedReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::concurrent::atomic::AtomicStampedReference : public ::java::lang::Object
-{
-
-public:
-  AtomicStampedReference(::java::lang::Object *, jint);
-  virtual ::java::lang::Object * getReference();
-  virtual jint getStamp();
-  virtual ::java::lang::Object * get(JArray< jint > *);
-  virtual jboolean weakCompareAndSet(::java::lang::Object *, ::java::lang::Object *, jint, jint);
-  virtual jboolean compareAndSet(::java::lang::Object *, ::java::lang::Object *, jint, jint);
-  virtual void set(::java::lang::Object *, jint);
-  virtual jboolean attemptStamp(::java::lang::Object *, jint);
-private:
-  ::java::util::concurrent::atomic::AtomicReference * __attribute__((aligned(__alignof__( ::java::lang::Object)))) atomicRef;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_atomic_AtomicStampedReference__
diff --git a/libjava/java/util/concurrent/locks/AbstractOwnableSynchronizer.h b/libjava/java/util/concurrent/locks/AbstractOwnableSynchronizer.h
deleted file mode 100644
index 8a14257c9df..00000000000
--- a/libjava/java/util/concurrent/locks/AbstractOwnableSynchronizer.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_AbstractOwnableSynchronizer__
-#define __java_util_concurrent_locks_AbstractOwnableSynchronizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::AbstractOwnableSynchronizer : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractOwnableSynchronizer();
-  virtual void setExclusiveOwnerThread(::java::lang::Thread *);
-  virtual ::java::lang::Thread * getExclusiveOwnerThread();
-private:
-  static const jlong serialVersionUID = 3737899427754241961LL;
-  ::java::lang::Thread * __attribute__((aligned(__alignof__( ::java::lang::Object)))) exclusiveOwnerThread;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_AbstractOwnableSynchronizer__
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.h b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.h
deleted file mode 100644
index 123ab81b563..00000000000
--- a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_AbstractQueuedLongSynchronizer$ConditionObject__
-#define __java_util_concurrent_locks_AbstractQueuedLongSynchronizer$ConditionObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::AbstractQueuedLongSynchronizer$ConditionObject : public ::java::lang::Object
-{
-
-public:
-  AbstractQueuedLongSynchronizer$ConditionObject(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer *);
-private:
-  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * addConditionWaiter();
-  void doSignal(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  void doSignalAll(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  jboolean isOnConditionQueue(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  void unlinkCancelledWaiter(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-public:
-  virtual void signal();
-  virtual void signalAll();
-  virtual void awaitUninterruptibly();
-private:
-  jint checkInterruptWhileWaiting(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  void reportInterruptAfterWait(jint);
-public:
-  virtual void await();
-  virtual jlong awaitNanos(jlong);
-  virtual jboolean awaitUntil(::java::util::Date *);
-  virtual jboolean await(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually package-private
-  virtual jboolean isOwnedBy(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer *);
-public: // actually protected
-  virtual jboolean hasWaiters();
-  virtual jint getWaitQueueLength();
-  virtual ::java::util::Collection * getWaitingThreads();
-private:
-  static const jlong serialVersionUID = 1173984872572414699LL;
-  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) firstWaiter;
-  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * lastWaiter;
-  static const jint REINTERRUPT = 1;
-  static const jint THROW_IE = -1;
-public: // actually package-private
-  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_AbstractQueuedLongSynchronizer$ConditionObject__
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h
deleted file mode 100644
index 423f2a06356..00000000000
--- a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_AbstractQueuedLongSynchronizer$Node__
-#define __java_util_concurrent_locks_AbstractQueuedLongSynchronizer$Node__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node : public ::java::lang::Object
-{
-
-public: // actually package-private
-  jboolean isShared();
-  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * predecessor();
-  AbstractQueuedLongSynchronizer$Node();
-  AbstractQueuedLongSynchronizer$Node(::java::lang::Thread *, ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  AbstractQueuedLongSynchronizer$Node(::java::lang::Thread *, jint);
-  static const jint CANCELLED = 1;
-  static const jint SIGNAL = -1;
-  static const jint CONDITION = -2;
-  static ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * SHARED;
-  static ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * EXCLUSIVE;
-  volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus;
-  volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * prev;
-  volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * next;
-  volatile ::java::lang::Thread * thread;
-  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * nextWaiter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_AbstractQueuedLongSynchronizer$Node__
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h
deleted file mode 100644
index 1e95c3d34b8..00000000000
--- a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_AbstractQueuedLongSynchronizer__
-#define __java_util_concurrent_locks_AbstractQueuedLongSynchronizer__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/AbstractOwnableSynchronizer.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::locks::AbstractQueuedLongSynchronizer : public ::java::util::concurrent::locks::AbstractOwnableSynchronizer
-{
-
-public: // actually protected
-  AbstractQueuedLongSynchronizer();
-  virtual jlong getState();
-  virtual void setState(jlong);
-  virtual jboolean compareAndSetState(jlong, jlong);
-private:
-  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * enq(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * addWaiter(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  void setHead(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  void unparkSuccessor(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  void setHeadAndPropagate(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *, jlong);
-  void cancelAcquire(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  static jboolean shouldParkAfterFailedAcquire(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *, ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  static void selfInterrupt();
-  jboolean parkAndCheckInterrupt();
-public: // actually package-private
-  virtual jboolean acquireQueued(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *, jlong);
-private:
-  void doAcquireInterruptibly(jlong);
-  jboolean doAcquireNanos(jlong, jlong);
-  void doAcquireShared(jlong);
-  void doAcquireSharedInterruptibly(jlong);
-  jboolean doAcquireSharedNanos(jlong, jlong);
-public: // actually protected
-  virtual jboolean tryAcquire(jlong);
-  virtual jboolean tryRelease(jlong);
-  virtual jlong tryAcquireShared(jlong);
-  virtual jboolean tryReleaseShared(jlong);
-  virtual jboolean isHeldExclusively();
-public:
-  virtual void acquire(jlong);
-  virtual void acquireInterruptibly(jlong);
-  virtual jboolean tryAcquireNanos(jlong, jlong);
-  virtual jboolean release(jlong);
-  virtual void acquireShared(jlong);
-  virtual void acquireSharedInterruptibly(jlong);
-  virtual jboolean tryAcquireSharedNanos(jlong, jlong);
-  virtual jboolean releaseShared(jlong);
-  virtual jboolean hasQueuedThreads();
-  virtual jboolean hasContended();
-  virtual ::java::lang::Thread * getFirstQueuedThread();
-private:
-  ::java::lang::Thread * fullGetFirstQueuedThread();
-public:
-  virtual jboolean isQueued(::java::lang::Thread *);
-public: // actually package-private
-  virtual jboolean apparentlyFirstQueuedIsExclusive();
-  virtual jboolean isFirst(::java::lang::Thread *);
-  virtual jboolean fullIsFirst(::java::lang::Thread *);
-public:
-  virtual jint getQueueLength();
-  virtual ::java::util::Collection * getQueuedThreads();
-  virtual ::java::util::Collection * getExclusiveQueuedThreads();
-  virtual ::java::util::Collection * getSharedQueuedThreads();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual jboolean isOnSyncQueue(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-private:
-  jboolean findNodeFromTail(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-public: // actually package-private
-  virtual jboolean transferForSignal(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  virtual jboolean transferAfterCancelledWait(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  virtual jlong fullyRelease(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-public:
-  virtual jboolean owns(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$ConditionObject *);
-  virtual jboolean hasWaiters(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$ConditionObject *);
-  virtual jint getWaitQueueLength(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$ConditionObject *);
-  virtual ::java::util::Collection * getWaitingThreads(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$ConditionObject *);
-private:
-  jboolean compareAndSetHead(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  jboolean compareAndSetTail(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *, ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *);
-  static jboolean compareAndSetWaitStatus(::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node *, jint, jint);
-public: // actually package-private
-  static void access$0();
-private:
-  static const jlong serialVersionUID = 7373984972572414692LL;
-  volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head;
-  volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * tail;
-  volatile jlong state;
-public: // actually package-private
-  static const jlong spinForTimeoutThreshold = 1000LL;
-private:
-  static ::sun::misc::Unsafe * unsafe;
-  static jlong stateOffset;
-  static jlong headOffset;
-  static jlong tailOffset;
-  static jlong waitStatusOffset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_AbstractQueuedLongSynchronizer__
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.h b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.h
deleted file mode 100644
index 67ca64f6e98..00000000000
--- a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_AbstractQueuedSynchronizer$ConditionObject__
-#define __java_util_concurrent_locks_AbstractQueuedSynchronizer$ConditionObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::AbstractQueuedSynchronizer$ConditionObject : public ::java::lang::Object
-{
-
-public:
-  AbstractQueuedSynchronizer$ConditionObject(::java::util::concurrent::locks::AbstractQueuedSynchronizer *);
-private:
-  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * addConditionWaiter();
-  void doSignal(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  void doSignalAll(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  jboolean isOnConditionQueue(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  void unlinkCancelledWaiter(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-public:
-  virtual void signal();
-  virtual void signalAll();
-  virtual void awaitUninterruptibly();
-private:
-  jint checkInterruptWhileWaiting(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  void reportInterruptAfterWait(jint);
-public:
-  virtual void await();
-  virtual jlong awaitNanos(jlong);
-  virtual jboolean awaitUntil(::java::util::Date *);
-  virtual jboolean await(jlong, ::java::util::concurrent::TimeUnit *);
-public: // actually package-private
-  virtual jboolean isOwnedBy(::java::util::concurrent::locks::AbstractQueuedSynchronizer *);
-public: // actually protected
-  virtual jboolean hasWaiters();
-  virtual jint getWaitQueueLength();
-  virtual ::java::util::Collection * getWaitingThreads();
-private:
-  static const jlong serialVersionUID = 1173984872572414699LL;
-  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) firstWaiter;
-  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * lastWaiter;
-  static const jint REINTERRUPT = 1;
-  static const jint THROW_IE = -1;
-public: // actually package-private
-  ::java::util::concurrent::locks::AbstractQueuedSynchronizer * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_AbstractQueuedSynchronizer$ConditionObject__
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h
deleted file mode 100644
index 0abbb8fd23a..00000000000
--- a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_AbstractQueuedSynchronizer$Node__
-#define __java_util_concurrent_locks_AbstractQueuedSynchronizer$Node__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::AbstractQueuedSynchronizer$Node : public ::java::lang::Object
-{
-
-public: // actually package-private
-  jboolean isShared();
-  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * predecessor();
-  AbstractQueuedSynchronizer$Node();
-  AbstractQueuedSynchronizer$Node(::java::lang::Thread *, ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  AbstractQueuedSynchronizer$Node(::java::lang::Thread *, jint);
-  static const jint CANCELLED = 1;
-  static const jint SIGNAL = -1;
-  static const jint CONDITION = -2;
-  static ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * SHARED;
-  static ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * EXCLUSIVE;
-  volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus;
-  volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * prev;
-  volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * next;
-  volatile ::java::lang::Thread * thread;
-  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * nextWaiter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_AbstractQueuedSynchronizer$Node__
diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h
deleted file mode 100644
index fc2b9df033d..00000000000
--- a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_AbstractQueuedSynchronizer__
-#define __java_util_concurrent_locks_AbstractQueuedSynchronizer__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/AbstractOwnableSynchronizer.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::locks::AbstractQueuedSynchronizer : public ::java::util::concurrent::locks::AbstractOwnableSynchronizer
-{
-
-public: // actually protected
-  AbstractQueuedSynchronizer();
-  virtual jint getState();
-  virtual void setState(jint);
-  virtual jboolean compareAndSetState(jint, jint);
-private:
-  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * enq(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * addWaiter(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  void setHead(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  void unparkSuccessor(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  void setHeadAndPropagate(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *, jint);
-  void cancelAcquire(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  static jboolean shouldParkAfterFailedAcquire(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *, ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  static void selfInterrupt();
-  jboolean parkAndCheckInterrupt();
-public: // actually package-private
-  virtual jboolean acquireQueued(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *, jint);
-private:
-  void doAcquireInterruptibly(jint);
-  jboolean doAcquireNanos(jint, jlong);
-  void doAcquireShared(jint);
-  void doAcquireSharedInterruptibly(jint);
-  jboolean doAcquireSharedNanos(jint, jlong);
-public: // actually protected
-  virtual jboolean tryAcquire(jint);
-  virtual jboolean tryRelease(jint);
-  virtual jint tryAcquireShared(jint);
-  virtual jboolean tryReleaseShared(jint);
-  virtual jboolean isHeldExclusively();
-public:
-  virtual void acquire(jint);
-  virtual void acquireInterruptibly(jint);
-  virtual jboolean tryAcquireNanos(jint, jlong);
-  virtual jboolean release(jint);
-  virtual void acquireShared(jint);
-  virtual void acquireSharedInterruptibly(jint);
-  virtual jboolean tryAcquireSharedNanos(jint, jlong);
-  virtual jboolean releaseShared(jint);
-  virtual jboolean hasQueuedThreads();
-  virtual jboolean hasContended();
-  virtual ::java::lang::Thread * getFirstQueuedThread();
-private:
-  ::java::lang::Thread * fullGetFirstQueuedThread();
-public:
-  virtual jboolean isQueued(::java::lang::Thread *);
-public: // actually package-private
-  virtual jboolean apparentlyFirstQueuedIsExclusive();
-  virtual jboolean isFirst(::java::lang::Thread *);
-  virtual jboolean fullIsFirst(::java::lang::Thread *);
-public:
-  virtual jint getQueueLength();
-  virtual ::java::util::Collection * getQueuedThreads();
-  virtual ::java::util::Collection * getExclusiveQueuedThreads();
-  virtual ::java::util::Collection * getSharedQueuedThreads();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  virtual jboolean isOnSyncQueue(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-private:
-  jboolean findNodeFromTail(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-public: // actually package-private
-  virtual jboolean transferForSignal(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  virtual jboolean transferAfterCancelledWait(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  virtual jint fullyRelease(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-public:
-  virtual jboolean owns(::java::util::concurrent::locks::AbstractQueuedSynchronizer$ConditionObject *);
-  virtual jboolean hasWaiters(::java::util::concurrent::locks::AbstractQueuedSynchronizer$ConditionObject *);
-  virtual jint getWaitQueueLength(::java::util::concurrent::locks::AbstractQueuedSynchronizer$ConditionObject *);
-  virtual ::java::util::Collection * getWaitingThreads(::java::util::concurrent::locks::AbstractQueuedSynchronizer$ConditionObject *);
-private:
-  jboolean compareAndSetHead(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  jboolean compareAndSetTail(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *, ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *);
-  static jboolean compareAndSetWaitStatus(::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node *, jint, jint);
-public: // actually package-private
-  static void access$0();
-private:
-  static const jlong serialVersionUID = 7373984972572414691LL;
-  volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head;
-  volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * tail;
-  volatile jint state;
-public: // actually package-private
-  static const jlong spinForTimeoutThreshold = 1000LL;
-private:
-  static ::sun::misc::Unsafe * unsafe;
-  static jlong stateOffset;
-  static jlong headOffset;
-  static jlong tailOffset;
-  static jlong waitStatusOffset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_AbstractQueuedSynchronizer__
diff --git a/libjava/java/util/concurrent/locks/Condition.h b/libjava/java/util/concurrent/locks/Condition.h
deleted file mode 100644
index 141a4e919cd..00000000000
--- a/libjava/java/util/concurrent/locks/Condition.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_Condition__
-#define __java_util_concurrent_locks_Condition__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::Condition : public ::java::lang::Object
-{
-
-public:
-  virtual void await() = 0;
-  virtual void awaitUninterruptibly() = 0;
-  virtual jlong awaitNanos(jlong) = 0;
-  virtual jboolean await(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual jboolean awaitUntil(::java::util::Date *) = 0;
-  virtual void signal() = 0;
-  virtual void signalAll() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_locks_Condition__
diff --git a/libjava/java/util/concurrent/locks/Lock.h b/libjava/java/util/concurrent/locks/Lock.h
deleted file mode 100644
index b00f601e71d..00000000000
--- a/libjava/java/util/concurrent/locks/Lock.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_Lock__
-#define __java_util_concurrent_locks_Lock__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::Lock : public ::java::lang::Object
-{
-
-public:
-  virtual void lock() = 0;
-  virtual void lockInterruptibly() = 0;
-  virtual jboolean tryLock() = 0;
-  virtual jboolean tryLock(jlong, ::java::util::concurrent::TimeUnit *) = 0;
-  virtual void unlock() = 0;
-  virtual ::java::util::concurrent::locks::Condition * newCondition() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_locks_Lock__
diff --git a/libjava/java/util/concurrent/locks/LockSupport.h b/libjava/java/util/concurrent/locks/LockSupport.h
deleted file mode 100644
index 15ef7306f8b..00000000000
--- a/libjava/java/util/concurrent/locks/LockSupport.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_LockSupport__
-#define __java_util_concurrent_locks_LockSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class java::util::concurrent::locks::LockSupport : public ::java::lang::Object
-{
-
-  LockSupport();
-  static void setBlocker(::java::lang::Thread *, ::java::lang::Object *);
-public:
-  static void unpark(::java::lang::Thread *);
-  static void park(::java::lang::Object *);
-  static void parkNanos(::java::lang::Object *, jlong);
-  static void parkUntil(::java::lang::Object *, jlong);
-  static ::java::lang::Object * getBlocker(::java::lang::Thread *);
-  static void park();
-  static void parkNanos(jlong);
-  static void parkUntil(jlong);
-private:
-  static ::sun::misc::Unsafe * unsafe;
-  static jlong parkBlockerOffset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_LockSupport__
diff --git a/libjava/java/util/concurrent/locks/ReadWriteLock.h b/libjava/java/util/concurrent/locks/ReadWriteLock.h
deleted file mode 100644
index 1f4ae2e7236..00000000000
--- a/libjava/java/util/concurrent/locks/ReadWriteLock.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReadWriteLock__
-#define __java_util_concurrent_locks_ReadWriteLock__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::ReadWriteLock : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::concurrent::locks::Lock * readLock() = 0;
-  virtual ::java::util::concurrent::locks::Lock * writeLock() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_concurrent_locks_ReadWriteLock__
diff --git a/libjava/java/util/concurrent/locks/ReentrantLock$FairSync.h b/libjava/java/util/concurrent/locks/ReentrantLock$FairSync.h
deleted file mode 100644
index d4268afcde8..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantLock$FairSync.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantLock$FairSync__
-#define __java_util_concurrent_locks_ReentrantLock$FairSync__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/ReentrantLock$Sync.h>
-
-class java::util::concurrent::locks::ReentrantLock$FairSync : public ::java::util::concurrent::locks::ReentrantLock$Sync
-{
-
-public: // actually package-private
-  ReentrantLock$FairSync();
-  void lock();
-public: // actually protected
-  jboolean tryAcquire(jint);
-private:
-  static const jlong serialVersionUID = -3000897897090466540LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantLock$FairSync__
diff --git a/libjava/java/util/concurrent/locks/ReentrantLock$NonfairSync.h b/libjava/java/util/concurrent/locks/ReentrantLock$NonfairSync.h
deleted file mode 100644
index 743a0bd75c0..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantLock$NonfairSync.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantLock$NonfairSync__
-#define __java_util_concurrent_locks_ReentrantLock$NonfairSync__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/ReentrantLock$Sync.h>
-
-class java::util::concurrent::locks::ReentrantLock$NonfairSync : public ::java::util::concurrent::locks::ReentrantLock$Sync
-{
-
-public: // actually package-private
-  ReentrantLock$NonfairSync();
-  void lock();
-public: // actually protected
-  jboolean tryAcquire(jint);
-private:
-  static const jlong serialVersionUID = 7316153563782823691LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantLock$NonfairSync__
diff --git a/libjava/java/util/concurrent/locks/ReentrantLock$Sync.h b/libjava/java/util/concurrent/locks/ReentrantLock$Sync.h
deleted file mode 100644
index b3656d0df53..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantLock$Sync.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantLock$Sync__
-#define __java_util_concurrent_locks_ReentrantLock$Sync__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/AbstractQueuedSynchronizer.h>
-
-class java::util::concurrent::locks::ReentrantLock$Sync : public ::java::util::concurrent::locks::AbstractQueuedSynchronizer
-{
-
-public: // actually package-private
-  ReentrantLock$Sync();
-  virtual void lock() = 0;
-  virtual jboolean nonfairTryAcquire(jint);
-public: // actually protected
-  virtual jboolean tryRelease(jint);
-  virtual jboolean isHeldExclusively();
-public: // actually package-private
-  virtual ::java::util::concurrent::locks::AbstractQueuedSynchronizer$ConditionObject * newCondition();
-  virtual ::java::lang::Thread * getOwner();
-  virtual jint getHoldCount();
-  virtual jboolean isLocked();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -5179523762034025860LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantLock$Sync__
diff --git a/libjava/java/util/concurrent/locks/ReentrantLock.h b/libjava/java/util/concurrent/locks/ReentrantLock.h
deleted file mode 100644
index 5cac4b27fa2..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantLock.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantLock__
-#define __java_util_concurrent_locks_ReentrantLock__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::ReentrantLock : public ::java::lang::Object
-{
-
-public:
-  ReentrantLock();
-  ReentrantLock(jboolean);
-  virtual void lock();
-  virtual void lockInterruptibly();
-  virtual jboolean tryLock();
-  virtual jboolean tryLock(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual void unlock();
-  virtual ::java::util::concurrent::locks::Condition * newCondition();
-  virtual jint getHoldCount();
-  virtual jboolean isHeldByCurrentThread();
-  virtual jboolean isLocked();
-  virtual jboolean isFair();
-public: // actually protected
-  virtual ::java::lang::Thread * getOwner();
-public:
-  virtual jboolean hasQueuedThreads();
-  virtual jboolean hasQueuedThread(::java::lang::Thread *);
-  virtual jint getQueueLength();
-public: // actually protected
-  virtual ::java::util::Collection * getQueuedThreads();
-public:
-  virtual jboolean hasWaiters(::java::util::concurrent::locks::Condition *);
-  virtual jint getWaitQueueLength(::java::util::concurrent::locks::Condition *);
-public: // actually protected
-  virtual ::java::util::Collection * getWaitingThreads(::java::util::concurrent::locks::Condition *);
-public:
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7373984872572414699LL;
-  ::java::util::concurrent::locks::ReentrantLock$Sync * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sync;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantLock__
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$FairSync.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$FairSync.h
deleted file mode 100644
index 05090b5b11c..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$FairSync.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantReadWriteLock$FairSync__
-#define __java_util_concurrent_locks_ReentrantReadWriteLock$FairSync__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/ReentrantReadWriteLock$Sync.h>
-
-class java::util::concurrent::locks::ReentrantReadWriteLock$FairSync : public ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync
-{
-
-public: // actually package-private
-  ReentrantReadWriteLock$FairSync();
-  jboolean writerShouldBlock(::java::lang::Thread *);
-  jboolean readerShouldBlock(::java::lang::Thread *);
-private:
-  static const jlong serialVersionUID = -2274990926593161451LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantReadWriteLock$FairSync__
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$NonfairSync.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$NonfairSync.h
deleted file mode 100644
index 29a565ae4e4..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$NonfairSync.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantReadWriteLock$NonfairSync__
-#define __java_util_concurrent_locks_ReentrantReadWriteLock$NonfairSync__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/ReentrantReadWriteLock$Sync.h>
-
-class java::util::concurrent::locks::ReentrantReadWriteLock$NonfairSync : public ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync
-{
-
-public: // actually package-private
-  ReentrantReadWriteLock$NonfairSync();
-  jboolean writerShouldBlock(::java::lang::Thread *);
-  jboolean readerShouldBlock(::java::lang::Thread *);
-private:
-  static const jlong serialVersionUID = -8159625535654395037LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantReadWriteLock$NonfairSync__
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$ReadLock.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$ReadLock.h
deleted file mode 100644
index 0f48a6cb895..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$ReadLock.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantReadWriteLock$ReadLock__
-#define __java_util_concurrent_locks_ReentrantReadWriteLock$ReadLock__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock : public ::java::lang::Object
-{
-
-public: // actually protected
-  ReentrantReadWriteLock$ReadLock(::java::util::concurrent::locks::ReentrantReadWriteLock *);
-public:
-  virtual void lock();
-  virtual void lockInterruptibly();
-  virtual jboolean tryLock();
-  virtual jboolean tryLock(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual void unlock();
-  virtual ::java::util::concurrent::locks::Condition * newCondition();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -5992448646407690164LL;
-  ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sync;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantReadWriteLock$ReadLock__
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$HoldCounter.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$HoldCounter.h
deleted file mode 100644
index 4813f0d8f2d..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$HoldCounter.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantReadWriteLock$Sync$HoldCounter__
-#define __java_util_concurrent_locks_ReentrantReadWriteLock$Sync$HoldCounter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ReentrantReadWriteLock$Sync$HoldCounter();
-  jint tryDecrement();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  jlong tid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantReadWriteLock$Sync$HoldCounter__
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h
deleted file mode 100644
index c9dedf0df50..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter__
-#define __java_util_concurrent_locks_ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter__
-
-#pragma interface
-
-#include <java/lang/ThreadLocal.h>
-
-class java::util::concurrent::locks::ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter : public ::java::lang::ThreadLocal
-{
-
-public: // actually package-private
-  ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter();
-public:
-  ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * target$initialValue();
-  ::java::lang::Object * initialValue();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter__
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync.h
deleted file mode 100644
index d1d43078f84..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantReadWriteLock$Sync__
-#define __java_util_concurrent_locks_ReentrantReadWriteLock$Sync__
-
-#pragma interface
-
-#include <java/util/concurrent/locks/AbstractQueuedSynchronizer.h>
-
-class java::util::concurrent::locks::ReentrantReadWriteLock$Sync : public ::java::util::concurrent::locks::AbstractQueuedSynchronizer
-{
-
-public: // actually package-private
-  static jint sharedCount(jint);
-  static jint exclusiveCount(jint);
-  ReentrantReadWriteLock$Sync();
-  virtual jboolean readerShouldBlock(::java::lang::Thread *) = 0;
-  virtual jboolean writerShouldBlock(::java::lang::Thread *) = 0;
-public: // actually protected
-  virtual jboolean tryRelease(jint);
-  virtual jboolean tryAcquire(jint);
-  virtual jboolean tryReleaseShared(jint);
-  virtual jint tryAcquireShared(jint);
-public: // actually package-private
-  virtual jint fullTryAcquireShared(::java::lang::Thread *);
-  virtual jboolean tryWriteLock();
-  virtual jboolean tryReadLock();
-public: // actually protected
-  virtual jboolean isHeldExclusively();
-public: // actually package-private
-  virtual ::java::util::concurrent::locks::AbstractQueuedSynchronizer$ConditionObject * newCondition();
-  virtual ::java::lang::Thread * getOwner();
-  virtual jint getReadLockCount();
-  virtual jboolean isWriteLocked();
-  virtual jint getWriteHoldCount();
-  virtual jint getReadHoldCount();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-public: // actually package-private
-  virtual jint getCount();
-private:
-  static const jlong serialVersionUID = 6317671515068378041LL;
-public: // actually package-private
-  static const jint SHARED_SHIFT = 16;
-  static const jint SHARED_UNIT = 65536;
-  static const jint MAX_COUNT = 65535;
-  static const jint EXCLUSIVE_MASK = 65535;
-  ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractQueuedSynchronizer)))) readHolds;
-  ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * cachedHoldCounter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantReadWriteLock$Sync__
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock.h
deleted file mode 100644
index 4e57d53c654..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantReadWriteLock$WriteLock__
-#define __java_util_concurrent_locks_ReentrantReadWriteLock$WriteLock__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock : public ::java::lang::Object
-{
-
-public: // actually protected
-  ReentrantReadWriteLock$WriteLock(::java::util::concurrent::locks::ReentrantReadWriteLock *);
-public:
-  virtual void lock();
-  virtual void lockInterruptibly();
-  virtual jboolean tryLock();
-  virtual jboolean tryLock(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual void unlock();
-  virtual ::java::util::concurrent::locks::Condition * newCondition();
-  virtual ::java::lang::String * toString();
-  virtual jboolean isHeldByCurrentThread();
-  virtual jint getHoldCount();
-private:
-  static const jlong serialVersionUID = -4992448646407690164LL;
-  ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sync;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantReadWriteLock$WriteLock__
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h
deleted file mode 100644
index 3bea3cc54a1..00000000000
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_concurrent_locks_ReentrantReadWriteLock__
-#define __java_util_concurrent_locks_ReentrantReadWriteLock__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::concurrent::locks::ReentrantReadWriteLock : public ::java::lang::Object
-{
-
-public:
-  ReentrantReadWriteLock();
-  ReentrantReadWriteLock(jboolean);
-  virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * target$writeLock();
-  virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * target$readLock();
-  virtual jboolean isFair();
-public: // actually protected
-  virtual ::java::lang::Thread * getOwner();
-public:
-  virtual jint getReadLockCount();
-  virtual jboolean isWriteLocked();
-  virtual jboolean isWriteLockedByCurrentThread();
-  virtual jint getWriteHoldCount();
-  virtual jint getReadHoldCount();
-public: // actually protected
-  virtual ::java::util::Collection * getQueuedWriterThreads();
-  virtual ::java::util::Collection * getQueuedReaderThreads();
-public:
-  virtual jboolean hasQueuedThreads();
-  virtual jboolean hasQueuedThread(::java::lang::Thread *);
-  virtual jint getQueueLength();
-public: // actually protected
-  virtual ::java::util::Collection * getQueuedThreads();
-public:
-  virtual jboolean hasWaiters(::java::util::concurrent::locks::Condition *);
-  virtual jint getWaitQueueLength(::java::util::concurrent::locks::Condition *);
-public: // actually protected
-  virtual ::java::util::Collection * getWaitingThreads(::java::util::concurrent::locks::Condition *);
-public:
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::concurrent::locks::Lock * readLock();
-  virtual ::java::util::concurrent::locks::Lock * writeLock();
-public: // actually package-private
-  static ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync * access$2(::java::util::concurrent::locks::ReentrantReadWriteLock *);
-private:
-  static const jlong serialVersionUID = -6992448646407690164LL;
-  ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * __attribute__((aligned(__alignof__( ::java::lang::Object)))) readerLock;
-  ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * writerLock;
-  ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync * sync;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_concurrent_locks_ReentrantReadWriteLock__
diff --git a/libjava/java/util/jar/Attributes$Name.h b/libjava/java/util/jar/Attributes$Name.h
deleted file mode 100644
index 867bcea7739..00000000000
--- a/libjava/java/util/jar/Attributes$Name.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_jar_Attributes$Name__
-#define __java_util_jar_Attributes$Name__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::jar::Attributes$Name : public ::java::lang::Object
-{
-
-public:
-  Attributes$Name(::java::lang::String *);
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  static ::java::util::jar::Attributes$Name * MANIFEST_VERSION;
-  static ::java::util::jar::Attributes$Name * SIGNATURE_VERSION;
-  static ::java::util::jar::Attributes$Name * CLASS_PATH;
-  static ::java::util::jar::Attributes$Name * MAIN_CLASS;
-  static ::java::util::jar::Attributes$Name * EXTENSION_LIST;
-  static ::java::util::jar::Attributes$Name * EXTENSION_NAME;
-  static ::java::util::jar::Attributes$Name * EXTENSION_INSTALLATION;
-  static ::java::util::jar::Attributes$Name * IMPLEMENTATION_TITLE;
-  static ::java::util::jar::Attributes$Name * IMPLEMENTATION_VERSION;
-  static ::java::util::jar::Attributes$Name * IMPLEMENTATION_VENDOR;
-  static ::java::util::jar::Attributes$Name * IMPLEMENTATION_VENDOR_ID;
-  static ::java::util::jar::Attributes$Name * IMPLEMENTATION_URL;
-  static ::java::util::jar::Attributes$Name * SPECIFICATION_TITLE;
-  static ::java::util::jar::Attributes$Name * SPECIFICATION_VERSION;
-  static ::java::util::jar::Attributes$Name * SPECIFICATION_VENDOR;
-  static ::java::util::jar::Attributes$Name * SEALED;
-  static ::java::util::jar::Attributes$Name * CONTENT_TYPE;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * origName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_jar_Attributes$Name__
diff --git a/libjava/java/util/jar/Attributes.h b/libjava/java/util/jar/Attributes.h
deleted file mode 100644
index 628be03df7f..00000000000
--- a/libjava/java/util/jar/Attributes.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_jar_Attributes__
-#define __java_util_jar_Attributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::jar::Attributes : public ::java::lang::Object
-{
-
-public:
-  Attributes();
-  Attributes(jint);
-  Attributes(::java::util::jar::Attributes *);
-  virtual ::java::lang::String * getValue(::java::lang::String *);
-  virtual ::java::lang::String * getValue(::java::util::jar::Attributes$Name *);
-  virtual ::java::lang::String * putValue(::java::lang::String *, ::java::lang::String *);
-private:
-  ::java::lang::String * putValue(::java::util::jar::Attributes$Name *, ::java::lang::String *);
-public:
-  virtual ::java::lang::Object * clone();
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::util::Set * keySet();
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::util::Collection * values();
-public: // actually protected
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) map;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_jar_Attributes__
diff --git a/libjava/java/util/jar/JarEntry.h b/libjava/java/util/jar/JarEntry.h
deleted file mode 100644
index c95ab948662..00000000000
--- a/libjava/java/util/jar/JarEntry.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_jar_JarEntry__
-#define __java_util_jar_JarEntry__
-
-#pragma interface
-
-#include <java/util/zip/ZipEntry.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::util::jar::JarEntry : public ::java::util::zip::ZipEntry
-{
-
-public:
-  JarEntry(::java::lang::String *);
-  JarEntry(::java::util::zip::ZipEntry *);
-  JarEntry(::java::util::jar::JarEntry *);
-  virtual ::java::util::jar::Attributes * getAttributes();
-  virtual JArray< ::java::security::cert::Certificate * > * getCertificates();
-public: // actually package-private
-  ::java::util::jar::Attributes * __attribute__((aligned(__alignof__( ::java::util::zip::ZipEntry)))) attr;
-  ::java::util::jar::JarFile * jarfile;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_jar_JarEntry__
diff --git a/libjava/java/util/jar/JarException.h b/libjava/java/util/jar/JarException.h
deleted file mode 100644
index 4ea6da37bfa..00000000000
--- a/libjava/java/util/jar/JarException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_jar_JarException__
-#define __java_util_jar_JarException__
-
-#pragma interface
-
-#include <java/util/zip/ZipException.h>
-
-class java::util::jar::JarException : public ::java::util::zip::ZipException
-{
-
-public:
-  JarException();
-  JarException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7159778400963954473LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_jar_JarException__
diff --git a/libjava/java/util/jar/JarFile$EntryInputStream.h b/libjava/java/util/jar/JarFile$EntryInputStream.h
deleted file mode 100644
index cf68dbf450c..00000000000
--- a/libjava/java/util/jar/JarFile$EntryInputStream.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_jar_JarFile$EntryInputStream__
-#define __java_util_jar_JarFile$EntryInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class MessageDigest;
-    }
-  }
-}
-
-class java::util::jar::JarFile$EntryInputStream : public ::java::io::FilterInputStream
-{
-
-public: // actually package-private
-  JarFile$EntryInputStream(::java::util::zip::ZipEntry *, ::java::io::InputStream *, ::java::util::jar::JarFile *);
-public:
-  virtual jboolean markSupported();
-  virtual void mark(jint);
-  virtual void reset();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jbyte > *);
-  virtual jlong skip(jlong);
-private:
-  void eof();
-  ::java::util::jar::JarFile * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) jarfile;
-  jlong length;
-  jlong pos;
-  ::java::util::zip::ZipEntry * entry;
-  JArray< JArray< jbyte > * > * hashes;
-  JArray< ::java::security::MessageDigest * > * md;
-  jboolean checked;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_jar_JarFile$EntryInputStream__
diff --git a/libjava/java/util/jar/JarFile$JarEnumeration.h b/libjava/java/util/jar/JarFile$JarEnumeration.h
deleted file mode 100644
index 8916b5bf14b..00000000000
--- a/libjava/java/util/jar/JarFile$JarEnumeration.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_jar_JarFile$JarEnumeration__
-#define __java_util_jar_JarFile$JarEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::jar::JarFile$JarEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JarFile$JarEnumeration(::java::util::Enumeration *, ::java::util::jar::JarFile *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::util::jar::JarEntry * target$nextElement();
-  virtual ::java::lang::Object * nextElement();
-private:
-  ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entries;
-  ::java::util::jar::JarFile * jarfile;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_jar_JarFile$JarEnumeration__
diff --git a/libjava/java/util/jar/JarFile.h b/libjava/java/util/jar/JarFile.h
deleted file mode 100644
index 081be76bf9b..00000000000
--- a/libjava/java/util/jar/JarFile.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_jar_JarFile__
-#define __java_util_jar_JarFile__
-
-#pragma interface
-
-#include <java/util/zip/ZipFile.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-        namespace pkcs
-        {
-            class SignerInfo;
-        }
-        namespace provider
-        {
-            class Gnu;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::util::jar::JarFile : public ::java::util::zip::ZipFile
-{
-
-public: // actually package-private
-  static void debug(::java::lang::Object *);
-public:
-  JarFile(::java::lang::String *);
-  JarFile(::java::lang::String *, jboolean);
-  JarFile(::java::io::File *);
-  JarFile(::java::io::File *, jboolean);
-  JarFile(::java::io::File *, jboolean, jint);
-private:
-  void verify();
-  ::java::util::jar::Manifest * readManifest();
-public:
-  virtual ::java::util::Enumeration * entries();
-  virtual ::java::util::zip::ZipEntry * getEntry(::java::lang::String *);
-  virtual ::java::io::InputStream * getInputStream(::java::util::zip::ZipEntry *);
-  virtual ::java::util::jar::JarEntry * getJarEntry(::java::lang::String *);
-  virtual ::java::util::jar::Manifest * getManifest();
-public: // actually package-private
-  virtual void readSignatures();
-private:
-  void verify(JArray< ::java::security::cert::Certificate * > *, ::gnu::java::security::pkcs::SignerInfo *, ::java::lang::String *, ::java::util::Set *);
-  jboolean verifyHashes(::java::lang::String *, ::java::util::jar::Attributes *, ::java::util::HashMap *);
-public:
-  static ::java::lang::String * MANIFEST_NAME;
-private:
-  static ::java::lang::String * META_INF;
-  static ::java::lang::String * PKCS7_DSA_SUFFIX;
-  static ::java::lang::String * PKCS7_RSA_SUFFIX;
-  static ::java::lang::String * DIGEST_KEY_SUFFIX;
-  static ::java::lang::String * SF_SUFFIX;
-public: // actually package-private
-  static ::gnu::java::security::provider::Gnu * provider;
-private:
-  static ::gnu::java::security::OID * MD2_OID;
-  static ::gnu::java::security::OID * MD4_OID;
-  static ::gnu::java::security::OID * MD5_OID;
-  static ::gnu::java::security::OID * SHA1_OID;
-  static ::gnu::java::security::OID * DSA_ENCRYPTION_OID;
-  static ::gnu::java::security::OID * RSA_ENCRYPTION_OID;
-  ::java::util::jar::Manifest * __attribute__((aligned(__alignof__( ::java::util::zip::ZipFile)))) manifest;
-public: // actually package-private
-  jboolean verify__;
-private:
-  jboolean manifestRead;
-public: // actually package-private
-  jboolean signaturesRead;
-  ::java::util::HashMap * verified;
-  ::java::util::HashMap * entryCerts;
-private:
-  ::java::util::HashMap * digestAlgorithms;
-public: // actually package-private
-  static jboolean DEBUG;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_jar_JarFile__
diff --git a/libjava/java/util/jar/JarInputStream.h b/libjava/java/util/jar/JarInputStream.h
deleted file mode 100644
index 7e4441d7e3a..00000000000
--- a/libjava/java/util/jar/JarInputStream.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_jar_JarInputStream__
-#define __java_util_jar_JarInputStream__
-
-#pragma interface
-
-#include <java/util/zip/ZipInputStream.h>
-#include <gcj/array.h>
-
-
-class java::util::jar::JarInputStream : public ::java::util::zip::ZipInputStream
-{
-
-public:
-  JarInputStream(::java::io::InputStream *);
-  JarInputStream(::java::io::InputStream *, jboolean);
-private:
-  void readManifest(jboolean);
-public: // actually protected
-  virtual ::java::util::zip::ZipEntry * createZipEntry(::java::lang::String *);
-public:
-  virtual ::java::util::jar::Manifest * getManifest();
-  virtual ::java::util::zip::ZipEntry * getNextEntry();
-  virtual ::java::util::jar::JarEntry * getNextJarEntry();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  ::java::util::jar::Manifest * __attribute__((aligned(__alignof__( ::java::util::zip::ZipInputStream)))) manifest;
-  ::java::util::jar::JarEntry * firstEntry;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_jar_JarInputStream__
diff --git a/libjava/java/util/jar/JarOutputStream.h b/libjava/java/util/jar/JarOutputStream.h
deleted file mode 100644
index 184f307c5a7..00000000000
--- a/libjava/java/util/jar/JarOutputStream.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_jar_JarOutputStream__
-#define __java_util_jar_JarOutputStream__
-
-#pragma interface
-
-#include <java/util/zip/ZipOutputStream.h>
-
-class java::util::jar::JarOutputStream : public ::java::util::zip::ZipOutputStream
-{
-
-public:
-  JarOutputStream(::java::io::OutputStream *);
-  JarOutputStream(::java::io::OutputStream *, ::java::util::jar::Manifest *);
-private:
-  void writeManifest(::java::util::jar::Manifest *);
-public:
-  virtual void putNextEntry(::java::util::zip::ZipEntry *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_jar_JarOutputStream__
diff --git a/libjava/java/util/jar/Manifest.h b/libjava/java/util/jar/Manifest.h
deleted file mode 100644
index b0f2e993230..00000000000
--- a/libjava/java/util/jar/Manifest.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_jar_Manifest__
-#define __java_util_jar_Manifest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::jar::Manifest : public ::java::lang::Object
-{
-
-public:
-  Manifest();
-  Manifest(::java::io::InputStream *);
-  Manifest(::java::util::jar::Manifest *);
-  virtual ::java::util::jar::Attributes * getMainAttributes();
-  virtual ::java::util::Map * getEntries();
-  virtual ::java::util::jar::Attributes * getAttributes(::java::lang::String *);
-  virtual void clear();
-  virtual void read(::java::io::InputStream *);
-  virtual void write(::java::io::OutputStream *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  ::java::util::jar::Attributes * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mainAttr;
-  ::java::util::Map * entries;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_jar_Manifest__
diff --git a/libjava/java/util/logging/ConsoleHandler.h b/libjava/java/util/logging/ConsoleHandler.h
deleted file mode 100644
index 0d1bbe02ddf..00000000000
--- a/libjava/java/util/logging/ConsoleHandler.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_ConsoleHandler__
-#define __java_util_logging_ConsoleHandler__
-
-#pragma interface
-
-#include <java/util/logging/StreamHandler.h>
-
-class java::util::logging::ConsoleHandler : public ::java::util::logging::StreamHandler
-{
-
-public:
-  ConsoleHandler();
-  virtual void close();
-  virtual void publish(::java::util::logging::LogRecord *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_ConsoleHandler__
diff --git a/libjava/java/util/logging/ErrorManager.h b/libjava/java/util/logging/ErrorManager.h
deleted file mode 100644
index e6c115e29d8..00000000000
--- a/libjava/java/util/logging/ErrorManager.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_ErrorManager__
-#define __java_util_logging_ErrorManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::logging::ErrorManager : public ::java::lang::Object
-{
-
-public:
-  ErrorManager();
-  virtual void error(::java::lang::String *, ::java::lang::Exception *, jint);
-  static const jint GENERIC_FAILURE = 0;
-  static const jint WRITE_FAILURE = 1;
-  static const jint FLUSH_FAILURE = 2;
-  static const jint CLOSE_FAILURE = 3;
-  static const jint OPEN_FAILURE = 4;
-  static const jint FORMAT_FAILURE = 5;
-private:
-  volatile jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) everUsed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_ErrorManager__
diff --git a/libjava/java/util/logging/FileHandler$ostr.h b/libjava/java/util/logging/FileHandler$ostr.h
deleted file mode 100644
index e34a3db8707..00000000000
--- a/libjava/java/util/logging/FileHandler$ostr.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_FileHandler$ostr__
-#define __java_util_logging_FileHandler$ostr__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-
-class java::util::logging::FileHandler$ostr : public ::java::io::FilterOutputStream
-{
-
-  FileHandler$ostr(::java::util::logging::FileHandler *, ::java::io::OutputStream *);
-public:
-  void write(jint);
-  void write(JArray< jbyte > *);
-  void write(JArray< jbyte > *, jint, jint);
-public: // actually package-private
-  FileHandler$ostr(::java::util::logging::FileHandler *, ::java::io::OutputStream *, ::java::util::logging::FileHandler$ostr *);
-  ::java::util::logging::FileHandler * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_FileHandler$ostr__
diff --git a/libjava/java/util/logging/FileHandler.h b/libjava/java/util/logging/FileHandler.h
deleted file mode 100644
index 16feec2b2c1..00000000000
--- a/libjava/java/util/logging/FileHandler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_FileHandler__
-#define __java_util_logging_FileHandler__
-
-#pragma interface
-
-#include <java/util/logging/StreamHandler.h>
-
-class java::util::logging::FileHandler : public ::java::util::logging::StreamHandler
-{
-
-public:
-  FileHandler();
-  FileHandler(::java::lang::String *);
-  FileHandler(::java::lang::String *, jboolean);
-  FileHandler(::java::lang::String *, jint, jint);
-  FileHandler(::java::lang::String *, jint, jint, jboolean);
-private:
-  ::java::io::OutputStream * createFileStream(::java::lang::String *, jint, jint, jboolean, jint);
-  static ::java::lang::String * replaceFileNameEscapes(::java::lang::String *, jint, jint, jint);
-public:
-  virtual void publish(::java::util::logging::LogRecord *);
-private:
-  void rotate();
-  static jboolean has(::java::lang::String *, jchar);
-  static ::java::lang::String * PROPERTY_PREFIX;
-  static ::java::lang::String * PATTERN_KEY;
-  static ::java::lang::String * DEFAULT_PATTERN;
-  static ::java::lang::String * LIMIT_KEY;
-  static const jint DEFAULT_LIMIT = 0;
-  static ::java::lang::String * COUNT_KEY;
-  static const jint DEFAULT_COUNT = 1;
-  static ::java::lang::String * APPEND_KEY;
-  static const jboolean DEFAULT_APPEND = 0;
-  jint __attribute__((aligned(__alignof__( ::java::util::logging::StreamHandler)))) limit;
-  jint count;
-  ::java::lang::String * pattern;
-  jboolean append;
-public: // actually package-private
-  jlong written;
-private:
-  ::java::util::LinkedList * logFiles;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_FileHandler__
diff --git a/libjava/java/util/logging/Filter.h b/libjava/java/util/logging/Filter.h
deleted file mode 100644
index 23b8ca6a1e5..00000000000
--- a/libjava/java/util/logging/Filter.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_Filter__
-#define __java_util_logging_Filter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::logging::Filter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isLoggable(::java::util::logging::LogRecord *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_logging_Filter__
diff --git a/libjava/java/util/logging/Formatter.h b/libjava/java/util/logging/Formatter.h
deleted file mode 100644
index def22454c6e..00000000000
--- a/libjava/java/util/logging/Formatter.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_Formatter__
-#define __java_util_logging_Formatter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::logging::Formatter : public ::java::lang::Object
-{
-
-public: // actually protected
-  Formatter();
-public:
-  virtual ::java::lang::String * format(::java::util::logging::LogRecord *) = 0;
-  virtual ::java::lang::String * getHead(::java::util::logging::Handler *);
-  virtual ::java::lang::String * getTail(::java::util::logging::Handler *);
-  virtual ::java::lang::String * formatMessage(::java::util::logging::LogRecord *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_Formatter__
diff --git a/libjava/java/util/logging/Handler.h b/libjava/java/util/logging/Handler.h
deleted file mode 100644
index 2c722be60d2..00000000000
--- a/libjava/java/util/logging/Handler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_Handler__
-#define __java_util_logging_Handler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::logging::Handler : public ::java::lang::Object
-{
-
-public: // actually protected
-  Handler();
-public:
-  virtual void publish(::java::util::logging::LogRecord *) = 0;
-  virtual void flush() = 0;
-  virtual void close() = 0;
-  virtual ::java::util::logging::Formatter * getFormatter();
-  virtual void setFormatter(::java::util::logging::Formatter *);
-  virtual ::java::lang::String * getEncoding();
-  virtual void setEncoding(::java::lang::String *);
-  virtual ::java::util::logging::Filter * getFilter();
-  virtual void setFilter(::java::util::logging::Filter *);
-  virtual ::java::util::logging::ErrorManager * getErrorManager();
-  virtual void setErrorManager(::java::util::logging::ErrorManager *);
-public: // actually protected
-  virtual void reportError(::java::lang::String *, ::java::lang::Exception *, jint);
-public:
-  virtual ::java::util::logging::Level * getLevel();
-  virtual void setLevel(::java::util::logging::Level *);
-  virtual jboolean isLoggable(::java::util::logging::LogRecord *);
-public: // actually package-private
-  ::java::util::logging::Formatter * __attribute__((aligned(__alignof__( ::java::lang::Object)))) formatter;
-  ::java::util::logging::Filter * filter;
-  ::java::util::logging::Level * level;
-  ::java::util::logging::ErrorManager * errorManager;
-  ::java::lang::String * encoding;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_Handler__
diff --git a/libjava/java/util/logging/Level.h b/libjava/java/util/logging/Level.h
deleted file mode 100644
index 34f51609326..00000000000
--- a/libjava/java/util/logging/Level.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_Level__
-#define __java_util_logging_Level__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::logging::Level : public ::java::lang::Object
-{
-
-public: // actually protected
-  Level(::java::lang::String *, jint);
-  Level(::java::lang::String *, jint, ::java::lang::String *);
-private:
-  ::java::lang::Object * readResolve();
-public:
-  virtual ::java::lang::String * getResourceBundleName();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getLocalizedName();
-  virtual ::java::lang::String * toString();
-  virtual jint intValue();
-  static ::java::util::logging::Level * parse(::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-public: // actually package-private
-  virtual jboolean isStandardLevel();
-public:
-  static ::java::util::logging::Level * OFF;
-  static ::java::util::logging::Level * SEVERE;
-  static ::java::util::logging::Level * WARNING;
-  static ::java::util::logging::Level * INFO;
-  static ::java::util::logging::Level * CONFIG;
-  static ::java::util::logging::Level * FINE;
-  static ::java::util::logging::Level * FINER;
-  static ::java::util::logging::Level * FINEST;
-  static ::java::util::logging::Level * ALL;
-private:
-  static JArray< ::java::util::logging::Level * > * knownLevels;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jint value;
-  ::java::lang::String * resourceBundleName;
-public: // actually package-private
-  static const jlong serialVersionUID = -8176160795706313070LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_Level__
diff --git a/libjava/java/util/logging/LogManager$1.h b/libjava/java/util/logging/LogManager$1.h
deleted file mode 100644
index 1ef5738fefc..00000000000
--- a/libjava/java/util/logging/LogManager$1.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_LogManager$1__
-#define __java_util_logging_LogManager$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::logging::LogManager$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LogManager$1();
-public:
-  ::java::lang::String * getLoggerLevel(::java::lang::String *);
-  ::java::util::List * getLoggerNames();
-  ::java::lang::String * getParentLoggerName(::java::lang::String *);
-  void setLoggerLevel(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_LogManager$1__
diff --git a/libjava/java/util/logging/LogManager.h b/libjava/java/util/logging/LogManager.h
deleted file mode 100644
index f552d65d74d..00000000000
--- a/libjava/java/util/logging/LogManager.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_LogManager__
-#define __java_util_logging_LogManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-  }
-}
-
-class java::util::logging::LogManager : public ::java::lang::Object
-{
-
-public: // actually protected
-  LogManager();
-public:
-  static ::java::util::logging::LogManager * getLogManager();
-private:
-  static ::java::util::logging::LogManager * makeLogManager();
-  static void initLogManager();
-public:
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual jboolean addLogger(::java::util::logging::Logger *);
-private:
-  ::java::util::logging::Logger * findAncestor(::java::util::logging::Logger *);
-public:
-  virtual ::java::util::logging::Logger * getLogger(::java::lang::String *);
-  virtual ::java::util::Enumeration * getLoggerNames();
-  virtual void reset();
-  virtual void readConfiguration();
-  virtual void readConfiguration(::java::io::InputStream *);
-  virtual ::java::lang::String * getProperty(::java::lang::String *);
-public: // actually package-private
-  static jint getIntProperty(::java::lang::String *, jint);
-  static jint getIntPropertyClamped(::java::lang::String *, jint, jint, jint);
-  static jboolean getBooleanProperty(::java::lang::String *, jboolean);
-  static ::java::util::logging::Level * getLevelProperty(::java::lang::String *, ::java::util::logging::Level *);
-  static ::java::lang::Class * getClassProperty(::java::lang::String *, ::java::lang::Class *);
-  static ::java::lang::Object * getInstanceProperty(::java::lang::String *, ::java::lang::Class *, ::java::lang::Class *);
-public:
-  virtual void checkAccess();
-private:
-  static ::java::lang::Object * createInstance(::java::lang::String *, ::java::lang::Class *, ::java::lang::String *);
-  static void warn(::java::lang::String *, ::java::lang::String *, ::java::lang::Throwable *);
-  static void warn(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static void warn(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::Throwable *);
-  static void warn(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class * locateClass(::java::lang::String *);
-public:
-  static ::java::util::logging::LoggingMXBean * getLoggingMXBean();
-  static ::java::lang::String * LOGGING_MXBEAN_NAME;
-private:
-  static ::java::util::logging::LogManager * logManager;
-  static ::java::util::logging::LoggingMXBean * loggingBean;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loggers;
-  ::java::util::Properties * properties;
-  ::java::beans::PropertyChangeSupport * pcs;
-  static ::java::lang::String * MANAGER_PROPERTY;
-  static ::java::lang::String * CONFIG_PROPERTY;
-  static ::java::util::logging::LoggingPermission * controlPermission;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_LogManager__
diff --git a/libjava/java/util/logging/LogRecord.h b/libjava/java/util/logging/LogRecord.h
deleted file mode 100644
index 44541590978..00000000000
--- a/libjava/java/util/logging/LogRecord.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_LogRecord__
-#define __java_util_logging_LogRecord__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::logging::LogRecord : public ::java::lang::Object
-{
-
-public:
-  LogRecord(::java::util::logging::Level *, ::java::lang::String *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  virtual ::java::lang::String * getLoggerName();
-  virtual void setLoggerName(::java::lang::String *);
-  virtual ::java::util::ResourceBundle * getResourceBundle();
-  virtual void setResourceBundle(::java::util::ResourceBundle *);
-  virtual ::java::lang::String * getResourceBundleName();
-  virtual void setResourceBundleName(::java::lang::String *);
-  virtual ::java::util::logging::Level * getLevel();
-  virtual void setLevel(::java::util::logging::Level *);
-private:
-  static jlong allocateSeqNum();
-public:
-  virtual jlong getSequenceNumber();
-  virtual void setSequenceNumber(jlong);
-  virtual ::java::lang::String * getSourceClassName();
-  virtual void setSourceClassName(::java::lang::String *);
-  virtual ::java::lang::String * getSourceMethodName();
-  virtual void setSourceMethodName(::java::lang::String *);
-  virtual ::java::lang::String * getMessage();
-  virtual void setMessage(::java::lang::String *);
-  virtual JArray< ::java::lang::Object * > * getParameters();
-  virtual void setParameters(JArray< ::java::lang::Object * > *);
-  virtual jint getThreadID();
-  virtual void setThreadID(jint);
-  virtual jlong getMillis();
-  virtual void setMillis(jlong);
-  virtual ::java::lang::Throwable * getThrown();
-  virtual void setThrown(::java::lang::Throwable *);
-private:
-  ::java::util::logging::Level * __attribute__((aligned(__alignof__( ::java::lang::Object)))) level;
-  jlong sequenceNumber;
-  ::java::lang::String * sourceClassName;
-  ::java::lang::String * sourceMethodName;
-  ::java::lang::String * message;
-  jint threadID;
-  jlong millis;
-  ::java::lang::Throwable * thrown;
-  ::java::lang::String * loggerName;
-  ::java::lang::String * resourceBundleName;
-  JArray< ::java::lang::Object * > * parameters;
-  ::java::util::ResourceBundle * bundle;
-public: // actually package-private
-  static const jlong serialVersionUID = 5372048053134512534LL;
-private:
-  static jlong lastSeqNum;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_LogRecord__
diff --git a/libjava/java/util/logging/Logger$1.h b/libjava/java/util/logging/Logger$1.h
deleted file mode 100644
index 1c1f3e8595d..00000000000
--- a/libjava/java/util/logging/Logger$1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_Logger$1__
-#define __java_util_logging_Logger$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::logging::Logger$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Logger$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_Logger$1__
diff --git a/libjava/java/util/logging/Logger.h b/libjava/java/util/logging/Logger.h
deleted file mode 100644
index c73a8d3c854..00000000000
--- a/libjava/java/util/logging/Logger.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_Logger__
-#define __java_util_logging_Logger__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::logging::Logger : public ::java::lang::Object
-{
-
-public: // actually protected
-  Logger(::java::lang::String *, ::java::lang::String *);
-public:
-  static ::java::util::logging::Logger * getLogger(::java::lang::String *);
-  static ::java::util::logging::Logger * getLogger(::java::lang::String *, ::java::lang::String *);
-  static ::java::util::logging::Logger * getAnonymousLogger();
-  static ::java::util::logging::Logger * getAnonymousLogger(::java::lang::String *);
-  virtual ::java::lang::String * getResourceBundleName();
-  virtual ::java::util::ResourceBundle * getResourceBundle();
-  virtual ::java::util::logging::Level * getLevel();
-  virtual jboolean isLoggable(::java::util::logging::Level *);
-  virtual void setLevel(::java::util::logging::Level *);
-  virtual ::java::util::logging::Filter * getFilter();
-  virtual void setFilter(::java::util::logging::Filter *);
-  virtual ::java::lang::String * getName();
-  virtual void log(::java::util::logging::LogRecord *);
-  virtual void log(::java::util::logging::Level *, ::java::lang::String *);
-  virtual void log(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::Object *);
-  virtual void log(::java::util::logging::Level *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual void log(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::Throwable *);
-  virtual void logp(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void logp(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::Object *);
-private:
-  ::java::util::ResourceBundle * findResourceBundle();
-  void logImpl(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-public:
-  virtual void logp(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual void logp(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::Throwable *);
-  virtual void logrb(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void logrb(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::Object *);
-  virtual void logrb(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual void logrb(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::Throwable *);
-  virtual void entering(::java::lang::String *, ::java::lang::String *);
-  virtual void entering(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *);
-  virtual void entering(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual void exiting(::java::lang::String *, ::java::lang::String *);
-  virtual void exiting(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *);
-  virtual void throwing(::java::lang::String *, ::java::lang::String *, ::java::lang::Throwable *);
-  virtual void severe(::java::lang::String *);
-  virtual void warning(::java::lang::String *);
-  virtual void info(::java::lang::String *);
-  virtual void config(::java::lang::String *);
-  virtual void fine(::java::lang::String *);
-  virtual void finer(::java::lang::String *);
-  virtual void finest(::java::lang::String *);
-  virtual void addHandler(::java::util::logging::Handler *);
-  virtual void removeHandler(::java::util::logging::Handler *);
-  virtual JArray< ::java::util::logging::Handler * > * getHandlers();
-  virtual jboolean getUseParentHandlers();
-  virtual void setUseParentHandlers(jboolean);
-  virtual ::java::util::logging::Logger * getParent();
-  virtual void setParent(::java::util::logging::Logger *);
-private:
-  ::java::lang::StackTraceElement * getCallerStackFrame();
-public: // actually package-private
-  virtual void resetLogger();
-  static ::java::util::logging::Logger * root;
-public:
-  static ::java::util::logging::Logger * global;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * resourceBundleName;
-  ::java::util::ResourceBundle * resourceBundle;
-  ::java::util::logging::Filter * filter;
-  ::java::util::List * handlerList;
-  JArray< ::java::util::logging::Handler * > * handlers;
-  jboolean anonymous;
-  jboolean useParentHandlers;
-  ::java::util::logging::Level * level;
-  ::java::util::logging::Logger * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_Logger__
diff --git a/libjava/java/util/logging/LoggingMXBean.h b/libjava/java/util/logging/LoggingMXBean.h
deleted file mode 100644
index 4bac932e4d5..00000000000
--- a/libjava/java/util/logging/LoggingMXBean.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_LoggingMXBean__
-#define __java_util_logging_LoggingMXBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::logging::LoggingMXBean : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getLoggerLevel(::java::lang::String *) = 0;
-  virtual ::java::util::List * getLoggerNames() = 0;
-  virtual ::java::lang::String * getParentLoggerName(::java::lang::String *) = 0;
-  virtual void setLoggerLevel(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_logging_LoggingMXBean__
diff --git a/libjava/java/util/logging/LoggingPermission.h b/libjava/java/util/logging/LoggingPermission.h
deleted file mode 100644
index a3b803ac274..00000000000
--- a/libjava/java/util/logging/LoggingPermission.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_LoggingPermission__
-#define __java_util_logging_LoggingPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-
-class java::util::logging::LoggingPermission : public ::java::security::BasicPermission
-{
-
-public:
-  LoggingPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 63564341580231582LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_LoggingPermission__
diff --git a/libjava/java/util/logging/MemoryHandler.h b/libjava/java/util/logging/MemoryHandler.h
deleted file mode 100644
index 4ce638af9a0..00000000000
--- a/libjava/java/util/logging/MemoryHandler.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_MemoryHandler__
-#define __java_util_logging_MemoryHandler__
-
-#pragma interface
-
-#include <java/util/logging/Handler.h>
-#include <gcj/array.h>
-
-
-class java::util::logging::MemoryHandler : public ::java::util::logging::Handler
-{
-
-public:
-  MemoryHandler();
-  MemoryHandler(::java::util::logging::Handler *, jint, ::java::util::logging::Level *);
-  virtual void publish(::java::util::logging::LogRecord *);
-  virtual void push();
-  virtual void flush();
-  virtual void close();
-  virtual ::java::util::logging::Level * getPushLevel();
-  virtual void setPushLevel(::java::util::logging::Level *);
-private:
-  JArray< ::java::util::logging::LogRecord * > * __attribute__((aligned(__alignof__( ::java::util::logging::Handler)))) buffer;
-  jint position;
-  jint numPublished;
-  ::java::util::logging::Level * pushLevel;
-  ::java::util::logging::Handler * target;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_MemoryHandler__
diff --git a/libjava/java/util/logging/SimpleFormatter.h b/libjava/java/util/logging/SimpleFormatter.h
deleted file mode 100644
index 6afece7191f..00000000000
--- a/libjava/java/util/logging/SimpleFormatter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_SimpleFormatter__
-#define __java_util_logging_SimpleFormatter__
-
-#pragma interface
-
-#include <java/util/logging/Formatter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class DateFormat;
-    }
-  }
-}
-
-class java::util::logging::SimpleFormatter : public ::java::util::logging::Formatter
-{
-
-public:
-  SimpleFormatter();
-  virtual ::java::lang::String * format(::java::util::logging::LogRecord *);
-private:
-  ::java::text::DateFormat * __attribute__((aligned(__alignof__( ::java::util::logging::Formatter)))) dateFormat;
-public: // actually package-private
-  static ::java::lang::String * lineSep;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_SimpleFormatter__
diff --git a/libjava/java/util/logging/SocketHandler.h b/libjava/java/util/logging/SocketHandler.h
deleted file mode 100644
index 8286f13520f..00000000000
--- a/libjava/java/util/logging/SocketHandler.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_SocketHandler__
-#define __java_util_logging_SocketHandler__
-
-#pragma interface
-
-#include <java/util/logging/StreamHandler.h>
-
-class java::util::logging::SocketHandler : public ::java::util::logging::StreamHandler
-{
-
-public:
-  SocketHandler();
-  SocketHandler(::java::lang::String *, jint);
-private:
-  static jint getPortNumber();
-  static ::java::io::OutputStream * createSocket(::java::lang::String *, jint);
-public:
-  virtual void publish(::java::util::logging::LogRecord *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_SocketHandler__
diff --git a/libjava/java/util/logging/StreamHandler.h b/libjava/java/util/logging/StreamHandler.h
deleted file mode 100644
index 11dca983ffd..00000000000
--- a/libjava/java/util/logging/StreamHandler.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_StreamHandler__
-#define __java_util_logging_StreamHandler__
-
-#pragma interface
-
-#include <java/util/logging/Handler.h>
-
-class java::util::logging::StreamHandler : public ::java::util::logging::Handler
-{
-
-public:
-  StreamHandler();
-  StreamHandler(::java::io::OutputStream *, ::java::util::logging::Formatter *);
-public: // actually package-private
-  StreamHandler(::java::io::OutputStream *, ::java::lang::String *, ::java::util::logging::Level *, ::java::util::logging::Formatter *, ::java::lang::Class *);
-private:
-  void checkOpen();
-  void checkFresh();
-  void changeWriter(::java::io::OutputStream *, ::java::lang::String *);
-public:
-  virtual void setEncoding(::java::lang::String *);
-public: // actually protected
-  virtual void setOutputStream(::java::io::OutputStream *);
-public:
-  virtual void publish(::java::util::logging::LogRecord *);
-  virtual jboolean isLoggable(::java::util::logging::LogRecord *);
-  virtual void flush();
-  virtual void close();
-private:
-  ::java::io::OutputStream * __attribute__((aligned(__alignof__( ::java::util::logging::Handler)))) out;
-  ::java::io::Writer * writer;
-  jint streamState;
-  static const jint STATE_FRESH = 0;
-  static const jint STATE_PUBLISHED = 1;
-  static const jint STATE_CLOSED = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_StreamHandler__
diff --git a/libjava/java/util/logging/XMLFormatter.h b/libjava/java/util/logging/XMLFormatter.h
deleted file mode 100644
index 48a585de097..00000000000
--- a/libjava/java/util/logging/XMLFormatter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_logging_XMLFormatter__
-#define __java_util_logging_XMLFormatter__
-
-#pragma interface
-
-#include <java/util/logging/Formatter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class SimpleDateFormat;
-    }
-  }
-}
-
-class java::util::logging::XMLFormatter : public ::java::util::logging::Formatter
-{
-
-public:
-  XMLFormatter();
-private:
-  static void appendTag(::java::lang::StringBuffer *, jint, ::java::lang::String *, ::java::lang::String *);
-  static void appendTag(::java::lang::StringBuffer *, jint, ::java::lang::String *, jlong);
-public:
-  virtual ::java::lang::String * format(::java::util::logging::LogRecord *);
-  virtual ::java::lang::String * getHead(::java::util::logging::Handler *);
-  virtual ::java::lang::String * getTail(::java::util::logging::Handler *);
-private:
-  static ::java::lang::String * lineSep;
-  ::java::text::SimpleDateFormat * __attribute__((aligned(__alignof__( ::java::util::logging::Formatter)))) iso8601;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_logging_XMLFormatter__
diff --git a/libjava/java/util/prefs/AbstractPreferences$1.h b/libjava/java/util/prefs/AbstractPreferences$1.h
deleted file mode 100644
index 97c3f53c752..00000000000
--- a/libjava/java/util/prefs/AbstractPreferences$1.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_AbstractPreferences$1__
-#define __java_util_prefs_AbstractPreferences$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::prefs::AbstractPreferences$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractPreferences$1(::java::util::prefs::AbstractPreferences *, ::java::util::prefs::PreferenceChangeListener *, ::java::util::prefs::PreferenceChangeEvent *);
-public:
-  void run();
-public: // actually package-private
-  ::java::util::prefs::AbstractPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::util::prefs::PreferenceChangeListener * val$l;
-  ::java::util::prefs::PreferenceChangeEvent * val$event;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_prefs_AbstractPreferences$1__
diff --git a/libjava/java/util/prefs/AbstractPreferences$2.h b/libjava/java/util/prefs/AbstractPreferences$2.h
deleted file mode 100644
index 45378c56ad5..00000000000
--- a/libjava/java/util/prefs/AbstractPreferences$2.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_AbstractPreferences$2__
-#define __java_util_prefs_AbstractPreferences$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::prefs::AbstractPreferences$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractPreferences$2(::java::util::prefs::AbstractPreferences *, jboolean, ::java::util::prefs::NodeChangeListener *, ::java::util::prefs::NodeChangeEvent *);
-public:
-  void run();
-public: // actually package-private
-  ::java::util::prefs::AbstractPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  jboolean val$added;
-  ::java::util::prefs::NodeChangeListener * val$l;
-  ::java::util::prefs::NodeChangeEvent * val$event;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_prefs_AbstractPreferences$2__
diff --git a/libjava/java/util/prefs/AbstractPreferences.h b/libjava/java/util/prefs/AbstractPreferences.h
deleted file mode 100644
index a4e3a028a36..00000000000
--- a/libjava/java/util/prefs/AbstractPreferences.h
+++ /dev/null
@@ -1,106 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_AbstractPreferences__
-#define __java_util_prefs_AbstractPreferences__
-
-#pragma interface
-
-#include <java/util/prefs/Preferences.h>
-#include <gcj/array.h>
-
-
-class java::util::prefs::AbstractPreferences : public ::java::util::prefs::Preferences
-{
-
-public: // actually protected
-  AbstractPreferences(::java::util::prefs::AbstractPreferences *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * absolutePath();
-private:
-  ::java::lang::String * path();
-public:
-  virtual jboolean isUserNode();
-  virtual ::java::lang::String * name();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual JArray< ::java::util::prefs::AbstractPreferences * > * cachedChildren();
-public:
-  virtual JArray< ::java::lang::String * > * childrenNames();
-  virtual ::java::util::prefs::Preferences * node(::java::lang::String *);
-private:
-  ::java::util::prefs::Preferences * getNode(::java::lang::String *);
-public:
-  virtual jboolean nodeExists(::java::lang::String *);
-private:
-  jboolean existsNode(::java::lang::String *);
-public: // actually protected
-  virtual ::java::util::prefs::AbstractPreferences * getChild(::java::lang::String *);
-  virtual jboolean isRemoved();
-public:
-  virtual ::java::util::prefs::Preferences * parent();
-  virtual void exportNode(::java::io::OutputStream *);
-  virtual void exportSubtree(::java::io::OutputStream *);
-  virtual JArray< ::java::lang::String * > * keys();
-  virtual ::java::lang::String * get(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean getBoolean(::java::lang::String *, jboolean);
-  virtual JArray< jbyte > * getByteArray(::java::lang::String *, JArray< jbyte > *);
-private:
-  static JArray< jbyte > * decode64(::java::lang::String *);
-public:
-  virtual jdouble getDouble(::java::lang::String *, jdouble);
-  virtual jfloat getFloat(::java::lang::String *, jfloat);
-  virtual jint getInt(::java::lang::String *, jint);
-  virtual jlong getLong(::java::lang::String *, jlong);
-  virtual void put(::java::lang::String *, ::java::lang::String *);
-  virtual void putBoolean(::java::lang::String *, jboolean);
-  virtual void putByteArray(::java::lang::String *, JArray< jbyte > *);
-private:
-  static ::java::lang::String * encode64(JArray< jbyte > *);
-public:
-  virtual void putDouble(::java::lang::String *, jdouble);
-  virtual void putFloat(::java::lang::String *, jfloat);
-  virtual void putInt(::java::lang::String *, jint);
-  virtual void putLong(::java::lang::String *, jlong);
-  virtual void remove(::java::lang::String *);
-  virtual void clear();
-  virtual void flush();
-  virtual void sync();
-private:
-  void flushNode(jboolean);
-public:
-  virtual void removeNode();
-private:
-  void purge();
-public:
-  virtual void addNodeChangeListener(::java::util::prefs::NodeChangeListener *);
-  virtual void addPreferenceChangeListener(::java::util::prefs::PreferenceChangeListener *);
-  virtual void removeNodeChangeListener(::java::util::prefs::NodeChangeListener *);
-  virtual void removePreferenceChangeListener(::java::util::prefs::PreferenceChangeListener *);
-private:
-  void fire(::java::util::prefs::PreferenceChangeEvent *);
-  void fire(::java::util::prefs::NodeChangeEvent *, jboolean);
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * childrenNamesSpi() = 0;
-  virtual ::java::util::prefs::AbstractPreferences * childSpi(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * keysSpi() = 0;
-  virtual ::java::lang::String * getSpi(::java::lang::String *) = 0;
-  virtual void putSpi(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeSpi(::java::lang::String *) = 0;
-  virtual void flushSpi() = 0;
-  virtual void syncSpi() = 0;
-  virtual void removeNodeSpi() = 0;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::prefs::Preferences)))) lock;
-  jboolean newNode;
-private:
-  ::java::util::prefs::AbstractPreferences * parent__;
-  ::java::lang::String * name__;
-  jboolean removed;
-  ::java::util::HashMap * childCache;
-  ::java::util::ArrayList * nodeListeners;
-  ::java::util::ArrayList * preferenceListeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_prefs_AbstractPreferences__
diff --git a/libjava/java/util/prefs/BackingStoreException.h b/libjava/java/util/prefs/BackingStoreException.h
deleted file mode 100644
index a6851385275..00000000000
--- a/libjava/java/util/prefs/BackingStoreException.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_BackingStoreException__
-#define __java_util_prefs_BackingStoreException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::util::prefs::BackingStoreException : public ::java::lang::Exception
-{
-
-public:
-  BackingStoreException(::java::lang::String *);
-  BackingStoreException(::java::lang::Throwable *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public: // actually package-private
-  static const jlong serialVersionUID = 859796500401108469LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_prefs_BackingStoreException__
diff --git a/libjava/java/util/prefs/InvalidPreferencesFormatException.h b/libjava/java/util/prefs/InvalidPreferencesFormatException.h
deleted file mode 100644
index dd81f5dc083..00000000000
--- a/libjava/java/util/prefs/InvalidPreferencesFormatException.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_InvalidPreferencesFormatException__
-#define __java_util_prefs_InvalidPreferencesFormatException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::util::prefs::InvalidPreferencesFormatException : public ::java::lang::Exception
-{
-
-public:
-  InvalidPreferencesFormatException(::java::lang::String *);
-  InvalidPreferencesFormatException(::java::lang::Throwable *);
-  InvalidPreferencesFormatException(::java::lang::String *, ::java::lang::Throwable *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public: // actually package-private
-  static const jlong serialVersionUID = -791715184232119669LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_prefs_InvalidPreferencesFormatException__
diff --git a/libjava/java/util/prefs/NodeChangeEvent.h b/libjava/java/util/prefs/NodeChangeEvent.h
deleted file mode 100644
index 7a51b708b0c..00000000000
--- a/libjava/java/util/prefs/NodeChangeEvent.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_NodeChangeEvent__
-#define __java_util_prefs_NodeChangeEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-
-class java::util::prefs::NodeChangeEvent : public ::java::util::EventObject
-{
-
-public:
-  NodeChangeEvent(::java::util::prefs::Preferences *, ::java::util::prefs::Preferences *);
-  virtual ::java::util::prefs::Preferences * getParent();
-  virtual ::java::util::prefs::Preferences * getChild();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 8068949086596572957LL;
-  ::java::util::prefs::Preferences * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) child;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_prefs_NodeChangeEvent__
diff --git a/libjava/java/util/prefs/NodeChangeListener.h b/libjava/java/util/prefs/NodeChangeListener.h
deleted file mode 100644
index 2ad05d6e1c0..00000000000
--- a/libjava/java/util/prefs/NodeChangeListener.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_NodeChangeListener__
-#define __java_util_prefs_NodeChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::prefs::NodeChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void childAdded(::java::util::prefs::NodeChangeEvent *) = 0;
-  virtual void childRemoved(::java::util::prefs::NodeChangeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_prefs_NodeChangeListener__
diff --git a/libjava/java/util/prefs/PreferenceChangeEvent.h b/libjava/java/util/prefs/PreferenceChangeEvent.h
deleted file mode 100644
index 790a957d2eb..00000000000
--- a/libjava/java/util/prefs/PreferenceChangeEvent.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_PreferenceChangeEvent__
-#define __java_util_prefs_PreferenceChangeEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-
-class java::util::prefs::PreferenceChangeEvent : public ::java::util::EventObject
-{
-
-public:
-  PreferenceChangeEvent(::java::util::prefs::Preferences *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::util::prefs::Preferences * getNode();
-  virtual ::java::lang::String * getKey();
-  virtual ::java::lang::String * getNewValue();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 793724513368024975LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) key;
-  ::java::lang::String * newValue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_prefs_PreferenceChangeEvent__
diff --git a/libjava/java/util/prefs/PreferenceChangeListener.h b/libjava/java/util/prefs/PreferenceChangeListener.h
deleted file mode 100644
index d450a31b767..00000000000
--- a/libjava/java/util/prefs/PreferenceChangeListener.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_PreferenceChangeListener__
-#define __java_util_prefs_PreferenceChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::prefs::PreferenceChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void preferenceChange(::java::util::prefs::PreferenceChangeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_prefs_PreferenceChangeListener__
diff --git a/libjava/java/util/prefs/Preferences$1.h b/libjava/java/util/prefs/Preferences$1.h
deleted file mode 100644
index 09a3f1c9f2c..00000000000
--- a/libjava/java/util/prefs/Preferences$1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_Preferences$1__
-#define __java_util_prefs_Preferences$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::prefs::Preferences$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Preferences$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_prefs_Preferences$1__
diff --git a/libjava/java/util/prefs/Preferences.h b/libjava/java/util/prefs/Preferences.h
deleted file mode 100644
index b19a034454f..00000000000
--- a/libjava/java/util/prefs/Preferences.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_Preferences__
-#define __java_util_prefs_Preferences__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-}
-
-class java::util::prefs::Preferences : public ::java::lang::Object
-{
-
-public: // actually protected
-  Preferences();
-public:
-  static ::java::util::prefs::Preferences * systemRoot();
-  static ::java::util::prefs::Preferences * userRoot();
-private:
-  static ::java::util::prefs::PreferencesFactory * getFactory();
-public:
-  static ::java::util::prefs::Preferences * systemNodeForPackage(::java::lang::Class *);
-  static ::java::util::prefs::Preferences * userNodeForPackage(::java::lang::Class *);
-private:
-  static ::java::util::prefs::Preferences * nodeForPackage(::java::lang::Class *, ::java::util::prefs::Preferences *);
-public:
-  static void importPreferences(::java::io::InputStream *);
-  virtual ::java::lang::String * absolutePath() = 0;
-  virtual jboolean isUserNode() = 0;
-  virtual ::java::lang::String * name() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual JArray< ::java::lang::String * > * childrenNames() = 0;
-  virtual ::java::util::prefs::Preferences * node(::java::lang::String *) = 0;
-  virtual jboolean nodeExists(::java::lang::String *) = 0;
-  virtual ::java::util::prefs::Preferences * parent() = 0;
-  virtual void exportNode(::java::io::OutputStream *) = 0;
-  virtual void exportSubtree(::java::io::OutputStream *) = 0;
-  virtual JArray< ::java::lang::String * > * keys() = 0;
-  virtual ::java::lang::String * get(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean getBoolean(::java::lang::String *, jboolean) = 0;
-  virtual JArray< jbyte > * getByteArray(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual jdouble getDouble(::java::lang::String *, jdouble) = 0;
-  virtual jfloat getFloat(::java::lang::String *, jfloat) = 0;
-  virtual jint getInt(::java::lang::String *, jint) = 0;
-  virtual jlong getLong(::java::lang::String *, jlong) = 0;
-  virtual void put(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void putBoolean(::java::lang::String *, jboolean) = 0;
-  virtual void putByteArray(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual void putDouble(::java::lang::String *, jdouble) = 0;
-  virtual void putFloat(::java::lang::String *, jfloat) = 0;
-  virtual void putInt(::java::lang::String *, jint) = 0;
-  virtual void putLong(::java::lang::String *, jlong) = 0;
-  virtual void remove(::java::lang::String *) = 0;
-  virtual void clear() = 0;
-  virtual void flush() = 0;
-  virtual void sync() = 0;
-  virtual void removeNode() = 0;
-  virtual void addNodeChangeListener(::java::util::prefs::NodeChangeListener *) = 0;
-  virtual void addPreferenceChangeListener(::java::util::prefs::PreferenceChangeListener *) = 0;
-  virtual void removeNodeChangeListener(::java::util::prefs::NodeChangeListener *) = 0;
-  virtual void removePreferenceChangeListener(::java::util::prefs::PreferenceChangeListener *) = 0;
-private:
-  static ::java::lang::String * defaultFactoryClass;
-  static ::java::security::Permission * prefsPermission;
-  static ::java::util::prefs::PreferencesFactory * factory;
-public:
-  static const jint MAX_NAME_LENGTH = 80;
-  static const jint MAX_KEY_LENGTH = 80;
-  static const jint MAX_VALUE_LENGTH = 8192;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_prefs_Preferences__
diff --git a/libjava/java/util/prefs/PreferencesFactory.h b/libjava/java/util/prefs/PreferencesFactory.h
deleted file mode 100644
index 40207d480fd..00000000000
--- a/libjava/java/util/prefs/PreferencesFactory.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_prefs_PreferencesFactory__
-#define __java_util_prefs_PreferencesFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::prefs::PreferencesFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::prefs::Preferences * systemRoot() = 0;
-  virtual ::java::util::prefs::Preferences * userRoot() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_prefs_PreferencesFactory__
diff --git a/libjava/java/util/regex/MatchResult.h b/libjava/java/util/regex/MatchResult.h
deleted file mode 100644
index 6b6acf8abf2..00000000000
--- a/libjava/java/util/regex/MatchResult.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_regex_MatchResult__
-#define __java_util_regex_MatchResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::regex::MatchResult : public ::java::lang::Object
-{
-
-public:
-  virtual jint end() = 0;
-  virtual jint end(jint) = 0;
-  virtual ::java::lang::String * group() = 0;
-  virtual ::java::lang::String * group(jint) = 0;
-  virtual jint groupCount() = 0;
-  virtual jint start() = 0;
-  virtual jint start(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_regex_MatchResult__
diff --git a/libjava/java/util/regex/Matcher.h b/libjava/java/util/regex/Matcher.h
deleted file mode 100644
index 35cd1c1cab4..00000000000
--- a/libjava/java/util/regex/Matcher.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_regex_Matcher__
-#define __java_util_regex_Matcher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class CharIndexed;
-            class REMatch;
-        }
-      }
-    }
-  }
-}
-
-class java::util::regex::Matcher : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Matcher(::java::util::regex::Pattern *, ::java::lang::CharSequence *);
-public:
-  ::java::util::regex::Matcher * appendReplacement(::java::lang::StringBuffer *, ::java::lang::String *);
-  ::java::lang::StringBuffer * appendTail(::java::lang::StringBuffer *);
-  jint end();
-  jint end(jint);
-  jboolean find();
-  jboolean find(jint);
-  ::java::lang::String * group();
-  ::java::lang::String * group(jint);
-  ::java::lang::String * replaceFirst(::java::lang::String *);
-  ::java::lang::String * replaceAll(::java::lang::String *);
-  jint groupCount();
-  jboolean lookingAt();
-  jboolean matches();
-  ::java::util::regex::Pattern * pattern();
-  ::java::util::regex::Matcher * reset();
-  ::java::util::regex::Matcher * reset(::java::lang::CharSequence *);
-  jint start();
-  jint start(jint);
-  jboolean hitEnd();
-  ::java::lang::String * toString();
-private:
-  void assertMatchOp();
-  ::java::util::regex::Pattern * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pattern__;
-  ::java::lang::CharSequence * input;
-  ::gnu::java::util::regex::CharIndexed * inputCharIndexed;
-  jint position;
-  jint appendPosition;
-  ::gnu::java::util::regex::REMatch * match;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_regex_Matcher__
diff --git a/libjava/java/util/regex/Pattern.h b/libjava/java/util/regex/Pattern.h
deleted file mode 100644
index 7bfc275e55f..00000000000
--- a/libjava/java/util/regex/Pattern.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_regex_Pattern__
-#define __java_util_regex_Pattern__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace regex
-        {
-            class RE;
-        }
-      }
-    }
-  }
-}
-
-class java::util::regex::Pattern : public ::java::lang::Object
-{
-
-  Pattern(::java::lang::String *, jint);
-public: // actually package-private
-  ::gnu::java::util::regex::RE * getRE();
-public:
-  static ::java::util::regex::Pattern * compile(::java::lang::String *);
-  static ::java::util::regex::Pattern * compile(::java::lang::String *, jint);
-  jint flags();
-  static jboolean matches(::java::lang::String *, ::java::lang::CharSequence *);
-  ::java::util::regex::Matcher * matcher(::java::lang::CharSequence *);
-  JArray< ::java::lang::String * > * split(::java::lang::CharSequence *);
-  JArray< ::java::lang::String * > * split(::java::lang::CharSequence *, jint);
-  ::java::lang::String * pattern();
-private:
-  static const jlong serialVersionUID = 5073258162644648461LL;
-public:
-  static const jint CANON_EQ = 128;
-  static const jint CASE_INSENSITIVE = 2;
-  static const jint COMMENTS = 4;
-  static const jint DOTALL = 32;
-  static const jint MULTILINE = 8;
-  static const jint UNICODE_CASE = 64;
-  static const jint UNIX_LINES = 1;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) regex;
-  jint flags__;
-  ::gnu::java::util::regex::RE * re;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_regex_Pattern__
diff --git a/libjava/java/util/regex/PatternSyntaxException.h b/libjava/java/util/regex/PatternSyntaxException.h
deleted file mode 100644
index 670549a6a75..00000000000
--- a/libjava/java/util/regex/PatternSyntaxException.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_regex_PatternSyntaxException__
-#define __java_util_regex_PatternSyntaxException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-
-class java::util::regex::PatternSyntaxException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  PatternSyntaxException(::java::lang::String *, ::java::lang::String *, jint);
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getPattern();
-  virtual jint getIndex();
-  virtual ::java::lang::String * getMessage();
-private:
-  static const jlong serialVersionUID = -3864639126226059218LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::IllegalArgumentException)))) desc;
-  ::java::lang::String * pattern;
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_regex_PatternSyntaxException__
diff --git a/libjava/java/util/zip/Adler32.h b/libjava/java/util/zip/Adler32.h
deleted file mode 100644
index ebd8e33cfa9..00000000000
--- a/libjava/java/util/zip/Adler32.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_Adler32__
-#define __java_util_zip_Adler32__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::Adler32 : public ::java::lang::Object
-{
-
-public:
-  Adler32();
-  virtual void reset();
-  virtual void update(jint);
-  virtual void update(JArray< jbyte > *);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual jlong getValue();
-private:
-  static const jint BASE = 65521;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) checksum;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_Adler32__
diff --git a/libjava/java/util/zip/CRC32.h b/libjava/java/util/zip/CRC32.h
deleted file mode 100644
index af515fc99fe..00000000000
--- a/libjava/java/util/zip/CRC32.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_CRC32__
-#define __java_util_zip_CRC32__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::CRC32 : public ::java::lang::Object
-{
-
-public:
-  CRC32();
-private:
-  static JArray< jint > * make_crc_table();
-public:
-  virtual jlong getValue();
-  virtual void reset();
-  virtual void update(jint);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual void update(JArray< jbyte > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) crc;
-  static JArray< jint > * crc_table;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_CRC32__
diff --git a/libjava/java/util/zip/CheckedInputStream.h b/libjava/java/util/zip/CheckedInputStream.h
deleted file mode 100644
index d9e80abe911..00000000000
--- a/libjava/java/util/zip/CheckedInputStream.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_CheckedInputStream__
-#define __java_util_zip_CheckedInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::CheckedInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  CheckedInputStream(::java::io::InputStream *, ::java::util::zip::Checksum *);
-  virtual ::java::util::zip::Checksum * getChecksum();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jlong skip(jlong);
-private:
-  ::java::util::zip::Checksum * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) sum;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_CheckedInputStream__
diff --git a/libjava/java/util/zip/CheckedOutputStream.h b/libjava/java/util/zip/CheckedOutputStream.h
deleted file mode 100644
index 5cf53c9f286..00000000000
--- a/libjava/java/util/zip/CheckedOutputStream.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_CheckedOutputStream__
-#define __java_util_zip_CheckedOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::CheckedOutputStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  CheckedOutputStream(::java::io::OutputStream *, ::java::util::zip::Checksum *);
-  virtual ::java::util::zip::Checksum * getChecksum();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-private:
-  ::java::util::zip::Checksum * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) sum;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_CheckedOutputStream__
diff --git a/libjava/java/util/zip/Checksum.h b/libjava/java/util/zip/Checksum.h
deleted file mode 100644
index 66ab907c80b..00000000000
--- a/libjava/java/util/zip/Checksum.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_Checksum__
-#define __java_util_zip_Checksum__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::Checksum : public ::java::lang::Object
-{
-
-public:
-  virtual jlong getValue() = 0;
-  virtual void reset() = 0;
-  virtual void update(jint) = 0;
-  virtual void update(JArray< jbyte > *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_zip_Checksum__
diff --git a/libjava/java/util/zip/DataFormatException.h b/libjava/java/util/zip/DataFormatException.h
deleted file mode 100644
index 5ebfbcf4b1f..00000000000
--- a/libjava/java/util/zip/DataFormatException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_DataFormatException__
-#define __java_util_zip_DataFormatException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-
-class java::util::zip::DataFormatException : public ::java::lang::Exception
-{
-
-public:
-  DataFormatException();
-  DataFormatException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2219632870893641452LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_DataFormatException__
diff --git a/libjava/java/util/zip/Deflater.h b/libjava/java/util/zip/Deflater.h
deleted file mode 100644
index 61d21899f7e..00000000000
--- a/libjava/java/util/zip/Deflater.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_Deflater__
-#define __java_util_zip_Deflater__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-}
-
-class java::util::zip::Deflater : public ::java::lang::Object
-{
-
-public:
-  Deflater();
-  Deflater(jint);
-  Deflater(jint, jboolean);
-private:
-  void init(jint, jboolean);
-  void update();
-public:
-  virtual void reset();
-  virtual void end();
-  virtual jint getAdler();
-  virtual jint getTotalIn();
-  virtual jlong getBytesRead();
-  virtual jint getTotalOut();
-  virtual jlong getBytesWritten();
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual void finish();
-  virtual jboolean finished();
-  virtual jboolean needsInput();
-  virtual void setInput(JArray< jbyte > *);
-  virtual void setInput(JArray< jbyte > *, jint, jint);
-  virtual void setLevel(jint);
-  virtual void setStrategy(jint);
-  virtual jint deflate(JArray< jbyte > *);
-  virtual jint deflate(JArray< jbyte > *, jint, jint);
-  virtual void setDictionary(JArray< jbyte > *);
-  virtual void setDictionary(JArray< jbyte > *, jint, jint);
-public: // actually package-private
-  virtual void flush();
-public:
-  static const jint BEST_COMPRESSION = 9;
-  static const jint BEST_SPEED = 1;
-  static const jint DEFAULT_COMPRESSION = -1;
-  static const jint NO_COMPRESSION = 0;
-  static const jint DEFAULT_STRATEGY = 0;
-  static const jint FILTERED = 1;
-  static const jint HUFFMAN_ONLY = 2;
-  static const jint DEFLATED = 8;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) level;
-  jint strategy;
-  ::gnu::gcj::RawData * zstream;
-  jboolean is_finished;
-  jint flush_flag;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_Deflater__
diff --git a/libjava/java/util/zip/DeflaterOutputStream.h b/libjava/java/util/zip/DeflaterOutputStream.h
deleted file mode 100644
index 307f364ad11..00000000000
--- a/libjava/java/util/zip/DeflaterOutputStream.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_DeflaterOutputStream__
-#define __java_util_zip_DeflaterOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::DeflaterOutputStream : public ::java::io::FilterOutputStream
-{
-
-public: // actually protected
-  virtual void deflate();
-public:
-  DeflaterOutputStream(::java::io::OutputStream *);
-  DeflaterOutputStream(::java::io::OutputStream *, ::java::util::zip::Deflater *);
-  DeflaterOutputStream(::java::io::OutputStream *, ::java::util::zip::Deflater *, jint);
-  virtual void flush();
-  virtual void finish();
-  virtual void close();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) buf;
-  ::java::util::zip::Deflater * def;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_DeflaterOutputStream__
diff --git a/libjava/java/util/zip/GZIPInputStream.h b/libjava/java/util/zip/GZIPInputStream.h
deleted file mode 100644
index 20777fabace..00000000000
--- a/libjava/java/util/zip/GZIPInputStream.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_GZIPInputStream__
-#define __java_util_zip_GZIPInputStream__
-
-#pragma interface
-
-#include <java/util/zip/InflaterInputStream.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::GZIPInputStream : public ::java::util::zip::InflaterInputStream
-{
-
-public:
-  GZIPInputStream(::java::io::InputStream *);
-  GZIPInputStream(::java::io::InputStream *, jint);
-  virtual void close();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  void readHeader();
-  void readFooter();
-public:
-  static const jint GZIP_MAGIC = 35615;
-public: // actually package-private
-  static const jint FTEXT = 1;
-  static const jint FHCRC = 2;
-  static const jint FEXTRA = 4;
-  static const jint FNAME = 8;
-  static const jint FCOMMENT = 16;
-public: // actually protected
-  ::java::util::zip::CRC32 * __attribute__((aligned(__alignof__( ::java::util::zip::InflaterInputStream)))) crc;
-  jboolean eos;
-private:
-  jboolean readGZIPHeader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_GZIPInputStream__
diff --git a/libjava/java/util/zip/GZIPOutputStream.h b/libjava/java/util/zip/GZIPOutputStream.h
deleted file mode 100644
index 1680d8964dc..00000000000
--- a/libjava/java/util/zip/GZIPOutputStream.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_GZIPOutputStream__
-#define __java_util_zip_GZIPOutputStream__
-
-#pragma interface
-
-#include <java/util/zip/DeflaterOutputStream.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::GZIPOutputStream : public ::java::util::zip::DeflaterOutputStream
-{
-
-public:
-  GZIPOutputStream(::java::io::OutputStream *);
-  GZIPOutputStream(::java::io::OutputStream *, jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void close();
-  virtual void finish();
-public: // actually protected
-  ::java::util::zip::CRC32 * __attribute__((aligned(__alignof__( ::java::util::zip::DeflaterOutputStream)))) crc;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_GZIPOutputStream__
diff --git a/libjava/java/util/zip/Inflater.h b/libjava/java/util/zip/Inflater.h
deleted file mode 100644
index 25ebdc6d6b8..00000000000
--- a/libjava/java/util/zip/Inflater.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_Inflater__
-#define __java_util_zip_Inflater__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class RawData;
-    }
-  }
-}
-
-class java::util::zip::Inflater : public ::java::lang::Object
-{
-
-public:
-  Inflater();
-  Inflater(jboolean);
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual void end();
-  virtual jboolean finished();
-  virtual jint getAdler();
-  virtual jint getRemaining();
-  virtual jint getTotalIn();
-  virtual jint getTotalOut();
-  virtual jint inflate(JArray< jbyte > *);
-  virtual jint inflate(JArray< jbyte > *, jint, jint);
-private:
-  void init(jboolean);
-public:
-  virtual jboolean needsDictionary();
-  virtual jboolean needsInput();
-  virtual void reset();
-  virtual void setDictionary(JArray< jbyte > *);
-  virtual void setDictionary(JArray< jbyte > *, jint, jint);
-  virtual void setInput(JArray< jbyte > *);
-  virtual void setInput(JArray< jbyte > *, jint, jint);
-private:
-  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) zstream;
-  jboolean is_finished;
-  jboolean dict_needed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_Inflater__
diff --git a/libjava/java/util/zip/InflaterInputStream.h b/libjava/java/util/zip/InflaterInputStream.h
deleted file mode 100644
index b576c364655..00000000000
--- a/libjava/java/util/zip/InflaterInputStream.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_InflaterInputStream__
-#define __java_util_zip_InflaterInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::InflaterInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  InflaterInputStream(::java::io::InputStream *);
-  InflaterInputStream(::java::io::InputStream *, ::java::util::zip::Inflater *);
-  InflaterInputStream(::java::io::InputStream *, ::java::util::zip::Inflater *, jint);
-  virtual jint available();
-  virtual void close();
-public: // actually protected
-  virtual void fill();
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jlong skip(jlong);
-  virtual jboolean markSupported();
-  virtual void mark(jint);
-  virtual void reset();
-public: // actually protected
-  ::java::util::zip::Inflater * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) inf;
-  JArray< jbyte > * buf;
-  jint len;
-private:
-  JArray< jbyte > * onebytebuffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_InflaterInputStream__
diff --git a/libjava/java/util/zip/ZipConstants.h b/libjava/java/util/zip/ZipConstants.h
deleted file mode 100644
index 3cf795d7b69..00000000000
--- a/libjava/java/util/zip/ZipConstants.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_ZipConstants__
-#define __java_util_zip_ZipConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::zip::ZipConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint LOCHDR = 30;
-  static const jlong LOCSIG = 67324752LL;
-  static const jint LOCVER = 4;
-  static const jint LOCFLG = 6;
-  static const jint LOCHOW = 8;
-  static const jint LOCTIM = 10;
-  static const jint LOCCRC = 14;
-  static const jint LOCSIZ = 18;
-  static const jint LOCLEN = 22;
-  static const jint LOCNAM = 26;
-  static const jint LOCEXT = 28;
-  static const jlong EXTSIG = 134695760LL;
-  static const jint EXTHDR = 16;
-  static const jint EXTCRC = 4;
-  static const jint EXTSIZ = 8;
-  static const jint EXTLEN = 12;
-  static const jlong CENSIG = 33639248LL;
-  static const jint CENHDR = 46;
-  static const jint CENVEM = 4;
-  static const jint CENVER = 6;
-  static const jint CENFLG = 8;
-  static const jint CENHOW = 10;
-  static const jint CENTIM = 12;
-  static const jint CENCRC = 16;
-  static const jint CENSIZ = 20;
-  static const jint CENLEN = 24;
-  static const jint CENNAM = 28;
-  static const jint CENEXT = 30;
-  static const jint CENCOM = 32;
-  static const jint CENDSK = 34;
-  static const jint CENATT = 36;
-  static const jint CENATX = 38;
-  static const jint CENOFF = 42;
-  static const jlong ENDSIG = 101010256LL;
-  static const jint ENDHDR = 22;
-  static const jint ENDSUB = 8;
-  static const jint ENDTOT = 10;
-  static const jint ENDSIZ = 12;
-  static const jint ENDOFF = 16;
-  static const jint ENDCOM = 20;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __java_util_zip_ZipConstants__
diff --git a/libjava/java/util/zip/ZipEntry.h b/libjava/java/util/zip/ZipEntry.h
deleted file mode 100644
index 7e1cc8f518f..00000000000
--- a/libjava/java/util/zip/ZipEntry.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_ZipEntry__
-#define __java_util_zip_ZipEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::ZipEntry : public ::java::lang::Object
-{
-
-public:
-  ZipEntry(::java::lang::String *);
-  ZipEntry(::java::util::zip::ZipEntry *);
-public: // actually package-private
-  ZipEntry(::java::util::zip::ZipEntry *, ::java::lang::String *);
-  virtual void setDOSTime(jint);
-  virtual jint getDOSTime();
-public:
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * getName();
-  virtual void setTime(jlong);
-  virtual jlong getTime();
-private:
-  static ::java::util::Calendar * getCalendar();
-public:
-  virtual void setSize(jlong);
-  virtual jlong getSize();
-  virtual void setCompressedSize(jlong);
-  virtual jlong getCompressedSize();
-  virtual void setCrc(jlong);
-  virtual jlong getCrc();
-  virtual void setMethod(jint);
-  virtual jint getMethod();
-  virtual void setExtra(JArray< jbyte > *);
-private:
-  void parseExtra();
-public:
-  virtual JArray< jbyte > * getExtra();
-  virtual void setComment(::java::lang::String *);
-  virtual ::java::lang::String * getComment();
-  virtual jboolean isDirectory();
-  virtual ::java::lang::String * toString();
-  virtual jint hashCode();
-private:
-  static const jint KNOWN_SIZE = 1;
-  static const jint KNOWN_CSIZE = 2;
-  static const jint KNOWN_CRC = 4;
-  static const jint KNOWN_TIME = 8;
-  static const jint KNOWN_EXTRA = 16;
-  static ::java::util::Calendar * cal;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jint size;
-  jlong compressedSize;
-  jint crc;
-  jint dostime;
-  jshort known;
-  jshort method;
-  JArray< jbyte > * extra;
-  ::java::lang::String * comment;
-public: // actually package-private
-  jint flags;
-  jint offset;
-public:
-  static const jint STORED = 0;
-  static const jint DEFLATED = 8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_ZipEntry__
diff --git a/libjava/java/util/zip/ZipException.h b/libjava/java/util/zip/ZipException.h
deleted file mode 100644
index 3a7b1fc5e7d..00000000000
--- a/libjava/java/util/zip/ZipException.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_ZipException__
-#define __java_util_zip_ZipException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-
-class java::util::zip::ZipException : public ::java::io::IOException
-{
-
-public:
-  ZipException();
-  ZipException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8000196834066748623LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_ZipException__
diff --git a/libjava/java/util/zip/ZipFile$1.h b/libjava/java/util/zip/ZipFile$1.h
deleted file mode 100644
index 85281339f57..00000000000
--- a/libjava/java/util/zip/ZipFile$1.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_ZipFile$1__
-#define __java_util_zip_ZipFile$1__
-
-#pragma interface
-
-#include <java/util/zip/InflaterInputStream.h>
-
-class java::util::zip::ZipFile$1 : public ::java::util::zip::InflaterInputStream
-{
-
-public: // actually package-private
-  ZipFile$1(::java::util::zip::ZipFile *, ::java::io::InputStream *, ::java::util::zip::Inflater *, jint);
-public:
-  jint available();
-public: // actually package-private
-  ::java::util::zip::ZipFile * __attribute__((aligned(__alignof__( ::java::util::zip::InflaterInputStream)))) this$0;
-private:
-  jint val$sz;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_ZipFile$1__
diff --git a/libjava/java/util/zip/ZipFile$PartialInputStream.h b/libjava/java/util/zip/ZipFile$PartialInputStream.h
deleted file mode 100644
index f258f9f0c16..00000000000
--- a/libjava/java/util/zip/ZipFile$PartialInputStream.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_ZipFile$PartialInputStream__
-#define __java_util_zip_ZipFile$PartialInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-      namespace charset
-      {
-          class Charset;
-          class CharsetDecoder;
-      }
-    }
-  }
-}
-
-class java::util::zip::ZipFile$PartialInputStream : public ::java::io::InputStream
-{
-
-public:
-  ZipFile$PartialInputStream(::java::io::RandomAccessFile *, jint);
-public: // actually package-private
-  void setLength(jlong);
-private:
-  void fillBuffer();
-public:
-  jint available();
-  jint read();
-  jint read(JArray< jbyte > *, jint, jint);
-  jlong skip(jlong);
-public: // actually package-private
-  void seek(jlong);
-  void readFully(JArray< jbyte > *);
-  void readFully(JArray< jbyte > *, jint, jint);
-  jint readLeShort();
-  jint readLeInt();
-private:
-  ::java::lang::String * decodeChars(JArray< jbyte > *, jint, jint);
-public: // actually package-private
-  ::java::lang::String * readString(jint);
-public:
-  void addDummyByte();
-private:
-  static ::java::nio::charset::Charset * UTF8CHARSET;
-  ::java::nio::charset::CharsetDecoder * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) utf8Decoder;
-  ::java::io::RandomAccessFile * raf;
-  JArray< jbyte > * buffer;
-  jlong bufferOffset;
-  jint pos;
-  jlong end;
-  jint dummyByteCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_ZipFile$PartialInputStream__
diff --git a/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h b/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h
deleted file mode 100644
index 40a7e975b2e..00000000000
--- a/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_ZipFile$ZipEntryEnumeration__
-#define __java_util_zip_ZipFile$ZipEntryEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::zip::ZipFile$ZipEntryEnumeration : public ::java::lang::Object
-{
-
-public:
-  ZipFile$ZipEntryEnumeration(::java::util::Iterator *);
-  virtual jboolean hasMoreElements();
-  virtual ::java::util::zip::ZipEntry * target$nextElement();
-  virtual ::java::lang::Object * nextElement();
-private:
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elements;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_ZipFile$ZipEntryEnumeration__
diff --git a/libjava/java/util/zip/ZipFile.h b/libjava/java/util/zip/ZipFile.h
deleted file mode 100644
index 7c0f69ca297..00000000000
--- a/libjava/java/util/zip/ZipFile.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_ZipFile__
-#define __java_util_zip_ZipFile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-
-class java::util::zip::ZipFile : public ::java::lang::Object
-{
-
-  ::java::io::RandomAccessFile * openFile(::java::lang::String *, ::java::io::File *);
-public:
-  ZipFile(::java::lang::String *);
-  ZipFile(::java::io::File *);
-  ZipFile(::java::io::File *, jint);
-private:
-  void checkZipFile();
-  void checkClosed();
-  void readEntries();
-public:
-  virtual void close();
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual ::java::util::Enumeration * entries();
-private:
-  ::java::util::LinkedHashMap * getEntries();
-public:
-  virtual ::java::util::zip::ZipEntry * getEntry(::java::lang::String *);
-  virtual ::java::io::InputStream * getInputStream(::java::util::zip::ZipEntry *);
-  virtual ::java::lang::String * getName();
-  virtual jint size();
-  static const jint OPEN_READ = 1;
-  static const jint OPEN_DELETE = 4;
-public: // actually package-private
-  static const jint ENDNRD = 4;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::io::RandomAccessFile * raf;
-  ::java::util::LinkedHashMap * entries__;
-  jboolean closed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_ZipFile__
diff --git a/libjava/java/util/zip/ZipInputStream.h b/libjava/java/util/zip/ZipInputStream.h
deleted file mode 100644
index 4a84395060e..00000000000
--- a/libjava/java/util/zip/ZipInputStream.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_ZipInputStream__
-#define __java_util_zip_ZipInputStream__
-
-#pragma interface
-
-#include <java/util/zip/InflaterInputStream.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::ZipInputStream : public ::java::util::zip::InflaterInputStream
-{
-
-public:
-  ZipInputStream(::java::io::InputStream *);
-private:
-  void fillBuf();
-  jint readBuf(JArray< jbyte > *, jint, jint);
-  void readFully(JArray< jbyte > *);
-  jint readLeByte();
-  jint readLeShort();
-  jint readLeInt();
-public:
-  virtual ::java::util::zip::ZipEntry * getNextEntry();
-private:
-  void readDataDescr();
-public:
-  virtual void closeEntry();
-  virtual jint available();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void close();
-public: // actually protected
-  virtual ::java::util::zip::ZipEntry * createZipEntry(::java::lang::String *);
-private:
-  ::java::util::zip::CRC32 * __attribute__((aligned(__alignof__( ::java::util::zip::InflaterInputStream)))) crc;
-  ::java::util::zip::ZipEntry * entry;
-  jint csize;
-  jint size;
-  jint method;
-  jint flags;
-  jint avail;
-  jboolean entryAtEOF;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_ZipInputStream__
diff --git a/libjava/java/util/zip/ZipOutputStream.h b/libjava/java/util/zip/ZipOutputStream.h
deleted file mode 100644
index 0de152efc63..00000000000
--- a/libjava/java/util/zip/ZipOutputStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_util_zip_ZipOutputStream__
-#define __java_util_zip_ZipOutputStream__
-
-#pragma interface
-
-#include <java/util/zip/DeflaterOutputStream.h>
-#include <gcj/array.h>
-
-
-class java::util::zip::ZipOutputStream : public ::java::util::zip::DeflaterOutputStream
-{
-
-public:
-  ZipOutputStream(::java::io::OutputStream *);
-  virtual void setComment(::java::lang::String *);
-  virtual void setMethod(jint);
-  virtual void setLevel(jint);
-private:
-  void writeLeShort(jint);
-  void writeLeInt(jint);
-  void writeLeInt(jlong);
-public:
-  virtual void putNextEntry(::java::util::zip::ZipEntry *);
-  virtual void closeEntry();
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void finish();
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::util::zip::DeflaterOutputStream)))) entries;
-  ::java::util::zip::CRC32 * crc;
-  ::java::util::zip::ZipEntry * curEntry;
-  jint curMethod;
-  jint size;
-  jint offset;
-  JArray< jbyte > * zipComment;
-  jint defaultMethod;
-  static const jint ZIP_STORED_VERSION = 10;
-  static const jint ZIP_DEFLATED_VERSION = 20;
-public:
-  static const jint STORED = 0;
-  static const jint DEFLATED = 8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_util_zip_ZipOutputStream__
diff --git a/libjava/javax/accessibility/Accessible.h b/libjava/javax/accessibility/Accessible.h
deleted file mode 100644
index 04dab4e5794..00000000000
--- a/libjava/javax/accessibility/Accessible.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_Accessible__
-#define __javax_accessibility_Accessible__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleContext;
-    }
-  }
-}
-
-class javax::accessibility::Accessible : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_Accessible__
diff --git a/libjava/javax/accessibility/AccessibleAction.h b/libjava/javax/accessibility/AccessibleAction.h
deleted file mode 100644
index ede23c9d2c4..00000000000
--- a/libjava/javax/accessibility/AccessibleAction.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleAction__
-#define __javax_accessibility_AccessibleAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleAction : public ::java::lang::Object
-{
-
-public:
-  virtual jint getAccessibleActionCount() = 0;
-  virtual ::java::lang::String * getAccessibleActionDescription(jint) = 0;
-  virtual jboolean doAccessibleAction(jint) = 0;
-  static ::java::lang::String * DECREMENT;
-  static ::java::lang::String * INCREMENT;
-  static ::java::lang::String * TOGGLE_EXPAND;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleAction__
diff --git a/libjava/javax/accessibility/AccessibleAttributeSequence.h b/libjava/javax/accessibility/AccessibleAttributeSequence.h
deleted file mode 100644
index e9d76b02db1..00000000000
--- a/libjava/javax/accessibility/AccessibleAttributeSequence.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleAttributeSequence__
-#define __javax_accessibility_AccessibleAttributeSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAttributeSequence;
-    }
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::accessibility::AccessibleAttributeSequence : public ::java::lang::Object
-{
-
-public:
-  AccessibleAttributeSequence();
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
-  jint startIndex;
-  jint endIndex;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleAttributeSequence__
diff --git a/libjava/javax/accessibility/AccessibleBundle.h b/libjava/javax/accessibility/AccessibleBundle.h
deleted file mode 100644
index 65413778af7..00000000000
--- a/libjava/javax/accessibility/AccessibleBundle.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleBundle__
-#define __javax_accessibility_AccessibleBundle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleBundle;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleBundle : public ::java::lang::Object
-{
-
-public:
-  AccessibleBundle();
-public: // actually protected
-  virtual ::java::lang::String * toDisplayString(::java::lang::String *, ::java::util::Locale *);
-public:
-  virtual ::java::lang::String * toDisplayString(::java::util::Locale *);
-  virtual ::java::lang::String * toDisplayString();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleBundle__
diff --git a/libjava/javax/accessibility/AccessibleComponent.h b/libjava/javax/accessibility/AccessibleComponent.h
deleted file mode 100644
index 3f260f24c31..00000000000
--- a/libjava/javax/accessibility/AccessibleComponent.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleComponent__
-#define __javax_accessibility_AccessibleComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleComponent;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleComponent : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Color * getBackground() = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual ::java::awt::Color * getForeground() = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual ::java::awt::Cursor * getCursor() = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual ::java::awt::Font * getFont() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual jboolean isEnabled() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual jboolean isVisible() = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual jboolean isShowing() = 0;
-  virtual jboolean contains(::java::awt::Point *) = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Point * getLocation() = 0;
-  virtual void setLocation(::java::awt::Point *) = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void setBounds(::java::awt::Rectangle *) = 0;
-  virtual ::java::awt::Dimension * getSize() = 0;
-  virtual void setSize(::java::awt::Dimension *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *) = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual void requestFocus() = 0;
-  virtual void addFocusListener(::java::awt::event::FocusListener *) = 0;
-  virtual void removeFocusListener(::java::awt::event::FocusListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleComponent__
diff --git a/libjava/javax/accessibility/AccessibleContext.h b/libjava/javax/accessibility/AccessibleContext.h
deleted file mode 100644
index 764af3aa883..00000000000
--- a/libjava/javax/accessibility/AccessibleContext.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleContext__
-#define __javax_accessibility_AccessibleContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleAction;
-        class AccessibleComponent;
-        class AccessibleContext;
-        class AccessibleEditableText;
-        class AccessibleIcon;
-        class AccessibleRelationSet;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-        class AccessibleTable;
-        class AccessibleText;
-        class AccessibleValue;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleContext : public ::java::lang::Object
-{
-
-public:
-  AccessibleContext();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual void setAccessibleName(::java::lang::String *);
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual void setAccessibleDescription(::java::lang::String *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole() = 0;
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet() = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleParent();
-  virtual void setAccessibleParent(::javax::accessibility::Accessible *);
-  virtual jint getAccessibleIndexInParent() = 0;
-  virtual jint getAccessibleChildrenCount() = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint) = 0;
-  virtual ::java::util::Locale * getLocale() = 0;
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual ::javax::accessibility::AccessibleEditableText * getAccessibleEditableText();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual JArray< ::javax::accessibility::AccessibleIcon * > * getAccessibleIcon();
-  virtual ::javax::accessibility::AccessibleRelationSet * getAccessibleRelationSet();
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleTable();
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::String * ACCESSIBLE_NAME_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_DESCRIPTION_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_STATE_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_VALUE_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_SELECTION_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_TEXT_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_CARET_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_VISIBLE_DATA_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_CHILD_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_TABLE_CAPTION_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_SUMMARY_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_MODEL_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_ROW_HEADER_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_ROW_DESCRIPTION_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_COLUMN_HEADER_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_TABLE_COLUMN_DESCRIPTION_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_ACTION_PROPERTY;
-  static ::java::lang::String * ACCESSIBLE_HYPERTEXT_OFFSET;
-  static ::java::lang::String * ACCESSIBLE_COMPONENT_BOUNDS_CHANGED;
-  static ::java::lang::String * ACCESSIBLE_INVALIDATE_CHILDREN;
-  static ::java::lang::String * ACCESSIBLE_TEXT_ATTRIBUTES_CHANGED;
-public: // actually protected
-  ::javax::accessibility::Accessible * __attribute__((aligned(__alignof__( ::java::lang::Object)))) accessibleParent;
-  ::java::lang::String * accessibleName;
-  ::java::lang::String * accessibleDescription;
-private:
-  ::java::beans::PropertyChangeSupport * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleContext__
diff --git a/libjava/javax/accessibility/AccessibleEditableText.h b/libjava/javax/accessibility/AccessibleEditableText.h
deleted file mode 100644
index 715abae2ff3..00000000000
--- a/libjava/javax/accessibility/AccessibleEditableText.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleEditableText__
-#define __javax_accessibility_AccessibleEditableText__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleEditableText;
-    }
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::accessibility::AccessibleEditableText : public ::java::lang::Object
-{
-
-public:
-  virtual void setTextContents(::java::lang::String *) = 0;
-  virtual void insertTextAtIndex(jint, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTextRange(jint, jint) = 0;
-  virtual void delete$(jint, jint) = 0;
-  virtual void cut(jint, jint) = 0;
-  virtual void paste(jint) = 0;
-  virtual void replaceText(jint, jint, ::java::lang::String *) = 0;
-  virtual void selectText(jint, jint) = 0;
-  virtual void setAttributes(jint, jint, ::javax::swing::text::AttributeSet *) = 0;
-  virtual jint getIndexAtPoint(::java::awt::Point *) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jint getCharCount() = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual ::java::lang::String * getAtIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getAfterIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getBeforeIndex(jint, jint) = 0;
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint) = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual jint getSelectionEnd() = 0;
-  virtual ::java::lang::String * getSelectedText() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleEditableText__
diff --git a/libjava/javax/accessibility/AccessibleExtendedComponent.h b/libjava/javax/accessibility/AccessibleExtendedComponent.h
deleted file mode 100644
index 92563b3b435..00000000000
--- a/libjava/javax/accessibility/AccessibleExtendedComponent.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleExtendedComponent__
-#define __javax_accessibility_AccessibleExtendedComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleExtendedComponent;
-        class AccessibleKeyBinding;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleExtendedComponent : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getToolTipText() = 0;
-  virtual ::java::lang::String * getTitledBorderText() = 0;
-  virtual ::javax::accessibility::AccessibleKeyBinding * getAccessibleKeyBinding() = 0;
-  virtual ::java::awt::Color * getBackground() = 0;
-  virtual void setBackground(::java::awt::Color *) = 0;
-  virtual ::java::awt::Color * getForeground() = 0;
-  virtual void setForeground(::java::awt::Color *) = 0;
-  virtual ::java::awt::Cursor * getCursor() = 0;
-  virtual void setCursor(::java::awt::Cursor *) = 0;
-  virtual ::java::awt::Font * getFont() = 0;
-  virtual void setFont(::java::awt::Font *) = 0;
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *) = 0;
-  virtual jboolean isEnabled() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual jboolean isVisible() = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual jboolean isShowing() = 0;
-  virtual jboolean contains(::java::awt::Point *) = 0;
-  virtual ::java::awt::Point * getLocationOnScreen() = 0;
-  virtual ::java::awt::Point * getLocation() = 0;
-  virtual void setLocation(::java::awt::Point *) = 0;
-  virtual ::java::awt::Rectangle * getBounds() = 0;
-  virtual void setBounds(::java::awt::Rectangle *) = 0;
-  virtual ::java::awt::Dimension * getSize() = 0;
-  virtual void setSize(::java::awt::Dimension *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *) = 0;
-  virtual jboolean isFocusTraversable() = 0;
-  virtual void requestFocus() = 0;
-  virtual void addFocusListener(::java::awt::event::FocusListener *) = 0;
-  virtual void removeFocusListener(::java::awt::event::FocusListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleExtendedComponent__
diff --git a/libjava/javax/accessibility/AccessibleExtendedTable.h b/libjava/javax/accessibility/AccessibleExtendedTable.h
deleted file mode 100644
index 995b3e50c62..00000000000
--- a/libjava/javax/accessibility/AccessibleExtendedTable.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleExtendedTable__
-#define __javax_accessibility_AccessibleExtendedTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleExtendedTable;
-        class AccessibleTable;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleExtendedTable : public ::java::lang::Object
-{
-
-public:
-  virtual jint getAccessibleRow(jint) = 0;
-  virtual jint getAccessibleColumn(jint) = 0;
-  virtual jint getAccessibleIndex(jint, jint) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleCaption() = 0;
-  virtual void setAccessibleCaption(::javax::accessibility::Accessible *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleSummary() = 0;
-  virtual void setAccessibleSummary(::javax::accessibility::Accessible *) = 0;
-  virtual jint getAccessibleRowCount() = 0;
-  virtual jint getAccessibleColumnCount() = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(jint, jint) = 0;
-  virtual jint getAccessibleRowExtentAt(jint, jint) = 0;
-  virtual jint getAccessibleColumnExtentAt(jint, jint) = 0;
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleRowHeader() = 0;
-  virtual void setAccessibleRowHeader(::javax::accessibility::AccessibleTable *) = 0;
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleColumnHeader() = 0;
-  virtual void setAccessibleColumnHeader(::javax::accessibility::AccessibleTable *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleRowDescription(jint) = 0;
-  virtual void setAccessibleRowDescription(jint, ::javax::accessibility::Accessible *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleColumnDescription(jint) = 0;
-  virtual void setAccessibleColumnDescription(jint, ::javax::accessibility::Accessible *) = 0;
-  virtual jboolean isAccessibleSelected(jint, jint) = 0;
-  virtual jboolean isAccessibleRowSelected(jint) = 0;
-  virtual jboolean isAccessibleColumnSelected(jint) = 0;
-  virtual JArray< jint > * getSelectedAccessibleRows() = 0;
-  virtual JArray< jint > * getSelectedAccessibleColumns() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleExtendedTable__
diff --git a/libjava/javax/accessibility/AccessibleExtendedText.h b/libjava/javax/accessibility/AccessibleExtendedText.h
deleted file mode 100644
index b947e664356..00000000000
--- a/libjava/javax/accessibility/AccessibleExtendedText.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleExtendedText__
-#define __javax_accessibility_AccessibleExtendedText__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleExtendedText;
-        class AccessibleTextSequence;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleExtendedText : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Rectangle * getTextBounds(jint, jint) = 0;
-  virtual ::java::lang::String * getTextRange(jint, jint) = 0;
-  virtual ::javax::accessibility::AccessibleTextSequence * getTextSequenceAfter(jint, jint) = 0;
-  virtual ::javax::accessibility::AccessibleTextSequence * getTextSequenceAt(jint, jint) = 0;
-  virtual ::javax::accessibility::AccessibleTextSequence * getTextSequenceBefore(jint, jint) = 0;
-  static const jint LINE = 4;
-  static const jint ATTRIBUTE_RUN = 5;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleExtendedText__
diff --git a/libjava/javax/accessibility/AccessibleHyperlink.h b/libjava/javax/accessibility/AccessibleHyperlink.h
deleted file mode 100644
index 08833559f19..00000000000
--- a/libjava/javax/accessibility/AccessibleHyperlink.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleHyperlink__
-#define __javax_accessibility_AccessibleHyperlink__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleHyperlink;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleHyperlink : public ::java::lang::Object
-{
-
-public:
-  AccessibleHyperlink();
-  virtual jboolean isValid() = 0;
-  virtual jint getAccessibleActionCount() = 0;
-  virtual jboolean doAccessibleAction(jint) = 0;
-  virtual ::java::lang::String * getAccessibleActionDescription(jint) = 0;
-  virtual ::java::lang::Object * getAccessibleActionObject(jint) = 0;
-  virtual ::java::lang::Object * getAccessibleActionAnchor(jint) = 0;
-  virtual jint getStartIndex() = 0;
-  virtual jint getEndIndex() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleHyperlink__
diff --git a/libjava/javax/accessibility/AccessibleHypertext.h b/libjava/javax/accessibility/AccessibleHypertext.h
deleted file mode 100644
index 0aac63529ad..00000000000
--- a/libjava/javax/accessibility/AccessibleHypertext.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleHypertext__
-#define __javax_accessibility_AccessibleHypertext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleHyperlink;
-        class AccessibleHypertext;
-    }
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::accessibility::AccessibleHypertext : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLinkCount() = 0;
-  virtual ::javax::accessibility::AccessibleHyperlink * getLink(jint) = 0;
-  virtual jint getLinkIndex(jint) = 0;
-  virtual jint getIndexAtPoint(::java::awt::Point *) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jint getCharCount() = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual ::java::lang::String * getAtIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getAfterIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getBeforeIndex(jint, jint) = 0;
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint) = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual jint getSelectionEnd() = 0;
-  virtual ::java::lang::String * getSelectedText() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleHypertext__
diff --git a/libjava/javax/accessibility/AccessibleIcon.h b/libjava/javax/accessibility/AccessibleIcon.h
deleted file mode 100644
index c2966204818..00000000000
--- a/libjava/javax/accessibility/AccessibleIcon.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleIcon__
-#define __javax_accessibility_AccessibleIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleIcon;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleIcon : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAccessibleIconDescription() = 0;
-  virtual void setAccessibleIconDescription(::java::lang::String *) = 0;
-  virtual jint getAccessibleIconWidth() = 0;
-  virtual jint getAccessibleIconHeight() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleIcon__
diff --git a/libjava/javax/accessibility/AccessibleKeyBinding.h b/libjava/javax/accessibility/AccessibleKeyBinding.h
deleted file mode 100644
index 472b7d0b761..00000000000
--- a/libjava/javax/accessibility/AccessibleKeyBinding.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleKeyBinding__
-#define __javax_accessibility_AccessibleKeyBinding__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleKeyBinding;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleKeyBinding : public ::java::lang::Object
-{
-
-public:
-  virtual jint getAccessibleKeyBindingCount() = 0;
-  virtual ::java::lang::Object * getAccessibleKeyBinding(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleKeyBinding__
diff --git a/libjava/javax/accessibility/AccessibleRelation.h b/libjava/javax/accessibility/AccessibleRelation.h
deleted file mode 100644
index f0d3a9dab99..00000000000
--- a/libjava/javax/accessibility/AccessibleRelation.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleRelation__
-#define __javax_accessibility_AccessibleRelation__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRelation;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleRelation : public ::javax::accessibility::AccessibleBundle
-{
-
-public:
-  AccessibleRelation(::java::lang::String *);
-  AccessibleRelation(::java::lang::String *, ::java::lang::Object *);
-  AccessibleRelation(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::String * getKey();
-  virtual JArray< ::java::lang::Object * > * getTarget();
-  virtual void setTarget(::java::lang::Object *);
-  virtual void setTarget(JArray< ::java::lang::Object * > *);
-  static ::java::lang::String * LABEL_FOR;
-  static ::java::lang::String * LABELED_BY;
-  static ::java::lang::String * MEMBER_OF;
-  static ::java::lang::String * CONTROLLER_FOR;
-  static ::java::lang::String * CONTROLLED_BY;
-  static ::java::lang::String * LABEL_FOR_PROPERTY;
-  static ::java::lang::String * LABELED_BY_PROPERTY;
-  static ::java::lang::String * MEMBER_OF_PROPERTY;
-  static ::java::lang::String * CONTROLLER_FOR_PROPERTY;
-  static ::java::lang::String * CONTROLLED_BY_PROPERTY;
-  static ::java::lang::String * CHILD_NODE_OF;
-  static ::java::lang::String * CHILD_NODE_OF_PROPERTY;
-  static ::java::lang::String * EMBEDDED_BY;
-  static ::java::lang::String * EMBEDDED_BY_PROPERTY;
-  static ::java::lang::String * EMBEDS;
-  static ::java::lang::String * EMBEDS_PROPERTY;
-  static ::java::lang::String * FLOWS_FROM;
-  static ::java::lang::String * FLOWS_FROM_PROPERTY;
-  static ::java::lang::String * FLOWS_TO;
-  static ::java::lang::String * FLOWS_TO_PROPERTY;
-  static ::java::lang::String * PARENT_WINDOW_OF;
-  static ::java::lang::String * PARENT_WINDOW_OF_PROPERTY;
-  static ::java::lang::String * SUBWINDOW_OF;
-  static ::java::lang::String * SUBWINDOW_OF_PROPERTY;
-private:
-  static JArray< ::java::lang::Object * > * EMPTY_TARGETS;
-public: // actually package-private
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleBundle)))) targets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleRelation__
diff --git a/libjava/javax/accessibility/AccessibleRelationSet.h b/libjava/javax/accessibility/AccessibleRelationSet.h
deleted file mode 100644
index 6c2d4d42afd..00000000000
--- a/libjava/javax/accessibility/AccessibleRelationSet.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleRelationSet__
-#define __javax_accessibility_AccessibleRelationSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRelation;
-        class AccessibleRelationSet;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleRelationSet : public ::java::lang::Object
-{
-
-public:
-  AccessibleRelationSet();
-  AccessibleRelationSet(JArray< ::javax::accessibility::AccessibleRelation * > *);
-  virtual jboolean add(::javax::accessibility::AccessibleRelation *);
-  virtual void addAll(JArray< ::javax::accessibility::AccessibleRelation * > *);
-  virtual jboolean remove(::javax::accessibility::AccessibleRelation *);
-  virtual void clear();
-  virtual jint size();
-  virtual jboolean contains(::java::lang::String *);
-  virtual ::javax::accessibility::AccessibleRelation * get(::java::lang::String *);
-  virtual JArray< ::javax::accessibility::AccessibleRelation * > * toArray();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) relations;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleRelationSet__
diff --git a/libjava/javax/accessibility/AccessibleResourceBundle.h b/libjava/javax/accessibility/AccessibleResourceBundle.h
deleted file mode 100644
index 87370a8a23d..00000000000
--- a/libjava/javax/accessibility/AccessibleResourceBundle.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleResourceBundle__
-#define __javax_accessibility_AccessibleResourceBundle__
-
-#pragma interface
-
-#include <java/util/ListResourceBundle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleResourceBundle;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleResourceBundle : public ::java::util::ListResourceBundle
-{
-
-public:
-  AccessibleResourceBundle();
-  virtual JArray< JArray< ::java::lang::Object * > * > * getContents();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleResourceBundle__
diff --git a/libjava/javax/accessibility/AccessibleRole.h b/libjava/javax/accessibility/AccessibleRole.h
deleted file mode 100644
index 1fd9e3cf0d4..00000000000
--- a/libjava/javax/accessibility/AccessibleRole.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleRole__
-#define __javax_accessibility_AccessibleRole__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleBundle.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleRole : public ::javax::accessibility::AccessibleBundle
-{
-
-public: // actually protected
-  AccessibleRole(::java::lang::String *);
-public:
-  static ::javax::accessibility::AccessibleRole * ALERT;
-  static ::javax::accessibility::AccessibleRole * COLUMN_HEADER;
-  static ::javax::accessibility::AccessibleRole * CANVAS;
-  static ::javax::accessibility::AccessibleRole * COMBO_BOX;
-  static ::javax::accessibility::AccessibleRole * DESKTOP_ICON;
-  static ::javax::accessibility::AccessibleRole * INTERNAL_FRAME;
-  static ::javax::accessibility::AccessibleRole * DESKTOP_PANE;
-  static ::javax::accessibility::AccessibleRole * OPTION_PANE;
-  static ::javax::accessibility::AccessibleRole * WINDOW;
-  static ::javax::accessibility::AccessibleRole * FRAME;
-  static ::javax::accessibility::AccessibleRole * DIALOG;
-  static ::javax::accessibility::AccessibleRole * COLOR_CHOOSER;
-  static ::javax::accessibility::AccessibleRole * DIRECTORY_PANE;
-  static ::javax::accessibility::AccessibleRole * FILE_CHOOSER;
-  static ::javax::accessibility::AccessibleRole * FILLER;
-  static ::javax::accessibility::AccessibleRole * HYPERLINK;
-  static ::javax::accessibility::AccessibleRole * ICON;
-  static ::javax::accessibility::AccessibleRole * LABEL;
-  static ::javax::accessibility::AccessibleRole * ROOT_PANE;
-  static ::javax::accessibility::AccessibleRole * GLASS_PANE;
-  static ::javax::accessibility::AccessibleRole * LAYERED_PANE;
-  static ::javax::accessibility::AccessibleRole * LIST;
-  static ::javax::accessibility::AccessibleRole * LIST_ITEM;
-  static ::javax::accessibility::AccessibleRole * MENU_BAR;
-  static ::javax::accessibility::AccessibleRole * POPUP_MENU;
-  static ::javax::accessibility::AccessibleRole * MENU;
-  static ::javax::accessibility::AccessibleRole * MENU_ITEM;
-  static ::javax::accessibility::AccessibleRole * SEPARATOR;
-  static ::javax::accessibility::AccessibleRole * PAGE_TAB_LIST;
-  static ::javax::accessibility::AccessibleRole * PAGE_TAB;
-  static ::javax::accessibility::AccessibleRole * PANEL;
-  static ::javax::accessibility::AccessibleRole * PROGRESS_BAR;
-  static ::javax::accessibility::AccessibleRole * PASSWORD_TEXT;
-  static ::javax::accessibility::AccessibleRole * PUSH_BUTTON;
-  static ::javax::accessibility::AccessibleRole * TOGGLE_BUTTON;
-  static ::javax::accessibility::AccessibleRole * CHECK_BOX;
-  static ::javax::accessibility::AccessibleRole * RADIO_BUTTON;
-  static ::javax::accessibility::AccessibleRole * ROW_HEADER;
-  static ::javax::accessibility::AccessibleRole * SCROLL_PANE;
-  static ::javax::accessibility::AccessibleRole * SCROLL_BAR;
-  static ::javax::accessibility::AccessibleRole * VIEWPORT;
-  static ::javax::accessibility::AccessibleRole * SLIDER;
-  static ::javax::accessibility::AccessibleRole * SPLIT_PANE;
-  static ::javax::accessibility::AccessibleRole * TABLE;
-  static ::javax::accessibility::AccessibleRole * TEXT;
-  static ::javax::accessibility::AccessibleRole * TREE;
-  static ::javax::accessibility::AccessibleRole * TOOL_BAR;
-  static ::javax::accessibility::AccessibleRole * TOOL_TIP;
-  static ::javax::accessibility::AccessibleRole * AWT_COMPONENT;
-  static ::javax::accessibility::AccessibleRole * SWING_COMPONENT;
-  static ::javax::accessibility::AccessibleRole * UNKNOWN;
-  static ::javax::accessibility::AccessibleRole * STATUS_BAR;
-  static ::javax::accessibility::AccessibleRole * DATE_EDITOR;
-  static ::javax::accessibility::AccessibleRole * SPIN_BOX;
-  static ::javax::accessibility::AccessibleRole * FONT_CHOOSER;
-  static ::javax::accessibility::AccessibleRole * GROUP_BOX;
-  static ::javax::accessibility::AccessibleRole * EDITBAR;
-  static ::javax::accessibility::AccessibleRole * FOOTER;
-  static ::javax::accessibility::AccessibleRole * HEADER;
-  static ::javax::accessibility::AccessibleRole * PARAGRAPH;
-  static ::javax::accessibility::AccessibleRole * PROGRESS_MONITOR;
-  static ::javax::accessibility::AccessibleRole * RULER;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleRole__
diff --git a/libjava/javax/accessibility/AccessibleSelection.h b/libjava/javax/accessibility/AccessibleSelection.h
deleted file mode 100644
index 3ab7b44948f..00000000000
--- a/libjava/javax/accessibility/AccessibleSelection.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleSelection__
-#define __javax_accessibility_AccessibleSelection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleSelection;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleSelection : public ::java::lang::Object
-{
-
-public:
-  virtual jint getAccessibleSelectionCount() = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint) = 0;
-  virtual jboolean isAccessibleChildSelected(jint) = 0;
-  virtual void addAccessibleSelection(jint) = 0;
-  virtual void removeAccessibleSelection(jint) = 0;
-  virtual void clearAccessibleSelection() = 0;
-  virtual void selectAllAccessibleSelection() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleSelection__
diff --git a/libjava/javax/accessibility/AccessibleState.h b/libjava/javax/accessibility/AccessibleState.h
deleted file mode 100644
index 3bc1adfe6b5..00000000000
--- a/libjava/javax/accessibility/AccessibleState.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleState__
-#define __javax_accessibility_AccessibleState__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleBundle.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleState;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleState : public ::javax::accessibility::AccessibleBundle
-{
-
-public: // actually protected
-  AccessibleState(::java::lang::String *);
-public:
-  static ::javax::accessibility::AccessibleState * ACTIVE;
-  static ::javax::accessibility::AccessibleState * PRESSED;
-  static ::javax::accessibility::AccessibleState * ARMED;
-  static ::javax::accessibility::AccessibleState * BUSY;
-  static ::javax::accessibility::AccessibleState * CHECKED;
-  static ::javax::accessibility::AccessibleState * EDITABLE;
-  static ::javax::accessibility::AccessibleState * EXPANDABLE;
-  static ::javax::accessibility::AccessibleState * COLLAPSED;
-  static ::javax::accessibility::AccessibleState * EXPANDED;
-  static ::javax::accessibility::AccessibleState * ENABLED;
-  static ::javax::accessibility::AccessibleState * FOCUSABLE;
-  static ::javax::accessibility::AccessibleState * FOCUSED;
-  static ::javax::accessibility::AccessibleState * ICONIFIED;
-  static ::javax::accessibility::AccessibleState * INDETERMINATE;
-  static ::javax::accessibility::AccessibleState * MANAGES_DESCENDANTS;
-  static ::javax::accessibility::AccessibleState * MODAL;
-  static ::javax::accessibility::AccessibleState * OPAQUE;
-  static ::javax::accessibility::AccessibleState * RESIZABLE;
-  static ::javax::accessibility::AccessibleState * MULTISELECTABLE;
-  static ::javax::accessibility::AccessibleState * SELECTABLE;
-  static ::javax::accessibility::AccessibleState * SELECTED;
-  static ::javax::accessibility::AccessibleState * SHOWING;
-  static ::javax::accessibility::AccessibleState * TRUNCATED;
-  static ::javax::accessibility::AccessibleState * VISIBLE;
-  static ::javax::accessibility::AccessibleState * VERTICAL;
-  static ::javax::accessibility::AccessibleState * HORIZONTAL;
-  static ::javax::accessibility::AccessibleState * SINGLE_LINE;
-  static ::javax::accessibility::AccessibleState * MULTI_LINE;
-  static ::javax::accessibility::AccessibleState * TRANSIENT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleState__
diff --git a/libjava/javax/accessibility/AccessibleStateSet.h b/libjava/javax/accessibility/AccessibleStateSet.h
deleted file mode 100644
index cf34e3aed03..00000000000
--- a/libjava/javax/accessibility/AccessibleStateSet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleStateSet__
-#define __javax_accessibility_AccessibleStateSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleState;
-        class AccessibleStateSet;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleStateSet : public ::java::lang::Object
-{
-
-public:
-  AccessibleStateSet();
-  AccessibleStateSet(JArray< ::javax::accessibility::AccessibleState * > *);
-  virtual jboolean add(::javax::accessibility::AccessibleState *);
-  virtual void addAll(JArray< ::javax::accessibility::AccessibleState * > *);
-  virtual jboolean remove(::javax::accessibility::AccessibleState *);
-  virtual void clear();
-  virtual jboolean contains(::javax::accessibility::AccessibleState *);
-  virtual JArray< ::javax::accessibility::AccessibleState * > * toArray();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) states;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleStateSet__
diff --git a/libjava/javax/accessibility/AccessibleStreamable.h b/libjava/javax/accessibility/AccessibleStreamable.h
deleted file mode 100644
index ed0e5ab1d43..00000000000
--- a/libjava/javax/accessibility/AccessibleStreamable.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleStreamable__
-#define __javax_accessibility_AccessibleStreamable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStreamable;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleStreamable : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getMimeTypes() = 0;
-  virtual ::java::io::InputStream * getStream(::java::awt::datatransfer::DataFlavor *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleStreamable__
diff --git a/libjava/javax/accessibility/AccessibleTable.h b/libjava/javax/accessibility/AccessibleTable.h
deleted file mode 100644
index 0c3531bbcb5..00000000000
--- a/libjava/javax/accessibility/AccessibleTable.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleTable__
-#define __javax_accessibility_AccessibleTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleTable;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleTable : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::accessibility::Accessible * getAccessibleCaption() = 0;
-  virtual void setAccessibleCaption(::javax::accessibility::Accessible *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleSummary() = 0;
-  virtual void setAccessibleSummary(::javax::accessibility::Accessible *) = 0;
-  virtual jint getAccessibleRowCount() = 0;
-  virtual jint getAccessibleColumnCount() = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(jint, jint) = 0;
-  virtual jint getAccessibleRowExtentAt(jint, jint) = 0;
-  virtual jint getAccessibleColumnExtentAt(jint, jint) = 0;
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleRowHeader() = 0;
-  virtual void setAccessibleRowHeader(::javax::accessibility::AccessibleTable *) = 0;
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleColumnHeader() = 0;
-  virtual void setAccessibleColumnHeader(::javax::accessibility::AccessibleTable *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleRowDescription(jint) = 0;
-  virtual void setAccessibleRowDescription(jint, ::javax::accessibility::Accessible *) = 0;
-  virtual ::javax::accessibility::Accessible * getAccessibleColumnDescription(jint) = 0;
-  virtual void setAccessibleColumnDescription(jint, ::javax::accessibility::Accessible *) = 0;
-  virtual jboolean isAccessibleSelected(jint, jint) = 0;
-  virtual jboolean isAccessibleRowSelected(jint) = 0;
-  virtual jboolean isAccessibleColumnSelected(jint) = 0;
-  virtual JArray< jint > * getSelectedAccessibleRows() = 0;
-  virtual JArray< jint > * getSelectedAccessibleColumns() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleTable__
diff --git a/libjava/javax/accessibility/AccessibleTableModelChange.h b/libjava/javax/accessibility/AccessibleTableModelChange.h
deleted file mode 100644
index f3dc58b4e84..00000000000
--- a/libjava/javax/accessibility/AccessibleTableModelChange.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleTableModelChange__
-#define __javax_accessibility_AccessibleTableModelChange__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleTableModelChange;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleTableModelChange : public ::java::lang::Object
-{
-
-public:
-  virtual jint getType() = 0;
-  virtual jint getFirstRow() = 0;
-  virtual jint getLastRow() = 0;
-  virtual jint getFirstColumn() = 0;
-  virtual jint getLastColumn() = 0;
-  static const jint INSERT = 1;
-  static const jint UPDATE = 0;
-  static const jint DELETE = -1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleTableModelChange__
diff --git a/libjava/javax/accessibility/AccessibleText.h b/libjava/javax/accessibility/AccessibleText.h
deleted file mode 100644
index f6ccf87c0ce..00000000000
--- a/libjava/javax/accessibility/AccessibleText.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleText__
-#define __javax_accessibility_AccessibleText__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleText;
-    }
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::accessibility::AccessibleText : public ::java::lang::Object
-{
-
-public:
-  virtual jint getIndexAtPoint(::java::awt::Point *) = 0;
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint) = 0;
-  virtual jint getCharCount() = 0;
-  virtual jint getCaretPosition() = 0;
-  virtual ::java::lang::String * getAtIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getAfterIndex(jint, jint) = 0;
-  virtual ::java::lang::String * getBeforeIndex(jint, jint) = 0;
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint) = 0;
-  virtual jint getSelectionStart() = 0;
-  virtual jint getSelectionEnd() = 0;
-  virtual ::java::lang::String * getSelectedText() = 0;
-  static const jint CHARACTER = 1;
-  static const jint WORD = 2;
-  static const jint SENTENCE = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleText__
diff --git a/libjava/javax/accessibility/AccessibleTextSequence.h b/libjava/javax/accessibility/AccessibleTextSequence.h
deleted file mode 100644
index 0c447e0fb21..00000000000
--- a/libjava/javax/accessibility/AccessibleTextSequence.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleTextSequence__
-#define __javax_accessibility_AccessibleTextSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleTextSequence;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleTextSequence : public ::java::lang::Object
-{
-
-public:
-  AccessibleTextSequence();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) text;
-  jint startIndex;
-  jint endIndex;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_accessibility_AccessibleTextSequence__
diff --git a/libjava/javax/accessibility/AccessibleValue.h b/libjava/javax/accessibility/AccessibleValue.h
deleted file mode 100644
index a82754ad412..00000000000
--- a/libjava/javax/accessibility/AccessibleValue.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_accessibility_AccessibleValue__
-#define __javax_accessibility_AccessibleValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleValue;
-    }
-  }
-}
-
-class javax::accessibility::AccessibleValue : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Number * getCurrentAccessibleValue() = 0;
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *) = 0;
-  virtual ::java::lang::Number * getMinimumAccessibleValue() = 0;
-  virtual ::java::lang::Number * getMaximumAccessibleValue() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_accessibility_AccessibleValue__
diff --git a/libjava/javax/crypto/BadPaddingException.h b/libjava/javax/crypto/BadPaddingException.h
deleted file mode 100644
index 201d4a06ffb..00000000000
--- a/libjava/javax/crypto/BadPaddingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_BadPaddingException__
-#define __javax_crypto_BadPaddingException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class BadPaddingException;
-    }
-  }
-}
-
-class javax::crypto::BadPaddingException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  BadPaddingException();
-  BadPaddingException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5315033893984728443LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_BadPaddingException__
diff --git a/libjava/javax/crypto/Cipher.h b/libjava/javax/crypto/Cipher.h
deleted file mode 100644
index b77c4d1d959..00000000000
--- a/libjava/javax/crypto/Cipher.h
+++ /dev/null
@@ -1,106 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_Cipher__
-#define __javax_crypto_Cipher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class Provider;
-        class SecureRandom;
-      namespace cert
-      {
-          class Certificate;
-      }
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class CipherSpi;
-        class ExemptionMechanism;
-    }
-  }
-}
-
-class javax::crypto::Cipher : public ::java::lang::Object
-{
-
-public:
-  static ::javax::crypto::Cipher * getInstance(::java::lang::String *);
-  static ::javax::crypto::Cipher * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::Cipher * getInstance(::java::lang::String *, ::java::security::Provider *);
-public: // actually protected
-  Cipher(::javax::crypto::CipherSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  virtual jint getBlockSize();
-  virtual ::javax::crypto::ExemptionMechanism * getExemptionMechanism();
-  virtual JArray< jbyte > * getIV();
-  virtual ::java::security::AlgorithmParameters * getParameters();
-  virtual ::java::security::Provider * getProvider();
-  virtual JArray< jbyte > * doFinal();
-  virtual JArray< jbyte > * doFinal(JArray< jbyte > *);
-  virtual JArray< jbyte > * doFinal(JArray< jbyte > *, jint, jint);
-  virtual jint doFinal(JArray< jbyte > *, jint);
-  virtual jint doFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual jint doFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *);
-  virtual jint doFinal(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual jint getOutputSize(jint);
-  virtual void init(jint, ::java::security::cert::Certificate *);
-  virtual void init(jint, ::java::security::Key *);
-  virtual void init(jint, ::java::security::cert::Certificate *, ::java::security::SecureRandom *);
-  virtual void init(jint, ::java::security::Key *, ::java::security::SecureRandom *);
-  virtual void init(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *);
-  virtual void init(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual void init(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
-  virtual void init(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual ::java::security::Key * unwrap(JArray< jbyte > *, ::java::lang::String *, jint);
-  virtual JArray< jbyte > * update(JArray< jbyte > *);
-  virtual JArray< jbyte > * update(JArray< jbyte > *, jint, jint);
-  virtual jint update(JArray< jbyte > *, jint, jint, JArray< jbyte > *);
-  virtual jint update(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  virtual jint update(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual JArray< jbyte > * wrap(::java::security::Key *);
-private:
-  static ::java::lang::String * SERVICE;
-public:
-  static const jint DECRYPT_MODE = 2;
-  static const jint ENCRYPT_MODE = 1;
-  static const jint PRIVATE_KEY = 2;
-  static const jint PUBLIC_KEY = 1;
-  static const jint SECRET_KEY = 3;
-  static const jint UNWRAP_MODE = 4;
-  static const jint WRAP_MODE = 3;
-private:
-  static const jint INITIAL_STATE = 0;
-  ::javax::crypto::CipherSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cipherSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * transformation;
-  jint state;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_Cipher__
diff --git a/libjava/javax/crypto/CipherInputStream.h b/libjava/javax/crypto/CipherInputStream.h
deleted file mode 100644
index e4c16e17375..00000000000
--- a/libjava/javax/crypto/CipherInputStream.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_CipherInputStream__
-#define __javax_crypto_CipherInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class CipherInputStream;
-    }
-  }
-}
-
-class javax::crypto::CipherInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  CipherInputStream(::java::io::InputStream *, ::javax::crypto::Cipher *);
-public: // actually protected
-  CipherInputStream(::java::io::InputStream *);
-public:
-  virtual jint available();
-  virtual void close();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jint read(JArray< jbyte > *);
-  virtual jlong skip(jlong);
-  virtual jboolean markSupported();
-  virtual void mark(jint);
-  virtual void reset();
-private:
-  void nextBlock();
-  static ::java::util::logging::Logger * logger;
-  ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) cipher;
-  JArray< jbyte > * outBuffer;
-  jint outOffset;
-  jboolean isStream;
-  jboolean eof;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_CipherInputStream__
diff --git a/libjava/javax/crypto/CipherOutputStream.h b/libjava/javax/crypto/CipherOutputStream.h
deleted file mode 100644
index 59da0000719..00000000000
--- a/libjava/javax/crypto/CipherOutputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_CipherOutputStream__
-#define __javax_crypto_CipherOutputStream__
-
-#pragma interface
-
-#include <java/io/FilterOutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class CipherOutputStream;
-    }
-  }
-}
-
-class javax::crypto::CipherOutputStream : public ::java::io::FilterOutputStream
-{
-
-public:
-  CipherOutputStream(::java::io::OutputStream *, ::javax::crypto::Cipher *);
-public: // actually protected
-  CipherOutputStream(::java::io::OutputStream *);
-public:
-  virtual void close();
-  virtual void flush();
-  virtual void write(jint);
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint);
-private:
-  ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) cipher;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_CipherOutputStream__
diff --git a/libjava/javax/crypto/CipherSpi.h b/libjava/javax/crypto/CipherSpi.h
deleted file mode 100644
index dd79290401f..00000000000
--- a/libjava/javax/crypto/CipherSpi.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_CipherSpi__
-#define __javax_crypto_CipherSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class CipherSpi;
-    }
-  }
-}
-
-class javax::crypto::CipherSpi : public ::java::lang::Object
-{
-
-public:
-  CipherSpi();
-public: // actually protected
-  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint) = 0;
-  virtual jint engineDoFinal(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual jint engineGetBlockSize() = 0;
-  virtual JArray< jbyte > * engineGetIV() = 0;
-  virtual jint engineGetKeySize(::java::security::Key *);
-  virtual jint engineGetOutputSize(jint) = 0;
-  virtual ::java::security::AlgorithmParameters * engineGetParameters() = 0;
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
-  virtual void engineSetMode(::java::lang::String *) = 0;
-  virtual void engineSetPadding(::java::lang::String *) = 0;
-  virtual ::java::security::Key * engineUnwrap(JArray< jbyte > *, ::java::lang::String *, jint);
-  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint) = 0;
-  virtual jint engineUpdate(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual JArray< jbyte > * engineWrap(::java::security::Key *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_CipherSpi__
diff --git a/libjava/javax/crypto/EncryptedPrivateKeyInfo.h b/libjava/javax/crypto/EncryptedPrivateKeyInfo.h
deleted file mode 100644
index 54818e1b55f..00000000000
--- a/libjava/javax/crypto/EncryptedPrivateKeyInfo.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_EncryptedPrivateKeyInfo__
-#define __javax_crypto_EncryptedPrivateKeyInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-      namespace spec
-      {
-          class PKCS8EncodedKeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class EncryptedPrivateKeyInfo;
-    }
-  }
-}
-
-class javax::crypto::EncryptedPrivateKeyInfo : public ::java::lang::Object
-{
-
-public:
-  EncryptedPrivateKeyInfo(::java::security::AlgorithmParameters *, JArray< jbyte > *);
-  EncryptedPrivateKeyInfo(JArray< jbyte > *);
-  EncryptedPrivateKeyInfo(::java::lang::String *, JArray< jbyte > *);
-private:
-  static ::gnu::java::security::OID * getOid(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getAlgName();
-  virtual ::java::security::AlgorithmParameters * getAlgParameters();
-  virtual JArray< jbyte > * getEncoded();
-  virtual JArray< jbyte > * getEncryptedData();
-  virtual ::java::security::spec::PKCS8EncodedKeySpec * getKeySpec(::javax::crypto::Cipher *);
-private:
-  void decode();
-  void encode();
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) encryptedData;
-  JArray< jbyte > * encoded;
-  ::gnu::java::security::OID * algOid;
-  ::java::lang::String * algName;
-  ::java::security::AlgorithmParameters * params;
-  JArray< jbyte > * encodedParams;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_EncryptedPrivateKeyInfo__
diff --git a/libjava/javax/crypto/ExemptionMechanism.h b/libjava/javax/crypto/ExemptionMechanism.h
deleted file mode 100644
index 65a0454661c..00000000000
--- a/libjava/javax/crypto/ExemptionMechanism.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_ExemptionMechanism__
-#define __javax_crypto_ExemptionMechanism__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class Provider;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class ExemptionMechanism;
-        class ExemptionMechanismSpi;
-    }
-  }
-}
-
-class javax::crypto::ExemptionMechanism : public ::java::lang::Object
-{
-
-public: // actually protected
-  ExemptionMechanism(::javax::crypto::ExemptionMechanismSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::crypto::ExemptionMechanism * getInstance(::java::lang::String *);
-  static ::javax::crypto::ExemptionMechanism * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::ExemptionMechanism * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual JArray< jbyte > * genExemptionBlob();
-  virtual jint genExemptionBlob(JArray< jbyte > *);
-  virtual jint genExemptionBlob(JArray< jbyte > *, jint);
-  virtual ::java::lang::String * getName();
-  virtual jint getOutputSize(jint);
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::java::security::Key *);
-  virtual void init(::java::security::Key *, ::java::security::AlgorithmParameters *);
-  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual jboolean isCryptoAllowed(::java::security::Key *);
-public: // actually protected
-  virtual void finalize();
-private:
-  static ::java::lang::String * SERVICE;
-  ::javax::crypto::ExemptionMechanismSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) emSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * mechanism;
-  jboolean virgin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_ExemptionMechanism__
diff --git a/libjava/javax/crypto/ExemptionMechanismException.h b/libjava/javax/crypto/ExemptionMechanismException.h
deleted file mode 100644
index 79dd95f2069..00000000000
--- a/libjava/javax/crypto/ExemptionMechanismException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_ExemptionMechanismException__
-#define __javax_crypto_ExemptionMechanismException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class ExemptionMechanismException;
-    }
-  }
-}
-
-class javax::crypto::ExemptionMechanismException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  ExemptionMechanismException();
-  ExemptionMechanismException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1572699429277957109LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_ExemptionMechanismException__
diff --git a/libjava/javax/crypto/ExemptionMechanismSpi.h b/libjava/javax/crypto/ExemptionMechanismSpi.h
deleted file mode 100644
index 70c738eb654..00000000000
--- a/libjava/javax/crypto/ExemptionMechanismSpi.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_ExemptionMechanismSpi__
-#define __javax_crypto_ExemptionMechanismSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class ExemptionMechanismSpi;
-    }
-  }
-}
-
-class javax::crypto::ExemptionMechanismSpi : public ::java::lang::Object
-{
-
-public:
-  ExemptionMechanismSpi();
-public: // actually protected
-  virtual JArray< jbyte > * engineGenExemptionBlob() = 0;
-  virtual jint engineGenExemptionBlob(JArray< jbyte > *, jint) = 0;
-  virtual jint engineGetOutputSize(jint) = 0;
-  virtual void engineInit(::java::security::Key *) = 0;
-  virtual void engineInit(::java::security::Key *, ::java::security::AlgorithmParameters *) = 0;
-  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_ExemptionMechanismSpi__
diff --git a/libjava/javax/crypto/IllegalBlockSizeException.h b/libjava/javax/crypto/IllegalBlockSizeException.h
deleted file mode 100644
index 22176b1e504..00000000000
--- a/libjava/javax/crypto/IllegalBlockSizeException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_IllegalBlockSizeException__
-#define __javax_crypto_IllegalBlockSizeException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class IllegalBlockSizeException;
-    }
-  }
-}
-
-class javax::crypto::IllegalBlockSizeException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  IllegalBlockSizeException();
-  IllegalBlockSizeException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1965144811953540392LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_IllegalBlockSizeException__
diff --git a/libjava/javax/crypto/KeyAgreement.h b/libjava/javax/crypto/KeyAgreement.h
deleted file mode 100644
index 5f6b4e7617c..00000000000
--- a/libjava/javax/crypto/KeyAgreement.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_KeyAgreement__
-#define __javax_crypto_KeyAgreement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class Provider;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class KeyAgreement;
-        class KeyAgreementSpi;
-        class SecretKey;
-    }
-  }
-}
-
-class javax::crypto::KeyAgreement : public ::java::lang::Object
-{
-
-public: // actually protected
-  KeyAgreement(::javax::crypto::KeyAgreementSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::crypto::KeyAgreement * getInstance(::java::lang::String *);
-  static ::javax::crypto::KeyAgreement * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::KeyAgreement * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::security::Key * doPhase(::java::security::Key *, jboolean);
-  virtual JArray< jbyte > * generateSecret();
-  virtual jint generateSecret(JArray< jbyte > *, jint);
-  virtual ::javax::crypto::SecretKey * generateSecret(::java::lang::String *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::java::security::Key *);
-  virtual void init(::java::security::Key *, ::java::security::SecureRandom *);
-  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-private:
-  static ::java::lang::String * SERVICE;
-  ::javax::crypto::KeyAgreementSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kaSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-  jboolean virgin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_KeyAgreement__
diff --git a/libjava/javax/crypto/KeyAgreementSpi.h b/libjava/javax/crypto/KeyAgreementSpi.h
deleted file mode 100644
index e0ac5eb1a2e..00000000000
--- a/libjava/javax/crypto/KeyAgreementSpi.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_KeyAgreementSpi__
-#define __javax_crypto_KeyAgreementSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class KeyAgreementSpi;
-        class SecretKey;
-    }
-  }
-}
-
-class javax::crypto::KeyAgreementSpi : public ::java::lang::Object
-{
-
-public:
-  KeyAgreementSpi();
-public: // actually protected
-  virtual ::java::security::Key * engineDoPhase(::java::security::Key *, jboolean) = 0;
-  virtual JArray< jbyte > * engineGenerateSecret() = 0;
-  virtual jint engineGenerateSecret(JArray< jbyte > *, jint) = 0;
-  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::lang::String *) = 0;
-  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(::java::security::Key *, ::java::security::SecureRandom *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_KeyAgreementSpi__
diff --git a/libjava/javax/crypto/KeyGenerator.h b/libjava/javax/crypto/KeyGenerator.h
deleted file mode 100644
index ea785044eea..00000000000
--- a/libjava/javax/crypto/KeyGenerator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_KeyGenerator__
-#define __javax_crypto_KeyGenerator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class KeyGenerator;
-        class KeyGeneratorSpi;
-        class SecretKey;
-    }
-  }
-}
-
-class javax::crypto::KeyGenerator : public ::java::lang::Object
-{
-
-public: // actually protected
-  KeyGenerator(::javax::crypto::KeyGeneratorSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::crypto::KeyGenerator * getInstance(::java::lang::String *);
-  static ::javax::crypto::KeyGenerator * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::KeyGenerator * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::javax::crypto::SecretKey * generateKey();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::java::security::spec::AlgorithmParameterSpec *);
-  virtual void init(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
-  virtual void init(jint);
-  virtual void init(jint, ::java::security::SecureRandom *);
-  virtual void init(::java::security::SecureRandom *);
-private:
-  static ::java::lang::String * SERVICE;
-  ::javax::crypto::KeyGeneratorSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kgSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_KeyGenerator__
diff --git a/libjava/javax/crypto/KeyGeneratorSpi.h b/libjava/javax/crypto/KeyGeneratorSpi.h
deleted file mode 100644
index 4fb3574260d..00000000000
--- a/libjava/javax/crypto/KeyGeneratorSpi.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_KeyGeneratorSpi__
-#define __javax_crypto_KeyGeneratorSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class KeyGeneratorSpi;
-        class SecretKey;
-    }
-  }
-}
-
-class javax::crypto::KeyGeneratorSpi : public ::java::lang::Object
-{
-
-public:
-  KeyGeneratorSpi();
-public: // actually protected
-  virtual ::javax::crypto::SecretKey * engineGenerateKey() = 0;
-  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(jint, ::java::security::SecureRandom *) = 0;
-  virtual void engineInit(::java::security::SecureRandom *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_KeyGeneratorSpi__
diff --git a/libjava/javax/crypto/Mac.h b/libjava/javax/crypto/Mac.h
deleted file mode 100644
index d9242114635..00000000000
--- a/libjava/javax/crypto/Mac.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_Mac__
-#define __javax_crypto_Mac__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class Key;
-        class Provider;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Mac;
-        class MacSpi;
-    }
-  }
-}
-
-class javax::crypto::Mac : public ::java::lang::Object
-{
-
-public: // actually protected
-  Mac(::javax::crypto::MacSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::crypto::Mac * getInstance(::java::lang::String *);
-  static ::javax::crypto::Mac * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::Mac * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual JArray< jbyte > * doFinal();
-  virtual JArray< jbyte > * doFinal(JArray< jbyte > *);
-  virtual void doFinal(JArray< jbyte > *, jint);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual jint getMacLength();
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::java::security::Key *);
-  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
-  virtual void reset();
-  virtual void update(jbyte);
-  virtual void update(JArray< jbyte > *);
-  virtual void update(JArray< jbyte > *, jint, jint);
-  virtual void update(::java::nio::ByteBuffer *);
-  virtual ::java::lang::Object * clone();
-private:
-  static ::java::lang::String * SERVICE;
-  ::javax::crypto::MacSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) macSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-  jboolean virgin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_Mac__
diff --git a/libjava/javax/crypto/MacSpi.h b/libjava/javax/crypto/MacSpi.h
deleted file mode 100644
index 4508d2f00e7..00000000000
--- a/libjava/javax/crypto/MacSpi.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_MacSpi__
-#define __javax_crypto_MacSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-    namespace security
-    {
-        class Key;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class MacSpi;
-    }
-  }
-}
-
-class javax::crypto::MacSpi : public ::java::lang::Object
-{
-
-public:
-  MacSpi();
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual JArray< jbyte > * engineDoFinal() = 0;
-  virtual jint engineGetMacLength() = 0;
-  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *) = 0;
-  virtual void engineReset() = 0;
-  virtual void engineUpdate(jbyte) = 0;
-  virtual void engineUpdate(JArray< jbyte > *, jint, jint) = 0;
-  virtual void engineUpdate(::java::nio::ByteBuffer *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_MacSpi__
diff --git a/libjava/javax/crypto/NoSuchPaddingException.h b/libjava/javax/crypto/NoSuchPaddingException.h
deleted file mode 100644
index 76d4f3952d4..00000000000
--- a/libjava/javax/crypto/NoSuchPaddingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_NoSuchPaddingException__
-#define __javax_crypto_NoSuchPaddingException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class NoSuchPaddingException;
-    }
-  }
-}
-
-class javax::crypto::NoSuchPaddingException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  NoSuchPaddingException();
-  NoSuchPaddingException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4572885201200175466LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_NoSuchPaddingException__
diff --git a/libjava/javax/crypto/NullCipher.h b/libjava/javax/crypto/NullCipher.h
deleted file mode 100644
index 2fc8378f316..00000000000
--- a/libjava/javax/crypto/NullCipher.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_NullCipher__
-#define __javax_crypto_NullCipher__
-
-#pragma interface
-
-#include <javax/crypto/Cipher.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class NullCipher;
-    }
-  }
-}
-
-class javax::crypto::NullCipher : public ::javax::crypto::Cipher
-{
-
-public:
-  NullCipher();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_NullCipher__
diff --git a/libjava/javax/crypto/NullCipherImpl.h b/libjava/javax/crypto/NullCipherImpl.h
deleted file mode 100644
index 56cccfe2430..00000000000
--- a/libjava/javax/crypto/NullCipherImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_NullCipherImpl__
-#define __javax_crypto_NullCipherImpl__
-
-#pragma interface
-
-#include <javax/crypto/CipherSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AlgorithmParameters;
-        class Key;
-        class SecureRandom;
-      namespace spec
-      {
-          class AlgorithmParameterSpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class NullCipherImpl;
-    }
-  }
-}
-
-class javax::crypto::NullCipherImpl : public ::javax::crypto::CipherSpi
-{
-
-public: // actually package-private
-  NullCipherImpl();
-public: // actually protected
-  void engineSetMode(::java::lang::String *);
-  void engineSetPadding(::java::lang::String *);
-  jint engineGetBlockSize();
-  jint engineGetOutputSize(jint);
-  JArray< jbyte > * engineGetIV();
-  ::java::security::AlgorithmParameters * engineGetParameters();
-  void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
-  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 *);
-  JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
-  jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-  JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
-  jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_NullCipherImpl__
diff --git a/libjava/javax/crypto/SealedObject.h b/libjava/javax/crypto/SealedObject.h
deleted file mode 100644
index 630f8ec5f3a..00000000000
--- a/libjava/javax/crypto/SealedObject.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_SealedObject__
-#define __javax_crypto_SealedObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Key;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class Cipher;
-        class SealedObject;
-    }
-  }
-}
-
-class javax::crypto::SealedObject : public ::java::lang::Object
-{
-
-public:
-  SealedObject(::java::io::Serializable *, ::javax::crypto::Cipher *);
-public: // actually protected
-  SealedObject(::javax::crypto::SealedObject *);
-public:
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::Object * getObject(::javax::crypto::Cipher *);
-  virtual ::java::lang::Object * getObject(::java::security::Key *);
-  virtual ::java::lang::Object * getObject(::java::security::Key *, ::java::lang::String *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  ::java::lang::Object * unseal();
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) encodedParams;
-private:
-  JArray< jbyte > * encryptedContent;
-  ::java::lang::String * sealAlg;
-  ::java::lang::String * paramsAlg;
-  ::javax::crypto::Cipher * sealCipher;
-  static const jlong serialVersionUID = 4482838265551344752LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_SealedObject__
diff --git a/libjava/javax/crypto/SecretKey.h b/libjava/javax/crypto/SecretKey.h
deleted file mode 100644
index d76e7286836..00000000000
--- a/libjava/javax/crypto/SecretKey.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_SecretKey__
-#define __javax_crypto_SecretKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-  }
-}
-
-class javax::crypto::SecretKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = -4795878709595146952LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_crypto_SecretKey__
diff --git a/libjava/javax/crypto/SecretKeyFactory.h b/libjava/javax/crypto/SecretKeyFactory.h
deleted file mode 100644
index 2e10b769c63..00000000000
--- a/libjava/javax/crypto/SecretKeyFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_SecretKeyFactory__
-#define __javax_crypto_SecretKeyFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-        class SecretKeyFactory;
-        class SecretKeyFactorySpi;
-    }
-  }
-}
-
-class javax::crypto::SecretKeyFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  SecretKeyFactory(::javax::crypto::SecretKeyFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::crypto::SecretKeyFactory * getInstance(::java::lang::String *);
-  static ::javax::crypto::SecretKeyFactory * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::crypto::SecretKeyFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::javax::crypto::SecretKey * generateSecret(::java::security::spec::KeySpec *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::spec::KeySpec * getKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
-  virtual ::java::security::Provider * getProvider();
-  virtual ::javax::crypto::SecretKey * translateKey(::javax::crypto::SecretKey *);
-private:
-  static ::java::lang::String * SERVICE;
-  ::javax::crypto::SecretKeyFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) skfSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_SecretKeyFactory__
diff --git a/libjava/javax/crypto/SecretKeyFactorySpi.h b/libjava/javax/crypto/SecretKeyFactorySpi.h
deleted file mode 100644
index 91a17d69aa7..00000000000
--- a/libjava/javax/crypto/SecretKeyFactorySpi.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_SecretKeyFactorySpi__
-#define __javax_crypto_SecretKeyFactorySpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace spec
-      {
-          class KeySpec;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-        class SecretKeyFactorySpi;
-    }
-  }
-}
-
-class javax::crypto::SecretKeyFactorySpi : public ::java::lang::Object
-{
-
-public:
-  SecretKeyFactorySpi();
-public: // actually protected
-  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *) = 0;
-  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *) = 0;
-  virtual ::javax::crypto::SecretKey * engineTranslateKey(::javax::crypto::SecretKey *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_SecretKeyFactorySpi__
diff --git a/libjava/javax/crypto/ShortBufferException.h b/libjava/javax/crypto/ShortBufferException.h
deleted file mode 100644
index 1c3d344e6d8..00000000000
--- a/libjava/javax/crypto/ShortBufferException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_ShortBufferException__
-#define __javax_crypto_ShortBufferException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-        class ShortBufferException;
-    }
-  }
-}
-
-class javax::crypto::ShortBufferException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  ShortBufferException();
-  ShortBufferException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8427718640832943747LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_ShortBufferException__
diff --git a/libjava/javax/crypto/interfaces/DHKey.h b/libjava/javax/crypto/interfaces/DHKey.h
deleted file mode 100644
index a425a9263bd..00000000000
--- a/libjava/javax/crypto/interfaces/DHKey.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_interfaces_DHKey__
-#define __javax_crypto_interfaces_DHKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHKey;
-      }
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::interfaces::DHKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::crypto::spec::DHParameterSpec * getParams() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_crypto_interfaces_DHKey__
diff --git a/libjava/javax/crypto/interfaces/DHPrivateKey.h b/libjava/javax/crypto/interfaces/DHPrivateKey.h
deleted file mode 100644
index 500bb2a688a..00000000000
--- a/libjava/javax/crypto/interfaces/DHPrivateKey.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_interfaces_DHPrivateKey__
-#define __javax_crypto_interfaces_DHPrivateKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHPrivateKey;
-      }
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::interfaces::DHPrivateKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getX() = 0;
-  virtual ::javax::crypto::spec::DHParameterSpec * getParams() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = 2211791113380396553LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_crypto_interfaces_DHPrivateKey__
diff --git a/libjava/javax/crypto/interfaces/DHPublicKey.h b/libjava/javax/crypto/interfaces/DHPublicKey.h
deleted file mode 100644
index 36ebfc5736a..00000000000
--- a/libjava/javax/crypto/interfaces/DHPublicKey.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_interfaces_DHPublicKey__
-#define __javax_crypto_interfaces_DHPublicKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class DHPublicKey;
-      }
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::interfaces::DHPublicKey : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::math::BigInteger * getY() = 0;
-  virtual ::javax::crypto::spec::DHParameterSpec * getParams() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = -6628103563352519193LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_crypto_interfaces_DHPublicKey__
diff --git a/libjava/javax/crypto/interfaces/PBEKey.h b/libjava/javax/crypto/interfaces/PBEKey.h
deleted file mode 100644
index ff8f1ea4a68..00000000000
--- a/libjava/javax/crypto/interfaces/PBEKey.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_interfaces_PBEKey__
-#define __javax_crypto_interfaces_PBEKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace interfaces
-      {
-          class PBEKey;
-      }
-    }
-  }
-}
-
-class javax::crypto::interfaces::PBEKey : public ::java::lang::Object
-{
-
-public:
-  virtual jint getIterationCount() = 0;
-  virtual JArray< jchar > * getPassword() = 0;
-  virtual JArray< jbyte > * getSalt() = 0;
-  virtual ::java::lang::String * getAlgorithm() = 0;
-  virtual ::java::lang::String * getFormat() = 0;
-  virtual JArray< jbyte > * getEncoded() = 0;
-  static const jlong serialVersionUID = -1430015993304333921LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_crypto_interfaces_PBEKey__
diff --git a/libjava/javax/crypto/spec/DESKeySpec.h b/libjava/javax/crypto/spec/DESKeySpec.h
deleted file mode 100644
index 3c860452bb3..00000000000
--- a/libjava/javax/crypto/spec/DESKeySpec.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DESKeySpec__
-#define __javax_crypto_spec_DESKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DESKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DESKeySpec : public ::java::lang::Object
-{
-
-public:
-  DESKeySpec(JArray< jbyte > *);
-  DESKeySpec(JArray< jbyte > *, jint);
-  static jboolean isParityAdjusted(JArray< jbyte > *, jint);
-  static jboolean isWeak(JArray< jbyte > *, jint);
-private:
-  static jboolean equalsOrComplementEquals(JArray< jbyte > *, jint, JArray< jbyte > *);
-public:
-  virtual JArray< jbyte > * getKey();
-  static const jint DES_KEY_LEN = 8;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  static JArray< JArray< jbyte > * > * WEAK_KEYS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DESKeySpec__
diff --git a/libjava/javax/crypto/spec/DESedeKeySpec.h b/libjava/javax/crypto/spec/DESedeKeySpec.h
deleted file mode 100644
index 28e23bb13c0..00000000000
--- a/libjava/javax/crypto/spec/DESedeKeySpec.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DESedeKeySpec__
-#define __javax_crypto_spec_DESedeKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DESedeKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DESedeKeySpec : public ::java::lang::Object
-{
-
-public:
-  DESedeKeySpec(JArray< jbyte > *);
-  DESedeKeySpec(JArray< jbyte > *, jint);
-  static jboolean isParityAdjusted(JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * getKey();
-  static const jint DES_EDE_KEY_LEN = 24;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DESedeKeySpec__
diff --git a/libjava/javax/crypto/spec/DHGenParameterSpec.h b/libjava/javax/crypto/spec/DHGenParameterSpec.h
deleted file mode 100644
index 79331116f9b..00000000000
--- a/libjava/javax/crypto/spec/DHGenParameterSpec.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DHGenParameterSpec__
-#define __javax_crypto_spec_DHGenParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHGenParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DHGenParameterSpec : public ::java::lang::Object
-{
-
-public:
-  DHGenParameterSpec(jint, jint);
-  virtual jint getExponentSize();
-  virtual jint getPrimeSize();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) primeSize;
-  jint exponentSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DHGenParameterSpec__
diff --git a/libjava/javax/crypto/spec/DHParameterSpec.h b/libjava/javax/crypto/spec/DHParameterSpec.h
deleted file mode 100644
index 7f7dd3fcd7a..00000000000
--- a/libjava/javax/crypto/spec/DHParameterSpec.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DHParameterSpec__
-#define __javax_crypto_spec_DHParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DHParameterSpec : public ::java::lang::Object
-{
-
-public:
-  DHParameterSpec(::java::math::BigInteger *, ::java::math::BigInteger *);
-  DHParameterSpec(::java::math::BigInteger *, ::java::math::BigInteger *, jint);
-  virtual ::java::math::BigInteger * getG();
-  virtual jint getL();
-  virtual ::java::math::BigInteger * getP();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) g;
-  ::java::math::BigInteger * p;
-  jint l;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DHParameterSpec__
diff --git a/libjava/javax/crypto/spec/DHPrivateKeySpec.h b/libjava/javax/crypto/spec/DHPrivateKeySpec.h
deleted file mode 100644
index c21a9e2e17e..00000000000
--- a/libjava/javax/crypto/spec/DHPrivateKeySpec.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DHPrivateKeySpec__
-#define __javax_crypto_spec_DHPrivateKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHPrivateKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DHPrivateKeySpec : public ::java::lang::Object
-{
-
-public:
-  DHPrivateKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getG();
-  virtual ::java::math::BigInteger * getP();
-  virtual ::java::math::BigInteger * getX();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) g;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * x;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DHPrivateKeySpec__
diff --git a/libjava/javax/crypto/spec/DHPublicKeySpec.h b/libjava/javax/crypto/spec/DHPublicKeySpec.h
deleted file mode 100644
index ae1a2bf557c..00000000000
--- a/libjava/javax/crypto/spec/DHPublicKeySpec.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_DHPublicKeySpec__
-#define __javax_crypto_spec_DHPublicKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class DHPublicKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::DHPublicKeySpec : public ::java::lang::Object
-{
-
-public:
-  DHPublicKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::java::math::BigInteger * getG();
-  virtual ::java::math::BigInteger * getP();
-  virtual ::java::math::BigInteger * getY();
-private:
-  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) g;
-  ::java::math::BigInteger * p;
-  ::java::math::BigInteger * y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_DHPublicKeySpec__
diff --git a/libjava/javax/crypto/spec/IvParameterSpec.h b/libjava/javax/crypto/spec/IvParameterSpec.h
deleted file mode 100644
index e5799e47fcc..00000000000
--- a/libjava/javax/crypto/spec/IvParameterSpec.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_IvParameterSpec__
-#define __javax_crypto_spec_IvParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class IvParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::IvParameterSpec : public ::java::lang::Object
-{
-
-public:
-  IvParameterSpec(JArray< jbyte > *);
-  IvParameterSpec(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * getIV();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iv;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_IvParameterSpec__
diff --git a/libjava/javax/crypto/spec/PBEKeySpec.h b/libjava/javax/crypto/spec/PBEKeySpec.h
deleted file mode 100644
index f987069389d..00000000000
--- a/libjava/javax/crypto/spec/PBEKeySpec.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_PBEKeySpec__
-#define __javax_crypto_spec_PBEKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class PBEKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::PBEKeySpec : public ::java::lang::Object
-{
-
-public:
-  PBEKeySpec(JArray< jchar > *);
-  PBEKeySpec(JArray< jchar > *, JArray< jbyte > *, jint);
-  PBEKeySpec(JArray< jchar > *, JArray< jbyte > *, jint, jint);
-  virtual void clearPassword();
-  virtual jint getIterationCount();
-  virtual jint getKeyLength();
-  virtual JArray< jchar > * getPassword();
-  virtual JArray< jbyte > * getSalt();
-private:
-  void setPassword(JArray< jchar > *);
-  void setSalt(JArray< jbyte > *);
-  void setIterationCount(jint);
-  void setKeyLength(jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) iterationCount;
-  jint keyLength;
-  JArray< jchar > * password;
-  JArray< jbyte > * salt;
-  jboolean passwordValid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_PBEKeySpec__
diff --git a/libjava/javax/crypto/spec/PBEParameterSpec.h b/libjava/javax/crypto/spec/PBEParameterSpec.h
deleted file mode 100644
index eb81ca7dc4c..00000000000
--- a/libjava/javax/crypto/spec/PBEParameterSpec.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_PBEParameterSpec__
-#define __javax_crypto_spec_PBEParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class PBEParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::PBEParameterSpec : public ::java::lang::Object
-{
-
-public:
-  PBEParameterSpec(JArray< jbyte > *, jint);
-  virtual jint getIterationCount();
-  virtual JArray< jbyte > * getSalt();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) iterationCount;
-  JArray< jbyte > * salt;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_PBEParameterSpec__
diff --git a/libjava/javax/crypto/spec/RC2ParameterSpec.h b/libjava/javax/crypto/spec/RC2ParameterSpec.h
deleted file mode 100644
index 419dc752b34..00000000000
--- a/libjava/javax/crypto/spec/RC2ParameterSpec.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_RC2ParameterSpec__
-#define __javax_crypto_spec_RC2ParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class RC2ParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::RC2ParameterSpec : public ::java::lang::Object
-{
-
-public:
-  RC2ParameterSpec(jint);
-  RC2ParameterSpec(jint, JArray< jbyte > *);
-  RC2ParameterSpec(jint, JArray< jbyte > *, jint);
-  virtual jint getEffectiveKeyBits();
-  virtual JArray< jbyte > * getIV();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  static const jint RC2_IV_LENGTH = 8;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) effectiveKeyBits;
-  JArray< jbyte > * iv;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_RC2ParameterSpec__
diff --git a/libjava/javax/crypto/spec/RC5ParameterSpec.h b/libjava/javax/crypto/spec/RC5ParameterSpec.h
deleted file mode 100644
index 8ba9232cd65..00000000000
--- a/libjava/javax/crypto/spec/RC5ParameterSpec.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_RC5ParameterSpec__
-#define __javax_crypto_spec_RC5ParameterSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class RC5ParameterSpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::RC5ParameterSpec : public ::java::lang::Object
-{
-
-public:
-  RC5ParameterSpec(jint, jint, jint);
-  RC5ParameterSpec(jint, jint, jint, JArray< jbyte > *);
-  RC5ParameterSpec(jint, jint, jint, JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * getIV();
-  virtual jint getRounds();
-  virtual jint getVersion();
-  virtual jint getWordSize();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iv;
-  jint rounds;
-  jint version;
-  jint wordSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_RC5ParameterSpec__
diff --git a/libjava/javax/crypto/spec/SecretKeySpec.h b/libjava/javax/crypto/spec/SecretKeySpec.h
deleted file mode 100644
index b6a2e04ced3..00000000000
--- a/libjava/javax/crypto/spec/SecretKeySpec.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_crypto_spec_SecretKeySpec__
-#define __javax_crypto_spec_SecretKeySpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace crypto
-    {
-      namespace spec
-      {
-          class SecretKeySpec;
-      }
-    }
-  }
-}
-
-class javax::crypto::spec::SecretKeySpec : public ::java::lang::Object
-{
-
-public:
-  SecretKeySpec(JArray< jbyte > *, ::java::lang::String *);
-  SecretKeySpec(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 jint hashCode();
-private:
-  static const jlong serialVersionUID = 6577238317307289933LL;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_crypto_spec_SecretKeySpec__
diff --git a/libjava/javax/imageio/IIOException.h b/libjava/javax/imageio/IIOException.h
deleted file mode 100644
index b303de89819..00000000000
--- a/libjava/javax/imageio/IIOException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_IIOException__
-#define __javax_imageio_IIOException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOException;
-    }
-  }
-}
-
-class javax::imageio::IIOException : public ::java::io::IOException
-{
-
-public:
-  IIOException(::java::lang::String *);
-  IIOException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_IIOException__
diff --git a/libjava/javax/imageio/IIOImage.h b/libjava/javax/imageio/IIOImage.h
deleted file mode 100644
index ae23913df8b..00000000000
--- a/libjava/javax/imageio/IIOImage.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_IIOImage__
-#define __javax_imageio_IIOImage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class Raster;
-          class RenderedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-    }
-  }
-}
-
-class javax::imageio::IIOImage : public ::java::lang::Object
-{
-
-public:
-  IIOImage(::java::awt::image::Raster *, ::java::util::List *, ::javax::imageio::metadata::IIOMetadata *);
-  IIOImage(::java::awt::image::RenderedImage *, ::java::util::List *, ::javax::imageio::metadata::IIOMetadata *);
-  virtual ::javax::imageio::metadata::IIOMetadata * getMetadata();
-  virtual jint getNumThumbnails();
-  virtual ::java::awt::image::Raster * getRaster();
-  virtual ::java::awt::image::RenderedImage * getRenderedImage();
-  virtual ::java::awt::image::BufferedImage * getThumbnail(jint);
-  virtual ::java::util::List * getThumbnails();
-  virtual jboolean hasRaster();
-  virtual void setMetadata(::javax::imageio::metadata::IIOMetadata *);
-  virtual void setRaster(::java::awt::image::Raster *);
-  virtual void setRenderedImage(::java::awt::image::RenderedImage *);
-  virtual void setThumbnails(::java::util::List *);
-public: // actually protected
-  ::java::awt::image::RenderedImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::javax::imageio::metadata::IIOMetadata * metadata;
-  ::java::awt::image::Raster * raster;
-  ::java::util::List * thumbnails;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_IIOImage__
diff --git a/libjava/javax/imageio/IIOParam.h b/libjava/javax/imageio/IIOParam.h
deleted file mode 100644
index ca81aea23cf..00000000000
--- a/libjava/javax/imageio/IIOParam.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_IIOParam__
-#define __javax_imageio_IIOParam__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOParam;
-        class IIOParamController;
-        class ImageTypeSpecifier;
-    }
-  }
-}
-
-class javax::imageio::IIOParam : public ::java::lang::Object
-{
-
-public: // actually protected
-  IIOParam();
-public:
-  virtual jboolean activateController();
-  virtual ::javax::imageio::IIOParamController * getController();
-  virtual ::javax::imageio::IIOParamController * getDefaultController();
-  virtual ::java::awt::Point * getDestinationOffset();
-  virtual ::javax::imageio::ImageTypeSpecifier * getDestinationType();
-  virtual JArray< jint > * getSourceBands();
-  virtual ::java::awt::Rectangle * getSourceRegion();
-  virtual jint getSourceXSubsampling();
-  virtual jint getSourceYSubsampling();
-  virtual jint getSubsamplingXOffset();
-  virtual jint getSubsamplingYOffset();
-  virtual jboolean hasController();
-  virtual void setController(::javax::imageio::IIOParamController *);
-  virtual void setDestinationType(::javax::imageio::ImageTypeSpecifier *);
-  virtual void setDestinationOffset(::java::awt::Point *);
-  virtual void setSourceBands(JArray< jint > *);
-  virtual void setSourceRegion(::java::awt::Rectangle *);
-  virtual void setSourceSubsampling(jint, jint, jint, jint);
-public: // actually protected
-  ::javax::imageio::IIOParamController * __attribute__((aligned(__alignof__( ::java::lang::Object)))) controller;
-  ::javax::imageio::IIOParamController * defaultController;
-  ::java::awt::Point * destinationOffset;
-  ::javax::imageio::ImageTypeSpecifier * destinationType;
-  JArray< jint > * sourceBands;
-  ::java::awt::Rectangle * sourceRegion;
-  jint sourceXSubsampling;
-  jint sourceYSubsampling;
-  jint subsamplingXOffset;
-  jint subsamplingYOffset;
-private:
-  jboolean no_controller;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_IIOParam__
diff --git a/libjava/javax/imageio/IIOParamController.h b/libjava/javax/imageio/IIOParamController.h
deleted file mode 100644
index 3e9d52d50bf..00000000000
--- a/libjava/javax/imageio/IIOParamController.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_IIOParamController__
-#define __javax_imageio_IIOParamController__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOParam;
-        class IIOParamController;
-    }
-  }
-}
-
-class javax::imageio::IIOParamController : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean activate(::javax::imageio::IIOParam *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_IIOParamController__
diff --git a/libjava/javax/imageio/ImageIO$1.h b/libjava/javax/imageio/ImageIO$1.h
deleted file mode 100644
index 5c3ae21e031..00000000000
--- a/libjava/javax/imageio/ImageIO$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$1__
-#define __javax_imageio_ImageIO$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$1;
-        class ImageTranscoder;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ImageIO$1(::java::util::Iterator *);
-public:
-  jboolean hasNext();
-  ::javax::imageio::ImageTranscoder * target$next();
-  void remove();
-  ::java::lang::Object * next();
-private:
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$spiIterator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$1__
diff --git a/libjava/javax/imageio/ImageIO$ImageReaderIterator.h b/libjava/javax/imageio/ImageIO$ImageReaderIterator.h
deleted file mode 100644
index 5288ca9254c..00000000000
--- a/libjava/javax/imageio/ImageIO$ImageReaderIterator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ImageReaderIterator__
-#define __javax_imageio_ImageIO$ImageReaderIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ImageReaderIterator;
-        class ImageReader;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ImageReaderIterator : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ImageReaderIterator(::java::util::Iterator *, ::java::lang::Object *);
-  ImageIO$ImageReaderIterator(::java::util::Iterator *);
-  jboolean hasNext();
-  ::javax::imageio::ImageReader * target$next();
-  void remove();
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) it;
-  ::java::lang::Object * readerExtension;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ImageReaderIterator__
diff --git a/libjava/javax/imageio/ImageIO$ImageWriterIterator.h b/libjava/javax/imageio/ImageIO$ImageWriterIterator.h
deleted file mode 100644
index 78f74fb2649..00000000000
--- a/libjava/javax/imageio/ImageIO$ImageWriterIterator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ImageWriterIterator__
-#define __javax_imageio_ImageIO$ImageWriterIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ImageWriterIterator;
-        class ImageWriter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ImageWriterIterator : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ImageWriterIterator(::java::util::Iterator *, ::java::lang::Object *);
-  ImageIO$ImageWriterIterator(::java::util::Iterator *);
-  jboolean hasNext();
-  ::javax::imageio::ImageWriter * target$next();
-  void remove();
-  ::java::lang::Object * next();
-public: // actually package-private
-  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) it;
-  ::java::lang::Object * writerExtension;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ImageWriterIterator__
diff --git a/libjava/javax/imageio/ImageIO$ReaderFormatFilter.h b/libjava/javax/imageio/ImageIO$ReaderFormatFilter.h
deleted file mode 100644
index a1d35dbff5b..00000000000
--- a/libjava/javax/imageio/ImageIO$ReaderFormatFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ReaderFormatFilter__
-#define __javax_imageio_ImageIO$ReaderFormatFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ReaderFormatFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ReaderFormatFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ReaderFormatFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) formatName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ReaderFormatFilter__
diff --git a/libjava/javax/imageio/ImageIO$ReaderMIMETypeFilter.h b/libjava/javax/imageio/ImageIO$ReaderMIMETypeFilter.h
deleted file mode 100644
index 7f7503278eb..00000000000
--- a/libjava/javax/imageio/ImageIO$ReaderMIMETypeFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ReaderMIMETypeFilter__
-#define __javax_imageio_ImageIO$ReaderMIMETypeFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ReaderMIMETypeFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ReaderMIMETypeFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ReaderMIMETypeFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) MIMEType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ReaderMIMETypeFilter__
diff --git a/libjava/javax/imageio/ImageIO$ReaderObjectFilter.h b/libjava/javax/imageio/ImageIO$ReaderObjectFilter.h
deleted file mode 100644
index 929530f2b09..00000000000
--- a/libjava/javax/imageio/ImageIO$ReaderObjectFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ReaderObjectFilter__
-#define __javax_imageio_ImageIO$ReaderObjectFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ReaderObjectFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ReaderObjectFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ReaderObjectFilter(::java::lang::Object *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) object;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ReaderObjectFilter__
diff --git a/libjava/javax/imageio/ImageIO$ReaderSuffixFilter.h b/libjava/javax/imageio/ImageIO$ReaderSuffixFilter.h
deleted file mode 100644
index b4dc85d1319..00000000000
--- a/libjava/javax/imageio/ImageIO$ReaderSuffixFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$ReaderSuffixFilter__
-#define __javax_imageio_ImageIO$ReaderSuffixFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$ReaderSuffixFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$ReaderSuffixFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$ReaderSuffixFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) fileSuffix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$ReaderSuffixFilter__
diff --git a/libjava/javax/imageio/ImageIO$TranscoderFilter.h b/libjava/javax/imageio/ImageIO$TranscoderFilter.h
deleted file mode 100644
index 48b9f104e78..00000000000
--- a/libjava/javax/imageio/ImageIO$TranscoderFilter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$TranscoderFilter__
-#define __javax_imageio_ImageIO$TranscoderFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$TranscoderFilter;
-        class ImageReader;
-        class ImageWriter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$TranscoderFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$TranscoderFilter(::javax::imageio::ImageReader *, ::javax::imageio::ImageWriter *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::javax::imageio::ImageReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) reader;
-  ::javax::imageio::ImageWriter * writer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$TranscoderFilter__
diff --git a/libjava/javax/imageio/ImageIO$WriterFormatFilter.h b/libjava/javax/imageio/ImageIO$WriterFormatFilter.h
deleted file mode 100644
index 5b71fda59c0..00000000000
--- a/libjava/javax/imageio/ImageIO$WriterFormatFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$WriterFormatFilter__
-#define __javax_imageio_ImageIO$WriterFormatFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$WriterFormatFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$WriterFormatFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$WriterFormatFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) formatName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$WriterFormatFilter__
diff --git a/libjava/javax/imageio/ImageIO$WriterMIMETypeFilter.h b/libjava/javax/imageio/ImageIO$WriterMIMETypeFilter.h
deleted file mode 100644
index fc35a0d38ee..00000000000
--- a/libjava/javax/imageio/ImageIO$WriterMIMETypeFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$WriterMIMETypeFilter__
-#define __javax_imageio_ImageIO$WriterMIMETypeFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$WriterMIMETypeFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$WriterMIMETypeFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$WriterMIMETypeFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) MIMEType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$WriterMIMETypeFilter__
diff --git a/libjava/javax/imageio/ImageIO$WriterObjectFilter.h b/libjava/javax/imageio/ImageIO$WriterObjectFilter.h
deleted file mode 100644
index 94500aed6f8..00000000000
--- a/libjava/javax/imageio/ImageIO$WriterObjectFilter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$WriterObjectFilter__
-#define __javax_imageio_ImageIO$WriterObjectFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$WriterObjectFilter;
-        class ImageTypeSpecifier;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$WriterObjectFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$WriterObjectFilter(::javax::imageio::ImageTypeSpecifier *, ::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::javax::imageio::ImageTypeSpecifier * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::lang::String * formatName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$WriterObjectFilter__
diff --git a/libjava/javax/imageio/ImageIO$WriterSuffixFilter.h b/libjava/javax/imageio/ImageIO$WriterSuffixFilter.h
deleted file mode 100644
index 9fc513410ab..00000000000
--- a/libjava/javax/imageio/ImageIO$WriterSuffixFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO$WriterSuffixFilter__
-#define __javax_imageio_ImageIO$WriterSuffixFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO$WriterSuffixFilter;
-    }
-  }
-}
-
-class javax::imageio::ImageIO$WriterSuffixFilter : public ::java::lang::Object
-{
-
-public:
-  ImageIO$WriterSuffixFilter(::java::lang::String *);
-  jboolean filter(::java::lang::Object *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) fileSuffix;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO$WriterSuffixFilter__
diff --git a/libjava/javax/imageio/ImageIO.h b/libjava/javax/imageio/ImageIO.h
deleted file mode 100644
index 95309b7e7aa..00000000000
--- a/libjava/javax/imageio/ImageIO.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageIO__
-#define __javax_imageio_ImageIO__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-          class RenderedImage;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageIO;
-        class ImageReader;
-        class ImageTypeSpecifier;
-        class ImageWriter;
-      namespace spi
-      {
-          class IIORegistry;
-          class ServiceRegistry$Filter;
-      }
-      namespace stream
-      {
-          class ImageInputStream;
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::ImageIO : public ::java::lang::Object
-{
-
-  ImageIO();
-  static ::java::util::Iterator * getReadersByFilter(::java::lang::Class *, ::javax::imageio::spi::ServiceRegistry$Filter *, ::java::lang::Object *);
-  static ::java::util::Iterator * getWritersByFilter(::java::lang::Class *, ::javax::imageio::spi::ServiceRegistry$Filter *, ::java::lang::Object *);
-public:
-  static ::java::io::File * getCacheDirectory();
-  static ::java::util::Iterator * getImageReadersByFormatName(::java::lang::String *);
-  static ::java::util::Iterator * getImageReadersByMIMEType(::java::lang::String *);
-  static ::java::util::Iterator * getImageReadersBySuffix(::java::lang::String *);
-  static ::java::util::Iterator * getImageWritersByFormatName(::java::lang::String *);
-  static ::java::util::Iterator * getImageWritersByMIMEType(::java::lang::String *);
-  static ::java::util::Iterator * getImageWritersBySuffix(::java::lang::String *);
-  static JArray< ::java::lang::String * > * getReaderFormatNames();
-  static JArray< ::java::lang::String * > * getReaderMIMETypes();
-private:
-  static ::javax::imageio::spi::IIORegistry * getRegistry();
-public:
-  static jboolean getUseCache();
-  static JArray< ::java::lang::String * > * getWriterFormatNames();
-  static JArray< ::java::lang::String * > * getWriterMIMETypes();
-  static void scanForPlugins();
-  static void setCacheDirectory(::java::io::File *);
-  static void setUseCache(jboolean);
-  static jboolean write(::java::awt::image::RenderedImage *, ::java::lang::String *, ::java::io::File *);
-  static jboolean write(::java::awt::image::RenderedImage *, ::java::lang::String *, ::java::io::OutputStream *);
-  static jboolean write(::java::awt::image::RenderedImage *, ::java::lang::String *, ::javax::imageio::stream::ImageOutputStream *);
-  static ::java::awt::image::BufferedImage * read(::javax::imageio::stream::ImageInputStream *);
-  static ::java::awt::image::BufferedImage * read(::java::net::URL *);
-  static ::java::awt::image::BufferedImage * read(::java::io::InputStream *);
-  static ::java::awt::image::BufferedImage * read(::java::io::File *);
-  static ::javax::imageio::stream::ImageInputStream * createImageInputStream(::java::lang::Object *);
-  static ::javax::imageio::stream::ImageOutputStream * createImageOutputStream(::java::lang::Object *);
-  static ::javax::imageio::ImageReader * getImageReader(::javax::imageio::ImageWriter *);
-  static ::java::util::Iterator * getImageReaders(::java::lang::Object *);
-  static ::java::util::Iterator * getImageWriters(::javax::imageio::ImageTypeSpecifier *, ::java::lang::String *);
-  static ::javax::imageio::ImageWriter * getImageWriter(::javax::imageio::ImageReader *);
-  static ::java::util::Iterator * getImageTranscoders(::javax::imageio::ImageReader *, ::javax::imageio::ImageWriter *);
-private:
-  static ::java::io::File * cacheDirectory;
-  static jboolean useCache;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageIO__
diff --git a/libjava/javax/imageio/ImageReadParam.h b/libjava/javax/imageio/ImageReadParam.h
deleted file mode 100644
index 1e406ce705b..00000000000
--- a/libjava/javax/imageio/ImageReadParam.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageReadParam__
-#define __javax_imageio_ImageReadParam__
-
-#pragma interface
-
-#include <javax/imageio/IIOParam.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReadParam;
-    }
-  }
-}
-
-class javax::imageio::ImageReadParam : public ::javax::imageio::IIOParam
-{
-
-public:
-  ImageReadParam();
-  virtual jboolean canSetSourceRenderSize();
-  virtual ::java::awt::image::BufferedImage * getDestination();
-  virtual JArray< jint > * getDestinationBands();
-  virtual jint getSourceMaxProgressivePass();
-  virtual jint getSourceMinProgressivePass();
-  virtual jint getSourceNumProgressivePasses();
-  virtual ::java::awt::Dimension * getSourceRenderSize();
-  virtual void setDestination(::java::awt::image::BufferedImage *);
-  virtual void setDestinationBands(JArray< jint > *);
-  virtual void setSourceProgressivePasses(jint, jint);
-  virtual void setSourceRenderSize(::java::awt::Dimension *);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::imageio::IIOParam)))) canSetSourceRenderSize__;
-  ::java::awt::image::BufferedImage * destination;
-  JArray< jint > * destinationBands;
-  jint minProgressivePass;
-  jint numProgressivePasses;
-  ::java::awt::Dimension * sourceRenderSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageReadParam__
diff --git a/libjava/javax/imageio/ImageReader.h b/libjava/javax/imageio/ImageReader.h
deleted file mode 100644
index 83c50759840..00000000000
--- a/libjava/javax/imageio/ImageReader.h
+++ /dev/null
@@ -1,166 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageReader__
-#define __javax_imageio_ImageReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace image
-      {
-          class BufferedImage;
-          class Raster;
-          class RenderedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageReadParam;
-        class ImageReader;
-        class ImageTypeSpecifier;
-      namespace event
-      {
-          class IIOReadProgressListener;
-          class IIOReadUpdateListener;
-          class IIOReadWarningListener;
-      }
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace spi
-      {
-          class ImageReaderSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::ImageReader : public ::java::lang::Object
-{
-
-public: // actually protected
-  ImageReader(::javax::imageio::spi::ImageReaderSpi *);
-public:
-  virtual void abort();
-public: // actually protected
-  virtual jboolean abortRequested();
-public:
-  virtual void addIIOReadProgressListener(::javax::imageio::event::IIOReadProgressListener *);
-  virtual void addIIOReadUpdateListener(::javax::imageio::event::IIOReadUpdateListener *);
-  virtual void addIIOReadWarningListener(::javax::imageio::event::IIOReadWarningListener *);
-  virtual jboolean canReadRaster();
-public: // actually protected
-  virtual void clearAbortRequest();
-public:
-  virtual void dispose();
-  virtual jfloat getAspectRatio(jint);
-  virtual JArray< ::java::util::Locale * > * getAvailableLocales();
-  virtual ::javax::imageio::ImageReadParam * getDefaultReadParam();
-  virtual ::java::lang::String * getFormatName();
-  virtual jint getHeight(jint) = 0;
-  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint) = 0;
-  virtual ::java::util::Iterator * getImageTypes(jint) = 0;
-  virtual void setInput(::java::lang::Object *, jboolean, jboolean);
-  virtual void setInput(::java::lang::Object *, jboolean);
-  virtual void setInput(::java::lang::Object *);
-  virtual ::java::lang::Object * getInput();
-  virtual ::java::util::Locale * getLocale();
-  virtual jint getNumImages(jboolean) = 0;
-  virtual jint getNumThumbnails(jint);
-  virtual ::javax::imageio::spi::ImageReaderSpi * getOriginatingProvider();
-  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata() = 0;
-  virtual jint getThumbnailHeight(jint, jint);
-  virtual jint getThumbnailWidth(jint, jint);
-  virtual jint getTileGridXOffset(jint);
-  virtual jint getTileGridYOffset(jint);
-  virtual jint getTileHeight(jint);
-  virtual jint getTileWidth(jint);
-  virtual jint getWidth(jint) = 0;
-  virtual jboolean hasThumbnails(jint);
-  virtual jboolean isIgnoringMetadata();
-  virtual jboolean isImageTiled(jint);
-  virtual jboolean isRandomAccessEasy(jint);
-  virtual jboolean isSeekForwardOnly();
-public: // actually protected
-  virtual void processImageComplete();
-  virtual void processImageProgress(jfloat);
-  virtual void processImageStarted(jint);
-  virtual void processImageUpdate(::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void processPassComplete(::java::awt::image::BufferedImage *);
-  virtual void processPassStarted(::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void processReadAborted();
-  virtual void processSequenceComplete();
-  virtual void processSequenceStarted(jint);
-  virtual void processThumbnailComplete();
-  virtual void processThumbnailPassComplete(::java::awt::image::BufferedImage *);
-  virtual void processThumbnailPassStarted(::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void processThumbnailProgress(jfloat);
-  virtual void processThumbnailStarted(jint, jint);
-  virtual void processThumbnailUpdate(::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, JArray< jint > *);
-  virtual void processWarningOccurred(::java::lang::String *);
-  virtual void processWarningOccurred(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::awt::image::BufferedImage * read(jint, ::javax::imageio::ImageReadParam *) = 0;
-  virtual jboolean readerSupportsThumbnails();
-  virtual ::java::awt::image::Raster * readRaster(jint, ::javax::imageio::ImageReadParam *);
-  virtual ::java::awt::image::BufferedImage * readThumbnail(jint, jint);
-  virtual void removeAllIIOReadProgressListeners();
-  virtual void removeAllIIOReadUpdateListeners();
-  virtual void removeAllIIOReadWarningListeners();
-  virtual void removeIIOReadProgressListener(::javax::imageio::event::IIOReadProgressListener *);
-  virtual void removeIIOReadUpdateListener(::javax::imageio::event::IIOReadUpdateListener *);
-  virtual void removeIIOReadWarningListener(::javax::imageio::event::IIOReadWarningListener *);
-  virtual void setLocale(::java::util::Locale *);
-public: // actually protected
-  static void checkReadParamBandSettings(::javax::imageio::ImageReadParam *, jint, jint);
-  static void computeRegions(::javax::imageio::ImageReadParam *, jint, jint, ::java::awt::image::BufferedImage *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  static ::java::awt::image::BufferedImage * getDestination(::javax::imageio::ImageReadParam *, ::java::util::Iterator *, jint, jint);
-public:
-  virtual ::javax::imageio::metadata::IIOMetadata * getImageMetadata(jint, ::java::lang::String *, ::java::util::Set *);
-  virtual jint getMinIndex();
-  virtual ::javax::imageio::ImageTypeSpecifier * getRawImageType(jint);
-public: // actually protected
-  static ::java::awt::Rectangle * getSourceRegion(::javax::imageio::ImageReadParam *, jint, jint);
-public:
-  virtual ::javax::imageio::metadata::IIOMetadata * getStreamMetadata(::java::lang::String *, ::java::util::Set *);
-  virtual ::java::awt::image::BufferedImage * read(jint);
-  virtual ::javax::imageio::IIOImage * readAll(jint, ::javax::imageio::ImageReadParam *);
-  virtual ::java::util::Iterator * readAll(::java::util::Iterator *);
-  virtual ::java::awt::image::RenderedImage * readAsRenderedImage(jint, ::javax::imageio::ImageReadParam *);
-  virtual ::java::awt::image::BufferedImage * readTile(jint, jint, jint);
-  virtual ::java::awt::image::Raster * readTileRaster(jint, jint, jint);
-  virtual void reset();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) aborted;
-public: // actually protected
-  JArray< ::java::util::Locale * > * availableLocales;
-  jboolean ignoreMetadata;
-  ::java::lang::Object * input;
-  ::java::util::Locale * locale;
-  jint minIndex;
-  ::javax::imageio::spi::ImageReaderSpi * originatingProvider;
-  ::java::util::List * progressListeners;
-  jboolean seekForwardOnly;
-  ::java::util::List * updateListeners;
-  ::java::util::List * warningListeners;
-  ::java::util::List * warningLocales;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageReader__
diff --git a/libjava/javax/imageio/ImageTranscoder.h b/libjava/javax/imageio/ImageTranscoder.h
deleted file mode 100644
index b3661fdcef2..00000000000
--- a/libjava/javax/imageio/ImageTranscoder.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageTranscoder__
-#define __javax_imageio_ImageTranscoder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTranscoder;
-        class ImageTypeSpecifier;
-        class ImageWriteParam;
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-    }
-  }
-}
-
-class javax::imageio::ImageTranscoder : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::imageio::metadata::IIOMetadata * convertImageMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *) = 0;
-  virtual ::javax::imageio::metadata::IIOMetadata * convertStreamMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageWriteParam *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_ImageTranscoder__
diff --git a/libjava/javax/imageio/ImageTypeSpecifier.h b/libjava/javax/imageio/ImageTypeSpecifier.h
deleted file mode 100644
index c8a33638beb..00000000000
--- a/libjava/javax/imageio/ImageTypeSpecifier.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageTypeSpecifier__
-#define __javax_imageio_ImageTypeSpecifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace color
-      {
-          class ColorSpace;
-      }
-      namespace image
-      {
-          class BufferedImage;
-          class ColorModel;
-          class RenderedImage;
-          class SampleModel;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-    }
-  }
-}
-
-class javax::imageio::ImageTypeSpecifier : public ::java::lang::Object
-{
-
-public:
-  ImageTypeSpecifier(::java::awt::image::ColorModel *, ::java::awt::image::SampleModel *);
-  ImageTypeSpecifier(::java::awt::image::RenderedImage *);
-  static ::javax::imageio::ImageTypeSpecifier * createBanded(::java::awt::color::ColorSpace *, JArray< jint > *, JArray< jint > *, jint, jboolean, jboolean);
-  virtual ::java::awt::image::BufferedImage * createBufferedImage(jint, jint);
-  static ::javax::imageio::ImageTypeSpecifier * createFromBufferedImageType(jint);
-  static ::javax::imageio::ImageTypeSpecifier * createFromRenderedImage(::java::awt::image::RenderedImage *);
-  static ::javax::imageio::ImageTypeSpecifier * createGrayscale(jint, jint, jboolean);
-  static ::javax::imageio::ImageTypeSpecifier * createGrayscale(jint, jint, jboolean, jboolean);
-  static ::javax::imageio::ImageTypeSpecifier * createIndexed(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, jint, jint);
-  static ::javax::imageio::ImageTypeSpecifier * createInterleaved(::java::awt::color::ColorSpace *, JArray< jint > *, jint, jboolean, jboolean);
-  static ::javax::imageio::ImageTypeSpecifier * createPacked(::java::awt::color::ColorSpace *, jint, jint, jint, jint, jint, jboolean);
-  virtual jint getBitsPerBand(jint);
-  virtual jint getBufferedImageType();
-  virtual ::java::awt::image::SampleModel * getSampleModel(jint, jint);
-  virtual ::java::awt::image::ColorModel * getColorModel();
-  virtual jint getNumBands();
-  virtual jint getNumComponents();
-  virtual ::java::awt::image::SampleModel * getSampleModel();
-public: // actually protected
-  ::java::awt::image::ColorModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) colorModel;
-  ::java::awt::image::SampleModel * sampleModel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageTypeSpecifier__
diff --git a/libjava/javax/imageio/ImageWriteParam.h b/libjava/javax/imageio/ImageWriteParam.h
deleted file mode 100644
index 100a3e5f962..00000000000
--- a/libjava/javax/imageio/ImageWriteParam.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageWriteParam__
-#define __javax_imageio_ImageWriteParam__
-
-#pragma interface
-
-#include <javax/imageio/IIOParam.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageWriteParam;
-    }
-  }
-}
-
-class javax::imageio::ImageWriteParam : public ::javax::imageio::IIOParam
-{
-
-public: // actually protected
-  ImageWriteParam();
-public:
-  ImageWriteParam(::java::util::Locale *);
-  virtual jfloat getBitRate(jfloat);
-private:
-  void checkSupportsCompression();
-  void checkNotExplicitCompression();
-  void checkCompressionTypesSet();
-  void checkSupportsProgressiveEncoding();
-  void checkSupportsTiling();
-  void checkNotExplicitTiling();
-  void checkTilingInitialized();
-  void checkMode(jint);
-public:
-  virtual jboolean canOffsetTiles();
-  virtual jboolean canWriteCompressed();
-  virtual jboolean canWriteProgressive();
-  virtual jboolean canWriteTiles();
-  virtual jint getCompressionMode();
-  virtual jfloat getCompressionQuality();
-  virtual JArray< ::java::lang::String * > * getCompressionQualityDescriptions();
-  virtual JArray< jfloat > * getCompressionQualityValues();
-  virtual ::java::lang::String * getCompressionType();
-  virtual JArray< ::java::lang::String * > * getCompressionTypes();
-  virtual ::java::util::Locale * getLocale();
-  virtual ::java::lang::String * getLocalizedCompressionTypeName();
-  virtual JArray< ::java::awt::Dimension * > * getPreferredTileSizes();
-  virtual jint getProgressiveMode();
-  virtual jint getTileGridXOffset();
-  virtual jint getTileGridYOffset();
-  virtual jint getTileHeight();
-  virtual jint getTileWidth();
-  virtual jint getTilingMode();
-  virtual jboolean isCompressionLossless();
-  virtual void setCompressionMode(jint);
-  virtual void setCompressionQuality(jfloat);
-  virtual void setCompressionType(::java::lang::String *);
-  virtual void setProgressiveMode(jint);
-  virtual void setTiling(jint, jint, jint, jint);
-  virtual void setTilingMode(jint);
-  virtual void unsetCompression();
-  virtual void unsetTiling();
-  static const jint MODE_DISABLED = 0;
-  static const jint MODE_DEFAULT = 1;
-  static const jint MODE_EXPLICIT = 2;
-  static const jint MODE_COPY_FROM_METADATA = 3;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::imageio::IIOParam)))) canOffsetTiles__;
-  jboolean canWriteCompressed__;
-  jboolean canWriteProgressive__;
-  jboolean canWriteTiles__;
-  jint compressionMode;
-  jfloat compressionQuality;
-  ::java::lang::String * compressionType;
-  JArray< ::java::lang::String * > * compressionTypes;
-  ::java::util::Locale * locale;
-  JArray< ::java::awt::Dimension * > * preferredTileSizes;
-  jint progressiveMode;
-  jint tileGridXOffset;
-  jint tileGridYOffset;
-  jint tileHeight;
-  jint tileWidth;
-  jint tilingMode;
-  jboolean tilingSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageWriteParam__
diff --git a/libjava/javax/imageio/ImageWriter.h b/libjava/javax/imageio/ImageWriter.h
deleted file mode 100644
index db14cbdde5d..00000000000
--- a/libjava/javax/imageio/ImageWriter.h
+++ /dev/null
@@ -1,140 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_ImageWriter__
-#define __javax_imageio_ImageWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-      namespace image
-      {
-          class Raster;
-          class RenderedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class IIOImage;
-        class ImageTypeSpecifier;
-        class ImageWriteParam;
-        class ImageWriter;
-      namespace event
-      {
-          class IIOWriteProgressListener;
-          class IIOWriteWarningListener;
-      }
-      namespace metadata
-      {
-          class IIOMetadata;
-      }
-      namespace spi
-      {
-          class ImageWriterSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::ImageWriter : public ::java::lang::Object
-{
-
-public: // actually protected
-  ImageWriter(::javax::imageio::spi::ImageWriterSpi *);
-private:
-  void checkOutputSet();
-public:
-  virtual void abort();
-public: // actually protected
-  virtual jboolean abortRequested();
-public:
-  virtual void addIIOWriteProgressListener(::javax::imageio::event::IIOWriteProgressListener *);
-  virtual void addIIOWriteWarningListener(::javax::imageio::event::IIOWriteWarningListener *);
-  virtual jboolean canInsertEmpty(jint);
-  virtual jboolean canInsertImage(jint);
-  virtual jboolean canRemoveImage(jint);
-  virtual jboolean canReplaceImageMetadata(jint);
-  virtual jboolean canReplacePixels(jint);
-  virtual jboolean canReplaceStreamMetadata();
-  virtual jboolean canWriteEmpty();
-  virtual jboolean canWriteRasters();
-  virtual jboolean canWriteSequence();
-public: // actually protected
-  virtual void clearAbortRequest();
-public:
-  virtual ::javax::imageio::metadata::IIOMetadata * convertImageMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *) = 0;
-  virtual ::javax::imageio::metadata::IIOMetadata * convertStreamMetadata(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageWriteParam *) = 0;
-  virtual void dispose();
-  virtual JArray< ::java::util::Locale * > * getAvailableLocales();
-  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultImageMetadata(::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *) = 0;
-  virtual ::javax::imageio::metadata::IIOMetadata * getDefaultStreamMetadata(::javax::imageio::ImageWriteParam *) = 0;
-  virtual ::javax::imageio::ImageWriteParam * getDefaultWriteParam();
-  virtual ::java::util::Locale * getLocale();
-  virtual jint getNumThumbnailsSupported(::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::metadata::IIOMetadata *);
-  virtual ::javax::imageio::spi::ImageWriterSpi * getOriginatingProvider();
-  virtual ::java::lang::Object * getOutput();
-  virtual JArray< ::java::awt::Dimension * > * getPreferredThumbnailSizes(::javax::imageio::ImageTypeSpecifier *, ::javax::imageio::ImageWriteParam *, ::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::metadata::IIOMetadata *);
-public: // actually protected
-  virtual void processImageComplete();
-  virtual void processImageProgress(jfloat);
-  virtual void processImageStarted(jint);
-  virtual void processThumbnailComplete();
-  virtual void processThumbnailProgress(jfloat);
-  virtual void processThumbnailStarted(jint, jint);
-  virtual void processWarningOccurred(jint, ::java::lang::String *);
-  virtual void processWarningOccurred(jint, ::java::lang::String *, ::java::lang::String *);
-  virtual void processWriteAborted();
-public:
-  virtual void removeAllIIOWriteProgressListeners();
-  virtual void removeAllIIOWriteWarningListeners();
-  virtual void removeIIOWriteProgressListener(::javax::imageio::event::IIOWriteProgressListener *);
-  virtual void removeIIOWriteWarningListener(::javax::imageio::event::IIOWriteWarningListener *);
-  virtual void reset();
-  virtual void setLocale(::java::util::Locale *);
-  virtual void setOutput(::java::lang::Object *);
-  virtual void write(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *) = 0;
-  virtual void endInsertEmpty();
-  virtual void endReplacePixels();
-  virtual void endWriteEmpty();
-  virtual void endWriteSequence();
-  virtual void prepareInsertEmpty(jint, ::javax::imageio::ImageTypeSpecifier *, jint, jint, ::javax::imageio::metadata::IIOMetadata *, ::java::util::List *, ::javax::imageio::ImageWriteParam *);
-  virtual void prepareReplacePixels(jint, ::java::awt::Rectangle *);
-  virtual void prepareWriteEmpty(::javax::imageio::metadata::IIOMetadata *, ::javax::imageio::ImageTypeSpecifier *, jint, jint, ::javax::imageio::metadata::IIOMetadata *, ::java::util::List *, ::javax::imageio::ImageWriteParam *);
-  virtual void prepareWriteSequence(::javax::imageio::metadata::IIOMetadata *);
-  virtual void removeImage(jint);
-  virtual void replaceImageMetadata(jint, ::javax::imageio::metadata::IIOMetadata *);
-  virtual void replacePixels(::java::awt::image::RenderedImage *, ::javax::imageio::ImageWriteParam *);
-  virtual void replacePixels(::java::awt::image::Raster *, ::javax::imageio::ImageWriteParam *);
-  virtual void replaceStreamMetadata(::javax::imageio::metadata::IIOMetadata *);
-  virtual void write(::java::awt::image::RenderedImage *);
-  virtual void write(::javax::imageio::IIOImage *);
-  virtual void writeInsert(jint, ::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-  virtual void writeToSequence(::javax::imageio::IIOImage *, ::javax::imageio::ImageWriteParam *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) aborted;
-public: // actually protected
-  JArray< ::java::util::Locale * > * availableLocales;
-  ::java::util::Locale * locale;
-  ::javax::imageio::spi::ImageWriterSpi * originatingProvider;
-  ::java::lang::Object * output;
-  ::java::util::List * progressListeners;
-  ::java::util::List * warningListeners;
-  ::java::util::List * warningLocales;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_ImageWriter__
diff --git a/libjava/javax/imageio/event/IIOReadProgressListener.h b/libjava/javax/imageio/event/IIOReadProgressListener.h
deleted file mode 100644
index 3bad67116b7..00000000000
--- a/libjava/javax/imageio/event/IIOReadProgressListener.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_event_IIOReadProgressListener__
-#define __javax_imageio_event_IIOReadProgressListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-      namespace event
-      {
-          class IIOReadProgressListener;
-      }
-    }
-  }
-}
-
-class javax::imageio::event::IIOReadProgressListener : public ::java::lang::Object
-{
-
-public:
-  virtual void imageComplete(::javax::imageio::ImageReader *) = 0;
-  virtual void imageProgress(::javax::imageio::ImageReader *, jfloat) = 0;
-  virtual void imageStarted(::javax::imageio::ImageReader *, jint) = 0;
-  virtual void readAborted(::javax::imageio::ImageReader *) = 0;
-  virtual void sequenceComplete(::javax::imageio::ImageReader *) = 0;
-  virtual void sequenceStarted(::javax::imageio::ImageReader *, jint) = 0;
-  virtual void thumbnailComplete(::javax::imageio::ImageReader *) = 0;
-  virtual void thumbnailProgress(::javax::imageio::ImageReader *, jfloat) = 0;
-  virtual void thumbnailStarted(::javax::imageio::ImageReader *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_event_IIOReadProgressListener__
diff --git a/libjava/javax/imageio/event/IIOReadUpdateListener.h b/libjava/javax/imageio/event/IIOReadUpdateListener.h
deleted file mode 100644
index 86c28ec700b..00000000000
--- a/libjava/javax/imageio/event/IIOReadUpdateListener.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_event_IIOReadUpdateListener__
-#define __javax_imageio_event_IIOReadUpdateListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-      namespace event
-      {
-          class IIOReadUpdateListener;
-      }
-    }
-  }
-}
-
-class javax::imageio::event::IIOReadUpdateListener : public ::java::lang::Object
-{
-
-public:
-  virtual void imageUpdate(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, JArray< jint > *) = 0;
-  virtual void passComplete(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *) = 0;
-  virtual void passStarted(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, jint, JArray< jint > *) = 0;
-  virtual void thumbnailPassComplete(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *) = 0;
-  virtual void thumbnailPassStarted(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, jint, JArray< jint > *) = 0;
-  virtual void thumbnailUpdate(::javax::imageio::ImageReader *, ::java::awt::image::BufferedImage *, jint, jint, jint, jint, jint, jint, JArray< jint > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_event_IIOReadUpdateListener__
diff --git a/libjava/javax/imageio/event/IIOReadWarningListener.h b/libjava/javax/imageio/event/IIOReadWarningListener.h
deleted file mode 100644
index c74cf41d719..00000000000
--- a/libjava/javax/imageio/event/IIOReadWarningListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_event_IIOReadWarningListener__
-#define __javax_imageio_event_IIOReadWarningListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-      namespace event
-      {
-          class IIOReadWarningListener;
-      }
-    }
-  }
-}
-
-class javax::imageio::event::IIOReadWarningListener : public ::java::lang::Object
-{
-
-public:
-  virtual void warningOccurred(::javax::imageio::ImageReader *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_event_IIOReadWarningListener__
diff --git a/libjava/javax/imageio/event/IIOWriteProgressListener.h b/libjava/javax/imageio/event/IIOWriteProgressListener.h
deleted file mode 100644
index bb140af3565..00000000000
--- a/libjava/javax/imageio/event/IIOWriteProgressListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_event_IIOWriteProgressListener__
-#define __javax_imageio_event_IIOWriteProgressListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageWriter;
-      namespace event
-      {
-          class IIOWriteProgressListener;
-      }
-    }
-  }
-}
-
-class javax::imageio::event::IIOWriteProgressListener : public ::java::lang::Object
-{
-
-public:
-  virtual void imageComplete(::javax::imageio::ImageWriter *) = 0;
-  virtual void imageProgress(::javax::imageio::ImageWriter *, jfloat) = 0;
-  virtual void imageStarted(::javax::imageio::ImageWriter *, jint) = 0;
-  virtual void thumbnailComplete(::javax::imageio::ImageWriter *) = 0;
-  virtual void thumbnailProgress(::javax::imageio::ImageWriter *, jfloat) = 0;
-  virtual void thumbnailStarted(::javax::imageio::ImageWriter *, jint, jint) = 0;
-  virtual void writeAborted(::javax::imageio::ImageWriter *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_event_IIOWriteProgressListener__
diff --git a/libjava/javax/imageio/event/IIOWriteWarningListener.h b/libjava/javax/imageio/event/IIOWriteWarningListener.h
deleted file mode 100644
index 220bf2321e5..00000000000
--- a/libjava/javax/imageio/event/IIOWriteWarningListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_event_IIOWriteWarningListener__
-#define __javax_imageio_event_IIOWriteWarningListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageWriter;
-      namespace event
-      {
-          class IIOWriteWarningListener;
-      }
-    }
-  }
-}
-
-class javax::imageio::event::IIOWriteWarningListener : public ::java::lang::Object
-{
-
-public:
-  virtual void warningOccurred(::javax::imageio::ImageWriter *, jint, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_event_IIOWriteWarningListener__
diff --git a/libjava/javax/imageio/metadata/IIOInvalidTreeException.h b/libjava/javax/imageio/metadata/IIOInvalidTreeException.h
deleted file mode 100644
index 9980defda65..00000000000
--- a/libjava/javax/imageio/metadata/IIOInvalidTreeException.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOInvalidTreeException__
-#define __javax_imageio_metadata_IIOInvalidTreeException__
-
-#pragma interface
-
-#include <javax/imageio/IIOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOInvalidTreeException;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOInvalidTreeException : public ::javax::imageio::IIOException
-{
-
-public:
-  IIOInvalidTreeException(::java::lang::String *, ::org::w3c::dom::Node *);
-  IIOInvalidTreeException(::java::lang::String *, ::java::lang::Throwable *, ::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * getOffendingNode();
-private:
-  static const jlong serialVersionUID = -1314083172544132777LL;
-public: // actually protected
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::javax::imageio::IIOException)))) offendingNode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOInvalidTreeException__
diff --git a/libjava/javax/imageio/metadata/IIOMetadata.h b/libjava/javax/imageio/metadata/IIOMetadata.h
deleted file mode 100644
index 33d5a61646f..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadata.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadata__
-#define __javax_imageio_metadata_IIOMetadata__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadata;
-          class IIOMetadataController;
-          class IIOMetadataFormat;
-          class IIOMetadataNode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadata : public ::java::lang::Object
-{
-
-public: // actually protected
-  IIOMetadata();
-  IIOMetadata(jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-public:
-  virtual jboolean activateController();
-  virtual ::javax::imageio::metadata::IIOMetadataController * getController();
-  virtual ::javax::imageio::metadata::IIOMetadataController * getDefaultController();
-  virtual JArray< ::java::lang::String * > * getExtraMetadataFormatNames();
-  virtual ::javax::imageio::metadata::IIOMetadataFormat * getMetadataFormat(::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getMetadataFormatNames();
-  virtual ::java::lang::String * getNativeMetadataFormatName();
-  virtual jboolean hasController();
-  virtual jboolean isReadOnly() = 0;
-  virtual jboolean isStandardMetadataFormatSupported();
-  virtual void reset() = 0;
-  virtual void setController(::javax::imageio::metadata::IIOMetadataController *);
-  virtual ::org::w3c::dom::Node * getAsTree(::java::lang::String *) = 0;
-public: // actually protected
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardChromaNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardCompressionNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardDataNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardDimensionNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardDocumentNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardTextNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardTileNode();
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardTransparencyNode();
-private:
-  void appendChild(::javax::imageio::metadata::IIOMetadataNode *, ::javax::imageio::metadata::IIOMetadataNode *);
-public: // actually protected
-  virtual ::javax::imageio::metadata::IIOMetadataNode * getStandardTree();
-public:
-  virtual void mergeTree(::java::lang::String *, ::org::w3c::dom::Node *) = 0;
-  virtual void setFromTree(::java::lang::String *, ::org::w3c::dom::Node *);
-public: // actually protected
-  ::javax::imageio::metadata::IIOMetadataController * __attribute__((aligned(__alignof__( ::java::lang::Object)))) controller;
-  ::javax::imageio::metadata::IIOMetadataController * defaultController;
-  JArray< ::java::lang::String * > * extraMetadataFormatClassNames;
-  JArray< ::java::lang::String * > * extraMetadataFormatNames;
-  ::java::lang::String * nativeMetadataFormatClassName;
-  ::java::lang::String * nativeMetadataFormatName;
-  jboolean standardFormatSupported;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadata__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataController.h b/libjava/javax/imageio/metadata/IIOMetadataController.h
deleted file mode 100644
index e970191d67e..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataController__
-#define __javax_imageio_metadata_IIOMetadataController__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadata;
-          class IIOMetadataController;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataController : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean activate(::javax::imageio::metadata::IIOMetadata *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_metadata_IIOMetadataController__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormat.h b/libjava/javax/imageio/metadata/IIOMetadataFormat.h
deleted file mode 100644
index 0744efbfcae..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormat.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormat__
-#define __javax_imageio_metadata_IIOMetadataFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-      namespace metadata
-      {
-          class IIOMetadataFormat;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormat : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean canNodeAppear(::java::lang::String *, ::javax::imageio::ImageTypeSpecifier *) = 0;
-  virtual jint getAttributeDataType(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeDefaultValue(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeDescription(::java::lang::String *, ::java::lang::String *, ::java::util::Locale *) = 0;
-  virtual JArray< ::java::lang::String * > * getAttributeEnumerations(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jint getAttributeListMaxLength(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jint getAttributeListMinLength(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeMaxValue(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeMinValue(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getAttributeNames(::java::lang::String *) = 0;
-  virtual jint getAttributeValueType(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getChildNames(::java::lang::String *) = 0;
-  virtual jint getChildPolicy(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getElementDescription(::java::lang::String *, ::java::util::Locale *) = 0;
-  virtual jint getElementMaxChildren(::java::lang::String *) = 0;
-  virtual jint getElementMinChildren(::java::lang::String *) = 0;
-  virtual jint getObjectArrayMaxLength(::java::lang::String *) = 0;
-  virtual jint getObjectArrayMinLength(::java::lang::String *) = 0;
-  virtual ::java::lang::Class * getObjectClass(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * getObjectDefaultValue(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::Object * > * getObjectEnumerations(::java::lang::String *) = 0;
-  virtual ::java::lang::Comparable * getObjectMaxValue(::java::lang::String *) = 0;
-  virtual ::java::lang::Comparable * getObjectMinValue(::java::lang::String *) = 0;
-  virtual jint getObjectValueType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getRootName() = 0;
-  virtual jboolean isAttributeRequired(::java::lang::String *, ::java::lang::String *) = 0;
-  static const jint CHILD_POLICY_ALL = 1;
-  static const jint CHILD_POLICY_CHOICE = 3;
-  static const jint CHILD_POLICY_EMPTY = 0;
-  static const jint CHILD_POLICY_MAX = 5;
-  static const jint CHILD_POLICY_REPEAT = 5;
-  static const jint CHILD_POLICY_SEQUENCE = 4;
-  static const jint CHILD_POLICY_SOME = 2;
-  static const jint DATATYPE_BOOLEAN = 1;
-  static const jint DATATYPE_DOUBLE = 4;
-  static const jint DATATYPE_FLOAT = 3;
-  static const jint DATATYPE_INTEGER = 2;
-  static const jint DATATYPE_STRING = 0;
-  static const jint VALUE_ARBITRARY = 1;
-  static const jint VALUE_ENUMERATION = 16;
-  static const jint VALUE_LIST = 32;
-  static const jint VALUE_NONE = 0;
-  static const jint VALUE_RANGE = 2;
-  static const jint VALUE_RANGE_MAX_INCLUSIVE = 10;
-  static const jint VALUE_RANGE_MAX_INCLUSIVE_MASK = 8;
-  static const jint VALUE_RANGE_MIN_INCLUSIVE = 6;
-  static const jint VALUE_RANGE_MIN_INCLUSIVE_MASK = 4;
-  static const jint VALUE_RANGE_MIN_MAX_INCLUSIVE = 14;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_metadata_IIOMetadataFormat__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$1.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$1.h
deleted file mode 100644
index 2afcdb019e7..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$1__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$1__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl$1;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$1 : public ::javax::imageio::metadata::IIOMetadataFormatImpl
-{
-
-public: // actually package-private
-  IIOMetadataFormatImpl$1(::java::lang::String *, jint);
-public:
-  jboolean canNodeAppear(::java::lang::String *, ::javax::imageio::ImageTypeSpecifier *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$1__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h
deleted file mode 100644
index e1f5f93a413..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttr__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttr__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataNode.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl$IIOMetadataNodeAttr;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-          class TypeInfo;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr : public ::javax::imageio::metadata::IIOMetadataNode
-{
-
-public:
-  IIOMetadataFormatImpl$IIOMetadataNodeAttr(::org::w3c::dom::Element *, ::java::lang::String *, ::java::lang::String *);
-  IIOMetadataFormatImpl$IIOMetadataNodeAttr(::org::w3c::dom::Element *, ::java::lang::String *, jint, jboolean, ::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::org::w3c::dom::Element * getOwnerElement();
-  virtual jint getDataType();
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo();
-  virtual jboolean getSpecified();
-  virtual ::java::lang::String * getValue();
-  virtual jboolean isId();
-  virtual void setValue(::java::lang::String *);
-  virtual jboolean isRequired();
-public: // actually protected
-  ::org::w3c::dom::Element * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataNode)))) owner;
-  ::java::lang::String * name;
-  jint dataType;
-  jboolean required;
-  ::java::lang::String * defaultValue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttr__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded.h
deleted file mode 100644
index 4a1a76e76bc..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded : public ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr
-{
-
-public:
-  IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::String *, jint, jboolean, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-  virtual ::java::lang::String * getMinValue();
-  virtual ::java::lang::String * getMaxValue();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr)))) minValue;
-  ::java::lang::String * maxValue;
-  jboolean minInclusive;
-  jboolean maxInclusive;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrBounded__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated.h
deleted file mode 100644
index a81c5628941..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated : public ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr
-{
-
-public:
-  IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::String *, jint, jboolean, ::java::lang::String *, ::java::util::List *);
-  virtual JArray< ::java::lang::Object * > * getEnumerations();
-public: // actually protected
-  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr)))) enumeratedValues;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrEnumerated__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrList.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrList.h
deleted file mode 100644
index fd5b373cb01..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttrList.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrList__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrList__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$IIOMetadataNodeAttr.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$IIOMetadataNodeAttrList;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttrList : public ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr
-{
-
-public:
-  IIOMetadataFormatImpl$IIOMetadataNodeAttrList(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::String *, jint, jboolean, jint, jint);
-  virtual jint getListMinLength();
-  virtual jint getListMaxLength();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$IIOMetadataNodeAttr)))) listMinLength;
-  jint listMaxLength;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$IIOMetadataNodeAttrList__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h
deleted file mode 100644
index fabfef49165..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObject__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$NodeObject;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject : public ::java::lang::Object
-{
-
-public:
-  IIOMetadataFormatImpl$NodeObject(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::Class *, jboolean, ::java::lang::Object *);
-  virtual jint getValueType();
-  virtual ::java::lang::Class * getClassType();
-  virtual ::org::w3c::dom::Element * getOwnerElement();
-  virtual ::java::lang::Object * getDefaultValue();
-  virtual jboolean isRequired();
-public: // actually protected
-  ::org::w3c::dom::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) owner;
-  ::java::lang::Class * classType;
-  jboolean required;
-  ::java::lang::Object * defaultValue;
-  jint valueType;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObject__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectArray.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectArray.h
deleted file mode 100644
index 4e9b819ed5b..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectArray.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectArray__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectArray__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$NodeObjectArray;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$NodeObjectArray : public ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject
-{
-
-public:
-  IIOMetadataFormatImpl$NodeObjectArray(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::Class *, jint, jint);
-  virtual ::java::lang::Comparable * getArrayMinLength();
-  virtual ::java::lang::Comparable * getArrayMaxLength();
-public: // actually protected
-  ::java::lang::Integer * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject)))) arrayMinLength;
-  ::java::lang::Integer * arrayMaxLength;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectArray__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectBounded.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectBounded.h
deleted file mode 100644
index 1605d23deb9..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectBounded.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectBounded__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectBounded__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$NodeObjectBounded;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$NodeObjectBounded : public ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject
-{
-
-public:
-  IIOMetadataFormatImpl$NodeObjectBounded(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::Class *, ::java::lang::Object *, ::java::lang::Comparable *, ::java::lang::Comparable *, jboolean, jboolean);
-  virtual ::java::lang::Comparable * getMinValue();
-  virtual ::java::lang::Comparable * getMaxValue();
-public: // actually protected
-  ::java::lang::Comparable * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject)))) minValue;
-  ::java::lang::Comparable * maxValue;
-  jboolean minInclusive;
-  jboolean maxInclusive;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectBounded__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectEnumerated.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectEnumerated.h
deleted file mode 100644
index 0dabd83e265..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl$NodeObjectEnumerated.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectEnumerated__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectEnumerated__
-
-#pragma interface
-
-#include <javax/imageio/metadata/IIOMetadataFormatImpl$NodeObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$NodeObjectEnumerated;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl$NodeObjectEnumerated : public ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject
-{
-
-public:
-  IIOMetadataFormatImpl$NodeObjectEnumerated(::javax::imageio::metadata::IIOMetadataFormatImpl *, ::org::w3c::dom::Element *, ::java::lang::Class *, jboolean, ::java::lang::Object *, ::java::util::List *);
-  virtual JArray< ::java::lang::Object * > * getEnumerations();
-public: // actually protected
-  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject)))) enumeratedValues;
-public: // actually package-private
-  ::javax::imageio::metadata::IIOMetadataFormatImpl * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl$NodeObjectEnumerated__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl.h b/libjava/javax/imageio/metadata/IIOMetadataFormatImpl.h
deleted file mode 100644
index b47defa8474..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataFormatImpl.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataFormatImpl__
-#define __javax_imageio_metadata_IIOMetadataFormatImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-      namespace metadata
-      {
-          class IIOMetadataFormat;
-          class IIOMetadataFormatImpl;
-          class IIOMetadataFormatImpl$NodeObject;
-          class IIOMetadataNode;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataFormatImpl : public ::java::lang::Object
-{
-
-public:
-  IIOMetadataFormatImpl(::java::lang::String *, jint);
-  IIOMetadataFormatImpl(::java::lang::String *, jint, jint);
-public: // actually protected
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, jint, jboolean, ::java::lang::String *);
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, jint, jboolean, ::java::lang::String *, ::java::util::List *);
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, jint, jboolean, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, jint, jboolean, jint, jint);
-  virtual void addBooleanAttribute(::java::lang::String *, ::java::lang::String *, jboolean, jboolean);
-  virtual void addChildElement(::java::lang::String *, ::java::lang::String *);
-  virtual void addElement(::java::lang::String *, ::java::lang::String *, jint);
-  virtual void addElement(::java::lang::String *, ::java::lang::String *, jint, jint);
-private:
-  void addNodeObject(::javax::imageio::metadata::IIOMetadataNode *, ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject *);
-  ::javax::imageio::metadata::IIOMetadataFormatImpl$NodeObject * getNodeObject(::javax::imageio::metadata::IIOMetadataNode *);
-  void removeNodeObject(::javax::imageio::metadata::IIOMetadataNode *);
-public: // actually protected
-  virtual void addObjectValue(::java::lang::String *, ::java::lang::Class *, jboolean, ::java::lang::Object *);
-  virtual void addObjectValue(::java::lang::String *, ::java::lang::Class *, jboolean, ::java::lang::Object *, ::java::util::List *);
-  virtual void addObjectValue(::java::lang::String *, ::java::lang::Class *, ::java::lang::Object *, ::java::lang::Comparable *, ::java::lang::Comparable *, jboolean, jboolean);
-  virtual void addObjectValue(::java::lang::String *, ::java::lang::Class *, jint, jint);
-public:
-  virtual ::java::lang::String * getRootName();
-public: // actually protected
-  virtual ::java::lang::String * getResourceBaseName();
-public:
-  static ::javax::imageio::metadata::IIOMetadataFormat * getStandardFormatInstance();
-  virtual jboolean canNodeAppear(::java::lang::String *, ::javax::imageio::ImageTypeSpecifier *) = 0;
-public: // actually protected
-  virtual void removeAttribute(::java::lang::String *, ::java::lang::String *);
-  virtual void removeElement(::java::lang::String *);
-  virtual void removeObjectValue(::java::lang::String *);
-  virtual void setResourceBaseName(::java::lang::String *);
-public:
-  virtual jint getAttributeDataType(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAttributeDefaultValue(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAttributeDescription(::java::lang::String *, ::java::lang::String *, ::java::util::Locale *);
-  virtual JArray< ::java::lang::String * > * getAttributeEnumerations(::java::lang::String *, ::java::lang::String *);
-  virtual jint getAttributeListMaxLength(::java::lang::String *, ::java::lang::String *);
-  virtual jint getAttributeListMinLength(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAttributeMaxValue(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAttributeMinValue(::java::lang::String *, ::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getAttributeNames(::java::lang::String *);
-  virtual jint getAttributeValueType(::java::lang::String *, ::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * getChildNames(::java::lang::String *);
-  virtual jint getChildPolicy(::java::lang::String *);
-private:
-  ::java::lang::String * getDescription(::java::lang::String *, ::java::util::Locale *);
-public:
-  virtual ::java::lang::String * getElementDescription(::java::lang::String *, ::java::util::Locale *);
-  virtual jint getElementMaxChildren(::java::lang::String *);
-  virtual jint getElementMinChildren(::java::lang::String *);
-  virtual jint getObjectArrayMaxLength(::java::lang::String *);
-  virtual jint getObjectArrayMinLength(::java::lang::String *);
-  virtual ::java::lang::Class * getObjectClass(::java::lang::String *);
-  virtual ::java::lang::Object * getObjectDefaultValue(::java::lang::String *);
-  virtual JArray< ::java::lang::Object * > * getObjectEnumerations(::java::lang::String *);
-  virtual ::java::lang::Comparable * getObjectMaxValue(::java::lang::String *);
-  virtual ::java::lang::Comparable * getObjectMinValue(::java::lang::String *);
-  virtual jint getObjectValueType(::java::lang::String *);
-  virtual jboolean isAttributeRequired(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * standardMetadataFormatName;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rootName;
-  ::java::util::Map * nodes;
-  ::java::util::Map * childPolicies;
-  ::java::util::Map * childRanges;
-  ::java::lang::String * resourceBaseName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataFormatImpl__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataNode$IIONamedNodeMap.h b/libjava/javax/imageio/metadata/IIOMetadataNode$IIONamedNodeMap.h
deleted file mode 100644
index 9026a27d65f..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataNode$IIONamedNodeMap.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataNode$IIONamedNodeMap__
-#define __javax_imageio_metadata_IIOMetadataNode$IIONamedNodeMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataNode;
-          class IIOMetadataNode$IIONamedNodeMap;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataNode$IIONamedNodeMap : public ::java::lang::Object
-{
-
-public:
-  IIOMetadataNode$IIONamedNodeMap(::javax::imageio::metadata::IIOMetadataNode *, ::java::util::HashMap *);
-  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 *);
-public: // actually package-private
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrs;
-  ::javax::imageio::metadata::IIOMetadataNode * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataNode$IIONamedNodeMap__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataNode$IIONodeList.h b/libjava/javax/imageio/metadata/IIOMetadataNode$IIONodeList.h
deleted file mode 100644
index 581abd9cab8..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataNode$IIONodeList.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataNode$IIONodeList__
-#define __javax_imageio_metadata_IIOMetadataNode$IIONodeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataNode;
-          class IIOMetadataNode$IIONodeList;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataNode$IIONodeList : public ::java::lang::Object
-{
-
-  IIOMetadataNode$IIONodeList(::javax::imageio::metadata::IIOMetadataNode *);
-public:
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual jint getLength();
-public: // actually package-private
-  IIOMetadataNode$IIONodeList(::javax::imageio::metadata::IIOMetadataNode *, ::javax::imageio::metadata::IIOMetadataNode$IIONodeList *);
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children;
-  ::javax::imageio::metadata::IIOMetadataNode * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataNode$IIONodeList__
diff --git a/libjava/javax/imageio/metadata/IIOMetadataNode.h b/libjava/javax/imageio/metadata/IIOMetadataNode.h
deleted file mode 100644
index bf2c50c5381..00000000000
--- a/libjava/javax/imageio/metadata/IIOMetadataNode.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_metadata_IIOMetadataNode__
-#define __javax_imageio_metadata_IIOMetadataNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataNode;
-          class IIOMetadataNode$IIONodeList;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class javax::imageio::metadata::IIOMetadataNode : public ::java::lang::Object
-{
-
-public:
-  IIOMetadataNode();
-  IIOMetadataNode(::java::lang::String *);
-  virtual ::java::lang::Object * getUserObject();
-  virtual void setUserObject(::java::lang::Object *);
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *);
-  virtual ::java::lang::String * getAttribute(::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 ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getBaseURI();
-private:
-  void getElementsRecurse(::javax::imageio::metadata::IIOMetadataNode$IIONodeList *, ::java::lang::String *);
-public:
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *);
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getTagName();
-  virtual jboolean hasAttribute(::java::lang::String *);
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *);
-  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 void setAttribute(::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 setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual jint getLength();
-  virtual ::org::w3c::dom::Node * item(jint);
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean);
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes();
-  virtual ::org::w3c::dom::NodeList * getChildNodes();
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::w3c::dom::Node * getFirstChild();
-  virtual ::org::w3c::dom::Node * getLastChild();
-  virtual ::java::lang::String * getLocalName();
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual ::org::w3c::dom::Node * getNextSibling();
-  virtual ::java::lang::String * getNodeName();
-  virtual jshort getNodeType();
-  virtual ::java::lang::String * getNodeValue();
-  virtual ::org::w3c::dom::Document * getOwnerDocument();
-  virtual ::org::w3c::dom::Node * getParentNode();
-  virtual ::java::lang::String * getPrefix();
-  virtual ::org::w3c::dom::Node * getPreviousSibling();
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo();
-  virtual ::java::lang::String * getTextContent();
-  virtual ::java::lang::Object * getUserData(::java::lang::String *);
-  virtual jboolean hasAttributes();
-  virtual jboolean hasChildNodes();
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  virtual jboolean isDefaultNamespace(::java::lang::String *);
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *);
-  virtual jboolean isSameNode(::org::w3c::dom::Node *);
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *);
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *);
-  virtual void normalize();
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  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 void setNodeValue(::java::lang::String *);
-  virtual void setPrefix(::java::lang::String *);
-  virtual void setTextContent(::java::lang::String *);
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::util::HashMap * attrs;
-  ::java::util::List * children;
-  ::javax::imageio::metadata::IIOMetadataNode * parent;
-  ::java::lang::Object * obj;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_metadata_IIOMetadataNode__
diff --git a/libjava/javax/imageio/plugins/bmp/BMPImageWriteParam.h b/libjava/javax/imageio/plugins/bmp/BMPImageWriteParam.h
deleted file mode 100644
index d1757850d02..00000000000
--- a/libjava/javax/imageio/plugins/bmp/BMPImageWriteParam.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_plugins_bmp_BMPImageWriteParam__
-#define __javax_imageio_plugins_bmp_BMPImageWriteParam__
-
-#pragma interface
-
-#include <javax/imageio/ImageWriteParam.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace bmp
-        {
-            class BMPImageWriteParam;
-        }
-      }
-    }
-  }
-}
-
-class javax::imageio::plugins::bmp::BMPImageWriteParam : public ::javax::imageio::ImageWriteParam
-{
-
-public:
-  BMPImageWriteParam();
-  BMPImageWriteParam(::java::util::Locale *);
-  virtual void setTopDown(jboolean);
-  virtual jboolean isTopDown();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::imageio::ImageWriteParam)))) topDown;
-public: // actually package-private
-  ::java::lang::String * rgb;
-  ::java::lang::String * rle8;
-  ::java::lang::String * rle4;
-  ::java::lang::String * bitfields;
-  static const jint BI_RGB = 0;
-  static const jint BI_RLE8 = 1;
-  static const jint BI_RLE4 = 2;
-  static const jint BI_BITFIELDS = 3;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_plugins_bmp_BMPImageWriteParam__
diff --git a/libjava/javax/imageio/plugins/jpeg/JPEGHuffmanTable.h b/libjava/javax/imageio/plugins/jpeg/JPEGHuffmanTable.h
deleted file mode 100644
index 7aa9f84e54c..00000000000
--- a/libjava/javax/imageio/plugins/jpeg/JPEGHuffmanTable.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_plugins_jpeg_JPEGHuffmanTable__
-#define __javax_imageio_plugins_jpeg_JPEGHuffmanTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGHuffmanTable;
-        }
-      }
-    }
-  }
-}
-
-class javax::imageio::plugins::jpeg::JPEGHuffmanTable : public ::java::lang::Object
-{
-
-public:
-  JPEGHuffmanTable(JArray< jshort > *, JArray< jshort > *);
-private:
-  JPEGHuffmanTable(JArray< jshort > *, JArray< jshort > *, jboolean);
-  static JArray< jshort > * checkLengths(JArray< jshort > *);
-  static JArray< jshort > * checkValues(JArray< jshort > *, JArray< jshort > *);
-public:
-  virtual JArray< jshort > * getLengths();
-  virtual JArray< jshort > * getValues();
-  virtual ::java::lang::String * toString();
-private:
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lengths;
-  JArray< jshort > * values;
-public:
-  static ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * StdACChrominance;
-  static ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * StdACLuminance;
-  static ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * StdDCChrominance;
-  static ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * StdDCLuminance;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_plugins_jpeg_JPEGHuffmanTable__
diff --git a/libjava/javax/imageio/plugins/jpeg/JPEGImageReadParam.h b/libjava/javax/imageio/plugins/jpeg/JPEGImageReadParam.h
deleted file mode 100644
index c4583821519..00000000000
--- a/libjava/javax/imageio/plugins/jpeg/JPEGImageReadParam.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_plugins_jpeg_JPEGImageReadParam__
-#define __javax_imageio_plugins_jpeg_JPEGImageReadParam__
-
-#pragma interface
-
-#include <javax/imageio/ImageReadParam.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGHuffmanTable;
-            class JPEGImageReadParam;
-            class JPEGQTable;
-        }
-      }
-    }
-  }
-}
-
-class javax::imageio::plugins::jpeg::JPEGImageReadParam : public ::javax::imageio::ImageReadParam
-{
-
-public:
-  JPEGImageReadParam();
-  virtual jboolean areTablesSet();
-  virtual void setDecodeTables(JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > *, JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > *, JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > *);
-  virtual void unsetDecodeTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > * getQTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * getDCHuffmanTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * getACHuffmanTables();
-private:
-  JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > * __attribute__((aligned(__alignof__( ::javax::imageio::ImageReadParam)))) qTables;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * DCHuffmanTables;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * ACHuffmanTables;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_plugins_jpeg_JPEGImageReadParam__
diff --git a/libjava/javax/imageio/plugins/jpeg/JPEGImageWriteParam.h b/libjava/javax/imageio/plugins/jpeg/JPEGImageWriteParam.h
deleted file mode 100644
index 03607d122a9..00000000000
--- a/libjava/javax/imageio/plugins/jpeg/JPEGImageWriteParam.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_plugins_jpeg_JPEGImageWriteParam__
-#define __javax_imageio_plugins_jpeg_JPEGImageWriteParam__
-
-#pragma interface
-
-#include <javax/imageio/ImageWriteParam.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGHuffmanTable;
-            class JPEGImageWriteParam;
-            class JPEGQTable;
-        }
-      }
-    }
-  }
-}
-
-class javax::imageio::plugins::jpeg::JPEGImageWriteParam : public ::javax::imageio::ImageWriteParam
-{
-
-public:
-  JPEGImageWriteParam(::java::util::Locale *);
-  virtual void unsetCompression();
-  virtual jboolean isCompressionLossless();
-  virtual JArray< ::java::lang::String * > * getCompressionQualityDescriptions();
-  virtual JArray< jfloat > * getCompressionQualityValues();
-  virtual jboolean areTablesSet();
-  virtual void setEncodeTables(JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > *, JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > *, JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > *);
-  virtual void unsetEncodeTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > * getQTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * getDCHuffmanTables();
-  virtual JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * getACHuffmanTables();
-  virtual void setOptimizeHuffmanTables(jboolean);
-  virtual jboolean getOptimizeHuffmanTables();
-private:
-  JArray< ::javax::imageio::plugins::jpeg::JPEGQTable * > * __attribute__((aligned(__alignof__( ::javax::imageio::ImageWriteParam)))) qTables;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * DCHuffmanTables;
-  JArray< ::javax::imageio::plugins::jpeg::JPEGHuffmanTable * > * ACHuffmanTables;
-  jboolean optimize;
-  JArray< ::java::lang::String * > * compressionQualityDescriptions;
-  JArray< jfloat > * compressionQualityValues;
-  ::java::util::ResourceBundle * messages;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_plugins_jpeg_JPEGImageWriteParam__
diff --git a/libjava/javax/imageio/plugins/jpeg/JPEGQTable.h b/libjava/javax/imageio/plugins/jpeg/JPEGQTable.h
deleted file mode 100644
index 366202f5664..00000000000
--- a/libjava/javax/imageio/plugins/jpeg/JPEGQTable.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_plugins_jpeg_JPEGQTable__
-#define __javax_imageio_plugins_jpeg_JPEGQTable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace plugins
-      {
-        namespace jpeg
-        {
-            class JPEGQTable;
-        }
-      }
-    }
-  }
-}
-
-class javax::imageio::plugins::jpeg::JPEGQTable : public ::java::lang::Object
-{
-
-public:
-  JPEGQTable(JArray< jint > *);
-private:
-  JPEGQTable(JArray< jint > *, jboolean);
-  static JArray< jint > * checkTable(JArray< jint > *);
-public:
-  virtual JArray< jint > * getTable();
-  virtual ::javax::imageio::plugins::jpeg::JPEGQTable * getScaledInstance(jfloat, jboolean);
-  virtual ::java::lang::String * toString();
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) table;
-public:
-  static ::javax::imageio::plugins::jpeg::JPEGQTable * K1Luminance;
-  static ::javax::imageio::plugins::jpeg::JPEGQTable * K1Div2Luminance;
-  static ::javax::imageio::plugins::jpeg::JPEGQTable * K2Chrominance;
-  static ::javax::imageio::plugins::jpeg::JPEGQTable * K2Div2Chrominance;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_plugins_jpeg_JPEGQTable__
diff --git a/libjava/javax/imageio/spi/IIORegistry.h b/libjava/javax/imageio/spi/IIORegistry.h
deleted file mode 100644
index 4b15c121ff1..00000000000
--- a/libjava/javax/imageio/spi/IIORegistry.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_IIORegistry__
-#define __javax_imageio_spi_IIORegistry__
-
-#pragma interface
-
-#include <javax/imageio/spi/ServiceRegistry.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class IIORegistry;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::IIORegistry : public ::javax::imageio::spi::ServiceRegistry
-{
-
-public:
-  static ::javax::imageio::spi::IIORegistry * getDefaultInstance();
-private:
-  IIORegistry();
-public:
-  void registerApplicationClasspathSpis();
-private:
-  static ::java::util::HashSet * defaultCategories;
-  static ::java::util::HashMap * instances;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_IIORegistry__
diff --git a/libjava/javax/imageio/spi/IIOServiceProvider.h b/libjava/javax/imageio/spi/IIOServiceProvider.h
deleted file mode 100644
index befcd09ccfc..00000000000
--- a/libjava/javax/imageio/spi/IIOServiceProvider.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_IIOServiceProvider__
-#define __javax_imageio_spi_IIOServiceProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class IIOServiceProvider;
-          class ServiceRegistry;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::IIOServiceProvider : public ::java::lang::Object
-{
-
-public:
-  IIOServiceProvider(::java::lang::String *, ::java::lang::String *);
-  IIOServiceProvider();
-  virtual void onRegistration(::javax::imageio::spi::ServiceRegistry *, ::java::lang::Class *);
-  virtual void onDeregistration(::javax::imageio::spi::ServiceRegistry *, ::java::lang::Class *);
-  virtual ::java::lang::String * getVendorName();
-  virtual ::java::lang::String * getVersion();
-  virtual ::java::lang::String * getDescription(::java::util::Locale *) = 0;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) vendorName;
-  ::java::lang::String * version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_IIOServiceProvider__
diff --git a/libjava/javax/imageio/spi/ImageInputStreamSpi.h b/libjava/javax/imageio/spi/ImageInputStreamSpi.h
deleted file mode 100644
index 946842c61f3..00000000000
--- a/libjava/javax/imageio/spi/ImageInputStreamSpi.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageInputStreamSpi__
-#define __javax_imageio_spi_ImageInputStreamSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/IIOServiceProvider.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ImageInputStreamSpi;
-      }
-      namespace stream
-      {
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageInputStreamSpi : public ::javax::imageio::spi::IIOServiceProvider
-{
-
-public: // actually protected
-  ImageInputStreamSpi();
-public:
-  ImageInputStreamSpi(::java::lang::String *, ::java::lang::String *, ::java::lang::Class *);
-  virtual ::java::lang::Class * getInputClass();
-  virtual jboolean canUseCacheFile();
-  virtual jboolean needsCacheFile();
-  virtual ::javax::imageio::stream::ImageInputStream * createInputStreamInstance(::java::lang::Object *, jboolean, ::java::io::File *) = 0;
-  virtual ::javax::imageio::stream::ImageInputStream * createInputStreamInstance(::java::lang::Object *);
-public: // actually protected
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::javax::imageio::spi::IIOServiceProvider)))) inputClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageInputStreamSpi__
diff --git a/libjava/javax/imageio/spi/ImageOutputStreamSpi.h b/libjava/javax/imageio/spi/ImageOutputStreamSpi.h
deleted file mode 100644
index 6ac36b4aa97..00000000000
--- a/libjava/javax/imageio/spi/ImageOutputStreamSpi.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageOutputStreamSpi__
-#define __javax_imageio_spi_ImageOutputStreamSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/IIOServiceProvider.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ImageOutputStreamSpi;
-      }
-      namespace stream
-      {
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageOutputStreamSpi : public ::javax::imageio::spi::IIOServiceProvider
-{
-
-public: // actually protected
-  ImageOutputStreamSpi();
-public:
-  ImageOutputStreamSpi(::java::lang::String *, ::java::lang::String *, ::java::lang::Class *);
-  virtual ::java::lang::Class * getOutputClass();
-  virtual jboolean canUseCacheFile();
-  virtual jboolean needsCacheFile();
-  virtual ::javax::imageio::stream::ImageOutputStream * createOutputStreamInstance(::java::lang::Object *, jboolean, ::java::io::File *) = 0;
-  virtual ::javax::imageio::stream::ImageOutputStream * createOutputStreamInstance(::java::lang::Object *);
-public: // actually protected
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::javax::imageio::spi::IIOServiceProvider)))) outputClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageOutputStreamSpi__
diff --git a/libjava/javax/imageio/spi/ImageReaderSpi.h b/libjava/javax/imageio/spi/ImageReaderSpi.h
deleted file mode 100644
index 554b52ee785..00000000000
--- a/libjava/javax/imageio/spi/ImageReaderSpi.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageReaderSpi__
-#define __javax_imageio_spi_ImageReaderSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageReaderWriterSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageReader;
-      namespace spi
-      {
-          class ImageReaderSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageReaderSpi : public ::javax::imageio::spi::ImageReaderWriterSpi
-{
-
-public: // actually protected
-  ImageReaderSpi();
-public:
-  ImageReaderSpi(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::String * > *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-  virtual jboolean canDecodeInput(::java::lang::Object *) = 0;
-  virtual ::javax::imageio::ImageReader * createReaderInstance();
-  virtual ::javax::imageio::ImageReader * createReaderInstance(::java::lang::Object *) = 0;
-  virtual JArray< ::java::lang::String * > * getImageWriterSpiNames();
-  virtual JArray< ::java::lang::Class * > * getInputTypes();
-  virtual jboolean isOwnReader(::javax::imageio::ImageReader *);
-  static JArray< ::java::lang::Class * > * STANDARD_INPUT_TYPE;
-public: // actually protected
-  JArray< ::java::lang::Class * > * __attribute__((aligned(__alignof__( ::javax::imageio::spi::ImageReaderWriterSpi)))) inputTypes;
-  JArray< ::java::lang::String * > * writerSpiNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageReaderSpi__
diff --git a/libjava/javax/imageio/spi/ImageReaderWriterSpi.h b/libjava/javax/imageio/spi/ImageReaderWriterSpi.h
deleted file mode 100644
index 91930cd208f..00000000000
--- a/libjava/javax/imageio/spi/ImageReaderWriterSpi.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageReaderWriterSpi__
-#define __javax_imageio_spi_ImageReaderWriterSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/IIOServiceProvider.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace metadata
-      {
-          class IIOMetadataFormat;
-      }
-      namespace spi
-      {
-          class ImageReaderWriterSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageReaderWriterSpi : public ::javax::imageio::spi::IIOServiceProvider
-{
-
-public:
-  ImageReaderWriterSpi();
-  ImageReaderWriterSpi(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::lang::String *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-  virtual JArray< ::java::lang::String * > * getFormatNames();
-  virtual JArray< ::java::lang::String * > * getFileSuffixes();
-  virtual JArray< ::java::lang::String * > * getMIMETypes();
-  virtual ::java::lang::String * getPluginClassName();
-  virtual jboolean isStandardStreamMetadataFormatSupported();
-  virtual ::java::lang::String * getNativeStreamMetadataFormatName();
-  virtual JArray< ::java::lang::String * > * getExtraStreamMetadataFormatNames();
-  virtual jboolean isStandardImageMetadataFormatSupported();
-  virtual ::java::lang::String * getNativeImageMetadataFormatName();
-  virtual JArray< ::java::lang::String * > * getExtraImageMetadataFormatNames();
-  virtual ::javax::imageio::metadata::IIOMetadataFormat * getStreamMetadataFormat(::java::lang::String *);
-  virtual ::javax::imageio::metadata::IIOMetadataFormat * getImageMetadataFormat(::java::lang::String *);
-public: // actually protected
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::javax::imageio::spi::IIOServiceProvider)))) names;
-  JArray< ::java::lang::String * > * suffixes;
-  JArray< ::java::lang::String * > * MIMETypes;
-  ::java::lang::String * pluginClassName;
-  jboolean supportsStandardStreamMetadataFormat;
-  ::java::lang::String * nativeStreamMetadataFormatName;
-  ::java::lang::String * nativeStreamMetadataFormatClassName;
-  JArray< ::java::lang::String * > * extraStreamMetadataFormatNames;
-  JArray< ::java::lang::String * > * extraStreamMetadataFormatClassNames;
-  jboolean supportsStandardImageMetadataFormat;
-  ::java::lang::String * nativeImageMetadataFormatName;
-  ::java::lang::String * nativeImageMetadataFormatClassName;
-  JArray< ::java::lang::String * > * extraImageMetadataFormatNames;
-  JArray< ::java::lang::String * > * extraImageMetadataFormatClassNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageReaderWriterSpi__
diff --git a/libjava/javax/imageio/spi/ImageTranscoderSpi.h b/libjava/javax/imageio/spi/ImageTranscoderSpi.h
deleted file mode 100644
index 368c2ad631a..00000000000
--- a/libjava/javax/imageio/spi/ImageTranscoderSpi.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageTranscoderSpi__
-#define __javax_imageio_spi_ImageTranscoderSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/IIOServiceProvider.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTranscoder;
-      namespace spi
-      {
-          class ImageTranscoderSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageTranscoderSpi : public ::javax::imageio::spi::IIOServiceProvider
-{
-
-public: // actually protected
-  ImageTranscoderSpi();
-public:
-  ImageTranscoderSpi(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getReaderServiceProviderName() = 0;
-  virtual ::java::lang::String * getWriterServiceProviderName() = 0;
-  virtual ::javax::imageio::ImageTranscoder * createTranscoderInstance() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageTranscoderSpi__
diff --git a/libjava/javax/imageio/spi/ImageWriterSpi.h b/libjava/javax/imageio/spi/ImageWriterSpi.h
deleted file mode 100644
index 55d9bdb8ed8..00000000000
--- a/libjava/javax/imageio/spi/ImageWriterSpi.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ImageWriterSpi__
-#define __javax_imageio_spi_ImageWriterSpi__
-
-#pragma interface
-
-#include <javax/imageio/spi/ImageReaderWriterSpi.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace image
-      {
-          class RenderedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-        class ImageTypeSpecifier;
-        class ImageWriter;
-      namespace spi
-      {
-          class ImageWriterSpi;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ImageWriterSpi : public ::javax::imageio::spi::ImageReaderWriterSpi
-{
-
-public: // actually protected
-  ImageWriterSpi();
-public:
-  ImageWriterSpi(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::String * > *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-  virtual jboolean canEncodeImage(::javax::imageio::ImageTypeSpecifier *) = 0;
-  virtual jboolean canEncodeImage(::java::awt::image::RenderedImage *);
-  virtual ::javax::imageio::ImageWriter * createWriterInstance();
-  virtual ::javax::imageio::ImageWriter * createWriterInstance(::java::lang::Object *) = 0;
-  virtual JArray< ::java::lang::String * > * getImageReaderSpiNames();
-  virtual JArray< ::java::lang::Class * > * getOutputTypes();
-  virtual jboolean isFormatLossless();
-  virtual jboolean isOwnWriter(::javax::imageio::ImageWriter *);
-  static JArray< ::java::lang::Class * > * STANDARD_OUTPUT_TYPE;
-public: // actually protected
-  JArray< ::java::lang::Class * > * __attribute__((aligned(__alignof__( ::javax::imageio::spi::ImageReaderWriterSpi)))) outputTypes;
-  JArray< ::java::lang::String * > * readerSpiNames;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ImageWriterSpi__
diff --git a/libjava/javax/imageio/spi/RegisterableService.h b/libjava/javax/imageio/spi/RegisterableService.h
deleted file mode 100644
index fcd4e140f69..00000000000
--- a/libjava/javax/imageio/spi/RegisterableService.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_RegisterableService__
-#define __javax_imageio_spi_RegisterableService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class RegisterableService;
-          class ServiceRegistry;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::RegisterableService : public ::java::lang::Object
-{
-
-public:
-  virtual void onRegistration(::javax::imageio::spi::ServiceRegistry *, ::java::lang::Class *) = 0;
-  virtual void onDeregistration(::javax::imageio::spi::ServiceRegistry *, ::java::lang::Class *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_spi_RegisterableService__
diff --git a/libjava/javax/imageio/spi/ServiceRegistry$1.h b/libjava/javax/imageio/spi/ServiceRegistry$1.h
deleted file mode 100644
index ea647060a4c..00000000000
--- a/libjava/javax/imageio/spi/ServiceRegistry$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ServiceRegistry$1__
-#define __javax_imageio_spi_ServiceRegistry$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ServiceRegistry;
-          class ServiceRegistry$1;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ServiceRegistry$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ServiceRegistry$1(::javax::imageio::spi::ServiceRegistry *);
-public:
-  jboolean hasNext();
-  ::java::lang::Object * next();
-  void remove();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-  ::javax::imageio::spi::ServiceRegistry * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ServiceRegistry$1__
diff --git a/libjava/javax/imageio/spi/ServiceRegistry$2.h b/libjava/javax/imageio/spi/ServiceRegistry$2.h
deleted file mode 100644
index e0d3a132e73..00000000000
--- a/libjava/javax/imageio/spi/ServiceRegistry$2.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ServiceRegistry$2__
-#define __javax_imageio_spi_ServiceRegistry$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ServiceRegistry;
-          class ServiceRegistry$2;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ServiceRegistry$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ServiceRegistry$2(::javax::imageio::spi::ServiceRegistry *, ::java::util::Map *);
-public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ::javax::imageio::spi::ServiceRegistry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::util::Map * val$cons;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ServiceRegistry$2__
diff --git a/libjava/javax/imageio/spi/ServiceRegistry$Filter.h b/libjava/javax/imageio/spi/ServiceRegistry$Filter.h
deleted file mode 100644
index 10fd5aaff7f..00000000000
--- a/libjava/javax/imageio/spi/ServiceRegistry$Filter.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ServiceRegistry$Filter__
-#define __javax_imageio_spi_ServiceRegistry$Filter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ServiceRegistry$Filter;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ServiceRegistry$Filter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean filter(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_spi_ServiceRegistry$Filter__
diff --git a/libjava/javax/imageio/spi/ServiceRegistry.h b/libjava/javax/imageio/spi/ServiceRegistry.h
deleted file mode 100644
index 79a48fe3fd5..00000000000
--- a/libjava/javax/imageio/spi/ServiceRegistry.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_spi_ServiceRegistry__
-#define __javax_imageio_spi_ServiceRegistry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace spi
-      {
-          class ServiceRegistry;
-          class ServiceRegistry$Filter;
-      }
-    }
-  }
-}
-
-class javax::imageio::spi::ServiceRegistry : public ::java::lang::Object
-{
-
-public:
-  ServiceRegistry(::java::util::Iterator *);
-  static ::java::util::Iterator * lookupProviders(::java::lang::Class *, ::java::lang::ClassLoader *);
-  static ::java::util::Iterator * lookupProviders(::java::lang::Class *);
-  virtual ::java::util::Iterator * getCategories();
-private:
-  jboolean registerServiceProvider(::java::lang::Object *, jint);
-public:
-  virtual jboolean registerServiceProvider(::java::lang::Object *, ::java::lang::Class *);
-  virtual void registerServiceProvider(::java::lang::Object *);
-  virtual void registerServiceProviders(::java::util::Iterator *);
-private:
-  jboolean deregisterServiceProvider(::java::lang::Object *, jint);
-public:
-  virtual jboolean deregisterServiceProvider(::java::lang::Object *, ::java::lang::Class *);
-  virtual void deregisterServiceProvider(::java::lang::Object *);
-  virtual void deregisterAll(::java::lang::Class *);
-  virtual void deregisterAll();
-  virtual void finalize();
-  virtual jboolean contains(::java::lang::Object *);
-private:
-  jint getCategoryID(::java::lang::Class *);
-public:
-  virtual ::java::util::Iterator * getServiceProviders(::java::lang::Class *, jboolean);
-  virtual ::java::util::Iterator * getServiceProviders(::java::lang::Class *, ::javax::imageio::spi::ServiceRegistry$Filter *, jboolean);
-  virtual ::java::lang::Object * getServiceProviderByClass(::java::lang::Class *);
-  virtual jboolean setOrdering(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean unsetOrdering(::java::lang::Class *, ::java::lang::Object *, ::java::lang::Object *);
-private:
-  jboolean addConstraint(jint, ::java::lang::Object *, ::java::lang::Object *);
-  jboolean removeConstraint(jint, ::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  JArray< ::java::lang::Class * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) categories;
-private:
-  JArray< ::java::util::LinkedList * > * providers;
-  JArray< ::java::util::IdentityHashMap * > * constraints;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_spi_ServiceRegistry__
diff --git a/libjava/javax/imageio/stream/FileCacheImageInputStream.h b/libjava/javax/imageio/stream/FileCacheImageInputStream.h
deleted file mode 100644
index 728ed37bdf6..00000000000
--- a/libjava/javax/imageio/stream/FileCacheImageInputStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_FileCacheImageInputStream__
-#define __javax_imageio_stream_FileCacheImageInputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageInputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class FileCacheImageInputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::FileCacheImageInputStream : public ::javax::imageio::stream::ImageInputStreamImpl
-{
-
-public:
-  FileCacheImageInputStream(::java::io::InputStream *, ::java::io::File *);
-  virtual void close();
-private:
-  void checkStreamClosed();
-public:
-  virtual jboolean isCached();
-  virtual jboolean isCachedFile();
-  virtual jboolean isCachedMemory();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageInputStreamImpl)))) stream;
-  ::java::io::File * cacheDir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_FileCacheImageInputStream__
diff --git a/libjava/javax/imageio/stream/FileCacheImageOutputStream.h b/libjava/javax/imageio/stream/FileCacheImageOutputStream.h
deleted file mode 100644
index 30659671227..00000000000
--- a/libjava/javax/imageio/stream/FileCacheImageOutputStream.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_FileCacheImageOutputStream__
-#define __javax_imageio_stream_FileCacheImageOutputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageOutputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class FileCacheImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::FileCacheImageOutputStream : public ::javax::imageio::stream::ImageOutputStreamImpl
-{
-
-public:
-  FileCacheImageOutputStream(::java::io::OutputStream *, ::java::io::File *);
-  virtual void close();
-private:
-  void checkStreamClosed();
-public:
-  virtual jboolean isCached();
-  virtual jboolean isCachedFile();
-  virtual jboolean isCachedMemory();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(jint);
-private:
-  ::java::io::OutputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageOutputStreamImpl)))) stream;
-  ::java::io::File * cacheDir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_FileCacheImageOutputStream__
diff --git a/libjava/javax/imageio/stream/FileImageInputStream.h b/libjava/javax/imageio/stream/FileImageInputStream.h
deleted file mode 100644
index 801e2cb1d48..00000000000
--- a/libjava/javax/imageio/stream/FileImageInputStream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_FileImageInputStream__
-#define __javax_imageio_stream_FileImageInputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageInputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class FileImageInputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::FileImageInputStream : public ::javax::imageio::stream::ImageInputStreamImpl
-{
-
-public:
-  FileImageInputStream(::java::io::File *);
-  FileImageInputStream(::java::io::RandomAccessFile *);
-  virtual void close();
-  virtual jlong length();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void seek(jlong);
-private:
-  ::java::io::RandomAccessFile * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageInputStreamImpl)))) file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_FileImageInputStream__
diff --git a/libjava/javax/imageio/stream/FileImageOutputStream.h b/libjava/javax/imageio/stream/FileImageOutputStream.h
deleted file mode 100644
index 8075f45772b..00000000000
--- a/libjava/javax/imageio/stream/FileImageOutputStream.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_FileImageOutputStream__
-#define __javax_imageio_stream_FileImageOutputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageOutputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class FileImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::FileImageOutputStream : public ::javax::imageio::stream::ImageOutputStreamImpl
-{
-
-public:
-  FileImageOutputStream(::java::io::File *);
-  FileImageOutputStream(::java::io::RandomAccessFile *);
-  virtual void close();
-  virtual jlong length();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void seek(jlong);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(jint);
-private:
-  ::java::io::RandomAccessFile * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageOutputStreamImpl)))) file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_FileImageOutputStream__
diff --git a/libjava/javax/imageio/stream/IIOByteBuffer.h b/libjava/javax/imageio/stream/IIOByteBuffer.h
deleted file mode 100644
index 0e5e0c145ef..00000000000
--- a/libjava/javax/imageio/stream/IIOByteBuffer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_IIOByteBuffer__
-#define __javax_imageio_stream_IIOByteBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class IIOByteBuffer;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::IIOByteBuffer : public ::java::lang::Object
-{
-
-public:
-  IIOByteBuffer(JArray< jbyte > *, jint, jint);
-  virtual JArray< jbyte > * getData();
-  virtual void setData(JArray< jbyte > *);
-  virtual jint getOffset();
-  virtual void setOffset(jint);
-  virtual jint getLength();
-  virtual void setLength(jint);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
-  jint offset;
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_IIOByteBuffer__
diff --git a/libjava/javax/imageio/stream/ImageInputStream.h b/libjava/javax/imageio/stream/ImageInputStream.h
deleted file mode 100644
index 99c6304c455..00000000000
--- a/libjava/javax/imageio/stream/ImageInputStream.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_ImageInputStream__
-#define __javax_imageio_stream_ImageInputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class IIOByteBuffer;
-          class ImageInputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::ImageInputStream : public ::java::lang::Object
-{
-
-public:
-  virtual void setByteOrder(::java::nio::ByteOrder *) = 0;
-  virtual ::java::nio::ByteOrder * getByteOrder() = 0;
-  virtual jint read() = 0;
-  virtual jint read(JArray< jbyte > *) = 0;
-  virtual jint read(JArray< jbyte > *, jint, jint) = 0;
-  virtual void readBytes(::javax::imageio::stream::IIOByteBuffer *, jint) = 0;
-  virtual jboolean readBoolean() = 0;
-  virtual jbyte readByte() = 0;
-  virtual jint readUnsignedByte() = 0;
-  virtual jshort readShort() = 0;
-  virtual jint readUnsignedShort() = 0;
-  virtual jchar readChar() = 0;
-  virtual jint readInt() = 0;
-  virtual jlong readUnsignedInt() = 0;
-  virtual jlong readLong() = 0;
-  virtual jfloat readFloat() = 0;
-  virtual jdouble readDouble() = 0;
-  virtual ::java::lang::String * readLine() = 0;
-  virtual ::java::lang::String * readUTF() = 0;
-  virtual void readFully(JArray< jbyte > *, jint, jint) = 0;
-  virtual void readFully(JArray< jbyte > *) = 0;
-  virtual void readFully(JArray< jshort > *, jint, jint) = 0;
-  virtual void readFully(JArray< jchar > *, jint, jint) = 0;
-  virtual void readFully(JArray< jint > *, jint, jint) = 0;
-  virtual void readFully(JArray< jlong > *, jint, jint) = 0;
-  virtual void readFully(JArray< jfloat > *, jint, jint) = 0;
-  virtual void readFully(JArray< jdouble > *, jint, jint) = 0;
-  virtual jlong getStreamPosition() = 0;
-  virtual jint getBitOffset() = 0;
-  virtual void setBitOffset(jint) = 0;
-  virtual jint readBit() = 0;
-  virtual jlong readBits(jint) = 0;
-  virtual jlong length() = 0;
-  virtual jint skipBytes(jint) = 0;
-  virtual jlong skipBytes(jlong) = 0;
-  virtual void seek(jlong) = 0;
-  virtual void mark() = 0;
-  virtual void reset() = 0;
-  virtual void flushBefore(jlong) = 0;
-  virtual void flush() = 0;
-  virtual jlong getFlushedPosition() = 0;
-  virtual jboolean isCached() = 0;
-  virtual jboolean isCachedMemory() = 0;
-  virtual jboolean isCachedFile() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_stream_ImageInputStream__
diff --git a/libjava/javax/imageio/stream/ImageInputStreamImpl.h b/libjava/javax/imageio/stream/ImageInputStreamImpl.h
deleted file mode 100644
index 42b2f12042a..00000000000
--- a/libjava/javax/imageio/stream/ImageInputStreamImpl.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_ImageInputStreamImpl__
-#define __javax_imageio_stream_ImageInputStreamImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class IIOByteBuffer;
-          class ImageInputStreamImpl;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::ImageInputStreamImpl : public ::java::lang::Object
-{
-
-public:
-  ImageInputStreamImpl();
-public: // actually protected
-  virtual void checkClosed();
-public:
-  virtual void close();
-public: // actually protected
-  virtual void finalize();
-public:
-  virtual void flush();
-  virtual void flushBefore(jlong);
-  virtual jint getBitOffset();
-  virtual ::java::nio::ByteOrder * getByteOrder();
-  virtual jlong getFlushedPosition();
-  virtual jlong getStreamPosition();
-  virtual jboolean isCached();
-  virtual jboolean isCachedFile();
-  virtual jboolean isCachedMemory();
-  virtual jlong length();
-  virtual void mark();
-  virtual jint read() = 0;
-  virtual jint read(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint read(JArray< jbyte > *);
-  virtual jint readBit();
-  virtual jlong readBits(jint);
-  virtual jboolean readBoolean();
-  virtual jbyte readByte();
-  virtual void readBytes(::javax::imageio::stream::IIOByteBuffer *, jint);
-  virtual jchar readChar();
-  virtual jdouble readDouble();
-  virtual jfloat readFloat();
-  virtual void readFully(JArray< jbyte > *);
-  virtual void readFully(JArray< jbyte > *, jint, jint);
-  virtual void readFully(JArray< jchar > *, jint, jint);
-  virtual void readFully(JArray< jdouble > *, jint, jint);
-  virtual void readFully(JArray< jfloat > *, jint, jint);
-  virtual void readFully(JArray< jint > *, jint, jint);
-  virtual void readFully(JArray< jlong > *, jint, jint);
-  virtual void readFully(JArray< jshort > *, jint, jint);
-  virtual jint readInt();
-  virtual ::java::lang::String * readLine();
-  virtual jlong readLong();
-  virtual jshort readShort();
-  virtual jint readUnsignedByte();
-  virtual jlong readUnsignedInt();
-  virtual jint readUnsignedShort();
-  virtual ::java::lang::String * readUTF();
-  virtual void reset();
-  virtual void seek(jlong);
-  virtual void setBitOffset(jint);
-  virtual void setByteOrder(::java::nio::ByteOrder *);
-  virtual jint skipBytes(jint);
-  virtual jlong skipBytes(jlong);
-private:
-  void readFullyPrivate(JArray< jbyte > *, jint, jint);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) closed;
-  ::java::util::Stack * markStack;
-public: // actually package-private
-  JArray< jbyte > * buffer;
-public: // actually protected
-  jint bitOffset;
-  ::java::nio::ByteOrder * byteOrder;
-  jlong flushedPos;
-  jlong streamPos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_ImageInputStreamImpl__
diff --git a/libjava/javax/imageio/stream/ImageOutputStream.h b/libjava/javax/imageio/stream/ImageOutputStream.h
deleted file mode 100644
index 7557e0a670b..00000000000
--- a/libjava/javax/imageio/stream/ImageOutputStream.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_ImageOutputStream__
-#define __javax_imageio_stream_ImageOutputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteOrder;
-    }
-  }
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class IIOByteBuffer;
-          class ImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::ImageOutputStream : public ::java::lang::Object
-{
-
-public:
-  virtual void flushBefore(jlong) = 0;
-  virtual void write(JArray< jbyte > *) = 0;
-  virtual void write(JArray< jbyte > *, jint, jint) = 0;
-  virtual void write(jint) = 0;
-  virtual void writeBit(jint) = 0;
-  virtual void writeBits(jlong, jint) = 0;
-  virtual void writeBoolean(jboolean) = 0;
-  virtual void writeByte(jint) = 0;
-  virtual void writeBytes(::java::lang::String *) = 0;
-  virtual void writeChar(jint) = 0;
-  virtual void writeChars(JArray< jchar > *, jint, jint) = 0;
-  virtual void writeChars(::java::lang::String *) = 0;
-  virtual void writeDouble(jdouble) = 0;
-  virtual void writeDoubles(JArray< jdouble > *, jint, jint) = 0;
-  virtual void writeFloat(jfloat) = 0;
-  virtual void writeFloats(JArray< jfloat > *, jint, jint) = 0;
-  virtual void writeInt(jint) = 0;
-  virtual void writeInts(JArray< jint > *, jint, jint) = 0;
-  virtual void writeLong(jlong) = 0;
-  virtual void writeLongs(JArray< jlong > *, jint, jint) = 0;
-  virtual void writeShort(jint) = 0;
-  virtual void writeShorts(JArray< jshort > *, jint, jint) = 0;
-  virtual void writeUTF(::java::lang::String *) = 0;
-  virtual void setByteOrder(::java::nio::ByteOrder *) = 0;
-  virtual ::java::nio::ByteOrder * getByteOrder() = 0;
-  virtual jint read() = 0;
-  virtual jint read(JArray< jbyte > *) = 0;
-  virtual jint read(JArray< jbyte > *, jint, jint) = 0;
-  virtual void readBytes(::javax::imageio::stream::IIOByteBuffer *, jint) = 0;
-  virtual jboolean readBoolean() = 0;
-  virtual jbyte readByte() = 0;
-  virtual jint readUnsignedByte() = 0;
-  virtual jshort readShort() = 0;
-  virtual jint readUnsignedShort() = 0;
-  virtual jchar readChar() = 0;
-  virtual jint readInt() = 0;
-  virtual jlong readUnsignedInt() = 0;
-  virtual jlong readLong() = 0;
-  virtual jfloat readFloat() = 0;
-  virtual jdouble readDouble() = 0;
-  virtual ::java::lang::String * readLine() = 0;
-  virtual ::java::lang::String * readUTF() = 0;
-  virtual void readFully(JArray< jbyte > *, jint, jint) = 0;
-  virtual void readFully(JArray< jbyte > *) = 0;
-  virtual void readFully(JArray< jshort > *, jint, jint) = 0;
-  virtual void readFully(JArray< jchar > *, jint, jint) = 0;
-  virtual void readFully(JArray< jint > *, jint, jint) = 0;
-  virtual void readFully(JArray< jlong > *, jint, jint) = 0;
-  virtual void readFully(JArray< jfloat > *, jint, jint) = 0;
-  virtual void readFully(JArray< jdouble > *, jint, jint) = 0;
-  virtual jlong getStreamPosition() = 0;
-  virtual jint getBitOffset() = 0;
-  virtual void setBitOffset(jint) = 0;
-  virtual jint readBit() = 0;
-  virtual jlong readBits(jint) = 0;
-  virtual jlong length() = 0;
-  virtual jint skipBytes(jint) = 0;
-  virtual jlong skipBytes(jlong) = 0;
-  virtual void seek(jlong) = 0;
-  virtual void mark() = 0;
-  virtual void reset() = 0;
-  virtual void flush() = 0;
-  virtual jlong getFlushedPosition() = 0;
-  virtual jboolean isCached() = 0;
-  virtual jboolean isCachedMemory() = 0;
-  virtual jboolean isCachedFile() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_imageio_stream_ImageOutputStream__
diff --git a/libjava/javax/imageio/stream/ImageOutputStreamImpl.h b/libjava/javax/imageio/stream/ImageOutputStreamImpl.h
deleted file mode 100644
index a45df4698a3..00000000000
--- a/libjava/javax/imageio/stream/ImageOutputStreamImpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_ImageOutputStreamImpl__
-#define __javax_imageio_stream_ImageOutputStreamImpl__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageInputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class ImageOutputStreamImpl;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::ImageOutputStreamImpl : public ::javax::imageio::stream::ImageInputStreamImpl
-{
-
-public:
-  ImageOutputStreamImpl();
-public: // actually protected
-  virtual void flushBits();
-public:
-  virtual void write(JArray< jbyte > *);
-  virtual void write(JArray< jbyte > *, jint, jint) = 0;
-  virtual void write(jint) = 0;
-  virtual void writeBit(jint);
-  virtual void writeBits(jlong, jint);
-  virtual void writeBoolean(jboolean);
-  virtual void writeByte(jint);
-  virtual void writeBytes(::java::lang::String *);
-  virtual void writeChar(jint);
-  virtual void writeChars(JArray< jchar > *, jint, jint);
-  virtual void writeChars(::java::lang::String *);
-  virtual void writeDouble(jdouble);
-  virtual void writeDoubles(JArray< jdouble > *, jint, jint);
-  virtual void writeFloat(jfloat);
-  virtual void writeFloats(JArray< jfloat > *, jint, jint);
-  virtual void writeInt(jint);
-  virtual void writeInts(JArray< jint > *, jint, jint);
-  virtual void writeLong(jlong);
-  virtual void writeLongs(JArray< jlong > *, jint, jint);
-  virtual void writeShort(jint);
-  virtual void writeShorts(JArray< jshort > *, jint, jint);
-  virtual void writeUTF(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_ImageOutputStreamImpl__
diff --git a/libjava/javax/imageio/stream/MemoryCacheImageInputStream.h b/libjava/javax/imageio/stream/MemoryCacheImageInputStream.h
deleted file mode 100644
index c83efe11204..00000000000
--- a/libjava/javax/imageio/stream/MemoryCacheImageInputStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_MemoryCacheImageInputStream__
-#define __javax_imageio_stream_MemoryCacheImageInputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageInputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class MemoryCacheImageInputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::MemoryCacheImageInputStream : public ::javax::imageio::stream::ImageInputStreamImpl
-{
-
-public:
-  MemoryCacheImageInputStream(::java::io::InputStream *);
-  virtual void close();
-  virtual void flushBefore(jlong);
-  virtual jboolean isCached();
-  virtual jboolean isCachedFile();
-  virtual jboolean isCachedMemory();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void seek(jlong);
-private:
-  ::java::io::InputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageInputStreamImpl)))) stream;
-  ::java::io::BufferedInputStream * buffer;
-  jint READLIMIT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_MemoryCacheImageInputStream__
diff --git a/libjava/javax/imageio/stream/MemoryCacheImageOutputStream.h b/libjava/javax/imageio/stream/MemoryCacheImageOutputStream.h
deleted file mode 100644
index a7643c1ea11..00000000000
--- a/libjava/javax/imageio/stream/MemoryCacheImageOutputStream.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_imageio_stream_MemoryCacheImageOutputStream__
-#define __javax_imageio_stream_MemoryCacheImageOutputStream__
-
-#pragma interface
-
-#include <javax/imageio/stream/ImageOutputStreamImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace imageio
-    {
-      namespace stream
-      {
-          class MemoryCacheImageOutputStream;
-      }
-    }
-  }
-}
-
-class javax::imageio::stream::MemoryCacheImageOutputStream : public ::javax::imageio::stream::ImageOutputStreamImpl
-{
-
-public:
-  MemoryCacheImageOutputStream(::java::io::OutputStream *);
-  virtual void close();
-  virtual void flushBefore(jlong);
-  virtual jboolean isCached();
-  virtual jboolean isCachedFile();
-  virtual jboolean isCachedMemory();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual void write(JArray< jbyte > *, jint, jint);
-  virtual void write(jint);
-private:
-  ::java::io::OutputStream * __attribute__((aligned(__alignof__( ::javax::imageio::stream::ImageOutputStreamImpl)))) stream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_imageio_stream_MemoryCacheImageOutputStream__
diff --git a/libjava/javax/management/Attribute.h b/libjava/javax/management/Attribute.h
deleted file mode 100644
index 304b9da4a86..00000000000
--- a/libjava/javax/management/Attribute.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Attribute__
-#define __javax_management_Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-    }
-  }
-}
-
-class javax::management::Attribute : public ::java::lang::Object
-{
-
-public:
-  Attribute(::java::lang::String *, ::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::Object * getValue();
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = 2484220110589082382LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) m_name;
-  ::java::lang::Object * m_value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Attribute__
diff --git a/libjava/javax/management/AttributeList.h b/libjava/javax/management/AttributeList.h
deleted file mode 100644
index a74ff2fb125..00000000000
--- a/libjava/javax/management/AttributeList.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_AttributeList__
-#define __javax_management_AttributeList__
-
-#pragma interface
-
-#include <java/util/ArrayList.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-    }
-  }
-}
-
-class javax::management::AttributeList : public ::java::util::ArrayList
-{
-
-public:
-  AttributeList();
-  AttributeList(::javax::management::AttributeList *);
-  AttributeList(jint);
-  virtual void add(::javax::management::Attribute *);
-  virtual void add(jint, ::javax::management::Attribute *);
-  virtual jboolean addAll(::javax::management::AttributeList *);
-  virtual jboolean addAll(jint, ::javax::management::AttributeList *);
-  virtual void set(jint, ::javax::management::Attribute *);
-private:
-  static const jlong serialVersionUID = -4077085769279709076LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_AttributeList__
diff --git a/libjava/javax/management/AttributeNotFoundException.h b/libjava/javax/management/AttributeNotFoundException.h
deleted file mode 100644
index 4defc660b61..00000000000
--- a/libjava/javax/management/AttributeNotFoundException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_AttributeNotFoundException__
-#define __javax_management_AttributeNotFoundException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class AttributeNotFoundException;
-    }
-  }
-}
-
-class javax::management::AttributeNotFoundException : public ::javax::management::OperationsException
-{
-
-public:
-  AttributeNotFoundException();
-  AttributeNotFoundException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_AttributeNotFoundException__
diff --git a/libjava/javax/management/BadAttributeValueExpException.h b/libjava/javax/management/BadAttributeValueExpException.h
deleted file mode 100644
index 5a05f6a6bb4..00000000000
--- a/libjava/javax/management/BadAttributeValueExpException.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_BadAttributeValueExpException__
-#define __javax_management_BadAttributeValueExpException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class BadAttributeValueExpException;
-    }
-  }
-}
-
-class javax::management::BadAttributeValueExpException : public ::java::lang::Exception
-{
-
-public:
-  BadAttributeValueExpException(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -3105272988410493376LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) val;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_BadAttributeValueExpException__
diff --git a/libjava/javax/management/BadBinaryOpValueExpException.h b/libjava/javax/management/BadBinaryOpValueExpException.h
deleted file mode 100644
index 21e866be8bc..00000000000
--- a/libjava/javax/management/BadBinaryOpValueExpException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_BadBinaryOpValueExpException__
-#define __javax_management_BadBinaryOpValueExpException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class BadBinaryOpValueExpException;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::BadBinaryOpValueExpException : public ::java::lang::Exception
-{
-
-public:
-  BadBinaryOpValueExpException(::javax::management::ValueExp *);
-  virtual ::javax::management::ValueExp * getExp();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 5068475589449021227LL;
-  ::javax::management::ValueExp * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) exp;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_BadBinaryOpValueExpException__
diff --git a/libjava/javax/management/BadStringOperationException.h b/libjava/javax/management/BadStringOperationException.h
deleted file mode 100644
index 60c923cf71d..00000000000
--- a/libjava/javax/management/BadStringOperationException.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_BadStringOperationException__
-#define __javax_management_BadStringOperationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class BadStringOperationException;
-    }
-  }
-}
-
-class javax::management::BadStringOperationException : public ::java::lang::Exception
-{
-
-public:
-  BadStringOperationException(::java::lang::String *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7802201238441662100LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) op;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_BadStringOperationException__
diff --git a/libjava/javax/management/DynamicMBean.h b/libjava/javax/management/DynamicMBean.h
deleted file mode 100644
index 59acee1c930..00000000000
--- a/libjava/javax/management/DynamicMBean.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_DynamicMBean__
-#define __javax_management_DynamicMBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-        class DynamicMBean;
-        class MBeanInfo;
-    }
-  }
-}
-
-class javax::management::DynamicMBean : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *) = 0;
-  virtual ::javax::management::AttributeList * getAttributes(JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::management::MBeanInfo * getMBeanInfo() = 0;
-  virtual ::java::lang::Object * invoke(::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual void setAttribute(::javax::management::Attribute *) = 0;
-  virtual ::javax::management::AttributeList * setAttributes(::javax::management::AttributeList *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_DynamicMBean__
diff --git a/libjava/javax/management/InstanceAlreadyExistsException.h b/libjava/javax/management/InstanceAlreadyExistsException.h
deleted file mode 100644
index 081b838e7e3..00000000000
--- a/libjava/javax/management/InstanceAlreadyExistsException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_InstanceAlreadyExistsException__
-#define __javax_management_InstanceAlreadyExistsException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class InstanceAlreadyExistsException;
-    }
-  }
-}
-
-class javax::management::InstanceAlreadyExistsException : public ::javax::management::OperationsException
-{
-
-public:
-  InstanceAlreadyExistsException();
-  InstanceAlreadyExistsException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8893743928912733931LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_InstanceAlreadyExistsException__
diff --git a/libjava/javax/management/InstanceNotFoundException.h b/libjava/javax/management/InstanceNotFoundException.h
deleted file mode 100644
index b1088deaa7f..00000000000
--- a/libjava/javax/management/InstanceNotFoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_InstanceNotFoundException__
-#define __javax_management_InstanceNotFoundException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class InstanceNotFoundException;
-    }
-  }
-}
-
-class javax::management::InstanceNotFoundException : public ::javax::management::OperationsException
-{
-
-public:
-  InstanceNotFoundException();
-  InstanceNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -882579438394773049LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_InstanceNotFoundException__
diff --git a/libjava/javax/management/IntrospectionException.h b/libjava/javax/management/IntrospectionException.h
deleted file mode 100644
index 55621f3c72a..00000000000
--- a/libjava/javax/management/IntrospectionException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_IntrospectionException__
-#define __javax_management_IntrospectionException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class IntrospectionException;
-    }
-  }
-}
-
-class javax::management::IntrospectionException : public ::javax::management::OperationsException
-{
-
-public:
-  IntrospectionException();
-  IntrospectionException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1054516935875481725LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_IntrospectionException__
diff --git a/libjava/javax/management/InvalidApplicationException.h b/libjava/javax/management/InvalidApplicationException.h
deleted file mode 100644
index 16d11c5bd03..00000000000
--- a/libjava/javax/management/InvalidApplicationException.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_InvalidApplicationException__
-#define __javax_management_InvalidApplicationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class InvalidApplicationException;
-    }
-  }
-}
-
-class javax::management::InvalidApplicationException : public ::java::lang::Exception
-{
-
-public:
-  InvalidApplicationException(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -3048022274675537269LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) val;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_InvalidApplicationException__
diff --git a/libjava/javax/management/InvalidAttributeValueException.h b/libjava/javax/management/InvalidAttributeValueException.h
deleted file mode 100644
index 3439bde3bf2..00000000000
--- a/libjava/javax/management/InvalidAttributeValueException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_InvalidAttributeValueException__
-#define __javax_management_InvalidAttributeValueException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class InvalidAttributeValueException;
-    }
-  }
-}
-
-class javax::management::InvalidAttributeValueException : public ::javax::management::OperationsException
-{
-
-public:
-  InvalidAttributeValueException();
-  InvalidAttributeValueException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_InvalidAttributeValueException__
diff --git a/libjava/javax/management/JMException.h b/libjava/javax/management/JMException.h
deleted file mode 100644
index 906840006d0..00000000000
--- a/libjava/javax/management/JMException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_JMException__
-#define __javax_management_JMException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class JMException;
-    }
-  }
-}
-
-class javax::management::JMException : public ::java::lang::Exception
-{
-
-public:
-  JMException();
-  JMException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_JMException__
diff --git a/libjava/javax/management/JMRuntimeException.h b/libjava/javax/management/JMRuntimeException.h
deleted file mode 100644
index ea6dd7f2258..00000000000
--- a/libjava/javax/management/JMRuntimeException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_JMRuntimeException__
-#define __javax_management_JMRuntimeException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class JMRuntimeException;
-    }
-  }
-}
-
-class javax::management::JMRuntimeException : public ::java::lang::RuntimeException
-{
-
-public:
-  JMRuntimeException();
-  JMRuntimeException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_JMRuntimeException__
diff --git a/libjava/javax/management/ListenerNotFoundException.h b/libjava/javax/management/ListenerNotFoundException.h
deleted file mode 100644
index ad60d6211f0..00000000000
--- a/libjava/javax/management/ListenerNotFoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ListenerNotFoundException__
-#define __javax_management_ListenerNotFoundException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ListenerNotFoundException;
-    }
-  }
-}
-
-class javax::management::ListenerNotFoundException : public ::javax::management::OperationsException
-{
-
-public:
-  ListenerNotFoundException();
-  ListenerNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7242605822448519061LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_ListenerNotFoundException__
diff --git a/libjava/javax/management/MBeanAttributeInfo.h b/libjava/javax/management/MBeanAttributeInfo.h
deleted file mode 100644
index ab088c63578..00000000000
--- a/libjava/javax/management/MBeanAttributeInfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanAttributeInfo__
-#define __javax_management_MBeanAttributeInfo__
-
-#pragma interface
-
-#include <javax/management/MBeanFeatureInfo.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanAttributeInfo;
-    }
-  }
-}
-
-class javax::management::MBeanAttributeInfo : public ::javax::management::MBeanFeatureInfo
-{
-
-public:
-  MBeanAttributeInfo(::java::lang::String *, ::java::lang::String *, ::java::lang::reflect::Method *, ::java::lang::reflect::Method *);
-  MBeanAttributeInfo(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jboolean, jboolean, jboolean);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getType();
-  virtual jint hashCode();
-  virtual jboolean isIs();
-  virtual jboolean isReadable();
-  virtual jboolean isWritable();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) attributeType;
-  jboolean isWrite;
-  jboolean isRead;
-  jboolean is;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanAttributeInfo__
diff --git a/libjava/javax/management/MBeanConstructorInfo.h b/libjava/javax/management/MBeanConstructorInfo.h
deleted file mode 100644
index 992ff8d595c..00000000000
--- a/libjava/javax/management/MBeanConstructorInfo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanConstructorInfo__
-#define __javax_management_MBeanConstructorInfo__
-
-#pragma interface
-
-#include <javax/management/MBeanFeatureInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanConstructorInfo;
-        class MBeanParameterInfo;
-    }
-  }
-}
-
-class javax::management::MBeanConstructorInfo : public ::javax::management::MBeanFeatureInfo
-{
-
-public:
-  MBeanConstructorInfo(::java::lang::String *, ::java::lang::reflect::Constructor *);
-  MBeanConstructorInfo(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::MBeanParameterInfo * > *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< ::javax::management::MBeanParameterInfo * > * getSignature();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4433990064191844427LL;
-  JArray< ::javax::management::MBeanParameterInfo * > * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) signature;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanConstructorInfo__
diff --git a/libjava/javax/management/MBeanException.h b/libjava/javax/management/MBeanException.h
deleted file mode 100644
index 17ff2a7addd..00000000000
--- a/libjava/javax/management/MBeanException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanException__
-#define __javax_management_MBeanException__
-
-#pragma interface
-
-#include <javax/management/JMException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanException;
-    }
-  }
-}
-
-class javax::management::MBeanException : public ::javax::management::JMException
-{
-
-public:
-  MBeanException(::java::lang::Exception *);
-  MBeanException(::java::lang::Exception *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::Exception * getTargetException();
-private:
-  static const jlong serialVersionUID = 4066342430588744142LL;
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::javax::management::JMException)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanException__
diff --git a/libjava/javax/management/MBeanFeatureInfo.h b/libjava/javax/management/MBeanFeatureInfo.h
deleted file mode 100644
index 60006427c2a..00000000000
--- a/libjava/javax/management/MBeanFeatureInfo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanFeatureInfo__
-#define __javax_management_MBeanFeatureInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanFeatureInfo;
-    }
-  }
-}
-
-class javax::management::MBeanFeatureInfo : public ::java::lang::Object
-{
-
-public:
-  MBeanFeatureInfo(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getName();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 3952882688968447265LL;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) description;
-  ::java::lang::String * name;
-public: // actually package-private
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanFeatureInfo__
diff --git a/libjava/javax/management/MBeanInfo.h b/libjava/javax/management/MBeanInfo.h
deleted file mode 100644
index cecc12f2889..00000000000
--- a/libjava/javax/management/MBeanInfo.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanInfo__
-#define __javax_management_MBeanInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanAttributeInfo;
-        class MBeanConstructorInfo;
-        class MBeanInfo;
-        class MBeanNotificationInfo;
-        class MBeanOperationInfo;
-    }
-  }
-}
-
-class javax::management::MBeanInfo : public ::java::lang::Object
-{
-
-public:
-  MBeanInfo(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::MBeanAttributeInfo * > *, JArray< ::javax::management::MBeanConstructorInfo * > *, JArray< ::javax::management::MBeanOperationInfo * > *, JArray< ::javax::management::MBeanNotificationInfo * > *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< ::javax::management::MBeanAttributeInfo * > * getAttributes();
-  virtual ::java::lang::String * getClassName();
-  virtual JArray< ::javax::management::MBeanConstructorInfo * > * getConstructors();
-  virtual ::java::lang::String * getDescription();
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotifications();
-  virtual JArray< ::javax::management::MBeanOperationInfo * > * getOperations();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6451021435135161911LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) description;
-  ::java::lang::String * className;
-  JArray< ::javax::management::MBeanAttributeInfo * > * attributes;
-  JArray< ::javax::management::MBeanOperationInfo * > * operations;
-  JArray< ::javax::management::MBeanConstructorInfo * > * constructors;
-  JArray< ::javax::management::MBeanNotificationInfo * > * notifications;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanInfo__
diff --git a/libjava/javax/management/MBeanNotificationInfo.h b/libjava/javax/management/MBeanNotificationInfo.h
deleted file mode 100644
index 25e99c3c1ed..00000000000
--- a/libjava/javax/management/MBeanNotificationInfo.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanNotificationInfo__
-#define __javax_management_MBeanNotificationInfo__
-
-#pragma interface
-
-#include <javax/management/MBeanFeatureInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-    }
-  }
-}
-
-class javax::management::MBeanNotificationInfo : public ::javax::management::MBeanFeatureInfo
-{
-
-public:
-  MBeanNotificationInfo(JArray< ::java::lang::String * > *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< ::java::lang::String * > * getNotifTypes();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -3888371564530107064LL;
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) types;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanNotificationInfo__
diff --git a/libjava/javax/management/MBeanOperationInfo.h b/libjava/javax/management/MBeanOperationInfo.h
deleted file mode 100644
index 97d0cd5c53f..00000000000
--- a/libjava/javax/management/MBeanOperationInfo.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanOperationInfo__
-#define __javax_management_MBeanOperationInfo__
-
-#pragma interface
-
-#include <javax/management/MBeanFeatureInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanOperationInfo;
-        class MBeanParameterInfo;
-    }
-  }
-}
-
-class javax::management::MBeanOperationInfo : public ::javax::management::MBeanFeatureInfo
-{
-
-public:
-  MBeanOperationInfo(::java::lang::String *, ::java::lang::reflect::Method *);
-  MBeanOperationInfo(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::MBeanParameterInfo * > *, ::java::lang::String *, jint);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint getImpact();
-  virtual ::java::lang::String * getReturnType();
-  virtual JArray< ::javax::management::MBeanParameterInfo * > * getSignature();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6178860474881375330LL;
-public:
-  static const jint INFO = 0;
-  static const jint ACTION = 1;
-  static const jint ACTION_INFO = 2;
-  static const jint UNKNOWN = 3;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) type;
-  JArray< ::javax::management::MBeanParameterInfo * > * signature;
-  jint impact;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanOperationInfo__
diff --git a/libjava/javax/management/MBeanParameterInfo.h b/libjava/javax/management/MBeanParameterInfo.h
deleted file mode 100644
index 3186814594a..00000000000
--- a/libjava/javax/management/MBeanParameterInfo.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanParameterInfo__
-#define __javax_management_MBeanParameterInfo__
-
-#pragma interface
-
-#include <javax/management/MBeanFeatureInfo.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanParameterInfo;
-    }
-  }
-}
-
-class javax::management::MBeanParameterInfo : public ::javax::management::MBeanFeatureInfo
-{
-
-public:
-  MBeanParameterInfo(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getType();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7432616882776782338LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::management::MBeanFeatureInfo)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanParameterInfo__
diff --git a/libjava/javax/management/MBeanPermission$NameHolder.h b/libjava/javax/management/MBeanPermission$NameHolder.h
deleted file mode 100644
index 810a8ce5441..00000000000
--- a/libjava/javax/management/MBeanPermission$NameHolder.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanPermission$NameHolder__
-#define __javax_management_MBeanPermission$NameHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanPermission;
-        class MBeanPermission$NameHolder;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::MBeanPermission$NameHolder : public ::java::lang::Object
-{
-
-public:
-  MBeanPermission$NameHolder(::javax::management::MBeanPermission *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getMember();
-  virtual ::javax::management::ObjectName * getObjectName();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) className;
-  ::java::lang::String * member;
-  ::javax::management::ObjectName * objectName;
-public: // actually package-private
-  ::javax::management::MBeanPermission * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanPermission$NameHolder__
diff --git a/libjava/javax/management/MBeanPermission.h b/libjava/javax/management/MBeanPermission.h
deleted file mode 100644
index 95c5ac6af34..00000000000
--- a/libjava/javax/management/MBeanPermission.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanPermission__
-#define __javax_management_MBeanPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanPermission;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::MBeanPermission : public ::java::security::Permission
-{
-
-public:
-  MBeanPermission(::java::lang::String *, ::java::lang::String *);
-  MBeanPermission(::java::lang::String *, ::java::lang::String *, ::javax::management::ObjectName *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getActions();
-  virtual jint hashCode();
-  virtual jboolean implies(::java::security::Permission *);
-public: // actually package-private
-  virtual ::java::util::Set * getActionSet();
-private:
-  void updateActionSet();
-  void readObject(::java::io::ObjectInputStream *);
-  void checkActions();
-  static const jlong serialVersionUID = -2416928705275160661LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::security::Permission)))) actions;
-  ::java::util::Set * actionSet;
-  static ::java::util::Set * validSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanPermission__
diff --git a/libjava/javax/management/MBeanRegistration.h b/libjava/javax/management/MBeanRegistration.h
deleted file mode 100644
index b1faba2fefb..00000000000
--- a/libjava/javax/management/MBeanRegistration.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanRegistration__
-#define __javax_management_MBeanRegistration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanRegistration;
-        class MBeanServer;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::MBeanRegistration : public ::java::lang::Object
-{
-
-public:
-  virtual void postDeregister() = 0;
-  virtual void postRegister(::java::lang::Boolean *) = 0;
-  virtual void preDeregister() = 0;
-  virtual ::javax::management::ObjectName * preRegister(::javax::management::MBeanServer *, ::javax::management::ObjectName *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_MBeanRegistration__
diff --git a/libjava/javax/management/MBeanRegistrationException.h b/libjava/javax/management/MBeanRegistrationException.h
deleted file mode 100644
index 4cd0266e25e..00000000000
--- a/libjava/javax/management/MBeanRegistrationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanRegistrationException__
-#define __javax_management_MBeanRegistrationException__
-
-#pragma interface
-
-#include <javax/management/MBeanException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanRegistrationException;
-    }
-  }
-}
-
-class javax::management::MBeanRegistrationException : public ::javax::management::MBeanException
-{
-
-public:
-  MBeanRegistrationException(::java::lang::Exception *);
-  MBeanRegistrationException(::java::lang::Exception *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4482382455277067805LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanRegistrationException__
diff --git a/libjava/javax/management/MBeanServer.h b/libjava/javax/management/MBeanServer.h
deleted file mode 100644
index 9971d5c5927..00000000000
--- a/libjava/javax/management/MBeanServer.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServer__
-#define __javax_management_MBeanServer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-        class MBeanInfo;
-        class MBeanServer;
-        class NotificationFilter;
-        class NotificationListener;
-        class ObjectInstance;
-        class ObjectName;
-        class QueryExp;
-      namespace loading
-      {
-          class ClassLoaderRepository;
-      }
-    }
-  }
-}
-
-class javax::management::MBeanServer : public ::java::lang::Object
-{
-
-public:
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::io::ObjectInputStream * deserialize(::javax::management::ObjectName *, JArray< jbyte > *) = 0;
-  virtual ::java::io::ObjectInputStream * deserialize(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual ::java::io::ObjectInputStream * deserialize(::java::lang::String *, ::javax::management::ObjectName *, JArray< jbyte > *) = 0;
-  virtual ::java::lang::Object * getAttribute(::javax::management::ObjectName *, ::java::lang::String *) = 0;
-  virtual ::javax::management::AttributeList * getAttributes(::javax::management::ObjectName *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::lang::ClassLoader * getClassLoader(::javax::management::ObjectName *) = 0;
-  virtual ::java::lang::ClassLoader * getClassLoaderFor(::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::loading::ClassLoaderRepository * getClassLoaderRepository() = 0;
-  virtual ::java::lang::String * getDefaultDomain() = 0;
-  virtual JArray< ::java::lang::String * > * getDomains() = 0;
-  virtual ::java::lang::Integer * getMBeanCount() = 0;
-  virtual ::javax::management::MBeanInfo * getMBeanInfo(::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * getObjectInstance(::javax::management::ObjectName *) = 0;
-  virtual ::java::lang::Object * instantiate(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * instantiate(::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::lang::Object * instantiate(::java::lang::String *, ::javax::management::ObjectName *) = 0;
-  virtual ::java::lang::Object * instantiate(::java::lang::String *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::lang::Object * invoke(::javax::management::ObjectName *, ::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean isInstanceOf(::javax::management::ObjectName *, ::java::lang::String *) = 0;
-  virtual jboolean isRegistered(::javax::management::ObjectName *) = 0;
-  virtual ::java::util::Set * queryMBeans(::javax::management::ObjectName *, ::javax::management::QueryExp *) = 0;
-  virtual ::java::util::Set * queryNames(::javax::management::ObjectName *, ::javax::management::QueryExp *) = 0;
-  virtual ::javax::management::ObjectInstance * registerMBean(::java::lang::Object *, ::javax::management::ObjectName *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void setAttribute(::javax::management::ObjectName *, ::javax::management::Attribute *) = 0;
-  virtual ::javax::management::AttributeList * setAttributes(::javax::management::ObjectName *, ::javax::management::AttributeList *) = 0;
-  virtual void unregisterMBean(::javax::management::ObjectName *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_MBeanServer__
diff --git a/libjava/javax/management/MBeanServerBuilder.h b/libjava/javax/management/MBeanServerBuilder.h
deleted file mode 100644
index c0dc95dd46f..00000000000
--- a/libjava/javax/management/MBeanServerBuilder.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerBuilder__
-#define __javax_management_MBeanServerBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class MBeanServerBuilder;
-        class MBeanServerDelegate;
-    }
-  }
-}
-
-class javax::management::MBeanServerBuilder : public ::java::lang::Object
-{
-
-public:
-  MBeanServerBuilder();
-  virtual ::javax::management::MBeanServer * newMBeanServer(::java::lang::String *, ::javax::management::MBeanServer *, ::javax::management::MBeanServerDelegate *);
-  virtual ::javax::management::MBeanServerDelegate * newMBeanServerDelegate();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerBuilder__
diff --git a/libjava/javax/management/MBeanServerConnection.h b/libjava/javax/management/MBeanServerConnection.h
deleted file mode 100644
index 10759ab89d7..00000000000
--- a/libjava/javax/management/MBeanServerConnection.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerConnection__
-#define __javax_management_MBeanServerConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-        class MBeanInfo;
-        class MBeanServerConnection;
-        class NotificationFilter;
-        class NotificationListener;
-        class ObjectInstance;
-        class ObjectName;
-        class QueryExp;
-    }
-  }
-}
-
-class javax::management::MBeanServerConnection : public ::java::lang::Object
-{
-
-public:
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void addNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * createMBean(::java::lang::String *, ::javax::management::ObjectName *, ::javax::management::ObjectName *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::lang::Object * getAttribute(::javax::management::ObjectName *, ::java::lang::String *) = 0;
-  virtual ::javax::management::AttributeList * getAttributes(::javax::management::ObjectName *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::java::lang::String * getDefaultDomain() = 0;
-  virtual JArray< ::java::lang::String * > * getDomains() = 0;
-  virtual ::java::lang::Integer * getMBeanCount() = 0;
-  virtual ::javax::management::MBeanInfo * getMBeanInfo(::javax::management::ObjectName *) = 0;
-  virtual ::javax::management::ObjectInstance * getObjectInstance(::javax::management::ObjectName *) = 0;
-  virtual ::java::lang::Object * invoke(::javax::management::ObjectName *, ::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean isInstanceOf(::javax::management::ObjectName *, ::java::lang::String *) = 0;
-  virtual jboolean isRegistered(::javax::management::ObjectName *) = 0;
-  virtual ::java::util::Set * queryMBeans(::javax::management::ObjectName *, ::javax::management::QueryExp *) = 0;
-  virtual ::java::util::Set * queryNames(::javax::management::ObjectName *, ::javax::management::QueryExp *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *) = 0;
-  virtual void removeNotificationListener(::javax::management::ObjectName *, ::javax::management::ObjectName *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void setAttribute(::javax::management::ObjectName *, ::javax::management::Attribute *) = 0;
-  virtual ::javax::management::AttributeList * setAttributes(::javax::management::ObjectName *, ::javax::management::AttributeList *) = 0;
-  virtual void unregisterMBean(::javax::management::ObjectName *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_MBeanServerConnection__
diff --git a/libjava/javax/management/MBeanServerDelegate.h b/libjava/javax/management/MBeanServerDelegate.h
deleted file mode 100644
index 4c97feb4796..00000000000
--- a/libjava/javax/management/MBeanServerDelegate.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerDelegate__
-#define __javax_management_MBeanServerDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-        class MBeanServerDelegate;
-        class Notification;
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class javax::management::MBeanServerDelegate : public ::java::lang::Object
-{
-
-public:
-  MBeanServerDelegate();
-  virtual void addNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual ::java::lang::String * getImplementationName();
-  virtual ::java::lang::String * getImplementationVendor();
-  virtual ::java::lang::String * getImplementationVersion();
-  virtual ::java::lang::String * getMBeanServerId();
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotificationInfo();
-  virtual ::java::lang::String * getSpecificationName();
-  virtual ::java::lang::String * getSpecificationVendor();
-  virtual ::java::lang::String * getSpecificationVersion();
-  virtual void removeNotificationListener(::javax::management::NotificationListener *);
-  virtual void removeNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *);
-  virtual void sendNotification(::javax::management::Notification *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::util::List * listeners;
-  jlong seqNo;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerDelegate__
diff --git a/libjava/javax/management/MBeanServerDelegateMBean.h b/libjava/javax/management/MBeanServerDelegateMBean.h
deleted file mode 100644
index 967dca872f4..00000000000
--- a/libjava/javax/management/MBeanServerDelegateMBean.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerDelegateMBean__
-#define __javax_management_MBeanServerDelegateMBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerDelegateMBean;
-    }
-  }
-}
-
-class javax::management::MBeanServerDelegateMBean : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getImplementationName() = 0;
-  virtual ::java::lang::String * getImplementationVendor() = 0;
-  virtual ::java::lang::String * getImplementationVersion() = 0;
-  virtual ::java::lang::String * getMBeanServerId() = 0;
-  virtual ::java::lang::String * getSpecificationName() = 0;
-  virtual ::java::lang::String * getSpecificationVendor() = 0;
-  virtual ::java::lang::String * getSpecificationVersion() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_MBeanServerDelegateMBean__
diff --git a/libjava/javax/management/MBeanServerFactory.h b/libjava/javax/management/MBeanServerFactory.h
deleted file mode 100644
index e9df36e5076..00000000000
--- a/libjava/javax/management/MBeanServerFactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerFactory__
-#define __javax_management_MBeanServerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class MBeanServerBuilder;
-        class MBeanServerFactory;
-      namespace loading
-      {
-          class ClassLoaderRepository;
-      }
-    }
-  }
-}
-
-class javax::management::MBeanServerFactory : public ::java::lang::Object
-{
-
-  MBeanServerFactory();
-public:
-  static ::javax::management::MBeanServer * createMBeanServer();
-  static ::javax::management::MBeanServer * createMBeanServer(::java::lang::String *);
-  static ::java::util::ArrayList * findMBeanServer(::java::lang::String *);
-  static ::javax::management::loading::ClassLoaderRepository * getClassLoaderRepository(::javax::management::MBeanServer *);
-  static ::javax::management::MBeanServer * newMBeanServer();
-  static ::javax::management::MBeanServer * newMBeanServer(::java::lang::String *);
-private:
-  static ::javax::management::MBeanServer * createServer(::java::lang::String *);
-public:
-  static void releaseMBeanServer(::javax::management::MBeanServer *);
-private:
-  static ::javax::management::MBeanServerBuilder * builder;
-  static ::java::util::Map * servers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerFactory__
diff --git a/libjava/javax/management/MBeanServerNotification.h b/libjava/javax/management/MBeanServerNotification.h
deleted file mode 100644
index 11a7203c5d5..00000000000
--- a/libjava/javax/management/MBeanServerNotification.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerNotification__
-#define __javax_management_MBeanServerNotification__
-
-#pragma interface
-
-#include <javax/management/Notification.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerNotification;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::MBeanServerNotification : public ::javax::management::Notification
-{
-
-public:
-  MBeanServerNotification(::java::lang::String *, ::java::lang::Object *, jlong, ::javax::management::ObjectName *);
-  virtual ::javax::management::ObjectName * getMBeanName();
-private:
-  static const jlong serialVersionUID = 2876477500475969677LL;
-public:
-  static ::java::lang::String * REGISTRATION_NOTIFICATION;
-  static ::java::lang::String * UNREGISTRATION_NOTIFICATION;
-private:
-  ::javax::management::ObjectName * __attribute__((aligned(__alignof__( ::javax::management::Notification)))) objectName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerNotification__
diff --git a/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration.h b/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration.h
deleted file mode 100644
index 1d072107c8d..00000000000
--- a/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration__
-#define __javax_management_MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerPermission;
-        class MBeanServerPermission$MBeanServerPermissionCollection;
-        class MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration;
-    }
-  }
-}
-
-class javax::management::MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration : public ::java::lang::Object
-{
-
-public:
-  MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration(::javax::management::MBeanServerPermission$MBeanServerPermissionCollection *, ::javax::management::MBeanServerPermission *);
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-private:
-  ::javax::management::MBeanServerPermission * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
-  jboolean done;
-public: // actually package-private
-  ::javax::management::MBeanServerPermission$MBeanServerPermissionCollection * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerPermission$MBeanServerPermissionCollection$MBeanServerPermissionEnumeration__
diff --git a/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection.h b/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection.h
deleted file mode 100644
index 61223449118..00000000000
--- a/libjava/javax/management/MBeanServerPermission$MBeanServerPermissionCollection.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerPermission$MBeanServerPermissionCollection__
-#define __javax_management_MBeanServerPermission$MBeanServerPermissionCollection__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerPermission;
-        class MBeanServerPermission$MBeanServerPermissionCollection;
-    }
-  }
-}
-
-class javax::management::MBeanServerPermission$MBeanServerPermissionCollection : public ::java::security::PermissionCollection
-{
-
-  MBeanServerPermission$MBeanServerPermissionCollection(::javax::management::MBeanServerPermission *);
-public:
-  virtual void add(::java::security::Permission *);
-  virtual ::java::util::Enumeration * elements();
-  virtual jboolean implies(::java::security::Permission *);
-public: // actually package-private
-  MBeanServerPermission$MBeanServerPermissionCollection(::javax::management::MBeanServerPermission *, ::javax::management::MBeanServerPermission$MBeanServerPermissionCollection *);
-private:
-  static const jlong serialVersionUID = -5661980843569388590LL;
-  ::javax::management::MBeanServerPermission * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) collectionPermission;
-public: // actually package-private
-  ::javax::management::MBeanServerPermission * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerPermission$MBeanServerPermissionCollection__
diff --git a/libjava/javax/management/MBeanServerPermission.h b/libjava/javax/management/MBeanServerPermission.h
deleted file mode 100644
index b2bdc1908e3..00000000000
--- a/libjava/javax/management/MBeanServerPermission.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanServerPermission__
-#define __javax_management_MBeanServerPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServerPermission;
-    }
-  }
-}
-
-class javax::management::MBeanServerPermission : public ::java::security::BasicPermission
-{
-
-public:
-  MBeanServerPermission(::java::lang::String *);
-  MBeanServerPermission(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jboolean implies(::java::security::Permission *);
-  virtual ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  static ::java::lang::String * checkName(::java::lang::String *);
-  static const jlong serialVersionUID = -5661980843569388590LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanServerPermission__
diff --git a/libjava/javax/management/MBeanTrustPermission.h b/libjava/javax/management/MBeanTrustPermission.h
deleted file mode 100644
index a9740097035..00000000000
--- a/libjava/javax/management/MBeanTrustPermission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MBeanTrustPermission__
-#define __javax_management_MBeanTrustPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanTrustPermission;
-    }
-  }
-}
-
-class javax::management::MBeanTrustPermission : public ::java::security::BasicPermission
-{
-
-public:
-  MBeanTrustPermission(::java::lang::String *);
-  MBeanTrustPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2952178077029018140LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MBeanTrustPermission__
diff --git a/libjava/javax/management/MalformedObjectNameException.h b/libjava/javax/management/MalformedObjectNameException.h
deleted file mode 100644
index 202fa205182..00000000000
--- a/libjava/javax/management/MalformedObjectNameException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_MalformedObjectNameException__
-#define __javax_management_MalformedObjectNameException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MalformedObjectNameException;
-    }
-  }
-}
-
-class javax::management::MalformedObjectNameException : public ::javax::management::OperationsException
-{
-
-public:
-  MalformedObjectNameException();
-  MalformedObjectNameException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -572689714442915824LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_MalformedObjectNameException__
diff --git a/libjava/javax/management/NotCompliantMBeanException.h b/libjava/javax/management/NotCompliantMBeanException.h
deleted file mode 100644
index 132f1133138..00000000000
--- a/libjava/javax/management/NotCompliantMBeanException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotCompliantMBeanException__
-#define __javax_management_NotCompliantMBeanException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class NotCompliantMBeanException;
-    }
-  }
-}
-
-class javax::management::NotCompliantMBeanException : public ::javax::management::OperationsException
-{
-
-public:
-  NotCompliantMBeanException();
-  NotCompliantMBeanException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5175579583207963577LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_NotCompliantMBeanException__
diff --git a/libjava/javax/management/Notification.h b/libjava/javax/management/Notification.h
deleted file mode 100644
index f53a4d5d604..00000000000
--- a/libjava/javax/management/Notification.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_Notification__
-#define __javax_management_Notification__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Notification;
-    }
-  }
-}
-
-class javax::management::Notification : public ::java::util::EventObject
-{
-
-public:
-  Notification(::java::lang::String *, ::java::lang::Object *, jlong);
-  Notification(::java::lang::String *, ::java::lang::Object *, jlong, jlong);
-  Notification(::java::lang::String *, ::java::lang::Object *, jlong, jlong, ::java::lang::String *);
-  Notification(::java::lang::String *, ::java::lang::Object *, jlong, ::java::lang::String *);
-  virtual ::java::lang::String * getMessage();
-  virtual jlong getSequenceNumber();
-  virtual jlong getTimeStamp();
-  virtual ::java::lang::String * getType();
-  virtual ::java::lang::Object * getUserData();
-  virtual void setSequenceNumber(jlong);
-  virtual void setSource(::java::lang::Object *);
-  virtual void setTimeStamp(jlong);
-  virtual void setUserData(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) message;
-  jlong sequenceNumber;
-public: // actually protected
-  ::java::lang::Object * source;
-private:
-  jlong timeStamp;
-  ::java::lang::String * type;
-  ::java::lang::Object * userData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_Notification__
diff --git a/libjava/javax/management/NotificationBroadcaster.h b/libjava/javax/management/NotificationBroadcaster.h
deleted file mode 100644
index 0cd53dc61c0..00000000000
--- a/libjava/javax/management/NotificationBroadcaster.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationBroadcaster__
-#define __javax_management_NotificationBroadcaster__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-        class NotificationBroadcaster;
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class javax::management::NotificationBroadcaster : public ::java::lang::Object
-{
-
-public:
-  virtual void addNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotificationInfo() = 0;
-  virtual void removeNotificationListener(::javax::management::NotificationListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_NotificationBroadcaster__
diff --git a/libjava/javax/management/NotificationEmitter.h b/libjava/javax/management/NotificationEmitter.h
deleted file mode 100644
index 2bdebc654b4..00000000000
--- a/libjava/javax/management/NotificationEmitter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationEmitter__
-#define __javax_management_NotificationEmitter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-        class NotificationEmitter;
-        class NotificationFilter;
-        class NotificationListener;
-    }
-  }
-}
-
-class javax::management::NotificationEmitter : public ::java::lang::Object
-{
-
-public:
-  virtual void removeNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual void addNotificationListener(::javax::management::NotificationListener *, ::javax::management::NotificationFilter *, ::java::lang::Object *) = 0;
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotificationInfo() = 0;
-  virtual void removeNotificationListener(::javax::management::NotificationListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_NotificationEmitter__
diff --git a/libjava/javax/management/NotificationFilter.h b/libjava/javax/management/NotificationFilter.h
deleted file mode 100644
index b65b1b13b3f..00000000000
--- a/libjava/javax/management/NotificationFilter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationFilter__
-#define __javax_management_NotificationFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Notification;
-        class NotificationFilter;
-    }
-  }
-}
-
-class javax::management::NotificationFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isNotificationEnabled(::javax::management::Notification *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_NotificationFilter__
diff --git a/libjava/javax/management/NotificationListener.h b/libjava/javax/management/NotificationListener.h
deleted file mode 100644
index 9561e10be06..00000000000
--- a/libjava/javax/management/NotificationListener.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_NotificationListener__
-#define __javax_management_NotificationListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Notification;
-        class NotificationListener;
-    }
-  }
-}
-
-class javax::management::NotificationListener : public ::java::lang::Object
-{
-
-public:
-  virtual void handleNotification(::javax::management::Notification *, ::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_NotificationListener__
diff --git a/libjava/javax/management/ObjectInstance.h b/libjava/javax/management/ObjectInstance.h
deleted file mode 100644
index 43755ef44f6..00000000000
--- a/libjava/javax/management/ObjectInstance.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ObjectInstance__
-#define __javax_management_ObjectInstance__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ObjectInstance;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::ObjectInstance : public ::java::lang::Object
-{
-
-public:
-  ObjectInstance(::javax::management::ObjectName *, ::java::lang::String *);
-  ObjectInstance(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getClassName();
-  virtual ::javax::management::ObjectName * getObjectName();
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = -4099952623687795850LL;
-  ::javax::management::ObjectName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_ObjectInstance__
diff --git a/libjava/javax/management/ObjectName.h b/libjava/javax/management/ObjectName.h
deleted file mode 100644
index aaaf89b5ebf..00000000000
--- a/libjava/javax/management/ObjectName.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ObjectName__
-#define __javax_management_ObjectName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class ObjectName;
-    }
-  }
-}
-
-class javax::management::ObjectName : public ::java::lang::Object
-{
-
-public:
-  ObjectName(::java::lang::String *);
-  ObjectName(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  ObjectName(::java::lang::String *, ::java::util::Hashtable *);
-private:
-  void checkComponents();
-public:
-  virtual jboolean apply(::javax::management::ObjectName *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getCanonicalKeyPropertyListString();
-  virtual ::java::lang::String * getCanonicalName();
-  virtual ::java::lang::String * getDomain();
-  static ::javax::management::ObjectName * getInstance(::javax::management::ObjectName *);
-  static ::javax::management::ObjectName * getInstance(::java::lang::String *);
-  static ::javax::management::ObjectName * getInstance(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static ::javax::management::ObjectName * getInstance(::java::lang::String *, ::java::util::Hashtable *);
-  virtual ::java::lang::String * getKeyProperty(::java::lang::String *);
-  virtual ::java::util::Hashtable * getKeyPropertyList();
-  virtual ::java::lang::String * getKeyPropertyListString();
-  virtual jint hashCode();
-  virtual jboolean isDomainPattern();
-  virtual jboolean isPattern();
-  virtual jboolean isPropertyPattern();
-  static ::java::lang::String * quote(::java::lang::String *);
-  virtual void setMBeanServer(::javax::management::MBeanServer *);
-  virtual ::java::lang::String * toString();
-  static ::java::lang::String * unquote(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) domain;
-  ::java::util::TreeMap * properties;
-  ::java::lang::String * propertyListString;
-  jboolean propertyPattern;
-  ::javax::management::MBeanServer * server;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_ObjectName__
diff --git a/libjava/javax/management/OperationsException.h b/libjava/javax/management/OperationsException.h
deleted file mode 100644
index 528e0600f68..00000000000
--- a/libjava/javax/management/OperationsException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_OperationsException__
-#define __javax_management_OperationsException__
-
-#pragma interface
-
-#include <javax/management/JMException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class OperationsException;
-    }
-  }
-}
-
-class javax::management::OperationsException : public ::javax::management::JMException
-{
-
-public:
-  OperationsException();
-  OperationsException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4967597595580536216LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_OperationsException__
diff --git a/libjava/javax/management/QueryExp.h b/libjava/javax/management/QueryExp.h
deleted file mode 100644
index 7790c378311..00000000000
--- a/libjava/javax/management/QueryExp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_QueryExp__
-#define __javax_management_QueryExp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class ObjectName;
-        class QueryExp;
-    }
-  }
-}
-
-class javax::management::QueryExp : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean apply(::javax::management::ObjectName *) = 0;
-  virtual void setMBeanServer(::javax::management::MBeanServer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_QueryExp__
diff --git a/libjava/javax/management/ReflectionException.h b/libjava/javax/management/ReflectionException.h
deleted file mode 100644
index d8b08802cb4..00000000000
--- a/libjava/javax/management/ReflectionException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ReflectionException__
-#define __javax_management_ReflectionException__
-
-#pragma interface
-
-#include <javax/management/JMException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ReflectionException;
-    }
-  }
-}
-
-class javax::management::ReflectionException : public ::javax::management::JMException
-{
-
-public:
-  ReflectionException(::java::lang::Exception *);
-  ReflectionException(::java::lang::Exception *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::Exception * getTargetException();
-private:
-  static const jlong serialVersionUID = 9170809325636915553LL;
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::javax::management::JMException)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_ReflectionException__
diff --git a/libjava/javax/management/RuntimeErrorException.h b/libjava/javax/management/RuntimeErrorException.h
deleted file mode 100644
index fdf440a1f5a..00000000000
--- a/libjava/javax/management/RuntimeErrorException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_RuntimeErrorException__
-#define __javax_management_RuntimeErrorException__
-
-#pragma interface
-
-#include <javax/management/JMRuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class RuntimeErrorException;
-    }
-  }
-}
-
-class javax::management::RuntimeErrorException : public ::javax::management::JMRuntimeException
-{
-
-public:
-  RuntimeErrorException(::java::lang::Error *);
-  RuntimeErrorException(::java::lang::Error *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::Error * getTargetError();
-private:
-  static const jlong serialVersionUID = 704338937753949796LL;
-  ::java::lang::Error * __attribute__((aligned(__alignof__( ::javax::management::JMRuntimeException)))) error;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_RuntimeErrorException__
diff --git a/libjava/javax/management/RuntimeMBeanException.h b/libjava/javax/management/RuntimeMBeanException.h
deleted file mode 100644
index 599cb916e56..00000000000
--- a/libjava/javax/management/RuntimeMBeanException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_RuntimeMBeanException__
-#define __javax_management_RuntimeMBeanException__
-
-#pragma interface
-
-#include <javax/management/JMRuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class RuntimeMBeanException;
-    }
-  }
-}
-
-class javax::management::RuntimeMBeanException : public ::javax::management::JMRuntimeException
-{
-
-public:
-  RuntimeMBeanException(::java::lang::RuntimeException *);
-  RuntimeMBeanException(::java::lang::RuntimeException *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::RuntimeException * getTargetException();
-private:
-  static const jlong serialVersionUID = 5274912751982730171LL;
-  ::java::lang::RuntimeException * __attribute__((aligned(__alignof__( ::javax::management::JMRuntimeException)))) runtimeException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_RuntimeMBeanException__
diff --git a/libjava/javax/management/RuntimeOperationsException.h b/libjava/javax/management/RuntimeOperationsException.h
deleted file mode 100644
index 3a8a1e71761..00000000000
--- a/libjava/javax/management/RuntimeOperationsException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_RuntimeOperationsException__
-#define __javax_management_RuntimeOperationsException__
-
-#pragma interface
-
-#include <javax/management/JMRuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class RuntimeOperationsException;
-    }
-  }
-}
-
-class javax::management::RuntimeOperationsException : public ::javax::management::JMRuntimeException
-{
-
-public:
-  RuntimeOperationsException(::java::lang::RuntimeException *);
-  RuntimeOperationsException(::java::lang::RuntimeException *, ::java::lang::String *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::RuntimeException * getTargetException();
-private:
-  static const jlong serialVersionUID = -8408923047489133588LL;
-  ::java::lang::RuntimeException * __attribute__((aligned(__alignof__( ::javax::management::JMRuntimeException)))) runtimeException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_RuntimeOperationsException__
diff --git a/libjava/javax/management/ServiceNotFoundException.h b/libjava/javax/management/ServiceNotFoundException.h
deleted file mode 100644
index 8eb29020899..00000000000
--- a/libjava/javax/management/ServiceNotFoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ServiceNotFoundException__
-#define __javax_management_ServiceNotFoundException__
-
-#pragma interface
-
-#include <javax/management/OperationsException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class ServiceNotFoundException;
-    }
-  }
-}
-
-class javax::management::ServiceNotFoundException : public ::javax::management::OperationsException
-{
-
-public:
-  ServiceNotFoundException();
-  ServiceNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3990675661956646827LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_ServiceNotFoundException__
diff --git a/libjava/javax/management/StandardMBean.h b/libjava/javax/management/StandardMBean.h
deleted file mode 100644
index d4dabb19db7..00000000000
--- a/libjava/javax/management/StandardMBean.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_StandardMBean__
-#define __javax_management_StandardMBean__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class Attribute;
-        class AttributeList;
-        class MBeanAttributeInfo;
-        class MBeanConstructorInfo;
-        class MBeanFeatureInfo;
-        class MBeanInfo;
-        class MBeanOperationInfo;
-        class MBeanParameterInfo;
-        class StandardMBean;
-    }
-  }
-}
-
-class javax::management::StandardMBean : public ::java::lang::Object
-{
-
-public: // actually protected
-  StandardMBean(::java::lang::Class *);
-public:
-  StandardMBean(::java::lang::Object *, ::java::lang::Class *);
-public: // actually protected
-  virtual void cacheMBeanInfo(::javax::management::MBeanInfo *);
-public:
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *);
-  virtual ::javax::management::AttributeList * getAttributes(JArray< ::java::lang::String * > *);
-public: // actually protected
-  virtual ::javax::management::MBeanInfo * getCachedMBeanInfo();
-  virtual ::java::lang::String * getClassName(::javax::management::MBeanInfo *);
-  virtual JArray< ::javax::management::MBeanConstructorInfo * > * getConstructors(JArray< ::javax::management::MBeanConstructorInfo * > *, ::java::lang::Object *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanAttributeInfo *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanConstructorInfo *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanConstructorInfo *, ::javax::management::MBeanParameterInfo *, jint);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanFeatureInfo *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanInfo *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanOperationInfo *);
-  virtual ::java::lang::String * getDescription(::javax::management::MBeanOperationInfo *, ::javax::management::MBeanParameterInfo *, jint);
-  virtual jint getImpact(::javax::management::MBeanOperationInfo *);
-public:
-  virtual ::java::lang::Object * getImplementation();
-  virtual ::java::lang::Class * getImplementationClass();
-  virtual ::javax::management::MBeanInfo * getMBeanInfo();
-  virtual ::java::lang::Class * getMBeanInterface();
-public: // actually protected
-  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 ::java::lang::Object * invoke(::java::lang::String *, JArray< ::java::lang::Object * > *, JArray< ::java::lang::String * > *);
-  virtual void setAttribute(::javax::management::Attribute *);
-  virtual ::javax::management::AttributeList * setAttributes(::javax::management::AttributeList *);
-  virtual void setImplementation(::java::lang::Object *);
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iface;
-  ::java::lang::Object * impl;
-  ::javax::management::MBeanInfo * info;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_StandardMBean__
diff --git a/libjava/javax/management/ValueExp.h b/libjava/javax/management/ValueExp.h
deleted file mode 100644
index 4837d9f62c1..00000000000
--- a/libjava/javax/management/ValueExp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_ValueExp__
-#define __javax_management_ValueExp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanServer;
-        class ObjectName;
-        class ValueExp;
-    }
-  }
-}
-
-class javax::management::ValueExp : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::management::ValueExp * apply(::javax::management::ObjectName *) = 0;
-  virtual void setMBeanServer(::javax::management::MBeanServer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_ValueExp__
diff --git a/libjava/javax/management/loading/ClassLoaderRepository.h b/libjava/javax/management/loading/ClassLoaderRepository.h
deleted file mode 100644
index 0332c059c7d..00000000000
--- a/libjava/javax/management/loading/ClassLoaderRepository.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_loading_ClassLoaderRepository__
-#define __javax_management_loading_ClassLoaderRepository__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace loading
-      {
-          class ClassLoaderRepository;
-      }
-    }
-  }
-}
-
-class javax::management::loading::ClassLoaderRepository : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * loadClass(::java::lang::String *) = 0;
-  virtual ::java::lang::Class * loadClassBefore(::java::lang::ClassLoader *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Class * loadClassWithout(::java::lang::ClassLoader *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_loading_ClassLoaderRepository__
diff --git a/libjava/javax/management/openmbean/ArrayType.h b/libjava/javax/management/openmbean/ArrayType.h
deleted file mode 100644
index ba8dece65a7..00000000000
--- a/libjava/javax/management/openmbean/ArrayType.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_ArrayType__
-#define __javax_management_openmbean_ArrayType__
-
-#pragma interface
-
-#include <javax/management/openmbean/OpenType.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class ArrayType;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::ArrayType : public ::javax::management::openmbean::OpenType
-{
-
-  static ::java::lang::String * getArrayClassName(::java::lang::String *, jint);
-public:
-  ArrayType(jint, ::javax::management::openmbean::OpenType *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint getDimension();
-  virtual ::javax::management::openmbean::OpenType * getElementOpenType();
-  virtual jint hashCode();
-  virtual jboolean isValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 720504429830309770LL;
-  jint __attribute__((aligned(__alignof__( ::javax::management::openmbean::OpenType)))) dimension;
-  ::javax::management::openmbean::OpenType * elementType;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_ArrayType__
diff --git a/libjava/javax/management/openmbean/CompositeData.h b/libjava/javax/management/openmbean/CompositeData.h
deleted file mode 100644
index 7382cdf927c..00000000000
--- a/libjava/javax/management/openmbean/CompositeData.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_CompositeData__
-#define __javax_management_openmbean_CompositeData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeData;
-          class CompositeType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::CompositeData : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean containsKey(::java::lang::String *) = 0;
-  virtual jboolean containsValue(::java::lang::Object *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * get(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::Object * > * getAll(JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::management::openmbean::CompositeType * getCompositeType() = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::util::Collection * values() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_CompositeData__
diff --git a/libjava/javax/management/openmbean/CompositeDataSupport.h b/libjava/javax/management/openmbean/CompositeDataSupport.h
deleted file mode 100644
index fcf0b73a96b..00000000000
--- a/libjava/javax/management/openmbean/CompositeDataSupport.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_CompositeDataSupport__
-#define __javax_management_openmbean_CompositeDataSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeDataSupport;
-          class CompositeType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::CompositeDataSupport : public ::java::lang::Object
-{
-
-public:
-  CompositeDataSupport(::javax::management::openmbean::CompositeType *, ::java::util::Map *);
-  CompositeDataSupport(::javax::management::openmbean::CompositeType *, JArray< ::java::lang::String * > *, JArray< ::java::lang::Object * > *);
-  virtual jboolean containsKey(::java::lang::String *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::String *);
-  virtual JArray< ::java::lang::Object * > * getAll(JArray< ::java::lang::String * > *);
-  virtual ::javax::management::openmbean::CompositeType * getCompositeType();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::Collection * values();
-private:
-  static const jlong serialVersionUID = 8003518976613702244LL;
-  ::java::util::SortedMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) contents;
-  ::javax::management::openmbean::CompositeType * compositeType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_CompositeDataSupport__
diff --git a/libjava/javax/management/openmbean/CompositeType.h b/libjava/javax/management/openmbean/CompositeType.h
deleted file mode 100644
index 30dcad38fda..00000000000
--- a/libjava/javax/management/openmbean/CompositeType.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_CompositeType__
-#define __javax_management_openmbean_CompositeType__
-
-#pragma interface
-
-#include <javax/management/openmbean/OpenType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeType;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::CompositeType : public ::javax::management::openmbean::OpenType
-{
-
-public:
-  CompositeType(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< ::javax::management::openmbean::OpenType * > *);
-  virtual jboolean containsKey(::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getDescription(::java::lang::String *);
-  virtual ::javax::management::openmbean::OpenType * getType(::java::lang::String *);
-  virtual jint hashCode();
-  virtual jboolean isValue(::java::lang::Object *);
-  virtual ::java::util::Set * keySet();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -5366242454346948798LL;
-  ::java::util::TreeMap * __attribute__((aligned(__alignof__( ::javax::management::openmbean::OpenType)))) nameToDescription;
-  ::java::util::TreeMap * nameToType;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_CompositeType__
diff --git a/libjava/javax/management/openmbean/InvalidKeyException.h b/libjava/javax/management/openmbean/InvalidKeyException.h
deleted file mode 100644
index 8534b941fde..00000000000
--- a/libjava/javax/management/openmbean/InvalidKeyException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_InvalidKeyException__
-#define __javax_management_openmbean_InvalidKeyException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class InvalidKeyException;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::InvalidKeyException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  InvalidKeyException();
-  InvalidKeyException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4224269443946322062LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_InvalidKeyException__
diff --git a/libjava/javax/management/openmbean/InvalidOpenTypeException.h b/libjava/javax/management/openmbean/InvalidOpenTypeException.h
deleted file mode 100644
index 8dec6485981..00000000000
--- a/libjava/javax/management/openmbean/InvalidOpenTypeException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_InvalidOpenTypeException__
-#define __javax_management_openmbean_InvalidOpenTypeException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class InvalidOpenTypeException;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::InvalidOpenTypeException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  InvalidOpenTypeException();
-  InvalidOpenTypeException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2837312755412327534LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_InvalidOpenTypeException__
diff --git a/libjava/javax/management/openmbean/KeyAlreadyExistsException.h b/libjava/javax/management/openmbean/KeyAlreadyExistsException.h
deleted file mode 100644
index 40269dd03f0..00000000000
--- a/libjava/javax/management/openmbean/KeyAlreadyExistsException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_KeyAlreadyExistsException__
-#define __javax_management_openmbean_KeyAlreadyExistsException__
-
-#pragma interface
-
-#include <java/lang/IllegalArgumentException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class KeyAlreadyExistsException;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::KeyAlreadyExistsException : public ::java::lang::IllegalArgumentException
-{
-
-public:
-  KeyAlreadyExistsException();
-  KeyAlreadyExistsException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1845183636745282866LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_KeyAlreadyExistsException__
diff --git a/libjava/javax/management/openmbean/OpenDataException.h b/libjava/javax/management/openmbean/OpenDataException.h
deleted file mode 100644
index d79caa5eb8a..00000000000
--- a/libjava/javax/management/openmbean/OpenDataException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenDataException__
-#define __javax_management_openmbean_OpenDataException__
-
-#pragma interface
-
-#include <javax/management/JMException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenDataException;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenDataException : public ::javax::management::JMException
-{
-
-public:
-  OpenDataException();
-  OpenDataException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8346311255433349870LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenDataException__
diff --git a/libjava/javax/management/openmbean/OpenMBeanAttributeInfo.h b/libjava/javax/management/openmbean/OpenMBeanAttributeInfo.h
deleted file mode 100644
index 2e576dcd931..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanAttributeInfo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanAttributeInfo__
-#define __javax_management_openmbean_OpenMBeanAttributeInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanAttributeInfo;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanAttributeInfo : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isIs() = 0;
-  virtual jboolean isReadable() = 0;
-  virtual jboolean isWritable() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::lang::Object * getDefaultValue() = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual ::java::util::Set * getLegalValues() = 0;
-  virtual ::java::lang::Comparable * getMaxValue() = 0;
-  virtual ::java::lang::Comparable * getMinValue() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::management::openmbean::OpenType * getOpenType() = 0;
-  virtual jboolean hasDefaultValue() = 0;
-  virtual jboolean hasLegalValues() = 0;
-  virtual jboolean hasMaxValue() = 0;
-  virtual jboolean hasMinValue() = 0;
-  virtual jboolean isValue(::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_OpenMBeanAttributeInfo__
diff --git a/libjava/javax/management/openmbean/OpenMBeanAttributeInfoSupport.h b/libjava/javax/management/openmbean/OpenMBeanAttributeInfoSupport.h
deleted file mode 100644
index a9cdbcfcf06..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanAttributeInfoSupport.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanAttributeInfoSupport__
-#define __javax_management_openmbean_OpenMBeanAttributeInfoSupport__
-
-#pragma interface
-
-#include <javax/management/MBeanAttributeInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanAttributeInfoSupport;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanAttributeInfoSupport : public ::javax::management::MBeanAttributeInfo
-{
-
-public:
-  OpenMBeanAttributeInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, jboolean, jboolean, jboolean);
-  OpenMBeanAttributeInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, jboolean, jboolean, jboolean, ::java::lang::Object *);
-  OpenMBeanAttributeInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, jboolean, jboolean, jboolean, ::java::lang::Object *, ::java::lang::Comparable *, ::java::lang::Comparable *);
-  OpenMBeanAttributeInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, jboolean, jboolean, jboolean, ::java::lang::Object *, JArray< ::java::lang::Object * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getDefaultValue();
-  virtual ::java::util::Set * getLegalValues();
-  virtual ::java::lang::Comparable * getMaxValue();
-  virtual ::java::lang::Comparable * getMinValue();
-  virtual ::javax::management::openmbean::OpenType * getOpenType();
-  virtual jboolean hasDefaultValue();
-  virtual jint hashCode();
-  virtual jboolean hasLegalValues();
-  virtual jboolean hasMaxValue();
-  virtual jboolean hasMinValue();
-  virtual jboolean isValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -4867215622149721849LL;
-  ::javax::management::openmbean::OpenType * __attribute__((aligned(__alignof__( ::javax::management::MBeanAttributeInfo)))) openType;
-  ::java::lang::Object * defaultValue;
-  ::java::util::Set * legalValues;
-  ::java::lang::Comparable * minValue;
-  ::java::lang::Comparable * maxValue;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenMBeanAttributeInfoSupport__
diff --git a/libjava/javax/management/openmbean/OpenMBeanConstructorInfo.h b/libjava/javax/management/openmbean/OpenMBeanConstructorInfo.h
deleted file mode 100644
index 07adf096c01..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanConstructorInfo.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanConstructorInfo__
-#define __javax_management_openmbean_OpenMBeanConstructorInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanParameterInfo;
-      namespace openmbean
-      {
-          class OpenMBeanConstructorInfo;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanConstructorInfo : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual JArray< ::javax::management::MBeanParameterInfo * > * getSignature() = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_OpenMBeanConstructorInfo__
diff --git a/libjava/javax/management/openmbean/OpenMBeanConstructorInfoSupport.h b/libjava/javax/management/openmbean/OpenMBeanConstructorInfoSupport.h
deleted file mode 100644
index a64d9cdda57..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanConstructorInfoSupport.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanConstructorInfoSupport__
-#define __javax_management_openmbean_OpenMBeanConstructorInfoSupport__
-
-#pragma interface
-
-#include <javax/management/MBeanConstructorInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanConstructorInfoSupport;
-          class OpenMBeanParameterInfo;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanConstructorInfoSupport : public ::javax::management::MBeanConstructorInfo
-{
-
-public:
-  OpenMBeanConstructorInfoSupport(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::openmbean::OpenMBeanParameterInfo * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -4400441579007477003LL;
-  ::java::lang::Integer * __attribute__((aligned(__alignof__( ::javax::management::MBeanConstructorInfo)))) hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenMBeanConstructorInfoSupport__
diff --git a/libjava/javax/management/openmbean/OpenMBeanInfo.h b/libjava/javax/management/openmbean/OpenMBeanInfo.h
deleted file mode 100644
index 2d61d82326e..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanInfo.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanInfo__
-#define __javax_management_openmbean_OpenMBeanInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanAttributeInfo;
-        class MBeanConstructorInfo;
-        class MBeanNotificationInfo;
-        class MBeanOperationInfo;
-      namespace openmbean
-      {
-          class OpenMBeanInfo;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanInfo : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual JArray< ::javax::management::MBeanAttributeInfo * > * getAttributes() = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual JArray< ::javax::management::MBeanConstructorInfo * > * getConstructors() = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual JArray< ::javax::management::MBeanNotificationInfo * > * getNotifications() = 0;
-  virtual JArray< ::javax::management::MBeanOperationInfo * > * getOperations() = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_OpenMBeanInfo__
diff --git a/libjava/javax/management/openmbean/OpenMBeanInfoSupport.h b/libjava/javax/management/openmbean/OpenMBeanInfoSupport.h
deleted file mode 100644
index 4b4e500311d..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanInfoSupport.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanInfoSupport__
-#define __javax_management_openmbean_OpenMBeanInfoSupport__
-
-#pragma interface
-
-#include <javax/management/MBeanInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanNotificationInfo;
-      namespace openmbean
-      {
-          class OpenMBeanAttributeInfo;
-          class OpenMBeanConstructorInfo;
-          class OpenMBeanInfoSupport;
-          class OpenMBeanOperationInfo;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanInfoSupport : public ::javax::management::MBeanInfo
-{
-
-public:
-  OpenMBeanInfoSupport(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::openmbean::OpenMBeanAttributeInfo * > *, JArray< ::javax::management::openmbean::OpenMBeanConstructorInfo * > *, JArray< ::javax::management::openmbean::OpenMBeanOperationInfo * > *, JArray< ::javax::management::MBeanNotificationInfo * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4349395935420511492LL;
-  ::java::lang::Integer * __attribute__((aligned(__alignof__( ::javax::management::MBeanInfo)))) hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenMBeanInfoSupport__
diff --git a/libjava/javax/management/openmbean/OpenMBeanOperationInfo.h b/libjava/javax/management/openmbean/OpenMBeanOperationInfo.h
deleted file mode 100644
index 4cdf93114d3..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanOperationInfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanOperationInfo__
-#define __javax_management_openmbean_OpenMBeanOperationInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-        class MBeanParameterInfo;
-      namespace openmbean
-      {
-          class OpenMBeanOperationInfo;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanOperationInfo : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual jint getImpact() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::management::openmbean::OpenType * getReturnOpenType() = 0;
-  virtual ::java::lang::String * getReturnType() = 0;
-  virtual JArray< ::javax::management::MBeanParameterInfo * > * getSignature() = 0;
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_OpenMBeanOperationInfo__
diff --git a/libjava/javax/management/openmbean/OpenMBeanOperationInfoSupport.h b/libjava/javax/management/openmbean/OpenMBeanOperationInfoSupport.h
deleted file mode 100644
index 04071e35afd..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanOperationInfoSupport.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanOperationInfoSupport__
-#define __javax_management_openmbean_OpenMBeanOperationInfoSupport__
-
-#pragma interface
-
-#include <javax/management/MBeanOperationInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanOperationInfoSupport;
-          class OpenMBeanParameterInfo;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanOperationInfoSupport : public ::javax::management::MBeanOperationInfo
-{
-
-public:
-  OpenMBeanOperationInfoSupport(::java::lang::String *, ::java::lang::String *, JArray< ::javax::management::openmbean::OpenMBeanParameterInfo * > *, ::javax::management::openmbean::OpenType *, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::management::openmbean::OpenType * getReturnOpenType();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 4996859732565369366LL;
-  ::javax::management::openmbean::OpenType * __attribute__((aligned(__alignof__( ::javax::management::MBeanOperationInfo)))) returnOpenType;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenMBeanOperationInfoSupport__
diff --git a/libjava/javax/management/openmbean/OpenMBeanParameterInfo.h b/libjava/javax/management/openmbean/OpenMBeanParameterInfo.h
deleted file mode 100644
index 5fe63058d4f..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanParameterInfo.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanParameterInfo__
-#define __javax_management_openmbean_OpenMBeanParameterInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanParameterInfo;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanParameterInfo : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getDefaultValue() = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual ::java::util::Set * getLegalValues() = 0;
-  virtual ::java::lang::Comparable * getMaxValue() = 0;
-  virtual ::java::lang::Comparable * getMinValue() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::management::openmbean::OpenType * getOpenType() = 0;
-  virtual jboolean hasDefaultValue() = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean hasLegalValues() = 0;
-  virtual jboolean hasMaxValue() = 0;
-  virtual jboolean hasMinValue() = 0;
-  virtual jboolean isValue(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_OpenMBeanParameterInfo__
diff --git a/libjava/javax/management/openmbean/OpenMBeanParameterInfoSupport.h b/libjava/javax/management/openmbean/OpenMBeanParameterInfoSupport.h
deleted file mode 100644
index 41f8bb4517e..00000000000
--- a/libjava/javax/management/openmbean/OpenMBeanParameterInfoSupport.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenMBeanParameterInfoSupport__
-#define __javax_management_openmbean_OpenMBeanParameterInfoSupport__
-
-#pragma interface
-
-#include <javax/management/MBeanParameterInfo.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenMBeanParameterInfoSupport;
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenMBeanParameterInfoSupport : public ::javax::management::MBeanParameterInfo
-{
-
-public:
-  OpenMBeanParameterInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *);
-  OpenMBeanParameterInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, ::java::lang::Object *);
-  OpenMBeanParameterInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, ::java::lang::Object *, ::java::lang::Comparable *, ::java::lang::Comparable *);
-  OpenMBeanParameterInfoSupport(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::OpenType *, ::java::lang::Object *, JArray< ::java::lang::Object * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getDefaultValue();
-  virtual ::java::util::Set * getLegalValues();
-  virtual ::java::lang::Comparable * getMaxValue();
-  virtual ::java::lang::Comparable * getMinValue();
-  virtual ::javax::management::openmbean::OpenType * getOpenType();
-  virtual jboolean hasDefaultValue();
-  virtual jint hashCode();
-  virtual jboolean hasLegalValues();
-  virtual jboolean hasMaxValue();
-  virtual jboolean hasMinValue();
-  virtual jboolean isValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -7235016873758443122LL;
-  ::javax::management::openmbean::OpenType * __attribute__((aligned(__alignof__( ::javax::management::MBeanParameterInfo)))) openType;
-  ::java::lang::Object * defaultValue;
-  ::java::util::Set * legalValues;
-  ::java::lang::Comparable * minValue;
-  ::java::lang::Comparable * maxValue;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenMBeanParameterInfoSupport__
diff --git a/libjava/javax/management/openmbean/OpenType.h b/libjava/javax/management/openmbean/OpenType.h
deleted file mode 100644
index 4150cf14f50..00000000000
--- a/libjava/javax/management/openmbean/OpenType.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_OpenType__
-#define __javax_management_openmbean_OpenType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class OpenType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::OpenType : public ::java::lang::Object
-{
-
-public: // actually protected
-  OpenType(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getTypeName();
-  virtual jint hashCode() = 0;
-  virtual jboolean isArray();
-  virtual jboolean isValue(::java::lang::Object *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-private:
-  static const jlong serialVersionUID = -9195195325186646468LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) className;
-  ::java::lang::String * typeName;
-  ::java::lang::String * description;
-public:
-  static JArray< ::java::lang::String * > * ALLOWED_CLASSNAMES;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_OpenType__
diff --git a/libjava/javax/management/openmbean/SimpleType.h b/libjava/javax/management/openmbean/SimpleType.h
deleted file mode 100644
index 1ff75672cc7..00000000000
--- a/libjava/javax/management/openmbean/SimpleType.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_SimpleType__
-#define __javax_management_openmbean_SimpleType__
-
-#pragma interface
-
-#include <javax/management/openmbean/OpenType.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class SimpleType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::SimpleType : public ::javax::management::openmbean::OpenType
-{
-
-  SimpleType(::java::lang::String *);
-public:
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  jboolean isValue(::java::lang::Object *);
-  ::java::lang::Object * readResolve();
-  ::java::lang::String * toString();
-  static ::javax::management::openmbean::SimpleType * BIGDECIMAL;
-  static ::javax::management::openmbean::SimpleType * BIGINTEGER;
-  static ::javax::management::openmbean::SimpleType * BOOLEAN;
-  static ::javax::management::openmbean::SimpleType * BYTE;
-  static ::javax::management::openmbean::SimpleType * CHARACTER;
-  static ::javax::management::openmbean::SimpleType * DATE;
-  static ::javax::management::openmbean::SimpleType * DOUBLE;
-  static ::javax::management::openmbean::SimpleType * FLOAT;
-  static ::javax::management::openmbean::SimpleType * INTEGER;
-  static ::javax::management::openmbean::SimpleType * LONG;
-  static ::javax::management::openmbean::SimpleType * OBJECTNAME;
-  static ::javax::management::openmbean::SimpleType * SHORT;
-  static ::javax::management::openmbean::SimpleType * STRING;
-  static ::javax::management::openmbean::SimpleType * VOID;
-private:
-  static const jlong serialVersionUID = 2215577471957694503LL;
-  ::java::lang::Integer * __attribute__((aligned(__alignof__( ::javax::management::openmbean::OpenType)))) hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_SimpleType__
diff --git a/libjava/javax/management/openmbean/TabularData.h b/libjava/javax/management/openmbean/TabularData.h
deleted file mode 100644
index ef70028a983..00000000000
--- a/libjava/javax/management/openmbean/TabularData.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_TabularData__
-#define __javax_management_openmbean_TabularData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeData;
-          class TabularData;
-          class TabularType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::TabularData : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::Object * > * calculateIndex(::javax::management::openmbean::CompositeData *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(JArray< ::java::lang::Object * > *) = 0;
-  virtual jboolean containsValue(::javax::management::openmbean::CompositeData *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::javax::management::openmbean::CompositeData * get(JArray< ::java::lang::Object * > *) = 0;
-  virtual ::javax::management::openmbean::TabularType * getTabularType() = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Set * keySet() = 0;
-  virtual void put(::javax::management::openmbean::CompositeData *) = 0;
-  virtual void putAll(JArray< ::javax::management::openmbean::CompositeData * > *) = 0;
-  virtual ::javax::management::openmbean::CompositeData * remove(JArray< ::java::lang::Object * > *) = 0;
-  virtual jint size() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::util::Collection * values() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_management_openmbean_TabularData__
diff --git a/libjava/javax/management/openmbean/TabularDataSupport.h b/libjava/javax/management/openmbean/TabularDataSupport.h
deleted file mode 100644
index 23b437650e5..00000000000
--- a/libjava/javax/management/openmbean/TabularDataSupport.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_TabularDataSupport__
-#define __javax_management_openmbean_TabularDataSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeData;
-          class TabularDataSupport;
-          class TabularType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::TabularDataSupport : public ::java::lang::Object
-{
-
-public:
-  TabularDataSupport(::javax::management::openmbean::TabularType *);
-  TabularDataSupport(::javax::management::openmbean::TabularType *, jint, jfloat);
-  virtual JArray< ::java::lang::Object * > * calculateIndex(::javax::management::openmbean::CompositeData *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean containsKey(::java::lang::Object *);
-  virtual jboolean containsKey(JArray< ::java::lang::Object * > *);
-  virtual jboolean containsValue(::java::lang::Object *);
-  virtual jboolean containsValue(::javax::management::openmbean::CompositeData *);
-  virtual ::java::util::Set * entrySet();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::javax::management::openmbean::CompositeData * get(JArray< ::java::lang::Object * > *);
-  virtual ::javax::management::openmbean::TabularType * getTabularType();
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-private:
-  jboolean isKeyValid(JArray< ::java::lang::Object * > *);
-public:
-  virtual ::java::util::Set * keySet();
-  virtual void put(::javax::management::openmbean::CompositeData *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putAll(JArray< ::javax::management::openmbean::CompositeData * > *);
-  virtual void putAll(::java::util::Map *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual ::javax::management::openmbean::CompositeData * remove(JArray< ::java::lang::Object * > *);
-public: // actually package-private
-  virtual void setMap(::java::util::Map *);
-public:
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-  virtual ::java::util::Collection * values();
-private:
-  static const jlong serialVersionUID = 5720150593236309827LL;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dataMap;
-  ::javax::management::openmbean::TabularType * tabularType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_TabularDataSupport__
diff --git a/libjava/javax/management/openmbean/TabularType.h b/libjava/javax/management/openmbean/TabularType.h
deleted file mode 100644
index 071a7049a3d..00000000000
--- a/libjava/javax/management/openmbean/TabularType.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_management_openmbean_TabularType__
-#define __javax_management_openmbean_TabularType__
-
-#pragma interface
-
-#include <javax/management/openmbean/OpenType.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace management
-    {
-      namespace openmbean
-      {
-          class CompositeType;
-          class TabularType;
-      }
-    }
-  }
-}
-
-class javax::management::openmbean::TabularType : public ::javax::management::openmbean::OpenType
-{
-
-public:
-  TabularType(::java::lang::String *, ::java::lang::String *, ::javax::management::openmbean::CompositeType *, JArray< ::java::lang::String * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::util::List * getIndexNames();
-  virtual ::javax::management::openmbean::CompositeType * getRowType();
-  virtual jint hashCode();
-  virtual jboolean isValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 6554071860220659261LL;
-  ::javax::management::openmbean::CompositeType * __attribute__((aligned(__alignof__( ::javax::management::openmbean::OpenType)))) rowType;
-  ::java::util::List * indexNames;
-  ::java::lang::Integer * hashCode__;
-  ::java::lang::String * string;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_management_openmbean_TabularType__
diff --git a/libjava/javax/naming/AuthenticationException.h b/libjava/javax/naming/AuthenticationException.h
deleted file mode 100644
index 9f41f0d6825..00000000000
--- a/libjava/javax/naming/AuthenticationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_AuthenticationException__
-#define __javax_naming_AuthenticationException__
-
-#pragma interface
-
-#include <javax/naming/NamingSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class AuthenticationException;
-    }
-  }
-}
-
-class javax::naming::AuthenticationException : public ::javax::naming::NamingSecurityException
-{
-
-public:
-  AuthenticationException();
-  AuthenticationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3678497619904568096LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_AuthenticationException__
diff --git a/libjava/javax/naming/AuthenticationNotSupportedException.h b/libjava/javax/naming/AuthenticationNotSupportedException.h
deleted file mode 100644
index d55627f1286..00000000000
--- a/libjava/javax/naming/AuthenticationNotSupportedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_AuthenticationNotSupportedException__
-#define __javax_naming_AuthenticationNotSupportedException__
-
-#pragma interface
-
-#include <javax/naming/NamingSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class AuthenticationNotSupportedException;
-    }
-  }
-}
-
-class javax::naming::AuthenticationNotSupportedException : public ::javax::naming::NamingSecurityException
-{
-
-public:
-  AuthenticationNotSupportedException();
-  AuthenticationNotSupportedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7149033933259492300LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_AuthenticationNotSupportedException__
diff --git a/libjava/javax/naming/BinaryRefAddr.h b/libjava/javax/naming/BinaryRefAddr.h
deleted file mode 100644
index b36ccbd6ae7..00000000000
--- a/libjava/javax/naming/BinaryRefAddr.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_BinaryRefAddr__
-#define __javax_naming_BinaryRefAddr__
-
-#pragma interface
-
-#include <javax/naming/RefAddr.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class BinaryRefAddr;
-    }
-  }
-}
-
-class javax::naming::BinaryRefAddr : public ::javax::naming::RefAddr
-{
-
-public:
-  BinaryRefAddr(::java::lang::String *, JArray< jbyte > *);
-  BinaryRefAddr(::java::lang::String *, JArray< jbyte > *, jint, jint);
-  virtual ::java::lang::Object * getContent();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = -3415254970957330361LL;
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::javax::naming::RefAddr)))) buf;
-  static JArray< jchar > * hex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_BinaryRefAddr__
diff --git a/libjava/javax/naming/Binding.h b/libjava/javax/naming/Binding.h
deleted file mode 100644
index 06522b4065e..00000000000
--- a/libjava/javax/naming/Binding.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Binding__
-#define __javax_naming_Binding__
-
-#pragma interface
-
-#include <javax/naming/NameClassPair.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Binding;
-    }
-  }
-}
-
-class javax::naming::Binding : public ::javax::naming::NameClassPair
-{
-
-public:
-  Binding(::java::lang::String *, ::java::lang::Object *);
-  Binding(::java::lang::String *, ::java::lang::Object *, jboolean);
-  Binding(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *);
-  Binding(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, jboolean);
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::Object * getObject();
-  virtual void setObject(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 8839217842691845890LL;
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::naming::NameClassPair)))) boundObj;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_Binding__
diff --git a/libjava/javax/naming/CannotProceedException.h b/libjava/javax/naming/CannotProceedException.h
deleted file mode 100644
index 83fe1ec7003..00000000000
--- a/libjava/javax/naming/CannotProceedException.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CannotProceedException__
-#define __javax_naming_CannotProceedException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CannotProceedException;
-        class Context;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::CannotProceedException : public ::javax::naming::NamingException
-{
-
-public:
-  CannotProceedException();
-  CannotProceedException(::java::lang::String *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual void setEnvironment(::java::util::Hashtable *);
-  virtual ::javax::naming::Name * getRemainingNewName();
-  virtual void setRemainingNewName(::javax::naming::Name *);
-  virtual ::javax::naming::Name * getAltName();
-  virtual void setAltName(::javax::naming::Name *);
-  virtual ::javax::naming::Context * getAltNameCtx();
-  virtual void setAltNameCtx(::javax::naming::Context *);
-private:
-  static const jlong serialVersionUID = 1219724816191576813LL;
-public: // actually protected
-  ::javax::naming::Name * __attribute__((aligned(__alignof__( ::javax::naming::NamingException)))) remainingNewName;
-  ::java::util::Hashtable * environment;
-  ::javax::naming::Name * altName;
-  ::javax::naming::Context * altNameCtx;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CannotProceedException__
diff --git a/libjava/javax/naming/CommunicationException.h b/libjava/javax/naming/CommunicationException.h
deleted file mode 100644
index 1a7a118ec04..00000000000
--- a/libjava/javax/naming/CommunicationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CommunicationException__
-#define __javax_naming_CommunicationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CommunicationException;
-    }
-  }
-}
-
-class javax::naming::CommunicationException : public ::javax::naming::NamingException
-{
-
-public:
-  CommunicationException();
-  CommunicationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3618507780299986611LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CommunicationException__
diff --git a/libjava/javax/naming/CompositeName.h b/libjava/javax/naming/CompositeName.h
deleted file mode 100644
index 8669b7f4b1a..00000000000
--- a/libjava/javax/naming/CompositeName.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CompositeName__
-#define __javax_naming_CompositeName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CompositeName;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::CompositeName : public ::java::lang::Object
-{
-
-public:
-  CompositeName();
-public: // actually protected
-  CompositeName(::java::util::Enumeration *);
-public:
-  CompositeName(::java::lang::String *);
-  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 ::java::lang::Object * clone();
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jboolean endsWith(::javax::naming::Name *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * get(jint);
-  virtual ::java::util::Enumeration * getAll();
-  virtual ::javax::naming::Name * getPrefix(jint);
-  virtual ::javax::naming::Name * getSuffix(jint);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint size();
-  virtual jboolean startsWith(::javax::naming::Name *);
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 1667768148915813118LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CompositeName__
diff --git a/libjava/javax/naming/CompoundName.h b/libjava/javax/naming/CompoundName.h
deleted file mode 100644
index a28724b07c6..00000000000
--- a/libjava/javax/naming/CompoundName.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_CompoundName__
-#define __javax_naming_CompoundName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CompoundName;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::CompoundName : public ::java::lang::Object
-{
-
-  CompoundName(::java::util::Properties *);
-public: // actually protected
-  CompoundName(::java::util::Enumeration *, ::java::util::Properties *);
-public:
-  CompoundName(::java::lang::String *, ::java::util::Properties *);
-  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 ::java::lang::Object * clone();
-  virtual jint compareTo(::java::lang::Object *);
-  virtual jboolean endsWith(::javax::naming::Name *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * get(jint);
-  virtual ::java::util::Enumeration * getAll();
-  virtual ::javax::naming::Name * getPrefix(jint);
-  virtual ::javax::naming::Name * getSuffix(jint);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint size();
-  virtual jboolean startsWith(::javax::naming::Name *);
-private:
-  ::java::lang::String * isSpecial(::java::lang::String *, jint);
-public:
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * canonicalize(::java::lang::String *);
-  void initializeSyntax();
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 3513100557083972036LL;
-public: // actually protected
-  ::java::util::Properties * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mySyntax;
-private:
-  ::java::util::Vector * elts;
-  jint direction;
-  ::java::lang::String * separator;
-  jboolean ignoreCase;
-  ::java::lang::String * escape;
-  ::java::lang::String * beginQuote;
-  ::java::lang::String * endQuote;
-  ::java::lang::String * beginQuote2;
-  ::java::lang::String * endQuote2;
-  jboolean trimBlanks;
-  static const jint RIGHT_TO_LEFT = -1;
-  static const jint LEFT_TO_RIGHT = 1;
-  static const jint FLAT = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_CompoundName__
diff --git a/libjava/javax/naming/ConfigurationException.h b/libjava/javax/naming/ConfigurationException.h
deleted file mode 100644
index f59a32a96fe..00000000000
--- a/libjava/javax/naming/ConfigurationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ConfigurationException__
-#define __javax_naming_ConfigurationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class ConfigurationException;
-    }
-  }
-}
-
-class javax::naming::ConfigurationException : public ::javax::naming::NamingException
-{
-
-public:
-  ConfigurationException();
-  ConfigurationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2535156726228855704LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ConfigurationException__
diff --git a/libjava/javax/naming/Context.h b/libjava/javax/naming/Context.h
deleted file mode 100644
index c5b5ed8abe6..00000000000
--- a/libjava/javax/naming/Context.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Context__
-#define __javax_naming_Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-}
-
-class javax::naming::Context : public ::java::lang::Object
-{
-
-public:
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static ::java::lang::String * INITIAL_CONTEXT_FACTORY;
-  static ::java::lang::String * OBJECT_FACTORIES;
-  static ::java::lang::String * STATE_FACTORIES;
-  static ::java::lang::String * URL_PKG_PREFIXES;
-  static ::java::lang::String * PROVIDER_URL;
-  static ::java::lang::String * DNS_URL;
-  static ::java::lang::String * AUTHORITATIVE;
-  static ::java::lang::String * BATCHSIZE;
-  static ::java::lang::String * REFERRAL;
-  static ::java::lang::String * SECURITY_PROTOCOL;
-  static ::java::lang::String * SECURITY_AUTHENTICATION;
-  static ::java::lang::String * SECURITY_PRINCIPAL;
-  static ::java::lang::String * SECURITY_CREDENTIALS;
-  static ::java::lang::String * LANGUAGE;
-  static ::java::lang::String * APPLET;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_Context__
diff --git a/libjava/javax/naming/ContextNotEmptyException.h b/libjava/javax/naming/ContextNotEmptyException.h
deleted file mode 100644
index 791e89d2b18..00000000000
--- a/libjava/javax/naming/ContextNotEmptyException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ContextNotEmptyException__
-#define __javax_naming_ContextNotEmptyException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class ContextNotEmptyException;
-    }
-  }
-}
-
-class javax::naming::ContextNotEmptyException : public ::javax::naming::NamingException
-{
-
-public:
-  ContextNotEmptyException();
-  ContextNotEmptyException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1090963683348219877LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ContextNotEmptyException__
diff --git a/libjava/javax/naming/InitialContext.h b/libjava/javax/naming/InitialContext.h
deleted file mode 100644
index 6eaac2e54a5..00000000000
--- a/libjava/javax/naming/InitialContext.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InitialContext__
-#define __javax_naming_InitialContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class InitialContext;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-    }
-  }
-}
-
-class javax::naming::InitialContext : public ::java::lang::Object
-{
-
-public:
-  InitialContext(::java::util::Hashtable *);
-public: // actually protected
-  InitialContext(jboolean);
-public:
-  InitialContext();
-public: // actually protected
-  virtual void init(::java::util::Hashtable *);
-public: // actually package-private
-  static void merge(::java::util::Hashtable *, ::java::util::Hashtable *);
-public: // actually protected
-  virtual ::javax::naming::Context * getDefaultInitCtx();
-  virtual ::javax::naming::Context * getURLOrDefaultInitCtx(::javax::naming::Name *);
-  virtual ::javax::naming::Context * getURLOrDefaultInitCtx(::java::lang::String *);
-public:
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookup(::java::lang::String *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *);
-  virtual void unbind(::javax::naming::Name *);
-  virtual void unbind(::java::lang::String *);
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual void rename(::java::lang::String *, ::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 void destroySubcontext(::javax::naming::Name *);
-  virtual void destroySubcontext(::java::lang::String *);
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *);
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *);
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *);
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *);
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *);
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *);
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *);
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *);
-  virtual ::java::util::Hashtable * getEnvironment();
-  virtual void close();
-  virtual ::java::lang::String * getNameInNamespace();
-public: // actually protected
-  ::javax::naming::Context * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultInitCtx;
-  jboolean gotDefault;
-  ::java::util::Hashtable * myProps;
-public: // actually package-private
-  static ::java::util::HashSet * colon_list;
-  static JArray< ::java::lang::String * > * use_properties;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InitialContext__
diff --git a/libjava/javax/naming/InsufficientResourcesException.h b/libjava/javax/naming/InsufficientResourcesException.h
deleted file mode 100644
index d3fc6603c03..00000000000
--- a/libjava/javax/naming/InsufficientResourcesException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InsufficientResourcesException__
-#define __javax_naming_InsufficientResourcesException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class InsufficientResourcesException;
-    }
-  }
-}
-
-class javax::naming::InsufficientResourcesException : public ::javax::naming::NamingException
-{
-
-public:
-  InsufficientResourcesException();
-  InsufficientResourcesException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6227672693037844532LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InsufficientResourcesException__
diff --git a/libjava/javax/naming/InterruptedNamingException.h b/libjava/javax/naming/InterruptedNamingException.h
deleted file mode 100644
index f13b87bb7ad..00000000000
--- a/libjava/javax/naming/InterruptedNamingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InterruptedNamingException__
-#define __javax_naming_InterruptedNamingException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class InterruptedNamingException;
-    }
-  }
-}
-
-class javax::naming::InterruptedNamingException : public ::javax::naming::NamingException
-{
-
-public:
-  InterruptedNamingException();
-  InterruptedNamingException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6404516648893194728LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InterruptedNamingException__
diff --git a/libjava/javax/naming/InvalidNameException.h b/libjava/javax/naming/InvalidNameException.h
deleted file mode 100644
index 47e17576825..00000000000
--- a/libjava/javax/naming/InvalidNameException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_InvalidNameException__
-#define __javax_naming_InvalidNameException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class InvalidNameException;
-    }
-  }
-}
-
-class javax::naming::InvalidNameException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidNameException();
-  InvalidNameException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8370672380823801105LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_InvalidNameException__
diff --git a/libjava/javax/naming/LimitExceededException.h b/libjava/javax/naming/LimitExceededException.h
deleted file mode 100644
index f6d6fdafa3d..00000000000
--- a/libjava/javax/naming/LimitExceededException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LimitExceededException__
-#define __javax_naming_LimitExceededException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LimitExceededException;
-    }
-  }
-}
-
-class javax::naming::LimitExceededException : public ::javax::naming::NamingException
-{
-
-public:
-  LimitExceededException();
-  LimitExceededException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -776898738660207856LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LimitExceededException__
diff --git a/libjava/javax/naming/LinkException.h b/libjava/javax/naming/LinkException.h
deleted file mode 100644
index 9949157b2ea..00000000000
--- a/libjava/javax/naming/LinkException.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LinkException__
-#define __javax_naming_LinkException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LinkException;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::LinkException : public ::javax::naming::NamingException
-{
-
-public:
-  LinkException();
-  LinkException(::java::lang::String *);
-  virtual ::javax::naming::Name * getLinkResolvedName();
-  virtual ::javax::naming::Name * getLinkRemainingName();
-  virtual ::java::lang::Object * getLinkResolvedObj();
-  virtual ::java::lang::String * getLinkExplanation();
-  virtual void setLinkExplanation(::java::lang::String *);
-  virtual void setLinkResolvedName(::javax::naming::Name *);
-  virtual void setLinkRemainingName(::javax::naming::Name *);
-  virtual void setLinkResolvedObj(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jboolean);
-private:
-  static const jlong serialVersionUID = -7967662604076777712LL;
-public: // actually protected
-  ::javax::naming::Name * __attribute__((aligned(__alignof__( ::javax::naming::NamingException)))) linkResolvedName;
-  ::java::lang::Object * linkResolvedObj;
-  ::javax::naming::Name * linkRemainingName;
-  ::java::lang::String * linkExplanation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LinkException__
diff --git a/libjava/javax/naming/LinkLoopException.h b/libjava/javax/naming/LinkLoopException.h
deleted file mode 100644
index 4ca06dd9819..00000000000
--- a/libjava/javax/naming/LinkLoopException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LinkLoopException__
-#define __javax_naming_LinkLoopException__
-
-#pragma interface
-
-#include <javax/naming/LinkException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LinkLoopException;
-    }
-  }
-}
-
-class javax::naming::LinkLoopException : public ::javax::naming::LinkException
-{
-
-public:
-  LinkLoopException();
-  LinkLoopException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3119189944325198009LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LinkLoopException__
diff --git a/libjava/javax/naming/LinkRef.h b/libjava/javax/naming/LinkRef.h
deleted file mode 100644
index 3ef79dcf56d..00000000000
--- a/libjava/javax/naming/LinkRef.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_LinkRef__
-#define __javax_naming_LinkRef__
-
-#pragma interface
-
-#include <javax/naming/Reference.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class LinkRef;
-        class Name;
-    }
-  }
-}
-
-class javax::naming::LinkRef : public ::javax::naming::Reference
-{
-
-public:
-  LinkRef(::javax::naming::Name *);
-  LinkRef(::java::lang::String *);
-  virtual ::java::lang::String * getLinkName();
-private:
-  static const jlong serialVersionUID = -5386290613498931298LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_LinkRef__
diff --git a/libjava/javax/naming/MalformedLinkException.h b/libjava/javax/naming/MalformedLinkException.h
deleted file mode 100644
index 982cf900df3..00000000000
--- a/libjava/javax/naming/MalformedLinkException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_MalformedLinkException__
-#define __javax_naming_MalformedLinkException__
-
-#pragma interface
-
-#include <javax/naming/LinkException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class MalformedLinkException;
-    }
-  }
-}
-
-class javax::naming::MalformedLinkException : public ::javax::naming::LinkException
-{
-
-public:
-  MalformedLinkException();
-  MalformedLinkException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3066740437737830242LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_MalformedLinkException__
diff --git a/libjava/javax/naming/Name.h b/libjava/javax/naming/Name.h
deleted file mode 100644
index 4a4dd9942e8..00000000000
--- a/libjava/javax/naming/Name.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Name__
-#define __javax_naming_Name__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-    }
-  }
-}
-
-class javax::naming::Name : public ::java::lang::Object
-{
-
-public:
-  virtual jint size() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual ::java::util::Enumeration * getAll() = 0;
-  virtual ::java::lang::String * get(jint) = 0;
-  virtual ::javax::naming::Name * getPrefix(jint) = 0;
-  virtual ::javax::naming::Name * getSuffix(jint) = 0;
-  virtual ::javax::naming::Name * add(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * add(jint, ::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * addAll(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Name * addAll(jint, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * remove(jint) = 0;
-  virtual jboolean startsWith(::javax::naming::Name *) = 0;
-  virtual jboolean endsWith(::javax::naming::Name *) = 0;
-  virtual jint compareTo(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static const jlong serialVersionUID = -3617482732056931635LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_Name__
diff --git a/libjava/javax/naming/NameAlreadyBoundException.h b/libjava/javax/naming/NameAlreadyBoundException.h
deleted file mode 100644
index dd6a952152d..00000000000
--- a/libjava/javax/naming/NameAlreadyBoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameAlreadyBoundException__
-#define __javax_naming_NameAlreadyBoundException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NameAlreadyBoundException;
-    }
-  }
-}
-
-class javax::naming::NameAlreadyBoundException : public ::javax::naming::NamingException
-{
-
-public:
-  NameAlreadyBoundException();
-  NameAlreadyBoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8491441000356780586LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NameAlreadyBoundException__
diff --git a/libjava/javax/naming/NameClassPair.h b/libjava/javax/naming/NameClassPair.h
deleted file mode 100644
index 690c31e9082..00000000000
--- a/libjava/javax/naming/NameClassPair.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameClassPair__
-#define __javax_naming_NameClassPair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NameClassPair;
-    }
-  }
-}
-
-class javax::naming::NameClassPair : public ::java::lang::Object
-{
-
-public:
-  NameClassPair(::java::lang::String *, ::java::lang::String *);
-  NameClassPair(::java::lang::String *, ::java::lang::String *, jboolean);
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getName();
-  virtual jboolean isRelative();
-  virtual void setClassName(::java::lang::String *);
-  virtual void setName(::java::lang::String *);
-  virtual void setRelative(jboolean);
-  virtual void setNameInNamespace(::java::lang::String *);
-  virtual ::java::lang::String * getNameInNamespace();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 5620776610160863339LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * className;
-  jboolean isRel;
-  ::java::lang::String * fullName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NameClassPair__
diff --git a/libjava/javax/naming/NameNotFoundException.h b/libjava/javax/naming/NameNotFoundException.h
deleted file mode 100644
index 079d5a02c16..00000000000
--- a/libjava/javax/naming/NameNotFoundException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameNotFoundException__
-#define __javax_naming_NameNotFoundException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NameNotFoundException;
-    }
-  }
-}
-
-class javax::naming::NameNotFoundException : public ::javax::naming::NamingException
-{
-
-public:
-  NameNotFoundException();
-  NameNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8007156725367842053LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NameNotFoundException__
diff --git a/libjava/javax/naming/NameParser.h b/libjava/javax/naming/NameParser.h
deleted file mode 100644
index 502fcaec43a..00000000000
--- a/libjava/javax/naming/NameParser.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NameParser__
-#define __javax_naming_NameParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-        class NameParser;
-    }
-  }
-}
-
-class javax::naming::NameParser : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::Name * parse(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_NameParser__
diff --git a/libjava/javax/naming/NamingEnumeration.h b/libjava/javax/naming/NamingEnumeration.h
deleted file mode 100644
index 7d848ce1a2c..00000000000
--- a/libjava/javax/naming/NamingEnumeration.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NamingEnumeration__
-#define __javax_naming_NamingEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-    }
-  }
-}
-
-class javax::naming::NamingEnumeration : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * next() = 0;
-  virtual jboolean hasMore() = 0;
-  virtual void close() = 0;
-  virtual jboolean hasMoreElements() = 0;
-  virtual ::java::lang::Object * nextElement() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_NamingEnumeration__
diff --git a/libjava/javax/naming/NamingException.h b/libjava/javax/naming/NamingException.h
deleted file mode 100644
index 75a5ae9951c..00000000000
--- a/libjava/javax/naming/NamingException.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NamingException__
-#define __javax_naming_NamingException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-        class NamingException;
-    }
-  }
-}
-
-class javax::naming::NamingException : public ::java::lang::Exception
-{
-
-public:
-  NamingException();
-  NamingException(::java::lang::String *);
-  virtual ::java::lang::Throwable * getRootCause();
-  virtual void setRootCause(::java::lang::Throwable *);
-  virtual ::javax::naming::Name * getResolvedName();
-  virtual void setResolvedName(::javax::naming::Name *);
-  virtual ::java::lang::Object * getResolvedObj();
-  virtual void setResolvedObj(::java::lang::Object *);
-  virtual ::javax::naming::Name * getRemainingName();
-  virtual void setRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingComponent(::java::lang::String *);
-  virtual ::java::lang::String * getExplanation();
-  virtual ::java::lang::String * toString(jboolean);
-  virtual ::java::lang::String * toString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = -1299181962103167177LL;
-public: // actually protected
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) rootException;
-  ::javax::naming::Name * resolvedName;
-  ::java::lang::Object * resolvedObj;
-  ::javax::naming::Name * remainingName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NamingException__
diff --git a/libjava/javax/naming/NamingSecurityException.h b/libjava/javax/naming/NamingSecurityException.h
deleted file mode 100644
index e2e2a491111..00000000000
--- a/libjava/javax/naming/NamingSecurityException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NamingSecurityException__
-#define __javax_naming_NamingSecurityException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingSecurityException;
-    }
-  }
-}
-
-class javax::naming::NamingSecurityException : public ::javax::naming::NamingException
-{
-
-public:
-  NamingSecurityException();
-  NamingSecurityException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5855287647294685775LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NamingSecurityException__
diff --git a/libjava/javax/naming/NoInitialContextException.h b/libjava/javax/naming/NoInitialContextException.h
deleted file mode 100644
index e598071d16e..00000000000
--- a/libjava/javax/naming/NoInitialContextException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NoInitialContextException__
-#define __javax_naming_NoInitialContextException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NoInitialContextException;
-    }
-  }
-}
-
-class javax::naming::NoInitialContextException : public ::javax::naming::NamingException
-{
-
-public:
-  NoInitialContextException();
-  NoInitialContextException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3413733186901258623LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NoInitialContextException__
diff --git a/libjava/javax/naming/NoPermissionException.h b/libjava/javax/naming/NoPermissionException.h
deleted file mode 100644
index d96556d9006..00000000000
--- a/libjava/javax/naming/NoPermissionException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NoPermissionException__
-#define __javax_naming_NoPermissionException__
-
-#pragma interface
-
-#include <javax/naming/NamingSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NoPermissionException;
-    }
-  }
-}
-
-class javax::naming::NoPermissionException : public ::javax::naming::NamingSecurityException
-{
-
-public:
-  NoPermissionException();
-  NoPermissionException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8395332708699751775LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NoPermissionException__
diff --git a/libjava/javax/naming/NotContextException.h b/libjava/javax/naming/NotContextException.h
deleted file mode 100644
index fd488ffb773..00000000000
--- a/libjava/javax/naming/NotContextException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_NotContextException__
-#define __javax_naming_NotContextException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NotContextException;
-    }
-  }
-}
-
-class javax::naming::NotContextException : public ::javax::naming::NamingException
-{
-
-public:
-  NotContextException();
-  NotContextException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 849752551644540417LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_NotContextException__
diff --git a/libjava/javax/naming/OperationNotSupportedException.h b/libjava/javax/naming/OperationNotSupportedException.h
deleted file mode 100644
index 7bf8c0fd5e0..00000000000
--- a/libjava/javax/naming/OperationNotSupportedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_OperationNotSupportedException__
-#define __javax_naming_OperationNotSupportedException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class OperationNotSupportedException;
-    }
-  }
-}
-
-class javax::naming::OperationNotSupportedException : public ::javax::naming::NamingException
-{
-
-public:
-  OperationNotSupportedException();
-  OperationNotSupportedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5493232822427682064LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_OperationNotSupportedException__
diff --git a/libjava/javax/naming/PartialResultException.h b/libjava/javax/naming/PartialResultException.h
deleted file mode 100644
index 9de177ae902..00000000000
--- a/libjava/javax/naming/PartialResultException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_PartialResultException__
-#define __javax_naming_PartialResultException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class PartialResultException;
-    }
-  }
-}
-
-class javax::naming::PartialResultException : public ::javax::naming::NamingException
-{
-
-public:
-  PartialResultException();
-  PartialResultException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2572144970049426786LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_PartialResultException__
diff --git a/libjava/javax/naming/RefAddr.h b/libjava/javax/naming/RefAddr.h
deleted file mode 100644
index f124428fd2d..00000000000
--- a/libjava/javax/naming/RefAddr.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_RefAddr__
-#define __javax_naming_RefAddr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class RefAddr;
-    }
-  }
-}
-
-class javax::naming::RefAddr : public ::java::lang::Object
-{
-
-public: // actually protected
-  RefAddr(::java::lang::String *);
-public:
-  virtual ::java::lang::String * getType();
-  virtual ::java::lang::Object * getContent() = 0;
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) addrType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_RefAddr__
diff --git a/libjava/javax/naming/Reference.h b/libjava/javax/naming/Reference.h
deleted file mode 100644
index 62325ce333a..00000000000
--- a/libjava/javax/naming/Reference.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Reference__
-#define __javax_naming_Reference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class RefAddr;
-        class Reference;
-    }
-  }
-}
-
-class javax::naming::Reference : public ::java::lang::Object
-{
-
-public:
-  Reference(::java::lang::String *);
-  Reference(::java::lang::String *, ::javax::naming::RefAddr *);
-  Reference(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  Reference(::java::lang::String *, ::javax::naming::RefAddr *, ::java::lang::String *, ::java::lang::String *);
-  virtual void add(jint, ::javax::naming::RefAddr *);
-  virtual void add(::javax::naming::RefAddr *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-private:
-  jboolean equals(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::naming::RefAddr * get(jint);
-  virtual ::javax::naming::RefAddr * get(::java::lang::String *);
-  virtual ::java::util::Enumeration * getAll();
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * getFactoryClassLocation();
-  virtual ::java::lang::String * getFactoryClassName();
-  virtual jint hashCode();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1673475790065791735LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) addrs;
-  ::java::lang::String * classFactory;
-  ::java::lang::String * classFactoryLocation;
-  ::java::lang::String * className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_Reference__
diff --git a/libjava/javax/naming/Referenceable.h b/libjava/javax/naming/Referenceable.h
deleted file mode 100644
index a2d09b6863f..00000000000
--- a/libjava/javax/naming/Referenceable.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_Referenceable__
-#define __javax_naming_Referenceable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Reference;
-        class Referenceable;
-    }
-  }
-}
-
-class javax::naming::Referenceable : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::Reference * getReference() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_Referenceable__
diff --git a/libjava/javax/naming/ReferralException.h b/libjava/javax/naming/ReferralException.h
deleted file mode 100644
index 7c26d973bff..00000000000
--- a/libjava/javax/naming/ReferralException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ReferralException__
-#define __javax_naming_ReferralException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class ReferralException;
-    }
-  }
-}
-
-class javax::naming::ReferralException : public ::javax::naming::NamingException
-{
-
-public: // actually protected
-  ReferralException();
-  ReferralException(::java::lang::String *);
-public:
-  virtual ::java::lang::Object * getReferralInfo() = 0;
-  virtual ::javax::naming::Context * getReferralContext() = 0;
-  virtual ::javax::naming::Context * getReferralContext(::java::util::Hashtable *) = 0;
-  virtual jboolean skipReferral() = 0;
-  virtual void retryReferral() = 0;
-private:
-  static const jlong serialVersionUID = -2881363844695698876LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ReferralException__
diff --git a/libjava/javax/naming/ServiceUnavailableException.h b/libjava/javax/naming/ServiceUnavailableException.h
deleted file mode 100644
index 4f90524535a..00000000000
--- a/libjava/javax/naming/ServiceUnavailableException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ServiceUnavailableException__
-#define __javax_naming_ServiceUnavailableException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class ServiceUnavailableException;
-    }
-  }
-}
-
-class javax::naming::ServiceUnavailableException : public ::javax::naming::NamingException
-{
-
-public:
-  ServiceUnavailableException();
-  ServiceUnavailableException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4996964726566773444LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ServiceUnavailableException__
diff --git a/libjava/javax/naming/SizeLimitExceededException.h b/libjava/javax/naming/SizeLimitExceededException.h
deleted file mode 100644
index d4744b1241c..00000000000
--- a/libjava/javax/naming/SizeLimitExceededException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_SizeLimitExceededException__
-#define __javax_naming_SizeLimitExceededException__
-
-#pragma interface
-
-#include <javax/naming/LimitExceededException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class SizeLimitExceededException;
-    }
-  }
-}
-
-class javax::naming::SizeLimitExceededException : public ::javax::naming::LimitExceededException
-{
-
-public:
-  SizeLimitExceededException();
-  SizeLimitExceededException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7129289564879168579LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_SizeLimitExceededException__
diff --git a/libjava/javax/naming/StringRefAddr.h b/libjava/javax/naming/StringRefAddr.h
deleted file mode 100644
index c7bd0c84ba4..00000000000
--- a/libjava/javax/naming/StringRefAddr.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_StringRefAddr__
-#define __javax_naming_StringRefAddr__
-
-#pragma interface
-
-#include <javax/naming/RefAddr.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class StringRefAddr;
-    }
-  }
-}
-
-class javax::naming::StringRefAddr : public ::javax::naming::RefAddr
-{
-
-public:
-  StringRefAddr(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::Object * getContent();
-private:
-  static const jlong serialVersionUID = -8913762495138505527LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::naming::RefAddr)))) contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_StringRefAddr__
diff --git a/libjava/javax/naming/TimeLimitExceededException.h b/libjava/javax/naming/TimeLimitExceededException.h
deleted file mode 100644
index 4c555fbb27c..00000000000
--- a/libjava/javax/naming/TimeLimitExceededException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_TimeLimitExceededException__
-#define __javax_naming_TimeLimitExceededException__
-
-#pragma interface
-
-#include <javax/naming/LimitExceededException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class TimeLimitExceededException;
-    }
-  }
-}
-
-class javax::naming::TimeLimitExceededException : public ::javax::naming::LimitExceededException
-{
-
-public:
-  TimeLimitExceededException();
-  TimeLimitExceededException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3597009011385034696LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_TimeLimitExceededException__
diff --git a/libjava/javax/naming/directory/Attribute.h b/libjava/javax/naming/directory/Attribute.h
deleted file mode 100644
index 4c8a92d270c..00000000000
--- a/libjava/javax/naming/directory/Attribute.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_Attribute__
-#define __javax_naming_directory_Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attribute;
-          class DirContext;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::Attribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::NamingEnumeration * getAll() = 0;
-  virtual ::java::lang::Object * get() = 0;
-  virtual jint size() = 0;
-  virtual ::java::lang::String * getID() = 0;
-  virtual jboolean contains(::java::lang::Object *) = 0;
-  virtual jboolean add(::java::lang::Object *) = 0;
-  virtual jboolean remove(::java::lang::Object *) = 0;
-  virtual void clear() = 0;
-  virtual ::javax::naming::directory::DirContext * getAttributeSyntaxDefinition() = 0;
-  virtual ::javax::naming::directory::DirContext * getAttributeDefinition() = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  virtual jboolean isOrdered() = 0;
-  virtual ::java::lang::Object * get(jint) = 0;
-  virtual ::java::lang::Object * remove(jint) = 0;
-  virtual void add(jint, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *) = 0;
-  static const jlong serialVersionUID = 8707690322213556804LL;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_directory_Attribute__
diff --git a/libjava/javax/naming/directory/AttributeInUseException.h b/libjava/javax/naming/directory/AttributeInUseException.h
deleted file mode 100644
index 5062ab562ef..00000000000
--- a/libjava/javax/naming/directory/AttributeInUseException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_AttributeInUseException__
-#define __javax_naming_directory_AttributeInUseException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class AttributeInUseException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::AttributeInUseException : public ::javax::naming::NamingException
-{
-
-public:
-  AttributeInUseException();
-  AttributeInUseException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4437710305529322564LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_AttributeInUseException__
diff --git a/libjava/javax/naming/directory/AttributeModificationException.h b/libjava/javax/naming/directory/AttributeModificationException.h
deleted file mode 100644
index e113e32dac7..00000000000
--- a/libjava/javax/naming/directory/AttributeModificationException.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_AttributeModificationException__
-#define __javax_naming_directory_AttributeModificationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class AttributeModificationException;
-          class ModificationItem;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::AttributeModificationException : public ::javax::naming::NamingException
-{
-
-public:
-  AttributeModificationException();
-  AttributeModificationException(::java::lang::String *);
-  virtual void setUnexecutedModifications(JArray< ::javax::naming::directory::ModificationItem * > *);
-  virtual JArray< ::javax::naming::directory::ModificationItem * > * getUnexecutedModifications();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 8060676069678710186LL;
-  JArray< ::javax::naming::directory::ModificationItem * > * __attribute__((aligned(__alignof__( ::javax::naming::NamingException)))) unexecs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_AttributeModificationException__
diff --git a/libjava/javax/naming/directory/Attributes.h b/libjava/javax/naming/directory/Attributes.h
deleted file mode 100644
index 31525e190bc..00000000000
--- a/libjava/javax/naming/directory/Attributes.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_Attributes__
-#define __javax_naming_directory_Attributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attribute;
-          class Attributes;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::Attributes : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isCaseIgnored() = 0;
-  virtual jint size() = 0;
-  virtual ::javax::naming::directory::Attribute * get(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * getAll() = 0;
-  virtual ::javax::naming::NamingEnumeration * getIDs() = 0;
-  virtual ::javax::naming::directory::Attribute * put(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::javax::naming::directory::Attribute * put(::javax::naming::directory::Attribute *) = 0;
-  virtual ::javax::naming::directory::Attribute * remove(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_directory_Attributes__
diff --git a/libjava/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.h b/libjava/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.h
deleted file mode 100644
index df2a00da452..00000000000
--- a/libjava/javax/naming/directory/BasicAttribute$BasicAttributeEnumeration.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttribute$BasicAttributeEnumeration__
-#define __javax_naming_directory_BasicAttribute$BasicAttributeEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class BasicAttribute;
-          class BasicAttribute$BasicAttributeEnumeration;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttribute$BasicAttributeEnumeration : public ::java::lang::Object
-{
-
-public:
-  BasicAttribute$BasicAttributeEnumeration(::javax::naming::directory::BasicAttribute *);
-  virtual void close();
-  virtual jboolean hasMore();
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) where;
-  ::javax::naming::directory::BasicAttribute * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttribute$BasicAttributeEnumeration__
diff --git a/libjava/javax/naming/directory/BasicAttribute.h b/libjava/javax/naming/directory/BasicAttribute.h
deleted file mode 100644
index 2d56a62b0ce..00000000000
--- a/libjava/javax/naming/directory/BasicAttribute.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttribute__
-#define __javax_naming_directory_BasicAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class BasicAttribute;
-          class DirContext;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttribute : public ::java::lang::Object
-{
-
-  BasicAttribute();
-public:
-  BasicAttribute(::java::lang::String *);
-  BasicAttribute(::java::lang::String *, jboolean);
-  BasicAttribute(::java::lang::String *, ::java::lang::Object *);
-  BasicAttribute(::java::lang::String *, ::java::lang::Object *, jboolean);
-  virtual void add(jint, ::java::lang::Object *);
-  virtual jboolean add(::java::lang::Object *);
-  virtual void clear();
-  virtual ::java::lang::Object * clone();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * get();
-  virtual ::java::lang::Object * get(jint);
-  virtual ::javax::naming::NamingEnumeration * getAll();
-  virtual ::javax::naming::directory::DirContext * getAttributeDefinition();
-  virtual ::javax::naming::directory::DirContext * getAttributeSyntaxDefinition();
-  virtual ::java::lang::String * getID();
-  virtual jint hashCode();
-  virtual jboolean isOrdered();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-private:
-  jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 6743528196119291326LL;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrID;
-  jboolean ordered;
-  ::java::util::Vector * values;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttribute__
diff --git a/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h b/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h
deleted file mode 100644
index 598b2276741..00000000000
--- a/libjava/javax/naming/directory/BasicAttributes$BasicAttributesEnumeration.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttributes$BasicAttributesEnumeration__
-#define __javax_naming_directory_BasicAttributes$BasicAttributesEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class BasicAttributes;
-          class BasicAttributes$BasicAttributesEnumeration;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttributes$BasicAttributesEnumeration : public ::java::lang::Object
-{
-
-public:
-  BasicAttributes$BasicAttributesEnumeration(::javax::naming::directory::BasicAttributes *, jboolean);
-  virtual void close();
-  virtual jboolean hasMore();
-  virtual ::java::lang::Object * next();
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) where;
-  jboolean id;
-  ::javax::naming::directory::BasicAttributes * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttributes$BasicAttributesEnumeration__
diff --git a/libjava/javax/naming/directory/BasicAttributes.h b/libjava/javax/naming/directory/BasicAttributes.h
deleted file mode 100644
index 89436721f18..00000000000
--- a/libjava/javax/naming/directory/BasicAttributes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_BasicAttributes__
-#define __javax_naming_directory_BasicAttributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attribute;
-          class BasicAttributes;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::BasicAttributes : public ::java::lang::Object
-{
-
-public:
-  BasicAttributes();
-  BasicAttributes(jboolean);
-  BasicAttributes(::java::lang::String *, ::java::lang::Object *);
-  BasicAttributes(::java::lang::String *, ::java::lang::Object *, jboolean);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::naming::directory::Attribute * get(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * getAll();
-  virtual ::javax::naming::NamingEnumeration * getIDs();
-  virtual jint hashCode();
-  virtual jboolean isCaseIgnored();
-  virtual ::javax::naming::directory::Attribute * put(::javax::naming::directory::Attribute *);
-  virtual ::javax::naming::directory::Attribute * put(::java::lang::String *, ::java::lang::Object *);
-  virtual ::javax::naming::directory::Attribute * remove(::java::lang::String *);
-  virtual jint size();
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 4980164073184639448LL;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) ignoreCase;
-public: // actually package-private
-  ::java::util::Vector * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_BasicAttributes__
diff --git a/libjava/javax/naming/directory/DirContext.h b/libjava/javax/naming/directory/DirContext.h
deleted file mode 100644
index 41126211b4b..00000000000
--- a/libjava/javax/naming/directory/DirContext.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_DirContext__
-#define __javax_naming_directory_DirContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::DirContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static const jint ADD_ATTRIBUTE = 1;
-  static const jint REPLACE_ATTRIBUTE = 2;
-  static const jint REMOVE_ATTRIBUTE = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_directory_DirContext__
diff --git a/libjava/javax/naming/directory/InitialDirContext.h b/libjava/javax/naming/directory/InitialDirContext.h
deleted file mode 100644
index 6e8712eb66a..00000000000
--- a/libjava/javax/naming/directory/InitialDirContext.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InitialDirContext__
-#define __javax_naming_directory_InitialDirContext__
-
-#pragma interface
-
-#include <javax/naming/InitialContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class InitialDirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InitialDirContext : public ::javax::naming::InitialContext
-{
-
-public:
-  InitialDirContext();
-public: // actually protected
-  InitialDirContext(jboolean);
-public:
-  InitialDirContext(::java::util::Hashtable *);
-private:
-  ::javax::naming::directory::DirContext * getURLOrDefaultInitDirCtx(::javax::naming::Name *);
-  ::javax::naming::directory::DirContext * getURLOrDefaultInitDirCtx(::java::lang::String *);
-public:
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *);
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *);
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *);
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *);
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *);
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *);
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *);
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *);
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *);
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *);
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *);
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *);
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *);
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InitialDirContext__
diff --git a/libjava/javax/naming/directory/InvalidAttributeIdentifierException.h b/libjava/javax/naming/directory/InvalidAttributeIdentifierException.h
deleted file mode 100644
index 23c341a4aad..00000000000
--- a/libjava/javax/naming/directory/InvalidAttributeIdentifierException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidAttributeIdentifierException__
-#define __javax_naming_directory_InvalidAttributeIdentifierException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidAttributeIdentifierException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidAttributeIdentifierException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidAttributeIdentifierException();
-  InvalidAttributeIdentifierException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -9036920266322999923LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidAttributeIdentifierException__
diff --git a/libjava/javax/naming/directory/InvalidAttributeValueException.h b/libjava/javax/naming/directory/InvalidAttributeValueException.h
deleted file mode 100644
index c8d55fe366c..00000000000
--- a/libjava/javax/naming/directory/InvalidAttributeValueException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidAttributeValueException__
-#define __javax_naming_directory_InvalidAttributeValueException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidAttributeValueException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidAttributeValueException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidAttributeValueException();
-  InvalidAttributeValueException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8720050295499275011LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidAttributeValueException__
diff --git a/libjava/javax/naming/directory/InvalidAttributesException.h b/libjava/javax/naming/directory/InvalidAttributesException.h
deleted file mode 100644
index 3bbb5bfb554..00000000000
--- a/libjava/javax/naming/directory/InvalidAttributesException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidAttributesException__
-#define __javax_naming_directory_InvalidAttributesException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidAttributesException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidAttributesException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidAttributesException();
-  InvalidAttributesException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2607612850539889765LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidAttributesException__
diff --git a/libjava/javax/naming/directory/InvalidSearchControlsException.h b/libjava/javax/naming/directory/InvalidSearchControlsException.h
deleted file mode 100644
index 58884397513..00000000000
--- a/libjava/javax/naming/directory/InvalidSearchControlsException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidSearchControlsException__
-#define __javax_naming_directory_InvalidSearchControlsException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidSearchControlsException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidSearchControlsException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidSearchControlsException();
-  InvalidSearchControlsException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5124108943352665777LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidSearchControlsException__
diff --git a/libjava/javax/naming/directory/InvalidSearchFilterException.h b/libjava/javax/naming/directory/InvalidSearchFilterException.h
deleted file mode 100644
index 5901c07bc4a..00000000000
--- a/libjava/javax/naming/directory/InvalidSearchFilterException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_InvalidSearchFilterException__
-#define __javax_naming_directory_InvalidSearchFilterException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class InvalidSearchFilterException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::InvalidSearchFilterException : public ::javax::naming::NamingException
-{
-
-public:
-  InvalidSearchFilterException();
-  InvalidSearchFilterException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2902700940682875441LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_InvalidSearchFilterException__
diff --git a/libjava/javax/naming/directory/ModificationItem.h b/libjava/javax/naming/directory/ModificationItem.h
deleted file mode 100644
index faf055b9086..00000000000
--- a/libjava/javax/naming/directory/ModificationItem.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_ModificationItem__
-#define __javax_naming_directory_ModificationItem__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attribute;
-          class ModificationItem;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::ModificationItem : public ::java::lang::Object
-{
-
-public:
-  ModificationItem(jint, ::javax::naming::directory::Attribute *);
-  virtual jint getModificationOp();
-  virtual ::javax::naming::directory::Attribute * getAttribute();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7573258562534746850LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) mod_op;
-  ::javax::naming::directory::Attribute * attr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_ModificationItem__
diff --git a/libjava/javax/naming/directory/NoSuchAttributeException.h b/libjava/javax/naming/directory/NoSuchAttributeException.h
deleted file mode 100644
index 501daeef868..00000000000
--- a/libjava/javax/naming/directory/NoSuchAttributeException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_NoSuchAttributeException__
-#define __javax_naming_directory_NoSuchAttributeException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class NoSuchAttributeException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::NoSuchAttributeException : public ::javax::naming::NamingException
-{
-
-public:
-  NoSuchAttributeException();
-  NoSuchAttributeException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4836415647935888137LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_NoSuchAttributeException__
diff --git a/libjava/javax/naming/directory/SchemaViolationException.h b/libjava/javax/naming/directory/SchemaViolationException.h
deleted file mode 100644
index 444f14c6cd7..00000000000
--- a/libjava/javax/naming/directory/SchemaViolationException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_SchemaViolationException__
-#define __javax_naming_directory_SchemaViolationException__
-
-#pragma interface
-
-#include <javax/naming/NamingException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class SchemaViolationException;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::SchemaViolationException : public ::javax::naming::NamingException
-{
-
-public:
-  SchemaViolationException();
-  SchemaViolationException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3041762429525049663LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_SchemaViolationException__
diff --git a/libjava/javax/naming/directory/SearchControls.h b/libjava/javax/naming/directory/SearchControls.h
deleted file mode 100644
index 1c39ba8f84b..00000000000
--- a/libjava/javax/naming/directory/SearchControls.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_SearchControls__
-#define __javax_naming_directory_SearchControls__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class SearchControls;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::SearchControls : public ::java::lang::Object
-{
-
-public:
-  SearchControls();
-  SearchControls(jint, jlong, jint, JArray< ::java::lang::String * > *, jboolean, jboolean);
-  virtual jint getSearchScope();
-  virtual jint getTimeLimit();
-  virtual jboolean getDerefLinkFlag();
-  virtual jboolean getReturningObjFlag();
-  virtual jlong getCountLimit();
-  virtual JArray< ::java::lang::String * > * getReturningAttributes();
-  virtual void setSearchScope(jint);
-  virtual void setTimeLimit(jint);
-  virtual void setDerefLinkFlag(jboolean);
-  virtual void setReturningObjFlag(jboolean);
-  virtual void setCountLimit(jlong);
-  virtual void setReturningAttributes(JArray< ::java::lang::String * > *);
-private:
-  static const jlong serialVersionUID = -2480540967773454797LL;
-public:
-  static const jint OBJECT_SCOPE = 0;
-  static const jint ONELEVEL_SCOPE = 1;
-  static const jint SUBTREE_SCOPE = 2;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) searchScope;
-  jint timeLimit;
-  jboolean derefLink;
-  jboolean returnObj;
-  jlong countLimit;
-  JArray< ::java::lang::String * > * attributesToReturn;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_SearchControls__
diff --git a/libjava/javax/naming/directory/SearchResult.h b/libjava/javax/naming/directory/SearchResult.h
deleted file mode 100644
index ac89020a465..00000000000
--- a/libjava/javax/naming/directory/SearchResult.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_directory_SearchResult__
-#define __javax_naming_directory_SearchResult__
-
-#pragma interface
-
-#include <javax/naming/Binding.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attributes;
-          class SearchResult;
-      }
-    }
-  }
-}
-
-class javax::naming::directory::SearchResult : public ::javax::naming::Binding
-{
-
-public:
-  SearchResult(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  SearchResult(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *, jboolean);
-  SearchResult(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  SearchResult(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *, jboolean);
-  virtual ::javax::naming::directory::Attributes * getAttributes();
-  virtual void setAttributes(::javax::naming::directory::Attributes *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -9158063327699723172LL;
-  ::javax::naming::directory::Attributes * __attribute__((aligned(__alignof__( ::javax::naming::Binding)))) attrs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_directory_SearchResult__
diff --git a/libjava/javax/naming/event/EventContext.h b/libjava/javax/naming/event/EventContext.h
deleted file mode 100644
index 3fbbfc2a561..00000000000
--- a/libjava/javax/naming/event/EventContext.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_EventContext__
-#define __javax_naming_event_EventContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace event
-      {
-          class EventContext;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::EventContext : public ::java::lang::Object
-{
-
-public:
-  virtual void addNamingListener(::javax::naming::Name *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void removeNamingListener(::javax::naming::event::NamingListener *) = 0;
-  virtual jboolean targetMustExist() = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static const jint OBJECT_SCOPE = 0;
-  static const jint ONELEVEL_SCOPE = 1;
-  static const jint SUBTREE_SCOPE = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_EventContext__
diff --git a/libjava/javax/naming/event/EventDirContext.h b/libjava/javax/naming/event/EventDirContext.h
deleted file mode 100644
index 2efa0c28495..00000000000
--- a/libjava/javax/naming/event/EventDirContext.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_EventDirContext__
-#define __javax_naming_event_EventDirContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-      namespace event
-      {
-          class EventDirContext;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::EventDirContext : public ::java::lang::Object
-{
-
-public:
-  virtual void addNamingListener(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::javax::naming::Name *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void addNamingListener(::java::lang::String *, jint, ::javax::naming::event::NamingListener *) = 0;
-  virtual void removeNamingListener(::javax::naming::event::NamingListener *) = 0;
-  virtual jboolean targetMustExist() = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_EventDirContext__
diff --git a/libjava/javax/naming/event/NamespaceChangeListener.h b/libjava/javax/naming/event/NamespaceChangeListener.h
deleted file mode 100644
index e34f1863241..00000000000
--- a/libjava/javax/naming/event/NamespaceChangeListener.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamespaceChangeListener__
-#define __javax_naming_event_NamespaceChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamespaceChangeListener;
-          class NamingEvent;
-          class NamingExceptionEvent;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamespaceChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void objectAdded(::javax::naming::event::NamingEvent *) = 0;
-  virtual void objectRemoved(::javax::naming::event::NamingEvent *) = 0;
-  virtual void objectRenamed(::javax::naming::event::NamingEvent *) = 0;
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_NamespaceChangeListener__
diff --git a/libjava/javax/naming/event/NamingEvent.h b/libjava/javax/naming/event/NamingEvent.h
deleted file mode 100644
index aad8b0e058d..00000000000
--- a/libjava/javax/naming/event/NamingEvent.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamingEvent__
-#define __javax_naming_event_NamingEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Binding;
-      namespace event
-      {
-          class EventContext;
-          class NamingEvent;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamingEvent : public ::java::util::EventObject
-{
-
-public:
-  NamingEvent(::javax::naming::event::EventContext *, jint, ::javax::naming::Binding *, ::javax::naming::Binding *, ::java::lang::Object *);
-  virtual jint getType();
-  virtual ::javax::naming::event::EventContext * getEventContext();
-  virtual ::javax::naming::Binding * getOldBinding();
-  virtual ::javax::naming::Binding * getNewBinding();
-  virtual ::java::lang::Object * getChangeInfo();
-  virtual void dispatch(::javax::naming::event::NamingListener *);
-private:
-  static const jlong serialVersionUID = -7126752885365133499LL;
-public:
-  static const jint OBJECT_ADDED = 0;
-  static const jint OBJECT_REMOVED = 1;
-  static const jint OBJECT_RENAMED = 2;
-  static const jint OBJECT_CHANGED = 3;
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) changeInfo;
-  jint type;
-  ::javax::naming::Binding * oldBinding;
-  ::javax::naming::Binding * newBinding;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_event_NamingEvent__
diff --git a/libjava/javax/naming/event/NamingExceptionEvent.h b/libjava/javax/naming/event/NamingExceptionEvent.h
deleted file mode 100644
index 9aee3c513ef..00000000000
--- a/libjava/javax/naming/event/NamingExceptionEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamingExceptionEvent__
-#define __javax_naming_event_NamingExceptionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingException;
-      namespace event
-      {
-          class EventContext;
-          class NamingExceptionEvent;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamingExceptionEvent : public ::java::util::EventObject
-{
-
-public:
-  NamingExceptionEvent(::javax::naming::event::EventContext *, ::javax::naming::NamingException *);
-  virtual ::javax::naming::NamingException * getException();
-  virtual ::javax::naming::event::EventContext * getEventContext();
-  virtual void dispatch(::javax::naming::event::NamingListener *);
-private:
-  static const jlong serialVersionUID = -4877678086134736336LL;
-  ::javax::naming::NamingException * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_event_NamingExceptionEvent__
diff --git a/libjava/javax/naming/event/NamingListener.h b/libjava/javax/naming/event/NamingListener.h
deleted file mode 100644
index d7eb0034359..00000000000
--- a/libjava/javax/naming/event/NamingListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_NamingListener__
-#define __javax_naming_event_NamingListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamingExceptionEvent;
-          class NamingListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::NamingListener : public ::java::lang::Object
-{
-
-public:
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_NamingListener__
diff --git a/libjava/javax/naming/event/ObjectChangeListener.h b/libjava/javax/naming/event/ObjectChangeListener.h
deleted file mode 100644
index eaff319dfa3..00000000000
--- a/libjava/javax/naming/event/ObjectChangeListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_event_ObjectChangeListener__
-#define __javax_naming_event_ObjectChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamingEvent;
-          class NamingExceptionEvent;
-          class ObjectChangeListener;
-      }
-    }
-  }
-}
-
-class javax::naming::event::ObjectChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void objectChanged(::javax::naming::event::NamingEvent *) = 0;
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_event_ObjectChangeListener__
diff --git a/libjava/javax/naming/ldap/Control.h b/libjava/javax/naming/ldap/Control.h
deleted file mode 100644
index 0a3f9f6a524..00000000000
--- a/libjava/javax/naming/ldap/Control.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_Control__
-#define __javax_naming_ldap_Control__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class Control;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::Control : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getID() = 0;
-  virtual jboolean isCritical() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  static const jboolean CRITICAL = 1;
-  static const jboolean NONCRITICAL = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_Control__
diff --git a/libjava/javax/naming/ldap/ControlFactory.h b/libjava/javax/naming/ldap/ControlFactory.h
deleted file mode 100644
index 404e22faa66..00000000000
--- a/libjava/javax/naming/ldap/ControlFactory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_ControlFactory__
-#define __javax_naming_ldap_ControlFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-      namespace ldap
-      {
-          class Control;
-          class ControlFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::ControlFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  ControlFactory();
-public:
-  virtual ::javax::naming::ldap::Control * getControlInstance(::javax::naming::ldap::Control *) = 0;
-  static ::javax::naming::ldap::Control * getControlInstance(::javax::naming::ldap::Control *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_ControlFactory__
diff --git a/libjava/javax/naming/ldap/ExtendedRequest.h b/libjava/javax/naming/ldap/ExtendedRequest.h
deleted file mode 100644
index f97e66b0483..00000000000
--- a/libjava/javax/naming/ldap/ExtendedRequest.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_ExtendedRequest__
-#define __javax_naming_ldap_ExtendedRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class ExtendedRequest;
-          class ExtendedResponse;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::ExtendedRequest : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getID() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  virtual ::javax::naming::ldap::ExtendedResponse * createExtendedResponse(::java::lang::String *, JArray< jbyte > *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_ExtendedRequest__
diff --git a/libjava/javax/naming/ldap/ExtendedResponse.h b/libjava/javax/naming/ldap/ExtendedResponse.h
deleted file mode 100644
index cb985fec90f..00000000000
--- a/libjava/javax/naming/ldap/ExtendedResponse.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_ExtendedResponse__
-#define __javax_naming_ldap_ExtendedResponse__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class ExtendedResponse;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::ExtendedResponse : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getID() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_ExtendedResponse__
diff --git a/libjava/javax/naming/ldap/HasControls.h b/libjava/javax/naming/ldap/HasControls.h
deleted file mode 100644
index 616b3b9a634..00000000000
--- a/libjava/javax/naming/ldap/HasControls.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_HasControls__
-#define __javax_naming_ldap_HasControls__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class Control;
-          class HasControls;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::HasControls : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::javax::naming::ldap::Control * > * getControls() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_HasControls__
diff --git a/libjava/javax/naming/ldap/InitialLdapContext.h b/libjava/javax/naming/ldap/InitialLdapContext.h
deleted file mode 100644
index b2511804cbc..00000000000
--- a/libjava/javax/naming/ldap/InitialLdapContext.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_InitialLdapContext__
-#define __javax_naming_ldap_InitialLdapContext__
-
-#pragma interface
-
-#include <javax/naming/directory/InitialDirContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class Control;
-          class ExtendedRequest;
-          class ExtendedResponse;
-          class InitialLdapContext;
-          class LdapContext;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::InitialLdapContext : public ::javax::naming::directory::InitialDirContext
-{
-
-public:
-  InitialLdapContext();
-  InitialLdapContext(::java::util::Hashtable *, JArray< ::javax::naming::ldap::Control * > *);
-private:
-  ::javax::naming::ldap::LdapContext * getDefaultInitLdapCtx();
-public:
-  virtual ::javax::naming::ldap::ExtendedResponse * extendedOperation(::javax::naming::ldap::ExtendedRequest *);
-  virtual JArray< ::javax::naming::ldap::Control * > * getConnectControls();
-  virtual JArray< ::javax::naming::ldap::Control * > * getRequestControls();
-  virtual JArray< ::javax::naming::ldap::Control * > * getResponseControls();
-  virtual ::javax::naming::ldap::LdapContext * newInstance(JArray< ::javax::naming::ldap::Control * > *);
-  virtual void reconnect(JArray< ::javax::naming::ldap::Control * > *);
-  virtual void setRequestControls(JArray< ::javax::naming::ldap::Control * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_InitialLdapContext__
diff --git a/libjava/javax/naming/ldap/LdapContext.h b/libjava/javax/naming/ldap/LdapContext.h
deleted file mode 100644
index 4fa910e72e6..00000000000
--- a/libjava/javax/naming/ldap/LdapContext.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_LdapContext__
-#define __javax_naming_ldap_LdapContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-        class NameParser;
-        class NamingEnumeration;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-          class ModificationItem;
-          class SearchControls;
-      }
-      namespace ldap
-      {
-          class Control;
-          class ExtendedRequest;
-          class ExtendedResponse;
-          class LdapContext;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::LdapContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::ldap::ExtendedResponse * extendedOperation(::javax::naming::ldap::ExtendedRequest *) = 0;
-  virtual ::javax::naming::ldap::LdapContext * newInstance(JArray< ::javax::naming::ldap::Control * > *) = 0;
-  virtual void reconnect(JArray< ::javax::naming::ldap::Control * > *) = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getConnectControls() = 0;
-  virtual void setRequestControls(JArray< ::javax::naming::ldap::Control * > *) = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getRequestControls() = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getResponseControls() = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::Attributes * getAttributes(::javax::naming::Name *, JArray< ::java::lang::String * > *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, jint, ::javax::naming::directory::Attributes *) = 0;
-  virtual void modifyAttributes(::javax::naming::Name *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void modifyAttributes(::java::lang::String *, JArray< ::javax::naming::directory::ModificationItem * > *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * createSubcontext(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchema(::java::lang::String *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::directory::DirContext * getSchemaClassDefinition(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::javax::naming::Name *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual ::javax::naming::NamingEnumeration * search(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *, ::javax::naming::directory::SearchControls *) = 0;
-  virtual void bind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void bind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * lookup(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookup(::java::lang::String *) = 0;
-  virtual void rebind(::javax::naming::Name *, ::java::lang::Object *) = 0;
-  virtual void rebind(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void unbind(::javax::naming::Name *) = 0;
-  virtual void unbind(::java::lang::String *) = 0;
-  virtual void rename(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual void rename(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * list(::java::lang::String *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NamingEnumeration * listBindings(::java::lang::String *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::Context * createSubcontext(::java::lang::String *) = 0;
-  virtual void destroySubcontext(::javax::naming::Name *) = 0;
-  virtual void destroySubcontext(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * lookupLink(::javax::naming::Name *) = 0;
-  virtual ::java::lang::Object * lookupLink(::java::lang::String *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::javax::naming::Name *) = 0;
-  virtual ::javax::naming::NameParser * getNameParser(::java::lang::String *) = 0;
-  virtual ::javax::naming::Name * composeName(::javax::naming::Name *, ::javax::naming::Name *) = 0;
-  virtual ::java::lang::String * composeName(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * addToEnvironment(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * removeFromEnvironment(::java::lang::String *) = 0;
-  virtual ::java::util::Hashtable * getEnvironment() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNameInNamespace() = 0;
-  static ::java::lang::String * CONTROL_FACTORIES;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_LdapContext__
diff --git a/libjava/javax/naming/ldap/LdapReferralException.h b/libjava/javax/naming/ldap/LdapReferralException.h
deleted file mode 100644
index 6ed5618e9c0..00000000000
--- a/libjava/javax/naming/ldap/LdapReferralException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_LdapReferralException__
-#define __javax_naming_ldap_LdapReferralException__
-
-#pragma interface
-
-#include <javax/naming/ReferralException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-      namespace ldap
-      {
-          class Control;
-          class LdapReferralException;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::LdapReferralException : public ::javax::naming::ReferralException
-{
-
-public: // actually protected
-  LdapReferralException();
-  LdapReferralException(::java::lang::String *);
-public:
-  virtual ::javax::naming::Context * getReferralContext() = 0;
-  virtual ::javax::naming::Context * getReferralContext(::java::util::Hashtable *) = 0;
-  virtual ::javax::naming::Context * getReferralContext(::java::util::Hashtable *, JArray< ::javax::naming::ldap::Control * > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_LdapReferralException__
diff --git a/libjava/javax/naming/ldap/StartTlsRequest.h b/libjava/javax/naming/ldap/StartTlsRequest.h
deleted file mode 100644
index 70ced7e5773..00000000000
--- a/libjava/javax/naming/ldap/StartTlsRequest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_StartTlsRequest__
-#define __javax_naming_ldap_StartTlsRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class ExtendedResponse;
-          class StartTlsRequest;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::StartTlsRequest : public ::java::lang::Object
-{
-
-public:
-  StartTlsRequest();
-  virtual ::java::lang::String * getID();
-  virtual JArray< jbyte > * getEncodedValue();
-  virtual ::javax::naming::ldap::ExtendedResponse * createExtendedResponse(::java::lang::String *, JArray< jbyte > *, jint, jint);
-private:
-  static const jlong serialVersionUID = 4441679576360753397LL;
-public:
-  static ::java::lang::String * OID;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_StartTlsRequest__
diff --git a/libjava/javax/naming/ldap/StartTlsResponse.h b/libjava/javax/naming/ldap/StartTlsResponse.h
deleted file mode 100644
index 9b3d8c59cf6..00000000000
--- a/libjava/javax/naming/ldap/StartTlsResponse.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_StartTlsResponse__
-#define __javax_naming_ldap_StartTlsResponse__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class StartTlsResponse;
-      }
-    }
-    namespace net
-    {
-      namespace ssl
-      {
-          class HostnameVerifier;
-          class SSLSession;
-          class SSLSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::StartTlsResponse : public ::java::lang::Object
-{
-
-public: // actually protected
-  StartTlsResponse();
-public:
-  virtual ::java::lang::String * getID();
-  virtual JArray< jbyte > * getEncodedValue();
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *) = 0;
-  virtual void setHostnameVerifier(::javax::net::ssl::HostnameVerifier *) = 0;
-  virtual ::javax::net::ssl::SSLSession * negotiate() = 0;
-  virtual ::javax::net::ssl::SSLSession * negotiate(::javax::net::ssl::SSLSocketFactory *) = 0;
-  virtual void close() = 0;
-private:
-  static const jlong serialVersionUID = 8372842182579276418LL;
-public:
-  static ::java::lang::String * OID;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_StartTlsResponse__
diff --git a/libjava/javax/naming/ldap/UnsolicitedNotification.h b/libjava/javax/naming/ldap/UnsolicitedNotification.h
deleted file mode 100644
index c23d4b0f2f6..00000000000
--- a/libjava/javax/naming/ldap/UnsolicitedNotification.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_UnsolicitedNotification__
-#define __javax_naming_ldap_UnsolicitedNotification__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class NamingException;
-      namespace ldap
-      {
-          class Control;
-          class UnsolicitedNotification;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::UnsolicitedNotification : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::String * > * getReferrals() = 0;
-  virtual ::javax::naming::NamingException * getException() = 0;
-  virtual ::java::lang::String * getID() = 0;
-  virtual JArray< jbyte > * getEncodedValue() = 0;
-  virtual JArray< ::javax::naming::ldap::Control * > * getControls() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_UnsolicitedNotification__
diff --git a/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.h b/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.h
deleted file mode 100644
index b6e4a4f5648..00000000000
--- a/libjava/javax/naming/ldap/UnsolicitedNotificationEvent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_UnsolicitedNotificationEvent__
-#define __javax_naming_ldap_UnsolicitedNotificationEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace ldap
-      {
-          class UnsolicitedNotification;
-          class UnsolicitedNotificationEvent;
-          class UnsolicitedNotificationListener;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::UnsolicitedNotificationEvent : public ::java::util::EventObject
-{
-
-public:
-  UnsolicitedNotificationEvent(::java::lang::Object *, ::javax::naming::ldap::UnsolicitedNotification *);
-  virtual ::javax::naming::ldap::UnsolicitedNotification * getNotification();
-  virtual void dispatch(::javax::naming::ldap::UnsolicitedNotificationListener *);
-private:
-  static const jlong serialVersionUID = -2382603380799883705LL;
-  ::javax::naming::ldap::UnsolicitedNotification * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) notice;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_ldap_UnsolicitedNotificationEvent__
diff --git a/libjava/javax/naming/ldap/UnsolicitedNotificationListener.h b/libjava/javax/naming/ldap/UnsolicitedNotificationListener.h
deleted file mode 100644
index d389381ac36..00000000000
--- a/libjava/javax/naming/ldap/UnsolicitedNotificationListener.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_ldap_UnsolicitedNotificationListener__
-#define __javax_naming_ldap_UnsolicitedNotificationListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace event
-      {
-          class NamingExceptionEvent;
-      }
-      namespace ldap
-      {
-          class UnsolicitedNotificationEvent;
-          class UnsolicitedNotificationListener;
-      }
-    }
-  }
-}
-
-class javax::naming::ldap::UnsolicitedNotificationListener : public ::java::lang::Object
-{
-
-public:
-  virtual void notificationReceived(::javax::naming::ldap::UnsolicitedNotificationEvent *) = 0;
-  virtual void namingExceptionThrown(::javax::naming::event::NamingExceptionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_ldap_UnsolicitedNotificationListener__
diff --git a/libjava/javax/naming/spi/DirObjectFactory.h b/libjava/javax/naming/spi/DirObjectFactory.h
deleted file mode 100644
index d84d3181c96..00000000000
--- a/libjava/javax/naming/spi/DirObjectFactory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirObjectFactory__
-#define __javax_naming_spi_DirObjectFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace directory
-      {
-          class Attributes;
-      }
-      namespace spi
-      {
-          class DirObjectFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirObjectFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_DirObjectFactory__
diff --git a/libjava/javax/naming/spi/DirStateFactory$Result.h b/libjava/javax/naming/spi/DirStateFactory$Result.h
deleted file mode 100644
index 586c7d3bc67..00000000000
--- a/libjava/javax/naming/spi/DirStateFactory$Result.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirStateFactory$Result__
-#define __javax_naming_spi_DirStateFactory$Result__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace directory
-      {
-          class Attributes;
-      }
-      namespace spi
-      {
-          class DirStateFactory$Result;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirStateFactory$Result : public ::java::lang::Object
-{
-
-public:
-  DirStateFactory$Result(::java::lang::Object *, ::javax::naming::directory::Attributes *);
-  virtual ::java::lang::Object * getObject();
-  virtual ::javax::naming::directory::Attributes * getAttributes();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) obj;
-  ::javax::naming::directory::Attributes * outAttrs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_DirStateFactory$Result__
diff --git a/libjava/javax/naming/spi/DirStateFactory.h b/libjava/javax/naming/spi/DirStateFactory.h
deleted file mode 100644
index 02b2b5a84bc..00000000000
--- a/libjava/javax/naming/spi/DirStateFactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirStateFactory__
-#define __javax_naming_spi_DirStateFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace directory
-      {
-          class Attributes;
-      }
-      namespace spi
-      {
-          class DirStateFactory;
-          class DirStateFactory$Result;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirStateFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::DirStateFactory$Result * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *) = 0;
-  virtual ::java::lang::Object * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_DirStateFactory__
diff --git a/libjava/javax/naming/spi/DirectoryManager.h b/libjava/javax/naming/spi/DirectoryManager.h
deleted file mode 100644
index 32d015c1da2..00000000000
--- a/libjava/javax/naming/spi/DirectoryManager.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_DirectoryManager__
-#define __javax_naming_spi_DirectoryManager__
-
-#pragma interface
-
-#include <javax/naming/spi/NamingManager.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CannotProceedException;
-        class Context;
-        class Name;
-      namespace directory
-      {
-          class Attributes;
-          class DirContext;
-      }
-      namespace spi
-      {
-          class DirStateFactory$Result;
-          class DirectoryManager;
-          class ObjectFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::DirectoryManager : public ::javax::naming::spi::NamingManager
-{
-
-public: // actually package-private
-  DirectoryManager();
-public:
-  static ::javax::naming::directory::DirContext * getContinuationDirContext(::javax::naming::CannotProceedException *);
-private:
-  static ::java::lang::Object * tryCreateObject(::javax::naming::spi::ObjectFactory *, ::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *);
-public:
-  static ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *);
-  static ::javax::naming::spi::DirStateFactory$Result * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *, ::javax::naming::directory::Attributes *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_DirectoryManager__
diff --git a/libjava/javax/naming/spi/InitialContextFactory.h b/libjava/javax/naming/spi/InitialContextFactory.h
deleted file mode 100644
index 446876cf2ee..00000000000
--- a/libjava/javax/naming/spi/InitialContextFactory.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_InitialContextFactory__
-#define __javax_naming_spi_InitialContextFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-      namespace spi
-      {
-          class InitialContextFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::InitialContextFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::Context * getInitialContext(::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_InitialContextFactory__
diff --git a/libjava/javax/naming/spi/InitialContextFactoryBuilder.h b/libjava/javax/naming/spi/InitialContextFactoryBuilder.h
deleted file mode 100644
index bdd016036e9..00000000000
--- a/libjava/javax/naming/spi/InitialContextFactoryBuilder.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_InitialContextFactoryBuilder__
-#define __javax_naming_spi_InitialContextFactoryBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace spi
-      {
-          class InitialContextFactory;
-          class InitialContextFactoryBuilder;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::InitialContextFactoryBuilder : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::InitialContextFactory * createInitialContextFactory(::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_InitialContextFactoryBuilder__
diff --git a/libjava/javax/naming/spi/NamingManager.h b/libjava/javax/naming/spi/NamingManager.h
deleted file mode 100644
index 6a24048edde..00000000000
--- a/libjava/javax/naming/spi/NamingManager.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_NamingManager__
-#define __javax_naming_spi_NamingManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class CannotProceedException;
-        class Context;
-        class Name;
-      namespace spi
-      {
-          class InitialContextFactoryBuilder;
-          class NamingManager;
-          class ObjectFactoryBuilder;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::NamingManager : public ::java::lang::Object
-{
-
-public: // actually package-private
-  NamingManager();
-public:
-  static jboolean hasInitialContextFactoryBuilder();
-  static ::javax::naming::Context * getInitialContext(::java::util::Hashtable *);
-public: // actually package-private
-  static ::javax::naming::Context * getURLContext(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::lang::String *, ::java::util::Hashtable *);
-  static ::java::lang::Class * forName(::java::lang::String *);
-public:
-  static ::javax::naming::Context * getURLContext(::java::lang::String *, ::java::util::Hashtable *);
-  static void setObjectFactoryBuilder(::javax::naming::spi::ObjectFactoryBuilder *);
-public: // actually package-private
-  static ::java::util::StringTokenizer * getPlusPath(::java::lang::String *, ::java::util::Hashtable *, ::javax::naming::Context *);
-public:
-  static ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  static void setInitialContextFactoryBuilder(::javax::naming::spi::InitialContextFactoryBuilder *);
-  static ::javax::naming::Context * getContinuationContext(::javax::naming::CannotProceedException *);
-  static ::java::lang::Object * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *);
-  static ::java::lang::String * CPE;
-private:
-  static ::javax::naming::spi::InitialContextFactoryBuilder * icfb;
-public: // actually package-private
-  static ::javax::naming::spi::ObjectFactoryBuilder * ofb;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_NamingManager__
diff --git a/libjava/javax/naming/spi/ObjectFactory.h b/libjava/javax/naming/spi/ObjectFactory.h
deleted file mode 100644
index 62d563969af..00000000000
--- a/libjava/javax/naming/spi/ObjectFactory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_ObjectFactory__
-#define __javax_naming_spi_ObjectFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace spi
-      {
-          class ObjectFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::ObjectFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getObjectInstance(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_ObjectFactory__
diff --git a/libjava/javax/naming/spi/ObjectFactoryBuilder.h b/libjava/javax/naming/spi/ObjectFactoryBuilder.h
deleted file mode 100644
index eb457e4fb8f..00000000000
--- a/libjava/javax/naming/spi/ObjectFactoryBuilder.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_ObjectFactoryBuilder__
-#define __javax_naming_spi_ObjectFactoryBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-      namespace spi
-      {
-          class ObjectFactory;
-          class ObjectFactoryBuilder;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::ObjectFactoryBuilder : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::ObjectFactory * createObjectFactory(::java::lang::Object *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_ObjectFactoryBuilder__
diff --git a/libjava/javax/naming/spi/ResolveResult.h b/libjava/javax/naming/spi/ResolveResult.h
deleted file mode 100644
index 72f118748c8..00000000000
--- a/libjava/javax/naming/spi/ResolveResult.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_ResolveResult__
-#define __javax_naming_spi_ResolveResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-      namespace spi
-      {
-          class ResolveResult;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::ResolveResult : public ::java::lang::Object
-{
-
-public: // actually protected
-  ResolveResult();
-public:
-  ResolveResult(::java::lang::Object *, ::java::lang::String *);
-  ResolveResult(::java::lang::Object *, ::javax::naming::Name *);
-  virtual ::javax::naming::Name * getRemainingName();
-  virtual ::java::lang::Object * getResolvedObj();
-  virtual void setRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingName(::javax::naming::Name *);
-  virtual void appendRemainingComponent(::java::lang::String *);
-  virtual void setResolvedObj(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -4552108072002407559LL;
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) resolvedObj;
-  ::javax::naming::Name * remainingName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_naming_spi_ResolveResult__
diff --git a/libjava/javax/naming/spi/Resolver.h b/libjava/javax/naming/spi/Resolver.h
deleted file mode 100644
index bc7956d712a..00000000000
--- a/libjava/javax/naming/spi/Resolver.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_Resolver__
-#define __javax_naming_spi_Resolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Name;
-      namespace spi
-      {
-          class ResolveResult;
-          class Resolver;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::Resolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::naming::spi::ResolveResult * resolveToClass(::javax::naming::Name *, ::java::lang::Class *) = 0;
-  virtual ::javax::naming::spi::ResolveResult * resolveToClass(::java::lang::String *, ::java::lang::Class *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_Resolver__
diff --git a/libjava/javax/naming/spi/StateFactory.h b/libjava/javax/naming/spi/StateFactory.h
deleted file mode 100644
index 2039a27e2de..00000000000
--- a/libjava/javax/naming/spi/StateFactory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_naming_spi_StateFactory__
-#define __javax_naming_spi_StateFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace naming
-    {
-        class Context;
-        class Name;
-      namespace spi
-      {
-          class StateFactory;
-      }
-    }
-  }
-}
-
-class javax::naming::spi::StateFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getStateToBind(::java::lang::Object *, ::javax::naming::Name *, ::javax::naming::Context *, ::java::util::Hashtable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_naming_spi_StateFactory__
diff --git a/libjava/javax/net/ServerSocketFactory.h b/libjava/javax/net/ServerSocketFactory.h
deleted file mode 100644
index 51a57097aad..00000000000
--- a/libjava/javax/net/ServerSocketFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ServerSocketFactory__
-#define __javax_net_ServerSocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class ServerSocket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-        class ServerSocketFactory;
-    }
-  }
-}
-
-class javax::net::ServerSocketFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  ServerSocketFactory();
-public:
-  static ::javax::net::ServerSocketFactory * getDefault();
-  virtual ::java::net::ServerSocket * createServerSocket();
-  virtual ::java::net::ServerSocket * createServerSocket(jint) = 0;
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint) = 0;
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint, ::java::net::InetAddress *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ServerSocketFactory__
diff --git a/libjava/javax/net/SocketFactory.h b/libjava/javax/net/SocketFactory.h
deleted file mode 100644
index 2e7821c2d09..00000000000
--- a/libjava/javax/net/SocketFactory.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_SocketFactory__
-#define __javax_net_SocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-        class SocketFactory;
-    }
-  }
-}
-
-class javax::net::SocketFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  SocketFactory();
-public:
-  static ::javax::net::SocketFactory * getDefault();
-  virtual ::java::net::Socket * createSocket();
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint) = 0;
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint) = 0;
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint) = 0;
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_SocketFactory__
diff --git a/libjava/javax/net/VanillaServerSocketFactory.h b/libjava/javax/net/VanillaServerSocketFactory.h
deleted file mode 100644
index 1c6f7dc4841..00000000000
--- a/libjava/javax/net/VanillaServerSocketFactory.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_VanillaServerSocketFactory__
-#define __javax_net_VanillaServerSocketFactory__
-
-#pragma interface
-
-#include <javax/net/ServerSocketFactory.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class ServerSocket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-        class VanillaServerSocketFactory;
-    }
-  }
-}
-
-class javax::net::VanillaServerSocketFactory : public ::javax::net::ServerSocketFactory
-{
-
-public: // actually package-private
-  VanillaServerSocketFactory();
-public:
-  virtual ::java::net::ServerSocket * createServerSocket();
-  virtual ::java::net::ServerSocket * createServerSocket(jint);
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint);
-  virtual ::java::net::ServerSocket * createServerSocket(jint, jint, ::java::net::InetAddress *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_VanillaServerSocketFactory__
diff --git a/libjava/javax/net/VanillaSocketFactory.h b/libjava/javax/net/VanillaSocketFactory.h
deleted file mode 100644
index cca82bd7cfe..00000000000
--- a/libjava/javax/net/VanillaSocketFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_VanillaSocketFactory__
-#define __javax_net_VanillaSocketFactory__
-
-#pragma interface
-
-#include <javax/net/SocketFactory.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-        class VanillaSocketFactory;
-    }
-  }
-}
-
-class javax::net::VanillaSocketFactory : public ::javax::net::SocketFactory
-{
-
-public: // actually package-private
-  VanillaSocketFactory();
-public:
-  virtual ::java::net::Socket * createSocket();
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint);
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint);
-  virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_VanillaSocketFactory__
diff --git a/libjava/javax/net/ssl/CertPathTrustManagerParameters.h b/libjava/javax/net/ssl/CertPathTrustManagerParameters.h
deleted file mode 100644
index 7f7cd67a0b2..00000000000
--- a/libjava/javax/net/ssl/CertPathTrustManagerParameters.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_CertPathTrustManagerParameters__
-#define __javax_net_ssl_CertPathTrustManagerParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertPathParameters;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class CertPathTrustManagerParameters;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::CertPathTrustManagerParameters : public ::java::lang::Object
-{
-
-public:
-  CertPathTrustManagerParameters(::java::security::cert::CertPathParameters *);
-  virtual ::java::security::cert::CertPathParameters * getParameters();
-private:
-  ::java::security::cert::CertPathParameters * __attribute__((aligned(__alignof__( ::java::lang::Object)))) params;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_CertPathTrustManagerParameters__
diff --git a/libjava/javax/net/ssl/HandshakeCompletedEvent.h b/libjava/javax/net/ssl/HandshakeCompletedEvent.h
deleted file mode 100644
index a9c15479aa1..00000000000
--- a/libjava/javax/net/ssl/HandshakeCompletedEvent.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_HandshakeCompletedEvent__
-#define __javax_net_ssl_HandshakeCompletedEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HandshakeCompletedEvent;
-          class SSLSession;
-          class SSLSocket;
-      }
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::HandshakeCompletedEvent : public ::java::util::EventObject
-{
-
-public:
-  HandshakeCompletedEvent(::javax::net::ssl::SSLSocket *, ::javax::net::ssl::SSLSession *);
-  virtual ::java::lang::String * getCipherSuite();
-  virtual JArray< ::java::security::cert::Certificate * > * getLocalCertificates();
-  virtual ::java::security::Principal * getLocalPrincipal();
-  virtual JArray< ::java::security::cert::Certificate * > * getPeerCertificates();
-  virtual JArray< ::javax::security::cert::X509Certificate * > * getPeerCertificateChain();
-  virtual ::java::security::Principal * getPeerPrincipal();
-  virtual ::javax::net::ssl::SSLSession * getSession();
-  virtual ::javax::net::ssl::SSLSocket * getSocket();
-private:
-  static const jlong serialVersionUID = 7914963744257769778LL;
-  ::javax::net::ssl::SSLSession * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) session;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_HandshakeCompletedEvent__
diff --git a/libjava/javax/net/ssl/HandshakeCompletedListener.h b/libjava/javax/net/ssl/HandshakeCompletedListener.h
deleted file mode 100644
index 7a797bd4eb0..00000000000
--- a/libjava/javax/net/ssl/HandshakeCompletedListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_HandshakeCompletedListener__
-#define __javax_net_ssl_HandshakeCompletedListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HandshakeCompletedEvent;
-          class HandshakeCompletedListener;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::HandshakeCompletedListener : public ::java::lang::Object
-{
-
-public:
-  virtual void handshakeCompleted(::javax::net::ssl::HandshakeCompletedEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_HandshakeCompletedListener__
diff --git a/libjava/javax/net/ssl/HostnameVerifier.h b/libjava/javax/net/ssl/HostnameVerifier.h
deleted file mode 100644
index 34a6ff01c0b..00000000000
--- a/libjava/javax/net/ssl/HostnameVerifier.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_HostnameVerifier__
-#define __javax_net_ssl_HostnameVerifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HostnameVerifier;
-          class SSLSession;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::HostnameVerifier : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean verify(::java::lang::String *, ::javax::net::ssl::SSLSession *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_HostnameVerifier__
diff --git a/libjava/javax/net/ssl/HttpsURLConnection.h b/libjava/javax/net/ssl/HttpsURLConnection.h
deleted file mode 100644
index 3f016541938..00000000000
--- a/libjava/javax/net/ssl/HttpsURLConnection.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_HttpsURLConnection__
-#define __javax_net_ssl_HttpsURLConnection__
-
-#pragma interface
-
-#include <java/net/HttpURLConnection.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-    namespace security
-    {
-        class Principal;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HostnameVerifier;
-          class HttpsURLConnection;
-          class SSLSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::HttpsURLConnection : public ::java::net::HttpURLConnection
-{
-
-public: // actually protected
-  HttpsURLConnection(::java::net::URL *);
-public:
-  static ::javax::net::ssl::HostnameVerifier * getDefaultHostnameVerifier();
-  static void setDefaultHostnameVerifier(::javax::net::ssl::HostnameVerifier *);
-  static ::javax::net::ssl::SSLSocketFactory * getDefaultSSLSocketFactory();
-  static void setDefaultSSLSocketFactory(::javax::net::ssl::SSLSocketFactory *);
-  virtual ::javax::net::ssl::HostnameVerifier * getHostnameVerifier();
-  virtual void setHostnameVerifier(::javax::net::ssl::HostnameVerifier *);
-  virtual ::javax::net::ssl::SSLSocketFactory * getSSLSocketFactory();
-  virtual void setSSLSocketFactory(::javax::net::ssl::SSLSocketFactory *);
-  virtual ::java::security::Principal * getLocalPrincipal();
-  virtual ::java::security::Principal * getPeerPrincipal();
-  virtual ::java::lang::String * getCipherSuite() = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * getLocalCertificates() = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * getServerCertificates() = 0;
-private:
-  static ::javax::net::ssl::HostnameVerifier * defaultVerifier;
-  static ::javax::net::ssl::SSLSocketFactory * defaultFactory;
-public: // actually protected
-  ::javax::net::ssl::HostnameVerifier * __attribute__((aligned(__alignof__( ::java::net::HttpURLConnection)))) hostnameVerifier;
-private:
-  ::javax::net::ssl::SSLSocketFactory * factory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_HttpsURLConnection__
diff --git a/libjava/javax/net/ssl/KeyManager.h b/libjava/javax/net/ssl/KeyManager.h
deleted file mode 100644
index 80b3c76006c..00000000000
--- a/libjava/javax/net/ssl/KeyManager.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_KeyManager__
-#define __javax_net_ssl_KeyManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::KeyManager : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_KeyManager__
diff --git a/libjava/javax/net/ssl/KeyManagerFactory$1.h b/libjava/javax/net/ssl/KeyManagerFactory$1.h
deleted file mode 100644
index 7aff8e92c41..00000000000
--- a/libjava/javax/net/ssl/KeyManagerFactory$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_KeyManagerFactory$1__
-#define __javax_net_ssl_KeyManagerFactory$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManagerFactory$1;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::KeyManagerFactory$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  KeyManagerFactory$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_KeyManagerFactory$1__
diff --git a/libjava/javax/net/ssl/KeyManagerFactory.h b/libjava/javax/net/ssl/KeyManagerFactory.h
deleted file mode 100644
index 72685063158..00000000000
--- a/libjava/javax/net/ssl/KeyManagerFactory.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_KeyManagerFactory__
-#define __javax_net_ssl_KeyManagerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-        class Provider;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class KeyManagerFactory;
-          class KeyManagerFactorySpi;
-          class ManagerFactoryParameters;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::KeyManagerFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  KeyManagerFactory(::javax::net::ssl::KeyManagerFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::java::lang::String * getDefaultAlgorithm();
-  static ::javax::net::ssl::KeyManagerFactory * getInstance(::java::lang::String *);
-  static ::javax::net::ssl::KeyManagerFactory * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::net::ssl::KeyManagerFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual JArray< ::javax::net::ssl::KeyManager * > * getKeyManagers();
-  virtual ::java::security::Provider * getProvider();
-  virtual void init(::javax::net::ssl::ManagerFactoryParameters *);
-  virtual void init(::java::security::KeyStore *, JArray< jchar > *);
-private:
-  static ::java::lang::String * KEY_MANAGER_FACTORY;
-  static ::java::lang::String * DEFAULT_ALGORITHM;
-  ::javax::net::ssl::KeyManagerFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kmfSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_KeyManagerFactory__
diff --git a/libjava/javax/net/ssl/KeyManagerFactorySpi.h b/libjava/javax/net/ssl/KeyManagerFactorySpi.h
deleted file mode 100644
index 4b82525697a..00000000000
--- a/libjava/javax/net/ssl/KeyManagerFactorySpi.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_KeyManagerFactorySpi__
-#define __javax_net_ssl_KeyManagerFactorySpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class KeyManagerFactorySpi;
-          class ManagerFactoryParameters;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::KeyManagerFactorySpi : public ::java::lang::Object
-{
-
-public:
-  KeyManagerFactorySpi();
-public: // actually protected
-  virtual JArray< ::javax::net::ssl::KeyManager * > * engineGetKeyManagers() = 0;
-  virtual void engineInit(::javax::net::ssl::ManagerFactoryParameters *) = 0;
-  virtual void engineInit(::java::security::KeyStore *, JArray< jchar > *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_KeyManagerFactorySpi__
diff --git a/libjava/javax/net/ssl/KeyStoreBuilderParameters.h b/libjava/javax/net/ssl/KeyStoreBuilderParameters.h
deleted file mode 100644
index da1ada28635..00000000000
--- a/libjava/javax/net/ssl/KeyStoreBuilderParameters.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_KeyStoreBuilderParameters__
-#define __javax_net_ssl_KeyStoreBuilderParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyStoreBuilderParameters;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::KeyStoreBuilderParameters : public ::java::lang::Object
-{
-
-public:
-  KeyStoreBuilderParameters();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_KeyStoreBuilderParameters__
diff --git a/libjava/javax/net/ssl/ManagerFactoryParameters.h b/libjava/javax/net/ssl/ManagerFactoryParameters.h
deleted file mode 100644
index e78e6e5d46a..00000000000
--- a/libjava/javax/net/ssl/ManagerFactoryParameters.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_ManagerFactoryParameters__
-#define __javax_net_ssl_ManagerFactoryParameters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class ManagerFactoryParameters;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::ManagerFactoryParameters : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_ManagerFactoryParameters__
diff --git a/libjava/javax/net/ssl/SSLContext.h b/libjava/javax/net/ssl/SSLContext.h
deleted file mode 100644
index 43be1bc99e2..00000000000
--- a/libjava/javax/net/ssl/SSLContext.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLContext__
-#define __javax_net_ssl_SSLContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-        class SecureRandom;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class SSLContext;
-          class SSLContextSpi;
-          class SSLEngine;
-          class SSLServerSocketFactory;
-          class SSLSessionContext;
-          class SSLSocketFactory;
-          class TrustManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLContext : public ::java::lang::Object
-{
-
-public: // actually protected
-  SSLContext(::javax::net::ssl::SSLContextSpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::net::ssl::SSLContext * getInstance(::java::lang::String *);
-  static ::javax::net::ssl::SSLContext * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::net::ssl::SSLContext * getInstance(::java::lang::String *, ::java::security::Provider *);
-  virtual ::javax::net::ssl::SSLEngine * createSSLEngine();
-  virtual ::javax::net::ssl::SSLEngine * createSSLEngine(::java::lang::String *, jint);
-  virtual ::javax::net::ssl::SSLSessionContext * getClientSessionContext();
-  virtual ::java::lang::String * getProtocol();
-  virtual ::java::security::Provider * getProvider();
-  virtual ::javax::net::ssl::SSLSessionContext * getServerSessionContext();
-  virtual ::javax::net::ssl::SSLServerSocketFactory * getServerSocketFactory();
-  virtual ::javax::net::ssl::SSLSocketFactory * getSocketFactory();
-  virtual void init(JArray< ::javax::net::ssl::KeyManager * > *, JArray< ::javax::net::ssl::TrustManager * > *, ::java::security::SecureRandom *);
-private:
-  static ::java::lang::String * SSL_CONTEXT;
-  ::javax::net::ssl::SSLContextSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ctxSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * protocol;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLContext__
diff --git a/libjava/javax/net/ssl/SSLContextSpi.h b/libjava/javax/net/ssl/SSLContextSpi.h
deleted file mode 100644
index 618b0157b46..00000000000
--- a/libjava/javax/net/ssl/SSLContextSpi.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLContextSpi__
-#define __javax_net_ssl_SSLContextSpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class SecureRandom;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class KeyManager;
-          class SSLContextSpi;
-          class SSLEngine;
-          class SSLServerSocketFactory;
-          class SSLSessionContext;
-          class SSLSocketFactory;
-          class TrustManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLContextSpi : public ::java::lang::Object
-{
-
-public:
-  SSLContextSpi();
-public: // actually protected
-  virtual ::javax::net::ssl::SSLEngine * engineCreateSSLEngine() = 0;
-  virtual ::javax::net::ssl::SSLEngine * engineCreateSSLEngine(::java::lang::String *, jint) = 0;
-  virtual ::javax::net::ssl::SSLSessionContext * engineGetClientSessionContext() = 0;
-  virtual ::javax::net::ssl::SSLSessionContext * engineGetServerSessionContext() = 0;
-  virtual ::javax::net::ssl::SSLServerSocketFactory * engineGetServerSocketFactory() = 0;
-  virtual ::javax::net::ssl::SSLSocketFactory * engineGetSocketFactory() = 0;
-  virtual void engineInit(JArray< ::javax::net::ssl::KeyManager * > *, JArray< ::javax::net::ssl::TrustManager * > *, ::java::security::SecureRandom *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLContextSpi__
diff --git a/libjava/javax/net/ssl/SSLEngine.h b/libjava/javax/net/ssl/SSLEngine.h
deleted file mode 100644
index 7bbe1b9c5a9..00000000000
--- a/libjava/javax/net/ssl/SSLEngine.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLEngine__
-#define __javax_net_ssl_SSLEngine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngine;
-          class SSLEngineResult;
-          class SSLEngineResult$HandshakeStatus;
-          class SSLSession;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLEngine : public ::java::lang::Object
-{
-
-public: // actually protected
-  SSLEngine();
-  SSLEngine(::java::lang::String *, jint);
-public:
-  virtual void beginHandshake() = 0;
-  virtual void closeInbound() = 0;
-  virtual void closeOutbound() = 0;
-  virtual ::java::lang::Runnable * getDelegatedTask() = 0;
-  virtual ::java::lang::String * getPeerHost();
-  virtual jint getPeerPort();
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols() = 0;
-  virtual jboolean getEnableSessionCreation() = 0;
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * getHandshakeStatus() = 0;
-  virtual jboolean getNeedClientAuth() = 0;
-  virtual ::javax::net::ssl::SSLSession * getSession() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedProtocols() = 0;
-  virtual jboolean getUseClientMode() = 0;
-  virtual jboolean getWantClientAuth() = 0;
-  virtual jboolean isInboundDone() = 0;
-  virtual jboolean isOutboundDone() = 0;
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *) = 0;
-  virtual void setEnabledProtocols(JArray< ::java::lang::String * > *) = 0;
-  virtual void setEnableSessionCreation(jboolean) = 0;
-  virtual void setUseClientMode(jboolean) = 0;
-  virtual void setNeedClientAuth(jboolean) = 0;
-  virtual void setWantClientAuth(jboolean) = 0;
-  virtual ::javax::net::ssl::SSLEngineResult * unwrap(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual ::javax::net::ssl::SSLEngineResult * unwrap(::java::nio::ByteBuffer *, JArray< ::java::nio::ByteBuffer * > *);
-  virtual ::javax::net::ssl::SSLEngineResult * unwrap(::java::nio::ByteBuffer *, JArray< ::java::nio::ByteBuffer * > *, jint, jint) = 0;
-  virtual ::javax::net::ssl::SSLEngineResult * wrap(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
-  virtual ::javax::net::ssl::SSLEngineResult * wrap(JArray< ::java::nio::ByteBuffer * > *, ::java::nio::ByteBuffer *);
-  virtual ::javax::net::ssl::SSLEngineResult * wrap(JArray< ::java::nio::ByteBuffer * > *, jint, jint, ::java::nio::ByteBuffer *) = 0;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) peerHost;
-  jint peerPort;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLEngine__
diff --git a/libjava/javax/net/ssl/SSLEngineResult$HandshakeStatus.h b/libjava/javax/net/ssl/SSLEngineResult$HandshakeStatus.h
deleted file mode 100644
index 8fa544db565..00000000000
--- a/libjava/javax/net/ssl/SSLEngineResult$HandshakeStatus.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLEngineResult$HandshakeStatus__
-#define __javax_net_ssl_SSLEngineResult$HandshakeStatus__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngineResult$HandshakeStatus;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLEngineResult$HandshakeStatus : public ::java::lang::Enum
-{
-
-  SSLEngineResult$HandshakeStatus(::java::lang::String *, jint);
-public:
-  static JArray< ::javax::net::ssl::SSLEngineResult$HandshakeStatus * > * values();
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * valueOf(::java::lang::String *);
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * NOT_HANDSHAKING;
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * FINISHED;
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * NEED_TASK;
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * NEED_WRAP;
-  static ::javax::net::ssl::SSLEngineResult$HandshakeStatus * NEED_UNWRAP;
-private:
-  static JArray< ::javax::net::ssl::SSLEngineResult$HandshakeStatus * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLEngineResult$HandshakeStatus__
diff --git a/libjava/javax/net/ssl/SSLEngineResult$Status.h b/libjava/javax/net/ssl/SSLEngineResult$Status.h
deleted file mode 100644
index 925e3d5e8d7..00000000000
--- a/libjava/javax/net/ssl/SSLEngineResult$Status.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLEngineResult$Status__
-#define __javax_net_ssl_SSLEngineResult$Status__
-
-#pragma interface
-
-#include <java/lang/Enum.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngineResult$Status;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLEngineResult$Status : public ::java::lang::Enum
-{
-
-  SSLEngineResult$Status(::java::lang::String *, jint);
-public:
-  static JArray< ::javax::net::ssl::SSLEngineResult$Status * > * values();
-  static ::javax::net::ssl::SSLEngineResult$Status * valueOf(::java::lang::String *);
-  static ::javax::net::ssl::SSLEngineResult$Status * BUFFER_UNDERFLOW;
-  static ::javax::net::ssl::SSLEngineResult$Status * BUFFER_OVERFLOW;
-  static ::javax::net::ssl::SSLEngineResult$Status * OK;
-  static ::javax::net::ssl::SSLEngineResult$Status * CLOSED;
-private:
-  static JArray< ::javax::net::ssl::SSLEngineResult$Status * > * ENUM$VALUES;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLEngineResult$Status__
diff --git a/libjava/javax/net/ssl/SSLEngineResult.h b/libjava/javax/net/ssl/SSLEngineResult.h
deleted file mode 100644
index c88f3e4f895..00000000000
--- a/libjava/javax/net/ssl/SSLEngineResult.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLEngineResult__
-#define __javax_net_ssl_SSLEngineResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLEngineResult;
-          class SSLEngineResult$HandshakeStatus;
-          class SSLEngineResult$Status;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLEngineResult : public ::java::lang::Object
-{
-
-public:
-  SSLEngineResult(::javax::net::ssl::SSLEngineResult$Status *, ::javax::net::ssl::SSLEngineResult$HandshakeStatus *, jint, jint);
-  virtual jint bytesConsumed();
-  virtual jint bytesProduced();
-  virtual ::javax::net::ssl::SSLEngineResult$HandshakeStatus * getHandshakeStatus();
-  virtual ::javax::net::ssl::SSLEngineResult$Status * getStatus();
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::net::ssl::SSLEngineResult$HandshakeStatus * __attribute__((aligned(__alignof__( ::java::lang::Object)))) handshakeStatus;
-  ::javax::net::ssl::SSLEngineResult$Status * status;
-  jint bytesConsumed__;
-  jint bytesProduced__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLEngineResult__
diff --git a/libjava/javax/net/ssl/SSLException.h b/libjava/javax/net/ssl/SSLException.h
deleted file mode 100644
index 7364cb101ab..00000000000
--- a/libjava/javax/net/ssl/SSLException.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLException__
-#define __javax_net_ssl_SSLException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLException;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLException : public ::java::io::IOException
-{
-
-public:
-  SSLException(::java::lang::String *);
-  SSLException(::java::lang::String *, ::java::lang::Throwable *);
-  SSLException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 4511006460650708967LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLException__
diff --git a/libjava/javax/net/ssl/SSLHandshakeException.h b/libjava/javax/net/ssl/SSLHandshakeException.h
deleted file mode 100644
index 0894667b978..00000000000
--- a/libjava/javax/net/ssl/SSLHandshakeException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLHandshakeException__
-#define __javax_net_ssl_SSLHandshakeException__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLHandshakeException;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLHandshakeException : public ::javax::net::ssl::SSLException
-{
-
-public:
-  SSLHandshakeException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLHandshakeException__
diff --git a/libjava/javax/net/ssl/SSLKeyException.h b/libjava/javax/net/ssl/SSLKeyException.h
deleted file mode 100644
index 4a6d8b69dd1..00000000000
--- a/libjava/javax/net/ssl/SSLKeyException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLKeyException__
-#define __javax_net_ssl_SSLKeyException__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLKeyException;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLKeyException : public ::javax::net::ssl::SSLException
-{
-
-public:
-  SSLKeyException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLKeyException__
diff --git a/libjava/javax/net/ssl/SSLPeerUnverifiedException.h b/libjava/javax/net/ssl/SSLPeerUnverifiedException.h
deleted file mode 100644
index d5085f1ff59..00000000000
--- a/libjava/javax/net/ssl/SSLPeerUnverifiedException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLPeerUnverifiedException__
-#define __javax_net_ssl_SSLPeerUnverifiedException__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLPeerUnverifiedException;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLPeerUnverifiedException : public ::javax::net::ssl::SSLException
-{
-
-public:
-  SSLPeerUnverifiedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLPeerUnverifiedException__
diff --git a/libjava/javax/net/ssl/SSLPermission.h b/libjava/javax/net/ssl/SSLPermission.h
deleted file mode 100644
index 32ccc233ffc..00000000000
--- a/libjava/javax/net/ssl/SSLPermission.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLPermission__
-#define __javax_net_ssl_SSLPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLPermission;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLPermission : public ::java::security::BasicPermission
-{
-
-public:
-  SSLPermission(::java::lang::String *);
-  SSLPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3456898025505876775LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLPermission__
diff --git a/libjava/javax/net/ssl/SSLProtocolException.h b/libjava/javax/net/ssl/SSLProtocolException.h
deleted file mode 100644
index afe38494ee0..00000000000
--- a/libjava/javax/net/ssl/SSLProtocolException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLProtocolException__
-#define __javax_net_ssl_SSLProtocolException__
-
-#pragma interface
-
-#include <javax/net/ssl/SSLException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLProtocolException;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLProtocolException : public ::javax::net::ssl::SSLException
-{
-
-public:
-  SSLProtocolException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLProtocolException__
diff --git a/libjava/javax/net/ssl/SSLServerSocket.h b/libjava/javax/net/ssl/SSLServerSocket.h
deleted file mode 100644
index e47aa9e2ad7..00000000000
--- a/libjava/javax/net/ssl/SSLServerSocket.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLServerSocket__
-#define __javax_net_ssl_SSLServerSocket__
-
-#pragma interface
-
-#include <java/net/ServerSocket.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLServerSocket;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLServerSocket : public ::java::net::ServerSocket
-{
-
-public: // actually protected
-  SSLServerSocket();
-  SSLServerSocket(jint);
-  SSLServerSocket(jint, jint);
-  SSLServerSocket(jint, jint, ::java::net::InetAddress *);
-public:
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites() = 0;
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *) = 0;
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols() = 0;
-  virtual void setEnabledProtocols(JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean getEnableSessionCreation() = 0;
-  virtual void setEnableSessionCreation(jboolean) = 0;
-  virtual jboolean getNeedClientAuth() = 0;
-  virtual void setNeedClientAuth(jboolean) = 0;
-  virtual jboolean getUseClientMode() = 0;
-  virtual void setUseClientMode(jboolean) = 0;
-  virtual jboolean getWantClientAuth() = 0;
-  virtual void setWantClientAuth(jboolean) = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedProtocols() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLServerSocket__
diff --git a/libjava/javax/net/ssl/SSLServerSocketFactory.h b/libjava/javax/net/ssl/SSLServerSocketFactory.h
deleted file mode 100644
index cffb2fbd788..00000000000
--- a/libjava/javax/net/ssl/SSLServerSocketFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLServerSocketFactory__
-#define __javax_net_ssl_SSLServerSocketFactory__
-
-#pragma interface
-
-#include <javax/net/ServerSocketFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-        class ServerSocketFactory;
-      namespace ssl
-      {
-          class SSLContext;
-          class SSLServerSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLServerSocketFactory : public ::javax::net::ServerSocketFactory
-{
-
-public: // actually protected
-  SSLServerSocketFactory();
-public:
-  static ::javax::net::ServerSocketFactory * getDefault();
-  virtual JArray< ::java::lang::String * > * getDefaultCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites() = 0;
-private:
-  static ::javax::net::ssl::SSLContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLServerSocketFactory__
diff --git a/libjava/javax/net/ssl/SSLSession.h b/libjava/javax/net/ssl/SSLSession.h
deleted file mode 100644
index ade9a0e309d..00000000000
--- a/libjava/javax/net/ssl/SSLSession.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSession__
-#define __javax_net_ssl_SSLSession__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Principal;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-          class SSLSessionContext;
-      }
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSession : public ::java::lang::Object
-{
-
-public:
-  virtual jint getApplicationBufferSize() = 0;
-  virtual ::java::lang::String * getCipherSuite() = 0;
-  virtual jlong getCreationTime() = 0;
-  virtual JArray< jbyte > * getId() = 0;
-  virtual jlong getLastAccessedTime() = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * getLocalCertificates() = 0;
-  virtual ::java::security::Principal * getLocalPrincipal() = 0;
-  virtual jint getPacketBufferSize() = 0;
-  virtual JArray< ::java::security::cert::Certificate * > * getPeerCertificates() = 0;
-  virtual JArray< ::javax::security::cert::X509Certificate * > * getPeerCertificateChain() = 0;
-  virtual ::java::lang::String * getPeerHost() = 0;
-  virtual jint getPeerPort() = 0;
-  virtual ::java::security::Principal * getPeerPrincipal() = 0;
-  virtual ::java::lang::String * getProtocol() = 0;
-  virtual ::javax::net::ssl::SSLSessionContext * getSessionContext() = 0;
-  virtual JArray< ::java::lang::String * > * getValueNames() = 0;
-  virtual ::java::lang::Object * getValue(::java::lang::String *) = 0;
-  virtual void invalidate() = 0;
-  virtual jboolean isValid() = 0;
-  virtual void putValue(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void removeValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_SSLSession__
diff --git a/libjava/javax/net/ssl/SSLSessionBindingEvent.h b/libjava/javax/net/ssl/SSLSessionBindingEvent.h
deleted file mode 100644
index b8b62315132..00000000000
--- a/libjava/javax/net/ssl/SSLSessionBindingEvent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSessionBindingEvent__
-#define __javax_net_ssl_SSLSessionBindingEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-          class SSLSessionBindingEvent;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSessionBindingEvent : public ::java::util::EventObject
-{
-
-public:
-  SSLSessionBindingEvent(::javax::net::ssl::SSLSession *, ::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::javax::net::ssl::SSLSession * getSession();
-private:
-  static const jlong serialVersionUID = 3989172637106345LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLSessionBindingEvent__
diff --git a/libjava/javax/net/ssl/SSLSessionBindingListener.h b/libjava/javax/net/ssl/SSLSessionBindingListener.h
deleted file mode 100644
index 442b749f3ff..00000000000
--- a/libjava/javax/net/ssl/SSLSessionBindingListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSessionBindingListener__
-#define __javax_net_ssl_SSLSessionBindingListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSessionBindingEvent;
-          class SSLSessionBindingListener;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSessionBindingListener : public ::java::lang::Object
-{
-
-public:
-  virtual void valueBound(::javax::net::ssl::SSLSessionBindingEvent *) = 0;
-  virtual void valueUnbound(::javax::net::ssl::SSLSessionBindingEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_SSLSessionBindingListener__
diff --git a/libjava/javax/net/ssl/SSLSessionContext.h b/libjava/javax/net/ssl/SSLSessionContext.h
deleted file mode 100644
index ec20fb6a67c..00000000000
--- a/libjava/javax/net/ssl/SSLSessionContext.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSessionContext__
-#define __javax_net_ssl_SSLSessionContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-          class SSLSessionContext;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSessionContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::util::Enumeration * getIds() = 0;
-  virtual ::javax::net::ssl::SSLSession * getSession(JArray< jbyte > *) = 0;
-  virtual jint getSessionCacheSize() = 0;
-  virtual jint getSessionTimeout() = 0;
-  virtual void setSessionCacheSize(jint) = 0;
-  virtual void setSessionTimeout(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_SSLSessionContext__
diff --git a/libjava/javax/net/ssl/SSLSocket.h b/libjava/javax/net/ssl/SSLSocket.h
deleted file mode 100644
index 061bfe15ef0..00000000000
--- a/libjava/javax/net/ssl/SSLSocket.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSocket__
-#define __javax_net_ssl_SSLSocket__
-
-#pragma interface
-
-#include <java/net/Socket.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class HandshakeCompletedListener;
-          class SSLSession;
-          class SSLSocket;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSocket : public ::java::net::Socket
-{
-
-public: // actually protected
-  SSLSocket();
-  SSLSocket(::java::lang::String *, jint);
-  SSLSocket(::java::net::InetAddress *, jint);
-  SSLSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  SSLSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
-public:
-  virtual void addHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *) = 0;
-  virtual void removeHandshakeCompletedListener(::javax::net::ssl::HandshakeCompletedListener *) = 0;
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites() = 0;
-  virtual void setEnabledCipherSuites(JArray< ::java::lang::String * > *) = 0;
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols() = 0;
-  virtual void setEnabledProtocols(JArray< ::java::lang::String * > *) = 0;
-  virtual jboolean getEnableSessionCreation() = 0;
-  virtual void setEnableSessionCreation(jboolean) = 0;
-  virtual jboolean getNeedClientAuth() = 0;
-  virtual void setNeedClientAuth(jboolean) = 0;
-  virtual ::javax::net::ssl::SSLSession * getSession() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedProtocols() = 0;
-  virtual jboolean getUseClientMode() = 0;
-  virtual void setUseClientMode(jboolean) = 0;
-  virtual jboolean getWantClientAuth() = 0;
-  virtual void setWantClientAuth(jboolean) = 0;
-  virtual void startHandshake() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLSocket__
diff --git a/libjava/javax/net/ssl/SSLSocketFactory.h b/libjava/javax/net/ssl/SSLSocketFactory.h
deleted file mode 100644
index 624a97ab6a6..00000000000
--- a/libjava/javax/net/ssl/SSLSocketFactory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_SSLSocketFactory__
-#define __javax_net_ssl_SSLSocketFactory__
-
-#pragma interface
-
-#include <javax/net/SocketFactory.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-        class SocketFactory;
-      namespace ssl
-      {
-          class SSLContext;
-          class SSLSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::SSLSocketFactory : public ::javax::net::SocketFactory
-{
-
-public:
-  SSLSocketFactory();
-  static ::javax::net::SocketFactory * getDefault();
-  virtual ::java::net::Socket * createSocket(::java::net::Socket *, ::java::lang::String *, jint, jboolean) = 0;
-  virtual JArray< ::java::lang::String * > * getDefaultCipherSuites() = 0;
-  virtual JArray< ::java::lang::String * > * getSupportedCipherSuites() = 0;
-private:
-  static ::javax::net::ssl::SSLContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_SSLSocketFactory__
diff --git a/libjava/javax/net/ssl/TrivialHostnameVerifier.h b/libjava/javax/net/ssl/TrivialHostnameVerifier.h
deleted file mode 100644
index e360858239d..00000000000
--- a/libjava/javax/net/ssl/TrivialHostnameVerifier.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_TrivialHostnameVerifier__
-#define __javax_net_ssl_TrivialHostnameVerifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSession;
-          class TrivialHostnameVerifier;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::TrivialHostnameVerifier : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TrivialHostnameVerifier();
-public:
-  virtual jboolean verify(::java::lang::String *, ::javax::net::ssl::SSLSession *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_TrivialHostnameVerifier__
diff --git a/libjava/javax/net/ssl/TrustManager.h b/libjava/javax/net/ssl/TrustManager.h
deleted file mode 100644
index 3ef89b7b79a..00000000000
--- a/libjava/javax/net/ssl/TrustManager.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_TrustManager__
-#define __javax_net_ssl_TrustManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class TrustManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::TrustManager : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_TrustManager__
diff --git a/libjava/javax/net/ssl/TrustManagerFactory$1.h b/libjava/javax/net/ssl/TrustManagerFactory$1.h
deleted file mode 100644
index 8649b480a3f..00000000000
--- a/libjava/javax/net/ssl/TrustManagerFactory$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_TrustManagerFactory$1__
-#define __javax_net_ssl_TrustManagerFactory$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class TrustManagerFactory$1;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::TrustManagerFactory$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TrustManagerFactory$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_TrustManagerFactory$1__
diff --git a/libjava/javax/net/ssl/TrustManagerFactory.h b/libjava/javax/net/ssl/TrustManagerFactory.h
deleted file mode 100644
index 2d87597c199..00000000000
--- a/libjava/javax/net/ssl/TrustManagerFactory.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_TrustManagerFactory__
-#define __javax_net_ssl_TrustManagerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-        class Provider;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class ManagerFactoryParameters;
-          class TrustManager;
-          class TrustManagerFactory;
-          class TrustManagerFactorySpi;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::TrustManagerFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  TrustManagerFactory(::javax::net::ssl::TrustManagerFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
-public:
-  static ::javax::net::ssl::TrustManagerFactory * getInstance(::java::lang::String *);
-  static ::javax::net::ssl::TrustManagerFactory * getInstance(::java::lang::String *, ::java::lang::String *);
-  static ::javax::net::ssl::TrustManagerFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
-  static ::java::lang::String * getDefaultAlgorithm();
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::security::Provider * getProvider();
-  virtual JArray< ::javax::net::ssl::TrustManager * > * getTrustManagers();
-  virtual void init(::javax::net::ssl::ManagerFactoryParameters *);
-  virtual void init(::java::security::KeyStore *);
-private:
-  static ::java::lang::String * TRUST_MANAGER_FACTORY;
-  static ::java::lang::String * DEFAULT_ALGORITHM;
-  ::javax::net::ssl::TrustManagerFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tmfSpi;
-  ::java::security::Provider * provider;
-  ::java::lang::String * algorithm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_TrustManagerFactory__
diff --git a/libjava/javax/net/ssl/TrustManagerFactorySpi.h b/libjava/javax/net/ssl/TrustManagerFactorySpi.h
deleted file mode 100644
index 3c1343d74a8..00000000000
--- a/libjava/javax/net/ssl/TrustManagerFactorySpi.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_TrustManagerFactorySpi__
-#define __javax_net_ssl_TrustManagerFactorySpi__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class KeyStore;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class ManagerFactoryParameters;
-          class TrustManager;
-          class TrustManagerFactorySpi;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::TrustManagerFactorySpi : public ::java::lang::Object
-{
-
-public:
-  TrustManagerFactorySpi();
-public: // actually protected
-  virtual JArray< ::javax::net::ssl::TrustManager * > * engineGetTrustManagers() = 0;
-  virtual void engineInit(::javax::net::ssl::ManagerFactoryParameters *) = 0;
-  virtual void engineInit(::java::security::KeyStore *) = 0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_TrustManagerFactorySpi__
diff --git a/libjava/javax/net/ssl/X509ExtendedKeyManager.h b/libjava/javax/net/ssl/X509ExtendedKeyManager.h
deleted file mode 100644
index cb3b68c3a0c..00000000000
--- a/libjava/javax/net/ssl/X509ExtendedKeyManager.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_X509ExtendedKeyManager__
-#define __javax_net_ssl_X509ExtendedKeyManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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 X509ExtendedKeyManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::X509ExtendedKeyManager : public ::java::lang::Object
-{
-
-public: // actually protected
-  X509ExtendedKeyManager();
-public:
-  virtual ::java::lang::String * chooseEngineClientAlias(JArray< ::java::lang::String * > *, JArray< ::java::security::Principal * > *, ::javax::net::ssl::SSLEngine *);
-  virtual ::java::lang::String * chooseEngineServerAlias(::java::lang::String *, JArray< ::java::security::Principal * > *, ::javax::net::ssl::SSLEngine *);
-  virtual ::java::lang::String * chooseClientAlias(JArray< ::java::lang::String * > *, JArray< ::java::security::Principal * > *, ::java::net::Socket *) = 0;
-  virtual ::java::lang::String * chooseServerAlias(::java::lang::String *, JArray< ::java::security::Principal * > *, ::java::net::Socket *) = 0;
-  virtual JArray< ::java::security::cert::X509Certificate * > * getCertificateChain(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getClientAliases(::java::lang::String *, JArray< ::java::security::Principal * > *) = 0;
-  virtual ::java::security::PrivateKey * getPrivateKey(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getServerAliases(::java::lang::String *, JArray< ::java::security::Principal * > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_net_ssl_X509ExtendedKeyManager__
diff --git a/libjava/javax/net/ssl/X509KeyManager.h b/libjava/javax/net/ssl/X509KeyManager.h
deleted file mode 100644
index 9ce4f14c433..00000000000
--- a/libjava/javax/net/ssl/X509KeyManager.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_X509KeyManager__
-#define __javax_net_ssl_X509KeyManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-    namespace security
-    {
-        class Principal;
-        class PrivateKey;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class X509KeyManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::X509KeyManager : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * chooseClientAlias(JArray< ::java::lang::String * > *, JArray< ::java::security::Principal * > *, ::java::net::Socket *) = 0;
-  virtual ::java::lang::String * chooseServerAlias(::java::lang::String *, JArray< ::java::security::Principal * > *, ::java::net::Socket *) = 0;
-  virtual JArray< ::java::security::cert::X509Certificate * > * getCertificateChain(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getClientAliases(::java::lang::String *, JArray< ::java::security::Principal * > *) = 0;
-  virtual ::java::security::PrivateKey * getPrivateKey(::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getServerAliases(::java::lang::String *, JArray< ::java::security::Principal * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_X509KeyManager__
diff --git a/libjava/javax/net/ssl/X509TrustManager.h b/libjava/javax/net/ssl/X509TrustManager.h
deleted file mode 100644
index 4afd47e09a8..00000000000
--- a/libjava/javax/net/ssl/X509TrustManager.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_net_ssl_X509TrustManager__
-#define __javax_net_ssl_X509TrustManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class X509TrustManager;
-      }
-    }
-  }
-}
-
-class javax::net::ssl::X509TrustManager : public ::java::lang::Object
-{
-
-public:
-  virtual void checkClientTrusted(JArray< ::java::security::cert::X509Certificate * > *, ::java::lang::String *) = 0;
-  virtual void checkServerTrusted(JArray< ::java::security::cert::X509Certificate * > *, ::java::lang::String *) = 0;
-  virtual JArray< ::java::security::cert::X509Certificate * > * getAcceptedIssuers() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_net_ssl_X509TrustManager__
diff --git a/libjava/javax/print/AttributeException.h b/libjava/javax/print/AttributeException.h
deleted file mode 100644
index 2402a177205..00000000000
--- a/libjava/javax/print/AttributeException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_AttributeException__
-#define __javax_print_AttributeException__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class AttributeException;
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class javax::print::AttributeException : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::Class * > * getUnsupportedAttributes() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * getUnsupportedValues() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_AttributeException__
diff --git a/libjava/javax/print/CancelablePrintJob.h b/libjava/javax/print/CancelablePrintJob.h
deleted file mode 100644
index 31b006e9551..00000000000
--- a/libjava/javax/print/CancelablePrintJob.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_CancelablePrintJob__
-#define __javax_print_CancelablePrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class CancelablePrintJob;
-        class Doc;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeListener;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::CancelablePrintJob : public ::java::lang::Object
-{
-
-public:
-  virtual void cancel() = 0;
-  virtual void addPrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *, ::javax::print::attribute::PrintJobAttributeSet *) = 0;
-  virtual void addPrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::PrintService * getPrintService() = 0;
-  virtual void print(::javax::print::Doc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void removePrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *) = 0;
-  virtual void removePrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_CancelablePrintJob__
diff --git a/libjava/javax/print/Doc.h b/libjava/javax/print/Doc.h
deleted file mode 100644
index 6b3bc34c354..00000000000
--- a/libjava/javax/print/Doc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_Doc__
-#define __javax_print_Doc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class DocFlavor;
-      namespace attribute
-      {
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::Doc : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::attribute::DocAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::DocFlavor * getDocFlavor() = 0;
-  virtual ::java::lang::Object * getPrintData() = 0;
-  virtual ::java::io::Reader * getReaderForText() = 0;
-  virtual ::java::io::InputStream * getStreamForBytes() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_Doc__
diff --git a/libjava/javax/print/DocFlavor$BYTE_ARRAY.h b/libjava/javax/print/DocFlavor$BYTE_ARRAY.h
deleted file mode 100644
index 006ddb000e0..00000000000
--- a/libjava/javax/print/DocFlavor$BYTE_ARRAY.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$BYTE_ARRAY__
-#define __javax_print_DocFlavor$BYTE_ARRAY__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$BYTE_ARRAY;
-    }
-  }
-}
-
-class javax::print::DocFlavor$BYTE_ARRAY : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$BYTE_ARRAY(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -9065578006593857475LL;
-public:
-  static ::javax::print::DocFlavor$BYTE_ARRAY * AUTOSENSE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * GIF;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * JPEG;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * PCL;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * PDF;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * PNG;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * POSTSCRIPT;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_HOST;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_US_ASCII;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_16;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_16BE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_16LE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_HTML_UTF_8;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_HOST;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_US_ASCII;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_16;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_16BE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_16LE;
-  static ::javax::print::DocFlavor$BYTE_ARRAY * TEXT_PLAIN_UTF_8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$BYTE_ARRAY__
diff --git a/libjava/javax/print/DocFlavor$CHAR_ARRAY.h b/libjava/javax/print/DocFlavor$CHAR_ARRAY.h
deleted file mode 100644
index 1909d2e151a..00000000000
--- a/libjava/javax/print/DocFlavor$CHAR_ARRAY.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$CHAR_ARRAY__
-#define __javax_print_DocFlavor$CHAR_ARRAY__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$CHAR_ARRAY;
-    }
-  }
-}
-
-class javax::print::DocFlavor$CHAR_ARRAY : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$CHAR_ARRAY(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8720590903724405128LL;
-public:
-  static ::javax::print::DocFlavor$CHAR_ARRAY * TEXT_HTML;
-  static ::javax::print::DocFlavor$CHAR_ARRAY * TEXT_PLAIN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$CHAR_ARRAY__
diff --git a/libjava/javax/print/DocFlavor$INPUT_STREAM.h b/libjava/javax/print/DocFlavor$INPUT_STREAM.h
deleted file mode 100644
index 3c635deed2b..00000000000
--- a/libjava/javax/print/DocFlavor$INPUT_STREAM.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$INPUT_STREAM__
-#define __javax_print_DocFlavor$INPUT_STREAM__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$INPUT_STREAM;
-    }
-  }
-}
-
-class javax::print::DocFlavor$INPUT_STREAM : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$INPUT_STREAM(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7045842700749194127LL;
-public:
-  static ::javax::print::DocFlavor$INPUT_STREAM * AUTOSENSE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * GIF;
-  static ::javax::print::DocFlavor$INPUT_STREAM * JPEG;
-  static ::javax::print::DocFlavor$INPUT_STREAM * PCL;
-  static ::javax::print::DocFlavor$INPUT_STREAM * PDF;
-  static ::javax::print::DocFlavor$INPUT_STREAM * PNG;
-  static ::javax::print::DocFlavor$INPUT_STREAM * POSTSCRIPT;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_HOST;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_US_ASCII;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_16;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_16BE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_16LE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_HTML_UTF_8;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_HOST;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_US_ASCII;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_16;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_16BE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_16LE;
-  static ::javax::print::DocFlavor$INPUT_STREAM * TEXT_PLAIN_UTF_8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$INPUT_STREAM__
diff --git a/libjava/javax/print/DocFlavor$READER.h b/libjava/javax/print/DocFlavor$READER.h
deleted file mode 100644
index c6a24cd62f0..00000000000
--- a/libjava/javax/print/DocFlavor$READER.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$READER__
-#define __javax_print_DocFlavor$READER__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$READER;
-    }
-  }
-}
-
-class javax::print::DocFlavor$READER : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$READER(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7100295812579351567LL;
-public:
-  static ::javax::print::DocFlavor$READER * TEXT_HTML;
-  static ::javax::print::DocFlavor$READER * TEXT_PLAIN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$READER__
diff --git a/libjava/javax/print/DocFlavor$SERVICE_FORMATTED.h b/libjava/javax/print/DocFlavor$SERVICE_FORMATTED.h
deleted file mode 100644
index 85386b18d8d..00000000000
--- a/libjava/javax/print/DocFlavor$SERVICE_FORMATTED.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$SERVICE_FORMATTED__
-#define __javax_print_DocFlavor$SERVICE_FORMATTED__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$SERVICE_FORMATTED;
-    }
-  }
-}
-
-class javax::print::DocFlavor$SERVICE_FORMATTED : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$SERVICE_FORMATTED(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6181337766266637256LL;
-public:
-  static ::javax::print::DocFlavor$SERVICE_FORMATTED * PAGEABLE;
-  static ::javax::print::DocFlavor$SERVICE_FORMATTED * PRINTABLE;
-  static ::javax::print::DocFlavor$SERVICE_FORMATTED * RENDERABLE_IMAGE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$SERVICE_FORMATTED__
diff --git a/libjava/javax/print/DocFlavor$STRING.h b/libjava/javax/print/DocFlavor$STRING.h
deleted file mode 100644
index c1ef38bbd84..00000000000
--- a/libjava/javax/print/DocFlavor$STRING.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$STRING__
-#define __javax_print_DocFlavor$STRING__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$STRING;
-    }
-  }
-}
-
-class javax::print::DocFlavor$STRING : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$STRING(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4414407504887034035LL;
-public:
-  static ::javax::print::DocFlavor$STRING * TEXT_HTML;
-  static ::javax::print::DocFlavor$STRING * TEXT_PLAIN;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$STRING__
diff --git a/libjava/javax/print/DocFlavor$URL.h b/libjava/javax/print/DocFlavor$URL.h
deleted file mode 100644
index 82bc8569ab3..00000000000
--- a/libjava/javax/print/DocFlavor$URL.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor$URL__
-#define __javax_print_DocFlavor$URL__
-
-#pragma interface
-
-#include <javax/print/DocFlavor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor$URL;
-    }
-  }
-}
-
-class javax::print::DocFlavor$URL : public ::javax::print::DocFlavor
-{
-
-public:
-  DocFlavor$URL(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2936725788144902062LL;
-public:
-  static ::javax::print::DocFlavor$URL * AUTOSENSE;
-  static ::javax::print::DocFlavor$URL * GIF;
-  static ::javax::print::DocFlavor$URL * JPEG;
-  static ::javax::print::DocFlavor$URL * PCL;
-  static ::javax::print::DocFlavor$URL * PDF;
-  static ::javax::print::DocFlavor$URL * PNG;
-  static ::javax::print::DocFlavor$URL * POSTSCRIPT;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_HOST;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_US_ASCII;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_16;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_16BE;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_16LE;
-  static ::javax::print::DocFlavor$URL * TEXT_HTML_UTF_8;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_HOST;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_US_ASCII;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_16;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_16BE;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_16LE;
-  static ::javax::print::DocFlavor$URL * TEXT_PLAIN_UTF_8;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor$URL__
diff --git a/libjava/javax/print/DocFlavor.h b/libjava/javax/print/DocFlavor.h
deleted file mode 100644
index f5331984a28..00000000000
--- a/libjava/javax/print/DocFlavor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocFlavor__
-#define __javax_print_DocFlavor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-    }
-  }
-}
-
-class javax::print::DocFlavor : public ::java::lang::Object
-{
-
-public:
-  DocFlavor(::java::lang::String *, ::java::lang::String *);
-private:
-  void parseMimeType(::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * getMediaSubtype();
-  virtual ::java::lang::String * getMediaType();
-  virtual ::java::lang::String * getMimeType();
-  virtual ::java::lang::String * getParameter(::java::lang::String *);
-  virtual ::java::lang::String * getRepresentationClassName();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -4512080796965449721LL;
-public:
-  static ::java::lang::String * hostEncoding;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mediaSubtype;
-  ::java::lang::String * mediaType;
-  ::java::util::TreeMap * params;
-  ::java::lang::String * myClassName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_DocFlavor__
diff --git a/libjava/javax/print/DocPrintJob.h b/libjava/javax/print/DocPrintJob.h
deleted file mode 100644
index 3a450e180d0..00000000000
--- a/libjava/javax/print/DocPrintJob.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_DocPrintJob__
-#define __javax_print_DocPrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class DocPrintJob;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeListener;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::DocPrintJob : public ::java::lang::Object
-{
-
-public:
-  virtual void addPrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *, ::javax::print::attribute::PrintJobAttributeSet *) = 0;
-  virtual void addPrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::PrintService * getPrintService() = 0;
-  virtual void print(::javax::print::Doc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void removePrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *) = 0;
-  virtual void removePrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_DocPrintJob__
diff --git a/libjava/javax/print/FlavorException.h b/libjava/javax/print/FlavorException.h
deleted file mode 100644
index b06cdd63332..00000000000
--- a/libjava/javax/print/FlavorException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_FlavorException__
-#define __javax_print_FlavorException__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class FlavorException;
-    }
-  }
-}
-
-class javax::print::FlavorException : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::javax::print::DocFlavor * > * getUnsupportedFlavors() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_FlavorException__
diff --git a/libjava/javax/print/MultiDoc.h b/libjava/javax/print/MultiDoc.h
deleted file mode 100644
index 8148c7e5f52..00000000000
--- a/libjava/javax/print/MultiDoc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_MultiDoc__
-#define __javax_print_MultiDoc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class MultiDoc;
-    }
-  }
-}
-
-class javax::print::MultiDoc : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::Doc * getDoc() = 0;
-  virtual ::javax::print::MultiDoc * next() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_MultiDoc__
diff --git a/libjava/javax/print/MultiDocPrintJob.h b/libjava/javax/print/MultiDocPrintJob.h
deleted file mode 100644
index 4c14d64634d..00000000000
--- a/libjava/javax/print/MultiDocPrintJob.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_MultiDocPrintJob__
-#define __javax_print_MultiDocPrintJob__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class Doc;
-        class MultiDoc;
-        class MultiDocPrintJob;
-        class PrintService;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeListener;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::MultiDocPrintJob : public ::java::lang::Object
-{
-
-public:
-  virtual void print(::javax::print::MultiDoc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void addPrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *, ::javax::print::attribute::PrintJobAttributeSet *) = 0;
-  virtual void addPrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes() = 0;
-  virtual ::javax::print::PrintService * getPrintService() = 0;
-  virtual void print(::javax::print::Doc *, ::javax::print::attribute::PrintRequestAttributeSet *) = 0;
-  virtual void removePrintJobAttributeListener(::javax::print::event::PrintJobAttributeListener *) = 0;
-  virtual void removePrintJobListener(::javax::print::event::PrintJobListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_MultiDocPrintJob__
diff --git a/libjava/javax/print/MultiDocPrintService.h b/libjava/javax/print/MultiDocPrintService.h
deleted file mode 100644
index 0b613f64a0b..00000000000
--- a/libjava/javax/print/MultiDocPrintService.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_MultiDocPrintService__
-#define __javax_print_MultiDocPrintService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class DocPrintJob;
-        class MultiDocPrintJob;
-        class MultiDocPrintService;
-        class ServiceUIFactory;
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::MultiDocPrintService : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::MultiDocPrintJob * createMultiDocPrintJob() = 0;
-  virtual ::javax::print::DocPrintJob * createPrintJob() = 0;
-  virtual ::javax::print::attribute::PrintServiceAttribute * getAttribute(::java::lang::Class *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes() = 0;
-  virtual ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::print::ServiceUIFactory * getServiceUIFactory() = 0;
-  virtual JArray< ::java::lang::Class * > * getSupportedAttributeCategories() = 0;
-  virtual ::java::lang::Object * getSupportedAttributeValues(::java::lang::Class *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isAttributeCategorySupported(::java::lang::Class *) = 0;
-  virtual jboolean isAttributeValueSupported(::javax::print::attribute::Attribute *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isDocFlavorSupported(::javax::print::DocFlavor *) = 0;
-  virtual void addPrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  virtual void removePrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_MultiDocPrintService__
diff --git a/libjava/javax/print/PrintException.h b/libjava/javax/print/PrintException.h
deleted file mode 100644
index 90a1659acb8..00000000000
--- a/libjava/javax/print/PrintException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_PrintException__
-#define __javax_print_PrintException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class PrintException;
-    }
-  }
-}
-
-class javax::print::PrintException : public ::java::lang::Exception
-{
-
-public:
-  PrintException();
-  PrintException(::java::lang::Exception *);
-  PrintException(::java::lang::String *);
-  PrintException(::java::lang::String *, ::java::lang::Exception *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_PrintException__
diff --git a/libjava/javax/print/PrintService.h b/libjava/javax/print/PrintService.h
deleted file mode 100644
index 3e26159a1ca..00000000000
--- a/libjava/javax/print/PrintService.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_PrintService__
-#define __javax_print_PrintService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class DocPrintJob;
-        class PrintService;
-        class ServiceUIFactory;
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::PrintService : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::print::DocPrintJob * createPrintJob() = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttribute * getAttribute(::java::lang::Class *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes() = 0;
-  virtual ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::print::ServiceUIFactory * getServiceUIFactory() = 0;
-  virtual JArray< ::java::lang::Class * > * getSupportedAttributeCategories() = 0;
-  virtual ::java::lang::Object * getSupportedAttributeValues(::java::lang::Class *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isAttributeCategorySupported(::java::lang::Class *) = 0;
-  virtual jboolean isAttributeValueSupported(::javax::print::attribute::Attribute *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isDocFlavorSupported(::javax::print::DocFlavor *) = 0;
-  virtual void addPrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  virtual void removePrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_PrintService__
diff --git a/libjava/javax/print/PrintServiceLookup.h b/libjava/javax/print/PrintServiceLookup.h
deleted file mode 100644
index 5409da90d94..00000000000
--- a/libjava/javax/print/PrintServiceLookup.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_PrintServiceLookup__
-#define __javax_print_PrintServiceLookup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace print
-      {
-          class CupsPrintServiceLookup;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class MultiDocPrintService;
-        class PrintService;
-        class PrintServiceLookup;
-      namespace attribute
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::PrintServiceLookup : public ::java::lang::Object
-{
-
-public:
-  PrintServiceLookup();
-  static jboolean registerServiceProvider(::javax::print::PrintServiceLookup *);
-  static jboolean registerService(::javax::print::PrintService *);
-  static JArray< ::javax::print::PrintService * > * lookupPrintServices(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *);
-  static JArray< ::javax::print::MultiDocPrintService * > * lookupMultiDocPrintServices(JArray< ::javax::print::DocFlavor * > *, ::javax::print::attribute::AttributeSet *);
-  static ::javax::print::PrintService * lookupDefaultPrintService();
-  virtual ::javax::print::PrintService * getDefaultPrintService() = 0;
-  virtual JArray< ::javax::print::MultiDocPrintService * > * getMultiDocPrintServices(JArray< ::javax::print::DocFlavor * > *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::PrintService * > * getPrintServices() = 0;
-  virtual JArray< ::javax::print::PrintService * > * getPrintServices(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-private:
-  static ::gnu::javax::print::CupsPrintServiceLookup * systemProvider;
-  static ::java::util::HashSet * printServices;
-  static ::java::util::HashSet * printServiceLookups;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_PrintServiceLookup__
diff --git a/libjava/javax/print/ServiceUI.h b/libjava/javax/print/ServiceUI.h
deleted file mode 100644
index 8ec373ac49b..00000000000
--- a/libjava/javax/print/ServiceUI.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_ServiceUI__
-#define __javax_print_ServiceUI__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class GraphicsConfiguration;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class PrintService;
-        class ServiceUI;
-      namespace attribute
-      {
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::ServiceUI : public ::java::lang::Object
-{
-
-public:
-  ServiceUI();
-  static ::javax::print::PrintService * printDialog(::java::awt::GraphicsConfiguration *, jint, jint, JArray< ::javax::print::PrintService * > *, ::javax::print::PrintService *, ::javax::print::DocFlavor *, ::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_ServiceUI__
diff --git a/libjava/javax/print/ServiceUIFactory.h b/libjava/javax/print/ServiceUIFactory.h
deleted file mode 100644
index 2424058fa35..00000000000
--- a/libjava/javax/print/ServiceUIFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_ServiceUIFactory__
-#define __javax_print_ServiceUIFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class ServiceUIFactory;
-    }
-  }
-}
-
-class javax::print::ServiceUIFactory : public ::java::lang::Object
-{
-
-public:
-  ServiceUIFactory();
-  virtual ::java::lang::Object * getUI(jint, ::java::lang::String *) = 0;
-  virtual JArray< ::java::lang::String * > * getUIClassNamesForRole(jint) = 0;
-  static const jint ABOUT_UIROLE = 1;
-  static const jint ADMIN_UIROLE = 2;
-  static const jint MAIN_UIROLE = 3;
-  static const jint RESERVED_UIROLE = 99;
-  static ::java::lang::String * DIALOG_UI;
-  static ::java::lang::String * JCOMPONENT_UI;
-  static ::java::lang::String * JDIALOG_UI;
-  static ::java::lang::String * PANEL_UI;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_ServiceUIFactory__
diff --git a/libjava/javax/print/SimpleDoc.h b/libjava/javax/print/SimpleDoc.h
deleted file mode 100644
index b055e4ed9bd..00000000000
--- a/libjava/javax/print/SimpleDoc.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_SimpleDoc__
-#define __javax_print_SimpleDoc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class SimpleDoc;
-      namespace attribute
-      {
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::SimpleDoc : public ::java::lang::Object
-{
-
-public:
-  SimpleDoc(::java::lang::Object *, ::javax::print::DocFlavor *, ::javax::print::attribute::DocAttributeSet *);
-  ::javax::print::attribute::DocAttributeSet * getAttributes();
-  ::javax::print::DocFlavor * getDocFlavor();
-  ::java::lang::Object * getPrintData();
-  ::java::io::Reader * getReaderForText();
-  ::java::io::InputStream * getStreamForBytes();
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) printData;
-  ::javax::print::DocFlavor * flavor;
-  ::javax::print::attribute::DocAttributeSet * attributes;
-  ::java::io::InputStream * stream;
-  ::java::io::Reader * reader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_SimpleDoc__
diff --git a/libjava/javax/print/StreamPrintService.h b/libjava/javax/print/StreamPrintService.h
deleted file mode 100644
index 115d6efab54..00000000000
--- a/libjava/javax/print/StreamPrintService.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_StreamPrintService__
-#define __javax_print_StreamPrintService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class DocPrintJob;
-        class ServiceUIFactory;
-        class StreamPrintService;
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::StreamPrintService : public ::java::lang::Object
-{
-
-public: // actually protected
-  StreamPrintService(::java::io::OutputStream *);
-public:
-  virtual void dispose();
-  virtual ::java::lang::String * getOutputFormat() = 0;
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual jboolean isDisposed();
-  virtual ::javax::print::DocPrintJob * createPrintJob() = 0;
-  virtual ::javax::print::attribute::PrintServiceAttribute * getAttribute(::java::lang::Class *) = 0;
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes() = 0;
-  virtual ::java::lang::Object * getDefaultAttributeValue(::java::lang::Class *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::print::ServiceUIFactory * getServiceUIFactory() = 0;
-  virtual JArray< ::java::lang::Class * > * getSupportedAttributeCategories() = 0;
-  virtual ::java::lang::Object * getSupportedAttributeValues(::java::lang::Class *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::attribute::AttributeSet * getUnsupportedAttributes(::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isAttributeCategorySupported(::java::lang::Class *) = 0;
-  virtual jboolean isAttributeValueSupported(::javax::print::attribute::Attribute *, ::javax::print::DocFlavor *, ::javax::print::attribute::AttributeSet *) = 0;
-  virtual jboolean isDocFlavorSupported(::javax::print::DocFlavor *) = 0;
-  virtual void addPrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-  virtual void removePrintServiceAttributeListener(::javax::print::event::PrintServiceAttributeListener *) = 0;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) disposed;
-  ::java::io::OutputStream * out;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_StreamPrintService__
diff --git a/libjava/javax/print/StreamPrintServiceFactory.h b/libjava/javax/print/StreamPrintServiceFactory.h
deleted file mode 100644
index 496b51f6189..00000000000
--- a/libjava/javax/print/StreamPrintServiceFactory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_StreamPrintServiceFactory__
-#define __javax_print_StreamPrintServiceFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocFlavor;
-        class StreamPrintService;
-        class StreamPrintServiceFactory;
-    }
-  }
-}
-
-class javax::print::StreamPrintServiceFactory : public ::java::lang::Object
-{
-
-public:
-  StreamPrintServiceFactory();
-  static JArray< ::javax::print::StreamPrintServiceFactory * > * lookupStreamPrintServiceFactories(::javax::print::DocFlavor *, ::java::lang::String *);
-  virtual ::java::lang::String * getOutputFormat() = 0;
-  virtual JArray< ::javax::print::DocFlavor * > * getSupportedDocFlavors() = 0;
-  virtual ::javax::print::StreamPrintService * getPrintService(::java::io::OutputStream *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_StreamPrintServiceFactory__
diff --git a/libjava/javax/print/URIException.h b/libjava/javax/print/URIException.h
deleted file mode 100644
index 7e4f868b07f..00000000000
--- a/libjava/javax/print/URIException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_URIException__
-#define __javax_print_URIException__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-        class URIException;
-    }
-  }
-}
-
-class javax::print::URIException : public ::java::lang::Object
-{
-
-public:
-  virtual jint getReason() = 0;
-  virtual ::java::net::URI * getUnsupportedURI() = 0;
-  static const jint URIInaccessible = 1;
-  static const jint URIOtherProblem = -1;
-  static const jint URISchemeNotSupported = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_URIException__
diff --git a/libjava/javax/print/attribute/Attribute.h b/libjava/javax/print/attribute/Attribute.h
deleted file mode 100644
index 88c4efd316e..00000000000
--- a/libjava/javax/print/attribute/Attribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_Attribute__
-#define __javax_print_attribute_Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::Attribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_Attribute__
diff --git a/libjava/javax/print/attribute/AttributeSet.h b/libjava/javax/print/attribute/AttributeSet.h
deleted file mode 100644
index f1fed93203e..00000000000
--- a/libjava/javax/print/attribute/AttributeSet.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSet__
-#define __javax_print_attribute_AttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jint hashCode() = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_AttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h
deleted file mode 100644
index 34cee3d0710..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class AttributeSetUtilities$SynchronizedAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet : public ::java::lang::Object
-{
-
-public:
-  AttributeSetUtilities$SynchronizedAttributeSet(::javax::print::attribute::AttributeSet *);
-  virtual jboolean add(::javax::print::attribute::Attribute *);
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *);
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Class *);
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual jboolean remove(::java::lang::Class *);
-  virtual jboolean remove(::javax::print::attribute::Attribute *);
-  virtual jint size();
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray();
-private:
-  ::javax::print::attribute::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.h
deleted file mode 100644
index 1e2b9a466b7..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedDocAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedDocAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedDocAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedDocAttributeSet;
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedDocAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedDocAttributeSet(::javax::print::attribute::DocAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedDocAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.h
deleted file mode 100644
index c52b5512578..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintJobAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintJobAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintJobAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedPrintJobAttributeSet;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedPrintJobAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedPrintJobAttributeSet(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.h
deleted file mode 100644
index 4fbb3d9b14d..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintRequestAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintRequestAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintRequestAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedPrintRequestAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedPrintRequestAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedPrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.h
deleted file mode 100644
index 8177161f282..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$SynchronizedPrintServiceAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintServiceAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintServiceAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$SynchronizedAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$SynchronizedPrintServiceAttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$SynchronizedPrintServiceAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$SynchronizedAttributeSet
-{
-
-public:
-  AttributeSetUtilities$SynchronizedPrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$SynchronizedPrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h
deleted file mode 100644
index 71de4168464..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiableAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiableAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class AttributeSetUtilities$UnmodifiableAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet : public ::java::lang::Object
-{
-
-public:
-  AttributeSetUtilities$UnmodifiableAttributeSet(::javax::print::attribute::AttributeSet *);
-  virtual jboolean add(::javax::print::attribute::Attribute *);
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *);
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Class *);
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual jboolean remove(::java::lang::Class *);
-  virtual jboolean remove(::javax::print::attribute::Attribute *);
-  virtual jint size();
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray();
-private:
-  ::javax::print::attribute::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiableAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.h
deleted file mode 100644
index de2bb982c0c..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiableDocAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiableDocAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiableDocAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiableDocAttributeSet;
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiableDocAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiableDocAttributeSet(::javax::print::attribute::DocAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiableDocAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.h
deleted file mode 100644
index 6f800a2332b..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintJobAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintJobAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintJobAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiablePrintJobAttributeSet;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiablePrintJobAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiablePrintJobAttributeSet(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.h
deleted file mode 100644
index 6dea83bd064..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.h b/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.h
deleted file mode 100644
index edfe0690cb6..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet__
-#define __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/AttributeSetUtilities$UnmodifiableAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet : public ::javax::print::attribute::AttributeSetUtilities$UnmodifiableAttributeSet
-{
-
-public:
-  AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities$UnmodifiablePrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/AttributeSetUtilities.h b/libjava/javax/print/attribute/AttributeSetUtilities.h
deleted file mode 100644
index 85f90d0681c..00000000000
--- a/libjava/javax/print/attribute/AttributeSetUtilities.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_AttributeSetUtilities__
-#define __javax_print_attribute_AttributeSetUtilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class AttributeSetUtilities;
-          class DocAttributeSet;
-          class PrintJobAttributeSet;
-          class PrintRequestAttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::AttributeSetUtilities : public ::java::lang::Object
-{
-
-  AttributeSetUtilities();
-public:
-  static ::javax::print::attribute::AttributeSet * synchronizedView(::javax::print::attribute::AttributeSet *);
-  static ::javax::print::attribute::DocAttributeSet * synchronizedView(::javax::print::attribute::DocAttributeSet *);
-  static ::javax::print::attribute::PrintJobAttributeSet * synchronizedView(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::javax::print::attribute::PrintRequestAttributeSet * synchronizedView(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::javax::print::attribute::PrintServiceAttributeSet * synchronizedView(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::javax::print::attribute::AttributeSet * unmodifiableView(::javax::print::attribute::AttributeSet *);
-  static ::javax::print::attribute::DocAttributeSet * unmodifiableView(::javax::print::attribute::DocAttributeSet *);
-  static ::javax::print::attribute::PrintJobAttributeSet * unmodifiableView(::javax::print::attribute::PrintJobAttributeSet *);
-  static ::javax::print::attribute::PrintRequestAttributeSet * unmodifiableView(::javax::print::attribute::PrintRequestAttributeSet *);
-  static ::javax::print::attribute::PrintServiceAttributeSet * unmodifiableView(::javax::print::attribute::PrintServiceAttributeSet *);
-  static ::java::lang::Class * verifyAttributeCategory(::java::lang::Object *, ::java::lang::Class *);
-  static ::javax::print::attribute::Attribute * verifyAttributeValue(::java::lang::Object *, ::java::lang::Class *);
-  static void verifyCategoryForValue(::java::lang::Class *, ::javax::print::attribute::Attribute *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_AttributeSetUtilities__
diff --git a/libjava/javax/print/attribute/DateTimeSyntax.h b/libjava/javax/print/attribute/DateTimeSyntax.h
deleted file mode 100644
index 8ec4f3c9812..00000000000
--- a/libjava/javax/print/attribute/DateTimeSyntax.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_DateTimeSyntax__
-#define __javax_print_attribute_DateTimeSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class DateTimeSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::DateTimeSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  DateTimeSyntax(::java::util::Date *);
-public:
-  virtual ::java::util::Date * getValue();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1400819079791208582LL;
-  ::java::util::Date * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_DateTimeSyntax__
diff --git a/libjava/javax/print/attribute/DocAttribute.h b/libjava/javax/print/attribute/DocAttribute.h
deleted file mode 100644
index d26bc6d8c10..00000000000
--- a/libjava/javax/print/attribute/DocAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_DocAttribute__
-#define __javax_print_attribute_DocAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class DocAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::DocAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_DocAttribute__
diff --git a/libjava/javax/print/attribute/DocAttributeSet.h b/libjava/javax/print/attribute/DocAttributeSet.h
deleted file mode 100644
index c85d799c414..00000000000
--- a/libjava/javax/print/attribute/DocAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_DocAttributeSet__
-#define __javax_print_attribute_DocAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class DocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::DocAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_DocAttributeSet__
diff --git a/libjava/javax/print/attribute/EnumSyntax.h b/libjava/javax/print/attribute/EnumSyntax.h
deleted file mode 100644
index 5b445c301b0..00000000000
--- a/libjava/javax/print/attribute/EnumSyntax.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_EnumSyntax__
-#define __javax_print_attribute_EnumSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::EnumSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  EnumSyntax(jint);
-public:
-  virtual jint getValue();
-  virtual ::java::lang::Object * clone();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual ::java::lang::Object * readResolve();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-  virtual jint getOffset();
-private:
-  static const jlong serialVersionUID = -2739521845085831642LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_EnumSyntax__
diff --git a/libjava/javax/print/attribute/HashAttributeSet.h b/libjava/javax/print/attribute/HashAttributeSet.h
deleted file mode 100644
index b82db6e5759..00000000000
--- a/libjava/javax/print/attribute/HashAttributeSet.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashAttributeSet__
-#define __javax_print_attribute_HashAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class HashAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashAttributeSet : public ::java::lang::Object
-{
-
-public:
-  HashAttributeSet();
-  HashAttributeSet(::javax::print::attribute::Attribute *);
-  HashAttributeSet(JArray< ::javax::print::attribute::Attribute * > *);
-  HashAttributeSet(::javax::print::attribute::AttributeSet *);
-public: // actually protected
-  HashAttributeSet(::java::lang::Class *);
-  HashAttributeSet(::javax::print::attribute::Attribute *, ::java::lang::Class *);
-  HashAttributeSet(JArray< ::javax::print::attribute::Attribute * > *, ::java::lang::Class *);
-  HashAttributeSet(::javax::print::attribute::AttributeSet *, ::java::lang::Class *);
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *);
-private:
-  jboolean addInternal(::javax::print::attribute::Attribute *, ::java::lang::Class *);
-public:
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *);
-private:
-  jboolean addAllInternal(::javax::print::attribute::AttributeSet *, ::java::lang::Class *);
-public:
-  virtual void clear();
-  virtual jboolean containsKey(::java::lang::Class *);
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *);
-  virtual jint hashCode();
-  virtual jboolean isEmpty();
-  virtual jboolean remove(::javax::print::attribute::Attribute *);
-  virtual jboolean remove(::java::lang::Class *);
-  virtual jint size();
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 5311560590283707917LL;
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) myInterface;
-  ::java::util::HashMap * attributeMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashAttributeSet__
diff --git a/libjava/javax/print/attribute/HashDocAttributeSet.h b/libjava/javax/print/attribute/HashDocAttributeSet.h
deleted file mode 100644
index 43b9eaec69b..00000000000
--- a/libjava/javax/print/attribute/HashDocAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashDocAttributeSet__
-#define __javax_print_attribute_HashDocAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class DocAttribute;
-          class DocAttributeSet;
-          class HashDocAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashDocAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashDocAttributeSet();
-  HashDocAttributeSet(::javax::print::attribute::DocAttribute *);
-  HashDocAttributeSet(JArray< ::javax::print::attribute::DocAttribute * > *);
-  HashDocAttributeSet(::javax::print::attribute::DocAttributeSet *);
-private:
-  static const jlong serialVersionUID = -1128534486061432528LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashDocAttributeSet__
diff --git a/libjava/javax/print/attribute/HashPrintJobAttributeSet.h b/libjava/javax/print/attribute/HashPrintJobAttributeSet.h
deleted file mode 100644
index 26fde6f998d..00000000000
--- a/libjava/javax/print/attribute/HashPrintJobAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashPrintJobAttributeSet__
-#define __javax_print_attribute_HashPrintJobAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class HashPrintJobAttributeSet;
-          class PrintJobAttribute;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashPrintJobAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashPrintJobAttributeSet();
-  HashPrintJobAttributeSet(::javax::print::attribute::PrintJobAttribute *);
-  HashPrintJobAttributeSet(JArray< ::javax::print::attribute::PrintJobAttribute * > *);
-  HashPrintJobAttributeSet(::javax::print::attribute::PrintJobAttributeSet *);
-private:
-  static const jlong serialVersionUID = -4204473656070350348LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashPrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/HashPrintRequestAttributeSet.h b/libjava/javax/print/attribute/HashPrintRequestAttributeSet.h
deleted file mode 100644
index a1232a21100..00000000000
--- a/libjava/javax/print/attribute/HashPrintRequestAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashPrintRequestAttributeSet__
-#define __javax_print_attribute_HashPrintRequestAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class HashPrintRequestAttributeSet;
-          class PrintRequestAttribute;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashPrintRequestAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashPrintRequestAttributeSet();
-  HashPrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttribute *);
-  HashPrintRequestAttributeSet(JArray< ::javax::print::attribute::PrintRequestAttribute * > *);
-  HashPrintRequestAttributeSet(::javax::print::attribute::PrintRequestAttributeSet *);
-private:
-  static const jlong serialVersionUID = 2364756266107751933LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashPrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/HashPrintServiceAttributeSet.h b/libjava/javax/print/attribute/HashPrintServiceAttributeSet.h
deleted file mode 100644
index abf583a7252..00000000000
--- a/libjava/javax/print/attribute/HashPrintServiceAttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_HashPrintServiceAttributeSet__
-#define __javax_print_attribute_HashPrintServiceAttributeSet__
-
-#pragma interface
-
-#include <javax/print/attribute/HashAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class HashPrintServiceAttributeSet;
-          class PrintServiceAttribute;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::HashPrintServiceAttributeSet : public ::javax::print::attribute::HashAttributeSet
-{
-
-public:
-  HashPrintServiceAttributeSet();
-  HashPrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttribute *);
-  HashPrintServiceAttributeSet(JArray< ::javax::print::attribute::PrintServiceAttribute * > *);
-  HashPrintServiceAttributeSet(::javax::print::attribute::PrintServiceAttributeSet *);
-private:
-  static const jlong serialVersionUID = 6642904616179203070LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_HashPrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/IntegerSyntax.h b/libjava/javax/print/attribute/IntegerSyntax.h
deleted file mode 100644
index 63ac7e04050..00000000000
--- a/libjava/javax/print/attribute/IntegerSyntax.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_IntegerSyntax__
-#define __javax_print_attribute_IntegerSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class IntegerSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::IntegerSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  IntegerSyntax(jint);
-  IntegerSyntax(jint, jint, jint);
-public:
-  virtual jint getValue();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_IntegerSyntax__
diff --git a/libjava/javax/print/attribute/PrintJobAttribute.h b/libjava/javax/print/attribute/PrintJobAttribute.h
deleted file mode 100644
index c22e5d716aa..00000000000
--- a/libjava/javax/print/attribute/PrintJobAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintJobAttribute__
-#define __javax_print_attribute_PrintJobAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class PrintJobAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintJobAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintJobAttribute__
diff --git a/libjava/javax/print/attribute/PrintJobAttributeSet.h b/libjava/javax/print/attribute/PrintJobAttributeSet.h
deleted file mode 100644
index 713ad66cde3..00000000000
--- a/libjava/javax/print/attribute/PrintJobAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintJobAttributeSet__
-#define __javax_print_attribute_PrintJobAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintJobAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintJobAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintJobAttributeSet__
diff --git a/libjava/javax/print/attribute/PrintRequestAttribute.h b/libjava/javax/print/attribute/PrintRequestAttribute.h
deleted file mode 100644
index 7d95bfcb157..00000000000
--- a/libjava/javax/print/attribute/PrintRequestAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintRequestAttribute__
-#define __javax_print_attribute_PrintRequestAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class PrintRequestAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintRequestAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintRequestAttribute__
diff --git a/libjava/javax/print/attribute/PrintRequestAttributeSet.h b/libjava/javax/print/attribute/PrintRequestAttributeSet.h
deleted file mode 100644
index 9929176608b..00000000000
--- a/libjava/javax/print/attribute/PrintRequestAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintRequestAttributeSet__
-#define __javax_print_attribute_PrintRequestAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintRequestAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintRequestAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintRequestAttributeSet__
diff --git a/libjava/javax/print/attribute/PrintServiceAttribute.h b/libjava/javax/print/attribute/PrintServiceAttribute.h
deleted file mode 100644
index eae08643857..00000000000
--- a/libjava/javax/print/attribute/PrintServiceAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintServiceAttribute__
-#define __javax_print_attribute_PrintServiceAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class PrintServiceAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintServiceAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintServiceAttribute__
diff --git a/libjava/javax/print/attribute/PrintServiceAttributeSet.h b/libjava/javax/print/attribute/PrintServiceAttributeSet.h
deleted file mode 100644
index 73db991c915..00000000000
--- a/libjava/javax/print/attribute/PrintServiceAttributeSet.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_PrintServiceAttributeSet__
-#define __javax_print_attribute_PrintServiceAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Attribute;
-          class AttributeSet;
-          class PrintServiceAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::PrintServiceAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean add(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean addAll(::javax::print::attribute::AttributeSet *) = 0;
-  virtual void clear() = 0;
-  virtual jboolean containsKey(::java::lang::Class *) = 0;
-  virtual jboolean containsValue(::javax::print::attribute::Attribute *) = 0;
-  virtual ::javax::print::attribute::Attribute * get(::java::lang::Class *) = 0;
-  virtual jboolean isEmpty() = 0;
-  virtual jboolean remove(::javax::print::attribute::Attribute *) = 0;
-  virtual jboolean remove(::java::lang::Class *) = 0;
-  virtual jint size() = 0;
-  virtual JArray< ::javax::print::attribute::Attribute * > * toArray() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_PrintServiceAttributeSet__
diff --git a/libjava/javax/print/attribute/ResolutionSyntax.h b/libjava/javax/print/attribute/ResolutionSyntax.h
deleted file mode 100644
index 107642dd4c4..00000000000
--- a/libjava/javax/print/attribute/ResolutionSyntax.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_ResolutionSyntax__
-#define __javax_print_attribute_ResolutionSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class ResolutionSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::ResolutionSyntax : public ::java::lang::Object
-{
-
-public:
-  ResolutionSyntax(jint, jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint getCrossFeedResolution(jint);
-public: // actually protected
-  virtual jint getCrossFeedResolutionDphi();
-public:
-  virtual jint getFeedResolution(jint);
-public: // actually protected
-  virtual jint getFeedResolutionDphi();
-public:
-  virtual JArray< jint > * getResolution(jint);
-  virtual jint hashCode();
-  virtual jboolean lessThanOrEquals(::javax::print::attribute::ResolutionSyntax *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jint, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2706743076526672017LL;
-public:
-  static const jint DPCM = 254;
-  static const jint DPI = 100;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) crossFeedResolution;
-  jint feedResolution;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_ResolutionSyntax__
diff --git a/libjava/javax/print/attribute/SetOfIntegerSyntax$1.h b/libjava/javax/print/attribute/SetOfIntegerSyntax$1.h
deleted file mode 100644
index 6c374e4728e..00000000000
--- a/libjava/javax/print/attribute/SetOfIntegerSyntax$1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_SetOfIntegerSyntax$1__
-#define __javax_print_attribute_SetOfIntegerSyntax$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class SetOfIntegerSyntax$1;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::SetOfIntegerSyntax$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  SetOfIntegerSyntax$1();
-public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_SetOfIntegerSyntax$1__
diff --git a/libjava/javax/print/attribute/SetOfIntegerSyntax.h b/libjava/javax/print/attribute/SetOfIntegerSyntax.h
deleted file mode 100644
index 302544fcd60..00000000000
--- a/libjava/javax/print/attribute/SetOfIntegerSyntax.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_SetOfIntegerSyntax__
-#define __javax_print_attribute_SetOfIntegerSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class StringCharacterIterator;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class IntegerSyntax;
-          class SetOfIntegerSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::SetOfIntegerSyntax : public ::java::lang::Object
-{
-
-  static JArray< JArray< jint > * > * normalize(JArray< JArray< jint > * > *, jint);
-public: // actually protected
-  SetOfIntegerSyntax(jint);
-  SetOfIntegerSyntax(JArray< JArray< jint > * > *);
-private:
-  jboolean skipWhitespace(::java::text::StringCharacterIterator *);
-  jboolean skipNumber(::java::text::StringCharacterIterator *);
-public: // actually protected
-  SetOfIntegerSyntax(::java::lang::String *);
-  SetOfIntegerSyntax(jint, jint);
-public:
-  virtual jboolean contains(jint);
-  virtual jboolean contains(::javax::print::attribute::IntegerSyntax *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< JArray< jint > * > * getMembers();
-  virtual jint hashCode();
-  virtual jint next(jint);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 3666874174847632203LL;
-  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) members;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_SetOfIntegerSyntax__
diff --git a/libjava/javax/print/attribute/Size2DSyntax.h b/libjava/javax/print/attribute/Size2DSyntax.h
deleted file mode 100644
index 36280a50ddc..00000000000
--- a/libjava/javax/print/attribute/Size2DSyntax.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_Size2DSyntax__
-#define __javax_print_attribute_Size2DSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class Size2DSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::Size2DSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  Size2DSyntax(jfloat, jfloat, jint);
-  Size2DSyntax(jint, jint, jint);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual JArray< jfloat > * getSize(jint);
-  virtual jfloat getX(jint);
-public: // actually protected
-  virtual jint getXMicrometers();
-public:
-  virtual jfloat getY(jint);
-public: // actually protected
-  virtual jint getYMicrometers();
-public:
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * toString(jint, ::java::lang::String *);
-  static const jint INCH = 25400;
-  static const jint MM = 1000;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_Size2DSyntax__
diff --git a/libjava/javax/print/attribute/SupportedValuesAttribute.h b/libjava/javax/print/attribute/SupportedValuesAttribute.h
deleted file mode 100644
index 26b2b2b8edf..00000000000
--- a/libjava/javax/print/attribute/SupportedValuesAttribute.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_SupportedValuesAttribute__
-#define __javax_print_attribute_SupportedValuesAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class SupportedValuesAttribute;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::SupportedValuesAttribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Class * getCategory() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_attribute_SupportedValuesAttribute__
diff --git a/libjava/javax/print/attribute/TextSyntax.h b/libjava/javax/print/attribute/TextSyntax.h
deleted file mode 100644
index b22700d0b58..00000000000
--- a/libjava/javax/print/attribute/TextSyntax.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_TextSyntax__
-#define __javax_print_attribute_TextSyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class TextSyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::TextSyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  TextSyntax(::java::lang::String *, ::java::util::Locale *);
-public:
-  virtual ::java::lang::String * getValue();
-  virtual ::java::util::Locale * getLocale();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -8130648736378144102LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  ::java::util::Locale * locale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_TextSyntax__
diff --git a/libjava/javax/print/attribute/URISyntax.h b/libjava/javax/print/attribute/URISyntax.h
deleted file mode 100644
index 9c38d5c5e0f..00000000000
--- a/libjava/javax/print/attribute/URISyntax.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_URISyntax__
-#define __javax_print_attribute_URISyntax__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class URISyntax;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::URISyntax : public ::java::lang::Object
-{
-
-public: // actually protected
-  URISyntax(::java::net::URI *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::net::URI * getURI();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -7842661210486401678LL;
-  ::java::net::URI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) uri;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_URISyntax__
diff --git a/libjava/javax/print/attribute/UnmodifiableSetException.h b/libjava/javax/print/attribute/UnmodifiableSetException.h
deleted file mode 100644
index 33bc1289993..00000000000
--- a/libjava/javax/print/attribute/UnmodifiableSetException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_UnmodifiableSetException__
-#define __javax_print_attribute_UnmodifiableSetException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class UnmodifiableSetException;
-      }
-    }
-  }
-}
-
-class javax::print::attribute::UnmodifiableSetException : public ::java::lang::RuntimeException
-{
-
-public:
-  UnmodifiableSetException();
-  UnmodifiableSetException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_UnmodifiableSetException__
diff --git a/libjava/javax/print/attribute/standard/Chromaticity.h b/libjava/javax/print/attribute/standard/Chromaticity.h
deleted file mode 100644
index 9571ef86cc7..00000000000
--- a/libjava/javax/print/attribute/standard/Chromaticity.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Chromaticity__
-#define __javax_print_attribute_standard_Chromaticity__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Chromaticity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Chromaticity : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Chromaticity(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 4660543931355214012LL;
-public:
-  static ::javax::print::attribute::standard::Chromaticity * MONOCHROME;
-  static ::javax::print::attribute::standard::Chromaticity * COLOR;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Chromaticity * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Chromaticity__
diff --git a/libjava/javax/print/attribute/standard/ColorSupported.h b/libjava/javax/print/attribute/standard/ColorSupported.h
deleted file mode 100644
index 085c0cdc24d..00000000000
--- a/libjava/javax/print/attribute/standard/ColorSupported.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_ColorSupported__
-#define __javax_print_attribute_standard_ColorSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class ColorSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::ColorSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  ColorSupported(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -2700555589688535545LL;
-public:
-  static ::javax::print::attribute::standard::ColorSupported * NOT_SUPPORTED;
-  static ::javax::print::attribute::standard::ColorSupported * SUPPORTED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::ColorSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_ColorSupported__
diff --git a/libjava/javax/print/attribute/standard/Compression.h b/libjava/javax/print/attribute/standard/Compression.h
deleted file mode 100644
index f1dc555680c..00000000000
--- a/libjava/javax/print/attribute/standard/Compression.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Compression__
-#define __javax_print_attribute_standard_Compression__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Compression;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Compression : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Compression(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();
-private:
-  static const jlong serialVersionUID = -5716748913324997674LL;
-public:
-  static ::javax::print::attribute::standard::Compression * NONE;
-  static ::javax::print::attribute::standard::Compression * DEFLATE;
-  static ::javax::print::attribute::standard::Compression * GZIP;
-  static ::javax::print::attribute::standard::Compression * COMPRESS;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Compression * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Compression__
diff --git a/libjava/javax/print/attribute/standard/Copies.h b/libjava/javax/print/attribute/standard/Copies.h
deleted file mode 100644
index d2c277c8c7a..00000000000
--- a/libjava/javax/print/attribute/standard/Copies.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Copies__
-#define __javax_print_attribute_standard_Copies__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class Copies;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Copies : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  Copies(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -6426631521680023833LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Copies__
diff --git a/libjava/javax/print/attribute/standard/CopiesSupported.h b/libjava/javax/print/attribute/standard/CopiesSupported.h
deleted file mode 100644
index 62c3428645a..00000000000
--- a/libjava/javax/print/attribute/standard/CopiesSupported.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_CopiesSupported__
-#define __javax_print_attribute_standard_CopiesSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class CopiesSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::CopiesSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  CopiesSupported(jint);
-  CopiesSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6927711687034846001LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_CopiesSupported__
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtCompleted.h b/libjava/javax/print/attribute/standard/DateTimeAtCompleted.h
deleted file mode 100644
index 1b012a34e8c..00000000000
--- a/libjava/javax/print/attribute/standard/DateTimeAtCompleted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DateTimeAtCompleted__
-#define __javax_print_attribute_standard_DateTimeAtCompleted__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DateTimeAtCompleted;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DateTimeAtCompleted : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  DateTimeAtCompleted(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6497399708058490000LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DateTimeAtCompleted__
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtCreation.h b/libjava/javax/print/attribute/standard/DateTimeAtCreation.h
deleted file mode 100644
index a88c7c128fb..00000000000
--- a/libjava/javax/print/attribute/standard/DateTimeAtCreation.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DateTimeAtCreation__
-#define __javax_print_attribute_standard_DateTimeAtCreation__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DateTimeAtCreation;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DateTimeAtCreation : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  DateTimeAtCreation(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2923732231056647903LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DateTimeAtCreation__
diff --git a/libjava/javax/print/attribute/standard/DateTimeAtProcessing.h b/libjava/javax/print/attribute/standard/DateTimeAtProcessing.h
deleted file mode 100644
index 8f50d1b9014..00000000000
--- a/libjava/javax/print/attribute/standard/DateTimeAtProcessing.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DateTimeAtProcessing__
-#define __javax_print_attribute_standard_DateTimeAtProcessing__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DateTimeAtProcessing;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DateTimeAtProcessing : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  DateTimeAtProcessing(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -3710068197278263244LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DateTimeAtProcessing__
diff --git a/libjava/javax/print/attribute/standard/Destination.h b/libjava/javax/print/attribute/standard/Destination.h
deleted file mode 100644
index b9d5d996f46..00000000000
--- a/libjava/javax/print/attribute/standard/Destination.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Destination__
-#define __javax_print_attribute_standard_Destination__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class Destination;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Destination : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  Destination(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6776739171700415321LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Destination__
diff --git a/libjava/javax/print/attribute/standard/DocumentName.h b/libjava/javax/print/attribute/standard/DocumentName.h
deleted file mode 100644
index 6ed7121309e..00000000000
--- a/libjava/javax/print/attribute/standard/DocumentName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_DocumentName__
-#define __javax_print_attribute_standard_DocumentName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class DocumentName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::DocumentName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  DocumentName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7883105848533280430LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_DocumentName__
diff --git a/libjava/javax/print/attribute/standard/Fidelity.h b/libjava/javax/print/attribute/standard/Fidelity.h
deleted file mode 100644
index ac31da58512..00000000000
--- a/libjava/javax/print/attribute/standard/Fidelity.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Fidelity__
-#define __javax_print_attribute_standard_Fidelity__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Fidelity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Fidelity : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Fidelity(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 6320827847329172308LL;
-public:
-  static ::javax::print::attribute::standard::Fidelity * FIDELITY_TRUE;
-  static ::javax::print::attribute::standard::Fidelity * FIDELITY_FALSE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Fidelity * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Fidelity__
diff --git a/libjava/javax/print/attribute/standard/Finishings.h b/libjava/javax/print/attribute/standard/Finishings.h
deleted file mode 100644
index 6b228c815e5..00000000000
--- a/libjava/javax/print/attribute/standard/Finishings.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Finishings__
-#define __javax_print_attribute_standard_Finishings__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Finishings;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Finishings : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Finishings(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();
-  virtual jint getOffset();
-private:
-  static const jlong serialVersionUID = -627840419548391754LL;
-public:
-  static ::javax::print::attribute::standard::Finishings * NONE;
-  static ::javax::print::attribute::standard::Finishings * STAPLE;
-  static ::javax::print::attribute::standard::Finishings * COVER;
-  static ::javax::print::attribute::standard::Finishings * BIND;
-  static ::javax::print::attribute::standard::Finishings * SADDLE_STITCH;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_TOP_LEFT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_BOTTOM_LEFT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_TOP_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_BOTTOM_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_LEFT;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_TOP;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * EDGE_STITCH_BOTTOM;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_LEFT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_TOP;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_RIGHT;
-  static ::javax::print::attribute::standard::Finishings * STAPLE_DUAL_BOTTOM;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Finishings * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Finishings__
diff --git a/libjava/javax/print/attribute/standard/JobHoldUntil.h b/libjava/javax/print/attribute/standard/JobHoldUntil.h
deleted file mode 100644
index c13c5273a79..00000000000
--- a/libjava/javax/print/attribute/standard/JobHoldUntil.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobHoldUntil__
-#define __javax_print_attribute_standard_JobHoldUntil__
-
-#pragma interface
-
-#include <javax/print/attribute/DateTimeSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobHoldUntil;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobHoldUntil : public ::javax::print::attribute::DateTimeSyntax
-{
-
-public:
-  JobHoldUntil(::java::util::Date *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1664471048860415024LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobHoldUntil__
diff --git a/libjava/javax/print/attribute/standard/JobImpressions.h b/libjava/javax/print/attribute/standard/JobImpressions.h
deleted file mode 100644
index 0cf000685db..00000000000
--- a/libjava/javax/print/attribute/standard/JobImpressions.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobImpressions__
-#define __javax_print_attribute_standard_JobImpressions__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobImpressions;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobImpressions : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobImpressions(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 8225537206784322464LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobImpressions__
diff --git a/libjava/javax/print/attribute/standard/JobImpressionsCompleted.h b/libjava/javax/print/attribute/standard/JobImpressionsCompleted.h
deleted file mode 100644
index 37deda52d1c..00000000000
--- a/libjava/javax/print/attribute/standard/JobImpressionsCompleted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobImpressionsCompleted__
-#define __javax_print_attribute_standard_JobImpressionsCompleted__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobImpressionsCompleted;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobImpressionsCompleted : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobImpressionsCompleted(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 6722648442432393294LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobImpressionsCompleted__
diff --git a/libjava/javax/print/attribute/standard/JobImpressionsSupported.h b/libjava/javax/print/attribute/standard/JobImpressionsSupported.h
deleted file mode 100644
index 83f5c1b80d2..00000000000
--- a/libjava/javax/print/attribute/standard/JobImpressionsSupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobImpressionsSupported__
-#define __javax_print_attribute_standard_JobImpressionsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobImpressionsSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobImpressionsSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  JobImpressionsSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4887354803843173692LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobImpressionsSupported__
diff --git a/libjava/javax/print/attribute/standard/JobKOctets.h b/libjava/javax/print/attribute/standard/JobKOctets.h
deleted file mode 100644
index 35241fc1f8d..00000000000
--- a/libjava/javax/print/attribute/standard/JobKOctets.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobKOctets__
-#define __javax_print_attribute_standard_JobKOctets__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobKOctets;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobKOctets : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobKOctets(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -8959710146498202869LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobKOctets__
diff --git a/libjava/javax/print/attribute/standard/JobKOctetsProcessed.h b/libjava/javax/print/attribute/standard/JobKOctetsProcessed.h
deleted file mode 100644
index 8eb274b2caf..00000000000
--- a/libjava/javax/print/attribute/standard/JobKOctetsProcessed.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobKOctetsProcessed__
-#define __javax_print_attribute_standard_JobKOctetsProcessed__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobKOctetsProcessed;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobKOctetsProcessed : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobKOctetsProcessed(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -6265238509657881806LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobKOctetsProcessed__
diff --git a/libjava/javax/print/attribute/standard/JobKOctetsSupported.h b/libjava/javax/print/attribute/standard/JobKOctetsSupported.h
deleted file mode 100644
index 455211eb4bb..00000000000
--- a/libjava/javax/print/attribute/standard/JobKOctetsSupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobKOctetsSupported__
-#define __javax_print_attribute_standard_JobKOctetsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobKOctetsSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobKOctetsSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  JobKOctetsSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2867871140549897443LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobKOctetsSupported__
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheets.h b/libjava/javax/print/attribute/standard/JobMediaSheets.h
deleted file mode 100644
index 4f21d416029..00000000000
--- a/libjava/javax/print/attribute/standard/JobMediaSheets.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMediaSheets__
-#define __javax_print_attribute_standard_JobMediaSheets__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMediaSheets;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMediaSheets : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobMediaSheets(jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 408871131531979741LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMediaSheets__
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.h b/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.h
deleted file mode 100644
index e12bf25359e..00000000000
--- a/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMediaSheetsCompleted__
-#define __javax_print_attribute_standard_JobMediaSheetsCompleted__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMediaSheetsCompleted;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMediaSheetsCompleted : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobMediaSheetsCompleted(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 1739595973810840475LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMediaSheetsCompleted__
diff --git a/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.h b/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.h
deleted file mode 100644
index b451ce4651c..00000000000
--- a/libjava/javax/print/attribute/standard/JobMediaSheetsSupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMediaSheetsSupported__
-#define __javax_print_attribute_standard_JobMediaSheetsSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMediaSheetsSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMediaSheetsSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  JobMediaSheetsSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 2953685470388672940LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMediaSheetsSupported__
diff --git a/libjava/javax/print/attribute/standard/JobMessageFromOperator.h b/libjava/javax/print/attribute/standard/JobMessageFromOperator.h
deleted file mode 100644
index 4c43f0d888a..00000000000
--- a/libjava/javax/print/attribute/standard/JobMessageFromOperator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobMessageFromOperator__
-#define __javax_print_attribute_standard_JobMessageFromOperator__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobMessageFromOperator;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobMessageFromOperator : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobMessageFromOperator(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4620751846003142047LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobMessageFromOperator__
diff --git a/libjava/javax/print/attribute/standard/JobName.h b/libjava/javax/print/attribute/standard/JobName.h
deleted file mode 100644
index 4147be41c4d..00000000000
--- a/libjava/javax/print/attribute/standard/JobName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobName__
-#define __javax_print_attribute_standard_JobName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 4660359192078689545LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobName__
diff --git a/libjava/javax/print/attribute/standard/JobOriginatingUserName.h b/libjava/javax/print/attribute/standard/JobOriginatingUserName.h
deleted file mode 100644
index a3ba06784ae..00000000000
--- a/libjava/javax/print/attribute/standard/JobOriginatingUserName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobOriginatingUserName__
-#define __javax_print_attribute_standard_JobOriginatingUserName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobOriginatingUserName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobOriginatingUserName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  JobOriginatingUserName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -8052537926362933477LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobOriginatingUserName__
diff --git a/libjava/javax/print/attribute/standard/JobPriority.h b/libjava/javax/print/attribute/standard/JobPriority.h
deleted file mode 100644
index 54a46220f16..00000000000
--- a/libjava/javax/print/attribute/standard/JobPriority.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobPriority__
-#define __javax_print_attribute_standard_JobPriority__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobPriority;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobPriority : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobPriority(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4599900369040602769LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobPriority__
diff --git a/libjava/javax/print/attribute/standard/JobPrioritySupported.h b/libjava/javax/print/attribute/standard/JobPrioritySupported.h
deleted file mode 100644
index c131fe76b91..00000000000
--- a/libjava/javax/print/attribute/standard/JobPrioritySupported.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobPrioritySupported__
-#define __javax_print_attribute_standard_JobPrioritySupported__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobPrioritySupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobPrioritySupported : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  JobPrioritySupported(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 2564840378013555894LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobPrioritySupported__
diff --git a/libjava/javax/print/attribute/standard/JobSheets.h b/libjava/javax/print/attribute/standard/JobSheets.h
deleted file mode 100644
index 8ab9c7febf2..00000000000
--- a/libjava/javax/print/attribute/standard/JobSheets.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobSheets__
-#define __javax_print_attribute_standard_JobSheets__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class JobSheets;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobSheets : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  JobSheets(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();
-private:
-  static const jlong serialVersionUID = -4735258056132519759LL;
-public:
-  static ::javax::print::attribute::standard::JobSheets * NONE;
-  static ::javax::print::attribute::standard::JobSheets * STANDARD;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::JobSheets * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobSheets__
diff --git a/libjava/javax/print/attribute/standard/JobState.h b/libjava/javax/print/attribute/standard/JobState.h
deleted file mode 100644
index dc6c1ec7e53..00000000000
--- a/libjava/javax/print/attribute/standard/JobState.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobState__
-#define __javax_print_attribute_standard_JobState__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class JobState;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobState : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  JobState(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();
-private:
-  static const jlong serialVersionUID = 400465010094018920LL;
-public:
-  static ::javax::print::attribute::standard::JobState * UNKNOWN;
-  static ::javax::print::attribute::standard::JobState * PENDING;
-  static ::javax::print::attribute::standard::JobState * PENDING_HELD;
-  static ::javax::print::attribute::standard::JobState * PROCESSING;
-  static ::javax::print::attribute::standard::JobState * PROCESSING_STOPPED;
-  static ::javax::print::attribute::standard::JobState * CANCELED;
-  static ::javax::print::attribute::standard::JobState * ABORTED;
-  static ::javax::print::attribute::standard::JobState * COMPLETED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::JobState * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobState__
diff --git a/libjava/javax/print/attribute/standard/JobStateReason.h b/libjava/javax/print/attribute/standard/JobStateReason.h
deleted file mode 100644
index b641ef6e84f..00000000000
--- a/libjava/javax/print/attribute/standard/JobStateReason.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobStateReason__
-#define __javax_print_attribute_standard_JobStateReason__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class JobStateReason;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobStateReason : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  JobStateReason(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();
-private:
-  static const jlong serialVersionUID = -8765894420449009168LL;
-public:
-  static ::javax::print::attribute::standard::JobStateReason * JOB_INCOMING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_DATA_INSUFFICIENT;
-  static ::javax::print::attribute::standard::JobStateReason * DOCUMENT_ACCESS_ERROR;
-  static ::javax::print::attribute::standard::JobStateReason * SUBMISSION_INTERRUPTED;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_OUTGOING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_HOLD_UNTIL_SPECIFIED;
-  static ::javax::print::attribute::standard::JobStateReason * RESOURCES_ARE_NOT_READY;
-  static ::javax::print::attribute::standard::JobStateReason * PRINTER_STOPPED_PARTLY;
-  static ::javax::print::attribute::standard::JobStateReason * PRINTER_STOPPED;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_INTERPRETING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_QUEUED;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_TRANSFORMING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_QUEUED_FOR_MARKER;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_PRINTING;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_CANCELED_BY_USER;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_CANCELED_BY_OPERATOR;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_CANCELED_AT_DEVICE;
-  static ::javax::print::attribute::standard::JobStateReason * ABORTED_BY_SYSTEM;
-  static ::javax::print::attribute::standard::JobStateReason * UNSUPPORTED_COMPRESSION;
-  static ::javax::print::attribute::standard::JobStateReason * COMPRESSION_ERROR;
-  static ::javax::print::attribute::standard::JobStateReason * UNSUPPORTED_DOCUMENT_FORMAT;
-  static ::javax::print::attribute::standard::JobStateReason * DOCUMENT_FORMAT_ERROR;
-  static ::javax::print::attribute::standard::JobStateReason * PROCESSING_TO_STOP_POINT;
-  static ::javax::print::attribute::standard::JobStateReason * SERVICE_OFF_LINE;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_COMPLETED_SUCCESSFULLY;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_COMPLETED_WITH_WARNINGS;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_COMPLETED_WITH_ERRORS;
-  static ::javax::print::attribute::standard::JobStateReason * JOB_RESTARTABLE;
-  static ::javax::print::attribute::standard::JobStateReason * QUEUED_IN_DEVICE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::JobStateReason * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobStateReason__
diff --git a/libjava/javax/print/attribute/standard/JobStateReasons.h b/libjava/javax/print/attribute/standard/JobStateReasons.h
deleted file mode 100644
index 4e5fce82d60..00000000000
--- a/libjava/javax/print/attribute/standard/JobStateReasons.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_JobStateReasons__
-#define __javax_print_attribute_standard_JobStateReasons__
-
-#pragma interface
-
-#include <java/util/HashSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class JobStateReason;
-            class JobStateReasons;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::JobStateReasons : public ::java::util::HashSet
-{
-
-public:
-  JobStateReasons();
-  JobStateReasons(jint, jfloat);
-  JobStateReasons(jint);
-  JobStateReasons(::java::util::Collection *);
-  jboolean target$add(::javax::print::attribute::standard::JobStateReason *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  jboolean add(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 8849088261264331812LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_JobStateReasons__
diff --git a/libjava/javax/print/attribute/standard/Media.h b/libjava/javax/print/attribute/standard/Media.h
deleted file mode 100644
index e4c013b1594..00000000000
--- a/libjava/javax/print/attribute/standard/Media.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Media__
-#define __javax_print_attribute_standard_Media__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class Media;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Media : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Media(jint);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Class * getCategory();
-  virtual ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2823970704630722439LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Media__
diff --git a/libjava/javax/print/attribute/standard/MediaName.h b/libjava/javax/print/attribute/standard/MediaName.h
deleted file mode 100644
index 160d6bbc461..00000000000
--- a/libjava/javax/print/attribute/standard/MediaName.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaName__
-#define __javax_print_attribute_standard_MediaName__
-
-#pragma interface
-
-#include <javax/print/attribute/standard/Media.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MediaName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaName : public ::javax::print::attribute::standard::Media
-{
-
-public: // actually protected
-  MediaName(jint);
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 4653117714524155448LL;
-public:
-  static ::javax::print::attribute::standard::MediaName * NA_LETTER_WHITE;
-  static ::javax::print::attribute::standard::MediaName * NA_LETTER_TRANSPARENT;
-  static ::javax::print::attribute::standard::MediaName * ISO_A4_WHITE;
-  static ::javax::print::attribute::standard::MediaName * ISO_A4_TRANSPARENT;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MediaName * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaName__
diff --git a/libjava/javax/print/attribute/standard/MediaPrintableArea.h b/libjava/javax/print/attribute/standard/MediaPrintableArea.h
deleted file mode 100644
index 89c96109b74..00000000000
--- a/libjava/javax/print/attribute/standard/MediaPrintableArea.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaPrintableArea__
-#define __javax_print_attribute_standard_MediaPrintableArea__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaPrintableArea;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaPrintableArea : public ::java::lang::Object
-{
-
-public:
-  MediaPrintableArea(jfloat, jfloat, jfloat, jfloat, jint);
-  MediaPrintableArea(jint, jint, jint, jint, jint);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  jfloat getHeight(jint);
-  jfloat getWidth(jint);
-  jfloat getX(jint);
-  jfloat getY(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * toString();
-  jint hashCode();
-  ::java::lang::String * toString(jint, ::java::lang::String *);
-  JArray< jfloat > * getPrintableArea(jint);
-private:
-  static const jlong serialVersionUID = -1597171464050795793LL;
-public:
-  static const jint INCH = 25400;
-  static const jint MM = 1000;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  jint y;
-  jint w;
-  jint h;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaPrintableArea__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$Engineering.h b/libjava/javax/print/attribute/standard/MediaSize$Engineering.h
deleted file mode 100644
index ae8edcce79f..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize$Engineering.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$Engineering__
-#define __javax_print_attribute_standard_MediaSize$Engineering__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$Engineering;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$Engineering : public ::java::lang::Object
-{
-
-  MediaSize$Engineering();
-public:
-  static ::javax::print::attribute::standard::MediaSize * A;
-  static ::javax::print::attribute::standard::MediaSize * B;
-  static ::javax::print::attribute::standard::MediaSize * C;
-  static ::javax::print::attribute::standard::MediaSize * D;
-  static ::javax::print::attribute::standard::MediaSize * E;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$Engineering__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$ISO.h b/libjava/javax/print/attribute/standard/MediaSize$ISO.h
deleted file mode 100644
index 08656462d30..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize$ISO.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$ISO__
-#define __javax_print_attribute_standard_MediaSize$ISO__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$ISO;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$ISO : public ::java::lang::Object
-{
-
-  MediaSize$ISO();
-public:
-  static ::javax::print::attribute::standard::MediaSize * A0;
-  static ::javax::print::attribute::standard::MediaSize * A1;
-  static ::javax::print::attribute::standard::MediaSize * A2;
-  static ::javax::print::attribute::standard::MediaSize * A3;
-  static ::javax::print::attribute::standard::MediaSize * A4;
-  static ::javax::print::attribute::standard::MediaSize * A5;
-  static ::javax::print::attribute::standard::MediaSize * A6;
-  static ::javax::print::attribute::standard::MediaSize * A7;
-  static ::javax::print::attribute::standard::MediaSize * A8;
-  static ::javax::print::attribute::standard::MediaSize * A9;
-  static ::javax::print::attribute::standard::MediaSize * A10;
-  static ::javax::print::attribute::standard::MediaSize * B0;
-  static ::javax::print::attribute::standard::MediaSize * B1;
-  static ::javax::print::attribute::standard::MediaSize * B2;
-  static ::javax::print::attribute::standard::MediaSize * B3;
-  static ::javax::print::attribute::standard::MediaSize * B4;
-  static ::javax::print::attribute::standard::MediaSize * B5;
-  static ::javax::print::attribute::standard::MediaSize * B6;
-  static ::javax::print::attribute::standard::MediaSize * B7;
-  static ::javax::print::attribute::standard::MediaSize * B8;
-  static ::javax::print::attribute::standard::MediaSize * B9;
-  static ::javax::print::attribute::standard::MediaSize * B10;
-  static ::javax::print::attribute::standard::MediaSize * C3;
-  static ::javax::print::attribute::standard::MediaSize * C4;
-  static ::javax::print::attribute::standard::MediaSize * C5;
-  static ::javax::print::attribute::standard::MediaSize * C6;
-  static ::javax::print::attribute::standard::MediaSize * DESIGNATED_LONG;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$ISO__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$JIS.h b/libjava/javax/print/attribute/standard/MediaSize$JIS.h
deleted file mode 100644
index be1545798d6..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize$JIS.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$JIS__
-#define __javax_print_attribute_standard_MediaSize$JIS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$JIS;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$JIS : public ::java::lang::Object
-{
-
-  MediaSize$JIS();
-public:
-  static ::javax::print::attribute::standard::MediaSize * B0;
-  static ::javax::print::attribute::standard::MediaSize * B1;
-  static ::javax::print::attribute::standard::MediaSize * B2;
-  static ::javax::print::attribute::standard::MediaSize * B3;
-  static ::javax::print::attribute::standard::MediaSize * B4;
-  static ::javax::print::attribute::standard::MediaSize * B5;
-  static ::javax::print::attribute::standard::MediaSize * B6;
-  static ::javax::print::attribute::standard::MediaSize * B7;
-  static ::javax::print::attribute::standard::MediaSize * B8;
-  static ::javax::print::attribute::standard::MediaSize * B9;
-  static ::javax::print::attribute::standard::MediaSize * B10;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_1;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_2;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_3;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_4;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_30;
-  static ::javax::print::attribute::standard::MediaSize * CHOU_40;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_0;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_1;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_2;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_20;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_3;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_4;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_5;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_6;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_7;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_8;
-  static ::javax::print::attribute::standard::MediaSize * KAKU_A4;
-  static ::javax::print::attribute::standard::MediaSize * YOU_1;
-  static ::javax::print::attribute::standard::MediaSize * YOU_2;
-  static ::javax::print::attribute::standard::MediaSize * YOU_3;
-  static ::javax::print::attribute::standard::MediaSize * YOU_4;
-  static ::javax::print::attribute::standard::MediaSize * YOU_5;
-  static ::javax::print::attribute::standard::MediaSize * YOU_6;
-  static ::javax::print::attribute::standard::MediaSize * YOU_7;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$JIS__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$NA.h b/libjava/javax/print/attribute/standard/MediaSize$NA.h
deleted file mode 100644
index e0236bfd9aa..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize$NA.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$NA__
-#define __javax_print_attribute_standard_MediaSize$NA__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$NA;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$NA : public ::java::lang::Object
-{
-
-  MediaSize$NA();
-public:
-  static ::javax::print::attribute::standard::MediaSize * LEGAL;
-  static ::javax::print::attribute::standard::MediaSize * LETTER;
-  static ::javax::print::attribute::standard::MediaSize * NA_5X7;
-  static ::javax::print::attribute::standard::MediaSize * NA_8X10;
-  static ::javax::print::attribute::standard::MediaSize * NA_6X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_7X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_9x11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_9x12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_10x13_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_10x14_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_10X15_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_10_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * NA_NUMBER_14_ENVELOPE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$NA__
diff --git a/libjava/javax/print/attribute/standard/MediaSize$Other.h b/libjava/javax/print/attribute/standard/MediaSize$Other.h
deleted file mode 100644
index d95078fbff0..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize$Other.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize$Other__
-#define __javax_print_attribute_standard_MediaSize$Other__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSize$Other;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize$Other : public ::java::lang::Object
-{
-
-  MediaSize$Other();
-public:
-  static ::javax::print::attribute::standard::MediaSize * EXECUTIVE;
-  static ::javax::print::attribute::standard::MediaSize * FOLIO;
-  static ::javax::print::attribute::standard::MediaSize * QUARTO;
-  static ::javax::print::attribute::standard::MediaSize * INVOICE;
-  static ::javax::print::attribute::standard::MediaSize * LEDGER;
-  static ::javax::print::attribute::standard::MediaSize * MONARCH_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * PERSONAL_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * ITALY_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSize * JAPANESE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSize * JAPANESE_DOUBLE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSize * TABLOID;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize$Other__
diff --git a/libjava/javax/print/attribute/standard/MediaSize.h b/libjava/javax/print/attribute/standard/MediaSize.h
deleted file mode 100644
index 3dd5aa9c010..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSize.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSize__
-#define __javax_print_attribute_standard_MediaSize__
-
-#pragma interface
-
-#include <javax/print/attribute/Size2DSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class MediaSize;
-            class MediaSizeName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSize : public ::javax::print::attribute::Size2DSyntax
-{
-
-public:
-  MediaSize(jfloat, jfloat, jint);
-  MediaSize(jfloat, jfloat, jint, ::javax::print::attribute::standard::MediaSizeName *);
-  MediaSize(jint, jint, jint);
-  MediaSize(jint, jint, jint, ::javax::print::attribute::standard::MediaSizeName *);
-  virtual ::java::lang::Class * getCategory();
-  static ::javax::print::attribute::standard::MediaSizeName * findMedia(jfloat, jfloat, jint);
-  static ::javax::print::attribute::standard::MediaSize * getMediaSizeForName(::javax::print::attribute::standard::MediaSizeName *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::javax::print::attribute::standard::MediaSizeName * getMediaSizeName();
-  virtual ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1967958664615414771LL;
-  static ::java::util::ArrayList * mediaCache;
-  ::javax::print::attribute::standard::MediaSizeName * __attribute__((aligned(__alignof__( ::javax::print::attribute::Size2DSyntax)))) mediaName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSize__
diff --git a/libjava/javax/print/attribute/standard/MediaSizeName.h b/libjava/javax/print/attribute/standard/MediaSizeName.h
deleted file mode 100644
index fecbee60593..00000000000
--- a/libjava/javax/print/attribute/standard/MediaSizeName.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaSizeName__
-#define __javax_print_attribute_standard_MediaSizeName__
-
-#pragma interface
-
-#include <javax/print/attribute/standard/Media.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MediaSizeName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaSizeName : public ::javax::print::attribute::standard::Media
-{
-
-public: // actually protected
-  MediaSizeName(jint);
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 2778798329756942747LL;
-public:
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A0;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A1;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A2;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A3;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A4;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A5;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A6;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A7;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A8;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A9;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_A10;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B0;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B1;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B2;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B3;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B4;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B5;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B6;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B7;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B8;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B9;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_B10;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B0;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B1;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B2;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B3;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B4;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B5;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B6;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B7;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B8;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B9;
-  static ::javax::print::attribute::standard::MediaSizeName * JIS_B10;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C0;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C1;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C2;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C3;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C4;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C5;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_C6;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_LETTER;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_LEGAL;
-  static ::javax::print::attribute::standard::MediaSizeName * EXECUTIVE;
-  static ::javax::print::attribute::standard::MediaSizeName * LEDGER;
-  static ::javax::print::attribute::standard::MediaSizeName * TABLOID;
-  static ::javax::print::attribute::standard::MediaSizeName * INVOICE;
-  static ::javax::print::attribute::standard::MediaSizeName * FOLIO;
-  static ::javax::print::attribute::standard::MediaSizeName * QUARTO;
-  static ::javax::print::attribute::standard::MediaSizeName * JAPANESE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSizeName * JAPANESE_DOUBLE_POSTCARD;
-  static ::javax::print::attribute::standard::MediaSizeName * A;
-  static ::javax::print::attribute::standard::MediaSizeName * B;
-  static ::javax::print::attribute::standard::MediaSizeName * C;
-  static ::javax::print::attribute::standard::MediaSizeName * D;
-  static ::javax::print::attribute::standard::MediaSizeName * E;
-  static ::javax::print::attribute::standard::MediaSizeName * ISO_DESIGNATED_LONG;
-  static ::javax::print::attribute::standard::MediaSizeName * ITALY_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * MONARCH_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * PERSONAL_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_10_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_NUMBER_14_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_6X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_7X9_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_9X11_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_9X12_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_10X13_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_10X14_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_10X15_ENVELOPE;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_5X7;
-  static ::javax::print::attribute::standard::MediaSizeName * NA_8X10;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MediaSizeName * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaSizeName__
diff --git a/libjava/javax/print/attribute/standard/MediaTray.h b/libjava/javax/print/attribute/standard/MediaTray.h
deleted file mode 100644
index 05fe123f3ea..00000000000
--- a/libjava/javax/print/attribute/standard/MediaTray.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MediaTray__
-#define __javax_print_attribute_standard_MediaTray__
-
-#pragma interface
-
-#include <javax/print/attribute/standard/Media.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MediaTray;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MediaTray : public ::javax::print::attribute::standard::Media
-{
-
-public: // actually protected
-  MediaTray(jint);
-  virtual JArray< ::java::lang::String * > * getStringTable();
-  virtual JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -982503611095214703LL;
-public:
-  static ::javax::print::attribute::standard::MediaTray * TOP;
-  static ::javax::print::attribute::standard::MediaTray * MIDDLE;
-  static ::javax::print::attribute::standard::MediaTray * BOTTOM;
-  static ::javax::print::attribute::standard::MediaTray * ENVELOPE;
-  static ::javax::print::attribute::standard::MediaTray * MANUAL;
-  static ::javax::print::attribute::standard::MediaTray * LARGE_CAPACITY;
-  static ::javax::print::attribute::standard::MediaTray * MAIN;
-  static ::javax::print::attribute::standard::MediaTray * SIDE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MediaTray * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MediaTray__
diff --git a/libjava/javax/print/attribute/standard/MultipleDocumentHandling.h b/libjava/javax/print/attribute/standard/MultipleDocumentHandling.h
deleted file mode 100644
index 27489968e45..00000000000
--- a/libjava/javax/print/attribute/standard/MultipleDocumentHandling.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_MultipleDocumentHandling__
-#define __javax_print_attribute_standard_MultipleDocumentHandling__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class MultipleDocumentHandling;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::MultipleDocumentHandling : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  MultipleDocumentHandling(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();
-private:
-  static const jlong serialVersionUID = 8098326460746413466LL;
-public:
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SINGLE_DOCUMENT;
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES;
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SEPARATE_DOCUMENTS_COLLATED_COPIES;
-  static ::javax::print::attribute::standard::MultipleDocumentHandling * SINGLE_DOCUMENT_NEW_SHEET;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::MultipleDocumentHandling * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_MultipleDocumentHandling__
diff --git a/libjava/javax/print/attribute/standard/NumberOfDocuments.h b/libjava/javax/print/attribute/standard/NumberOfDocuments.h
deleted file mode 100644
index 58eae0b5c0a..00000000000
--- a/libjava/javax/print/attribute/standard/NumberOfDocuments.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberOfDocuments__
-#define __javax_print_attribute_standard_NumberOfDocuments__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberOfDocuments;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberOfDocuments : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  NumberOfDocuments(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7891881310684461097LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberOfDocuments__
diff --git a/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.h b/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.h
deleted file mode 100644
index cdca46991a2..00000000000
--- a/libjava/javax/print/attribute/standard/NumberOfInterveningJobs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberOfInterveningJobs__
-#define __javax_print_attribute_standard_NumberOfInterveningJobs__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberOfInterveningJobs;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberOfInterveningJobs : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  NumberOfInterveningJobs(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 2568141124844982746LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberOfInterveningJobs__
diff --git a/libjava/javax/print/attribute/standard/NumberUp.h b/libjava/javax/print/attribute/standard/NumberUp.h
deleted file mode 100644
index dfa108f868d..00000000000
--- a/libjava/javax/print/attribute/standard/NumberUp.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberUp__
-#define __javax_print_attribute_standard_NumberUp__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberUp;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberUp : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  NumberUp(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -3040436486786527811LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberUp__
diff --git a/libjava/javax/print/attribute/standard/NumberUpSupported.h b/libjava/javax/print/attribute/standard/NumberUpSupported.h
deleted file mode 100644
index aff84dd1f7a..00000000000
--- a/libjava/javax/print/attribute/standard/NumberUpSupported.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_NumberUpSupported__
-#define __javax_print_attribute_standard_NumberUpSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class NumberUpSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::NumberUpSupported : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  NumberUpSupported(jint);
-  NumberUpSupported(JArray< JArray< jint > * > *);
-  NumberUpSupported(jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1041573395759141805LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_NumberUpSupported__
diff --git a/libjava/javax/print/attribute/standard/OrientationRequested.h b/libjava/javax/print/attribute/standard/OrientationRequested.h
deleted file mode 100644
index 28e0fc13d63..00000000000
--- a/libjava/javax/print/attribute/standard/OrientationRequested.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_OrientationRequested__
-#define __javax_print_attribute_standard_OrientationRequested__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class OrientationRequested;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::OrientationRequested : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  OrientationRequested(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();
-private:
-  static const jlong serialVersionUID = -4447437289862822276LL;
-public:
-  static ::javax::print::attribute::standard::OrientationRequested * PORTRAIT;
-  static ::javax::print::attribute::standard::OrientationRequested * LANDSCAPE;
-  static ::javax::print::attribute::standard::OrientationRequested * REVERSE_LANDSCAPE;
-  static ::javax::print::attribute::standard::OrientationRequested * REVERSE_PORTRAIT;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::OrientationRequested * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_OrientationRequested__
diff --git a/libjava/javax/print/attribute/standard/OutputDeviceAssigned.h b/libjava/javax/print/attribute/standard/OutputDeviceAssigned.h
deleted file mode 100644
index de03f87193e..00000000000
--- a/libjava/javax/print/attribute/standard/OutputDeviceAssigned.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_OutputDeviceAssigned__
-#define __javax_print_attribute_standard_OutputDeviceAssigned__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class OutputDeviceAssigned;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::OutputDeviceAssigned : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  OutputDeviceAssigned(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 5486733778854271081LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_OutputDeviceAssigned__
diff --git a/libjava/javax/print/attribute/standard/PDLOverrideSupported.h b/libjava/javax/print/attribute/standard/PDLOverrideSupported.h
deleted file mode 100644
index 525b8781e1a..00000000000
--- a/libjava/javax/print/attribute/standard/PDLOverrideSupported.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PDLOverrideSupported__
-#define __javax_print_attribute_standard_PDLOverrideSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PDLOverrideSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PDLOverrideSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PDLOverrideSupported(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();
-private:
-  static const jlong serialVersionUID = -4393264467928463934LL;
-public:
-  static ::javax::print::attribute::standard::PDLOverrideSupported * NOT_ATTEMPTED;
-  static ::javax::print::attribute::standard::PDLOverrideSupported * ATTEMPTED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PDLOverrideSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PDLOverrideSupported__
diff --git a/libjava/javax/print/attribute/standard/PageRanges.h b/libjava/javax/print/attribute/standard/PageRanges.h
deleted file mode 100644
index 115553060ed..00000000000
--- a/libjava/javax/print/attribute/standard/PageRanges.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PageRanges__
-#define __javax_print_attribute_standard_PageRanges__
-
-#pragma interface
-
-#include <javax/print/attribute/SetOfIntegerSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PageRanges;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PageRanges : public ::javax::print::attribute::SetOfIntegerSyntax
-{
-
-public:
-  PageRanges(jint);
-  PageRanges(JArray< JArray< jint > * > *);
-  PageRanges(jint, jint);
-  PageRanges(::java::lang::String *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 8639895197656148392LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PageRanges__
diff --git a/libjava/javax/print/attribute/standard/PagesPerMinute.h b/libjava/javax/print/attribute/standard/PagesPerMinute.h
deleted file mode 100644
index c237fe9dc86..00000000000
--- a/libjava/javax/print/attribute/standard/PagesPerMinute.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PagesPerMinute__
-#define __javax_print_attribute_standard_PagesPerMinute__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PagesPerMinute;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PagesPerMinute : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  PagesPerMinute(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -6366403993072862015LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PagesPerMinute__
diff --git a/libjava/javax/print/attribute/standard/PagesPerMinuteColor.h b/libjava/javax/print/attribute/standard/PagesPerMinuteColor.h
deleted file mode 100644
index fad634af9b1..00000000000
--- a/libjava/javax/print/attribute/standard/PagesPerMinuteColor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PagesPerMinuteColor__
-#define __javax_print_attribute_standard_PagesPerMinuteColor__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PagesPerMinuteColor;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PagesPerMinuteColor : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  PagesPerMinuteColor(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 1684993151687470944LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PagesPerMinuteColor__
diff --git a/libjava/javax/print/attribute/standard/PresentationDirection.h b/libjava/javax/print/attribute/standard/PresentationDirection.h
deleted file mode 100644
index cae02422fad..00000000000
--- a/libjava/javax/print/attribute/standard/PresentationDirection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PresentationDirection__
-#define __javax_print_attribute_standard_PresentationDirection__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PresentationDirection;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PresentationDirection : public ::javax::print::attribute::EnumSyntax
-{
-
-  PresentationDirection(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 8294728067230931780LL;
-public:
-  static ::javax::print::attribute::standard::PresentationDirection * TOBOTTOM_TORIGHT;
-  static ::javax::print::attribute::standard::PresentationDirection * TOBOTTOM_TOLEFT;
-  static ::javax::print::attribute::standard::PresentationDirection * TOTOP_TORIGHT;
-  static ::javax::print::attribute::standard::PresentationDirection * TOTOP_TOLEFT;
-  static ::javax::print::attribute::standard::PresentationDirection * TORIGHT_TOBOTTOM;
-  static ::javax::print::attribute::standard::PresentationDirection * TORIGHT_TOTOP;
-  static ::javax::print::attribute::standard::PresentationDirection * TOLEFT_TOBOTTOM;
-  static ::javax::print::attribute::standard::PresentationDirection * TOLEFT_TOTOP;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PresentationDirection * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PresentationDirection__
diff --git a/libjava/javax/print/attribute/standard/PrintQuality.h b/libjava/javax/print/attribute/standard/PrintQuality.h
deleted file mode 100644
index 6c696d6c92c..00000000000
--- a/libjava/javax/print/attribute/standard/PrintQuality.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrintQuality__
-#define __javax_print_attribute_standard_PrintQuality__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrintQuality;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrintQuality : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrintQuality(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();
-  virtual jint getOffset();
-private:
-  static const jlong serialVersionUID = -3072341285225858365LL;
-public:
-  static ::javax::print::attribute::standard::PrintQuality * DRAFT;
-  static ::javax::print::attribute::standard::PrintQuality * NORMAL;
-  static ::javax::print::attribute::standard::PrintQuality * HIGH;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrintQuality * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrintQuality__
diff --git a/libjava/javax/print/attribute/standard/PrinterInfo.h b/libjava/javax/print/attribute/standard/PrinterInfo.h
deleted file mode 100644
index 8f9f8281e21..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterInfo.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterInfo__
-#define __javax_print_attribute_standard_PrinterInfo__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterInfo;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterInfo : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterInfo(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7765280618777599727LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterInfo__
diff --git a/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.h b/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.h
deleted file mode 100644
index 2b8fdbfe8f0..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterIsAcceptingJobs.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterIsAcceptingJobs__
-#define __javax_print_attribute_standard_PrinterIsAcceptingJobs__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrinterIsAcceptingJobs;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterIsAcceptingJobs : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrinterIsAcceptingJobs(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -5052010680537678061LL;
-public:
-  static ::javax::print::attribute::standard::PrinterIsAcceptingJobs * NOT_ACCEPTING_JOBS;
-  static ::javax::print::attribute::standard::PrinterIsAcceptingJobs * ACCEPTING_JOBS;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrinterIsAcceptingJobs * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterIsAcceptingJobs__
diff --git a/libjava/javax/print/attribute/standard/PrinterLocation.h b/libjava/javax/print/attribute/standard/PrinterLocation.h
deleted file mode 100644
index 8839a0996ef..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterLocation.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterLocation__
-#define __javax_print_attribute_standard_PrinterLocation__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterLocation;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterLocation : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterLocation(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -1598610039865566337LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterLocation__
diff --git a/libjava/javax/print/attribute/standard/PrinterMakeAndModel.h b/libjava/javax/print/attribute/standard/PrinterMakeAndModel.h
deleted file mode 100644
index a121d9d18d4..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterMakeAndModel.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMakeAndModel__
-#define __javax_print_attribute_standard_PrinterMakeAndModel__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMakeAndModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMakeAndModel : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterMakeAndModel(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 4580461489499351411LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMakeAndModel__
diff --git a/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.h b/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.h
deleted file mode 100644
index 1028729215b..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterMessageFromOperator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMessageFromOperator__
-#define __javax_print_attribute_standard_PrinterMessageFromOperator__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMessageFromOperator;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMessageFromOperator : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterMessageFromOperator(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -4486871203218629318LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMessageFromOperator__
diff --git a/libjava/javax/print/attribute/standard/PrinterMoreInfo.h b/libjava/javax/print/attribute/standard/PrinterMoreInfo.h
deleted file mode 100644
index 3a979cf950a..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterMoreInfo.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMoreInfo__
-#define __javax_print_attribute_standard_PrinterMoreInfo__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMoreInfo;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMoreInfo : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterMoreInfo(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 4555850007675338574LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMoreInfo__
diff --git a/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.h b/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.h
deleted file mode 100644
index bd7c297b391..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterMoreInfoManufacturer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterMoreInfoManufacturer__
-#define __javax_print_attribute_standard_PrinterMoreInfoManufacturer__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterMoreInfoManufacturer;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterMoreInfoManufacturer : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterMoreInfoManufacturer(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 3323271346485076608LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterMoreInfoManufacturer__
diff --git a/libjava/javax/print/attribute/standard/PrinterName.h b/libjava/javax/print/attribute/standard/PrinterName.h
deleted file mode 100644
index fd70e824c6b..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterName__
-#define __javax_print_attribute_standard_PrinterName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  PrinterName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 299740639137803127LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterName__
diff --git a/libjava/javax/print/attribute/standard/PrinterResolution.h b/libjava/javax/print/attribute/standard/PrinterResolution.h
deleted file mode 100644
index a0a5b49c2a8..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterResolution.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterResolution__
-#define __javax_print_attribute_standard_PrinterResolution__
-
-#pragma interface
-
-#include <javax/print/attribute/ResolutionSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterResolution;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterResolution : public ::javax::print::attribute::ResolutionSyntax
-{
-
-public:
-  PrinterResolution(jint, jint, jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 13090306561090558LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterResolution__
diff --git a/libjava/javax/print/attribute/standard/PrinterState.h b/libjava/javax/print/attribute/standard/PrinterState.h
deleted file mode 100644
index 7efde73334c..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterState.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterState__
-#define __javax_print_attribute_standard_PrinterState__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrinterState;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterState : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrinterState(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -649578618346507718LL;
-public:
-  static ::javax::print::attribute::standard::PrinterState * UNKNOWN;
-  static ::javax::print::attribute::standard::PrinterState * IDLE;
-  static ::javax::print::attribute::standard::PrinterState * PROCESSING;
-  static ::javax::print::attribute::standard::PrinterState * STOPPED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrinterState * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterState__
diff --git a/libjava/javax/print/attribute/standard/PrinterStateReason.h b/libjava/javax/print/attribute/standard/PrinterStateReason.h
deleted file mode 100644
index 04b83358af9..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterStateReason.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterStateReason__
-#define __javax_print_attribute_standard_PrinterStateReason__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class PrinterStateReason;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterStateReason : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  PrinterStateReason(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();
-private:
-  static const jlong serialVersionUID = -1623720656201472593LL;
-public:
-  static ::javax::print::attribute::standard::PrinterStateReason * OTHER;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_NEEDED;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_JAM;
-  static ::javax::print::attribute::standard::PrinterStateReason * MOVING_TO_PAUSED;
-  static ::javax::print::attribute::standard::PrinterStateReason * PAUSED;
-  static ::javax::print::attribute::standard::PrinterStateReason * SHUTDOWN;
-  static ::javax::print::attribute::standard::PrinterStateReason * CONNECTING_TO_DEVICE;
-  static ::javax::print::attribute::standard::PrinterStateReason * TIMED_OUT;
-  static ::javax::print::attribute::standard::PrinterStateReason * STOPPING;
-  static ::javax::print::attribute::standard::PrinterStateReason * STOPPED_PARTLY;
-  static ::javax::print::attribute::standard::PrinterStateReason * TONER_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * TONER_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * SPOOL_AREA_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * COVER_OPEN;
-  static ::javax::print::attribute::standard::PrinterStateReason * INTERLOCK_OPEN;
-  static ::javax::print::attribute::standard::PrinterStateReason * DOOR_OPEN;
-  static ::javax::print::attribute::standard::PrinterStateReason * INPUT_TRAY_MISSING;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * MEDIA_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * OUTPUT_TRAY_MISSING;
-  static ::javax::print::attribute::standard::PrinterStateReason * OUTPUT_AREA_ALMOST_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * OUTPUT_AREA_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_SUPPLY_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_SUPPLY_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_WASTE_ALMOST_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * MARKER_WASTE_FULL;
-  static ::javax::print::attribute::standard::PrinterStateReason * FUSER_OVER_TEMP;
-  static ::javax::print::attribute::standard::PrinterStateReason * FUSER_UNDER_TEMP;
-  static ::javax::print::attribute::standard::PrinterStateReason * OPC_NEAR_EOL;
-  static ::javax::print::attribute::standard::PrinterStateReason * OPC_LIFE_OVER;
-  static ::javax::print::attribute::standard::PrinterStateReason * DEVELOPER_LOW;
-  static ::javax::print::attribute::standard::PrinterStateReason * DEVELOPER_EMPTY;
-  static ::javax::print::attribute::standard::PrinterStateReason * INTERPRETER_RESOURCE_UNAVAILABLE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::PrinterStateReason * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterStateReason__
diff --git a/libjava/javax/print/attribute/standard/PrinterStateReasons.h b/libjava/javax/print/attribute/standard/PrinterStateReasons.h
deleted file mode 100644
index bedc8b81d54..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterStateReasons.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterStateReasons__
-#define __javax_print_attribute_standard_PrinterStateReasons__
-
-#pragma interface
-
-#include <java/util/HashMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterStateReason;
-            class PrinterStateReasons;
-            class Severity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterStateReasons : public ::java::util::HashMap
-{
-
-public:
-  PrinterStateReasons();
-  PrinterStateReasons(jint, jfloat);
-  PrinterStateReasons(jint);
-  PrinterStateReasons(::java::util::Map *);
-  ::java::util::Set * printerStateReasonSet(::javax::print::attribute::standard::Severity *);
-  ::javax::print::attribute::standard::Severity * target$put(::javax::print::attribute::standard::PrinterStateReason *, ::javax::print::attribute::standard::Severity *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-  ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -3731791085163619457LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterStateReasons__
diff --git a/libjava/javax/print/attribute/standard/PrinterURI.h b/libjava/javax/print/attribute/standard/PrinterURI.h
deleted file mode 100644
index b5dc5c269d4..00000000000
--- a/libjava/javax/print/attribute/standard/PrinterURI.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_PrinterURI__
-#define __javax_print_attribute_standard_PrinterURI__
-
-#pragma interface
-
-#include <javax/print/attribute/URISyntax.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URI;
-    }
-  }
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class PrinterURI;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::PrinterURI : public ::javax::print::attribute::URISyntax
-{
-
-public:
-  PrinterURI(::java::net::URI *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7923912792485606497LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_PrinterURI__
diff --git a/libjava/javax/print/attribute/standard/QueuedJobCount.h b/libjava/javax/print/attribute/standard/QueuedJobCount.h
deleted file mode 100644
index d1b115466d3..00000000000
--- a/libjava/javax/print/attribute/standard/QueuedJobCount.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_QueuedJobCount__
-#define __javax_print_attribute_standard_QueuedJobCount__
-
-#pragma interface
-
-#include <javax/print/attribute/IntegerSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class QueuedJobCount;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::QueuedJobCount : public ::javax::print::attribute::IntegerSyntax
-{
-
-public:
-  QueuedJobCount(jint);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = 7499723077864047742LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_QueuedJobCount__
diff --git a/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.h b/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.h
deleted file mode 100644
index c0cdd6783ca..00000000000
--- a/libjava/javax/print/attribute/standard/ReferenceUriSchemesSupported.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_ReferenceUriSchemesSupported__
-#define __javax_print_attribute_standard_ReferenceUriSchemesSupported__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class ReferenceUriSchemesSupported;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::ReferenceUriSchemesSupported : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  ReferenceUriSchemesSupported(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();
-private:
-  static const jlong serialVersionUID = -8989076942813442805LL;
-public:
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * FTP;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * HTTP;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * HTTPS;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * GOPHER;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * NEWS;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * NNTP;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * WAIS;
-  static ::javax::print::attribute::standard::ReferenceUriSchemesSupported * FILE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::ReferenceUriSchemesSupported * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_ReferenceUriSchemesSupported__
diff --git a/libjava/javax/print/attribute/standard/RequestingUserName.h b/libjava/javax/print/attribute/standard/RequestingUserName.h
deleted file mode 100644
index f562e2616cb..00000000000
--- a/libjava/javax/print/attribute/standard/RequestingUserName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_RequestingUserName__
-#define __javax_print_attribute_standard_RequestingUserName__
-
-#pragma interface
-
-#include <javax/print/attribute/TextSyntax.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-        namespace standard
-        {
-            class RequestingUserName;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::RequestingUserName : public ::javax::print::attribute::TextSyntax
-{
-
-public:
-  RequestingUserName(::java::lang::String *, ::java::util::Locale *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-private:
-  static const jlong serialVersionUID = -2683049894310331454LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_RequestingUserName__
diff --git a/libjava/javax/print/attribute/standard/Severity.h b/libjava/javax/print/attribute/standard/Severity.h
deleted file mode 100644
index ea302530894..00000000000
--- a/libjava/javax/print/attribute/standard/Severity.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Severity__
-#define __javax_print_attribute_standard_Severity__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Severity;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Severity : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Severity(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 8781881462717925380LL;
-public:
-  static ::javax::print::attribute::standard::Severity * REPORT;
-  static ::javax::print::attribute::standard::Severity * WARNING;
-  static ::javax::print::attribute::standard::Severity * ERROR;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Severity * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Severity__
diff --git a/libjava/javax/print/attribute/standard/SheetCollate.h b/libjava/javax/print/attribute/standard/SheetCollate.h
deleted file mode 100644
index 81d40cb60a5..00000000000
--- a/libjava/javax/print/attribute/standard/SheetCollate.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_SheetCollate__
-#define __javax_print_attribute_standard_SheetCollate__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class SheetCollate;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::SheetCollate : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  SheetCollate(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = 7080587914259873003LL;
-public:
-  static ::javax::print::attribute::standard::SheetCollate * UNCOLLATED;
-  static ::javax::print::attribute::standard::SheetCollate * COLLATED;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::SheetCollate * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_SheetCollate__
diff --git a/libjava/javax/print/attribute/standard/Sides.h b/libjava/javax/print/attribute/standard/Sides.h
deleted file mode 100644
index 9f3072bd8e2..00000000000
--- a/libjava/javax/print/attribute/standard/Sides.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_attribute_standard_Sides__
-#define __javax_print_attribute_standard_Sides__
-
-#pragma interface
-
-#include <javax/print/attribute/EnumSyntax.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace attribute
-      {
-          class EnumSyntax;
-        namespace standard
-        {
-            class Sides;
-        }
-      }
-    }
-  }
-}
-
-class javax::print::attribute::standard::Sides : public ::javax::print::attribute::EnumSyntax
-{
-
-public: // actually protected
-  Sides(jint);
-public:
-  ::java::lang::Class * getCategory();
-  ::java::lang::String * getName();
-public: // actually protected
-  JArray< ::java::lang::String * > * getStringTable();
-  JArray< ::javax::print::attribute::EnumSyntax * > * getEnumValueTable();
-private:
-  static const jlong serialVersionUID = -6890309414893262822LL;
-public:
-  static ::javax::print::attribute::standard::Sides * ONE_SIDED;
-  static ::javax::print::attribute::standard::Sides * TWO_SIDED_LONG_EDGE;
-  static ::javax::print::attribute::standard::Sides * TWO_SIDED_SHORT_EDGE;
-  static ::javax::print::attribute::standard::Sides * DUPLEX;
-  static ::javax::print::attribute::standard::Sides * TUMBLE;
-private:
-  static JArray< ::java::lang::String * > * stringTable;
-  static JArray< ::javax::print::attribute::standard::Sides * > * enumValueTable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_attribute_standard_Sides__
diff --git a/libjava/javax/print/event/PrintEvent.h b/libjava/javax/print/event/PrintEvent.h
deleted file mode 100644
index e69675adf1c..00000000000
--- a/libjava/javax/print/event/PrintEvent.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintEvent__
-#define __javax_print_event_PrintEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintEvent : public ::java::util::EventObject
-{
-
-public:
-  PrintEvent(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintEvent__
diff --git a/libjava/javax/print/event/PrintJobAdapter.h b/libjava/javax/print/event/PrintJobAdapter.h
deleted file mode 100644
index 2137f467dca..00000000000
--- a/libjava/javax/print/event/PrintJobAdapter.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobAdapter__
-#define __javax_print_event_PrintJobAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintJobAdapter;
-          class PrintJobEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobAdapter : public ::java::lang::Object
-{
-
-public:
-  PrintJobAdapter();
-  virtual void printDataTransferCompleted(::javax::print::event::PrintJobEvent *);
-  virtual void printJobCanceled(::javax::print::event::PrintJobEvent *);
-  virtual void printJobCompleted(::javax::print::event::PrintJobEvent *);
-  virtual void printJobFailed(::javax::print::event::PrintJobEvent *);
-  virtual void printJobNoMoreEvents(::javax::print::event::PrintJobEvent *);
-  virtual void printJobRequiresAttention(::javax::print::event::PrintJobEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintJobAdapter__
diff --git a/libjava/javax/print/event/PrintJobAttributeEvent.h b/libjava/javax/print/event/PrintJobAttributeEvent.h
deleted file mode 100644
index d3fcc6c39f5..00000000000
--- a/libjava/javax/print/event/PrintJobAttributeEvent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobAttributeEvent__
-#define __javax_print_event_PrintJobAttributeEvent__
-
-#pragma interface
-
-#include <javax/print/event/PrintEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocPrintJob;
-      namespace attribute
-      {
-          class PrintJobAttributeSet;
-      }
-      namespace event
-      {
-          class PrintJobAttributeEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobAttributeEvent : public ::javax::print::event::PrintEvent
-{
-
-public:
-  PrintJobAttributeEvent(::javax::print::DocPrintJob *, ::javax::print::attribute::PrintJobAttributeSet *);
-  virtual ::javax::print::DocPrintJob * getPrintJob();
-  virtual ::javax::print::attribute::PrintJobAttributeSet * getAttributes();
-private:
-  static const jlong serialVersionUID = -6534469883874742101LL;
-  ::javax::print::attribute::PrintJobAttributeSet * __attribute__((aligned(__alignof__( ::javax::print::event::PrintEvent)))) attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintJobAttributeEvent__
diff --git a/libjava/javax/print/event/PrintJobAttributeListener.h b/libjava/javax/print/event/PrintJobAttributeListener.h
deleted file mode 100644
index 7b7581c4d5e..00000000000
--- a/libjava/javax/print/event/PrintJobAttributeListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobAttributeListener__
-#define __javax_print_event_PrintJobAttributeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintJobAttributeEvent;
-          class PrintJobAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobAttributeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void attributeUpdate(::javax::print::event::PrintJobAttributeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_event_PrintJobAttributeListener__
diff --git a/libjava/javax/print/event/PrintJobEvent.h b/libjava/javax/print/event/PrintJobEvent.h
deleted file mode 100644
index a052e07d60f..00000000000
--- a/libjava/javax/print/event/PrintJobEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobEvent__
-#define __javax_print_event_PrintJobEvent__
-
-#pragma interface
-
-#include <javax/print/event/PrintEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class DocPrintJob;
-      namespace event
-      {
-          class PrintJobEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobEvent : public ::javax::print::event::PrintEvent
-{
-
-public:
-  PrintJobEvent(::javax::print::DocPrintJob *, jint);
-  virtual jint getPrintEventType();
-  virtual ::javax::print::DocPrintJob * getPrintJob();
-private:
-  static const jlong serialVersionUID = -1711656903622072997LL;
-public:
-  static const jint DATA_TRANSFER_COMPLETE = 106;
-  static const jint JOB_CANCELED = 101;
-  static const jint JOB_COMPLETE = 102;
-  static const jint JOB_FAILED = 103;
-  static const jint NO_MORE_EVENTS = 105;
-  static const jint REQUIRES_ATTENTION = 104;
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::print::event::PrintEvent)))) reason;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintJobEvent__
diff --git a/libjava/javax/print/event/PrintJobListener.h b/libjava/javax/print/event/PrintJobListener.h
deleted file mode 100644
index 2dbc20e4ca9..00000000000
--- a/libjava/javax/print/event/PrintJobListener.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintJobListener__
-#define __javax_print_event_PrintJobListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintJobEvent;
-          class PrintJobListener;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintJobListener : public ::java::lang::Object
-{
-
-public:
-  virtual void printDataTransferCompleted(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobCanceled(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobCompleted(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobFailed(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobNoMoreEvents(::javax::print::event::PrintJobEvent *) = 0;
-  virtual void printJobRequiresAttention(::javax::print::event::PrintJobEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_event_PrintJobListener__
diff --git a/libjava/javax/print/event/PrintServiceAttributeEvent.h b/libjava/javax/print/event/PrintServiceAttributeEvent.h
deleted file mode 100644
index baceddb9a4c..00000000000
--- a/libjava/javax/print/event/PrintServiceAttributeEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintServiceAttributeEvent__
-#define __javax_print_event_PrintServiceAttributeEvent__
-
-#pragma interface
-
-#include <javax/print/event/PrintEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-        class PrintService;
-      namespace attribute
-      {
-          class PrintServiceAttributeSet;
-      }
-      namespace event
-      {
-          class PrintServiceAttributeEvent;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintServiceAttributeEvent : public ::javax::print::event::PrintEvent
-{
-
-public:
-  PrintServiceAttributeEvent(::javax::print::PrintService *, ::javax::print::attribute::PrintServiceAttributeSet *);
-  virtual ::javax::print::PrintService * getPrintService();
-  virtual ::javax::print::attribute::PrintServiceAttributeSet * getAttributes();
-private:
-  ::javax::print::attribute::PrintServiceAttributeSet * __attribute__((aligned(__alignof__( ::javax::print::event::PrintEvent)))) attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_print_event_PrintServiceAttributeEvent__
diff --git a/libjava/javax/print/event/PrintServiceAttributeListener.h b/libjava/javax/print/event/PrintServiceAttributeListener.h
deleted file mode 100644
index 95b52368563..00000000000
--- a/libjava/javax/print/event/PrintServiceAttributeListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_print_event_PrintServiceAttributeListener__
-#define __javax_print_event_PrintServiceAttributeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace print
-    {
-      namespace event
-      {
-          class PrintServiceAttributeEvent;
-          class PrintServiceAttributeListener;
-      }
-    }
-  }
-}
-
-class javax::print::event::PrintServiceAttributeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void attributeUpdate(::javax::print::event::PrintServiceAttributeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_print_event_PrintServiceAttributeListener__
diff --git a/libjava/javax/rmi/CORBA/ClassDesc.h b/libjava/javax/rmi/CORBA/ClassDesc.h
deleted file mode 100644
index 39d37b95175..00000000000
--- a/libjava/javax/rmi/CORBA/ClassDesc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_ClassDesc__
-#define __javax_rmi_CORBA_ClassDesc__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class ClassDesc;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::ClassDesc : public ::java::lang::Object
-{
-
-public:
-  ClassDesc();
-private:
-  static const jlong serialVersionUID = -3477057297839810709LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) repid;
-  ::java::lang::String * codebase;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_CORBA_ClassDesc__
diff --git a/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.h b/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.h
deleted file mode 100644
index 2e3c72dcaaa..00000000000
--- a/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_PortableRemoteObjectDelegate__
-#define __javax_rmi_CORBA_PortableRemoteObjectDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class PortableRemoteObjectDelegate;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::PortableRemoteObjectDelegate : public ::java::lang::Object
-{
-
-public:
-  virtual void connect(::java::rmi::Remote *, ::java::rmi::Remote *) = 0;
-  virtual void exportObject(::java::rmi::Remote *) = 0;
-  virtual ::java::lang::Object * narrow(::java::lang::Object *, ::java::lang::Class *) = 0;
-  virtual ::java::rmi::Remote * toStub(::java::rmi::Remote *) = 0;
-  virtual void unexportObject(::java::rmi::Remote *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_PortableRemoteObjectDelegate__
diff --git a/libjava/javax/rmi/CORBA/Stub.h b/libjava/javax/rmi/CORBA/Stub.h
deleted file mode 100644
index d87f63d0d6d..00000000000
--- a/libjava/javax/rmi/CORBA/Stub.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_Stub__
-#define __javax_rmi_CORBA_Stub__
-
-#pragma interface
-
-#include <org/omg/CORBA_2_3/portable/ObjectImpl.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Stub;
-          class StubDelegate;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::Stub : public ::org::omg::CORBA_2_3::portable::ObjectImpl
-{
-
-public:
-  Stub();
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual void connect(::org::omg::CORBA::ORB *);
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = 1087775603798577179LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::org::omg::CORBA_2_3::portable::ObjectImpl)))) m_hash;
-  ::java::lang::String * m_ior;
-  ::org::omg::CORBA::ORB * m_orb;
-  static ::javax::rmi::CORBA::StubDelegate * delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_CORBA_Stub__
diff --git a/libjava/javax/rmi/CORBA/StubDelegate.h b/libjava/javax/rmi/CORBA/StubDelegate.h
deleted file mode 100644
index c8dc436221f..00000000000
--- a/libjava/javax/rmi/CORBA/StubDelegate.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_StubDelegate__
-#define __javax_rmi_CORBA_StubDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Stub;
-          class StubDelegate;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::StubDelegate : public ::java::lang::Object
-{
-
-public:
-  virtual void connect(::javax::rmi::CORBA::Stub *, ::org::omg::CORBA::ORB *) = 0;
-  virtual jboolean equals(::javax::rmi::CORBA::Stub *, ::java::lang::Object *) = 0;
-  virtual jint hashCode(::javax::rmi::CORBA::Stub *) = 0;
-  virtual void readObject(::javax::rmi::CORBA::Stub *, ::java::io::ObjectInputStream *) = 0;
-  virtual void writeObject(::javax::rmi::CORBA::Stub *, ::java::io::ObjectOutputStream *) = 0;
-  virtual ::java::lang::String * toString(::javax::rmi::CORBA::Stub *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_StubDelegate__
diff --git a/libjava/javax/rmi/CORBA/Tie.h b/libjava/javax/rmi/CORBA/Tie.h
deleted file mode 100644
index 9f9ffcf1ba7..00000000000
--- a/libjava/javax/rmi/CORBA/Tie.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_Tie__
-#define __javax_rmi_CORBA_Tie__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Tie;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class Object;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::Tie : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::rmi::Remote * getTarget() = 0;
-  virtual void setTarget(::java::rmi::Remote *) = 0;
-  virtual ::org::omg::CORBA::ORB * orb() = 0;
-  virtual void orb(::org::omg::CORBA::ORB *) = 0;
-  virtual ::org::omg::CORBA::Object * thisObject() = 0;
-  virtual void deactivate() = 0;
-  virtual ::org::omg::CORBA::portable::OutputStream * _invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_Tie__
diff --git a/libjava/javax/rmi/CORBA/Util.h b/libjava/javax/rmi/CORBA/Util.h
deleted file mode 100644
index a7eaf610411..00000000000
--- a/libjava/javax/rmi/CORBA/Util.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_Util__
-#define __javax_rmi_CORBA_Util__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-        class RemoteException;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Stub;
-          class Tie;
-          class Util;
-          class UtilDelegate;
-          class ValueHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class SystemException;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::Util : public ::java::lang::Object
-{
-
-  Util();
-public:
-  static ::java::lang::Object * copyObject(::java::lang::Object *, ::org::omg::CORBA::ORB *);
-  static JArray< ::java::lang::Object * > * copyObjects(JArray< ::java::lang::Object * > *, ::org::omg::CORBA::ORB *);
-  static ::javax::rmi::CORBA::ValueHandler * createValueHandler();
-  static ::java::lang::String * getCodebase(::java::lang::Class *);
-  static ::javax::rmi::CORBA::Tie * getTie(::java::rmi::Remote *);
-  static jboolean isLocal(::javax::rmi::CORBA::Stub *);
-  static ::java::lang::Class * loadClass(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-  static ::java::rmi::RemoteException * mapSystemException(::org::omg::CORBA::SystemException *);
-  static void registerTarget(::javax::rmi::CORBA::Tie *, ::java::rmi::Remote *);
-  static void unexportObject(::java::rmi::Remote *);
-  static ::java::rmi::RemoteException * wrapException(::java::lang::Throwable *);
-  static void writeAbstractObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-  static void writeAny(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-  static ::java::lang::Object * readAny(::org::omg::CORBA::portable::InputStream *);
-  static void writeRemoteObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *);
-public: // actually package-private
-  static ::javax::rmi::CORBA::UtilDelegate * delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_CORBA_Util__
diff --git a/libjava/javax/rmi/CORBA/UtilDelegate.h b/libjava/javax/rmi/CORBA/UtilDelegate.h
deleted file mode 100644
index e3c235d92ef..00000000000
--- a/libjava/javax/rmi/CORBA/UtilDelegate.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_UtilDelegate__
-#define __javax_rmi_CORBA_UtilDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-        class RemoteException;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class Stub;
-          class Tie;
-          class UtilDelegate;
-          class ValueHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class SystemException;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::UtilDelegate : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * copyObject(::java::lang::Object *, ::org::omg::CORBA::ORB *) = 0;
-  virtual JArray< ::java::lang::Object * > * copyObjects(JArray< ::java::lang::Object * > *, ::org::omg::CORBA::ORB *) = 0;
-  virtual ::javax::rmi::CORBA::ValueHandler * createValueHandler() = 0;
-  virtual ::java::lang::String * getCodebase(::java::lang::Class *) = 0;
-  virtual jboolean isLocal(::javax::rmi::CORBA::Stub *) = 0;
-  virtual ::java::lang::Class * loadClass(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *) = 0;
-  virtual ::java::rmi::RemoteException * mapSystemException(::org::omg::CORBA::SystemException *) = 0;
-  virtual ::javax::rmi::CORBA::Tie * getTie(::java::rmi::Remote *) = 0;
-  virtual void registerTarget(::javax::rmi::CORBA::Tie *, ::java::rmi::Remote *) = 0;
-  virtual void unexportObject(::java::rmi::Remote *) = 0;
-  virtual ::java::rmi::RemoteException * wrapException(::java::lang::Throwable *) = 0;
-  virtual void writeRemoteObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *) = 0;
-  virtual void writeAbstractObject(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *) = 0;
-  virtual void writeAny(::org::omg::CORBA::portable::OutputStream *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * readAny(::org::omg::CORBA::portable::InputStream *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_UtilDelegate__
diff --git a/libjava/javax/rmi/CORBA/ValueHandler.h b/libjava/javax/rmi/CORBA/ValueHandler.h
deleted file mode 100644
index 170f4d593b8..00000000000
--- a/libjava/javax/rmi/CORBA/ValueHandler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_ValueHandler__
-#define __javax_rmi_CORBA_ValueHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class ValueHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace SendingContext
-      {
-          class RunTime;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::ValueHandler : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getRMIRepositoryID(::java::lang::Class *) = 0;
-  virtual ::org::omg::SendingContext::RunTime * getRunTimeCodeBase() = 0;
-  virtual jboolean isCustomMarshaled(::java::lang::Class *) = 0;
-  virtual ::java::io::Serializable * readValue(::org::omg::CORBA::portable::InputStream *, jint, ::java::lang::Class *, ::java::lang::String *, ::org::omg::SendingContext::RunTime *) = 0;
-  virtual ::java::io::Serializable * writeReplace(::java::io::Serializable *) = 0;
-  virtual void writeValue(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_ValueHandler__
diff --git a/libjava/javax/rmi/CORBA/ValueHandlerMultiFormat.h b/libjava/javax/rmi/CORBA/ValueHandlerMultiFormat.h
deleted file mode 100644
index 7e59a61f40d..00000000000
--- a/libjava/javax/rmi/CORBA/ValueHandlerMultiFormat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_CORBA_ValueHandlerMultiFormat__
-#define __javax_rmi_CORBA_ValueHandlerMultiFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class ValueHandlerMultiFormat;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace SendingContext
-      {
-          class RunTime;
-      }
-    }
-  }
-}
-
-class javax::rmi::CORBA::ValueHandlerMultiFormat : public ::java::lang::Object
-{
-
-public:
-  virtual jbyte getMaximumStreamFormatVersion() = 0;
-  virtual void writeValue(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *, jbyte) = 0;
-  virtual ::java::lang::String * getRMIRepositoryID(::java::lang::Class *) = 0;
-  virtual ::org::omg::SendingContext::RunTime * getRunTimeCodeBase() = 0;
-  virtual jboolean isCustomMarshaled(::java::lang::Class *) = 0;
-  virtual ::java::io::Serializable * readValue(::org::omg::CORBA::portable::InputStream *, jint, ::java::lang::Class *, ::java::lang::String *, ::org::omg::SendingContext::RunTime *) = 0;
-  virtual ::java::io::Serializable * writeReplace(::java::io::Serializable *) = 0;
-  virtual void writeValue(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_rmi_CORBA_ValueHandlerMultiFormat__
diff --git a/libjava/javax/rmi/PortableRemoteObject.h b/libjava/javax/rmi/PortableRemoteObject.h
deleted file mode 100644
index 2fd0facd270..00000000000
--- a/libjava/javax/rmi/PortableRemoteObject.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_PortableRemoteObject__
-#define __javax_rmi_PortableRemoteObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace rmi
-    {
-        class Remote;
-    }
-  }
-  namespace javax
-  {
-    namespace rmi
-    {
-      namespace CORBA
-      {
-          class PortableRemoteObjectDelegate;
-      }
-        class PortableRemoteObject;
-    }
-  }
-}
-
-class javax::rmi::PortableRemoteObject : public ::java::lang::Object
-{
-
-public: // actually protected
-  PortableRemoteObject();
-public:
-  static void connect(::java::rmi::Remote *, ::java::rmi::Remote *);
-  static void exportObject(::java::rmi::Remote *);
-  static ::java::lang::Object * narrow(::java::lang::Object *, ::java::lang::Class *);
-  static ::java::rmi::Remote * toStub(::java::rmi::Remote *);
-  static void unexportObject(::java::rmi::Remote *);
-public: // actually package-private
-  static ::javax::rmi::CORBA::PortableRemoteObjectDelegate * delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_PortableRemoteObject__
diff --git a/libjava/javax/rmi/ssl/SslRMIClientSocketFactory.h b/libjava/javax/rmi/ssl/SslRMIClientSocketFactory.h
deleted file mode 100644
index 8c54dd83066..00000000000
--- a/libjava/javax/rmi/ssl/SslRMIClientSocketFactory.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_ssl_SslRMIClientSocketFactory__
-#define __javax_rmi_ssl_SslRMIClientSocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class Socket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLSocketFactory;
-      }
-    }
-    namespace rmi
-    {
-      namespace ssl
-      {
-          class SslRMIClientSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::rmi::ssl::SslRMIClientSocketFactory : public ::java::lang::Object
-{
-
-public:
-  SslRMIClientSocketFactory();
-private:
-  JArray< ::java::lang::String * > * getProp(::java::lang::String *);
-public:
-  virtual ::java::net::Socket * createSocket(::java::lang::String *, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  static const jlong serialVersionUID = -8310631444933958385LL;
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabledCipherSuites;
-  JArray< ::java::lang::String * > * enabledProtocols;
-  static ::javax::net::ssl::SSLSocketFactory * socketFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_ssl_SslRMIClientSocketFactory__
diff --git a/libjava/javax/rmi/ssl/SslRMIServerSocketFactory.h b/libjava/javax/rmi/ssl/SslRMIServerSocketFactory.h
deleted file mode 100644
index 3b49d3e9ede..00000000000
--- a/libjava/javax/rmi/ssl/SslRMIServerSocketFactory.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_rmi_ssl_SslRMIServerSocketFactory__
-#define __javax_rmi_ssl_SslRMIServerSocketFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class ServerSocket;
-    }
-  }
-  namespace javax
-  {
-    namespace net
-    {
-      namespace ssl
-      {
-          class SSLServerSocketFactory;
-      }
-    }
-    namespace rmi
-    {
-      namespace ssl
-      {
-          class SslRMIServerSocketFactory;
-      }
-    }
-  }
-}
-
-class javax::rmi::ssl::SslRMIServerSocketFactory : public ::java::lang::Object
-{
-
-public:
-  SslRMIServerSocketFactory();
-  SslRMIServerSocketFactory(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, jboolean);
-  virtual ::java::net::ServerSocket * createServerSocket(jint);
-  virtual jboolean equals(::java::lang::Object *);
-public: // actually package-private
-  static jboolean cmpStrArray(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *);
-public:
-  virtual JArray< ::java::lang::String * > * getEnabledCipherSuites();
-  virtual JArray< ::java::lang::String * > * getEnabledProtocols();
-  virtual jboolean getNeedClientAuth();
-  virtual jint hashCode();
-private:
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabledCipherSuites;
-  JArray< ::java::lang::String * > * enabledProtocols;
-  jboolean needClientAuth;
-  static ::javax::net::ssl::SSLServerSocketFactory * socketFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_rmi_ssl_SslRMIServerSocketFactory__
diff --git a/libjava/javax/security/auth/AuthPermission.h b/libjava/javax/security/auth/AuthPermission.h
deleted file mode 100644
index 7be18bde9e1..00000000000
--- a/libjava/javax/security/auth/AuthPermission.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_AuthPermission__
-#define __javax_security_auth_AuthPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class AuthPermission;
-      }
-    }
-  }
-}
-
-class javax::security::auth::AuthPermission : public ::java::security::BasicPermission
-{
-
-public:
-  AuthPermission(::java::lang::String *);
-  AuthPermission(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_AuthPermission__
diff --git a/libjava/javax/security/auth/DestroyFailedException.h b/libjava/javax/security/auth/DestroyFailedException.h
deleted file mode 100644
index 7ee0fb6a29c..00000000000
--- a/libjava/javax/security/auth/DestroyFailedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_DestroyFailedException__
-#define __javax_security_auth_DestroyFailedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class DestroyFailedException;
-      }
-    }
-  }
-}
-
-class javax::security::auth::DestroyFailedException : public ::java::lang::Exception
-{
-
-public:
-  DestroyFailedException();
-  DestroyFailedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_DestroyFailedException__
diff --git a/libjava/javax/security/auth/Destroyable.h b/libjava/javax/security/auth/Destroyable.h
deleted file mode 100644
index 3afdb762f8e..00000000000
--- a/libjava/javax/security/auth/Destroyable.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_Destroyable__
-#define __javax_security_auth_Destroyable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Destroyable;
-      }
-    }
-  }
-}
-
-class javax::security::auth::Destroyable : public ::java::lang::Object
-{
-
-public:
-  virtual void destroy() = 0;
-  virtual jboolean isDestroyed() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_auth_Destroyable__
diff --git a/libjava/javax/security/auth/Policy.h b/libjava/javax/security/auth/Policy.h
deleted file mode 100644
index 394a870d686..00000000000
--- a/libjava/javax/security/auth/Policy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_Policy__
-#define __javax_security_auth_Policy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class CodeSource;
-        class PermissionCollection;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Policy;
-          class Subject;
-      }
-    }
-  }
-}
-
-class javax::security::auth::Policy : public ::java::lang::Object
-{
-
-public: // actually protected
-  Policy();
-public:
-  static ::javax::security::auth::Policy * getPolicy();
-  static void setPolicy(::javax::security::auth::Policy *);
-  virtual ::java::security::PermissionCollection * getPermissions(::javax::security::auth::Subject *, ::java::security::CodeSource *) = 0;
-  virtual void refresh() = 0;
-private:
-  static ::javax::security::auth::Policy * policy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_Policy__
diff --git a/libjava/javax/security/auth/PrivateCredentialPermission$CredOwner.h b/libjava/javax/security/auth/PrivateCredentialPermission$CredOwner.h
deleted file mode 100644
index c877eddd1f5..00000000000
--- a/libjava/javax/security/auth/PrivateCredentialPermission$CredOwner.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_PrivateCredentialPermission$CredOwner__
-#define __javax_security_auth_PrivateCredentialPermission$CredOwner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class PrivateCredentialPermission$CredOwner;
-      }
-    }
-  }
-}
-
-class javax::security::auth::PrivateCredentialPermission$CredOwner : public ::java::lang::Object
-{
-
-public: // actually package-private
-  PrivateCredentialPermission$CredOwner(::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getPrincipalClass();
-  virtual ::java::lang::String * getPrincipalName();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) principalClass;
-  ::java::lang::String * principalName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_PrivateCredentialPermission$CredOwner__
diff --git a/libjava/javax/security/auth/PrivateCredentialPermission.h b/libjava/javax/security/auth/PrivateCredentialPermission.h
deleted file mode 100644
index 157c1df79ce..00000000000
--- a/libjava/javax/security/auth/PrivateCredentialPermission.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_PrivateCredentialPermission__
-#define __javax_security_auth_PrivateCredentialPermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class PrivateCredentialPermission;
-      }
-    }
-  }
-}
-
-class javax::security::auth::PrivateCredentialPermission : public ::java::security::Permission
-{
-
-public:
-  PrivateCredentialPermission(::java::lang::String *, ::java::lang::String *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * getActions();
-  ::java::lang::String * getCredentialClass();
-  JArray< JArray< ::java::lang::String * > * > * getPrincipals();
-  jint hashCode();
-  jboolean implies(::java::security::Permission *);
-  ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  static const jlong serialVersionUID = 5284372143517237068LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::security::Permission)))) credentialClass;
-  ::java::util::Set * principals;
-  jboolean testing;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_PrivateCredentialPermission__
diff --git a/libjava/javax/security/auth/RefreshFailedException.h b/libjava/javax/security/auth/RefreshFailedException.h
deleted file mode 100644
index c0fadb08d54..00000000000
--- a/libjava/javax/security/auth/RefreshFailedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_RefreshFailedException__
-#define __javax_security_auth_RefreshFailedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class RefreshFailedException;
-      }
-    }
-  }
-}
-
-class javax::security::auth::RefreshFailedException : public ::java::lang::Exception
-{
-
-public:
-  RefreshFailedException();
-  RefreshFailedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_RefreshFailedException__
diff --git a/libjava/javax/security/auth/Refreshable.h b/libjava/javax/security/auth/Refreshable.h
deleted file mode 100644
index 5c065c5aa9c..00000000000
--- a/libjava/javax/security/auth/Refreshable.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_Refreshable__
-#define __javax_security_auth_Refreshable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Refreshable;
-      }
-    }
-  }
-}
-
-class javax::security::auth::Refreshable : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isCurrent() = 0;
-  virtual void refresh() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_auth_Refreshable__
diff --git a/libjava/javax/security/auth/Subject$SecureSet.h b/libjava/javax/security/auth/Subject$SecureSet.h
deleted file mode 100644
index 854176ce9cb..00000000000
--- a/libjava/javax/security/auth/Subject$SecureSet.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_Subject$SecureSet__
-#define __javax_security_auth_Subject$SecureSet__
-
-#pragma interface
-
-#include <java/util/AbstractSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-          class Subject$SecureSet;
-      }
-    }
-  }
-}
-
-class javax::security::auth::Subject$SecureSet : public ::java::util::AbstractSet
-{
-
-public: // actually package-private
-  Subject$SecureSet(::javax::security::auth::Subject *, jint, ::java::util::Collection *);
-  Subject$SecureSet(::javax::security::auth::Subject *, jint);
-public:
-  virtual jint size();
-  virtual ::java::util::Iterator * iterator();
-  virtual jboolean add(::java::lang::Object *);
-  virtual jboolean remove(::java::lang::Object *);
-  virtual jboolean contains(::java::lang::Object *);
-  virtual jboolean removeAll(::java::util::Collection *);
-  virtual jboolean retainAll(::java::util::Collection *);
-  virtual void clear();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 7911754171111800359LL;
-public: // actually package-private
-  static const jint PRINCIPALS = 0;
-  static const jint PUBLIC_CREDENTIALS = 1;
-  static const jint PRIVATE_CREDENTIALS = 2;
-private:
-  ::javax::security::auth::Subject * __attribute__((aligned(__alignof__( ::java::util::AbstractSet)))) subject;
-  ::java::util::LinkedList * elements;
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_Subject$SecureSet__
diff --git a/libjava/javax/security/auth/Subject.h b/libjava/javax/security/auth/Subject.h
deleted file mode 100644
index de9165199ba..00000000000
--- a/libjava/javax/security/auth/Subject.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_Subject__
-#define __javax_security_auth_Subject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class AccessControlContext;
-        class PrivilegedAction;
-        class PrivilegedExceptionAction;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-          class Subject$SecureSet;
-      }
-    }
-  }
-}
-
-class javax::security::auth::Subject : public ::java::lang::Object
-{
-
-public:
-  Subject();
-  Subject(jboolean, ::java::util::Set *, ::java::util::Set *, ::java::util::Set *);
-  static ::javax::security::auth::Subject * getSubject(::java::security::AccessControlContext *);
-  static ::java::lang::Object * doAs(::javax::security::auth::Subject *, ::java::security::PrivilegedAction *);
-  static ::java::lang::Object * doAs(::javax::security::auth::Subject *, ::java::security::PrivilegedExceptionAction *);
-  static ::java::lang::Object * doAsPrivileged(::javax::security::auth::Subject *, ::java::security::PrivilegedAction *, ::java::security::AccessControlContext *);
-  static ::java::lang::Object * doAsPrivileged(::javax::security::auth::Subject *, ::java::security::PrivilegedExceptionAction *, ::java::security::AccessControlContext *);
-  jboolean equals(::java::lang::Object *);
-  ::java::util::Set * getPrincipals();
-  ::java::util::Set * getPrincipals(::java::lang::Class *);
-  ::java::util::Set * getPrivateCredentials();
-  ::java::util::Set * getPrivateCredentials(::java::lang::Class *);
-  ::java::util::Set * getPublicCredentials();
-  ::java::util::Set * getPublicCredentials(::java::lang::Class *);
-  jint hashCode();
-  jboolean isReadOnly();
-  void setReadOnly();
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -8308522755600156056LL;
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::java::lang::Object)))) principals;
-  jboolean readOnly;
-  ::javax::security::auth::Subject$SecureSet * pubCred;
-  ::javax::security::auth::Subject$SecureSet * privCred;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_Subject__
diff --git a/libjava/javax/security/auth/SubjectDomainCombiner.h b/libjava/javax/security/auth/SubjectDomainCombiner.h
deleted file mode 100644
index bda871c92db..00000000000
--- a/libjava/javax/security/auth/SubjectDomainCombiner.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_SubjectDomainCombiner__
-#define __javax_security_auth_SubjectDomainCombiner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class ProtectionDomain;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-          class SubjectDomainCombiner;
-      }
-    }
-  }
-}
-
-class javax::security::auth::SubjectDomainCombiner : public ::java::lang::Object
-{
-
-public:
-  SubjectDomainCombiner(::javax::security::auth::Subject *);
-  virtual JArray< ::java::security::ProtectionDomain * > * combine(JArray< ::java::security::ProtectionDomain * > *, JArray< ::java::security::ProtectionDomain * > *);
-  virtual ::javax::security::auth::Subject * getSubject();
-private:
-  ::javax::security::auth::Subject * __attribute__((aligned(__alignof__( ::java::lang::Object)))) subject;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_SubjectDomainCombiner__
diff --git a/libjava/javax/security/auth/callback/Callback.h b/libjava/javax/security/auth/callback/Callback.h
deleted file mode 100644
index ef069f63367..00000000000
--- a/libjava/javax/security/auth/callback/Callback.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_Callback__
-#define __javax_security_auth_callback_Callback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class Callback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::Callback : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_auth_callback_Callback__
diff --git a/libjava/javax/security/auth/callback/CallbackHandler.h b/libjava/javax/security/auth/callback/CallbackHandler.h
deleted file mode 100644
index 63f4bfb4164..00000000000
--- a/libjava/javax/security/auth/callback/CallbackHandler.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_CallbackHandler__
-#define __javax_security_auth_callback_CallbackHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class Callback;
-            class CallbackHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::CallbackHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void handle(JArray< ::javax::security::auth::callback::Callback * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_auth_callback_CallbackHandler__
diff --git a/libjava/javax/security/auth/callback/ChoiceCallback.h b/libjava/javax/security/auth/callback/ChoiceCallback.h
deleted file mode 100644
index 80f4ccf2879..00000000000
--- a/libjava/javax/security/auth/callback/ChoiceCallback.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_ChoiceCallback__
-#define __javax_security_auth_callback_ChoiceCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class ChoiceCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::ChoiceCallback : public ::java::lang::Object
-{
-
-public:
-  ChoiceCallback(::java::lang::String *, JArray< ::java::lang::String * > *, jint, jboolean);
-  virtual ::java::lang::String * getPrompt();
-  virtual JArray< ::java::lang::String * > * getChoices();
-  virtual jint getDefaultChoice();
-  virtual jboolean allowMultipleSelections();
-  virtual void setSelectedIndex(jint);
-  virtual void setSelectedIndexes(JArray< jint > *);
-  virtual JArray< jint > * getSelectedIndexes();
-private:
-  void setPrompt(::java::lang::String *);
-  void setChoices(JArray< ::java::lang::String * > *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prompt;
-  JArray< ::java::lang::String * > * choices;
-  jint defaultChoice;
-  jboolean multipleSelectionsAllowed;
-  JArray< jint > * selections;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_ChoiceCallback__
diff --git a/libjava/javax/security/auth/callback/ConfirmationCallback.h b/libjava/javax/security/auth/callback/ConfirmationCallback.h
deleted file mode 100644
index 4e7443832a7..00000000000
--- a/libjava/javax/security/auth/callback/ConfirmationCallback.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_ConfirmationCallback__
-#define __javax_security_auth_callback_ConfirmationCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class ConfirmationCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::ConfirmationCallback : public ::java::lang::Object
-{
-
-public:
-  ConfirmationCallback(jint, jint, jint);
-  ConfirmationCallback(jint, JArray< ::java::lang::String * > *, jint);
-  ConfirmationCallback(::java::lang::String *, jint, jint, jint);
-  ConfirmationCallback(::java::lang::String *, jint, JArray< ::java::lang::String * > *, jint);
-  virtual ::java::lang::String * getPrompt();
-  virtual jint getMessageType();
-  virtual jint getOptionType();
-  virtual JArray< ::java::lang::String * > * getOptions();
-  virtual jint getDefaultOption();
-  virtual void setSelectedIndex(jint);
-  virtual jint getSelectedIndex();
-private:
-  void setMessageType(jint);
-  void setOptionType(jint, jint);
-  void setOptions(JArray< ::java::lang::String * > *, jint);
-  void setPrompt(::java::lang::String *);
-public:
-  static const jint UNSPECIFIED_OPTION = -1;
-  static const jint YES_NO_OPTION = 0;
-  static const jint YES_NO_CANCEL_OPTION = 1;
-  static const jint OK_CANCEL_OPTION = 2;
-  static const jint YES = 0;
-  static const jint NO = 1;
-  static const jint CANCEL = 2;
-  static const jint OK = 3;
-  static const jint INFORMATION = 0;
-  static const jint WARNING = 1;
-  static const jint ERROR = 2;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prompt;
-  jint messageType;
-  jint optionType;
-  jint defaultOption;
-  JArray< ::java::lang::String * > * options;
-  jint selection;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_ConfirmationCallback__
diff --git a/libjava/javax/security/auth/callback/LanguageCallback.h b/libjava/javax/security/auth/callback/LanguageCallback.h
deleted file mode 100644
index 8580fa7a847..00000000000
--- a/libjava/javax/security/auth/callback/LanguageCallback.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_LanguageCallback__
-#define __javax_security_auth_callback_LanguageCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class LanguageCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::LanguageCallback : public ::java::lang::Object
-{
-
-public:
-  LanguageCallback();
-  virtual void setLocale(::java::util::Locale *);
-  virtual ::java::util::Locale * getLocale();
-private:
-  ::java::util::Locale * __attribute__((aligned(__alignof__( ::java::lang::Object)))) locale;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_LanguageCallback__
diff --git a/libjava/javax/security/auth/callback/NameCallback.h b/libjava/javax/security/auth/callback/NameCallback.h
deleted file mode 100644
index 89e3ffdbce4..00000000000
--- a/libjava/javax/security/auth/callback/NameCallback.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_NameCallback__
-#define __javax_security_auth_callback_NameCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class NameCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::NameCallback : public ::java::lang::Object
-{
-
-public:
-  NameCallback(::java::lang::String *);
-  NameCallback(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getPrompt();
-  virtual ::java::lang::String * getDefaultName();
-  virtual void setName(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-private:
-  void setPrompt(::java::lang::String *);
-  void setDefaultName(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prompt;
-  ::java::lang::String * defaultName;
-  ::java::lang::String * inputName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_NameCallback__
diff --git a/libjava/javax/security/auth/callback/PasswordCallback.h b/libjava/javax/security/auth/callback/PasswordCallback.h
deleted file mode 100644
index 2055b7cc65e..00000000000
--- a/libjava/javax/security/auth/callback/PasswordCallback.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_PasswordCallback__
-#define __javax_security_auth_callback_PasswordCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class PasswordCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::PasswordCallback : public ::java::lang::Object
-{
-
-public:
-  PasswordCallback(::java::lang::String *, jboolean);
-  virtual ::java::lang::String * getPrompt();
-  virtual jboolean isEchoOn();
-  virtual void setPassword(JArray< jchar > *);
-  virtual JArray< jchar > * getPassword();
-  virtual void clearPassword();
-private:
-  void setPrompt(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prompt;
-  jboolean echoOn;
-  JArray< jchar > * inputPassword;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_PasswordCallback__
diff --git a/libjava/javax/security/auth/callback/TextInputCallback.h b/libjava/javax/security/auth/callback/TextInputCallback.h
deleted file mode 100644
index bf85c3544db..00000000000
--- a/libjava/javax/security/auth/callback/TextInputCallback.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_TextInputCallback__
-#define __javax_security_auth_callback_TextInputCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class TextInputCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::TextInputCallback : public ::java::lang::Object
-{
-
-public:
-  TextInputCallback(::java::lang::String *);
-  TextInputCallback(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getPrompt();
-  virtual ::java::lang::String * getDefaultText();
-  virtual void setText(::java::lang::String *);
-  virtual ::java::lang::String * getText();
-private:
-  void setPrompt(::java::lang::String *);
-  void setDefaultText(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prompt;
-  ::java::lang::String * defaultText;
-  ::java::lang::String * inputText;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_TextInputCallback__
diff --git a/libjava/javax/security/auth/callback/TextOutputCallback.h b/libjava/javax/security/auth/callback/TextOutputCallback.h
deleted file mode 100644
index 048e8cf83e2..00000000000
--- a/libjava/javax/security/auth/callback/TextOutputCallback.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_TextOutputCallback__
-#define __javax_security_auth_callback_TextOutputCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class TextOutputCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::TextOutputCallback : public ::java::lang::Object
-{
-
-public:
-  TextOutputCallback(jint, ::java::lang::String *);
-  virtual jint getMessageType();
-  virtual ::java::lang::String * getMessage();
-private:
-  void setMessage(::java::lang::String *);
-public:
-  static const jint INFORMATION = 0;
-  static const jint WARNING = 1;
-  static const jint ERROR = 2;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) messageType;
-  ::java::lang::String * message;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_TextOutputCallback__
diff --git a/libjava/javax/security/auth/callback/UnsupportedCallbackException.h b/libjava/javax/security/auth/callback/UnsupportedCallbackException.h
deleted file mode 100644
index ec80fddcb56..00000000000
--- a/libjava/javax/security/auth/callback/UnsupportedCallbackException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_callback_UnsupportedCallbackException__
-#define __javax_security_auth_callback_UnsupportedCallbackException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class Callback;
-            class UnsupportedCallbackException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::callback::UnsupportedCallbackException : public ::java::lang::Exception
-{
-
-public:
-  UnsupportedCallbackException(::javax::security::auth::callback::Callback *);
-  UnsupportedCallbackException(::javax::security::auth::callback::Callback *, ::java::lang::String *);
-  virtual ::javax::security::auth::callback::Callback * getCallback();
-private:
-  ::javax::security::auth::callback::Callback * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) callback;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_callback_UnsupportedCallbackException__
diff --git a/libjava/javax/security/auth/kerberos/DelegationPermission$1.h b/libjava/javax/security/auth/kerberos/DelegationPermission$1.h
deleted file mode 100644
index 44aa424bb8e..00000000000
--- a/libjava/javax/security/auth/kerberos/DelegationPermission$1.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_DelegationPermission$1__
-#define __javax_security_auth_kerberos_DelegationPermission$1__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class DelegationPermission;
-            class DelegationPermission$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::DelegationPermission$1 : public ::java::security::PermissionCollection
-{
-
-public: // actually package-private
-  DelegationPermission$1(::javax::security::auth::kerberos::DelegationPermission *);
-public:
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
-public: // actually package-private
-  ::javax::security::auth::kerberos::DelegationPermission * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_DelegationPermission$1__
diff --git a/libjava/javax/security/auth/kerberos/DelegationPermission.h b/libjava/javax/security/auth/kerberos/DelegationPermission.h
deleted file mode 100644
index 2b89ad70095..00000000000
--- a/libjava/javax/security/auth/kerberos/DelegationPermission.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_DelegationPermission__
-#define __javax_security_auth_kerberos_DelegationPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class DelegationPermission;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::DelegationPermission : public ::java::security::BasicPermission
-{
-
-public:
-  DelegationPermission(::java::lang::String *);
-  DelegationPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static void checkSyntax(::java::lang::String *);
-public:
-  jboolean implies(::java::security::Permission *);
-  ::java::security::PermissionCollection * newPermissionCollection();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_DelegationPermission__
diff --git a/libjava/javax/security/auth/kerberos/KerberosKey.h b/libjava/javax/security/auth/kerberos/KerberosKey.h
deleted file mode 100644
index ed0e93f2910..00000000000
--- a/libjava/javax/security/auth/kerberos/KerberosKey.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_KerberosKey__
-#define __javax_security_auth_kerberos_KerberosKey__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class KerberosKey;
-            class KerberosPrincipal;
-            class KeyImpl;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::KerberosKey : public ::java::lang::Object
-{
-
-public:
-  KerberosKey(::javax::security::auth::kerberos::KerberosPrincipal *, JArray< jbyte > *, jint, jint);
-  KerberosKey(::javax::security::auth::kerberos::KerberosPrincipal *, JArray< jchar > *, ::java::lang::String *);
-  virtual ::java::lang::String * getAlgorithm();
-  virtual ::java::lang::String * getFormat();
-  virtual ::javax::security::auth::kerberos::KerberosPrincipal * getPrincipal();
-  virtual jint getKeyType();
-  virtual jint getVersionNumber();
-  virtual JArray< jbyte > * getEncoded();
-  virtual void destroy();
-  virtual jboolean isDestroyed();
-private:
-  void checkDestroyed();
-public:
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -4625402278148246993LL;
-  ::javax::security::auth::kerberos::KerberosPrincipal * __attribute__((aligned(__alignof__( ::java::lang::Object)))) principal;
-  jint versionNum;
-  ::javax::security::auth::kerberos::KeyImpl * key;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_KerberosKey__
diff --git a/libjava/javax/security/auth/kerberos/KerberosPrincipal.h b/libjava/javax/security/auth/kerberos/KerberosPrincipal.h
deleted file mode 100644
index c945a5620e3..00000000000
--- a/libjava/javax/security/auth/kerberos/KerberosPrincipal.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_KerberosPrincipal__
-#define __javax_security_auth_kerberos_KerberosPrincipal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class KerberosPrincipal;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::KerberosPrincipal : public ::java::lang::Object
-{
-
-public:
-  KerberosPrincipal(::java::lang::String *);
-  KerberosPrincipal(::java::lang::String *, jint);
-private:
-  ::java::lang::String * parseRealm();
-public:
-  ::java::lang::String * getName();
-  ::java::lang::String * getRealm();
-  jint getNameType();
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * toString();
-  static const jint KRB_NT_PRINCIPAL = 1;
-  static const jint KRB_NT_SRV_HST = 3;
-  static const jint KRB_NT_SRV_INST = 2;
-  static const jint KRB_NT_SRV_XHST = 4;
-  static const jint KRB_NT_UID = 5;
-  static const jint KRB_NT_UNKNOWN = 0;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jint type;
-  ::java::lang::String * realm;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_KerberosPrincipal__
diff --git a/libjava/javax/security/auth/kerberos/KerberosTicket.h b/libjava/javax/security/auth/kerberos/KerberosTicket.h
deleted file mode 100644
index 44c35b4c78d..00000000000
--- a/libjava/javax/security/auth/kerberos/KerberosTicket.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_KerberosTicket__
-#define __javax_security_auth_kerberos_KerberosTicket__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-    }
-  }
-  namespace javax
-  {
-    namespace crypto
-    {
-        class SecretKey;
-    }
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class KerberosPrincipal;
-            class KerberosTicket;
-            class KeyImpl;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::KerberosTicket : public ::java::lang::Object
-{
-
-public:
-  KerberosTicket(JArray< jbyte > *, ::javax::security::auth::kerberos::KerberosPrincipal *, ::javax::security::auth::kerberos::KerberosPrincipal *, JArray< jbyte > *, jint, JArray< jboolean > *, ::java::util::Date *, ::java::util::Date *, ::java::util::Date *, ::java::util::Date *, JArray< ::java::net::InetAddress * > *);
-  virtual void destroy();
-  virtual jboolean isDestroyed();
-  virtual jboolean isCurrent();
-  virtual void refresh();
-  virtual ::javax::security::auth::kerberos::KerberosPrincipal * getClient();
-  virtual ::javax::security::auth::kerberos::KerberosPrincipal * getServer();
-  virtual jboolean isForwardable();
-  virtual jboolean isForwarded();
-  virtual jboolean isProxiable();
-  virtual jboolean isProxy();
-  virtual jboolean isPostdated();
-  virtual jboolean isRenewable();
-  virtual jboolean isInitial();
-  virtual JArray< jboolean > * getFlags();
-  virtual ::java::util::Date * getAuthTime();
-  virtual ::java::util::Date * getStartTime();
-  virtual ::java::util::Date * getEndTime();
-  virtual ::java::util::Date * getRenewTill();
-  virtual JArray< ::java::net::InetAddress * > * getClientAddresses();
-  virtual JArray< jbyte > * getEncoded();
-  virtual ::javax::crypto::SecretKey * getSessionKey();
-private:
-  void checkDestroyed();
-public:
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 7395334370157380539LL;
-  static const jint FORWARDABLE = 1;
-  static const jint FORWARDED = 2;
-  static const jint PROXIABLE = 3;
-  static const jint PROXY = 4;
-  static const jint POSTDATED = 6;
-  static const jint RENEWABLE = 8;
-  static const jint INITIAL = 9;
-  static const jint NUM_FLAGS = 12;
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) asn1Encoding;
-  ::javax::security::auth::kerberos::KeyImpl * sessionKey;
-  JArray< jboolean > * flags;
-  ::java::util::Date * authTime;
-  ::java::util::Date * startTime;
-  ::java::util::Date * endTime;
-  ::java::util::Date * renewTill;
-  ::javax::security::auth::kerberos::KerberosPrincipal * client;
-  ::javax::security::auth::kerberos::KerberosPrincipal * server;
-  JArray< ::java::net::InetAddress * > * clientAddresses;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_KerberosTicket__
diff --git a/libjava/javax/security/auth/kerberos/KeyImpl.h b/libjava/javax/security/auth/kerberos/KeyImpl.h
deleted file mode 100644
index 39998ba2219..00000000000
--- a/libjava/javax/security/auth/kerberos/KeyImpl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_KeyImpl__
-#define __javax_security_auth_kerberos_KeyImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class KeyImpl;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::KeyImpl : public ::java::lang::Object
-{
-
-public:
-  KeyImpl(JArray< jbyte > *, jint);
-  KeyImpl(JArray< jchar > *, ::java::lang::String *);
-  ::java::lang::String * getAlgorithm();
-  JArray< jbyte > * getEncoded();
-  ::java::lang::String * getFormat();
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) algorithm;
-  jint type;
-  JArray< jbyte > * key;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_KeyImpl__
diff --git a/libjava/javax/security/auth/kerberos/ServicePermission$1.h b/libjava/javax/security/auth/kerberos/ServicePermission$1.h
deleted file mode 100644
index 4a11e5faa79..00000000000
--- a/libjava/javax/security/auth/kerberos/ServicePermission$1.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_ServicePermission$1__
-#define __javax_security_auth_kerberos_ServicePermission$1__
-
-#pragma interface
-
-#include <java/security/PermissionCollection.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class ServicePermission;
-            class ServicePermission$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::ServicePermission$1 : public ::java::security::PermissionCollection
-{
-
-public: // actually package-private
-  ServicePermission$1(::javax::security::auth::kerberos::ServicePermission *);
-public:
-  void add(::java::security::Permission *);
-  jboolean implies(::java::security::Permission *);
-  ::java::util::Enumeration * elements();
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::security::PermissionCollection)))) permissions;
-public: // actually package-private
-  ::javax::security::auth::kerberos::ServicePermission * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_ServicePermission$1__
diff --git a/libjava/javax/security/auth/kerberos/ServicePermission.h b/libjava/javax/security/auth/kerberos/ServicePermission.h
deleted file mode 100644
index 0abca5189dd..00000000000
--- a/libjava/javax/security/auth/kerberos/ServicePermission.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_kerberos_ServicePermission__
-#define __javax_security_auth_kerberos_ServicePermission__
-
-#pragma interface
-
-#include <java/security/Permission.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Permission;
-        class PermissionCollection;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace kerberos
-        {
-            class ServicePermission;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::kerberos::ServicePermission : public ::java::security::Permission
-{
-
-public:
-  ServicePermission(::java::lang::String *, ::java::lang::String *);
-  jboolean implies(::java::security::Permission *);
-  jboolean equals(::java::lang::Object *);
-  jint hashCode();
-  ::java::lang::String * getActions();
-  ::java::security::PermissionCollection * newPermissionCollection();
-private:
-  void parseActions(::java::lang::String *);
-  static const jint INITIATE = 1;
-  static const jint ACCEPT = 2;
-  jint __attribute__((aligned(__alignof__( ::java::security::Permission)))) flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_kerberos_ServicePermission__
diff --git a/libjava/javax/security/auth/login/AccountException.h b/libjava/javax/security/auth/login/AccountException.h
deleted file mode 100644
index 1ee7718694f..00000000000
--- a/libjava/javax/security/auth/login/AccountException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AccountException__
-#define __javax_security_auth_login_AccountException__
-
-#pragma interface
-
-#include <javax/security/auth/login/LoginException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AccountException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AccountException : public ::javax::security::auth::login::LoginException
-{
-
-public:
-  AccountException();
-  AccountException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2112878680072211787LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AccountException__
diff --git a/libjava/javax/security/auth/login/AccountExpiredException.h b/libjava/javax/security/auth/login/AccountExpiredException.h
deleted file mode 100644
index 76c92144244..00000000000
--- a/libjava/javax/security/auth/login/AccountExpiredException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AccountExpiredException__
-#define __javax_security_auth_login_AccountExpiredException__
-
-#pragma interface
-
-#include <javax/security/auth/login/AccountException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AccountExpiredException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AccountExpiredException : public ::javax::security::auth::login::AccountException
-{
-
-public:
-  AccountExpiredException();
-  AccountExpiredException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -6064064890162661560LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AccountExpiredException__
diff --git a/libjava/javax/security/auth/login/AccountLockedException.h b/libjava/javax/security/auth/login/AccountLockedException.h
deleted file mode 100644
index e2d8a53df85..00000000000
--- a/libjava/javax/security/auth/login/AccountLockedException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AccountLockedException__
-#define __javax_security_auth_login_AccountLockedException__
-
-#pragma interface
-
-#include <javax/security/auth/login/AccountException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AccountLockedException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AccountLockedException : public ::javax::security::auth::login::AccountException
-{
-
-public:
-  AccountLockedException();
-  AccountLockedException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 8280345554014066334LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AccountLockedException__
diff --git a/libjava/javax/security/auth/login/AccountNotFoundException.h b/libjava/javax/security/auth/login/AccountNotFoundException.h
deleted file mode 100644
index e258fa0ea9a..00000000000
--- a/libjava/javax/security/auth/login/AccountNotFoundException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AccountNotFoundException__
-#define __javax_security_auth_login_AccountNotFoundException__
-
-#pragma interface
-
-#include <javax/security/auth/login/AccountException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AccountNotFoundException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AccountNotFoundException : public ::javax::security::auth::login::AccountException
-{
-
-public:
-  AccountNotFoundException();
-  AccountNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1498349563916294614LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AccountNotFoundException__
diff --git a/libjava/javax/security/auth/login/AppConfigurationEntry$LoginModuleControlFlag.h b/libjava/javax/security/auth/login/AppConfigurationEntry$LoginModuleControlFlag.h
deleted file mode 100644
index b5ddbece94b..00000000000
--- a/libjava/javax/security/auth/login/AppConfigurationEntry$LoginModuleControlFlag.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AppConfigurationEntry$LoginModuleControlFlag__
-#define __javax_security_auth_login_AppConfigurationEntry$LoginModuleControlFlag__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AppConfigurationEntry$LoginModuleControlFlag;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag : public ::java::lang::Object
-{
-
-  AppConfigurationEntry$LoginModuleControlFlag();
-public:
-  virtual ::java::lang::String * toString();
-  static ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * OPTIONAL;
-  static ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * REQUIRED;
-  static ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * REQUISITE;
-  static ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * SUFFICIENT;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AppConfigurationEntry$LoginModuleControlFlag__
diff --git a/libjava/javax/security/auth/login/AppConfigurationEntry.h b/libjava/javax/security/auth/login/AppConfigurationEntry.h
deleted file mode 100644
index 8ca23b3e301..00000000000
--- a/libjava/javax/security/auth/login/AppConfigurationEntry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_AppConfigurationEntry__
-#define __javax_security_auth_login_AppConfigurationEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AppConfigurationEntry;
-            class AppConfigurationEntry$LoginModuleControlFlag;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::AppConfigurationEntry : public ::java::lang::Object
-{
-
-public:
-  AppConfigurationEntry(::java::lang::String *, ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag *, ::java::util::Map *);
-  virtual ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * getControlFlag();
-  virtual ::java::lang::String * getLoginModuleName();
-  virtual ::java::util::Map * getOptions();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loginModuleName;
-  ::javax::security::auth::login::AppConfigurationEntry$LoginModuleControlFlag * controlFlag;
-  ::java::util::Map * options;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_AppConfigurationEntry__
diff --git a/libjava/javax/security/auth/login/Configuration$1.h b/libjava/javax/security/auth/login/Configuration$1.h
deleted file mode 100644
index e91c8a4d342..00000000000
--- a/libjava/javax/security/auth/login/Configuration$1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_Configuration$1__
-#define __javax_security_auth_login_Configuration$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class Configuration$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::Configuration$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Configuration$1();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_Configuration$1__
diff --git a/libjava/javax/security/auth/login/Configuration.h b/libjava/javax/security/auth/login/Configuration.h
deleted file mode 100644
index 1da5bf7130c..00000000000
--- a/libjava/javax/security/auth/login/Configuration.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_Configuration__
-#define __javax_security_auth_login_Configuration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AppConfigurationEntry;
-            class Configuration;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::Configuration : public ::java::lang::Object
-{
-
-public: // actually protected
-  Configuration();
-public:
-  static ::javax::security::auth::login::Configuration * getConfiguration();
-  static void setConfiguration(::javax::security::auth::login::Configuration *);
-  virtual JArray< ::javax::security::auth::login::AppConfigurationEntry * > * getAppConfigurationEntry(::java::lang::String *) = 0;
-  virtual void refresh() = 0;
-public: // actually package-private
-  static ::javax::security::auth::login::Configuration * getConfig();
-private:
-  static ::javax::security::auth::login::Configuration * config;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_Configuration__
diff --git a/libjava/javax/security/auth/login/CredentialException.h b/libjava/javax/security/auth/login/CredentialException.h
deleted file mode 100644
index 87b0c068397..00000000000
--- a/libjava/javax/security/auth/login/CredentialException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_CredentialException__
-#define __javax_security_auth_login_CredentialException__
-
-#pragma interface
-
-#include <javax/security/auth/login/LoginException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class CredentialException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::CredentialException : public ::javax::security::auth::login::LoginException
-{
-
-public:
-  CredentialException();
-  CredentialException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4772893876810601859LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_CredentialException__
diff --git a/libjava/javax/security/auth/login/CredentialExpiredException.h b/libjava/javax/security/auth/login/CredentialExpiredException.h
deleted file mode 100644
index a10aefa13bd..00000000000
--- a/libjava/javax/security/auth/login/CredentialExpiredException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_CredentialExpiredException__
-#define __javax_security_auth_login_CredentialExpiredException__
-
-#pragma interface
-
-#include <javax/security/auth/login/CredentialException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class CredentialExpiredException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::CredentialExpiredException : public ::javax::security::auth::login::CredentialException
-{
-
-public:
-  CredentialExpiredException();
-  CredentialExpiredException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5344739593859737937LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_CredentialExpiredException__
diff --git a/libjava/javax/security/auth/login/CredentialNotFoundException.h b/libjava/javax/security/auth/login/CredentialNotFoundException.h
deleted file mode 100644
index c60f3db8de4..00000000000
--- a/libjava/javax/security/auth/login/CredentialNotFoundException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_CredentialNotFoundException__
-#define __javax_security_auth_login_CredentialNotFoundException__
-
-#pragma interface
-
-#include <javax/security/auth/login/CredentialException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class CredentialNotFoundException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::CredentialNotFoundException : public ::javax::security::auth::login::CredentialException
-{
-
-public:
-  CredentialNotFoundException();
-  CredentialNotFoundException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7779934467214319475LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_CredentialNotFoundException__
diff --git a/libjava/javax/security/auth/login/FailedLoginException.h b/libjava/javax/security/auth/login/FailedLoginException.h
deleted file mode 100644
index 014a472c6d9..00000000000
--- a/libjava/javax/security/auth/login/FailedLoginException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_FailedLoginException__
-#define __javax_security_auth_login_FailedLoginException__
-
-#pragma interface
-
-#include <javax/security/auth/login/LoginException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class FailedLoginException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::FailedLoginException : public ::javax::security::auth::login::LoginException
-{
-
-public:
-  FailedLoginException();
-  FailedLoginException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 802556922354616286LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_FailedLoginException__
diff --git a/libjava/javax/security/auth/login/LoginContext.h b/libjava/javax/security/auth/login/LoginContext.h
deleted file mode 100644
index b6d39cd5038..00000000000
--- a/libjava/javax/security/auth/login/LoginContext.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_LoginContext__
-#define __javax_security_auth_login_LoginContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-        namespace login
-        {
-            class AppConfigurationEntry;
-            class Configuration;
-            class LoginContext;
-        }
-        namespace spi
-        {
-            class LoginModule;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::LoginContext : public ::java::lang::Object
-{
-
-public:
-  LoginContext(::java::lang::String *);
-  LoginContext(::java::lang::String *, ::javax::security::auth::callback::CallbackHandler *);
-  LoginContext(::java::lang::String *, ::javax::security::auth::Subject *);
-  LoginContext(::java::lang::String *, ::javax::security::auth::Subject *, ::javax::security::auth::callback::CallbackHandler *);
-  LoginContext(::java::lang::String *, ::javax::security::auth::Subject *, ::javax::security::auth::callback::CallbackHandler *, ::javax::security::auth::login::Configuration *);
-  virtual ::javax::security::auth::Subject * getSubject();
-  virtual void login();
-  virtual void logout();
-private:
-  static ::javax::security::auth::callback::CallbackHandler * defaultHandler();
-  ::javax::security::auth::spi::LoginModule * lookupModule(::javax::security::auth::login::AppConfigurationEntry *, ::javax::security::auth::Subject *, ::java::util::Map *);
-  static ::java::lang::String * OTHER;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::javax::security::auth::callback::CallbackHandler * cbHandler;
-  ::javax::security::auth::Subject * subject;
-  JArray< ::javax::security::auth::login::AppConfigurationEntry * > * entries;
-  JArray< ::javax::security::auth::spi::LoginModule * > * modules;
-  ::java::util::Map * sharedState;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_LoginContext__
diff --git a/libjava/javax/security/auth/login/LoginException.h b/libjava/javax/security/auth/login/LoginException.h
deleted file mode 100644
index e68060db78c..00000000000
--- a/libjava/javax/security/auth/login/LoginException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_LoginException__
-#define __javax_security_auth_login_LoginException__
-
-#pragma interface
-
-#include <java/security/GeneralSecurityException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class LoginException;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::LoginException : public ::java::security::GeneralSecurityException
-{
-
-public:
-  LoginException();
-  LoginException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4679091624035232488LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_LoginException__
diff --git a/libjava/javax/security/auth/login/NullConfiguration.h b/libjava/javax/security/auth/login/NullConfiguration.h
deleted file mode 100644
index 5d73d7ff33f..00000000000
--- a/libjava/javax/security/auth/login/NullConfiguration.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_login_NullConfiguration__
-#define __javax_security_auth_login_NullConfiguration__
-
-#pragma interface
-
-#include <javax/security/auth/login/Configuration.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace login
-        {
-            class AppConfigurationEntry;
-            class NullConfiguration;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::login::NullConfiguration : public ::javax::security::auth::login::Configuration
-{
-
-public: // actually package-private
-  NullConfiguration();
-public:
-  JArray< ::javax::security::auth::login::AppConfigurationEntry * > * getAppConfigurationEntry(::java::lang::String *);
-  void refresh();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_login_NullConfiguration__
diff --git a/libjava/javax/security/auth/spi/LoginModule.h b/libjava/javax/security/auth/spi/LoginModule.h
deleted file mode 100644
index 413c684f0e7..00000000000
--- a/libjava/javax/security/auth/spi/LoginModule.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_spi_LoginModule__
-#define __javax_security_auth_spi_LoginModule__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-          class Subject;
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-        namespace spi
-        {
-            class LoginModule;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::spi::LoginModule : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean abort() = 0;
-  virtual jboolean commit() = 0;
-  virtual void initialize(::javax::security::auth::Subject *, ::javax::security::auth::callback::CallbackHandler *, ::java::util::Map *, ::java::util::Map *) = 0;
-  virtual jboolean login() = 0;
-  virtual jboolean logout() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_auth_spi_LoginModule__
diff --git a/libjava/javax/security/auth/x500/X500Principal.h b/libjava/javax/security/auth/x500/X500Principal.h
deleted file mode 100644
index 75cdb05e7ef..00000000000
--- a/libjava/javax/security/auth/x500/X500Principal.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_x500_X500Principal__
-#define __javax_security_auth_x500_X500Principal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace security
-      {
-          class OID;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500Principal;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::x500::X500Principal : public ::java::lang::Object
-{
-
-  X500Principal();
-public:
-  X500Principal(::java::lang::String *);
-  X500Principal(JArray< jbyte > *);
-  X500Principal(::java::io::InputStream *);
-  jint hashCode();
-  jboolean equals(::java::lang::Object *);
-  JArray< jbyte > * getEncoded();
-  ::java::lang::String * getName();
-  ::java::lang::String * getName(::java::lang::String *);
-  ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  jint size();
-  ::java::lang::String * getComponent(::gnu::java::security::OID *, jint);
-  void encodeDer();
-  void parseString(::java::lang::String *);
-  ::java::lang::String * readAttributeType(::java::io::Reader *);
-  ::java::lang::String * readAttributeValue(::java::io::Reader *);
-  void parseDer(::java::io::InputStream *);
-  void newRelativeDistinguishedName();
-  void putComponent(::gnu::java::security::OID *, ::java::lang::String *);
-  void putComponent(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * compressWS(::java::lang::String *);
-  static JArray< jbyte > * toByteArray(::java::lang::String *);
-  static const jlong serialVersionUID = -500463348111345721LL;
-public:
-  static ::java::lang::String * CANONICAL;
-  static ::java::lang::String * RFC1779;
-  static ::java::lang::String * RFC2253;
-private:
-  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 * DC;
-  static ::gnu::java::security::OID * UID;
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) components;
-  ::java::util::Map * currentRdn;
-  jboolean fixed;
-  JArray< jbyte > * encoded;
-  jint sep;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_x500_X500Principal__
diff --git a/libjava/javax/security/auth/x500/X500PrivateCredential.h b/libjava/javax/security/auth/x500/X500PrivateCredential.h
deleted file mode 100644
index 27ee30e4a0f..00000000000
--- a/libjava/javax/security/auth/x500/X500PrivateCredential.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_auth_x500_X500PrivateCredential__
-#define __javax_security_auth_x500_X500PrivateCredential__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PrivateKey;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace x500
-        {
-            class X500PrivateCredential;
-        }
-      }
-    }
-  }
-}
-
-class javax::security::auth::x500::X500PrivateCredential : public ::java::lang::Object
-{
-
-public:
-  X500PrivateCredential(::java::security::cert::X509Certificate *, ::java::security::PrivateKey *);
-  X500PrivateCredential(::java::security::cert::X509Certificate *, ::java::security::PrivateKey *, ::java::lang::String *);
-  ::java::security::cert::X509Certificate * getCertificate();
-  ::java::security::PrivateKey * getPrivateKey();
-  ::java::lang::String * getAlias();
-  void destroy();
-  jboolean isDestroyed();
-private:
-  ::java::security::PrivateKey * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::security::cert::X509Certificate * certificate;
-  ::java::lang::String * alias;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_auth_x500_X500PrivateCredential__
diff --git a/libjava/javax/security/cert/Certificate.h b/libjava/javax/security/cert/Certificate.h
deleted file mode 100644
index 1417a9ae2c6..00000000000
--- a/libjava/javax/security/cert/Certificate.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_Certificate__
-#define __javax_security_cert_Certificate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class PublicKey;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class javax::security::cert::Certificate : public ::java::lang::Object
-{
-
-public:
-  Certificate();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual JArray< jbyte > * getEncoded() = 0;
-  virtual void verify(::java::security::PublicKey *) = 0;
-  virtual void verify(::java::security::PublicKey *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::java::security::PublicKey * getPublicKey() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_Certificate__
diff --git a/libjava/javax/security/cert/CertificateEncodingException.h b/libjava/javax/security/cert/CertificateEncodingException.h
deleted file mode 100644
index d9f102e63cc..00000000000
--- a/libjava/javax/security/cert/CertificateEncodingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_CertificateEncodingException__
-#define __javax_security_cert_CertificateEncodingException__
-
-#pragma interface
-
-#include <javax/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateEncodingException;
-      }
-    }
-  }
-}
-
-class javax::security::cert::CertificateEncodingException : public ::javax::security::cert::CertificateException
-{
-
-public:
-  CertificateEncodingException();
-  CertificateEncodingException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_CertificateEncodingException__
diff --git a/libjava/javax/security/cert/CertificateException.h b/libjava/javax/security/cert/CertificateException.h
deleted file mode 100644
index 259c5fb0f97..00000000000
--- a/libjava/javax/security/cert/CertificateException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_CertificateException__
-#define __javax_security_cert_CertificateException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateException;
-      }
-    }
-  }
-}
-
-class javax::security::cert::CertificateException : public ::java::lang::Exception
-{
-
-public:
-  CertificateException();
-  CertificateException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_CertificateException__
diff --git a/libjava/javax/security/cert/CertificateExpiredException.h b/libjava/javax/security/cert/CertificateExpiredException.h
deleted file mode 100644
index c8260988d4e..00000000000
--- a/libjava/javax/security/cert/CertificateExpiredException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_CertificateExpiredException__
-#define __javax_security_cert_CertificateExpiredException__
-
-#pragma interface
-
-#include <javax/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateExpiredException;
-      }
-    }
-  }
-}
-
-class javax::security::cert::CertificateExpiredException : public ::javax::security::cert::CertificateException
-{
-
-public:
-  CertificateExpiredException();
-  CertificateExpiredException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_CertificateExpiredException__
diff --git a/libjava/javax/security/cert/CertificateNotYetValidException.h b/libjava/javax/security/cert/CertificateNotYetValidException.h
deleted file mode 100644
index 6b840c51e3b..00000000000
--- a/libjava/javax/security/cert/CertificateNotYetValidException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_CertificateNotYetValidException__
-#define __javax_security_cert_CertificateNotYetValidException__
-
-#pragma interface
-
-#include <javax/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateNotYetValidException;
-      }
-    }
-  }
-}
-
-class javax::security::cert::CertificateNotYetValidException : public ::javax::security::cert::CertificateException
-{
-
-public:
-  CertificateNotYetValidException();
-  CertificateNotYetValidException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_CertificateNotYetValidException__
diff --git a/libjava/javax/security/cert/CertificateParsingException.h b/libjava/javax/security/cert/CertificateParsingException.h
deleted file mode 100644
index e55a28405c1..00000000000
--- a/libjava/javax/security/cert/CertificateParsingException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_CertificateParsingException__
-#define __javax_security_cert_CertificateParsingException__
-
-#pragma interface
-
-#include <javax/security/cert/CertificateException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class CertificateParsingException;
-      }
-    }
-  }
-}
-
-class javax::security::cert::CertificateParsingException : public ::javax::security::cert::CertificateException
-{
-
-public:
-  CertificateParsingException();
-  CertificateParsingException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_CertificateParsingException__
diff --git a/libjava/javax/security/cert/X509CertBridge.h b/libjava/javax/security/cert/X509CertBridge.h
deleted file mode 100644
index be6a18f15df..00000000000
--- a/libjava/javax/security/cert/X509CertBridge.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_X509CertBridge__
-#define __javax_security_cert_X509CertBridge__
-
-#pragma interface
-
-#include <javax/security/cert/X509Certificate.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Principal;
-        class PublicKey;
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509CertBridge;
-      }
-    }
-  }
-}
-
-class javax::security::cert::X509CertBridge : public ::javax::security::cert::X509Certificate
-{
-
-public: // actually package-private
-  X509CertBridge(::java::security::cert::X509Certificate *);
-public:
-  JArray< jbyte > * getEncoded();
-  void verify(::java::security::PublicKey *);
-  void verify(::java::security::PublicKey *, ::java::lang::String *);
-  ::java::lang::String * toString();
-  ::java::security::PublicKey * getPublicKey();
-  void checkValidity();
-  void checkValidity(::java::util::Date *);
-  jint getVersion();
-  ::java::math::BigInteger * getSerialNumber();
-  ::java::security::Principal * getIssuerDN();
-  ::java::security::Principal * getSubjectDN();
-  ::java::util::Date * getNotBefore();
-  ::java::util::Date * getNotAfter();
-  ::java::lang::String * getSigAlgName();
-  ::java::lang::String * getSigAlgOID();
-  JArray< jbyte > * getSigAlgParams();
-private:
-  ::java::security::cert::X509Certificate * __attribute__((aligned(__alignof__( ::javax::security::cert::X509Certificate)))) cert;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_X509CertBridge__
diff --git a/libjava/javax/security/cert/X509Certificate.h b/libjava/javax/security/cert/X509Certificate.h
deleted file mode 100644
index 8d1cda6c6b9..00000000000
--- a/libjava/javax/security/cert/X509Certificate.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_cert_X509Certificate__
-#define __javax_security_cert_X509Certificate__
-
-#pragma interface
-
-#include <javax/security/cert/Certificate.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigInteger;
-    }
-    namespace security
-    {
-        class Principal;
-    }
-  }
-  namespace javax
-  {
-    namespace security
-    {
-      namespace cert
-      {
-          class X509Certificate;
-      }
-    }
-  }
-}
-
-class javax::security::cert::X509Certificate : public ::javax::security::cert::Certificate
-{
-
-public:
-  X509Certificate();
-  static ::javax::security::cert::X509Certificate * getInstance(JArray< jbyte > *);
-  static ::javax::security::cert::X509Certificate * getInstance(::java::io::InputStream *);
-  virtual void checkValidity() = 0;
-  virtual void checkValidity(::java::util::Date *) = 0;
-  virtual jint getVersion() = 0;
-  virtual ::java::math::BigInteger * getSerialNumber() = 0;
-  virtual ::java::security::Principal * getIssuerDN() = 0;
-  virtual ::java::security::Principal * getSubjectDN() = 0;
-  virtual ::java::util::Date * getNotBefore() = 0;
-  virtual ::java::util::Date * getNotAfter() = 0;
-  virtual ::java::lang::String * getSigAlgName() = 0;
-  virtual ::java::lang::String * getSigAlgOID() = 0;
-  virtual JArray< jbyte > * getSigAlgParams() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_cert_X509Certificate__
diff --git a/libjava/javax/security/sasl/AuthenticationException.h b/libjava/javax/security/sasl/AuthenticationException.h
deleted file mode 100644
index 1ab4491acae..00000000000
--- a/libjava/javax/security/sasl/AuthenticationException.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_AuthenticationException__
-#define __javax_security_sasl_AuthenticationException__
-
-#pragma interface
-
-#include <javax/security/sasl/SaslException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class AuthenticationException;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::AuthenticationException : public ::javax::security::sasl::SaslException
-{
-
-public:
-  AuthenticationException();
-  AuthenticationException(::java::lang::String *);
-  AuthenticationException(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_AuthenticationException__
diff --git a/libjava/javax/security/sasl/AuthorizeCallback.h b/libjava/javax/security/sasl/AuthorizeCallback.h
deleted file mode 100644
index 3ae14bdb4ef..00000000000
--- a/libjava/javax/security/sasl/AuthorizeCallback.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_AuthorizeCallback__
-#define __javax_security_sasl_AuthorizeCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class AuthorizeCallback;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::AuthorizeCallback : public ::java::lang::Object
-{
-
-public:
-  AuthorizeCallback(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getAuthenticationID();
-  virtual ::java::lang::String * getAuthorizationID();
-  virtual jboolean isAuthorized();
-  virtual void setAuthorized(jboolean);
-  virtual ::java::lang::String * getAuthorizedID();
-  virtual void setAuthorizedID(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2353344186490470805LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) authenticationID;
-  ::java::lang::String * authorizationID;
-  ::java::lang::String * authorizedID;
-  jboolean authorized;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_AuthorizeCallback__
diff --git a/libjava/javax/security/sasl/RealmCallback.h b/libjava/javax/security/sasl/RealmCallback.h
deleted file mode 100644
index 17dff32907e..00000000000
--- a/libjava/javax/security/sasl/RealmCallback.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_RealmCallback__
-#define __javax_security_sasl_RealmCallback__
-
-#pragma interface
-
-#include <javax/security/auth/callback/TextInputCallback.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class RealmCallback;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::RealmCallback : public ::javax::security::auth::callback::TextInputCallback
-{
-
-public:
-  RealmCallback(::java::lang::String *);
-  RealmCallback(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_RealmCallback__
diff --git a/libjava/javax/security/sasl/RealmChoiceCallback.h b/libjava/javax/security/sasl/RealmChoiceCallback.h
deleted file mode 100644
index c1ec2a20e39..00000000000
--- a/libjava/javax/security/sasl/RealmChoiceCallback.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_RealmChoiceCallback__
-#define __javax_security_sasl_RealmChoiceCallback__
-
-#pragma interface
-
-#include <javax/security/auth/callback/ChoiceCallback.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class RealmChoiceCallback;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::RealmChoiceCallback : public ::javax::security::auth::callback::ChoiceCallback
-{
-
-public:
-  RealmChoiceCallback(::java::lang::String *, JArray< ::java::lang::String * > *, jint, jboolean);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_RealmChoiceCallback__
diff --git a/libjava/javax/security/sasl/Sasl.h b/libjava/javax/security/sasl/Sasl.h
deleted file mode 100644
index 16a0cf23d94..00000000000
--- a/libjava/javax/security/sasl/Sasl.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_Sasl__
-#define __javax_security_sasl_Sasl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-      }
-      namespace sasl
-      {
-          class Sasl;
-          class SaslClient;
-          class SaslServer;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::Sasl : public ::java::lang::Object
-{
-
-  Sasl();
-public:
-  static ::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 *);
-  static ::java::util::Enumeration * getSaslClientFactories();
-  static ::javax::security::sasl::SaslServer * createSaslServer(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Map *, ::javax::security::auth::callback::CallbackHandler *);
-  static ::java::util::Enumeration * getSaslServerFactories();
-  static ::java::lang::String * QOP;
-  static ::java::lang::String * STRENGTH;
-  static ::java::lang::String * SERVER_AUTH;
-  static ::java::lang::String * MAX_BUFFER;
-  static ::java::lang::String * RAW_SEND_SIZE;
-  static ::java::lang::String * POLICY_NOPLAINTEXT;
-  static ::java::lang::String * POLICY_NOACTIVE;
-  static ::java::lang::String * POLICY_NODICTIONARY;
-  static ::java::lang::String * POLICY_NOANONYMOUS;
-  static ::java::lang::String * POLICY_FORWARD_SECRECY;
-  static ::java::lang::String * POLICY_PASS_CREDENTIALS;
-  static ::java::lang::String * REUSE;
-private:
-  static ::java::lang::String * CLIENT_FACTORY_SVC;
-  static ::java::lang::String * SERVER_FACTORY_SVC;
-  static ::java::lang::String * ALIAS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_Sasl__
diff --git a/libjava/javax/security/sasl/SaslClient.h b/libjava/javax/security/sasl/SaslClient.h
deleted file mode 100644
index cad1cdaa8f6..00000000000
--- a/libjava/javax/security/sasl/SaslClient.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_SaslClient__
-#define __javax_security_sasl_SaslClient__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class SaslClient;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::SaslClient : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getMechanismName() = 0;
-  virtual jboolean hasInitialResponse() = 0;
-  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *) = 0;
-  virtual jboolean isComplete() = 0;
-  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::lang::Object * getNegotiatedProperty(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_sasl_SaslClient__
diff --git a/libjava/javax/security/sasl/SaslClientFactory.h b/libjava/javax/security/sasl/SaslClientFactory.h
deleted file mode 100644
index ab603a104af..00000000000
--- a/libjava/javax/security/sasl/SaslClientFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_SaslClientFactory__
-#define __javax_security_sasl_SaslClientFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-      }
-      namespace sasl
-      {
-          class SaslClient;
-          class SaslClientFactory;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::SaslClientFactory : public ::java::lang::Object
-{
-
-public:
-  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 *) = 0;
-  virtual JArray< ::java::lang::String * > * getMechanismNames(::java::util::Map *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_sasl_SaslClientFactory__
diff --git a/libjava/javax/security/sasl/SaslException.h b/libjava/javax/security/sasl/SaslException.h
deleted file mode 100644
index 9cfd9fce38b..00000000000
--- a/libjava/javax/security/sasl/SaslException.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_SaslException__
-#define __javax_security_sasl_SaslException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class SaslException;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::SaslException : public ::java::io::IOException
-{
-
-public:
-  SaslException();
-  SaslException(::java::lang::String *);
-  SaslException(::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:
-  static const jlong serialVersionUID = 4579784287983423626LL;
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::io::IOException)))) _exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_security_sasl_SaslException__
diff --git a/libjava/javax/security/sasl/SaslServer.h b/libjava/javax/security/sasl/SaslServer.h
deleted file mode 100644
index d1f6a89c6ce..00000000000
--- a/libjava/javax/security/sasl/SaslServer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_SaslServer__
-#define __javax_security_sasl_SaslServer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace sasl
-      {
-          class SaslServer;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::SaslServer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getMechanismName() = 0;
-  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *) = 0;
-  virtual jboolean isComplete() = 0;
-  virtual ::java::lang::String * getAuthorizationID() = 0;
-  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint) = 0;
-  virtual ::java::lang::Object * getNegotiatedProperty(::java::lang::String *) = 0;
-  virtual void dispose() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_sasl_SaslServer__
diff --git a/libjava/javax/security/sasl/SaslServerFactory.h b/libjava/javax/security/sasl/SaslServerFactory.h
deleted file mode 100644
index ceaf0016ed9..00000000000
--- a/libjava/javax/security/sasl/SaslServerFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_security_sasl_SaslServerFactory__
-#define __javax_security_sasl_SaslServerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace security
-    {
-      namespace auth
-      {
-        namespace callback
-        {
-            class CallbackHandler;
-        }
-      }
-      namespace sasl
-      {
-          class SaslServer;
-          class SaslServerFactory;
-      }
-    }
-  }
-}
-
-class javax::security::sasl::SaslServerFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::security::sasl::SaslServer * createSaslServer(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Map *, ::javax::security::auth::callback::CallbackHandler *) = 0;
-  virtual JArray< ::java::lang::String * > * getMechanismNames(::java::util::Map *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_security_sasl_SaslServerFactory__
diff --git a/libjava/javax/sound/midi/ControllerEventListener.h b/libjava/javax/sound/midi/ControllerEventListener.h
deleted file mode 100644
index f3352319082..00000000000
--- a/libjava/javax/sound/midi/ControllerEventListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_ControllerEventListener__
-#define __javax_sound_midi_ControllerEventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class ControllerEventListener;
-          class ShortMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::ControllerEventListener : public ::java::lang::Object
-{
-
-public:
-  virtual void controlChange(::javax::sound::midi::ShortMessage *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_ControllerEventListener__
diff --git a/libjava/javax/sound/midi/Instrument.h b/libjava/javax/sound/midi/Instrument.h
deleted file mode 100644
index 9f895a57f46..00000000000
--- a/libjava/javax/sound/midi/Instrument.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Instrument__
-#define __javax_sound_midi_Instrument__
-
-#pragma interface
-
-#include <javax/sound/midi/SoundbankResource.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Instrument;
-          class Patch;
-          class Soundbank;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Instrument : public ::javax::sound::midi::SoundbankResource
-{
-
-public: // actually protected
-  Instrument(::javax::sound::midi::Soundbank *, ::javax::sound::midi::Patch *, ::java::lang::String *, ::java::lang::Class *);
-public:
-  virtual ::javax::sound::midi::Patch * getPatch();
-private:
-  ::javax::sound::midi::Patch * __attribute__((aligned(__alignof__( ::javax::sound::midi::SoundbankResource)))) patch;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_Instrument__
diff --git a/libjava/javax/sound/midi/InvalidMidiDataException.h b/libjava/javax/sound/midi/InvalidMidiDataException.h
deleted file mode 100644
index c66b0816f99..00000000000
--- a/libjava/javax/sound/midi/InvalidMidiDataException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_InvalidMidiDataException__
-#define __javax_sound_midi_InvalidMidiDataException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class InvalidMidiDataException;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::InvalidMidiDataException : public ::java::lang::Exception
-{
-
-public:
-  InvalidMidiDataException();
-  InvalidMidiDataException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2780771756789932067LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_InvalidMidiDataException__
diff --git a/libjava/javax/sound/midi/MetaEventListener.h b/libjava/javax/sound/midi/MetaEventListener.h
deleted file mode 100644
index ccbed891bea..00000000000
--- a/libjava/javax/sound/midi/MetaEventListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MetaEventListener__
-#define __javax_sound_midi_MetaEventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MetaEventListener;
-          class MetaMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MetaEventListener : public ::java::lang::Object
-{
-
-public:
-  virtual void meta(::javax::sound::midi::MetaMessage *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_MetaEventListener__
diff --git a/libjava/javax/sound/midi/MetaMessage.h b/libjava/javax/sound/midi/MetaMessage.h
deleted file mode 100644
index a50e3b22883..00000000000
--- a/libjava/javax/sound/midi/MetaMessage.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MetaMessage__
-#define __javax_sound_midi_MetaMessage__
-
-#pragma interface
-
-#include <javax/sound/midi/MidiMessage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MetaMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MetaMessage : public ::javax::sound::midi::MidiMessage
-{
-
-public:
-  MetaMessage();
-public: // actually protected
-  MetaMessage(JArray< jbyte > *);
-public:
-  virtual void setMessage(jint, JArray< jbyte > *, jint);
-  virtual jint getType();
-  virtual JArray< jbyte > * getData();
-  virtual ::java::lang::Object * clone();
-  static const jint META = 255;
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::sound::midi::MidiMessage)))) lengthLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MetaMessage__
diff --git a/libjava/javax/sound/midi/MidiChannel.h b/libjava/javax/sound/midi/MidiChannel.h
deleted file mode 100644
index 4d348d2f783..00000000000
--- a/libjava/javax/sound/midi/MidiChannel.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiChannel__
-#define __javax_sound_midi_MidiChannel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiChannel;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiChannel : public ::java::lang::Object
-{
-
-public:
-  virtual void noteOn(jint, jint) = 0;
-  virtual void noteOff(jint, jint) = 0;
-  virtual void noteOff(jint) = 0;
-  virtual void setPolyPressure(jint, jint) = 0;
-  virtual jint getPolyPressure(jint) = 0;
-  virtual void setChannelPressure(jint) = 0;
-  virtual jint getChannelPressure() = 0;
-  virtual void controlChange(jint, jint) = 0;
-  virtual jint getController(jint) = 0;
-  virtual void programChange(jint) = 0;
-  virtual void programChange(jint, jint) = 0;
-  virtual jint getProgram() = 0;
-  virtual void setPitchBend(jint) = 0;
-  virtual jint getPitchBend() = 0;
-  virtual void resetAllControllers() = 0;
-  virtual void allNotesOff() = 0;
-  virtual void allSoundOff() = 0;
-  virtual jboolean localControl(jboolean) = 0;
-  virtual void setMono(jboolean) = 0;
-  virtual jboolean getMono() = 0;
-  virtual void setOmni(jboolean) = 0;
-  virtual jboolean getOmni() = 0;
-  virtual void setMute(jboolean) = 0;
-  virtual jboolean getMute() = 0;
-  virtual void setSolo(jboolean) = 0;
-  virtual jboolean getSolo() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_MidiChannel__
diff --git a/libjava/javax/sound/midi/MidiDevice$Info.h b/libjava/javax/sound/midi/MidiDevice$Info.h
deleted file mode 100644
index 02b9c42f667..00000000000
--- a/libjava/javax/sound/midi/MidiDevice$Info.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiDevice$Info__
-#define __javax_sound_midi_MidiDevice$Info__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiDevice$Info : public ::java::lang::Object
-{
-
-public: // actually protected
-  MidiDevice$Info(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getVendor();
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getVersion();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * vendor;
-  ::java::lang::String * description;
-  ::java::lang::String * version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiDevice$Info__
diff --git a/libjava/javax/sound/midi/MidiDevice.h b/libjava/javax/sound/midi/MidiDevice.h
deleted file mode 100644
index bc952ab1076..00000000000
--- a/libjava/javax/sound/midi/MidiDevice.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiDevice__
-#define __javax_sound_midi_MidiDevice__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-          class MidiDevice$Info;
-          class Receiver;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiDevice : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::sound::midi::MidiDevice$Info * getDeviceInfo() = 0;
-  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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_MidiDevice__
diff --git a/libjava/javax/sound/midi/MidiEvent.h b/libjava/javax/sound/midi/MidiEvent.h
deleted file mode 100644
index ef6dbd0f267..00000000000
--- a/libjava/javax/sound/midi/MidiEvent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiEvent__
-#define __javax_sound_midi_MidiEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiEvent;
-          class MidiMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiEvent : public ::java::lang::Object
-{
-
-public:
-  MidiEvent(::javax::sound::midi::MidiMessage *, jlong);
-  virtual ::javax::sound::midi::MidiMessage * getMessage();
-  virtual void setTick(jlong);
-  virtual jlong getTick();
-private:
-  ::javax::sound::midi::MidiMessage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) message;
-  jlong tick;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiEvent__
diff --git a/libjava/javax/sound/midi/MidiFileFormat.h b/libjava/javax/sound/midi/MidiFileFormat.h
deleted file mode 100644
index 57fab827a78..00000000000
--- a/libjava/javax/sound/midi/MidiFileFormat.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiFileFormat__
-#define __javax_sound_midi_MidiFileFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiFileFormat;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiFileFormat : public ::java::lang::Object
-{
-
-public:
-  MidiFileFormat(jint, jfloat, jint, jint, jlong);
-  virtual jint getType();
-  virtual jfloat getDivisionType();
-  virtual jint getResolution();
-  virtual jint getByteLength();
-  virtual jlong getMicrosecondLength();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jfloat divisionType;
-  jint resolution;
-  jint byteLength;
-  jlong microsecondLength;
-public:
-  static const jint UNKNOWN_LENGTH = -1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiFileFormat__
diff --git a/libjava/javax/sound/midi/MidiMessage.h b/libjava/javax/sound/midi/MidiMessage.h
deleted file mode 100644
index bf7e2d21725..00000000000
--- a/libjava/javax/sound/midi/MidiMessage.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiMessage__
-#define __javax_sound_midi_MidiMessage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiMessage : public ::java::lang::Object
-{
-
-public: // actually protected
-  MidiMessage(JArray< jbyte > *);
-  virtual void setMessage(JArray< jbyte > *, jint);
-public:
-  virtual JArray< jbyte > * getMessage();
-  virtual jint getStatus();
-  virtual jint getLength();
-  virtual ::java::lang::Object * clone() = 0;
-public: // actually protected
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiMessage__
diff --git a/libjava/javax/sound/midi/MidiSystem.h b/libjava/javax/sound/midi/MidiSystem.h
deleted file mode 100644
index 487b9d6de8e..00000000000
--- a/libjava/javax/sound/midi/MidiSystem.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiSystem__
-#define __javax_sound_midi_MidiSystem__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-          class MidiDevice$Info;
-          class MidiFileFormat;
-          class MidiSystem;
-          class Receiver;
-          class Sequence;
-          class Sequencer;
-          class Soundbank;
-          class Synthesizer;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiSystem : public ::java::lang::Object
-{
-
-  MidiSystem();
-public:
-  static JArray< ::javax::sound::midi::MidiDevice$Info * > * getMidiDeviceInfo();
-  static ::javax::sound::midi::MidiDevice * getMidiDevice(::javax::sound::midi::MidiDevice$Info *);
-  static ::javax::sound::midi::Receiver * getReceiver();
-  static ::javax::sound::midi::Transmitter * getTransmitter();
-  static ::javax::sound::midi::Synthesizer * getSynthesizer();
-  static ::javax::sound::midi::Sequencer * getSequencer();
-  static ::javax::sound::midi::Soundbank * getSoundbank(::java::io::InputStream *);
-  static ::javax::sound::midi::Soundbank * getSoundbank(::java::net::URL *);
-  static ::javax::sound::midi::Soundbank * getSoundbank(::java::io::File *);
-  static ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::io::InputStream *);
-  static ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::net::URL *);
-  static ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::io::File *);
-  static ::javax::sound::midi::Sequence * getSequence(::java::io::InputStream *);
-  static ::javax::sound::midi::Sequence * getSequence(::java::net::URL *);
-  static ::javax::sound::midi::Sequence * getSequence(::java::io::File *);
-  static JArray< jint > * getMidiFileTypes();
-  static jboolean isFileTypeSupported(jint);
-  static JArray< jint > * getMidiFileTypes(::javax::sound::midi::Sequence *);
-  static jboolean isFileTypeSupported(jint, ::javax::sound::midi::Sequence *);
-  static jint write(::javax::sound::midi::Sequence *, jint, ::java::io::OutputStream *);
-  static jint write(::javax::sound::midi::Sequence *, jint, ::java::io::File *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiSystem__
diff --git a/libjava/javax/sound/midi/MidiUnavailableException.h b/libjava/javax/sound/midi/MidiUnavailableException.h
deleted file mode 100644
index 740496db2dd..00000000000
--- a/libjava/javax/sound/midi/MidiUnavailableException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_MidiUnavailableException__
-#define __javax_sound_midi_MidiUnavailableException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiUnavailableException;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::MidiUnavailableException : public ::java::lang::Exception
-{
-
-public:
-  MidiUnavailableException();
-  MidiUnavailableException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6093809578628944323LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_MidiUnavailableException__
diff --git a/libjava/javax/sound/midi/Patch.h b/libjava/javax/sound/midi/Patch.h
deleted file mode 100644
index fcc9b31867d..00000000000
--- a/libjava/javax/sound/midi/Patch.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Patch__
-#define __javax_sound_midi_Patch__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Patch;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Patch : public ::java::lang::Object
-{
-
-public:
-  Patch(jint, jint);
-  virtual jint getBank();
-  virtual jint getProgram();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) bank;
-  jint program;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_Patch__
diff --git a/libjava/javax/sound/midi/Receiver.h b/libjava/javax/sound/midi/Receiver.h
deleted file mode 100644
index b82d06f185f..00000000000
--- a/libjava/javax/sound/midi/Receiver.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Receiver__
-#define __javax_sound_midi_Receiver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiMessage;
-          class Receiver;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Receiver : public ::java::lang::Object
-{
-
-public:
-  virtual void send(::javax::sound::midi::MidiMessage *, jlong) = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_Receiver__
diff --git a/libjava/javax/sound/midi/Sequence.h b/libjava/javax/sound/midi/Sequence.h
deleted file mode 100644
index 0ca6ed71148..00000000000
--- a/libjava/javax/sound/midi/Sequence.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Sequence__
-#define __javax_sound_midi_Sequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Patch;
-          class Sequence;
-          class Track;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Sequence : public ::java::lang::Object
-{
-
-  void init(jfloat, jint, jint);
-public:
-  Sequence(jfloat, jint);
-  Sequence(jfloat, jint, jint);
-  virtual jfloat getDivisionType();
-  virtual jint getResolution();
-  virtual ::javax::sound::midi::Track * createTrack();
-  virtual jboolean deleteTrack(::javax::sound::midi::Track *);
-  virtual JArray< ::javax::sound::midi::Track * > * getTracks();
-  virtual jlong getMicrosecondLength();
-  virtual jlong getTickLength();
-  virtual JArray< ::javax::sound::midi::Patch * > * getPatchList();
-public: // actually protected
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) divisionType;
-  jint resolution;
-  ::java::util::Vector * tracks;
-public:
-  static jfloat PPQ;
-  static jfloat SMPTE_24;
-  static jfloat SMPTE_25;
-  static jfloat SMPTE_30;
-  static jfloat SMPTE_30DROP;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_Sequence__
diff --git a/libjava/javax/sound/midi/Sequencer$SyncMode.h b/libjava/javax/sound/midi/Sequencer$SyncMode.h
deleted file mode 100644
index 70944db8bd8..00000000000
--- a/libjava/javax/sound/midi/Sequencer$SyncMode.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Sequencer$SyncMode__
-#define __javax_sound_midi_Sequencer$SyncMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Sequencer$SyncMode;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Sequencer$SyncMode : public ::java::lang::Object
-{
-
-public: // actually protected
-  Sequencer$SyncMode(::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  static ::javax::sound::midi::Sequencer$SyncMode * INTERNAL_CLOCK;
-  static ::javax::sound::midi::Sequencer$SyncMode * MIDI_SYNC;
-  static ::javax::sound::midi::Sequencer$SyncMode * MIDI_TIME_CODE;
-  static ::javax::sound::midi::Sequencer$SyncMode * NO_SYNC;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_Sequencer$SyncMode__
diff --git a/libjava/javax/sound/midi/Sequencer.h b/libjava/javax/sound/midi/Sequencer.h
deleted file mode 100644
index 453634e413a..00000000000
--- a/libjava/javax/sound/midi/Sequencer.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Sequencer__
-#define __javax_sound_midi_Sequencer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class ControllerEventListener;
-          class MetaEventListener;
-          class MidiDevice$Info;
-          class Receiver;
-          class Sequence;
-          class Sequencer;
-          class Sequencer$SyncMode;
-          class Track;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Sequencer : public ::java::lang::Object
-{
-
-public:
-  virtual void setSequence(::javax::sound::midi::Sequence *) = 0;
-  virtual void setSequence(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::midi::Sequence * getSequence() = 0;
-  virtual void start() = 0;
-  virtual void stop() = 0;
-  virtual jboolean isRunning() = 0;
-  virtual void startRecording() = 0;
-  virtual void stopRecording() = 0;
-  virtual jboolean isRecording() = 0;
-  virtual void recordEnable(::javax::sound::midi::Track *, jint) = 0;
-  virtual void recordDisable(::javax::sound::midi::Track *) = 0;
-  virtual jfloat getTempoInBPM() = 0;
-  virtual void setTempoInBPM(jfloat) = 0;
-  virtual jfloat getTempoInMPQ() = 0;
-  virtual void setTempoInMPQ(jfloat) = 0;
-  virtual void setTempoFactor(jfloat) = 0;
-  virtual jfloat getTempoFactor() = 0;
-  virtual jlong getTickLength() = 0;
-  virtual jlong getTickPosition() = 0;
-  virtual void setTickPosition(jlong) = 0;
-  virtual jlong getMicrosecondLength() = 0;
-  virtual jlong getMicrosecondPosition() = 0;
-  virtual void setMicrosecondPosition(jlong) = 0;
-  virtual void setMasterSyncMode(::javax::sound::midi::Sequencer$SyncMode *) = 0;
-  virtual ::javax::sound::midi::Sequencer$SyncMode * getMasterSyncMode() = 0;
-  virtual JArray< ::javax::sound::midi::Sequencer$SyncMode * > * getMasterSyncModes() = 0;
-  virtual void setSlaveSyncMode(::javax::sound::midi::Sequencer$SyncMode *) = 0;
-  virtual ::javax::sound::midi::Sequencer$SyncMode * getSlaveSyncMode() = 0;
-  virtual JArray< ::javax::sound::midi::Sequencer$SyncMode * > * getSlaveSyncModes() = 0;
-  virtual void setTrackMute(jint, jboolean) = 0;
-  virtual jboolean getTrackMute(jint) = 0;
-  virtual void setTrackSolo(jint, jboolean) = 0;
-  virtual jboolean getTrackSolo(jint) = 0;
-  virtual jboolean addMetaEventListener(::javax::sound::midi::MetaEventListener *) = 0;
-  virtual void removeMetaEventListener(::javax::sound::midi::MetaEventListener *) = 0;
-  virtual JArray< jint > * addControllerEventListener(::javax::sound::midi::ControllerEventListener *, JArray< jint > *) = 0;
-  virtual JArray< jint > * removeControllerEventListener(::javax::sound::midi::ControllerEventListener *, JArray< jint > *) = 0;
-  virtual ::javax::sound::midi::MidiDevice$Info * getDeviceInfo() = 0;
-  virtual void open() = 0;
-  virtual void close() = 0;
-  virtual jboolean isOpen() = 0;
-  virtual jint getMaxReceivers() = 0;
-  virtual jint getMaxTransmitters() = 0;
-  virtual ::javax::sound::midi::Receiver * getReceiver() = 0;
-  virtual ::javax::sound::midi::Transmitter * getTransmitter() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_Sequencer__
diff --git a/libjava/javax/sound/midi/ShortMessage.h b/libjava/javax/sound/midi/ShortMessage.h
deleted file mode 100644
index 7a5872cd8ec..00000000000
--- a/libjava/javax/sound/midi/ShortMessage.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_ShortMessage__
-#define __javax_sound_midi_ShortMessage__
-
-#pragma interface
-
-#include <javax/sound/midi/MidiMessage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class ShortMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::ShortMessage : public ::javax::sound::midi::MidiMessage
-{
-
-public:
-  ShortMessage();
-public: // actually protected
-  ShortMessage(JArray< jbyte > *);
-public:
-  virtual void setMessage(jint, jint, jint);
-  virtual void setMessage(jint, jint, jint, jint);
-  virtual void setMessage(jint);
-public: // actually protected
-  virtual jint getDataLength(jint);
-public:
-  virtual jint getChannel();
-  virtual jint getCommand();
-  virtual jint getData1();
-  virtual jint getData2();
-  virtual ::java::lang::Object * clone();
-  static const jint MIDI_TIME_CODE = 241;
-  static const jint SONG_POSITION_POINTER = 242;
-  static const jint SONG_SELECT = 243;
-  static const jint TUNE_REQUEST = 246;
-  static const jint END_OF_EXCLUSIVE = 247;
-  static const jint TIMING_CLOCK = 248;
-  static const jint START = 250;
-  static const jint CONTINUE = 251;
-  static const jint STOP = 252;
-  static const jint ACTIVE_SENSING = 254;
-  static const jint SYSTEM_RESET = 255;
-  static const jint NOTE_OFF = 128;
-  static const jint NOTE_ON = 144;
-  static const jint POLY_PRESSURE = 160;
-  static const jint CONTROL_CHANGE = 176;
-  static const jint PROGRAM_CHANGE = 192;
-  static const jint CHANNEL_PRESSURE = 208;
-  static const jint PITCH_BEND = 224;
-private:
-  static JArray< jbyte > * defaultMessage;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_ShortMessage__
diff --git a/libjava/javax/sound/midi/Soundbank.h b/libjava/javax/sound/midi/Soundbank.h
deleted file mode 100644
index 8890388b827..00000000000
--- a/libjava/javax/sound/midi/Soundbank.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Soundbank__
-#define __javax_sound_midi_Soundbank__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Instrument;
-          class Patch;
-          class Soundbank;
-          class SoundbankResource;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Soundbank : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::java::lang::String * getVersion() = 0;
-  virtual ::java::lang::String * getVendor() = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  virtual JArray< ::javax::sound::midi::SoundbankResource * > * getResources() = 0;
-  virtual JArray< ::javax::sound::midi::Instrument * > * getInstruments() = 0;
-  virtual ::javax::sound::midi::Instrument * getInstrument(::javax::sound::midi::Patch *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_Soundbank__
diff --git a/libjava/javax/sound/midi/SoundbankResource.h b/libjava/javax/sound/midi/SoundbankResource.h
deleted file mode 100644
index 19562681035..00000000000
--- a/libjava/javax/sound/midi/SoundbankResource.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_SoundbankResource__
-#define __javax_sound_midi_SoundbankResource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Soundbank;
-          class SoundbankResource;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::SoundbankResource : public ::java::lang::Object
-{
-
-public: // actually protected
-  SoundbankResource(::javax::sound::midi::Soundbank *, ::java::lang::String *, ::java::lang::Class *);
-public:
-  virtual ::javax::sound::midi::Soundbank * getSoundbank();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::Class * getDataClass();
-  virtual ::java::lang::Object * getData() = 0;
-private:
-  ::javax::sound::midi::Soundbank * __attribute__((aligned(__alignof__( ::java::lang::Object)))) soundbank;
-  ::java::lang::String * name;
-  ::java::lang::Class * dataClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_SoundbankResource__
diff --git a/libjava/javax/sound/midi/Synthesizer.h b/libjava/javax/sound/midi/Synthesizer.h
deleted file mode 100644
index 1ccc094bed0..00000000000
--- a/libjava/javax/sound/midi/Synthesizer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Synthesizer__
-#define __javax_sound_midi_Synthesizer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Instrument;
-          class MidiChannel;
-          class MidiDevice$Info;
-          class Patch;
-          class Receiver;
-          class Soundbank;
-          class Synthesizer;
-          class Transmitter;
-          class VoiceStatus;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Synthesizer : public ::java::lang::Object
-{
-
-public:
-  virtual jint getMaxPolyphony() = 0;
-  virtual jlong getLatency() = 0;
-  virtual JArray< ::javax::sound::midi::MidiChannel * > * getChannels() = 0;
-  virtual JArray< ::javax::sound::midi::VoiceStatus * > * getVoiceStatus() = 0;
-  virtual jboolean isSoundbankSupported(::javax::sound::midi::Soundbank *) = 0;
-  virtual jboolean loadInstrument(::javax::sound::midi::Instrument *) = 0;
-  virtual void unloadInstrument(::javax::sound::midi::Instrument *) = 0;
-  virtual jboolean remapInstrument(::javax::sound::midi::Instrument *, ::javax::sound::midi::Instrument *) = 0;
-  virtual ::javax::sound::midi::Soundbank * getDefaultSoundbank() = 0;
-  virtual JArray< ::javax::sound::midi::Instrument * > * getAvailableInstruments() = 0;
-  virtual JArray< ::javax::sound::midi::Instrument * > * getLoadedInstruments() = 0;
-  virtual jboolean loadAllInstruments(::javax::sound::midi::Soundbank *) = 0;
-  virtual void unloadAllInstruments(::javax::sound::midi::Soundbank *) = 0;
-  virtual jboolean loadInstruments(::javax::sound::midi::Soundbank *, JArray< ::javax::sound::midi::Patch * > *) = 0;
-  virtual void unloadInstruments(::javax::sound::midi::Soundbank *, JArray< ::javax::sound::midi::Patch * > *) = 0;
-  virtual ::javax::sound::midi::MidiDevice$Info * getDeviceInfo() = 0;
-  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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_Synthesizer__
diff --git a/libjava/javax/sound/midi/SysexMessage.h b/libjava/javax/sound/midi/SysexMessage.h
deleted file mode 100644
index e6901f283d6..00000000000
--- a/libjava/javax/sound/midi/SysexMessage.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_SysexMessage__
-#define __javax_sound_midi_SysexMessage__
-
-#pragma interface
-
-#include <javax/sound/midi/MidiMessage.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class SysexMessage;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::SysexMessage : public ::javax::sound::midi::MidiMessage
-{
-
-public:
-  SysexMessage();
-public: // actually protected
-  SysexMessage(JArray< jbyte > *);
-public:
-  virtual void setMessage(JArray< jbyte > *, jint);
-  virtual void setMessage(jint, JArray< jbyte > *, jint);
-  virtual JArray< jbyte > * getData();
-  virtual ::java::lang::Object * clone();
-  static const jint SYSTEM_EXCLUSIVE = 240;
-  static const jint SPECIAL_SYSTEM_EXCLUSIVE = 247;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_SysexMessage__
diff --git a/libjava/javax/sound/midi/Track.h b/libjava/javax/sound/midi/Track.h
deleted file mode 100644
index 9f544596541..00000000000
--- a/libjava/javax/sound/midi/Track.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Track__
-#define __javax_sound_midi_Track__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiEvent;
-          class Track;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Track : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Track();
-public:
-  virtual jboolean add(::javax::sound::midi::MidiEvent *);
-  virtual jboolean remove(::javax::sound::midi::MidiEvent *);
-  virtual ::javax::sound::midi::MidiEvent * get(jint);
-  virtual jint size();
-  virtual jlong ticks();
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) events;
-private:
-  ::java::util::HashSet * eventSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_Track__
diff --git a/libjava/javax/sound/midi/Transmitter.h b/libjava/javax/sound/midi/Transmitter.h
deleted file mode 100644
index 039f311bdf3..00000000000
--- a/libjava/javax/sound/midi/Transmitter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_Transmitter__
-#define __javax_sound_midi_Transmitter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Receiver;
-          class Transmitter;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::Transmitter : public ::java::lang::Object
-{
-
-public:
-  virtual void setReceiver(::javax::sound::midi::Receiver *) = 0;
-  virtual ::javax::sound::midi::Receiver * getReceiver() = 0;
-  virtual void close() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_midi_Transmitter__
diff --git a/libjava/javax/sound/midi/VoiceStatus.h b/libjava/javax/sound/midi/VoiceStatus.h
deleted file mode 100644
index 6e25a3457d1..00000000000
--- a/libjava/javax/sound/midi/VoiceStatus.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_VoiceStatus__
-#define __javax_sound_midi_VoiceStatus__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class VoiceStatus;
-      }
-    }
-  }
-}
-
-class javax::sound::midi::VoiceStatus : public ::java::lang::Object
-{
-
-public:
-  VoiceStatus();
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) active;
-  jint channel;
-  jint bank;
-  jint program;
-  jint note;
-  jint volume;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_VoiceStatus__
diff --git a/libjava/javax/sound/midi/spi/MidiDeviceProvider.h b/libjava/javax/sound/midi/spi/MidiDeviceProvider.h
deleted file mode 100644
index 3e172aa55a9..00000000000
--- a/libjava/javax/sound/midi/spi/MidiDeviceProvider.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_spi_MidiDeviceProvider__
-#define __javax_sound_midi_spi_MidiDeviceProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiDevice;
-          class MidiDevice$Info;
-        namespace spi
-        {
-            class MidiDeviceProvider;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::midi::spi::MidiDeviceProvider : public ::java::lang::Object
-{
-
-public:
-  MidiDeviceProvider();
-  virtual jboolean isDeviceSupported(::javax::sound::midi::MidiDevice$Info *);
-  virtual JArray< ::javax::sound::midi::MidiDevice$Info * > * getDeviceInfo() = 0;
-  virtual ::javax::sound::midi::MidiDevice * getDevice(::javax::sound::midi::MidiDevice$Info *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_spi_MidiDeviceProvider__
diff --git a/libjava/javax/sound/midi/spi/MidiFileReader.h b/libjava/javax/sound/midi/spi/MidiFileReader.h
deleted file mode 100644
index a389294bb15..00000000000
--- a/libjava/javax/sound/midi/spi/MidiFileReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_spi_MidiFileReader__
-#define __javax_sound_midi_spi_MidiFileReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class MidiFileFormat;
-          class Sequence;
-        namespace spi
-        {
-            class MidiFileReader;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::midi::spi::MidiFileReader : public ::java::lang::Object
-{
-
-public:
-  MidiFileReader();
-  virtual ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::net::URL *) = 0;
-  virtual ::javax::sound::midi::MidiFileFormat * getMidiFileFormat(::java::io::File *) = 0;
-  virtual ::javax::sound::midi::Sequence * getSequence(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::midi::Sequence * getSequence(::java::net::URL *) = 0;
-  virtual ::javax::sound::midi::Sequence * getSequence(::java::io::File *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_spi_MidiFileReader__
diff --git a/libjava/javax/sound/midi/spi/MidiFileWriter.h b/libjava/javax/sound/midi/spi/MidiFileWriter.h
deleted file mode 100644
index d5144faae97..00000000000
--- a/libjava/javax/sound/midi/spi/MidiFileWriter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_spi_MidiFileWriter__
-#define __javax_sound_midi_spi_MidiFileWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Sequence;
-        namespace spi
-        {
-            class MidiFileWriter;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::midi::spi::MidiFileWriter : public ::java::lang::Object
-{
-
-public:
-  MidiFileWriter();
-  virtual JArray< jint > * getMidiFileTypes() = 0;
-  virtual JArray< jint > * getMidiFileTypes(::javax::sound::midi::Sequence *) = 0;
-  virtual jboolean isFileTypeSupported(jint);
-  virtual jboolean isFileTypeSupported(jint, ::javax::sound::midi::Sequence *);
-  virtual jint write(::javax::sound::midi::Sequence *, jint, ::java::io::OutputStream *) = 0;
-  virtual jint write(::javax::sound::midi::Sequence *, jint, ::java::io::File *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_spi_MidiFileWriter__
diff --git a/libjava/javax/sound/midi/spi/SoundbankReader.h b/libjava/javax/sound/midi/spi/SoundbankReader.h
deleted file mode 100644
index a12e20b9fe8..00000000000
--- a/libjava/javax/sound/midi/spi/SoundbankReader.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_midi_spi_SoundbankReader__
-#define __javax_sound_midi_spi_SoundbankReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace midi
-      {
-          class Soundbank;
-        namespace spi
-        {
-            class SoundbankReader;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::midi::spi::SoundbankReader : public ::java::lang::Object
-{
-
-public:
-  SoundbankReader();
-  virtual ::javax::sound::midi::Soundbank * getSoundbank(::java::net::URL *) = 0;
-  virtual ::javax::sound::midi::Soundbank * getSoundbank(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::midi::Soundbank * getSoundbank(::java::io::File *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_midi_spi_SoundbankReader__
diff --git a/libjava/javax/sound/sampled/AudioFileFormat$Type.h b/libjava/javax/sound/sampled/AudioFileFormat$Type.h
deleted file mode 100644
index cc44a55b8ec..00000000000
--- a/libjava/javax/sound/sampled/AudioFileFormat$Type.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioFileFormat$Type__
-#define __javax_sound_sampled_AudioFileFormat$Type__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioFileFormat$Type : public ::java::lang::Object
-{
-
-public:
-  AudioFileFormat$Type(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getExtension();
-  virtual ::java::lang::String * toString();
-  static ::javax::sound::sampled::AudioFileFormat$Type * AIFC;
-  static ::javax::sound::sampled::AudioFileFormat$Type * AIFF;
-  static ::javax::sound::sampled::AudioFileFormat$Type * AU;
-  static ::javax::sound::sampled::AudioFileFormat$Type * SND;
-  static ::javax::sound::sampled::AudioFileFormat$Type * WAVE;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * extension;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioFileFormat$Type__
diff --git a/libjava/javax/sound/sampled/AudioFileFormat.h b/libjava/javax/sound/sampled/AudioFileFormat.h
deleted file mode 100644
index f5171f516f7..00000000000
--- a/libjava/javax/sound/sampled/AudioFileFormat.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioFileFormat__
-#define __javax_sound_sampled_AudioFileFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat;
-          class AudioFileFormat$Type;
-          class AudioFormat;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioFileFormat : public ::java::lang::Object
-{
-
-public:
-  AudioFileFormat(::javax::sound::sampled::AudioFileFormat$Type *, ::javax::sound::sampled::AudioFormat *, jint);
-  AudioFileFormat(::javax::sound::sampled::AudioFileFormat$Type *, ::javax::sound::sampled::AudioFormat *, jint, ::java::util::Map *);
-public: // actually protected
-  AudioFileFormat(::javax::sound::sampled::AudioFileFormat$Type *, jint, ::javax::sound::sampled::AudioFormat *, jint);
-public:
-  virtual jint getByteLength();
-  virtual ::javax::sound::sampled::AudioFormat * getFormat();
-  virtual jint getFrameLength();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual ::javax::sound::sampled::AudioFileFormat$Type * getType();
-  virtual ::java::util::Map * properties();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) byteLength;
-  ::javax::sound::sampled::AudioFormat * format;
-  ::javax::sound::sampled::AudioFileFormat$Type * type;
-  jint frameLength;
-  ::java::util::Map * properties__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioFileFormat__
diff --git a/libjava/javax/sound/sampled/AudioFormat$Encoding.h b/libjava/javax/sound/sampled/AudioFormat$Encoding.h
deleted file mode 100644
index 74b37793d67..00000000000
--- a/libjava/javax/sound/sampled/AudioFormat$Encoding.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioFormat$Encoding__
-#define __javax_sound_sampled_AudioFormat$Encoding__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat$Encoding;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioFormat$Encoding : public ::java::lang::Object
-{
-
-public:
-  AudioFormat$Encoding(::java::lang::String *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  static ::javax::sound::sampled::AudioFormat$Encoding * ALAW;
-  static ::javax::sound::sampled::AudioFormat$Encoding * PCM_SIGNED;
-  static ::javax::sound::sampled::AudioFormat$Encoding * PCM_UNSIGNED;
-  static ::javax::sound::sampled::AudioFormat$Encoding * ULAW;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioFormat$Encoding__
diff --git a/libjava/javax/sound/sampled/AudioFormat.h b/libjava/javax/sound/sampled/AudioFormat.h
deleted file mode 100644
index 5166524d9f8..00000000000
--- a/libjava/javax/sound/sampled/AudioFormat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioFormat__
-#define __javax_sound_sampled_AudioFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class AudioFormat$Encoding;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioFormat : public ::java::lang::Object
-{
-
-public:
-  AudioFormat(::javax::sound::sampled::AudioFormat$Encoding *, jfloat, jint, jint, jint, jfloat, jboolean);
-  AudioFormat(::javax::sound::sampled::AudioFormat$Encoding *, jfloat, jint, jint, jint, jfloat, jboolean, ::java::util::Map *);
-  AudioFormat(jfloat, jint, jint, jboolean, jboolean);
-  virtual jint getChannels();
-  virtual ::javax::sound::sampled::AudioFormat$Encoding * getEncoding();
-  virtual jfloat getFrameRate();
-  virtual jint getFrameSize();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual jfloat getSampleRate();
-  virtual jint getSampleSizeInBits();
-  virtual jboolean isBigEndian();
-  virtual jboolean matches(::javax::sound::sampled::AudioFormat *);
-  virtual ::java::util::Map * properties();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) bigEndian;
-  jint channels;
-  ::javax::sound::sampled::AudioFormat$Encoding * encoding;
-  jfloat frameRate;
-  jint frameSize;
-  jfloat sampleRate;
-  jint sampleSizeInBits;
-private:
-  ::java::util::Map * properties__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioFormat__
diff --git a/libjava/javax/sound/sampled/AudioInputStream$TargetInputStream.h b/libjava/javax/sound/sampled/AudioInputStream$TargetInputStream.h
deleted file mode 100644
index a4d4b195d9c..00000000000
--- a/libjava/javax/sound/sampled/AudioInputStream$TargetInputStream.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioInputStream$TargetInputStream__
-#define __javax_sound_sampled_AudioInputStream$TargetInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioInputStream$TargetInputStream;
-          class TargetDataLine;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioInputStream$TargetInputStream : public ::java::io::InputStream
-{
-
-public:
-  AudioInputStream$TargetInputStream(::javax::sound::sampled::TargetDataLine *);
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-private:
-  ::javax::sound::sampled::TargetDataLine * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) line;
-  JArray< jbyte > * buf;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioInputStream$TargetInputStream__
diff --git a/libjava/javax/sound/sampled/AudioInputStream.h b/libjava/javax/sound/sampled/AudioInputStream.h
deleted file mode 100644
index 5e07e8dc1a7..00000000000
--- a/libjava/javax/sound/sampled/AudioInputStream.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioInputStream__
-#define __javax_sound_sampled_AudioInputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class AudioInputStream;
-          class TargetDataLine;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioInputStream : public ::java::io::InputStream
-{
-
-public:
-  AudioInputStream(::java::io::InputStream *, ::javax::sound::sampled::AudioFormat *, jlong);
-  AudioInputStream(::javax::sound::sampled::TargetDataLine *);
-  virtual jint available();
-  virtual void close();
-  virtual ::javax::sound::sampled::AudioFormat * getFormat();
-  virtual jlong getFrameLength();
-  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);
-public: // actually protected
-  ::javax::sound::sampled::AudioFormat * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) format;
-  jlong frameLength;
-  jlong framePos;
-  jint frameSize;
-private:
-  ::java::io::InputStream * input;
-  jlong markedFramePos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioInputStream__
diff --git a/libjava/javax/sound/sampled/AudioPermission.h b/libjava/javax/sound/sampled/AudioPermission.h
deleted file mode 100644
index e83637b5033..00000000000
--- a/libjava/javax/sound/sampled/AudioPermission.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioPermission__
-#define __javax_sound_sampled_AudioPermission__
-
-#pragma interface
-
-#include <java/security/BasicPermission.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioPermission;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioPermission : public ::java::security::BasicPermission
-{
-
-public:
-  AudioPermission(::java::lang::String *);
-  AudioPermission(::java::lang::String *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5518053473477801126LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioPermission__
diff --git a/libjava/javax/sound/sampled/AudioSystem.h b/libjava/javax/sound/sampled/AudioSystem.h
deleted file mode 100644
index 9b490ded804..00000000000
--- a/libjava/javax/sound/sampled/AudioSystem.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_AudioSystem__
-#define __javax_sound_sampled_AudioSystem__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat;
-          class AudioFileFormat$Type;
-          class AudioFormat;
-          class AudioFormat$Encoding;
-          class AudioInputStream;
-          class AudioSystem;
-          class Clip;
-          class Line;
-          class Line$Info;
-          class Mixer;
-          class Mixer$Info;
-          class SourceDataLine;
-          class TargetDataLine;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::AudioSystem : public ::java::lang::Object
-{
-
-  AudioSystem();
-public:
-  static ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::File *);
-  static ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *);
-  static ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::net::URL *);
-  static JArray< ::javax::sound::sampled::AudioFileFormat$Type * > * getAudioFileTypes();
-  static JArray< ::javax::sound::sampled::AudioFileFormat$Type * > * getAudioFileTypes(::javax::sound::sampled::AudioInputStream *);
-  static ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioInputStream *);
-  static ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::AudioInputStream *);
-  static ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::File *);
-  static ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::InputStream *);
-  static ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::net::URL *);
-  static ::javax::sound::sampled::Clip * getClip();
-  static ::javax::sound::sampled::Clip * getClip(::javax::sound::sampled::Mixer$Info *);
-  static ::javax::sound::sampled::Line * getLine(::javax::sound::sampled::Line$Info *);
-  static ::javax::sound::sampled::Mixer * getMixer(::javax::sound::sampled::Mixer$Info *);
-  static JArray< ::javax::sound::sampled::Mixer$Info * > * getMixerInfo();
-  static ::javax::sound::sampled::SourceDataLine * getSourceDataLine(::javax::sound::sampled::AudioFormat *);
-  static ::javax::sound::sampled::SourceDataLine * getSourceDataLine(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::Mixer$Info *);
-  static JArray< ::javax::sound::sampled::Line$Info * > * getSourceLineInfo(::javax::sound::sampled::Line$Info *);
-  static ::javax::sound::sampled::TargetDataLine * getTargetDataLine(::javax::sound::sampled::AudioFormat *);
-  static ::javax::sound::sampled::TargetDataLine * getTargetDataLine(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::Mixer$Info *);
-  static JArray< ::javax::sound::sampled::AudioFormat$Encoding * > * getTargetEncodings(::javax::sound::sampled::AudioFormat$Encoding *);
-  static JArray< ::javax::sound::sampled::AudioFormat$Encoding * > * getTargetEncodings(::javax::sound::sampled::AudioFormat *);
-  static JArray< ::javax::sound::sampled::AudioFormat * > * getTargetFormats(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioFormat *);
-  static JArray< ::javax::sound::sampled::Line$Info * > * getTargetLineInfo(::javax::sound::sampled::Line$Info *);
-  static jboolean isConversionSupported(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioFormat *);
-  static jboolean isConversionSupported(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::AudioFormat *);
-private:
-  static jboolean isFileTypeSupported(JArray< ::javax::sound::sampled::AudioFileFormat$Type * > *, ::javax::sound::sampled::AudioFileFormat$Type *);
-public:
-  static jboolean isFileTypeSupported(::javax::sound::sampled::AudioFileFormat$Type *);
-  static jboolean isFileTypeSupported(::javax::sound::sampled::AudioFileFormat$Type *, ::javax::sound::sampled::AudioInputStream *);
-  static jboolean isLineSupported(::javax::sound::sampled::Line$Info *);
-  static jint write(::javax::sound::sampled::AudioInputStream *, ::javax::sound::sampled::AudioFileFormat$Type *, ::java::io::File *);
-  static jint write(::javax::sound::sampled::AudioInputStream *, ::javax::sound::sampled::AudioFileFormat$Type *, ::java::io::OutputStream *);
-  static const jint NOT_SPECIFIED = -1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_AudioSystem__
diff --git a/libjava/javax/sound/sampled/BooleanControl$Type.h b/libjava/javax/sound/sampled/BooleanControl$Type.h
deleted file mode 100644
index a7058efe4ae..00000000000
--- a/libjava/javax/sound/sampled/BooleanControl$Type.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_BooleanControl$Type__
-#define __javax_sound_sampled_BooleanControl$Type__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control$Type.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class BooleanControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::BooleanControl$Type : public ::javax::sound::sampled::Control$Type
-{
-
-public: // actually protected
-  BooleanControl$Type(::java::lang::String *);
-public:
-  static ::javax::sound::sampled::BooleanControl$Type * APPLY_REVERB;
-  static ::javax::sound::sampled::BooleanControl$Type * MUTE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_BooleanControl$Type__
diff --git a/libjava/javax/sound/sampled/BooleanControl.h b/libjava/javax/sound/sampled/BooleanControl.h
deleted file mode 100644
index efb3ab4715d..00000000000
--- a/libjava/javax/sound/sampled/BooleanControl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_BooleanControl__
-#define __javax_sound_sampled_BooleanControl__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class BooleanControl;
-          class BooleanControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::BooleanControl : public ::javax::sound::sampled::Control
-{
-
-public: // actually protected
-  BooleanControl(::javax::sound::sampled::BooleanControl$Type *, jboolean);
-  BooleanControl(::javax::sound::sampled::BooleanControl$Type *, jboolean, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getStateLabel(jboolean);
-  virtual jboolean getValue();
-  virtual void setValue(jboolean);
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::sound::sampled::BooleanControl$Type * __attribute__((aligned(__alignof__( ::javax::sound::sampled::Control)))) type;
-  jboolean value;
-  ::java::lang::String * trueLabel;
-  ::java::lang::String * falseLabel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_BooleanControl__
diff --git a/libjava/javax/sound/sampled/Clip.h b/libjava/javax/sound/sampled/Clip.h
deleted file mode 100644
index ab6c5582812..00000000000
--- a/libjava/javax/sound/sampled/Clip.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Clip__
-#define __javax_sound_sampled_Clip__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class AudioInputStream;
-          class Clip;
-          class Control;
-          class Control$Type;
-          class Line$Info;
-          class LineListener;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Clip : public ::java::lang::Object
-{
-
-public:
-  virtual jint getFrameLength() = 0;
-  virtual jlong getMicrosecondLength() = 0;
-  virtual void loop(jint) = 0;
-  virtual void open(::javax::sound::sampled::AudioFormat *, JArray< jbyte > *, jint, jint) = 0;
-  virtual void open(::javax::sound::sampled::AudioInputStream *) = 0;
-  virtual void setFramePosition(jint) = 0;
-  virtual void setLoopPoints(jint, jint) = 0;
-  virtual void setMicrosecondPosition(jlong) = 0;
-  virtual jint available() = 0;
-  virtual void drain() = 0;
-  virtual void flush() = 0;
-  virtual jint getBufferSize() = 0;
-  virtual ::javax::sound::sampled::AudioFormat * getFormat() = 0;
-  virtual jint getFramePosition() = 0;
-  virtual jfloat getLevel() = 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 addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static const jint LOOP_CONTINUOUSLY = -1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_Clip__
diff --git a/libjava/javax/sound/sampled/CompoundControl$Type.h b/libjava/javax/sound/sampled/CompoundControl$Type.h
deleted file mode 100644
index ccbf51f1dd9..00000000000
--- a/libjava/javax/sound/sampled/CompoundControl$Type.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_CompoundControl$Type__
-#define __javax_sound_sampled_CompoundControl$Type__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control$Type.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class CompoundControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::CompoundControl$Type : public ::javax::sound::sampled::Control$Type
-{
-
-public: // actually protected
-  CompoundControl$Type(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_CompoundControl$Type__
diff --git a/libjava/javax/sound/sampled/CompoundControl.h b/libjava/javax/sound/sampled/CompoundControl.h
deleted file mode 100644
index d4438e56d62..00000000000
--- a/libjava/javax/sound/sampled/CompoundControl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_CompoundControl__
-#define __javax_sound_sampled_CompoundControl__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class CompoundControl;
-          class CompoundControl$Type;
-          class Control;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::CompoundControl : public ::javax::sound::sampled::Control
-{
-
-public: // actually protected
-  CompoundControl(::javax::sound::sampled::CompoundControl$Type *, JArray< ::javax::sound::sampled::Control * > *);
-public:
-  virtual JArray< ::javax::sound::sampled::Control * > * getMemberControls();
-  virtual ::java::lang::String * toString();
-private:
-  JArray< ::javax::sound::sampled::Control * > * __attribute__((aligned(__alignof__( ::javax::sound::sampled::Control)))) memberControls;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_CompoundControl__
diff --git a/libjava/javax/sound/sampled/Control$Type.h b/libjava/javax/sound/sampled/Control$Type.h
deleted file mode 100644
index cf7043abe6a..00000000000
--- a/libjava/javax/sound/sampled/Control$Type.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Control$Type__
-#define __javax_sound_sampled_Control$Type__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Control$Type : public ::java::lang::Object
-{
-
-public: // actually protected
-  Control$Type(::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_Control$Type__
diff --git a/libjava/javax/sound/sampled/Control.h b/libjava/javax/sound/sampled/Control.h
deleted file mode 100644
index 59dc5b14b81..00000000000
--- a/libjava/javax/sound/sampled/Control.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Control__
-#define __javax_sound_sampled_Control__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control;
-          class Control$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Control : public ::java::lang::Object
-{
-
-public: // actually protected
-  Control(::javax::sound::sampled::Control$Type *);
-public:
-  virtual ::javax::sound::sampled::Control$Type * getType();
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::sound::sampled::Control$Type * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_Control__
diff --git a/libjava/javax/sound/sampled/DataLine$Info.h b/libjava/javax/sound/sampled/DataLine$Info.h
deleted file mode 100644
index ea6322eae57..00000000000
--- a/libjava/javax/sound/sampled/DataLine$Info.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_DataLine$Info__
-#define __javax_sound_sampled_DataLine$Info__
-
-#pragma interface
-
-#include <javax/sound/sampled/Line$Info.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class DataLine$Info;
-          class Line$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::DataLine$Info : public ::javax::sound::sampled::Line$Info
-{
-
-public:
-  DataLine$Info(::java::lang::Class *, ::javax::sound::sampled::AudioFormat *);
-  DataLine$Info(::java::lang::Class *, JArray< ::javax::sound::sampled::AudioFormat * > *, jint, jint);
-  DataLine$Info(::java::lang::Class *, ::javax::sound::sampled::AudioFormat *, jint);
-  virtual JArray< ::javax::sound::sampled::AudioFormat * > * getFormats();
-  virtual jint getMaxBufferSize();
-  virtual jint getMinBufferSize();
-  virtual jboolean isFormatSupported(::javax::sound::sampled::AudioFormat *);
-  virtual jboolean matches(::javax::sound::sampled::Line$Info *);
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::sound::sampled::Line$Info)))) minBufferSize;
-  jint maxBufferSize;
-  JArray< ::javax::sound::sampled::AudioFormat * > * formats;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_DataLine$Info__
diff --git a/libjava/javax/sound/sampled/DataLine.h b/libjava/javax/sound/sampled/DataLine.h
deleted file mode 100644
index 257fd9b7781..00000000000
--- a/libjava/javax/sound/sampled/DataLine.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_DataLine__
-#define __javax_sound_sampled_DataLine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class Control;
-          class Control$Type;
-          class DataLine;
-          class Line$Info;
-          class LineListener;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::DataLine : public ::java::lang::Object
-{
-
-public:
-  virtual jint available() = 0;
-  virtual void drain() = 0;
-  virtual void flush() = 0;
-  virtual jint getBufferSize() = 0;
-  virtual ::javax::sound::sampled::AudioFormat * getFormat() = 0;
-  virtual jint getFramePosition() = 0;
-  virtual jfloat getLevel() = 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 addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_DataLine__
diff --git a/libjava/javax/sound/sampled/EnumControl$Type.h b/libjava/javax/sound/sampled/EnumControl$Type.h
deleted file mode 100644
index dce2cc12f62..00000000000
--- a/libjava/javax/sound/sampled/EnumControl$Type.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_EnumControl$Type__
-#define __javax_sound_sampled_EnumControl$Type__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control$Type.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class EnumControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::EnumControl$Type : public ::javax::sound::sampled::Control$Type
-{
-
-public: // actually protected
-  EnumControl$Type(::java::lang::String *);
-public:
-  static ::javax::sound::sampled::EnumControl$Type * REVERB;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_EnumControl$Type__
diff --git a/libjava/javax/sound/sampled/EnumControl.h b/libjava/javax/sound/sampled/EnumControl.h
deleted file mode 100644
index 618d19c16de..00000000000
--- a/libjava/javax/sound/sampled/EnumControl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_EnumControl__
-#define __javax_sound_sampled_EnumControl__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class EnumControl;
-          class EnumControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::EnumControl : public ::javax::sound::sampled::Control
-{
-
-public: // actually protected
-  EnumControl(::javax::sound::sampled::EnumControl$Type *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-public:
-  virtual ::java::lang::Object * getValue();
-  virtual JArray< ::java::lang::Object * > * getValues();
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::javax::sound::sampled::Control)))) values;
-  ::java::lang::Object * value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_EnumControl__
diff --git a/libjava/javax/sound/sampled/FloatControl$Type.h b/libjava/javax/sound/sampled/FloatControl$Type.h
deleted file mode 100644
index d14a4f9f10b..00000000000
--- a/libjava/javax/sound/sampled/FloatControl$Type.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_FloatControl$Type__
-#define __javax_sound_sampled_FloatControl$Type__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control$Type.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class FloatControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::FloatControl$Type : public ::javax::sound::sampled::Control$Type
-{
-
-public: // actually protected
-  FloatControl$Type(::java::lang::String *);
-public:
-  static ::javax::sound::sampled::FloatControl$Type * AUX_RETURN;
-  static ::javax::sound::sampled::FloatControl$Type * AUX_SEND;
-  static ::javax::sound::sampled::FloatControl$Type * BALANCE;
-  static ::javax::sound::sampled::FloatControl$Type * MASTER_GAIN;
-  static ::javax::sound::sampled::FloatControl$Type * PAN;
-  static ::javax::sound::sampled::FloatControl$Type * REVERB_RETURN;
-  static ::javax::sound::sampled::FloatControl$Type * REVERB_SEND;
-  static ::javax::sound::sampled::FloatControl$Type * SAMPLE_RATE;
-  static ::javax::sound::sampled::FloatControl$Type * VOLUME;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_FloatControl$Type__
diff --git a/libjava/javax/sound/sampled/FloatControl.h b/libjava/javax/sound/sampled/FloatControl.h
deleted file mode 100644
index 3a7da025b9b..00000000000
--- a/libjava/javax/sound/sampled/FloatControl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_FloatControl__
-#define __javax_sound_sampled_FloatControl__
-
-#pragma interface
-
-#include <javax/sound/sampled/Control.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class FloatControl;
-          class FloatControl$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::FloatControl : public ::javax::sound::sampled::Control
-{
-
-public: // actually protected
-  FloatControl(::javax::sound::sampled::FloatControl$Type *, jfloat, jfloat, jfloat, jint, jfloat, ::java::lang::String *);
-  FloatControl(::javax::sound::sampled::FloatControl$Type *, jfloat, jfloat, jfloat, jint, jfloat, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jfloat getMaximum();
-  virtual ::java::lang::String * getMaxLabel();
-  virtual ::java::lang::String * getMidLabel();
-  virtual jfloat getMinimum();
-  virtual ::java::lang::String * getMinLabel();
-  virtual jfloat getPrecision();
-  virtual ::java::lang::String * getUnits();
-  virtual jint getUpdatePeriod();
-  virtual jfloat getValue();
-  virtual void setValue(jfloat);
-  virtual void shift(jfloat, jfloat, jint);
-  virtual ::java::lang::String * toString();
-private:
-  jfloat __attribute__((aligned(__alignof__( ::javax::sound::sampled::Control)))) minimum;
-  jfloat maximum;
-  jfloat precision;
-  jint updatePeriod;
-  jfloat value;
-  ::java::lang::String * units;
-  ::java::lang::String * minLabel;
-  ::java::lang::String * maxLabel;
-  ::java::lang::String * midLabel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_FloatControl__
diff --git a/libjava/javax/sound/sampled/Line$Info.h b/libjava/javax/sound/sampled/Line$Info.h
deleted file mode 100644
index 982c0273204..00000000000
--- a/libjava/javax/sound/sampled/Line$Info.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Line$Info__
-#define __javax_sound_sampled_Line$Info__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Line$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Line$Info : public ::java::lang::Object
-{
-
-public:
-  Line$Info(::java::lang::Class *);
-  virtual ::java::lang::Class * getLineClass();
-  virtual jboolean matches(::javax::sound::sampled::Line$Info *);
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) klass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_Line$Info__
diff --git a/libjava/javax/sound/sampled/Line.h b/libjava/javax/sound/sampled/Line.h
deleted file mode 100644
index 7f6552d8d87..00000000000
--- a/libjava/javax/sound/sampled/Line.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Line__
-#define __javax_sound_sampled_Line__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control;
-          class Control$Type;
-          class Line;
-          class Line$Info;
-          class LineListener;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Line : public ::java::lang::Object
-{
-
-public:
-  virtual void addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_Line__
diff --git a/libjava/javax/sound/sampled/LineEvent$Type.h b/libjava/javax/sound/sampled/LineEvent$Type.h
deleted file mode 100644
index c509deca221..00000000000
--- a/libjava/javax/sound/sampled/LineEvent$Type.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_LineEvent$Type__
-#define __javax_sound_sampled_LineEvent$Type__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class LineEvent$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::LineEvent$Type : public ::java::lang::Object
-{
-
-public: // actually protected
-  LineEvent$Type(::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  static ::javax::sound::sampled::LineEvent$Type * CLOSE;
-  static ::javax::sound::sampled::LineEvent$Type * OPEN;
-  static ::javax::sound::sampled::LineEvent$Type * START;
-  static ::javax::sound::sampled::LineEvent$Type * STOP;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_LineEvent$Type__
diff --git a/libjava/javax/sound/sampled/LineEvent.h b/libjava/javax/sound/sampled/LineEvent.h
deleted file mode 100644
index ccc90e25dc8..00000000000
--- a/libjava/javax/sound/sampled/LineEvent.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_LineEvent__
-#define __javax_sound_sampled_LineEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Line;
-          class LineEvent;
-          class LineEvent$Type;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::LineEvent : public ::java::util::EventObject
-{
-
-public:
-  LineEvent(::javax::sound::sampled::Line *, ::javax::sound::sampled::LineEvent$Type *, jlong);
-  virtual jlong getFramePosition();
-  virtual ::javax::sound::sampled::Line * getLine();
-  virtual ::javax::sound::sampled::LineEvent$Type * getType();
-  virtual ::java::lang::String * toString();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  static const jlong serialVersionUID = -1274246333383880410LL;
-  ::javax::sound::sampled::LineEvent$Type * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) type;
-  jlong framePosition;
-  ::javax::sound::sampled::Line * line;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_LineEvent__
diff --git a/libjava/javax/sound/sampled/LineListener.h b/libjava/javax/sound/sampled/LineListener.h
deleted file mode 100644
index 5abbde1a870..00000000000
--- a/libjava/javax/sound/sampled/LineListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_LineListener__
-#define __javax_sound_sampled_LineListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class LineEvent;
-          class LineListener;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::LineListener : public ::java::lang::Object
-{
-
-public:
-  virtual void update(::javax::sound::sampled::LineEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_LineListener__
diff --git a/libjava/javax/sound/sampled/LineUnavailableException.h b/libjava/javax/sound/sampled/LineUnavailableException.h
deleted file mode 100644
index a0068a6ec06..00000000000
--- a/libjava/javax/sound/sampled/LineUnavailableException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_LineUnavailableException__
-#define __javax_sound_sampled_LineUnavailableException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class LineUnavailableException;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::LineUnavailableException : public ::java::lang::Exception
-{
-
-public:
-  LineUnavailableException();
-  LineUnavailableException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2046718279487432130LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_LineUnavailableException__
diff --git a/libjava/javax/sound/sampled/Mixer$Info.h b/libjava/javax/sound/sampled/Mixer$Info.h
deleted file mode 100644
index 81ba18b1d61..00000000000
--- a/libjava/javax/sound/sampled/Mixer$Info.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Mixer$Info__
-#define __javax_sound_sampled_Mixer$Info__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Mixer$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Mixer$Info : public ::java::lang::Object
-{
-
-public: // actually protected
-  Mixer$Info(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getVendor();
-  virtual ::java::lang::String * getVersion();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * description;
-  ::java::lang::String * vendor;
-  ::java::lang::String * version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_Mixer$Info__
diff --git a/libjava/javax/sound/sampled/Mixer.h b/libjava/javax/sound/sampled/Mixer.h
deleted file mode 100644
index b0bd095592a..00000000000
--- a/libjava/javax/sound/sampled/Mixer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Mixer__
-#define __javax_sound_sampled_Mixer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control;
-          class Control$Type;
-          class Line;
-          class Line$Info;
-          class LineListener;
-          class Mixer;
-          class Mixer$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Mixer : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::sound::sampled::Line * getLine(::javax::sound::sampled::Line$Info *) = 0;
-  virtual jint getMaxLines(::javax::sound::sampled::Line$Info *) = 0;
-  virtual ::javax::sound::sampled::Mixer$Info * getMixerInfo() = 0;
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getSourceLineInfo() = 0;
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getSourceLineInfo(::javax::sound::sampled::Line$Info *) = 0;
-  virtual JArray< ::javax::sound::sampled::Line * > * getSourceLines() = 0;
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getTargetLineInfo() = 0;
-  virtual JArray< ::javax::sound::sampled::Line$Info * > * getTargetLineInfo(::javax::sound::sampled::Line$Info *) = 0;
-  virtual JArray< ::javax::sound::sampled::Line * > * getTargetLines() = 0;
-  virtual jboolean isLineSupported(::javax::sound::sampled::Line$Info *) = 0;
-  virtual jboolean isSynchronizationSupported(JArray< ::javax::sound::sampled::Line * > *, jboolean) = 0;
-  virtual void synchronize(JArray< ::javax::sound::sampled::Line * > *, jboolean) = 0;
-  virtual void unsynchronize(JArray< ::javax::sound::sampled::Line * > *) = 0;
-  virtual void addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_Mixer__
diff --git a/libjava/javax/sound/sampled/Port$Info.h b/libjava/javax/sound/sampled/Port$Info.h
deleted file mode 100644
index 1635e27c31b..00000000000
--- a/libjava/javax/sound/sampled/Port$Info.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Port$Info__
-#define __javax_sound_sampled_Port$Info__
-
-#pragma interface
-
-#include <javax/sound/sampled/Line$Info.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Line$Info;
-          class Port$Info;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Port$Info : public ::javax::sound::sampled::Line$Info
-{
-
-public:
-  Port$Info(::java::lang::Class *, ::java::lang::String *, jboolean);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * getName();
-  virtual jboolean isSource();
-  virtual jboolean matches(::javax::sound::sampled::Line$Info *);
-  virtual ::java::lang::String * toString();
-  static ::javax::sound::sampled::Port$Info * COMPACT_DISC;
-  static ::javax::sound::sampled::Port$Info * HEADPHONE;
-  static ::javax::sound::sampled::Port$Info * LINE_IN;
-  static ::javax::sound::sampled::Port$Info * LINE_OUT;
-  static ::javax::sound::sampled::Port$Info * MICROPHONE;
-  static ::javax::sound::sampled::Port$Info * SPEAKER;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::sound::sampled::Line$Info)))) name;
-  jboolean isSource__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_Port$Info__
diff --git a/libjava/javax/sound/sampled/Port.h b/libjava/javax/sound/sampled/Port.h
deleted file mode 100644
index 4958786a943..00000000000
--- a/libjava/javax/sound/sampled/Port.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_Port__
-#define __javax_sound_sampled_Port__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Control;
-          class Control$Type;
-          class Line$Info;
-          class LineListener;
-          class Port;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::Port : public ::java::lang::Object
-{
-
-public:
-  virtual void addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_Port__
diff --git a/libjava/javax/sound/sampled/ReverbType.h b/libjava/javax/sound/sampled/ReverbType.h
deleted file mode 100644
index acdf5142cf8..00000000000
--- a/libjava/javax/sound/sampled/ReverbType.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_ReverbType__
-#define __javax_sound_sampled_ReverbType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class ReverbType;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::ReverbType : public ::java::lang::Object
-{
-
-public: // actually protected
-  ReverbType(::java::lang::String *, jint, jfloat, jint, jfloat, jint);
-public:
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual jint getDecayTime();
-  virtual jint getEarlyReflectionDelay();
-  virtual jfloat getEarlyReflectionIntensity();
-  virtual jint getLateReflectionDelay();
-  virtual jfloat getLateReflectionIntensity();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jint earlyReflectionDelay;
-  jfloat earlyReflectionIntensity;
-  jint lateReflectionDelay;
-  jfloat lateReflectionIntensity;
-  jint decayTime;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_ReverbType__
diff --git a/libjava/javax/sound/sampled/SourceDataLine.h b/libjava/javax/sound/sampled/SourceDataLine.h
deleted file mode 100644
index 74b5e807631..00000000000
--- a/libjava/javax/sound/sampled/SourceDataLine.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_SourceDataLine__
-#define __javax_sound_sampled_SourceDataLine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class Control;
-          class Control$Type;
-          class Line$Info;
-          class LineListener;
-          class SourceDataLine;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::SourceDataLine : public ::java::lang::Object
-{
-
-public:
-  virtual void open(::javax::sound::sampled::AudioFormat *) = 0;
-  virtual void open(::javax::sound::sampled::AudioFormat *, jint) = 0;
-  virtual jint write(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint available() = 0;
-  virtual void drain() = 0;
-  virtual void flush() = 0;
-  virtual jint getBufferSize() = 0;
-  virtual ::javax::sound::sampled::AudioFormat * getFormat() = 0;
-  virtual jint getFramePosition() = 0;
-  virtual jfloat getLevel() = 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 addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_SourceDataLine__
diff --git a/libjava/javax/sound/sampled/TargetDataLine.h b/libjava/javax/sound/sampled/TargetDataLine.h
deleted file mode 100644
index 18383898624..00000000000
--- a/libjava/javax/sound/sampled/TargetDataLine.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_TargetDataLine__
-#define __javax_sound_sampled_TargetDataLine__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class Control;
-          class Control$Type;
-          class Line$Info;
-          class LineListener;
-          class TargetDataLine;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::TargetDataLine : public ::java::lang::Object
-{
-
-public:
-  virtual void open(::javax::sound::sampled::AudioFormat *) = 0;
-  virtual void open(::javax::sound::sampled::AudioFormat *, jint) = 0;
-  virtual jint read(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint available() = 0;
-  virtual void drain() = 0;
-  virtual void flush() = 0;
-  virtual jint getBufferSize() = 0;
-  virtual ::javax::sound::sampled::AudioFormat * getFormat() = 0;
-  virtual jint getFramePosition() = 0;
-  virtual jfloat getLevel() = 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 addLineListener(::javax::sound::sampled::LineListener *) = 0;
-  virtual void close() = 0;
-  virtual ::javax::sound::sampled::Control * getControl(::javax::sound::sampled::Control$Type *) = 0;
-  virtual JArray< ::javax::sound::sampled::Control * > * getControls() = 0;
-  virtual ::javax::sound::sampled::Line$Info * getLineInfo() = 0;
-  virtual jboolean isControlSupported(::javax::sound::sampled::Control$Type *) = 0;
-  virtual jboolean isOpen() = 0;
-  virtual void open() = 0;
-  virtual void removeLineListener(::javax::sound::sampled::LineListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sound_sampled_TargetDataLine__
diff --git a/libjava/javax/sound/sampled/UnsupportedAudioFileException.h b/libjava/javax/sound/sampled/UnsupportedAudioFileException.h
deleted file mode 100644
index 896c85a4226..00000000000
--- a/libjava/javax/sound/sampled/UnsupportedAudioFileException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_UnsupportedAudioFileException__
-#define __javax_sound_sampled_UnsupportedAudioFileException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class UnsupportedAudioFileException;
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::UnsupportedAudioFileException : public ::java::lang::Exception
-{
-
-public:
-  UnsupportedAudioFileException();
-  UnsupportedAudioFileException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -139127412623160368LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_UnsupportedAudioFileException__
diff --git a/libjava/javax/sound/sampled/spi/AudioFileReader.h b/libjava/javax/sound/sampled/spi/AudioFileReader.h
deleted file mode 100644
index aab7d7d6887..00000000000
--- a/libjava/javax/sound/sampled/spi/AudioFileReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_spi_AudioFileReader__
-#define __javax_sound_sampled_spi_AudioFileReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat;
-          class AudioInputStream;
-        namespace spi
-        {
-            class AudioFileReader;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::spi::AudioFileReader : public ::java::lang::Object
-{
-
-public:
-  AudioFileReader();
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::File *) = 0;
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::sampled::AudioFileFormat * getAudioFileFormat(::java::net::URL *) = 0;
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::File *) = 0;
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::io::InputStream *) = 0;
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::java::net::URL *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_spi_AudioFileReader__
diff --git a/libjava/javax/sound/sampled/spi/AudioFileWriter.h b/libjava/javax/sound/sampled/spi/AudioFileWriter.h
deleted file mode 100644
index 558e3daeaf1..00000000000
--- a/libjava/javax/sound/sampled/spi/AudioFileWriter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_spi_AudioFileWriter__
-#define __javax_sound_sampled_spi_AudioFileWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFileFormat$Type;
-          class AudioInputStream;
-        namespace spi
-        {
-            class AudioFileWriter;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::spi::AudioFileWriter : public ::java::lang::Object
-{
-
-public:
-  AudioFileWriter();
-  virtual JArray< ::javax::sound::sampled::AudioFileFormat$Type * > * getAudioFileTypes() = 0;
-  virtual JArray< ::javax::sound::sampled::AudioFileFormat$Type * > * getAudioFileTypes(::javax::sound::sampled::AudioInputStream *) = 0;
-  virtual jboolean isFileTypeSupported(::javax::sound::sampled::AudioFileFormat$Type *);
-  virtual jboolean isFileTypeSupported(::javax::sound::sampled::AudioFileFormat$Type *, ::javax::sound::sampled::AudioInputStream *);
-  virtual jint write(::javax::sound::sampled::AudioInputStream *, ::javax::sound::sampled::AudioFileFormat$Type *, ::java::io::File *) = 0;
-  virtual jint write(::javax::sound::sampled::AudioInputStream *, ::javax::sound::sampled::AudioFileFormat$Type *, ::java::io::OutputStream *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_spi_AudioFileWriter__
diff --git a/libjava/javax/sound/sampled/spi/FormatConversionProvider.h b/libjava/javax/sound/sampled/spi/FormatConversionProvider.h
deleted file mode 100644
index e00ccac45e2..00000000000
--- a/libjava/javax/sound/sampled/spi/FormatConversionProvider.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_spi_FormatConversionProvider__
-#define __javax_sound_sampled_spi_FormatConversionProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class AudioFormat;
-          class AudioFormat$Encoding;
-          class AudioInputStream;
-        namespace spi
-        {
-            class FormatConversionProvider;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::spi::FormatConversionProvider : public ::java::lang::Object
-{
-
-public:
-  FormatConversionProvider();
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioInputStream *) = 0;
-  virtual ::javax::sound::sampled::AudioInputStream * getAudioInputStream(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::AudioInputStream *) = 0;
-  virtual JArray< ::javax::sound::sampled::AudioFormat$Encoding * > * getSourceEncodings() = 0;
-  virtual JArray< ::javax::sound::sampled::AudioFormat$Encoding * > * getTargetEncodings() = 0;
-  virtual JArray< ::javax::sound::sampled::AudioFormat$Encoding * > * getTargetEncodings(::javax::sound::sampled::AudioFormat *) = 0;
-  virtual JArray< ::javax::sound::sampled::AudioFormat * > * getTargetFormats(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioFormat *) = 0;
-  virtual jboolean isConversionSupported(::javax::sound::sampled::AudioFormat$Encoding *, ::javax::sound::sampled::AudioFormat *);
-  virtual jboolean isConversionSupported(::javax::sound::sampled::AudioFormat *, ::javax::sound::sampled::AudioFormat *);
-  virtual jboolean isSourceEncodingSupported(::javax::sound::sampled::AudioFormat$Encoding *);
-  virtual jboolean isTargetEncodingSupported(::javax::sound::sampled::AudioFormat$Encoding *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_spi_FormatConversionProvider__
diff --git a/libjava/javax/sound/sampled/spi/MixerProvider.h b/libjava/javax/sound/sampled/spi/MixerProvider.h
deleted file mode 100644
index 50fc476d0ba..00000000000
--- a/libjava/javax/sound/sampled/spi/MixerProvider.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sound_sampled_spi_MixerProvider__
-#define __javax_sound_sampled_spi_MixerProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sound
-    {
-      namespace sampled
-      {
-          class Mixer;
-          class Mixer$Info;
-        namespace spi
-        {
-            class MixerProvider;
-        }
-      }
-    }
-  }
-}
-
-class javax::sound::sampled::spi::MixerProvider : public ::java::lang::Object
-{
-
-public:
-  MixerProvider();
-  virtual ::javax::sound::sampled::Mixer * getMixer(::javax::sound::sampled::Mixer$Info *) = 0;
-  virtual JArray< ::javax::sound::sampled::Mixer$Info * > * getMixerInfo() = 0;
-  virtual jboolean isMixerSupported(::javax::sound::sampled::Mixer$Info *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sound_sampled_spi_MixerProvider__
diff --git a/libjava/javax/sql/ConnectionEvent.h b/libjava/javax/sql/ConnectionEvent.h
deleted file mode 100644
index 19f1de27b66..00000000000
--- a/libjava/javax/sql/ConnectionEvent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_ConnectionEvent__
-#define __javax_sql_ConnectionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class SQLException;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class ConnectionEvent;
-        class PooledConnection;
-    }
-  }
-}
-
-class javax::sql::ConnectionEvent : public ::java::util::EventObject
-{
-
-public:
-  ConnectionEvent(::javax::sql::PooledConnection *);
-  ConnectionEvent(::javax::sql::PooledConnection *, ::java::sql::SQLException *);
-  virtual ::java::sql::SQLException * getSQLException();
-private:
-  static const jlong serialVersionUID = -4843217645290030002LL;
-  ::java::sql::SQLException * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) ex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sql_ConnectionEvent__
diff --git a/libjava/javax/sql/ConnectionEventListener.h b/libjava/javax/sql/ConnectionEventListener.h
deleted file mode 100644
index c412cb76642..00000000000
--- a/libjava/javax/sql/ConnectionEventListener.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_ConnectionEventListener__
-#define __javax_sql_ConnectionEventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class ConnectionEvent;
-        class ConnectionEventListener;
-    }
-  }
-}
-
-class javax::sql::ConnectionEventListener : public ::java::lang::Object
-{
-
-public:
-  virtual void connectionClosed(::javax::sql::ConnectionEvent *) = 0;
-  virtual void connectionErrorOccurred(::javax::sql::ConnectionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_ConnectionEventListener__
diff --git a/libjava/javax/sql/ConnectionPoolDataSource.h b/libjava/javax/sql/ConnectionPoolDataSource.h
deleted file mode 100644
index c64160e77c7..00000000000
--- a/libjava/javax/sql/ConnectionPoolDataSource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_ConnectionPoolDataSource__
-#define __javax_sql_ConnectionPoolDataSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class ConnectionPoolDataSource;
-        class PooledConnection;
-    }
-  }
-}
-
-class javax::sql::ConnectionPoolDataSource : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::sql::PooledConnection * getPooledConnection() = 0;
-  virtual ::javax::sql::PooledConnection * getPooledConnection(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::io::PrintWriter * getLogWriter() = 0;
-  virtual void setLogWriter(::java::io::PrintWriter *) = 0;
-  virtual void setLoginTimeout(jint) = 0;
-  virtual jint getLoginTimeout() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_ConnectionPoolDataSource__
diff --git a/libjava/javax/sql/DataSource.h b/libjava/javax/sql/DataSource.h
deleted file mode 100644
index f8048bd3183..00000000000
--- a/libjava/javax/sql/DataSource.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_DataSource__
-#define __javax_sql_DataSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class DataSource;
-    }
-  }
-}
-
-class javax::sql::DataSource : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual ::java::sql::Connection * getConnection(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::io::PrintWriter * getLogWriter() = 0;
-  virtual void setLogWriter(::java::io::PrintWriter *) = 0;
-  virtual void setLoginTimeout(jint) = 0;
-  virtual jint getLoginTimeout() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_DataSource__
diff --git a/libjava/javax/sql/PooledConnection.h b/libjava/javax/sql/PooledConnection.h
deleted file mode 100644
index 9310e91ea9c..00000000000
--- a/libjava/javax/sql/PooledConnection.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_PooledConnection__
-#define __javax_sql_PooledConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class ConnectionEventListener;
-        class PooledConnection;
-    }
-  }
-}
-
-class javax::sql::PooledConnection : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual void close() = 0;
-  virtual void addConnectionEventListener(::javax::sql::ConnectionEventListener *) = 0;
-  virtual void removeConnectionEventListener(::javax::sql::ConnectionEventListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_PooledConnection__
diff --git a/libjava/javax/sql/RowSet.h b/libjava/javax/sql/RowSet.h
deleted file mode 100644
index b55f16589b3..00000000000
--- a/libjava/javax/sql/RowSet.h
+++ /dev/null
@@ -1,252 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSet__
-#define __javax_sql_RowSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-    namespace net
-    {
-        class URL;
-    }
-    namespace sql
-    {
-        class Array;
-        class Blob;
-        class Clob;
-        class Date;
-        class Ref;
-        class ResultSetMetaData;
-        class SQLWarning;
-        class Statement;
-        class Time;
-        class Timestamp;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSet;
-        class RowSetListener;
-    }
-  }
-}
-
-class javax::sql::RowSet : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getUrl() = 0;
-  virtual void setUrl(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDataSourceName() = 0;
-  virtual void setDataSourceName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getUsername() = 0;
-  virtual void setUsername(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPassword() = 0;
-  virtual void setPassword(::java::lang::String *) = 0;
-  virtual jint getTransactionIsolation() = 0;
-  virtual void setTransactionIsolation(jint) = 0;
-  virtual ::java::util::Map * getTypeMap() = 0;
-  virtual void setTypeMap(::java::util::Map *) = 0;
-  virtual ::java::lang::String * getCommand() = 0;
-  virtual void setCommand(::java::lang::String *) = 0;
-  virtual jboolean isReadOnly() = 0;
-  virtual void setReadOnly(jboolean) = 0;
-  virtual jint getMaxFieldSize() = 0;
-  virtual void setMaxFieldSize(jint) = 0;
-  virtual jint getMaxRows() = 0;
-  virtual void setMaxRows(jint) = 0;
-  virtual jboolean getEscapeProcessing() = 0;
-  virtual void setEscapeProcessing(jboolean) = 0;
-  virtual jint getQueryTimeout() = 0;
-  virtual void setQueryTimeout(jint) = 0;
-  virtual void setType(jint) = 0;
-  virtual void setConcurrency(jint) = 0;
-  virtual void setNull(jint, jint) = 0;
-  virtual void setNull(jint, jint, ::java::lang::String *) = 0;
-  virtual void setBoolean(jint, jboolean) = 0;
-  virtual void setByte(jint, jbyte) = 0;
-  virtual void setShort(jint, jshort) = 0;
-  virtual void setInt(jint, jint) = 0;
-  virtual void setLong(jint, jlong) = 0;
-  virtual void setFloat(jint, jfloat) = 0;
-  virtual void setDouble(jint, jdouble) = 0;
-  virtual void setBigDecimal(jint, ::java::math::BigDecimal *) = 0;
-  virtual void setString(jint, ::java::lang::String *) = 0;
-  virtual void setBytes(jint, JArray< jbyte > *) = 0;
-  virtual void setDate(jint, ::java::sql::Date *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *) = 0;
-  virtual void setAsciiStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setBinaryStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void setCharacterStream(jint, ::java::io::Reader *, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *, jint) = 0;
-  virtual void setObject(jint, ::java::lang::Object *) = 0;
-  virtual void setRef(jint, ::java::sql::Ref *) = 0;
-  virtual void setBlob(jint, ::java::sql::Blob *) = 0;
-  virtual void setClob(jint, ::java::sql::Clob *) = 0;
-  virtual void setArray(jint, ::java::sql::Array *) = 0;
-  virtual void setDate(jint, ::java::sql::Date *, ::java::util::Calendar *) = 0;
-  virtual void setTime(jint, ::java::sql::Time *, ::java::util::Calendar *) = 0;
-  virtual void setTimestamp(jint, ::java::sql::Timestamp *, ::java::util::Calendar *) = 0;
-  virtual void clearParameters() = 0;
-  virtual void execute() = 0;
-  virtual void addRowSetListener(::javax::sql::RowSetListener *) = 0;
-  virtual void removeRowSetListener(::javax::sql::RowSetListener *) = 0;
-  virtual jboolean next() = 0;
-  virtual void close() = 0;
-  virtual jboolean wasNull() = 0;
-  virtual ::java::lang::String * getString(jint) = 0;
-  virtual jboolean getBoolean(jint) = 0;
-  virtual jbyte getByte(jint) = 0;
-  virtual jshort getShort(jint) = 0;
-  virtual jint getInt(jint) = 0;
-  virtual jlong getLong(jint) = 0;
-  virtual jfloat getFloat(jint) = 0;
-  virtual jdouble getDouble(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint, jint) = 0;
-  virtual JArray< jbyte > * getBytes(jint) = 0;
-  virtual ::java::sql::Date * getDate(jint) = 0;
-  virtual ::java::sql::Time * getTime(jint) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint) = 0;
-  virtual ::java::io::InputStream * getAsciiStream(jint) = 0;
-  virtual ::java::io::InputStream * getUnicodeStream(jint) = 0;
-  virtual ::java::io::InputStream * getBinaryStream(jint) = 0;
-  virtual ::java::lang::String * getString(::java::lang::String *) = 0;
-  virtual jboolean getBoolean(::java::lang::String *) = 0;
-  virtual jbyte getByte(::java::lang::String *) = 0;
-  virtual jshort getShort(::java::lang::String *) = 0;
-  virtual jint getInt(::java::lang::String *) = 0;
-  virtual jlong getLong(::java::lang::String *) = 0;
-  virtual jfloat getFloat(::java::lang::String *) = 0;
-  virtual jdouble getDouble(::java::lang::String *) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(::java::lang::String *, jint) = 0;
-  virtual JArray< jbyte > * getBytes(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getAsciiStream(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getUnicodeStream(::java::lang::String *) = 0;
-  virtual ::java::io::InputStream * getBinaryStream(::java::lang::String *) = 0;
-  virtual ::java::sql::SQLWarning * getWarnings() = 0;
-  virtual void clearWarnings() = 0;
-  virtual ::java::lang::String * getCursorName() = 0;
-  virtual ::java::sql::ResultSetMetaData * getMetaData() = 0;
-  virtual ::java::lang::Object * getObject(jint) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *) = 0;
-  virtual jint findColumn(::java::lang::String *) = 0;
-  virtual ::java::io::Reader * getCharacterStream(jint) = 0;
-  virtual ::java::io::Reader * getCharacterStream(::java::lang::String *) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(jint) = 0;
-  virtual ::java::math::BigDecimal * getBigDecimal(::java::lang::String *) = 0;
-  virtual jboolean isBeforeFirst() = 0;
-  virtual jboolean isAfterLast() = 0;
-  virtual jboolean isFirst() = 0;
-  virtual jboolean isLast() = 0;
-  virtual void beforeFirst() = 0;
-  virtual void afterLast() = 0;
-  virtual jboolean first() = 0;
-  virtual jboolean last() = 0;
-  virtual jint getRow() = 0;
-  virtual jboolean absolute(jint) = 0;
-  virtual jboolean relative(jint) = 0;
-  virtual jboolean previous() = 0;
-  virtual void setFetchDirection(jint) = 0;
-  virtual jint getFetchDirection() = 0;
-  virtual void setFetchSize(jint) = 0;
-  virtual jint getFetchSize() = 0;
-  virtual jint getType() = 0;
-  virtual jint getConcurrency() = 0;
-  virtual jboolean rowUpdated() = 0;
-  virtual jboolean rowInserted() = 0;
-  virtual jboolean rowDeleted() = 0;
-  virtual void updateNull(jint) = 0;
-  virtual void updateBoolean(jint, jboolean) = 0;
-  virtual void updateByte(jint, jbyte) = 0;
-  virtual void updateShort(jint, jshort) = 0;
-  virtual void updateInt(jint, jint) = 0;
-  virtual void updateLong(jint, jlong) = 0;
-  virtual void updateFloat(jint, jfloat) = 0;
-  virtual void updateDouble(jint, jdouble) = 0;
-  virtual void updateBigDecimal(jint, ::java::math::BigDecimal *) = 0;
-  virtual void updateString(jint, ::java::lang::String *) = 0;
-  virtual void updateBytes(jint, JArray< jbyte > *) = 0;
-  virtual void updateDate(jint, ::java::sql::Date *) = 0;
-  virtual void updateTime(jint, ::java::sql::Time *) = 0;
-  virtual void updateTimestamp(jint, ::java::sql::Timestamp *) = 0;
-  virtual void updateAsciiStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void updateBinaryStream(jint, ::java::io::InputStream *, jint) = 0;
-  virtual void updateCharacterStream(jint, ::java::io::Reader *, jint) = 0;
-  virtual void updateObject(jint, ::java::lang::Object *, jint) = 0;
-  virtual void updateObject(jint, ::java::lang::Object *) = 0;
-  virtual void updateNull(::java::lang::String *) = 0;
-  virtual void updateBoolean(::java::lang::String *, jboolean) = 0;
-  virtual void updateByte(::java::lang::String *, jbyte) = 0;
-  virtual void updateShort(::java::lang::String *, jshort) = 0;
-  virtual void updateInt(::java::lang::String *, jint) = 0;
-  virtual void updateLong(::java::lang::String *, jlong) = 0;
-  virtual void updateFloat(::java::lang::String *, jfloat) = 0;
-  virtual void updateDouble(::java::lang::String *, jdouble) = 0;
-  virtual void updateBigDecimal(::java::lang::String *, ::java::math::BigDecimal *) = 0;
-  virtual void updateString(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void updateBytes(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual void updateDate(::java::lang::String *, ::java::sql::Date *) = 0;
-  virtual void updateTime(::java::lang::String *, ::java::sql::Time *) = 0;
-  virtual void updateTimestamp(::java::lang::String *, ::java::sql::Timestamp *) = 0;
-  virtual void updateAsciiStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void updateBinaryStream(::java::lang::String *, ::java::io::InputStream *, jint) = 0;
-  virtual void updateCharacterStream(::java::lang::String *, ::java::io::Reader *, jint) = 0;
-  virtual void updateObject(::java::lang::String *, ::java::lang::Object *, jint) = 0;
-  virtual void updateObject(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void insertRow() = 0;
-  virtual void updateRow() = 0;
-  virtual void deleteRow() = 0;
-  virtual void refreshRow() = 0;
-  virtual void cancelRowUpdates() = 0;
-  virtual void moveToInsertRow() = 0;
-  virtual void moveToCurrentRow() = 0;
-  virtual ::java::sql::Statement * getStatement() = 0;
-  virtual ::java::lang::Object * getObject(jint, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(jint) = 0;
-  virtual ::java::sql::Blob * getBlob(jint) = 0;
-  virtual ::java::sql::Clob * getClob(jint) = 0;
-  virtual ::java::sql::Array * getArray(jint) = 0;
-  virtual ::java::lang::Object * getObject(::java::lang::String *, ::java::util::Map *) = 0;
-  virtual ::java::sql::Ref * getRef(::java::lang::String *) = 0;
-  virtual ::java::sql::Blob * getBlob(::java::lang::String *) = 0;
-  virtual ::java::sql::Clob * getClob(::java::lang::String *) = 0;
-  virtual ::java::sql::Array * getArray(::java::lang::String *) = 0;
-  virtual ::java::sql::Date * getDate(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Date * getDate(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Time * getTime(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(jint, ::java::util::Calendar *) = 0;
-  virtual ::java::sql::Timestamp * getTimestamp(::java::lang::String *, ::java::util::Calendar *) = 0;
-  virtual ::java::net::URL * getURL(jint) = 0;
-  virtual ::java::net::URL * getURL(::java::lang::String *) = 0;
-  virtual void updateRef(jint, ::java::sql::Ref *) = 0;
-  virtual void updateRef(::java::lang::String *, ::java::sql::Ref *) = 0;
-  virtual void updateBlob(jint, ::java::sql::Blob *) = 0;
-  virtual void updateBlob(::java::lang::String *, ::java::sql::Blob *) = 0;
-  virtual void updateClob(jint, ::java::sql::Clob *) = 0;
-  virtual void updateClob(::java::lang::String *, ::java::sql::Clob *) = 0;
-  virtual void updateArray(jint, ::java::sql::Array *) = 0;
-  virtual void updateArray(::java::lang::String *, ::java::sql::Array *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSet__
diff --git a/libjava/javax/sql/RowSetEvent.h b/libjava/javax/sql/RowSetEvent.h
deleted file mode 100644
index 5c5ba6e6461..00000000000
--- a/libjava/javax/sql/RowSetEvent.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetEvent__
-#define __javax_sql_RowSetEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSet;
-        class RowSetEvent;
-    }
-  }
-}
-
-class javax::sql::RowSetEvent : public ::java::util::EventObject
-{
-
-public:
-  RowSetEvent(::javax::sql::RowSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_sql_RowSetEvent__
diff --git a/libjava/javax/sql/RowSetInternal.h b/libjava/javax/sql/RowSetInternal.h
deleted file mode 100644
index e1869df86f1..00000000000
--- a/libjava/javax/sql/RowSetInternal.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetInternal__
-#define __javax_sql_RowSetInternal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-        class ResultSet;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSetInternal;
-        class RowSetMetaData;
-    }
-  }
-}
-
-class javax::sql::RowSetInternal : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::Object * > * getParams() = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual void setMetaData(::javax::sql::RowSetMetaData *) = 0;
-  virtual ::java::sql::ResultSet * getOriginal() = 0;
-  virtual ::java::sql::ResultSet * getOriginalRow() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSetInternal__
diff --git a/libjava/javax/sql/RowSetListener.h b/libjava/javax/sql/RowSetListener.h
deleted file mode 100644
index 9edc7d4bcd0..00000000000
--- a/libjava/javax/sql/RowSetListener.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetListener__
-#define __javax_sql_RowSetListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSetEvent;
-        class RowSetListener;
-    }
-  }
-}
-
-class javax::sql::RowSetListener : public ::java::lang::Object
-{
-
-public:
-  virtual void rowSetChanged(::javax::sql::RowSetEvent *) = 0;
-  virtual void rowChanged(::javax::sql::RowSetEvent *) = 0;
-  virtual void cursorMoved(::javax::sql::RowSetEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSetListener__
diff --git a/libjava/javax/sql/RowSetMetaData.h b/libjava/javax/sql/RowSetMetaData.h
deleted file mode 100644
index 90d5a46c737..00000000000
--- a/libjava/javax/sql/RowSetMetaData.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetMetaData__
-#define __javax_sql_RowSetMetaData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSetMetaData;
-    }
-  }
-}
-
-class javax::sql::RowSetMetaData : public ::java::lang::Object
-{
-
-public:
-  virtual void setColumnCount(jint) = 0;
-  virtual void setAutoIncrement(jint, jboolean) = 0;
-  virtual void setCaseSensitive(jint, jboolean) = 0;
-  virtual void setSearchable(jint, jboolean) = 0;
-  virtual void setCurrency(jint, jboolean) = 0;
-  virtual void setNullable(jint, jint) = 0;
-  virtual void setSigned(jint, jboolean) = 0;
-  virtual void setColumnDisplaySize(jint, jint) = 0;
-  virtual void setColumnLabel(jint, ::java::lang::String *) = 0;
-  virtual void setColumnName(jint, ::java::lang::String *) = 0;
-  virtual void setSchemaName(jint, ::java::lang::String *) = 0;
-  virtual void setPrecision(jint, jint) = 0;
-  virtual void setScale(jint, jint) = 0;
-  virtual void setTableName(jint, ::java::lang::String *) = 0;
-  virtual void setCatalogName(jint, ::java::lang::String *) = 0;
-  virtual void setColumnType(jint, jint) = 0;
-  virtual void setColumnTypeName(jint, ::java::lang::String *) = 0;
-  virtual jint getColumnCount() = 0;
-  virtual jboolean isAutoIncrement(jint) = 0;
-  virtual jboolean isCaseSensitive(jint) = 0;
-  virtual jboolean isSearchable(jint) = 0;
-  virtual jboolean isCurrency(jint) = 0;
-  virtual jint isNullable(jint) = 0;
-  virtual jboolean isSigned(jint) = 0;
-  virtual jint getColumnDisplaySize(jint) = 0;
-  virtual ::java::lang::String * getColumnLabel(jint) = 0;
-  virtual ::java::lang::String * getColumnName(jint) = 0;
-  virtual ::java::lang::String * getSchemaName(jint) = 0;
-  virtual jint getPrecision(jint) = 0;
-  virtual jint getScale(jint) = 0;
-  virtual ::java::lang::String * getTableName(jint) = 0;
-  virtual ::java::lang::String * getCatalogName(jint) = 0;
-  virtual jint getColumnType(jint) = 0;
-  virtual ::java::lang::String * getColumnTypeName(jint) = 0;
-  virtual jboolean isReadOnly(jint) = 0;
-  virtual jboolean isWritable(jint) = 0;
-  virtual jboolean isDefinitelyWritable(jint) = 0;
-  virtual ::java::lang::String * getColumnClassName(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSetMetaData__
diff --git a/libjava/javax/sql/RowSetReader.h b/libjava/javax/sql/RowSetReader.h
deleted file mode 100644
index 6e2adad48f3..00000000000
--- a/libjava/javax/sql/RowSetReader.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetReader__
-#define __javax_sql_RowSetReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSetInternal;
-        class RowSetReader;
-    }
-  }
-}
-
-class javax::sql::RowSetReader : public ::java::lang::Object
-{
-
-public:
-  virtual void readData(::javax::sql::RowSetInternal *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSetReader__
diff --git a/libjava/javax/sql/RowSetWriter.h b/libjava/javax/sql/RowSetWriter.h
deleted file mode 100644
index c4ce0de158c..00000000000
--- a/libjava/javax/sql/RowSetWriter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_RowSetWriter__
-#define __javax_sql_RowSetWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class RowSetInternal;
-        class RowSetWriter;
-    }
-  }
-}
-
-class javax::sql::RowSetWriter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean writeData(::javax::sql::RowSetInternal *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_RowSetWriter__
diff --git a/libjava/javax/sql/XAConnection.h b/libjava/javax/sql/XAConnection.h
deleted file mode 100644
index ece83a7c9ce..00000000000
--- a/libjava/javax/sql/XAConnection.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_XAConnection__
-#define __javax_sql_XAConnection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace sql
-    {
-        class Connection;
-    }
-  }
-  namespace javax
-  {
-    namespace sql
-    {
-        class ConnectionEventListener;
-        class XAConnection;
-    }
-    namespace transaction
-    {
-      namespace xa
-      {
-          class XAResource;
-      }
-    }
-  }
-}
-
-class javax::sql::XAConnection : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::transaction::xa::XAResource * getXAResource() = 0;
-  virtual ::java::sql::Connection * getConnection() = 0;
-  virtual void close() = 0;
-  virtual void addConnectionEventListener(::javax::sql::ConnectionEventListener *) = 0;
-  virtual void removeConnectionEventListener(::javax::sql::ConnectionEventListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_XAConnection__
diff --git a/libjava/javax/sql/XADataSource.h b/libjava/javax/sql/XADataSource.h
deleted file mode 100644
index b5177ad1983..00000000000
--- a/libjava/javax/sql/XADataSource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_sql_XADataSource__
-#define __javax_sql_XADataSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace sql
-    {
-        class XAConnection;
-        class XADataSource;
-    }
-  }
-}
-
-class javax::sql::XADataSource : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::sql::XAConnection * getXAConnection() = 0;
-  virtual ::javax::sql::XAConnection * getXAConnection(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::io::PrintWriter * getLogWriter() = 0;
-  virtual void setLogWriter(::java::io::PrintWriter *) = 0;
-  virtual void setLoginTimeout(jint) = 0;
-  virtual jint getLoginTimeout() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_sql_XADataSource__
diff --git a/libjava/javax/swing/AbstractAction.h b/libjava/javax/swing/AbstractAction.h
deleted file mode 100644
index 6f79d0d37f1..00000000000
--- a/libjava/javax/swing/AbstractAction.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractAction__
-#define __javax_swing_AbstractAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractAction;
-        class Icon;
-      namespace event
-      {
-          class SwingPropertyChangeSupport;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractAction : public ::java::lang::Object
-{
-
-public:
-  AbstractAction();
-  AbstractAction(::java::lang::String *);
-  AbstractAction(::java::lang::String *, ::javax::swing::Icon *);
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-public:
-  virtual ::java::lang::Object * getValue(::java::lang::String *);
-  virtual void putValue(::java::lang::String *, ::java::lang::Object *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual JArray< ::java::lang::Object * > * getKeys();
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-private:
-  void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-public:
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *) = 0;
-private:
-  static const jlong serialVersionUID = -6803159439231523484LL;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) enabled;
-  ::javax::swing::event::SwingPropertyChangeSupport * changeSupport;
-private:
-  ::java::util::HashMap * store;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractAction__
diff --git a/libjava/javax/swing/AbstractButton$1.h b/libjava/javax/swing/AbstractButton$1.h
deleted file mode 100644
index fa5975e2d53..00000000000
--- a/libjava/javax/swing/AbstractButton$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$1__
-#define __javax_swing_AbstractButton$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$1;
-    }
-  }
-}
-
-class javax::swing::AbstractButton$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractButton$1(::javax::swing::AbstractButton *);
-public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton$1__
diff --git a/libjava/javax/swing/AbstractButton$2.h b/libjava/javax/swing/AbstractButton$2.h
deleted file mode 100644
index 1bb6bc29681..00000000000
--- a/libjava/javax/swing/AbstractButton$2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$2__
-#define __javax_swing_AbstractButton$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$2;
-    }
-  }
-}
-
-class javax::swing::AbstractButton$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractButton$2(::javax::swing::AbstractButton *);
-public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton$2__
diff --git a/libjava/javax/swing/AbstractButton$3.h b/libjava/javax/swing/AbstractButton$3.h
deleted file mode 100644
index 174029e5f26..00000000000
--- a/libjava/javax/swing/AbstractButton$3.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$3__
-#define __javax_swing_AbstractButton$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$3;
-    }
-  }
-}
-
-class javax::swing::AbstractButton$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractButton$3(::javax::swing::AbstractButton *);
-public:
-  void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton$3__
diff --git a/libjava/javax/swing/AbstractButton$AccessibleAbstractButton.h b/libjava/javax/swing/AbstractButton$AccessibleAbstractButton.h
deleted file mode 100644
index fd5ea169d2d..00000000000
--- a/libjava/javax/swing/AbstractButton$AccessibleAbstractButton.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$AccessibleAbstractButton__
-#define __javax_swing_AbstractButton$AccessibleAbstractButton__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleAction;
-        class AccessibleIcon;
-        class AccessibleRelationSet;
-        class AccessibleStateSet;
-        class AccessibleText;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$AccessibleAbstractButton;
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractButton$AccessibleAbstractButton : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  AbstractButton$AccessibleAbstractButton(::javax::swing::AbstractButton *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual JArray< ::javax::accessibility::AccessibleIcon * > * getAccessibleIcon();
-  virtual ::javax::accessibility::AccessibleRelationSet * getAccessibleRelationSet();
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual jint getIndexAtPoint(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getCharCount();
-  virtual jint getCaretPosition();
-  virtual ::java::lang::String * getAtIndex(jint, jint);
-  virtual ::java::lang::String * getAfterIndex(jint, jint);
-  virtual ::java::lang::String * getBeforeIndex(jint, jint);
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint);
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual ::java::lang::String * getSelectedText();
-private:
-  static const jlong serialVersionUID = -5673062525319836790LL;
-public: // actually package-private
-  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton$AccessibleAbstractButton__
diff --git a/libjava/javax/swing/AbstractButton$ButtonChangeListener.h b/libjava/javax/swing/AbstractButton$ButtonChangeListener.h
deleted file mode 100644
index e291daa77aa..00000000000
--- a/libjava/javax/swing/AbstractButton$ButtonChangeListener.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$ButtonChangeListener__
-#define __javax_swing_AbstractButton$ButtonChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$ButtonChangeListener;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractButton$ButtonChangeListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractButton$ButtonChangeListener(::javax::swing::AbstractButton *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-private:
-  static const jlong serialVersionUID = 1471056094226600578LL;
-public: // actually package-private
-  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton$ButtonChangeListener__
diff --git a/libjava/javax/swing/AbstractButton$EventHandler.h b/libjava/javax/swing/AbstractButton$EventHandler.h
deleted file mode 100644
index 148efd61172..00000000000
--- a/libjava/javax/swing/AbstractButton$EventHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton$EventHandler__
-#define __javax_swing_AbstractButton$EventHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$EventHandler;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractButton$EventHandler : public ::java::lang::Object
-{
-
-  AbstractButton$EventHandler(::javax::swing::AbstractButton *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  AbstractButton$EventHandler(::javax::swing::AbstractButton *, ::javax::swing::AbstractButton$EventHandler *);
-  ::javax::swing::AbstractButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton$EventHandler__
diff --git a/libjava/javax/swing/AbstractButton.h b/libjava/javax/swing/AbstractButton.h
deleted file mode 100644
index 82cf58823fd..00000000000
--- a/libjava/javax/swing/AbstractButton.h
+++ /dev/null
@@ -1,227 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractButton__
-#define __javax_swing_AbstractButton__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Image;
-        class Insets;
-        class LayoutManager;
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class AbstractButton$EventHandler;
-        class Action;
-        class ButtonModel;
-        class Icon;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ButtonUI;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractButton : public ::javax::swing::JComponent
-{
-
-public:
-  AbstractButton();
-  virtual ::javax::swing::ButtonModel * getModel();
-  virtual void setModel(::javax::swing::ButtonModel *);
-public: // actually protected
-  virtual void init(::java::lang::String *, ::javax::swing::Icon *);
-public:
-  virtual ::java::lang::String * getActionCommand();
-  virtual void setActionCommand(::java::lang::String *);
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireItemStateChanged(::java::awt::event::ItemEvent *);
-  virtual void fireActionPerformed(::java::awt::event::ActionEvent *);
-  virtual void fireStateChanged();
-public:
-  virtual jint getMnemonic();
-  virtual void setMnemonic(jchar);
-  virtual void setMnemonic(jint);
-  virtual void setDisplayedMnemonicIndex(jint);
-  virtual jint getDisplayedMnemonicIndex();
-  virtual void setRolloverEnabled(jboolean);
-  virtual jboolean isRolloverEnabled();
-  virtual void setSelected(jboolean);
-  virtual jboolean isSelected();
-  virtual void setEnabled(jboolean);
-  virtual jint getHorizontalAlignment();
-  virtual void setHorizontalAlignment(jint);
-  virtual jint getHorizontalTextPosition();
-  virtual void setHorizontalTextPosition(jint);
-  virtual jint getVerticalAlignment();
-  virtual void setVerticalAlignment(jint);
-  virtual jint getVerticalTextPosition();
-  virtual void setVerticalTextPosition(jint);
-  virtual jboolean isBorderPainted();
-  virtual void setBorderPainted(jboolean);
-  virtual ::javax::swing::Action * getAction();
-  virtual void setAction(::javax::swing::Action *);
-  virtual ::javax::swing::Icon * getIcon();
-  virtual void setIcon(::javax::swing::Icon *);
-  virtual ::java::lang::String * getText();
-  virtual void setLabel(::java::lang::String *);
-  virtual ::java::lang::String * getLabel();
-  virtual void setText(::java::lang::String *);
-  virtual void setIconTextGap(jint);
-  virtual jint getIconTextGap();
-  virtual ::java::awt::Insets * getMargin();
-  virtual void setMargin(::java::awt::Insets *);
-  virtual ::javax::swing::Icon * getPressedIcon();
-  virtual void setPressedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getDisabledIcon();
-  virtual void setDisabledIcon(::javax::swing::Icon *);
-  virtual jboolean isFocusPainted();
-  virtual void setFocusPainted(jboolean);
-public: // actually protected
-  virtual jint checkHorizontalKey(jint, ::java::lang::String *);
-  virtual jint checkVerticalKey(jint, ::java::lang::String *);
-  virtual void configurePropertiesFromAction(::javax::swing::Action *);
-  virtual ::java::awt::event::ActionListener * createActionListener();
-  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-  virtual ::java::awt::event::ItemListener * createItemListener();
-public:
-  virtual void doClick();
-  virtual void doClick(jint);
-  virtual ::javax::swing::Icon * getDisabledSelectedIcon();
-  virtual void setDisabledSelectedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getRolloverIcon();
-  virtual void setRolloverIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getRolloverSelectedIcon();
-  virtual void setRolloverSelectedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getSelectedIcon();
-  virtual void setSelectedIcon(::javax::swing::Icon *);
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-  virtual jboolean isContentAreaFilled();
-  virtual void setContentAreaFilled(jboolean);
-public: // actually protected
-  virtual void paintBorder(::java::awt::Graphics *);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void setUI(::javax::swing::plaf::ButtonUI *);
-  virtual ::javax::swing::plaf::ButtonUI * getUI();
-  virtual void updateUI();
-  virtual jlong getMultiClickThreshhold();
-  virtual void setMultiClickThreshhold(jlong);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void setLayout(::java::awt::LayoutManager *);
-public: // actually package-private
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::javax::swing::AbstractButton$EventHandler * getEventHandler();
-private:
-  static const jlong serialVersionUID = -937921345538462020LL;
-public: // actually package-private
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) default_icon;
-  ::javax::swing::Icon * pressed_icon;
-  ::javax::swing::Icon * disabledIcon;
-  ::javax::swing::Icon * selectedIcon;
-  ::javax::swing::Icon * disabledSelectedIcon;
-  ::javax::swing::Icon * rolloverIcon;
-  ::javax::swing::Icon * rolloverSelectedIcon;
-  ::javax::swing::Icon * current_icon;
-  ::java::lang::String * text;
-  jint iconTextGap;
-  jint verticalAlignment;
-  jint horizontalAlignment;
-  jint horizontalTextPosition;
-  jint verticalTextPosition;
-  jboolean borderPainted;
-  jboolean focusPainted;
-  jboolean contentAreaFilled;
-  jboolean rollOverEnabled;
-  ::javax::swing::Action * action;
-public: // actually protected
-  ::javax::swing::ButtonModel * model;
-public: // actually package-private
-  ::java::awt::Insets * margin;
-  jint mnemonicIndex;
-public: // actually protected
-  ::java::awt::event::ActionListener * actionListener;
-  ::java::awt::event::ItemListener * itemListener;
-  ::javax::swing::event::ChangeListener * changeListener;
-private:
-  ::javax::swing::AbstractButton$EventHandler * eventHandler;
-public: // actually package-private
-  jlong multiClickThreshhold;
-  ::java::beans::PropertyChangeListener * actionPropertyChangeListener;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * changeEvent;
-private:
-  jboolean clientBorderPaintedSet;
-  jboolean clientRolloverEnabledSet;
-  jboolean clientIconTextGapSet;
-  jboolean clientContentAreaFilledSet;
-public:
-  static ::java::lang::String * BORDER_PAINTED_CHANGED_PROPERTY;
-  static ::java::lang::String * CONTENT_AREA_FILLED_CHANGED_PROPERTY;
-  static ::java::lang::String * DISABLED_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * DISABLED_SELECTED_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * FOCUS_PAINTED_CHANGED_PROPERTY;
-  static ::java::lang::String * HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY;
-  static ::java::lang::String * HORIZONTAL_TEXT_POSITION_CHANGED_PROPERTY;
-  static ::java::lang::String * ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * MARGIN_CHANGED_PROPERTY;
-  static ::java::lang::String * MNEMONIC_CHANGED_PROPERTY;
-  static ::java::lang::String * MODEL_CHANGED_PROPERTY;
-  static ::java::lang::String * PRESSED_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * ROLLOVER_ENABLED_CHANGED_PROPERTY;
-  static ::java::lang::String * ROLLOVER_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * SELECTED_ICON_CHANGED_PROPERTY;
-  static ::java::lang::String * TEXT_CHANGED_PROPERTY;
-  static ::java::lang::String * VERTICAL_ALIGNMENT_CHANGED_PROPERTY;
-  static ::java::lang::String * VERTICAL_TEXT_POSITION_CHANGED_PROPERTY;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractButton__
diff --git a/libjava/javax/swing/AbstractCellEditor.h b/libjava/javax/swing/AbstractCellEditor.h
deleted file mode 100644
index a3aae0dbd58..00000000000
--- a/libjava/javax/swing/AbstractCellEditor.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractCellEditor__
-#define __javax_swing_AbstractCellEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractCellEditor;
-      namespace event
-      {
-          class CellEditorListener;
-          class ChangeEvent;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractCellEditor : public ::java::lang::Object
-{
-
-public:
-  AbstractCellEditor();
-  virtual jboolean isCellEditable(::java::util::EventObject *);
-  virtual jboolean shouldSelectCell(::java::util::EventObject *);
-  virtual jboolean stopCellEditing();
-  virtual void cancelCellEditing();
-  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *);
-  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *);
-  virtual JArray< ::javax::swing::event::CellEditorListener * > * getCellEditorListeners();
-public: // actually protected
-  virtual void fireEditingStopped();
-  virtual void fireEditingCanceled();
-public:
-  virtual ::java::lang::Object * getCellEditorValue() = 0;
-private:
-  static const jlong serialVersionUID = -1048006551406220959LL;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-  ::javax::swing::event::ChangeEvent * changeEvent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractCellEditor__
diff --git a/libjava/javax/swing/AbstractListModel.h b/libjava/javax/swing/AbstractListModel.h
deleted file mode 100644
index 5e6eb547690..00000000000
--- a/libjava/javax/swing/AbstractListModel.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractListModel__
-#define __javax_swing_AbstractListModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractListModel;
-      namespace event
-      {
-          class EventListenerList;
-          class ListDataListener;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractListModel : public ::java::lang::Object
-{
-
-public:
-  AbstractListModel();
-  virtual void addListDataListener(::javax::swing::event::ListDataListener *);
-  virtual void removeListDataListener(::javax::swing::event::ListDataListener *);
-public: // actually protected
-  virtual void fireContentsChanged(::java::lang::Object *, jint, jint);
-  virtual void fireIntervalAdded(::java::lang::Object *, jint, jint);
-  virtual void fireIntervalRemoved(::java::lang::Object *, jint, jint);
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ListDataListener * > * getListDataListeners();
-  virtual jint getSize() = 0;
-  virtual ::java::lang::Object * getElementAt(jint) = 0;
-private:
-  static const jlong serialVersionUID = -3285184064379168730LL;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractListModel__
diff --git a/libjava/javax/swing/AbstractSpinnerModel.h b/libjava/javax/swing/AbstractSpinnerModel.h
deleted file mode 100644
index dde4ac870ae..00000000000
--- a/libjava/javax/swing/AbstractSpinnerModel.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_AbstractSpinnerModel__
-#define __javax_swing_AbstractSpinnerModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractSpinnerModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::AbstractSpinnerModel : public ::java::lang::Object
-{
-
-public:
-  AbstractSpinnerModel();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual void setValue(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getValue() = 0;
-  virtual ::java::lang::Object * getNextValue() = 0;
-  virtual ::java::lang::Object * getPreviousValue() = 0;
-private:
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * listenerList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_AbstractSpinnerModel__
diff --git a/libjava/javax/swing/Action.h b/libjava/javax/swing/Action.h
deleted file mode 100644
index b3a42f4f0b5..00000000000
--- a/libjava/javax/swing/Action.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Action__
-#define __javax_swing_Action__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-    }
-  }
-}
-
-class javax::swing::Action : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getValue(::java::lang::String *) = 0;
-  virtual void putValue(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual jboolean isEnabled() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual void actionPerformed(::java::awt::event::ActionEvent *) = 0;
-  static ::java::lang::String * DEFAULT;
-  static ::java::lang::String * LONG_DESCRIPTION;
-  static ::java::lang::String * NAME;
-  static ::java::lang::String * SHORT_DESCRIPTION;
-  static ::java::lang::String * SMALL_ICON;
-  static ::java::lang::String * ACCELERATOR_KEY;
-  static ::java::lang::String * ACTION_COMMAND_KEY;
-  static ::java::lang::String * MNEMONIC_KEY;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_Action__
diff --git a/libjava/javax/swing/ActionMap.h b/libjava/javax/swing/ActionMap.h
deleted file mode 100644
index 92e8e039ae6..00000000000
--- a/libjava/javax/swing/ActionMap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ActionMap__
-#define __javax_swing_ActionMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class ActionMap;
-    }
-  }
-}
-
-class javax::swing::ActionMap : public ::java::lang::Object
-{
-
-public:
-  ActionMap();
-  virtual ::javax::swing::Action * get(::java::lang::Object *);
-  virtual void put(::java::lang::Object *, ::javax::swing::Action *);
-  virtual void remove(::java::lang::Object *);
-  virtual ::javax::swing::ActionMap * getParent();
-  virtual void setParent(::javax::swing::ActionMap *);
-  virtual jint size();
-  virtual void clear();
-  virtual JArray< ::java::lang::Object * > * keys();
-  virtual JArray< ::java::lang::Object * > * allKeys();
-private:
-  static const jlong serialVersionUID = -6277518704513986346LL;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) actionMap;
-  ::javax::swing::ActionMap * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ActionMap__
diff --git a/libjava/javax/swing/BorderFactory.h b/libjava/javax/swing/BorderFactory.h
deleted file mode 100644
index 2a84d3366c5..00000000000
--- a/libjava/javax/swing/BorderFactory.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_BorderFactory__
-#define __javax_swing_BorderFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class BorderFactory;
-        class Icon;
-      namespace border
-      {
-          class Border;
-          class CompoundBorder;
-          class MatteBorder;
-          class TitledBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::BorderFactory : public ::java::lang::Object
-{
-
-  BorderFactory();
-public:
-  static ::javax::swing::border::Border * createLineBorder(::java::awt::Color *);
-  static ::javax::swing::border::Border * createLineBorder(::java::awt::Color *, jint);
-  static ::javax::swing::border::Border * createRaisedBevelBorder();
-  static ::javax::swing::border::Border * createLoweredBevelBorder();
-  static ::javax::swing::border::Border * createBevelBorder(jint);
-  static ::javax::swing::border::Border * createBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
-  static ::javax::swing::border::Border * createBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  static ::javax::swing::border::Border * createEtchedBorder();
-  static ::javax::swing::border::Border * createEtchedBorder(jint);
-  static ::javax::swing::border::Border * createEtchedBorder(::java::awt::Color *, ::java::awt::Color *);
-  static ::javax::swing::border::Border * createEtchedBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::java::lang::String *);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *);
-  static ::javax::swing::border::TitledBorder * createTitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *, ::java::awt::Color *);
-  static ::javax::swing::border::Border * createEmptyBorder();
-  static ::javax::swing::border::Border * createEmptyBorder(jint, jint, jint, jint);
-  static ::javax::swing::border::CompoundBorder * createCompoundBorder();
-  static ::javax::swing::border::CompoundBorder * createCompoundBorder(::javax::swing::border::Border *, ::javax::swing::border::Border *);
-  static ::javax::swing::border::MatteBorder * createMatteBorder(jint, jint, jint, jint, ::java::awt::Color *);
-  static ::javax::swing::border::MatteBorder * createMatteBorder(jint, jint, jint, jint, ::javax::swing::Icon *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_BorderFactory__
diff --git a/libjava/javax/swing/BoundedRangeModel.h b/libjava/javax/swing/BoundedRangeModel.h
deleted file mode 100644
index 6842157c266..00000000000
--- a/libjava/javax/swing/BoundedRangeModel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_BoundedRangeModel__
-#define __javax_swing_BoundedRangeModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class BoundedRangeModel;
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::BoundedRangeModel : public ::java::lang::Object
-{
-
-public:
-  virtual jint getValue() = 0;
-  virtual void setValue(jint) = 0;
-  virtual jint getMinimum() = 0;
-  virtual void setMinimum(jint) = 0;
-  virtual jint getMaximum() = 0;
-  virtual void setMaximum(jint) = 0;
-  virtual jboolean getValueIsAdjusting() = 0;
-  virtual void setValueIsAdjusting(jboolean) = 0;
-  virtual jint getExtent() = 0;
-  virtual void setExtent(jint) = 0;
-  virtual void setRangeProperties(jint, jint, jint, jint, jboolean) = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_BoundedRangeModel__
diff --git a/libjava/javax/swing/Box$AccessibleBox.h b/libjava/javax/swing/Box$AccessibleBox.h
deleted file mode 100644
index eb552a1857d..00000000000
--- a/libjava/javax/swing/Box$AccessibleBox.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Box$AccessibleBox__
-#define __javax_swing_Box$AccessibleBox__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class Box;
-        class Box$AccessibleBox;
-    }
-  }
-}
-
-class javax::swing::Box$AccessibleBox : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  Box$AccessibleBox(::javax::swing::Box *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -7775079816389931944LL;
-public: // actually package-private
-  ::javax::swing::Box * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Box$AccessibleBox__
diff --git a/libjava/javax/swing/Box$Filler$AccessibleBoxFiller.h b/libjava/javax/swing/Box$Filler$AccessibleBoxFiller.h
deleted file mode 100644
index 66440c34421..00000000000
--- a/libjava/javax/swing/Box$Filler$AccessibleBoxFiller.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Box$Filler$AccessibleBoxFiller__
-#define __javax_swing_Box$Filler$AccessibleBoxFiller__
-
-#pragma interface
-
-#include <java/awt/Component$AccessibleAWTComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class Box$Filler;
-        class Box$Filler$AccessibleBoxFiller;
-    }
-  }
-}
-
-class javax::swing::Box$Filler$AccessibleBoxFiller : public ::java::awt::Component$AccessibleAWTComponent
-{
-
-public: // actually protected
-  Box$Filler$AccessibleBoxFiller(::javax::swing::Box$Filler *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 164963348357479321LL;
-public: // actually package-private
-  ::javax::swing::Box$Filler * __attribute__((aligned(__alignof__( ::java::awt::Component$AccessibleAWTComponent)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Box$Filler$AccessibleBoxFiller__
diff --git a/libjava/javax/swing/Box$Filler.h b/libjava/javax/swing/Box$Filler.h
deleted file mode 100644
index a16dc81500e..00000000000
--- a/libjava/javax/swing/Box$Filler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Box$Filler__
-#define __javax_swing_Box$Filler__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Box$Filler;
-    }
-  }
-}
-
-class javax::swing::Box$Filler : public ::javax::swing::JComponent
-{
-
-public:
-  Box$Filler(::java::awt::Dimension *, ::java::awt::Dimension *, ::java::awt::Dimension *);
-  virtual void changeShape(::java::awt::Dimension *, ::java::awt::Dimension *, ::java::awt::Dimension *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-private:
-  static const jlong serialVersionUID = -1204263191910183998LL;
-  ::java::awt::Dimension * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) min;
-  ::java::awt::Dimension * pref;
-  ::java::awt::Dimension * max;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Box$Filler__
diff --git a/libjava/javax/swing/Box.h b/libjava/javax/swing/Box.h
deleted file mode 100644
index 29538a6eed8..00000000000
--- a/libjava/javax/swing/Box.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Box__
-#define __javax_swing_Box__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class LayoutManager;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Box;
-    }
-  }
-}
-
-class javax::swing::Box : public ::javax::swing::JComponent
-{
-
-public:
-  Box(jint);
-  static ::java::awt::Component * createGlue();
-  static ::javax::swing::Box * createHorizontalBox();
-  static ::java::awt::Component * createHorizontalGlue();
-  static ::java::awt::Component * createHorizontalStrut(jint);
-  static ::java::awt::Component * createRigidArea(::java::awt::Dimension *);
-  static ::javax::swing::Box * createVerticalBox();
-  static ::java::awt::Component * createVerticalGlue();
-  static ::java::awt::Component * createVerticalStrut(jint);
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 1525417495883046342LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Box__
diff --git a/libjava/javax/swing/BoxLayout.h b/libjava/javax/swing/BoxLayout.h
deleted file mode 100644
index c60bb8dd9b9..00000000000
--- a/libjava/javax/swing/BoxLayout.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_BoxLayout__
-#define __javax_swing_BoxLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class BoxLayout;
-        class SizeRequirements;
-    }
-  }
-}
-
-class javax::swing::BoxLayout : public ::java::lang::Object
-{
-
-public:
-  BoxLayout(::java::awt::Container *, jint);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-private:
-  jboolean isHorizontalIn(::java::awt::Container *);
-public:
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-private:
-  void checkTotalRequirements();
-  void checkRequirements();
-  void checkLayout();
-public:
-  static const jint X_AXIS = 0;
-  static const jint Y_AXIS = 1;
-  static const jint LINE_AXIS = 2;
-  static const jint PAGE_AXIS = 3;
-private:
-  static const jlong serialVersionUID = -2474455742719112368LL;
-  ::java::awt::Container * __attribute__((aligned(__alignof__( ::java::lang::Object)))) container;
-  jint way;
-  JArray< ::javax::swing::SizeRequirements * > * xChildren;
-  JArray< ::javax::swing::SizeRequirements * > * yChildren;
-  ::javax::swing::SizeRequirements * xTotal;
-  ::javax::swing::SizeRequirements * yTotal;
-  JArray< jint > * offsetsX;
-  JArray< jint > * offsetsY;
-  JArray< jint > * spansX;
-  JArray< jint > * spansY;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_BoxLayout__
diff --git a/libjava/javax/swing/ButtonGroup.h b/libjava/javax/swing/ButtonGroup.h
deleted file mode 100644
index 68f383ac653..00000000000
--- a/libjava/javax/swing/ButtonGroup.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ButtonGroup__
-#define __javax_swing_ButtonGroup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class ButtonGroup;
-        class ButtonModel;
-    }
-  }
-}
-
-class javax::swing::ButtonGroup : public ::java::lang::Object
-{
-
-public:
-  ButtonGroup();
-  virtual void add(::javax::swing::AbstractButton *);
-  virtual void remove(::javax::swing::AbstractButton *);
-  virtual ::java::util::Enumeration * getElements();
-  virtual ::javax::swing::ButtonModel * getSelection();
-public: // actually package-private
-  virtual ::javax::swing::AbstractButton * findButton(::javax::swing::ButtonModel *);
-public:
-  virtual void setSelected(::javax::swing::ButtonModel *, jboolean);
-  virtual jboolean isSelected(::javax::swing::ButtonModel *);
-  virtual jint getButtonCount();
-private:
-  static const jlong serialVersionUID = 4259076101881721375LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buttons;
-public: // actually package-private
-  ::javax::swing::ButtonModel * sel;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ButtonGroup__
diff --git a/libjava/javax/swing/ButtonModel.h b/libjava/javax/swing/ButtonModel.h
deleted file mode 100644
index 5f137a654ba..00000000000
--- a/libjava/javax/swing/ButtonModel.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ButtonModel__
-#define __javax_swing_ButtonModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionListener;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ButtonGroup;
-        class ButtonModel;
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::ButtonModel : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isArmed() = 0;
-  virtual void setArmed(jboolean) = 0;
-  virtual jboolean isEnabled() = 0;
-  virtual void setEnabled(jboolean) = 0;
-  virtual void setPressed(jboolean) = 0;
-  virtual jboolean isPressed() = 0;
-  virtual void removeActionListener(::java::awt::event::ActionListener *) = 0;
-  virtual void addActionListener(::java::awt::event::ActionListener *) = 0;
-  virtual void addItemListener(::java::awt::event::ItemListener *) = 0;
-  virtual void removeItemListener(::java::awt::event::ItemListener *) = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void setRollover(jboolean) = 0;
-  virtual jboolean isRollover() = 0;
-  virtual jint getMnemonic() = 0;
-  virtual void setMnemonic(jint) = 0;
-  virtual void setActionCommand(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getActionCommand() = 0;
-  virtual void setGroup(::javax::swing::ButtonGroup *) = 0;
-  virtual void setSelected(jboolean) = 0;
-  virtual jboolean isSelected() = 0;
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ButtonModel__
diff --git a/libjava/javax/swing/CellEditor.h b/libjava/javax/swing/CellEditor.h
deleted file mode 100644
index 63e9c8b77f8..00000000000
--- a/libjava/javax/swing/CellEditor.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_CellEditor__
-#define __javax_swing_CellEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class CellEditor;
-      namespace event
-      {
-          class CellEditorListener;
-      }
-    }
-  }
-}
-
-class javax::swing::CellEditor : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getCellEditorValue() = 0;
-  virtual jboolean isCellEditable(::java::util::EventObject *) = 0;
-  virtual jboolean shouldSelectCell(::java::util::EventObject *) = 0;
-  virtual jboolean stopCellEditing() = 0;
-  virtual void cancelCellEditing() = 0;
-  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_CellEditor__
diff --git a/libjava/javax/swing/CellRendererPane$AccessibleCellRendererPane.h b/libjava/javax/swing/CellRendererPane$AccessibleCellRendererPane.h
deleted file mode 100644
index da0650bcb38..00000000000
--- a/libjava/javax/swing/CellRendererPane$AccessibleCellRendererPane.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_CellRendererPane$AccessibleCellRendererPane__
-#define __javax_swing_CellRendererPane$AccessibleCellRendererPane__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class CellRendererPane;
-        class CellRendererPane$AccessibleCellRendererPane;
-    }
-  }
-}
-
-class javax::swing::CellRendererPane$AccessibleCellRendererPane : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  CellRendererPane$AccessibleCellRendererPane(::javax::swing::CellRendererPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -8981090083147391074LL;
-public: // actually package-private
-  ::javax::swing::CellRendererPane * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_CellRendererPane$AccessibleCellRendererPane__
diff --git a/libjava/javax/swing/CellRendererPane.h b/libjava/javax/swing/CellRendererPane.h
deleted file mode 100644
index af350004fed..00000000000
--- a/libjava/javax/swing/CellRendererPane.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_CellRendererPane__
-#define __javax_swing_CellRendererPane__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class CellRendererPane;
-    }
-  }
-}
-
-class javax::swing::CellRendererPane : public ::java::awt::Container
-{
-
-public:
-  CellRendererPane();
-  virtual void update(::java::awt::Graphics *);
-  virtual void invalidate();
-  virtual void paint(::java::awt::Graphics *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, jint, jint, jint, jint, jboolean);
-  virtual void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, jint, jint, jint, jint);
-  virtual void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, ::java::awt::Rectangle *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -7642183829532984273LL;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Container)))) accessibleContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_CellRendererPane__
diff --git a/libjava/javax/swing/ComboBoxEditor.h b/libjava/javax/swing/ComboBoxEditor.h
deleted file mode 100644
index 14f0d457471..00000000000
--- a/libjava/javax/swing/ComboBoxEditor.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ComboBoxEditor__
-#define __javax_swing_ComboBoxEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxEditor;
-    }
-  }
-}
-
-class javax::swing::ComboBoxEditor : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getEditorComponent() = 0;
-  virtual void setItem(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getItem() = 0;
-  virtual void selectAll() = 0;
-  virtual void addActionListener(::java::awt::event::ActionListener *) = 0;
-  virtual void removeActionListener(::java::awt::event::ActionListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ComboBoxEditor__
diff --git a/libjava/javax/swing/ComboBoxModel.h b/libjava/javax/swing/ComboBoxModel.h
deleted file mode 100644
index 0fd38ea13f2..00000000000
--- a/libjava/javax/swing/ComboBoxModel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ComboBoxModel__
-#define __javax_swing_ComboBoxModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxModel;
-      namespace event
-      {
-          class ListDataListener;
-      }
-    }
-  }
-}
-
-class javax::swing::ComboBoxModel : public ::java::lang::Object
-{
-
-public:
-  virtual void setSelectedItem(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getSelectedItem() = 0;
-  virtual jint getSize() = 0;
-  virtual ::java::lang::Object * getElementAt(jint) = 0;
-  virtual void addListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  virtual void removeListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ComboBoxModel__
diff --git a/libjava/javax/swing/CompatibilityFocusTraversalPolicy.h b/libjava/javax/swing/CompatibilityFocusTraversalPolicy.h
deleted file mode 100644
index 46fcc805157..00000000000
--- a/libjava/javax/swing/CompatibilityFocusTraversalPolicy.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_CompatibilityFocusTraversalPolicy__
-#define __javax_swing_CompatibilityFocusTraversalPolicy__
-
-#pragma interface
-
-#include <java/awt/FocusTraversalPolicy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class FocusTraversalPolicy;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class CompatibilityFocusTraversalPolicy;
-    }
-  }
-}
-
-class javax::swing::CompatibilityFocusTraversalPolicy : public ::java::awt::FocusTraversalPolicy
-{
-
-public: // actually package-private
-  CompatibilityFocusTraversalPolicy(::java::awt::FocusTraversalPolicy *);
-public:
-  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getDefaultComponent(::java::awt::Container *);
-public: // actually package-private
-  virtual void setNextFocusableComponent(::java::awt::Component *, ::java::awt::Component *);
-  virtual void addNextFocusableComponent(::java::awt::Component *, ::java::awt::Component *);
-  virtual void removeNextFocusableComponent(::java::awt::Component *, ::java::awt::Component *);
-private:
-  ::java::awt::FocusTraversalPolicy * __attribute__((aligned(__alignof__( ::java::awt::FocusTraversalPolicy)))) fallback;
-  ::java::util::HashMap * forward;
-  ::java::util::HashMap * backward;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_CompatibilityFocusTraversalPolicy__
diff --git a/libjava/javax/swing/ComponentInputMap.h b/libjava/javax/swing/ComponentInputMap.h
deleted file mode 100644
index e0ec4e94636..00000000000
--- a/libjava/javax/swing/ComponentInputMap.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ComponentInputMap__
-#define __javax_swing_ComponentInputMap__
-
-#pragma interface
-
-#include <javax/swing/InputMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComponentInputMap;
-        class InputMap;
-        class JComponent;
-        class KeyStroke;
-    }
-  }
-}
-
-class javax::swing::ComponentInputMap : public ::javax::swing::InputMap
-{
-
-public:
-  ComponentInputMap(::javax::swing::JComponent *);
-  virtual void put(::javax::swing::KeyStroke *, ::java::lang::Object *);
-  virtual void clear();
-  virtual void remove(::javax::swing::KeyStroke *);
-  virtual void setParent(::javax::swing::InputMap *);
-  virtual ::javax::swing::JComponent * getComponent();
-private:
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::javax::swing::InputMap)))) component;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ComponentInputMap__
diff --git a/libjava/javax/swing/DebugGraphics.h b/libjava/javax/swing/DebugGraphics.h
deleted file mode 100644
index c21460f6d96..00000000000
--- a/libjava/javax/swing/DebugGraphics.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DebugGraphics__
-#define __javax_swing_DebugGraphics__
-
-#pragma interface
-
-#include <java/awt/Graphics.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Image;
-        class Rectangle;
-        class Shape;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-    namespace text
-    {
-        class AttributedCharacterIterator;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DebugGraphics;
-        class JComponent;
-    }
-  }
-}
-
-class javax::swing::DebugGraphics : public ::java::awt::Graphics
-{
-
-public:
-  DebugGraphics();
-  DebugGraphics(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  DebugGraphics(::java::awt::Graphics *);
-  virtual void setColor(::java::awt::Color *);
-  virtual ::java::awt::Graphics * create();
-  virtual ::java::awt::Graphics * create(jint, jint, jint, jint);
-  static ::java::awt::Color * flashColor();
-  static void setFlashColor(::java::awt::Color *);
-  static jint flashTime();
-  static void setFlashTime(jint);
-  static jint flashCount();
-  static void setFlashCount(jint);
-  static ::java::io::PrintStream * logStream();
-  static void setLogStream(::java::io::PrintStream *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::Color * getColor();
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual void translate(jint, jint);
-  virtual void setPaintMode();
-  virtual void setXORMode(::java::awt::Color *);
-  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 *);
-private:
-  void sleep(jint);
-public:
-  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 drawLine(jint, jint, jint, jint);
-  virtual void draw3DRect(jint, jint, jint, jint, jboolean);
-  virtual void fill3DRect(jint, jint, jint, jint, jboolean);
-  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 drawString(::java::lang::String *, jint, jint);
-  virtual void drawString(::java::text::AttributedCharacterIterator *, jint, jint);
-  virtual void drawBytes(JArray< jbyte > *, jint, jint, jint, jint);
-  virtual void drawChars(JArray< jchar > *, jint, jint, 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 copyArea(jint, jint, jint, jint, jint, jint);
-  virtual void dispose();
-  virtual jboolean isDrawingBuffer();
-  virtual void setDebugOptions(jint);
-  virtual jint getDebugOptions();
-private:
-  ::java::lang::String * prefix();
-public:
-  static const jint LOG_OPTION = 1;
-  static const jint FLASH_OPTION = 2;
-  static const jint BUFFERED_OPTION = 4;
-  static const jint NONE_OPTION = -1;
-public: // actually package-private
-  static ::java::awt::Color * debugFlashColor;
-  static jint debugFlashCount;
-  static jint debugFlashTime;
-  static ::java::io::PrintStream * debugLogStream;
-  static jint counter;
-  ::java::awt::Graphics * __attribute__((aligned(__alignof__( ::java::awt::Graphics)))) graphics;
-  ::java::awt::Image * buffer;
-  jint debugOptions;
-  jint graphicsID;
-  jint xOffset;
-  jint yOffset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DebugGraphics__
diff --git a/libjava/javax/swing/DefaultBoundedRangeModel.h b/libjava/javax/swing/DefaultBoundedRangeModel.h
deleted file mode 100644
index 61d780d7a4a..00000000000
--- a/libjava/javax/swing/DefaultBoundedRangeModel.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultBoundedRangeModel__
-#define __javax_swing_DefaultBoundedRangeModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultBoundedRangeModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::DefaultBoundedRangeModel : public ::java::lang::Object
-{
-
-public:
-  DefaultBoundedRangeModel();
-  DefaultBoundedRangeModel(jint, jint, jint, jint);
-  virtual ::java::lang::String * toString();
-  virtual jint getValue();
-  virtual void setValue(jint);
-  virtual jint getExtent();
-  virtual void setExtent(jint);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-  virtual void setRangeProperties(jint, jint, jint, jint, jboolean);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = 5034068491295259790LL;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  jint value;
-  jint extent;
-  jint minimum;
-  jint maximum;
-  jboolean isAdjusting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultBoundedRangeModel__
diff --git a/libjava/javax/swing/DefaultButtonModel.h b/libjava/javax/swing/DefaultButtonModel.h
deleted file mode 100644
index 735898ddb1c..00000000000
--- a/libjava/javax/swing/DefaultButtonModel.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultButtonModel__
-#define __javax_swing_DefaultButtonModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-          class ItemEvent;
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ButtonGroup;
-        class DefaultButtonModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::DefaultButtonModel : public ::java::lang::Object
-{
-
-public:
-  DefaultButtonModel();
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireItemStateChanged(::java::awt::event::ItemEvent *);
-  virtual void fireActionPerformed(::java::awt::event::ActionEvent *);
-  virtual void fireStateChanged();
-public:
-  virtual jboolean isArmed();
-  virtual void setArmed(jboolean);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual void setPressed(jboolean);
-  virtual jboolean isPressed();
-  virtual void setRollover(jboolean);
-  virtual void setSelected(jboolean);
-  virtual jboolean isSelected();
-  virtual jboolean isRollover();
-  virtual jint getMnemonic();
-  virtual void setMnemonic(jint);
-  virtual void setActionCommand(::java::lang::String *);
-  virtual ::java::lang::String * getActionCommand();
-  virtual void setGroup(::javax::swing::ButtonGroup *);
-  virtual ::javax::swing::ButtonGroup * getGroup();
-private:
-  static const jlong serialVersionUID = -5342609566534980231LL;
-public:
-  static const jint ARMED = 1;
-  static const jint ENABLED = 8;
-  static const jint PRESSED = 4;
-  static const jint ROLLOVER = 16;
-  static const jint SELECTED = 2;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) stateMask;
-  ::javax::swing::event::EventListenerList * listenerList;
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  ::javax::swing::ButtonGroup * group;
-  jint mnemonic;
-  ::java::lang::String * actionCommand;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultButtonModel__
diff --git a/libjava/javax/swing/DefaultCellEditor$EditorDelegate.h b/libjava/javax/swing/DefaultCellEditor$EditorDelegate.h
deleted file mode 100644
index a571c5c5a8c..00000000000
--- a/libjava/javax/swing/DefaultCellEditor$EditorDelegate.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultCellEditor$EditorDelegate__
-#define __javax_swing_DefaultCellEditor$EditorDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultCellEditor;
-        class DefaultCellEditor$EditorDelegate;
-    }
-  }
-}
-
-class javax::swing::DefaultCellEditor$EditorDelegate : public ::java::lang::Object
-{
-
-public: // actually protected
-  DefaultCellEditor$EditorDelegate(::javax::swing::DefaultCellEditor *);
-public:
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getCellEditorValue();
-  virtual jboolean isCellEditable(::java::util::EventObject *);
-  virtual jboolean shouldSelectCell(::java::util::EventObject *);
-  virtual jboolean stopCellEditing();
-  virtual void cancelCellEditing();
-  virtual jboolean startCellEditing(::java::util::EventObject *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  virtual void fireEditingStopped();
-  virtual void fireEditingCanceled();
-private:
-  static const jlong serialVersionUID = -1420007406015481933LL;
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-public: // actually package-private
-  ::javax::swing::DefaultCellEditor * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultCellEditor$EditorDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor$JCheckBoxDelegate.h b/libjava/javax/swing/DefaultCellEditor$JCheckBoxDelegate.h
deleted file mode 100644
index 08ecd3d5939..00000000000
--- a/libjava/javax/swing/DefaultCellEditor$JCheckBoxDelegate.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultCellEditor$JCheckBoxDelegate__
-#define __javax_swing_DefaultCellEditor$JCheckBoxDelegate__
-
-#pragma interface
-
-#include <javax/swing/DefaultCellEditor$EditorDelegate.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultCellEditor;
-        class DefaultCellEditor$JCheckBoxDelegate;
-    }
-  }
-}
-
-class javax::swing::DefaultCellEditor$JCheckBoxDelegate : public ::javax::swing::DefaultCellEditor$EditorDelegate
-{
-
-  DefaultCellEditor$JCheckBoxDelegate(::javax::swing::DefaultCellEditor *);
-public:
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getCellEditorValue();
-public: // actually package-private
-  DefaultCellEditor$JCheckBoxDelegate(::javax::swing::DefaultCellEditor *, ::javax::swing::DefaultCellEditor$JCheckBoxDelegate *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::javax::swing::DefaultCellEditor * __attribute__((aligned(__alignof__( ::javax::swing::DefaultCellEditor$EditorDelegate)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultCellEditor$JCheckBoxDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor$JComboBoxDelegate.h b/libjava/javax/swing/DefaultCellEditor$JComboBoxDelegate.h
deleted file mode 100644
index abfa15cc767..00000000000
--- a/libjava/javax/swing/DefaultCellEditor$JComboBoxDelegate.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultCellEditor$JComboBoxDelegate__
-#define __javax_swing_DefaultCellEditor$JComboBoxDelegate__
-
-#pragma interface
-
-#include <javax/swing/DefaultCellEditor$EditorDelegate.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultCellEditor;
-        class DefaultCellEditor$JComboBoxDelegate;
-    }
-  }
-}
-
-class javax::swing::DefaultCellEditor$JComboBoxDelegate : public ::javax::swing::DefaultCellEditor$EditorDelegate
-{
-
-  DefaultCellEditor$JComboBoxDelegate(::javax::swing::DefaultCellEditor *);
-public:
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getCellEditorValue();
-  virtual jboolean shouldSelectCell(::java::util::EventObject *);
-public: // actually package-private
-  DefaultCellEditor$JComboBoxDelegate(::javax::swing::DefaultCellEditor *, ::javax::swing::DefaultCellEditor$JComboBoxDelegate *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::javax::swing::DefaultCellEditor * __attribute__((aligned(__alignof__( ::javax::swing::DefaultCellEditor$EditorDelegate)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultCellEditor$JComboBoxDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor$JTextFieldDelegate.h b/libjava/javax/swing/DefaultCellEditor$JTextFieldDelegate.h
deleted file mode 100644
index dcaf8f1781e..00000000000
--- a/libjava/javax/swing/DefaultCellEditor$JTextFieldDelegate.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultCellEditor$JTextFieldDelegate__
-#define __javax_swing_DefaultCellEditor$JTextFieldDelegate__
-
-#pragma interface
-
-#include <javax/swing/DefaultCellEditor$EditorDelegate.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultCellEditor;
-        class DefaultCellEditor$JTextFieldDelegate;
-    }
-  }
-}
-
-class javax::swing::DefaultCellEditor$JTextFieldDelegate : public ::javax::swing::DefaultCellEditor$EditorDelegate
-{
-
-  DefaultCellEditor$JTextFieldDelegate(::javax::swing::DefaultCellEditor *);
-public:
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getCellEditorValue();
-public: // actually package-private
-  DefaultCellEditor$JTextFieldDelegate(::javax::swing::DefaultCellEditor *, ::javax::swing::DefaultCellEditor$JTextFieldDelegate *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::javax::swing::DefaultCellEditor * __attribute__((aligned(__alignof__( ::javax::swing::DefaultCellEditor$EditorDelegate)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultCellEditor$JTextFieldDelegate__
diff --git a/libjava/javax/swing/DefaultCellEditor.h b/libjava/javax/swing/DefaultCellEditor.h
deleted file mode 100644
index 0c62413be2d..00000000000
--- a/libjava/javax/swing/DefaultCellEditor.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultCellEditor__
-#define __javax_swing_DefaultCellEditor__
-
-#pragma interface
-
-#include <javax/swing/AbstractCellEditor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultCellEditor;
-        class DefaultCellEditor$EditorDelegate;
-        class JCheckBox;
-        class JComboBox;
-        class JComponent;
-        class JTable;
-        class JTextField;
-        class JTree;
-    }
-  }
-}
-
-class javax::swing::DefaultCellEditor : public ::javax::swing::AbstractCellEditor
-{
-
-public:
-  DefaultCellEditor(::javax::swing::JTextField *);
-  DefaultCellEditor(::javax::swing::JCheckBox *);
-  DefaultCellEditor(::javax::swing::JComboBox *);
-  virtual ::java::awt::Component * getComponent();
-  virtual jint getClickCountToStart();
-  virtual void setClickCountToStart(jint);
-  virtual ::java::lang::Object * getCellEditorValue();
-  virtual jboolean isCellEditable(::java::util::EventObject *);
-  virtual jboolean shouldSelectCell(::java::util::EventObject *);
-  virtual jboolean stopCellEditing();
-  virtual void cancelCellEditing();
-  virtual ::java::awt::Component * getTreeCellEditorComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint);
-  virtual ::java::awt::Component * getTableCellEditorComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jint, jint);
-private:
-  static const jlong serialVersionUID = 3564035141373880027LL;
-public: // actually protected
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::javax::swing::AbstractCellEditor)))) editorComponent;
-  ::javax::swing::DefaultCellEditor$EditorDelegate * delegate;
-  jint clickCountToStart;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultCellEditor__
diff --git a/libjava/javax/swing/DefaultComboBoxModel.h b/libjava/javax/swing/DefaultComboBoxModel.h
deleted file mode 100644
index 9c5e721f750..00000000000
--- a/libjava/javax/swing/DefaultComboBoxModel.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultComboBoxModel__
-#define __javax_swing_DefaultComboBoxModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultComboBoxModel;
-    }
-  }
-}
-
-class javax::swing::DefaultComboBoxModel : public ::javax::swing::AbstractListModel
-{
-
-public:
-  DefaultComboBoxModel();
-  DefaultComboBoxModel(JArray< ::java::lang::Object * > *);
-  DefaultComboBoxModel(::java::util::Vector *);
-  virtual void addElement(::java::lang::Object *);
-  virtual void removeElementAt(jint);
-  virtual void insertElementAt(::java::lang::Object *, jint);
-  virtual void removeElement(::java::lang::Object *);
-  virtual void removeAllElements();
-  virtual jint getSize();
-  virtual void setSelectedItem(::java::lang::Object *);
-  virtual ::java::lang::Object * getSelectedItem();
-  virtual ::java::lang::Object * getElementAt(jint);
-  virtual jint getIndexOf(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 6698657703676921904LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) list;
-  ::java::lang::Object * selectedItem;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultComboBoxModel__
diff --git a/libjava/javax/swing/DefaultDesktopManager.h b/libjava/javax/swing/DefaultDesktopManager.h
deleted file mode 100644
index 2857f0dfbfc..00000000000
--- a/libjava/javax/swing/DefaultDesktopManager.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultDesktopManager__
-#define __javax_swing_DefaultDesktopManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultDesktopManager;
-        class JComponent;
-        class JInternalFrame;
-    }
-  }
-}
-
-class javax::swing::DefaultDesktopManager : public ::java::lang::Object
-{
-
-public:
-  DefaultDesktopManager();
-  virtual void openFrame(::javax::swing::JInternalFrame *);
-  virtual void closeFrame(::javax::swing::JInternalFrame *);
-  virtual void maximizeFrame(::javax::swing::JInternalFrame *);
-  virtual void minimizeFrame(::javax::swing::JInternalFrame *);
-  virtual void iconifyFrame(::javax::swing::JInternalFrame *);
-  virtual void deiconifyFrame(::javax::swing::JInternalFrame *);
-  virtual void activateFrame(::javax::swing::JInternalFrame *);
-  virtual void deactivateFrame(::javax::swing::JInternalFrame *);
-  virtual void beginDraggingFrame(::javax::swing::JComponent *);
-  virtual void dragFrame(::javax::swing::JComponent *, jint, jint);
-  virtual void endDraggingFrame(::javax::swing::JComponent *);
-  virtual void beginResizingFrame(::javax::swing::JComponent *, jint);
-  virtual void resizeFrame(::javax::swing::JComponent *, jint, jint, jint, jint);
-  virtual void endResizingFrame(::javax::swing::JComponent *);
-  virtual void setBoundsForFrame(::javax::swing::JComponent *, jint, jint, jint, jint);
-public: // actually protected
-  virtual void removeIconFor(::javax::swing::JInternalFrame *);
-  virtual ::java::awt::Rectangle * getBoundsForIconOf(::javax::swing::JInternalFrame *);
-  virtual void setPreviousBounds(::javax::swing::JInternalFrame *, ::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * getPreviousBounds(::javax::swing::JInternalFrame *);
-  virtual void setWasIcon(::javax::swing::JInternalFrame *, ::java::lang::Boolean *);
-  virtual jboolean wasIcon(::javax::swing::JInternalFrame *);
-private:
-  static const jlong serialVersionUID = 4657624909838017887LL;
-public: // actually package-private
-  static ::java::lang::String * WAS_ICON_ONCE_PROPERTY;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) currentDragMode;
-  ::java::awt::Rectangle * dragCache;
-  ::java::awt::Container * pane;
-  JArray< ::java::awt::Rectangle * > * iconRects;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultDesktopManager__
diff --git a/libjava/javax/swing/DefaultFocusManager.h b/libjava/javax/swing/DefaultFocusManager.h
deleted file mode 100644
index a1eec270a61..00000000000
--- a/libjava/javax/swing/DefaultFocusManager.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultFocusManager__
-#define __javax_swing_DefaultFocusManager__
-
-#pragma interface
-
-#include <javax/swing/FocusManager.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultFocusManager;
-    }
-  }
-}
-
-class javax::swing::DefaultFocusManager : public ::javax::swing::FocusManager
-{
-
-public:
-  DefaultFocusManager();
-  virtual void processKeyEvent(::java::awt::Component *, ::java::awt::event::KeyEvent *);
-  virtual void focusNextComponent(::java::awt::Component *);
-  virtual void focusPreviousComponent(::java::awt::Component *);
-  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
-  virtual jboolean compareTabOrder(::java::awt::Component *, ::java::awt::Component *);
-private:
-  ::java::util::Stack * __attribute__((aligned(__alignof__( ::javax::swing::FocusManager)))) historyStack;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultFocusManager__
diff --git a/libjava/javax/swing/DefaultListCellRenderer$UIResource.h b/libjava/javax/swing/DefaultListCellRenderer$UIResource.h
deleted file mode 100644
index 91435fb16f6..00000000000
--- a/libjava/javax/swing/DefaultListCellRenderer$UIResource.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultListCellRenderer$UIResource__
-#define __javax_swing_DefaultListCellRenderer$UIResource__
-
-#pragma interface
-
-#include <javax/swing/DefaultListCellRenderer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListCellRenderer$UIResource;
-    }
-  }
-}
-
-class javax::swing::DefaultListCellRenderer$UIResource : public ::javax::swing::DefaultListCellRenderer
-{
-
-public:
-  DefaultListCellRenderer$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultListCellRenderer$UIResource__
diff --git a/libjava/javax/swing/DefaultListCellRenderer.h b/libjava/javax/swing/DefaultListCellRenderer.h
deleted file mode 100644
index 320767aa579..00000000000
--- a/libjava/javax/swing/DefaultListCellRenderer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultListCellRenderer__
-#define __javax_swing_DefaultListCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListCellRenderer;
-        class JList;
-      namespace border
-      {
-          class Border;
-      }
-    }
-  }
-}
-
-class javax::swing::DefaultListCellRenderer : public ::javax::swing::JLabel
-{
-
-public:
-  DefaultListCellRenderer();
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
-  virtual void validate();
-  virtual void revalidate();
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void repaint(::java::awt::Rectangle *);
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void firePropertyChange(::java::lang::String *, jbyte, jbyte);
-  virtual void firePropertyChange(::java::lang::String *, jchar, jchar);
-  virtual void firePropertyChange(::java::lang::String *, jshort, jshort);
-  virtual void firePropertyChange(::java::lang::String *, jint, jint);
-  virtual void firePropertyChange(::java::lang::String *, jlong, jlong);
-  virtual void firePropertyChange(::java::lang::String *, jfloat, jfloat);
-  virtual void firePropertyChange(::java::lang::String *, jdouble, jdouble);
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-private:
-  static const jlong serialVersionUID = 7708947179685189462LL;
-public: // actually protected
-  static ::javax::swing::border::Border * noFocusBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultListCellRenderer__
diff --git a/libjava/javax/swing/DefaultListModel.h b/libjava/javax/swing/DefaultListModel.h
deleted file mode 100644
index 67ca91bdc51..00000000000
--- a/libjava/javax/swing/DefaultListModel.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultListModel__
-#define __javax_swing_DefaultListModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListModel;
-    }
-  }
-}
-
-class javax::swing::DefaultListModel : public ::javax::swing::AbstractListModel
-{
-
-public:
-  DefaultListModel();
-  virtual ::java::lang::Object * elementAt(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint indexOf(::java::lang::Object *);
-  virtual jint indexOf(::java::lang::Object *, jint);
-  virtual jint lastIndexOf(::java::lang::Object *);
-  virtual jint lastIndexOf(::java::lang::Object *, jint);
-  virtual ::java::lang::Object * get(jint);
-  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
-  virtual void add(jint, ::java::lang::Object *);
-  virtual void addElement(::java::lang::Object *);
-  virtual jint size();
-  virtual JArray< ::java::lang::Object * > * toArray();
-  virtual jboolean contains(::java::lang::Object *);
-  virtual void copyInto(JArray< ::java::lang::Object * > *);
-  virtual void clear();
-  virtual ::java::lang::Object * remove(jint);
-  virtual jboolean isEmpty();
-  virtual ::java::util::Enumeration * elements();
-  virtual void trimToSize();
-  virtual void ensureCapacity(jint);
-  virtual void setSize(jint);
-  virtual jint capacity();
-  virtual ::java::lang::Object * firstElement();
-  virtual ::java::lang::Object * lastElement();
-  virtual void setElementAt(::java::lang::Object *, jint);
-  virtual void removeElementAt(jint);
-  virtual void insertElementAt(::java::lang::Object *, jint);
-  virtual jboolean removeElement(::java::lang::Object *);
-  virtual void removeAllElements();
-  virtual void removeRange(jint, jint);
-  virtual jint getSize();
-  virtual ::java::lang::Object * getElementAt(jint);
-private:
-  static const jlong serialVersionUID = 2315945659722172272LL;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) elements__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultListModel__
diff --git a/libjava/javax/swing/DefaultListSelectionModel.h b/libjava/javax/swing/DefaultListSelectionModel.h
deleted file mode 100644
index 0a0ed22a363..00000000000
--- a/libjava/javax/swing/DefaultListSelectionModel.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultListSelectionModel__
-#define __javax_swing_DefaultListSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListSelectionModel;
-      namespace event
-      {
-          class EventListenerList;
-          class ListSelectionListener;
-      }
-    }
-  }
-}
-
-class javax::swing::DefaultListSelectionModel : public ::java::lang::Object
-{
-
-public:
-  DefaultListSelectionModel();
-  virtual jint getSelectionMode();
-  virtual void setSelectionMode(jint);
-  virtual jint getAnchorSelectionIndex();
-  virtual void setAnchorSelectionIndex(jint);
-  virtual jint getLeadSelectionIndex();
-  virtual void setLeadSelectionIndex(jint);
-  virtual void moveLeadSelectionIndex(jint);
-  virtual jboolean isLeadAnchorNotificationEnabled();
-  virtual void setLeadAnchorNotificationEnabled(jboolean);
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-  virtual jboolean isSelectionEmpty();
-  virtual jint getMinSelectionIndex();
-  virtual jint getMaxSelectionIndex();
-  virtual jboolean isSelectedIndex(jint);
-  virtual void addSelectionInterval(jint, jint);
-  virtual void removeSelectionInterval(jint, jint);
-  virtual void clearSelection();
-private:
-  void fireDifference(::java::util::BitSet *, ::java::util::BitSet *);
-public:
-  virtual void setSelectionInterval(jint, jint);
-  virtual void insertIndexInterval(jint, jint, jboolean);
-  virtual void removeIndexInterval(jint, jint);
-public: // actually protected
-  virtual void fireValueChanged(jboolean);
-  virtual void fireValueChanged(jint, jint);
-  virtual void fireValueChanged(jint, jint, jboolean);
-public:
-  virtual void addListSelectionListener(::javax::swing::event::ListSelectionListener *);
-  virtual void removeListSelectionListener(::javax::swing::event::ListSelectionListener *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ListSelectionListener * > * getListSelectionListeners();
-  virtual ::java::lang::Object * clone();
-private:
-  static const jlong serialVersionUID = -5718799865110415860LL;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-public: // actually package-private
-  jint selectionMode;
-  jint leadSelectionIndex;
-  jint anchorSelectionIndex;
-public: // actually protected
-  jboolean leadAnchorNotificationEnabled;
-public: // actually package-private
-  jboolean valueIsAdjusting;
-  ::java::util::BitSet * sel;
-  ::java::lang::Object * oldSel;
-  jboolean setLeadCalledFromAdd;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultListSelectionModel__
diff --git a/libjava/javax/swing/DefaultSingleSelectionModel.h b/libjava/javax/swing/DefaultSingleSelectionModel.h
deleted file mode 100644
index 8ea8f8e796d..00000000000
--- a/libjava/javax/swing/DefaultSingleSelectionModel.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DefaultSingleSelectionModel__
-#define __javax_swing_DefaultSingleSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultSingleSelectionModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::DefaultSingleSelectionModel : public ::java::lang::Object
-{
-
-public:
-  DefaultSingleSelectionModel();
-  virtual jint getSelectedIndex();
-  virtual void setSelectedIndex(jint);
-  virtual void clearSelection();
-  virtual jboolean isSelected();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-private:
-  static const jlong serialVersionUID = 3676229404753786004LL;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_DefaultSingleSelectionModel__
diff --git a/libjava/javax/swing/DesktopManager.h b/libjava/javax/swing/DesktopManager.h
deleted file mode 100644
index 7981bdbb5aa..00000000000
--- a/libjava/javax/swing/DesktopManager.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_DesktopManager__
-#define __javax_swing_DesktopManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DesktopManager;
-        class JComponent;
-        class JInternalFrame;
-    }
-  }
-}
-
-class javax::swing::DesktopManager : public ::java::lang::Object
-{
-
-public:
-  virtual void openFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void closeFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void maximizeFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void minimizeFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void iconifyFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void deiconifyFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void activateFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void deactivateFrame(::javax::swing::JInternalFrame *) = 0;
-  virtual void beginDraggingFrame(::javax::swing::JComponent *) = 0;
-  virtual void dragFrame(::javax::swing::JComponent *, jint, jint) = 0;
-  virtual void endDraggingFrame(::javax::swing::JComponent *) = 0;
-  virtual void beginResizingFrame(::javax::swing::JComponent *, jint) = 0;
-  virtual void resizeFrame(::javax::swing::JComponent *, jint, jint, jint, jint) = 0;
-  virtual void endResizingFrame(::javax::swing::JComponent *) = 0;
-  virtual void setBoundsForFrame(::javax::swing::JComponent *, jint, jint, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_DesktopManager__
diff --git a/libjava/javax/swing/FocusManager$WrappingFocusManager.h b/libjava/javax/swing/FocusManager$WrappingFocusManager.h
deleted file mode 100644
index 6ff193c5359..00000000000
--- a/libjava/javax/swing/FocusManager$WrappingFocusManager.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_FocusManager$WrappingFocusManager__
-#define __javax_swing_FocusManager$WrappingFocusManager__
-
-#pragma interface
-
-#include <javax/swing/FocusManager.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-        class Component;
-        class Container;
-        class FocusTraversalPolicy;
-        class KeyEventDispatcher;
-        class KeyEventPostProcessor;
-        class KeyboardFocusManager;
-        class Window;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class VetoableChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class FocusManager$WrappingFocusManager;
-    }
-  }
-}
-
-class javax::swing::FocusManager$WrappingFocusManager : public ::javax::swing::FocusManager
-{
-
-public: // actually package-private
-  FocusManager$WrappingFocusManager(::java::awt::KeyboardFocusManager *);
-public:
-  virtual jboolean dispatchEvent(::java::awt::AWTEvent *);
-  virtual jboolean dispatchKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void downFocusCycle(::java::awt::Container *);
-  virtual void upFocusCycle(::java::awt::Container *);
-  virtual void focusNextComponent(::java::awt::Component *);
-  virtual void focusPreviousComponent(::java::awt::Component *);
-  virtual jboolean postProcessKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processKeyEvent(::java::awt::Component *, ::java::awt::event::KeyEvent *);
-  virtual void addKeyEventDispatcher(::java::awt::KeyEventDispatcher *);
-  virtual void addKeyEventPostProcessor(::java::awt::KeyEventPostProcessor *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void addPropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void addVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual void addVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual void clearGlobalFocusOwner();
-  virtual ::java::awt::Window * getActiveWindow();
-  virtual ::java::awt::Container * getCurrentFocusCycleRoot();
-  virtual ::java::util::Set * getDefaultFocusTraversalKeys(jint);
-  virtual ::java::awt::FocusTraversalPolicy * getDefaultFocusTraversalPolicy();
-  virtual ::java::awt::Window * getFocusedWindow();
-  virtual ::java::awt::Component * getFocusOwner();
-  virtual ::java::awt::Component * getPermanentFocusOwner();
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners(::java::lang::String *);
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners();
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners(::java::lang::String *);
-  virtual void removeKeyEventDispatcher(::java::awt::KeyEventDispatcher *);
-  virtual void removeKeyEventPostProcessor(::java::awt::KeyEventPostProcessor *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::lang::String *, ::java::beans::PropertyChangeListener *);
-  virtual void removeVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual void removeVetoableChangeListener(::java::lang::String *, ::java::beans::VetoableChangeListener *);
-  virtual void setDefaultFocusTraversalKeys(jint, ::java::util::Set *);
-  virtual void setDefaultFocusTraversalPolicy(::java::awt::FocusTraversalPolicy *);
-  virtual void setGlobalCurrentFocusCycleRoot(::java::awt::Container *);
-private:
-  ::java::awt::KeyboardFocusManager * __attribute__((aligned(__alignof__( ::javax::swing::FocusManager)))) wrapped;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_FocusManager$WrappingFocusManager__
diff --git a/libjava/javax/swing/FocusManager.h b/libjava/javax/swing/FocusManager.h
deleted file mode 100644
index 0bf93943890..00000000000
--- a/libjava/javax/swing/FocusManager.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_FocusManager__
-#define __javax_swing_FocusManager__
-
-#pragma interface
-
-#include <java/awt/DefaultKeyboardFocusManager.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class FocusManager;
-    }
-  }
-}
-
-class javax::swing::FocusManager : public ::java::awt::DefaultKeyboardFocusManager
-{
-
-public:
-  FocusManager();
-  static ::javax::swing::FocusManager * getCurrentManager();
-  static void setCurrentManager(::javax::swing::FocusManager *);
-  static void disableSwingFocusManager();
-  static jboolean isFocusManagerEnabled();
-  static ::java::lang::String * FOCUS_MANAGER_CLASS_PROPERTY;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_FocusManager__
diff --git a/libjava/javax/swing/GrayFilter.h b/libjava/javax/swing/GrayFilter.h
deleted file mode 100644
index 436c3763a42..00000000000
--- a/libjava/javax/swing/GrayFilter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_GrayFilter__
-#define __javax_swing_GrayFilter__
-
-#pragma interface
-
-#include <java/awt/image/RGBImageFilter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class GrayFilter;
-    }
-  }
-}
-
-class javax::swing::GrayFilter : public ::java::awt::image::RGBImageFilter
-{
-
-public:
-  GrayFilter(jboolean, jint);
-  static ::java::awt::Image * createDisabledImage(::java::awt::Image *);
-  virtual jint filterRGB(jint, jint, jint);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::image::RGBImageFilter)))) b;
-  jdouble p;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_GrayFilter__
diff --git a/libjava/javax/swing/Icon.h b/libjava/javax/swing/Icon.h
deleted file mode 100644
index 7ab6cfe4d21..00000000000
--- a/libjava/javax/swing/Icon.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Icon__
-#define __javax_swing_Icon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-    }
-  }
-}
-
-class javax::swing::Icon : public ::java::lang::Object
-{
-
-public:
-  virtual jint getIconHeight() = 0;
-  virtual jint getIconWidth() = 0;
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_Icon__
diff --git a/libjava/javax/swing/ImageIcon$1.h b/libjava/javax/swing/ImageIcon$1.h
deleted file mode 100644
index 529be408a28..00000000000
--- a/libjava/javax/swing/ImageIcon$1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ImageIcon$1__
-#define __javax_swing_ImageIcon$1__
-
-#pragma interface
-
-#include <java/awt/Component.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ImageIcon$1;
-    }
-  }
-}
-
-class javax::swing::ImageIcon$1 : public ::java::awt::Component
-{
-
-public: // actually package-private
-  ImageIcon$1();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ImageIcon$1__
diff --git a/libjava/javax/swing/ImageIcon$AccessibleImageIcon.h b/libjava/javax/swing/ImageIcon$AccessibleImageIcon.h
deleted file mode 100644
index 05d2323e283..00000000000
--- a/libjava/javax/swing/ImageIcon$AccessibleImageIcon.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ImageIcon$AccessibleImageIcon__
-#define __javax_swing_ImageIcon$AccessibleImageIcon__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class ImageIcon;
-        class ImageIcon$AccessibleImageIcon;
-    }
-  }
-}
-
-class javax::swing::ImageIcon$AccessibleImageIcon : public ::javax::accessibility::AccessibleContext
-{
-
-public: // actually protected
-  ImageIcon$AccessibleImageIcon(::javax::swing::ImageIcon *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::Accessible * getAccessibleParent();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-  virtual ::java::lang::String * getAccessibleIconDescription();
-  virtual void setAccessibleIconDescription(::java::lang::String *);
-  virtual jint getAccessibleIconHeight();
-  virtual jint getAccessibleIconWidth();
-private:
-  static const jlong serialVersionUID = 2113430526551336564LL;
-public: // actually package-private
-  ::javax::swing::ImageIcon * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ImageIcon$AccessibleImageIcon__
diff --git a/libjava/javax/swing/ImageIcon.h b/libjava/javax/swing/ImageIcon.h
deleted file mode 100644
index 4e3d8d90273..00000000000
--- a/libjava/javax/swing/ImageIcon.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ImageIcon__
-#define __javax_swing_ImageIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Image;
-        class MediaTracker;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class ImageIcon;
-    }
-  }
-}
-
-class javax::swing::ImageIcon : public ::java::lang::Object
-{
-
-public:
-  ImageIcon();
-  ImageIcon(::java::lang::String *);
-  ImageIcon(::java::lang::String *, ::java::lang::String *);
-  ImageIcon(JArray< jbyte > *);
-  ImageIcon(JArray< jbyte > *, ::java::lang::String *);
-  ImageIcon(::java::net::URL *);
-  ImageIcon(::java::net::URL *, ::java::lang::String *);
-  ImageIcon(::java::awt::Image *);
-  ImageIcon(::java::awt::Image *, ::java::lang::String *);
-  virtual ::java::awt::image::ImageObserver * getImageObserver();
-  virtual void setImageObserver(::java::awt::image::ImageObserver *);
-  virtual ::java::awt::Image * getImage();
-  virtual void setImage(::java::awt::Image *);
-  virtual ::java::lang::String * getDescription();
-  virtual void setDescription(::java::lang::String *);
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually protected
-  virtual void loadImage(::java::awt::Image *);
-public:
-  virtual jint getImageLoadStatus();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 532615968316031794LL;
-public: // actually protected
-  static ::java::awt::Component * component;
-  static ::java::awt::MediaTracker * tracker;
-private:
-  static jint id;
-public: // actually package-private
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
-  ::java::lang::String * description;
-  ::java::awt::image::ImageObserver * observer;
-private:
-  jint loadStatus;
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ImageIcon__
diff --git a/libjava/javax/swing/InputMap.h b/libjava/javax/swing/InputMap.h
deleted file mode 100644
index 5846eeb25af..00000000000
--- a/libjava/javax/swing/InputMap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_InputMap__
-#define __javax_swing_InputMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class InputMap;
-        class KeyStroke;
-    }
-  }
-}
-
-class javax::swing::InputMap : public ::java::lang::Object
-{
-
-public:
-  InputMap();
-  virtual ::java::lang::Object * get(::javax::swing::KeyStroke *);
-  virtual void put(::javax::swing::KeyStroke *, ::java::lang::Object *);
-  virtual void remove(::javax::swing::KeyStroke *);
-  virtual ::javax::swing::InputMap * getParent();
-  virtual void setParent(::javax::swing::InputMap *);
-  virtual jint size();
-  virtual void clear();
-  virtual JArray< ::javax::swing::KeyStroke * > * keys();
-  virtual JArray< ::javax::swing::KeyStroke * > * allKeys();
-private:
-  static const jlong serialVersionUID = -5429059542008604257LL;
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) inputMap;
-  ::javax::swing::InputMap * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_InputMap__
diff --git a/libjava/javax/swing/InputVerifier.h b/libjava/javax/swing/InputVerifier.h
deleted file mode 100644
index 986647e1bb3..00000000000
--- a/libjava/javax/swing/InputVerifier.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_InputVerifier__
-#define __javax_swing_InputVerifier__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class InputVerifier;
-        class JComponent;
-    }
-  }
-}
-
-class javax::swing::InputVerifier : public ::java::lang::Object
-{
-
-public:
-  InputVerifier();
-  virtual jboolean verify(::javax::swing::JComponent *) = 0;
-  virtual jboolean shouldYieldFocus(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_InputVerifier__
diff --git a/libjava/javax/swing/InternalFrameFocusTraversalPolicy.h b/libjava/javax/swing/InternalFrameFocusTraversalPolicy.h
deleted file mode 100644
index 4573093d46d..00000000000
--- a/libjava/javax/swing/InternalFrameFocusTraversalPolicy.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_InternalFrameFocusTraversalPolicy__
-#define __javax_swing_InternalFrameFocusTraversalPolicy__
-
-#pragma interface
-
-#include <java/awt/FocusTraversalPolicy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class InternalFrameFocusTraversalPolicy;
-        class JInternalFrame;
-    }
-  }
-}
-
-class javax::swing::InternalFrameFocusTraversalPolicy : public ::java::awt::FocusTraversalPolicy
-{
-
-public:
-  InternalFrameFocusTraversalPolicy();
-  virtual ::java::awt::Component * getInitialComponent(::javax::swing::JInternalFrame *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_InternalFrameFocusTraversalPolicy__
diff --git a/libjava/javax/swing/JApplet$AccessibleJApplet.h b/libjava/javax/swing/JApplet$AccessibleJApplet.h
deleted file mode 100644
index d6aea498e1d..00000000000
--- a/libjava/javax/swing/JApplet$AccessibleJApplet.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JApplet$AccessibleJApplet__
-#define __javax_swing_JApplet$AccessibleJApplet__
-
-#pragma interface
-
-#include <java/applet/Applet$AccessibleApplet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JApplet;
-        class JApplet$AccessibleJApplet;
-    }
-  }
-}
-
-class javax::swing::JApplet$AccessibleJApplet : public ::java::applet::Applet$AccessibleApplet
-{
-
-public: // actually protected
-  JApplet$AccessibleJApplet(::javax::swing::JApplet *);
-public: // actually package-private
-  ::javax::swing::JApplet * __attribute__((aligned(__alignof__( ::java::applet::Applet$AccessibleApplet)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JApplet$AccessibleJApplet__
diff --git a/libjava/javax/swing/JApplet.h b/libjava/javax/swing/JApplet.h
deleted file mode 100644
index 16cdbcf69da..00000000000
--- a/libjava/javax/swing/JApplet.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JApplet__
-#define __javax_swing_JApplet__
-
-#pragma interface
-
-#include <java/applet/Applet.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Graphics;
-        class LayoutManager;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JApplet;
-        class JLayeredPane;
-        class JMenuBar;
-        class JRootPane;
-    }
-  }
-}
-
-class javax::swing::JApplet : public ::java::applet::Applet
-{
-
-public:
-  JApplet();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual ::javax::swing::JRootPane * getRootPane();
-public: // actually protected
-  virtual void setRootPane(::javax::swing::JRootPane *);
-  virtual ::javax::swing::JRootPane * createRootPane();
-public:
-  virtual ::java::awt::Container * getContentPane();
-  virtual void setContentPane(::java::awt::Container *);
-  virtual ::java::awt::Component * getGlassPane();
-  virtual void setGlassPane(::java::awt::Component *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::JMenuBar * getJMenuBar();
-  virtual void setJMenuBar(::javax::swing::JMenuBar *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  virtual void remove(::java::awt::Component *);
-public: // actually protected
-  virtual jboolean isRootPaneCheckingEnabled();
-  virtual void setRootPaneCheckingEnabled(jboolean);
-public:
-  virtual void update(::java::awt::Graphics *);
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::applet::Applet)))) accessibleContext;
-private:
-  static const jlong serialVersionUID = 7269359214497372587LL;
-public: // actually protected
-  ::javax::swing::JRootPane * rootPane;
-  jboolean rootPaneCheckingEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JApplet__
diff --git a/libjava/javax/swing/JButton$AccessibleJButton.h b/libjava/javax/swing/JButton$AccessibleJButton.h
deleted file mode 100644
index b8f0f3ed85a..00000000000
--- a/libjava/javax/swing/JButton$AccessibleJButton.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JButton$AccessibleJButton__
-#define __javax_swing_JButton$AccessibleJButton__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton$AccessibleAbstractButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JButton;
-        class JButton$AccessibleJButton;
-    }
-  }
-}
-
-class javax::swing::JButton$AccessibleJButton : public ::javax::swing::AbstractButton$AccessibleAbstractButton
-{
-
-public: // actually protected
-  JButton$AccessibleJButton(::javax::swing::JButton *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JButton * __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton$AccessibleAbstractButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JButton$AccessibleJButton__
diff --git a/libjava/javax/swing/JButton.h b/libjava/javax/swing/JButton.h
deleted file mode 100644
index a151bae8a8a..00000000000
--- a/libjava/javax/swing/JButton.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JButton__
-#define __javax_swing_JButton__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JButton;
-    }
-  }
-}
-
-class javax::swing::JButton : public ::javax::swing::AbstractButton
-{
-
-public:
-  JButton();
-  JButton(::javax::swing::Action *);
-  JButton(::javax::swing::Icon *);
-  JButton(::java::lang::String *);
-  JButton(::java::lang::String *, ::javax::swing::Icon *);
-public: // actually protected
-  virtual void configurePropertiesFromAction(::javax::swing::Action *);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jboolean isDefaultButton();
-  virtual jboolean isDefaultCapable();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void removeNotify();
-  virtual void setDefaultCapable(jboolean);
-  virtual void updateUI();
-private:
-  static const jlong serialVersionUID = -1907255238954382202LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton)))) defaultCapable;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JButton__
diff --git a/libjava/javax/swing/JCheckBox$AccessibleJCheckBox.h b/libjava/javax/swing/JCheckBox$AccessibleJCheckBox.h
deleted file mode 100644
index 34d711e395f..00000000000
--- a/libjava/javax/swing/JCheckBox$AccessibleJCheckBox.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JCheckBox$AccessibleJCheckBox__
-#define __javax_swing_JCheckBox$AccessibleJCheckBox__
-
-#pragma interface
-
-#include <javax/swing/JToggleButton$AccessibleJToggleButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JCheckBox;
-        class JCheckBox$AccessibleJCheckBox;
-    }
-  }
-}
-
-class javax::swing::JCheckBox$AccessibleJCheckBox : public ::javax::swing::JToggleButton$AccessibleJToggleButton
-{
-
-public: // actually protected
-  JCheckBox$AccessibleJCheckBox(::javax::swing::JCheckBox *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JCheckBox * __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton$AccessibleJToggleButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JCheckBox$AccessibleJCheckBox__
diff --git a/libjava/javax/swing/JCheckBox.h b/libjava/javax/swing/JCheckBox.h
deleted file mode 100644
index b57d5c1671b..00000000000
--- a/libjava/javax/swing/JCheckBox.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JCheckBox__
-#define __javax_swing_JCheckBox__
-
-#pragma interface
-
-#include <javax/swing/JToggleButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JCheckBox;
-    }
-  }
-}
-
-class javax::swing::JCheckBox : public ::javax::swing::JToggleButton
-{
-
-  void init();
-public:
-  JCheckBox();
-  JCheckBox(::javax::swing::Action *);
-  JCheckBox(::javax::swing::Icon *);
-  JCheckBox(::javax::swing::Icon *, jboolean);
-  JCheckBox(::java::lang::String *);
-  JCheckBox(::java::lang::String *, jboolean);
-  JCheckBox(::java::lang::String *, ::javax::swing::Icon *);
-  JCheckBox(::java::lang::String *, ::javax::swing::Icon *, jboolean);
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual jboolean isBorderPaintedFlat();
-  virtual void setBorderPaintedFlat(jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -5246739313864538930LL;
-public:
-  static ::java::lang::String * BORDER_PAINTED_FLAT_CHANGED_PROPERTY;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton)))) borderPaintedFlat;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JCheckBox__
diff --git a/libjava/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.h b/libjava/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.h
deleted file mode 100644
index 5508976090a..00000000000
--- a/libjava/javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem__
-#define __javax_swing_JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem$AccessibleJMenuItem.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JCheckBoxMenuItem;
-        class JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem;
-    }
-  }
-}
-
-class javax::swing::JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem : public ::javax::swing::JMenuItem$AccessibleJMenuItem
-{
-
-public: // actually protected
-  JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem(::javax::swing::JCheckBoxMenuItem *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 1079958073579370777LL;
-public: // actually package-private
-  ::javax::swing::JCheckBoxMenuItem * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem$AccessibleJMenuItem)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem__
diff --git a/libjava/javax/swing/JCheckBoxMenuItem.h b/libjava/javax/swing/JCheckBoxMenuItem.h
deleted file mode 100644
index fcb3355228c..00000000000
--- a/libjava/javax/swing/JCheckBoxMenuItem.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JCheckBoxMenuItem__
-#define __javax_swing_JCheckBoxMenuItem__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JCheckBoxMenuItem;
-    }
-  }
-}
-
-class javax::swing::JCheckBoxMenuItem : public ::javax::swing::JMenuItem
-{
-
-public:
-  JCheckBoxMenuItem();
-  JCheckBoxMenuItem(::javax::swing::Icon *);
-  JCheckBoxMenuItem(::java::lang::String *);
-  JCheckBoxMenuItem(::javax::swing::Action *);
-  JCheckBoxMenuItem(::java::lang::String *, ::javax::swing::Icon *);
-  JCheckBoxMenuItem(::java::lang::String *, jboolean);
-  JCheckBoxMenuItem(::java::lang::String *, ::javax::swing::Icon *, jboolean);
-  virtual ::java::lang::String * getUIClassID();
-  virtual jboolean getState();
-  virtual void setState(jboolean);
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual void requestFocus();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -6676402307973384715LL;
-  static ::java::lang::String * uiClassID;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem)))) state;
-  JArray< ::java::lang::Object * > * selectedObjects;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JCheckBoxMenuItem__
diff --git a/libjava/javax/swing/JColorChooser$AccessibleJColorChooser.h b/libjava/javax/swing/JColorChooser$AccessibleJColorChooser.h
deleted file mode 100644
index 6a4ecf7318d..00000000000
--- a/libjava/javax/swing/JColorChooser$AccessibleJColorChooser.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JColorChooser$AccessibleJColorChooser__
-#define __javax_swing_JColorChooser$AccessibleJColorChooser__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JColorChooser;
-        class JColorChooser$AccessibleJColorChooser;
-    }
-  }
-}
-
-class javax::swing::JColorChooser$AccessibleJColorChooser : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JColorChooser$AccessibleJColorChooser(::javax::swing::JColorChooser *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -2038297864782299082LL;
-public: // actually package-private
-  ::javax::swing::JColorChooser * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JColorChooser$AccessibleJColorChooser__
diff --git a/libjava/javax/swing/JColorChooser$DefaultOKCancelListener.h b/libjava/javax/swing/JColorChooser$DefaultOKCancelListener.h
deleted file mode 100644
index 0b2093c2dee..00000000000
--- a/libjava/javax/swing/JColorChooser$DefaultOKCancelListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JColorChooser$DefaultOKCancelListener__
-#define __javax_swing_JColorChooser$DefaultOKCancelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JColorChooser$DefaultOKCancelListener;
-        class JDialog;
-    }
-  }
-}
-
-class javax::swing::JColorChooser$DefaultOKCancelListener : public ::java::lang::Object
-{
-
-public:
-  JColorChooser$DefaultOKCancelListener(::javax::swing::JDialog *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::javax::swing::JDialog * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dialog;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JColorChooser$DefaultOKCancelListener__
diff --git a/libjava/javax/swing/JColorChooser$DefaultResetListener.h b/libjava/javax/swing/JColorChooser$DefaultResetListener.h
deleted file mode 100644
index 4167cbbcf5f..00000000000
--- a/libjava/javax/swing/JColorChooser$DefaultResetListener.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JColorChooser$DefaultResetListener__
-#define __javax_swing_JColorChooser$DefaultResetListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JColorChooser;
-        class JColorChooser$DefaultResetListener;
-    }
-  }
-}
-
-class javax::swing::JColorChooser$DefaultResetListener : public ::java::lang::Object
-{
-
-public:
-  JColorChooser$DefaultResetListener(::javax::swing::JColorChooser *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::javax::swing::JColorChooser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) chooser;
-  ::java::awt::Color * init;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JColorChooser$DefaultResetListener__
diff --git a/libjava/javax/swing/JColorChooser.h b/libjava/javax/swing/JColorChooser.h
deleted file mode 100644
index 66d0da60702..00000000000
--- a/libjava/javax/swing/JColorChooser.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JColorChooser__
-#define __javax_swing_JColorChooser__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-      namespace event
-      {
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JColorChooser;
-        class JComponent;
-        class JDialog;
-      namespace colorchooser
-      {
-          class AbstractColorChooserPanel;
-          class ColorSelectionModel;
-      }
-      namespace plaf
-      {
-          class ColorChooserUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JColorChooser : public ::javax::swing::JComponent
-{
-
-public:
-  JColorChooser();
-  JColorChooser(::java::awt::Color *);
-  JColorChooser(::javax::swing::colorchooser::ColorSelectionModel *);
-  virtual void setColor(::java::awt::Color *);
-  virtual void setColor(jint, jint, jint);
-  virtual void setColor(jint);
-  static ::java::awt::Color * showDialog(::java::awt::Component *, ::java::lang::String *, ::java::awt::Color *);
-public: // actually package-private
-  static void makeModal(::javax::swing::JDialog *);
-private:
-  static ::java::awt::Component * findParent(::java::awt::Component *);
-public:
-  static ::javax::swing::JDialog * createDialog(::java::awt::Component *, ::java::lang::String *, jboolean, ::javax::swing::JColorChooser *, ::java::awt::event::ActionListener *, ::java::awt::event::ActionListener *);
-  virtual ::javax::swing::plaf::ColorChooserUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ColorChooserUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::awt::Color * getColor();
-  virtual void setPreviewPanel(::javax::swing::JComponent *);
-  virtual ::javax::swing::JComponent * getPreviewPanel();
-  virtual void addChooserPanel(::javax::swing::colorchooser::AbstractColorChooserPanel *);
-  virtual ::javax::swing::colorchooser::AbstractColorChooserPanel * removeChooserPanel(::javax::swing::colorchooser::AbstractColorChooserPanel *);
-  virtual void setChooserPanels(JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > *);
-  virtual JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * getChooserPanels();
-  virtual ::javax::swing::colorchooser::ColorSelectionModel * getSelectionModel();
-  virtual void setSelectionModel(::javax::swing::colorchooser::ColorSelectionModel *);
-  virtual jboolean getDragEnabled();
-  virtual void setDragEnabled(jboolean);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 9168066781620640889LL;
-  ::javax::swing::colorchooser::ColorSelectionModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) selectionModel;
-  ::javax::swing::JComponent * previewPanel;
-  JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * chooserPanels;
-  jboolean dragEnabled;
-public:
-  static ::java::lang::String * SELECTION_MODEL_PROPERTY;
-  static ::java::lang::String * PREVIEW_PANEL_PROPERTY;
-  static ::java::lang::String * CHOOSER_PANELS_PROPERTY;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JColorChooser__
diff --git a/libjava/javax/swing/JComboBox$1.h b/libjava/javax/swing/JComboBox$1.h
deleted file mode 100644
index 865b18fe48c..00000000000
--- a/libjava/javax/swing/JComboBox$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComboBox$1__
-#define __javax_swing_JComboBox$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComboBox;
-        class JComboBox$1;
-    }
-  }
-}
-
-class javax::swing::JComboBox$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JComboBox$1(::javax::swing::JComboBox *);
-public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComboBox$1__
diff --git a/libjava/javax/swing/JComboBox$AccessibleJComboBox.h b/libjava/javax/swing/JComboBox$AccessibleJComboBox.h
deleted file mode 100644
index 7f8b2ca997a..00000000000
--- a/libjava/javax/swing/JComboBox$AccessibleJComboBox.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComboBox$AccessibleJComboBox__
-#define __javax_swing_JComboBox$AccessibleJComboBox__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleAction;
-        class AccessibleRole;
-        class AccessibleSelection;
-    }
-    namespace swing
-    {
-        class JComboBox;
-        class JComboBox$AccessibleJComboBox;
-    }
-  }
-}
-
-class javax::swing::JComboBox$AccessibleJComboBox : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JComboBox$AccessibleJComboBox(::javax::swing::JComboBox *);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jint getAccessibleActionCount();
-  virtual jboolean doAccessibleAction(jint);
-  virtual jint getAccessibleSelectionCount();
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-private:
-  static const jlong serialVersionUID = 8217828307256675666LL;
-public: // actually package-private
-  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComboBox$AccessibleJComboBox__
diff --git a/libjava/javax/swing/JComboBox$DefaultKeySelectionManager.h b/libjava/javax/swing/JComboBox$DefaultKeySelectionManager.h
deleted file mode 100644
index d968118ed66..00000000000
--- a/libjava/javax/swing/JComboBox$DefaultKeySelectionManager.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComboBox$DefaultKeySelectionManager__
-#define __javax_swing_JComboBox$DefaultKeySelectionManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxModel;
-        class JComboBox;
-        class JComboBox$DefaultKeySelectionManager;
-    }
-  }
-}
-
-class javax::swing::JComboBox$DefaultKeySelectionManager : public ::java::lang::Object
-{
-
-  JComboBox$DefaultKeySelectionManager(::javax::swing::JComboBox *);
-public:
-  virtual jint selectionForKey(jchar, ::javax::swing::ComboBoxModel *);
-public: // actually package-private
-  JComboBox$DefaultKeySelectionManager(::javax::swing::JComboBox *, ::javax::swing::JComboBox$DefaultKeySelectionManager *);
-  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComboBox$DefaultKeySelectionManager__
diff --git a/libjava/javax/swing/JComboBox$KeySelectionManager.h b/libjava/javax/swing/JComboBox$KeySelectionManager.h
deleted file mode 100644
index 4d6314e8f42..00000000000
--- a/libjava/javax/swing/JComboBox$KeySelectionManager.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComboBox$KeySelectionManager__
-#define __javax_swing_JComboBox$KeySelectionManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxModel;
-        class JComboBox$KeySelectionManager;
-    }
-  }
-}
-
-class javax::swing::JComboBox$KeySelectionManager : public ::java::lang::Object
-{
-
-public:
-  virtual jint selectionForKey(jchar, ::javax::swing::ComboBoxModel *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_JComboBox$KeySelectionManager__
diff --git a/libjava/javax/swing/JComboBox.h b/libjava/javax/swing/JComboBox.h
deleted file mode 100644
index ef9f7147c79..00000000000
--- a/libjava/javax/swing/JComboBox.h
+++ /dev/null
@@ -1,164 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComboBox__
-#define __javax_swing_JComboBox__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-          class ItemEvent;
-          class ItemListener;
-          class KeyEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class ComboBoxEditor;
-        class ComboBoxModel;
-        class JComboBox;
-        class JComboBox$KeySelectionManager;
-        class ListCellRenderer;
-      namespace event
-      {
-          class ListDataEvent;
-          class PopupMenuListener;
-      }
-      namespace plaf
-      {
-          class ComboBoxUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JComboBox : public ::javax::swing::JComponent
-{
-
-public:
-  JComboBox(::javax::swing::ComboBoxModel *);
-  JComboBox(JArray< ::java::lang::Object * > *);
-  JComboBox(::java::util::Vector *);
-  JComboBox();
-  virtual jboolean isEditable();
-public: // actually protected
-  virtual void installAncestorListener();
-public:
-  virtual void setUI(::javax::swing::plaf::ComboBoxUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::plaf::ComboBoxUI * getUI();
-  virtual void setModel(::javax::swing::ComboBoxModel *);
-  virtual ::javax::swing::ComboBoxModel * getModel();
-  virtual void setLightWeightPopupEnabled(jboolean);
-  virtual jboolean isLightWeightPopupEnabled();
-  virtual void setEditable(jboolean);
-  virtual void setMaximumRowCount(jint);
-  virtual jint getMaximumRowCount();
-  virtual void setRenderer(::javax::swing::ListCellRenderer *);
-  virtual ::javax::swing::ListCellRenderer * getRenderer();
-  virtual void setEditor(::javax::swing::ComboBoxEditor *);
-  virtual ::javax::swing::ComboBoxEditor * getEditor();
-  virtual void setSelectedItem(::java::lang::Object *);
-  virtual ::java::lang::Object * getSelectedItem();
-  virtual void setSelectedIndex(jint);
-  virtual jint getSelectedIndex();
-  virtual ::java::lang::Object * getPrototypeDisplayValue();
-  virtual void setPrototypeDisplayValue(::java::lang::Object *);
-  virtual void addItem(::java::lang::Object *);
-  virtual void insertItemAt(::java::lang::Object *, jint);
-  virtual void removeItem(::java::lang::Object *);
-  virtual void removeItemAt(jint);
-  virtual void removeAllItems();
-  virtual void showPopup();
-  virtual void hidePopup();
-  virtual void setPopupVisible(jboolean);
-  virtual jboolean isPopupVisible();
-  virtual void setActionCommand(::java::lang::String *);
-  virtual ::java::lang::String * getActionCommand();
-  virtual void setAction(::javax::swing::Action *);
-  virtual ::javax::swing::Action * getAction();
-public: // actually protected
-  virtual void configurePropertiesFromAction(::javax::swing::Action *);
-  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
-  virtual void fireItemStateChanged(::java::awt::event::ItemEvent *);
-  virtual void fireActionEvent();
-public:
-  virtual void firePopupMenuCanceled();
-  virtual void firePopupMenuWillBecomeInvisible();
-  virtual void firePopupMenuWillBecomeVisible();
-public: // actually protected
-  virtual void selectedItemChanged();
-public:
-  virtual JArray< ::java::lang::Object * > * getSelectedObjects();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean selectWithKeyChar(jchar);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void setEnabled(jboolean);
-  virtual void configureEditor(::javax::swing::ComboBoxEditor *, ::java::lang::Object *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void setKeySelectionManager(::javax::swing::JComboBox$KeySelectionManager *);
-  virtual ::javax::swing::JComboBox$KeySelectionManager * getKeySelectionManager();
-  virtual jint getItemCount();
-  virtual ::java::lang::Object * getItemAt(jint);
-public: // actually protected
-  virtual ::javax::swing::JComboBox$KeySelectionManager * createDefaultKeySelectionManager();
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual void addItemListener(::java::awt::event::ItemListener *);
-  virtual void removeItemListener(::java::awt::event::ItemListener *);
-  virtual JArray< ::java::awt::event::ItemListener * > * getItemListeners();
-  virtual void addPopupMenuListener(::javax::swing::event::PopupMenuListener *);
-  virtual void removePopupMenuListener(::javax::swing::event::PopupMenuListener *);
-  virtual JArray< ::javax::swing::event::PopupMenuListener * > * getPopupMenuListeners();
-private:
-  static const jlong serialVersionUID = 5654585963292734470LL;
-  static const jint DEFAULT_MAXIMUM_ROW_COUNT = 8;
-public: // actually protected
-  ::javax::swing::ComboBoxModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) dataModel;
-  ::javax::swing::ListCellRenderer * renderer;
-  ::javax::swing::ComboBoxEditor * editor;
-  jint maximumRowCount;
-  jboolean isEditable__;
-  ::java::lang::Object * selectedItemReminder;
-  ::javax::swing::JComboBox$KeySelectionManager * keySelectionManager;
-  ::java::lang::String * actionCommand;
-  jboolean lightWeightPopupEnabled;
-private:
-  ::javax::swing::Action * action;
-  ::java::lang::Object * prototypeDisplayValue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComboBox__
diff --git a/libjava/javax/swing/JComponent$1.h b/libjava/javax/swing/JComponent$1.h
deleted file mode 100644
index efcbd1c8fe0..00000000000
--- a/libjava/javax/swing/JComponent$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent$1__
-#define __javax_swing_JComponent$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JComponent$1;
-    }
-  }
-}
-
-class javax::swing::JComponent$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JComponent$1(::javax::swing::JComponent *);
-public:
-  void run();
-public: // actually package-private
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent$1__
diff --git a/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.h b/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.h
deleted file mode 100644
index 6b25d9aeaa9..00000000000
--- a/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleContainerHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent$AccessibleJComponent$AccessibleContainerHandler__
-#define __javax_swing_JComponent$AccessibleJComponent$AccessibleContainerHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent$AccessibleJComponent;
-        class JComponent$AccessibleJComponent$AccessibleContainerHandler;
-    }
-  }
-}
-
-class javax::swing::JComponent$AccessibleJComponent$AccessibleContainerHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  JComponent$AccessibleJComponent$AccessibleContainerHandler(::javax::swing::JComponent$AccessibleJComponent *);
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-public: // actually package-private
-  ::javax::swing::JComponent$AccessibleJComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent$AccessibleJComponent$AccessibleContainerHandler__
diff --git a/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.h b/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.h
deleted file mode 100644
index 50825416858..00000000000
--- a/libjava/javax/swing/JComponent$AccessibleJComponent$AccessibleFocusHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent$AccessibleJComponent$AccessibleFocusHandler__
-#define __javax_swing_JComponent$AccessibleJComponent$AccessibleFocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent$AccessibleJComponent;
-        class JComponent$AccessibleJComponent$AccessibleFocusHandler;
-    }
-  }
-}
-
-class javax::swing::JComponent$AccessibleJComponent$AccessibleFocusHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  JComponent$AccessibleJComponent$AccessibleFocusHandler(::javax::swing::JComponent$AccessibleJComponent *);
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::JComponent$AccessibleJComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent$AccessibleJComponent$AccessibleFocusHandler__
diff --git a/libjava/javax/swing/JComponent$AccessibleJComponent.h b/libjava/javax/swing/JComponent$AccessibleJComponent.h
deleted file mode 100644
index d0a3546743f..00000000000
--- a/libjava/javax/swing/JComponent$AccessibleJComponent.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent$AccessibleJComponent__
-#define __javax_swing_JComponent$AccessibleJComponent__
-
-#pragma interface
-
-#include <java/awt/Container$AccessibleAWTContainer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerListener;
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleKeyBinding;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JComponent$AccessibleJComponent;
-      namespace border
-      {
-          class Border;
-      }
-    }
-  }
-}
-
-class javax::swing::JComponent$AccessibleJComponent : public ::java::awt::Container$AccessibleAWTContainer
-{
-
-public: // actually protected
-  JComponent$AccessibleJComponent(::javax::swing::JComponent *);
-public:
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually protected
-  virtual ::java::lang::String * getBorderTitle(::javax::swing::border::Border *);
-public:
-  virtual ::java::lang::String * getToolTipText();
-  virtual ::java::lang::String * getTitledBorderText();
-  virtual ::javax::accessibility::AccessibleKeyBinding * getAccessibleKeyBinding();
-private:
-  static const jlong serialVersionUID = -7047089700479897799LL;
-public: // actually protected
-  ::java::awt::event::ContainerListener * __attribute__((aligned(__alignof__( ::java::awt::Container$AccessibleAWTContainer)))) accessibleContainerHandler;
-  ::java::awt::event::FocusListener * accessibleFocusHandler;
-public: // actually package-private
-  ::javax::swing::JComponent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent$AccessibleJComponent__
diff --git a/libjava/javax/swing/JComponent$ActionListenerProxy.h b/libjava/javax/swing/JComponent$ActionListenerProxy.h
deleted file mode 100644
index 9679e190935..00000000000
--- a/libjava/javax/swing/JComponent$ActionListenerProxy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent$ActionListenerProxy__
-#define __javax_swing_JComponent$ActionListenerProxy__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent$ActionListenerProxy;
-    }
-  }
-}
-
-class javax::swing::JComponent$ActionListenerProxy : public ::javax::swing::AbstractAction
-{
-
-public:
-  JComponent$ActionListenerProxy(::java::awt::event::ActionListener *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::java::awt::event::ActionListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) target;
-  ::java::lang::String * bindingCommandName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent$ActionListenerProxy__
diff --git a/libjava/javax/swing/JComponent.h b/libjava/javax/swing/JComponent.h
deleted file mode 100644
index e87a6c29076..00000000000
--- a/libjava/javax/swing/JComponent.h
+++ /dev/null
@@ -1,297 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JComponent__
-#define __javax_swing_JComponent__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Container;
-        class Dimension;
-        class Font;
-        class Graphics;
-        class Image;
-        class Insets;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class ActionListener;
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-    namespace beans
-    {
-        class VetoableChangeListener;
-        class VetoableChangeSupport;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class ActionMap;
-        class ComponentInputMap;
-        class InputMap;
-        class InputVerifier;
-        class JComponent;
-        class JPopupMenu;
-        class JRootPane;
-        class JToolTip;
-        class KeyStroke;
-        class TransferHandler;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class AncestorListener;
-          class EventListenerList;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JComponent : public ::java::awt::Container
-{
-
-public:
-  JComponent();
-private:
-  ::java::util::Hashtable * getClientProperties();
-public:
-  virtual ::java::lang::Object * getClientProperty(::java::lang::Object *);
-  virtual void putClientProperty(::java::lang::Object *, ::java::lang::Object *);
-  virtual void removeAncestorListener(::javax::swing::event::AncestorListener *);
-  virtual void removeVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual void addAncestorListener(::javax::swing::event::AncestorListener *);
-  virtual void addVetoableChangeListener(::java::beans::VetoableChangeListener *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::AncestorListener * > * getAncestorListeners();
-  virtual JArray< ::java::beans::VetoableChangeListener * > * getVetoableChangeListeners();
-public: // actually protected
-  virtual void fireVetoableChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void firePropertyChange(::java::lang::String *, jint, jint);
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-  virtual void firePropertyChange(::java::lang::String *, jchar, jchar);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual jfloat getAlignmentX();
-  virtual jfloat getAlignmentY();
-  virtual jboolean getAutoscrolls();
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual ::javax::swing::border::Border * getBorder();
-  virtual ::java::awt::Rectangle * getBounds(::java::awt::Rectangle *);
-public: // actually protected
-  virtual ::java::awt::Graphics * getComponentGraphics(::java::awt::Graphics *);
-public:
-  virtual jint getDebugGraphicsOptions();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * getInsets(::java::awt::Insets *);
-  virtual ::java::awt::Point * getLocation(::java::awt::Point *);
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Component * getNextFocusableComponent();
-  virtual JArray< ::javax::swing::KeyStroke * > * getRegisteredKeyStrokes();
-  virtual ::javax::swing::JRootPane * getRootPane();
-  virtual ::java::awt::Dimension * getSize(::java::awt::Dimension *);
-  virtual ::javax::swing::JToolTip * createToolTip();
-  virtual ::java::awt::Point * getToolTipLocation(::java::awt::event::MouseEvent *);
-  virtual void setToolTipText(::java::lang::String *);
-  virtual ::java::lang::String * getToolTipText();
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-  virtual jboolean getInheritsPopupMenu();
-  virtual void setInheritsPopupMenu(jboolean);
-  virtual ::javax::swing::JPopupMenu * getComponentPopupMenu();
-  virtual void setComponentPopupMenu(::javax::swing::JPopupMenu *);
-  virtual ::java::awt::Container * getTopLevelAncestor();
-  virtual void computeVisibleRect(::java::awt::Rectangle *);
-  virtual ::java::awt::Rectangle * getVisibleRect();
-  virtual void grabFocus();
-  virtual jboolean isDoubleBuffered();
-  static jboolean isLightweightComponent(::java::awt::Component *);
-  virtual jboolean isManagingFocus();
-  virtual jboolean isOpaque();
-  virtual jboolean isOptimizedDrawingEnabled();
-  virtual jboolean isPaintingTile();
-  virtual jboolean isRequestFocusEnabled();
-  virtual jboolean isValidateRoot();
-  virtual void paint(::java::awt::Graphics *);
-private:
-  jboolean isOccupiedByChild(jint, jint, jint, jint);
-  void initializeDragBuffer();
-public: // actually protected
-  virtual void paintBorder(::java::awt::Graphics *);
-  virtual void paintChildren(::java::awt::Graphics *);
-private:
-  jboolean isCompletelyObscured(jint, jint, jint, jint, jint);
-  jboolean isPartiallyObscured(jint, jint, jint, jint, jint);
-public: // actually protected
-  virtual void paintComponent(::java::awt::Graphics *);
-public:
-  virtual void paintImmediately(jint, jint, jint, jint);
-  virtual void paintImmediately(::java::awt::Rectangle *);
-public: // actually package-private
-  virtual void paintImmediately2(jint, jint, jint, jint);
-  virtual jboolean onTop();
-  virtual jboolean isPaintRoot();
-private:
-  void paintDoubleBuffered(jint, jint, jint, jint);
-  void clipAndTranslateGraphics(::java::awt::Component *, ::java::awt::Component *, ::java::awt::Graphics *);
-public: // actually package-private
-  virtual void paintSimple(::java::awt::Rectangle *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void registerKeyboardAction(::java::awt::event::ActionListener *, ::javax::swing::KeyStroke *, jint);
-  virtual void registerKeyboardAction(::java::awt::event::ActionListener *, ::java::lang::String *, ::javax::swing::KeyStroke *, jint);
-  virtual void setInputMap(jint, ::javax::swing::InputMap *);
-  virtual ::javax::swing::InputMap * getInputMap(jint);
-  virtual ::javax::swing::InputMap * getInputMap();
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual void setActionMap(::javax::swing::ActionMap *);
-  virtual jint getConditionForKeyStroke(::javax::swing::KeyStroke *);
-  virtual ::java::awt::event::ActionListener * getActionForKeyStroke(::javax::swing::KeyStroke *);
-public: // actually protected
-  virtual void processComponentKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-  virtual jboolean processKeyBinding(::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, jint, jboolean);
-public:
-  virtual void unregisterKeyboardAction(::javax::swing::KeyStroke *);
-  virtual void resetKeyboardActions();
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void repaint(::java::awt::Rectangle *);
-  virtual jboolean requestDefaultFocus();
-  virtual void revalidate();
-  virtual void scrollRectToVisible(::java::awt::Rectangle *);
-  virtual void setAlignmentX(jfloat);
-  virtual void setAlignmentY(jfloat);
-  virtual void setAutoscrolls(jboolean);
-  virtual void setDebugGraphicsOptions(jint);
-  virtual void setDoubleBuffered(jboolean);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setNextFocusableComponent(::java::awt::Component *);
-  virtual void setRequestFocusEnabled(jboolean);
-  virtual ::javax::swing::TransferHandler * getTransferHandler();
-  virtual void setTransferHandler(::javax::swing::TransferHandler *);
-  virtual void setOpaque(jboolean);
-  virtual void setVisible(jboolean);
-  virtual void update(::java::awt::Graphics *);
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual void setUI(::javax::swing::plaf::ComponentUI *);
-public:
-  virtual void updateUI();
-  static ::java::util::Locale * getDefaultLocale();
-  static void setDefaultLocale(::java::util::Locale *);
-  virtual ::javax::swing::InputVerifier * getInputVerifier();
-  virtual void setInputVerifier(::javax::swing::InputVerifier *);
-  virtual jboolean getVerifyInputWhenFocusTarget();
-  virtual void setVerifyInputWhenFocusTarget(jboolean);
-  virtual void requestFocus();
-  virtual jboolean requestFocus(jboolean);
-  virtual jboolean requestFocusInWindow();
-public: // actually protected
-  virtual jboolean requestFocusInWindow(jboolean);
-public:
-  virtual void addNotify();
-  virtual void removeNotify();
-  virtual jboolean contains(jint, jint);
-  virtual void disable();
-  virtual void enable();
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual jint getX();
-  virtual jint getY();
-  virtual jint getHeight();
-  virtual jint getWidth();
-  virtual void print(::java::awt::Graphics *);
-  virtual void printAll(::java::awt::Graphics *);
-public: // actually protected
-  virtual void printComponent(::java::awt::Graphics *);
-  virtual void printChildren(::java::awt::Graphics *);
-  virtual void printBorder(::java::awt::Graphics *);
-  virtual void processMouseMotionEvent(::java::awt::event::MouseEvent *);
-public:
-  virtual void reshape(jint, jint, jint, jint);
-public: // actually package-private
-  virtual void fireAncestorEvent(::javax::swing::JComponent *, jint);
-  virtual void updateComponentInputMap(::javax::swing::ComponentInputMap *);
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -7908749299918704233LL;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Container)))) accessibleContext;
-public: // actually package-private
-  jfloat alignmentX;
-  jfloat alignmentY;
-  ::javax::swing::border::Border * border;
-  ::javax::swing::JPopupMenu * componentPopupMenu;
-  jboolean inheritsPopupMenu;
-  jboolean doubleBuffered;
-  jint debugGraphicsOptions;
-  jboolean opaque;
-public: // actually protected
-  ::javax::swing::plaf::ComponentUI * ui;
-public: // actually package-private
-  jboolean requestFocusEnabled;
-  jboolean autoscrolls;
-  static jboolean paintingDoubleBuffered;
-  static jboolean isRepainting;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  ::java::beans::VetoableChangeSupport * vetoableChangeSupport;
-  ::java::util::Hashtable * clientProperties;
-  ::javax::swing::InputMap * inputMap_whenFocused;
-  ::javax::swing::InputMap * inputMap_whenAncestorOfFocused;
-  ::javax::swing::ComponentInputMap * inputMap_whenInFocusedWindow;
-  ::javax::swing::ActionMap * actionMap;
-  jboolean verifyInputWhenFocusTarget;
-  ::javax::swing::InputVerifier * inputVerifier;
-  ::javax::swing::TransferHandler * transferHandler;
-  jboolean paintingTile;
-  ::java::awt::Image * dragBuffer;
-  jboolean dragBufferInitialized;
-  static ::java::awt::Rectangle * rectCache;
-  static ::java::util::Locale * defaultLocale;
-public:
-  static ::java::lang::String * TOOL_TIP_TEXT_KEY;
-  static const jint UNDEFINED_CONDITION = -1;
-  static const jint WHEN_FOCUSED = 0;
-  static const jint WHEN_ANCESTOR_OF_FOCUSED_COMPONENT = 1;
-  static const jint WHEN_IN_FOCUSED_WINDOW = 2;
-public: // actually package-private
-  ::java::awt::Component * paintChild;
-private:
-  jboolean clientOpaqueSet;
-  jboolean clientAutoscrollsSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JComponent__
diff --git a/libjava/javax/swing/JDesktopPane$AccessibleJDesktopPane.h b/libjava/javax/swing/JDesktopPane$AccessibleJDesktopPane.h
deleted file mode 100644
index 7788b49dda8..00000000000
--- a/libjava/javax/swing/JDesktopPane$AccessibleJDesktopPane.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JDesktopPane$AccessibleJDesktopPane__
-#define __javax_swing_JDesktopPane$AccessibleJDesktopPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JDesktopPane;
-        class JDesktopPane$AccessibleJDesktopPane;
-    }
-  }
-}
-
-class javax::swing::JDesktopPane$AccessibleJDesktopPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JDesktopPane$AccessibleJDesktopPane(::javax::swing::JDesktopPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 6079388927946077570LL;
-public: // actually package-private
-  ::javax::swing::JDesktopPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JDesktopPane$AccessibleJDesktopPane__
diff --git a/libjava/javax/swing/JDesktopPane.h b/libjava/javax/swing/JDesktopPane.h
deleted file mode 100644
index d7e022c9065..00000000000
--- a/libjava/javax/swing/JDesktopPane.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JDesktopPane__
-#define __javax_swing_JDesktopPane__
-
-#pragma interface
-
-#include <javax/swing/JLayeredPane.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class DesktopManager;
-        class JDesktopPane;
-        class JInternalFrame;
-      namespace plaf
-      {
-          class DesktopPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JDesktopPane : public ::javax::swing::JLayeredPane
-{
-
-public:
-  JDesktopPane();
-  virtual ::javax::swing::plaf::DesktopPaneUI * getUI();
-  virtual void setUI(::javax::swing::plaf::DesktopPaneUI *);
-  virtual void setDragMode(jint);
-  virtual jint getDragMode();
-  virtual ::javax::swing::DesktopManager * getDesktopManager();
-  virtual void setDesktopManager(::javax::swing::DesktopManager *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual JArray< ::javax::swing::JInternalFrame * > * getAllFrames();
-  virtual ::javax::swing::JInternalFrame * getSelectedFrame();
-  virtual void setSelectedFrame(::javax::swing::JInternalFrame *);
-  virtual JArray< ::javax::swing::JInternalFrame * > * getAllFramesInLayer(jint);
-  virtual jboolean isOpaque();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-private:
-  static JArray< ::javax::swing::JInternalFrame * > * getFramesFromComponents(JArray< ::java::awt::Component * > *);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 766333777224038726LL;
-public:
-  static const jint LIVE_DRAG_MODE = 0;
-  static const jint OUTLINE_DRAG_MODE = 1;
-private:
-  ::javax::swing::JInternalFrame * __attribute__((aligned(__alignof__( ::javax::swing::JLayeredPane)))) selectedFrame;
-public: // actually package-private
-  ::javax::swing::DesktopManager * desktopManager;
-private:
-  jint dragMode;
-  jboolean clientDragModeSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JDesktopPane__
diff --git a/libjava/javax/swing/JDialog$AccessibleJDialog.h b/libjava/javax/swing/JDialog$AccessibleJDialog.h
deleted file mode 100644
index 26ffba493e1..00000000000
--- a/libjava/javax/swing/JDialog$AccessibleJDialog.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JDialog$AccessibleJDialog__
-#define __javax_swing_JDialog$AccessibleJDialog__
-
-#pragma interface
-
-#include <java/awt/Dialog$AccessibleAWTDialog.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JDialog;
-        class JDialog$AccessibleJDialog;
-    }
-  }
-}
-
-class javax::swing::JDialog$AccessibleJDialog : public ::java::awt::Dialog$AccessibleAWTDialog
-{
-
-public: // actually protected
-  JDialog$AccessibleJDialog(::javax::swing::JDialog *);
-public: // actually package-private
-  ::javax::swing::JDialog * __attribute__((aligned(__alignof__( ::java::awt::Dialog$AccessibleAWTDialog)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JDialog$AccessibleJDialog__
diff --git a/libjava/javax/swing/JDialog.h b/libjava/javax/swing/JDialog.h
deleted file mode 100644
index 968a0fcba57..00000000000
--- a/libjava/javax/swing/JDialog.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JDialog__
-#define __javax_swing_JDialog__
-
-#pragma interface
-
-#include <java/awt/Dialog.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dialog;
-        class Dimension;
-        class Frame;
-        class Graphics;
-        class GraphicsConfiguration;
-        class LayoutManager;
-      namespace event
-      {
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JDialog;
-        class JLayeredPane;
-        class JMenuBar;
-        class JRootPane;
-    }
-  }
-}
-
-class javax::swing::JDialog : public ::java::awt::Dialog
-{
-
-public:
-  JDialog();
-  JDialog(::java::awt::Dialog *);
-  JDialog(::java::awt::Dialog *, jboolean);
-  JDialog(::java::awt::Dialog *, ::java::lang::String *);
-  JDialog(::java::awt::Dialog *, ::java::lang::String *, jboolean);
-  JDialog(::java::awt::Dialog *, ::java::lang::String *, jboolean, ::java::awt::GraphicsConfiguration *);
-  JDialog(::java::awt::Frame *);
-  JDialog(::java::awt::Frame *, jboolean);
-  JDialog(::java::awt::Frame *, ::java::lang::String *);
-  JDialog(::java::awt::Frame *, ::java::lang::String *, jboolean);
-  JDialog(::java::awt::Frame *, ::java::lang::String *, jboolean, ::java::awt::GraphicsConfiguration *);
-public: // actually protected
-  virtual void dialogInit();
-public:
-  static jboolean isDefaultLookAndFeelDecorated();
-  static void setDefaultLookAndFeelDecorated(jboolean);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::javax::swing::JMenuBar * getJMenuBar();
-  virtual void setJMenuBar(::javax::swing::JMenuBar *);
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual ::javax::swing::JRootPane * getRootPane();
-public: // actually protected
-  virtual void setRootPane(::javax::swing::JRootPane *);
-  virtual ::javax::swing::JRootPane * createRootPane();
-public:
-  virtual ::java::awt::Container * getContentPane();
-  virtual void setContentPane(::java::awt::Container *);
-  virtual ::java::awt::Component * getGlassPane();
-  virtual void setGlassPane(::java::awt::Component *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void remove(::java::awt::Component *);
-public: // actually protected
-  virtual jboolean isRootPaneCheckingEnabled();
-  virtual void setRootPaneCheckingEnabled(jboolean);
-public:
-  virtual void update(::java::awt::Graphics *);
-public: // actually protected
-  virtual void processWindowEvent(::java::awt::event::WindowEvent *);
-public:
-  virtual void setDefaultCloseOperation(jint);
-  virtual jint getDefaultCloseOperation();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -864070866424508218LL;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::awt::Dialog)))) accessibleContext;
-  ::javax::swing::JRootPane * rootPane;
-  jboolean rootPaneCheckingEnabled;
-private:
-  jint closeAction;
-  static jboolean decorated;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JDialog__
diff --git a/libjava/javax/swing/JEditorPane$1.h b/libjava/javax/swing/JEditorPane$1.h
deleted file mode 100644
index e0010c7e1c7..00000000000
--- a/libjava/javax/swing/JEditorPane$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$1__
-#define __javax_swing_JEditorPane$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane$1;
-        class JEditorPane$PlainEditorKit;
-      namespace text
-      {
-          class Element;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::JEditorPane$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JEditorPane$1(::javax::swing::JEditorPane$PlainEditorKit *);
-public:
-  ::javax::swing::text::View * create(::javax::swing::text::Element *);
-public: // actually package-private
-  ::javax::swing::JEditorPane$PlainEditorKit * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$1__
diff --git a/libjava/javax/swing/JEditorPane$2.h b/libjava/javax/swing/JEditorPane$2.h
deleted file mode 100644
index b9bad89cba6..00000000000
--- a/libjava/javax/swing/JEditorPane$2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$2__
-#define __javax_swing_JEditorPane$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane$2;
-        class JEditorPane$PageLoader;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JEditorPane$2(::javax::swing::JEditorPane$PageLoader *);
-public:
-  void run();
-public: // actually package-private
-  ::javax::swing::JEditorPane$PageLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$2__
diff --git a/libjava/javax/swing/JEditorPane$AccessibleJEditorPane.h b/libjava/javax/swing/JEditorPane$AccessibleJEditorPane.h
deleted file mode 100644
index 9aecb469f25..00000000000
--- a/libjava/javax/swing/JEditorPane$AccessibleJEditorPane.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$AccessibleJEditorPane__
-#define __javax_swing_JEditorPane$AccessibleJEditorPane__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent$AccessibleJTextComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$AccessibleJEditorPane;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$AccessibleJEditorPane : public ::javax::swing::text::JTextComponent$AccessibleJTextComponent
-{
-
-public: // actually protected
-  JEditorPane$AccessibleJEditorPane(::javax::swing::JEditorPane *);
-public:
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-public: // actually package-private
-  ::javax::swing::JEditorPane * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent$AccessibleJTextComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$AccessibleJEditorPane__
diff --git a/libjava/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.h b/libjava/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.h
deleted file mode 100644
index b9ce1d57da4..00000000000
--- a/libjava/javax/swing/JEditorPane$AccessibleJEditorPaneHTML.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$AccessibleJEditorPaneHTML__
-#define __javax_swing_JEditorPane$AccessibleJEditorPaneHTML__
-
-#pragma interface
-
-#include <javax/swing/JEditorPane$AccessibleJEditorPane.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleText;
-    }
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$AccessibleJEditorPaneHTML;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$AccessibleJEditorPaneHTML : public ::javax::swing::JEditorPane$AccessibleJEditorPane
-{
-
-public: // actually protected
-  JEditorPane$AccessibleJEditorPaneHTML(::javax::swing::JEditorPane *);
-public:
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-public: // actually package-private
-  ::javax::swing::JEditorPane * __attribute__((aligned(__alignof__( ::javax::swing::JEditorPane$AccessibleJEditorPane)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$AccessibleJEditorPaneHTML__
diff --git a/libjava/javax/swing/JEditorPane$EditorKitMapping.h b/libjava/javax/swing/JEditorPane$EditorKitMapping.h
deleted file mode 100644
index cb9fa757ae3..00000000000
--- a/libjava/javax/swing/JEditorPane$EditorKitMapping.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$EditorKitMapping__
-#define __javax_swing_JEditorPane$EditorKitMapping__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane$EditorKitMapping;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$EditorKitMapping : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JEditorPane$EditorKitMapping(::java::lang::String *, ::java::lang::ClassLoader *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) className;
-  ::java::lang::ClassLoader * classLoader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$EditorKitMapping__
diff --git a/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.h b/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.h
deleted file mode 100644
index 3fd5224fe8a..00000000000
--- a/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink__
-#define __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleHyperlink.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane$JEditorPaneAccessibleHypertextSupport;
-        class JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink;
-      namespace text
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink : public ::javax::accessibility::AccessibleHyperlink
-{
-
-public:
-  JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink(::javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport *, ::javax::swing::text::Element *);
-  virtual jboolean isValid();
-  virtual jint getAccessibleActionCount();
-  virtual jboolean doAccessibleAction(jint);
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual ::java::lang::Object * getAccessibleActionObject(jint);
-  virtual ::java::lang::Object * getAccessibleActionAnchor(jint);
-  virtual jint getStartIndex();
-  virtual jint getEndIndex();
-public: // actually package-private
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleHyperlink)))) element;
-  ::javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink__
diff --git a/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.h b/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.h
deleted file mode 100644
index 759b435f4f5..00000000000
--- a/libjava/javax/swing/JEditorPane$JEditorPaneAccessibleHypertextSupport.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport__
-#define __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport__
-
-#pragma interface
-
-#include <javax/swing/JEditorPane$AccessibleJEditorPane.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleHyperlink;
-    }
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$JEditorPaneAccessibleHypertextSupport;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport : public ::javax::swing::JEditorPane$AccessibleJEditorPane
-{
-
-public:
-  JEditorPane$JEditorPaneAccessibleHypertextSupport(::javax::swing::JEditorPane *);
-  virtual jint getLinkCount();
-  virtual ::javax::accessibility::AccessibleHyperlink * getLink(jint);
-  virtual jint getLinkIndex(jint);
-  virtual ::java::lang::String * getLinkText(jint);
-public: // actually package-private
-  static ::javax::swing::JEditorPane * access$0(::javax::swing::JEditorPane$JEditorPaneAccessibleHypertextSupport *);
-  ::javax::swing::JEditorPane * __attribute__((aligned(__alignof__( ::javax::swing::JEditorPane$AccessibleJEditorPane)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$JEditorPaneAccessibleHypertextSupport__
diff --git a/libjava/javax/swing/JEditorPane$PageLoader.h b/libjava/javax/swing/JEditorPane$PageLoader.h
deleted file mode 100644
index 6357e72a54d..00000000000
--- a/libjava/javax/swing/JEditorPane$PageLoader.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$PageLoader__
-#define __javax_swing_JEditorPane$PageLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$PageLoader;
-        class JEditorPane$PageStream;
-      namespace text
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::JEditorPane$PageLoader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JEditorPane$PageLoader(::javax::swing::JEditorPane *, ::javax::swing::text::Document *, ::java::io::InputStream *, ::java::net::URL *, ::java::net::URL *);
-public:
-  virtual void run();
-public: // actually package-private
-  virtual void cancel();
-  static ::java::net::URL * access$0(::javax::swing::JEditorPane$PageLoader *);
-  static ::javax::swing::JEditorPane * access$1(::javax::swing::JEditorPane$PageLoader *);
-private:
-  ::javax::swing::text::Document * __attribute__((aligned(__alignof__( ::java::lang::Object)))) doc;
-  ::javax::swing::JEditorPane$PageStream * in;
-  ::java::net::URL * old;
-public: // actually package-private
-  ::java::net::URL * page;
-  ::javax::swing::JEditorPane * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$PageLoader__
diff --git a/libjava/javax/swing/JEditorPane$PageStream.h b/libjava/javax/swing/JEditorPane$PageStream.h
deleted file mode 100644
index b4591b722e1..00000000000
--- a/libjava/javax/swing/JEditorPane$PageStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$PageStream__
-#define __javax_swing_JEditorPane$PageStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$PageStream;
-    }
-  }
-}
-
-class javax::swing::JEditorPane$PageStream : public ::java::io::FilterInputStream
-{
-
-public: // actually protected
-  JEditorPane$PageStream(::javax::swing::JEditorPane *, ::java::io::InputStream *);
-private:
-  void checkCancelled();
-public: // actually package-private
-  virtual void cancel();
-public:
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jlong skip(jlong);
-  virtual jint available();
-  virtual void reset();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) cancelled;
-public: // actually package-private
-  ::javax::swing::JEditorPane * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$PageStream__
diff --git a/libjava/javax/swing/JEditorPane$PlainEditorKit.h b/libjava/javax/swing/JEditorPane$PlainEditorKit.h
deleted file mode 100644
index 39ca0d31834..00000000000
--- a/libjava/javax/swing/JEditorPane$PlainEditorKit.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane$PlainEditorKit__
-#define __javax_swing_JEditorPane$PlainEditorKit__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultEditorKit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane$PlainEditorKit;
-      namespace text
-      {
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::JEditorPane$PlainEditorKit : public ::javax::swing::text::DefaultEditorKit
-{
-
-  JEditorPane$PlainEditorKit();
-public:
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-public: // actually package-private
-  JEditorPane$PlainEditorKit(::javax::swing::JEditorPane$PlainEditorKit *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane$PlainEditorKit__
diff --git a/libjava/javax/swing/JEditorPane.h b/libjava/javax/swing/JEditorPane.h
deleted file mode 100644
index 0d1404cee8c..00000000000
--- a/libjava/javax/swing/JEditorPane.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JEditorPane__
-#define __javax_swing_JEditorPane__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JEditorPane;
-        class JEditorPane$PageLoader;
-      namespace event
-      {
-          class HyperlinkEvent;
-          class HyperlinkListener;
-      }
-      namespace text
-      {
-          class EditorKit;
-      }
-    }
-  }
-}
-
-class javax::swing::JEditorPane : public ::javax::swing::text::JTextComponent
-{
-
-public:
-  JEditorPane();
-  JEditorPane(::java::lang::String *);
-  JEditorPane(::java::lang::String *, ::java::lang::String *);
-  JEditorPane(::java::net::URL *);
-public: // actually package-private
-  virtual void init();
-public: // actually protected
-  virtual ::javax::swing::text::EditorKit * createDefaultEditorKit();
-public:
-  static ::javax::swing::text::EditorKit * createEditorKitForContentType(::java::lang::String *);
-  virtual void fireHyperlinkUpdate(::javax::swing::event::HyperlinkEvent *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getContentType();
-  virtual ::javax::swing::text::EditorKit * getEditorKit();
-  static ::java::lang::String * getEditorKitClassNameForContentType(::java::lang::String *);
-  virtual ::javax::swing::text::EditorKit * getEditorKitForContentType(::java::lang::String *);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual jboolean getScrollableTracksViewportHeight();
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual ::java::net::URL * getPage();
-public: // actually protected
-  virtual ::java::io::InputStream * getStream(::java::net::URL *);
-public:
-  virtual ::java::lang::String * getText();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jboolean isFocusCycleRoot();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void read(::java::io::InputStream *, ::java::lang::Object *);
-  static void registerEditorKitForContentType(::java::lang::String *, ::java::lang::String *);
-  static void registerEditorKitForContentType(::java::lang::String *, ::java::lang::String *, ::java::lang::ClassLoader *);
-  virtual void replaceSelection(::java::lang::String *);
-  virtual void scrollToReference(::java::lang::String *);
-  virtual void setContentType(::java::lang::String *);
-  virtual void setEditorKit(::javax::swing::text::EditorKit *);
-  virtual void setEditorKitForContentType(::java::lang::String *, ::javax::swing::text::EditorKit *);
-  virtual void setPage(::java::lang::String *);
-  virtual void setPage(::java::net::URL *);
-  virtual void setText(::java::lang::String *);
-  virtual void addHyperlinkListener(::javax::swing::event::HyperlinkListener *);
-  virtual void removeHyperlinkListener(::javax::swing::event::HyperlinkListener *);
-  virtual JArray< ::javax::swing::event::HyperlinkListener * > * getHyperlinkListeners();
-public: // actually package-private
-  static void access$0(::javax::swing::JEditorPane *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 3140472492599046285LL;
-  ::javax::swing::text::EditorKit * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent)))) editorKit;
-public: // actually package-private
-  jboolean focus_root;
-  static ::java::util::HashMap * editorKits;
-  static ::java::util::HashMap * registerMap;
-  ::java::util::HashMap * editorMap;
-private:
-  ::javax::swing::JEditorPane$PageLoader * loader;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JEditorPane__
diff --git a/libjava/javax/swing/JFileChooser$1.h b/libjava/javax/swing/JFileChooser$1.h
deleted file mode 100644
index 0fb02d37927..00000000000
--- a/libjava/javax/swing/JFileChooser$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFileChooser$1__
-#define __javax_swing_JFileChooser$1__
-
-#pragma interface
-
-#include <java/awt/event/WindowAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-        class JFileChooser$1;
-    }
-  }
-}
-
-class javax::swing::JFileChooser$1 : public ::java::awt::event::WindowAdapter
-{
-
-public: // actually package-private
-  JFileChooser$1(::javax::swing::JFileChooser *);
-public:
-  void windowClosing(::java::awt::event::WindowEvent *);
-public: // actually package-private
-  ::javax::swing::JFileChooser * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFileChooser$1__
diff --git a/libjava/javax/swing/JFileChooser$AccessibleJFileChooser.h b/libjava/javax/swing/JFileChooser$AccessibleJFileChooser.h
deleted file mode 100644
index 6229b49b62c..00000000000
--- a/libjava/javax/swing/JFileChooser$AccessibleJFileChooser.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFileChooser$AccessibleJFileChooser__
-#define __javax_swing_JFileChooser$AccessibleJFileChooser__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JFileChooser;
-        class JFileChooser$AccessibleJFileChooser;
-    }
-  }
-}
-
-class javax::swing::JFileChooser$AccessibleJFileChooser : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JFileChooser$AccessibleJFileChooser(::javax::swing::JFileChooser *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JFileChooser * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFileChooser$AccessibleJFileChooser__
diff --git a/libjava/javax/swing/JFileChooser.h b/libjava/javax/swing/JFileChooser.h
deleted file mode 100644
index d9418e25228..00000000000
--- a/libjava/javax/swing/JFileChooser.h
+++ /dev/null
@@ -1,197 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFileChooser__
-#define __javax_swing_JFileChooser__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class JDialog;
-        class JFileChooser;
-      namespace filechooser
-      {
-          class FileFilter;
-          class FileSystemView;
-          class FileView;
-      }
-      namespace plaf
-      {
-          class FileChooserUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JFileChooser : public ::javax::swing::JComponent
-{
-
-public:
-  JFileChooser();
-  JFileChooser(::java::lang::String *);
-  JFileChooser(::java::lang::String *, ::javax::swing::filechooser::FileSystemView *);
-  JFileChooser(::java::io::File *);
-  JFileChooser(::javax::swing::filechooser::FileSystemView *);
-  JFileChooser(::java::io::File *, ::javax::swing::filechooser::FileSystemView *);
-public: // actually protected
-  virtual void setup(::javax::swing::filechooser::FileSystemView *);
-public:
-  virtual void setDragEnabled(jboolean);
-  virtual jboolean getDragEnabled();
-  virtual ::java::io::File * getSelectedFile();
-  virtual void setSelectedFile(::java::io::File *);
-  virtual JArray< ::java::io::File * > * getSelectedFiles();
-  virtual void setSelectedFiles(JArray< ::java::io::File * > *);
-  virtual ::java::io::File * getCurrentDirectory();
-  virtual void setCurrentDirectory(::java::io::File *);
-  virtual void changeToParentDirectory();
-  virtual void rescanCurrentDirectory();
-  virtual void ensureFileIsVisible(::java::io::File *);
-  virtual jint showOpenDialog(::java::awt::Component *);
-  virtual jint showSaveDialog(::java::awt::Component *);
-  virtual jint showDialog(::java::awt::Component *, ::java::lang::String *);
-public: // actually protected
-  virtual ::javax::swing::JDialog * createDialog(::java::awt::Component *);
-public:
-  virtual jboolean getControlButtonsAreShown();
-  virtual void setControlButtonsAreShown(jboolean);
-  virtual jint getDialogType();
-  virtual void setDialogType(jint);
-  virtual void setDialogTitle(::java::lang::String *);
-  virtual ::java::lang::String * getDialogTitle();
-  virtual void setApproveButtonToolTipText(::java::lang::String *);
-  virtual ::java::lang::String * getApproveButtonToolTipText();
-  virtual jint getApproveButtonMnemonic();
-  virtual void setApproveButtonMnemonic(jint);
-  virtual void setApproveButtonMnemonic(jchar);
-  virtual void setApproveButtonText(::java::lang::String *);
-  virtual ::java::lang::String * getApproveButtonText();
-  virtual JArray< ::javax::swing::filechooser::FileFilter * > * getChoosableFileFilters();
-  virtual void addChoosableFileFilter(::javax::swing::filechooser::FileFilter *);
-  virtual jboolean removeChoosableFileFilter(::javax::swing::filechooser::FileFilter *);
-  virtual void resetChoosableFileFilters();
-  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter();
-  virtual jboolean isAcceptAllFileFilterUsed();
-  virtual void setAcceptAllFileFilterUsed(jboolean);
-  virtual ::javax::swing::JComponent * getAccessory();
-  virtual void setAccessory(::javax::swing::JComponent *);
-  virtual void setFileSelectionMode(jint);
-  virtual jint getFileSelectionMode();
-  virtual jboolean isFileSelectionEnabled();
-  virtual jboolean isDirectorySelectionEnabled();
-  virtual void setMultiSelectionEnabled(jboolean);
-  virtual jboolean isMultiSelectionEnabled();
-  virtual jboolean isFileHidingEnabled();
-  virtual void setFileHidingEnabled(jboolean);
-  virtual void setFileFilter(::javax::swing::filechooser::FileFilter *);
-  virtual ::javax::swing::filechooser::FileFilter * getFileFilter();
-  virtual void setFileView(::javax::swing::filechooser::FileView *);
-  virtual ::javax::swing::filechooser::FileView * getFileView();
-  virtual ::java::lang::String * getName(::java::io::File *);
-  virtual ::java::lang::String * getDescription(::java::io::File *);
-  virtual ::java::lang::String * getTypeDescription(::java::io::File *);
-  virtual ::javax::swing::Icon * getIcon(::java::io::File *);
-  virtual jboolean isTraversable(::java::io::File *);
-  virtual jboolean accept(::java::io::File *);
-  virtual void setFileSystemView(::javax::swing::filechooser::FileSystemView *);
-  virtual ::javax::swing::filechooser::FileSystemView * getFileSystemView();
-  virtual void approveSelection();
-  virtual void cancelSelection();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-public: // actually protected
-  virtual void fireActionPerformed(::java::lang::String *);
-public:
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::plaf::FileChooserUI * getUI();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 3162921138695327837LL;
-public:
-  static const jint OPEN_DIALOG = 0;
-  static const jint SAVE_DIALOG = 1;
-  static const jint CUSTOM_DIALOG = 2;
-  static const jint CANCEL_OPTION = 1;
-  static const jint APPROVE_OPTION = 0;
-  static const jint ERROR_OPTION = -1;
-  static const jint FILES_ONLY = 0;
-  static const jint DIRECTORIES_ONLY = 1;
-  static const jint FILES_AND_DIRECTORIES = 2;
-  static ::java::lang::String * CANCEL_SELECTION;
-  static ::java::lang::String * APPROVE_SELECTION;
-  static ::java::lang::String * APPROVE_BUTTON_TEXT_CHANGED_PROPERTY;
-  static ::java::lang::String * APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY;
-  static ::java::lang::String * APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY;
-  static ::java::lang::String * CONTROL_BUTTONS_ARE_SHOWN_CHANGED_PROPERTY;
-  static ::java::lang::String * DIRECTORY_CHANGED_PROPERTY;
-  static ::java::lang::String * SELECTED_FILE_CHANGED_PROPERTY;
-  static ::java::lang::String * SELECTED_FILES_CHANGED_PROPERTY;
-  static ::java::lang::String * MULTI_SELECTION_ENABLED_CHANGED_PROPERTY;
-  static ::java::lang::String * FILE_SYSTEM_VIEW_CHANGED_PROPERTY;
-  static ::java::lang::String * FILE_VIEW_CHANGED_PROPERTY;
-  static ::java::lang::String * FILE_HIDING_CHANGED_PROPERTY;
-  static ::java::lang::String * FILE_FILTER_CHANGED_PROPERTY;
-  static ::java::lang::String * FILE_SELECTION_MODE_CHANGED_PROPERTY;
-  static ::java::lang::String * ACCESSORY_CHANGED_PROPERTY;
-  static ::java::lang::String * ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY;
-  static ::java::lang::String * DIALOG_TITLE_CHANGED_PROPERTY;
-  static ::java::lang::String * DIALOG_TYPE_CHANGED_PROPERTY;
-  static ::java::lang::String * CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) accessibleContext;
-private:
-  ::javax::swing::filechooser::FileSystemView * fsv;
-  ::javax::swing::JComponent * accessory;
-  jint approveButtonMnemonic;
-  ::java::lang::String * approveButtonText;
-  ::java::lang::String * approveButtonToolTipText;
-  ::java::util::ArrayList * choosableFilters;
-  jboolean isAcceptAll;
-  ::java::lang::String * dialogTitle;
-  jint dialogType;
-  jint retval;
-  jboolean multiSelection;
-  jboolean fileHiding;
-  jint fileSelectionMode;
-  ::javax::swing::filechooser::FileView * fv;
-  jboolean controlButtonsShown;
-  ::java::io::File * currentDir;
-  ::javax::swing::filechooser::FileFilter * currentFilter;
-  JArray< ::java::io::File * > * selectedFiles;
-  ::java::io::File * selectedFile;
-  jboolean dragEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFileChooser__
diff --git a/libjava/javax/swing/JFormattedTextField$AbstractFormatter.h b/libjava/javax/swing/JFormattedTextField$AbstractFormatter.h
deleted file mode 100644
index d7ef6b51f24..00000000000
--- a/libjava/javax/swing/JFormattedTextField$AbstractFormatter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFormattedTextField$AbstractFormatter__
-#define __javax_swing_JFormattedTextField$AbstractFormatter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class JFormattedTextField;
-        class JFormattedTextField$AbstractFormatter;
-      namespace text
-      {
-          class DocumentFilter;
-          class NavigationFilter;
-      }
-    }
-  }
-}
-
-class javax::swing::JFormattedTextField$AbstractFormatter : public ::java::lang::Object
-{
-
-public:
-  JFormattedTextField$AbstractFormatter();
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual ::javax::swing::text::DocumentFilter * getDocumentFilter();
-  virtual ::javax::swing::JFormattedTextField * getFormattedTextField();
-  virtual ::javax::swing::text::NavigationFilter * getNavigationFilter();
-public:
-  virtual void install(::javax::swing::JFormattedTextField *);
-  virtual void uninstall();
-public: // actually protected
-  virtual void invalidEdit();
-  virtual void setEditValid(jboolean);
-public:
-  virtual ::java::lang::Object * stringToValue(::java::lang::String *) = 0;
-  virtual ::java::lang::String * valueToString(::java::lang::Object *) = 0;
-private:
-  static const jlong serialVersionUID = -5193212041738979680LL;
-  ::javax::swing::JFormattedTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) textField;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFormattedTextField$AbstractFormatter__
diff --git a/libjava/javax/swing/JFormattedTextField$AbstractFormatterFactory.h b/libjava/javax/swing/JFormattedTextField$AbstractFormatterFactory.h
deleted file mode 100644
index 45c633db4e4..00000000000
--- a/libjava/javax/swing/JFormattedTextField$AbstractFormatterFactory.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFormattedTextField$AbstractFormatterFactory__
-#define __javax_swing_JFormattedTextField$AbstractFormatterFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFormattedTextField;
-        class JFormattedTextField$AbstractFormatter;
-        class JFormattedTextField$AbstractFormatterFactory;
-    }
-  }
-}
-
-class javax::swing::JFormattedTextField$AbstractFormatterFactory : public ::java::lang::Object
-{
-
-public:
-  JFormattedTextField$AbstractFormatterFactory();
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getFormatter(::javax::swing::JFormattedTextField *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFormattedTextField$AbstractFormatterFactory__
diff --git a/libjava/javax/swing/JFormattedTextField.h b/libjava/javax/swing/JFormattedTextField.h
deleted file mode 100644
index 5c79e06e605..00000000000
--- a/libjava/javax/swing/JFormattedTextField.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFormattedTextField__
-#define __javax_swing_JFormattedTextField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-    namespace text
-    {
-        class Format;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class JFormattedTextField;
-        class JFormattedTextField$AbstractFormatter;
-        class JFormattedTextField$AbstractFormatterFactory;
-      namespace text
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::JFormattedTextField : public ::javax::swing::JTextField
-{
-
-public:
-  JFormattedTextField();
-  JFormattedTextField(::java::text::Format *);
-  JFormattedTextField(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  JFormattedTextField(::javax::swing::JFormattedTextField$AbstractFormatterFactory *);
-  JFormattedTextField(::javax::swing::JFormattedTextField$AbstractFormatterFactory *, ::java::lang::Object *);
-  JFormattedTextField(::java::lang::Object *);
-private:
-  ::javax::swing::JFormattedTextField$AbstractFormatterFactory * getAppropriateFormatterFactory(::java::text::Format *);
-public:
-  virtual void commitEdit();
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual jint getFocusLostBehavior();
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getFormatter();
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatterFactory * getFormatterFactory();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::lang::Object * getValue();
-public: // actually protected
-  virtual void invalidEdit();
-public:
-  virtual jboolean isEditValid();
-public: // actually protected
-  virtual void processFocusEvent(::java::awt::event::FocusEvent *);
-public:
-  virtual void setDocument(::javax::swing::text::Document *);
-  virtual void setFocusLostBehavior(jint);
-public: // actually protected
-  virtual void setFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
-public:
-  virtual void setFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatterFactory *);
-  virtual void setValue(::java::lang::Object *);
-public: // actually package-private
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatterFactory * createFormatterFactory(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 5464657870110180632LL;
-public:
-  static const jint COMMIT = 0;
-  static const jint COMMIT_OR_REVERT = 1;
-  static const jint REVERT = 2;
-  static const jint PERSIST = 3;
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) value;
-  jint focusLostBehavior;
-  ::javax::swing::JFormattedTextField$AbstractFormatterFactory * formatterFactory;
-  ::javax::swing::JFormattedTextField$AbstractFormatter * formatter;
-public: // actually package-private
-  jboolean editValid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFormattedTextField__
diff --git a/libjava/javax/swing/JFrame$AccessibleJFrame.h b/libjava/javax/swing/JFrame$AccessibleJFrame.h
deleted file mode 100644
index dbb3c553faa..00000000000
--- a/libjava/javax/swing/JFrame$AccessibleJFrame.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFrame$AccessibleJFrame__
-#define __javax_swing_JFrame$AccessibleJFrame__
-
-#pragma interface
-
-#include <java/awt/Frame$AccessibleAWTFrame.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFrame;
-        class JFrame$AccessibleJFrame;
-    }
-  }
-}
-
-class javax::swing::JFrame$AccessibleJFrame : public ::java::awt::Frame$AccessibleAWTFrame
-{
-
-public: // actually protected
-  JFrame$AccessibleJFrame(::javax::swing::JFrame *);
-public: // actually package-private
-  ::javax::swing::JFrame * __attribute__((aligned(__alignof__( ::java::awt::Frame$AccessibleAWTFrame)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFrame$AccessibleJFrame__
diff --git a/libjava/javax/swing/JFrame.h b/libjava/javax/swing/JFrame.h
deleted file mode 100644
index 705e200b2f9..00000000000
--- a/libjava/javax/swing/JFrame.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JFrame__
-#define __javax_swing_JFrame__
-
-#pragma interface
-
-#include <java/awt/Frame.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Graphics;
-        class GraphicsConfiguration;
-        class LayoutManager;
-      namespace event
-      {
-          class KeyEvent;
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JFrame;
-        class JLayeredPane;
-        class JMenuBar;
-        class JRootPane;
-    }
-  }
-}
-
-class javax::swing::JFrame : public ::java::awt::Frame
-{
-
-public:
-  JFrame();
-  JFrame(::java::lang::String *);
-  JFrame(::java::awt::GraphicsConfiguration *);
-  JFrame(::java::lang::String *, ::java::awt::GraphicsConfiguration *);
-public: // actually protected
-  virtual void frameInit();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::javax::swing::JMenuBar * getJMenuBar();
-  virtual void setJMenuBar(::javax::swing::JMenuBar *);
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual ::javax::swing::JRootPane * getRootPane();
-public: // actually protected
-  virtual void setRootPane(::javax::swing::JRootPane *);
-  virtual ::javax::swing::JRootPane * createRootPane();
-public:
-  virtual ::java::awt::Container * getContentPane();
-  virtual void setContentPane(::java::awt::Container *);
-  virtual ::java::awt::Component * getGlassPane();
-  virtual void setGlassPane(::java::awt::Component *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void remove(::java::awt::Component *);
-public: // actually protected
-  virtual jboolean isRootPaneCheckingEnabled();
-  virtual void setRootPaneCheckingEnabled(jboolean);
-public:
-  virtual void update(::java::awt::Graphics *);
-public: // actually protected
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  static void setDefaultLookAndFeelDecorated(jboolean);
-  static jboolean isDefaultLookAndFeelDecorated();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual jint getDefaultCloseOperation();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-  virtual void processWindowEvent(::java::awt::event::WindowEvent *);
-public:
-  virtual void setDefaultCloseOperation(jint);
-  static const jint EXIT_ON_CLOSE = 3;
-private:
-  static const jlong serialVersionUID = -3362141868504252139LL;
-  static jboolean defaultLookAndFeelDecorated;
-  jint __attribute__((aligned(__alignof__( ::java::awt::Frame)))) closeAction;
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-  ::javax::swing::JRootPane * rootPane;
-  jboolean rootPaneCheckingEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JFrame__
diff --git a/libjava/javax/swing/JInternalFrame$AccessibleJInternalFrame.h b/libjava/javax/swing/JInternalFrame$AccessibleJInternalFrame.h
deleted file mode 100644
index 94749ac5a50..00000000000
--- a/libjava/javax/swing/JInternalFrame$AccessibleJInternalFrame.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JInternalFrame$AccessibleJInternalFrame__
-#define __javax_swing_JInternalFrame$AccessibleJInternalFrame__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JInternalFrame;
-        class JInternalFrame$AccessibleJInternalFrame;
-    }
-  }
-}
-
-class javax::swing::JInternalFrame$AccessibleJInternalFrame : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JInternalFrame$AccessibleJInternalFrame(::javax::swing::JInternalFrame *);
-public:
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-private:
-  static const jlong serialVersionUID = 5931936924175476797LL;
-public: // actually package-private
-  ::javax::swing::JInternalFrame * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JInternalFrame$AccessibleJInternalFrame__
diff --git a/libjava/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.h b/libjava/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.h
deleted file mode 100644
index bcea0c5139f..00000000000
--- a/libjava/javax/swing/JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon__
-#define __javax_swing_JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JInternalFrame$JDesktopIcon;
-        class JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon;
-    }
-  }
-}
-
-class javax::swing::JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon(::javax::swing::JInternalFrame$JDesktopIcon *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-private:
-  static const jlong serialVersionUID = 5035560458941637802LL;
-public: // actually package-private
-  ::javax::swing::JInternalFrame$JDesktopIcon * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JInternalFrame$JDesktopIcon$AccessibleJDesktopIcon__
diff --git a/libjava/javax/swing/JInternalFrame$JDesktopIcon.h b/libjava/javax/swing/JInternalFrame$JDesktopIcon.h
deleted file mode 100644
index dc20f4d5781..00000000000
--- a/libjava/javax/swing/JInternalFrame$JDesktopIcon.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JInternalFrame$JDesktopIcon__
-#define __javax_swing_JInternalFrame$JDesktopIcon__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JDesktopPane;
-        class JInternalFrame;
-        class JInternalFrame$JDesktopIcon;
-      namespace plaf
-      {
-          class DesktopIconUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JInternalFrame$JDesktopIcon : public ::javax::swing::JComponent
-{
-
-public:
-  JInternalFrame$JDesktopIcon(::javax::swing::JInternalFrame *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::JDesktopPane * getDesktopPane();
-  virtual ::javax::swing::JInternalFrame * getInternalFrame();
-  virtual ::javax::swing::plaf::DesktopIconUI * getUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual void setInternalFrame(::javax::swing::JInternalFrame *);
-  virtual void setUI(::javax::swing::plaf::DesktopIconUI *);
-  virtual void updateUI();
-private:
-  static const jlong serialVersionUID = 4672973344731387687LL;
-public: // actually package-private
-  ::javax::swing::JInternalFrame * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) frame;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JInternalFrame$JDesktopIcon__
diff --git a/libjava/javax/swing/JInternalFrame.h b/libjava/javax/swing/JInternalFrame.h
deleted file mode 100644
index 36deb84c55e..00000000000
--- a/libjava/javax/swing/JInternalFrame.h
+++ /dev/null
@@ -1,192 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JInternalFrame__
-#define __javax_swing_JInternalFrame__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Graphics;
-        class LayoutManager;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JDesktopPane;
-        class JInternalFrame;
-        class JInternalFrame$JDesktopIcon;
-        class JLayeredPane;
-        class JMenuBar;
-        class JRootPane;
-      namespace event
-      {
-          class InternalFrameListener;
-      }
-      namespace plaf
-      {
-          class InternalFrameUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JInternalFrame : public ::javax::swing::JComponent
-{
-
-public:
-  JInternalFrame();
-  JInternalFrame(::java::lang::String *);
-  JInternalFrame(::java::lang::String *, jboolean);
-  JInternalFrame(::java::lang::String *, jboolean, jboolean);
-  JInternalFrame(::java::lang::String *, jboolean, jboolean, jboolean);
-  JInternalFrame(::java::lang::String *, jboolean, jboolean, jboolean, jboolean);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void addInternalFrameListener(::javax::swing::event::InternalFrameListener *);
-public: // actually protected
-  virtual ::javax::swing::JRootPane * createRootPane();
-public:
-  virtual void dispose();
-  virtual void doDefaultCloseAction();
-public: // actually protected
-  virtual void fireInternalFrameEvent(jint);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Container * getContentPane();
-  virtual jint getDefaultCloseOperation();
-  virtual ::javax::swing::JInternalFrame$JDesktopIcon * getDesktopIcon();
-  virtual ::javax::swing::JDesktopPane * getDesktopPane();
-  virtual ::java::awt::Container * getFocusCycleRootAncestor();
-  virtual ::java::awt::Component * getFocusOwner();
-  virtual ::javax::swing::Icon * getFrameIcon();
-  virtual ::java::awt::Component * getGlassPane();
-  virtual JArray< ::javax::swing::event::InternalFrameListener * > * getInternalFrameListeners();
-  virtual ::javax::swing::JMenuBar * getJMenuBar();
-  virtual jint getLayer();
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual ::javax::swing::JMenuBar * getMenuBar();
-  virtual ::java::awt::Component * getMostRecentFocusOwner();
-  virtual ::java::awt::Rectangle * getNormalBounds();
-  virtual ::javax::swing::JRootPane * getRootPane();
-  virtual ::java::lang::String * getTitle();
-  virtual ::javax::swing::plaf::InternalFrameUI * getUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::lang::String * getWarningString();
-  virtual void hide();
-  virtual jboolean isClosable();
-  virtual jboolean isClosed();
-  virtual jboolean isFocusCycleRoot();
-  virtual jboolean isIcon();
-  virtual jboolean isIconifiable();
-  virtual jboolean isMaximizable();
-  virtual jboolean isMaximum();
-  virtual jboolean isResizable();
-public: // actually protected
-  virtual jboolean isRootPaneCheckingEnabled();
-public:
-  virtual jboolean isSelected();
-  virtual void moveToBack();
-  virtual void moveToFront();
-  virtual void pack();
-public: // actually protected
-  virtual void paintComponent(::java::awt::Graphics *);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void remove(::java::awt::Component *);
-  virtual void removeInternalFrameListener(::javax::swing::event::InternalFrameListener *);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void restoreSubcomponentFocus();
-  virtual void setClosable(jboolean);
-  virtual void setClosed(jboolean);
-  virtual void setContentPane(::java::awt::Container *);
-  virtual void setDefaultCloseOperation(jint);
-  virtual void setDesktopIcon(::javax::swing::JInternalFrame$JDesktopIcon *);
-  virtual void setFocusCycleRoot(jboolean);
-  virtual void setFrameIcon(::javax::swing::Icon *);
-  virtual void setGlassPane(::java::awt::Component *);
-  virtual void setIcon(jboolean);
-  virtual void setIconifiable(jboolean);
-  virtual void setJMenuBar(::javax::swing::JMenuBar *);
-  virtual void setLayer(jint);
-  virtual void setLayer(::java::lang::Integer *);
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  virtual void setMaximizable(jboolean);
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setMaximum(jboolean);
-  virtual void setMenuBar(::javax::swing::JMenuBar *);
-  virtual void setNormalBounds(::java::awt::Rectangle *);
-  virtual void setResizable(jboolean);
-public: // actually protected
-  virtual void setRootPane(::javax::swing::JRootPane *);
-  virtual void setRootPaneCheckingEnabled(jboolean);
-public:
-  virtual void setSelected(jboolean);
-  virtual void setTitle(::java::lang::String *);
-  virtual void show();
-  virtual void setUI(::javax::swing::plaf::InternalFrameUI *);
-  virtual void toBack();
-  virtual void toFront();
-  virtual void updateUI();
-public: // actually package-private
-  virtual void setWasIcon(jboolean, ::java::lang::String *);
-  virtual jboolean getWasIcon();
-private:
-  void fireVetoableChange(::java::lang::String *, jboolean, jboolean);
-  static const jlong serialVersionUID = -5425177187760785402LL;
-public:
-  static ::java::lang::String * CONTENT_PANE_PROPERTY;
-  static ::java::lang::String * FRAME_ICON_PROPERTY;
-  static ::java::lang::String * GLASS_PANE_PROPERTY;
-  static ::java::lang::String * IS_CLOSED_PROPERTY;
-  static ::java::lang::String * IS_ICON_PROPERTY;
-  static ::java::lang::String * IS_MAXIMUM_PROPERTY;
-  static ::java::lang::String * IS_SELECTED_PROPERTY;
-  static ::java::lang::String * LAYERED_PANE_PROPERTY;
-  static ::java::lang::String * MENU_BAR_PROPERTY;
-  static ::java::lang::String * ROOT_PANE_PROPERTY;
-  static ::java::lang::String * TITLE_PROPERTY;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) closable;
-  jboolean iconable;
-  jboolean isClosed__;
-  jboolean isIcon__;
-  jboolean isMaximum__;
-  jboolean isSelected__;
-  jboolean maximizable;
-  jboolean rootPaneCheckingEnabled;
-  jboolean resizable;
-  ::javax::swing::JInternalFrame$JDesktopIcon * desktopIcon;
-  ::javax::swing::Icon * frameIcon;
-  ::javax::swing::JRootPane * rootPane;
-  ::java::lang::String * title;
-private:
-  ::java::awt::Rectangle * storedBounds;
-  ::java::awt::Component * defaultFocus;
-  jint defaultCloseOperation;
-  jboolean isFirstTimeVisible;
-  jboolean wasIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JInternalFrame__
diff --git a/libjava/javax/swing/JLabel$AccessibleJLabel.h b/libjava/javax/swing/JLabel$AccessibleJLabel.h
deleted file mode 100644
index 0fb4609aa68..00000000000
--- a/libjava/javax/swing/JLabel$AccessibleJLabel.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JLabel$AccessibleJLabel__
-#define __javax_swing_JLabel$AccessibleJLabel__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JLabel;
-        class JLabel$AccessibleJLabel;
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::JLabel$AccessibleJLabel : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JLabel$AccessibleJLabel(::javax::swing::JLabel *);
-public:
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::java::lang::String * getSelectedText();
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint);
-  virtual ::java::lang::String * getAtIndex(jint, jint);
-  virtual ::java::lang::String * getAfterIndex(jint, jint);
-  virtual ::java::lang::String * getBeforeIndex(jint, jint);
-  virtual jint getCaretPosition();
-  virtual jint getCharCount();
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-private:
-  ::java::awt::Rectangle * getTextRectangle();
-public:
-  virtual jint getIndexAtPoint(::java::awt::Point *);
-public: // actually package-private
-  ::javax::swing::JLabel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JLabel$AccessibleJLabel__
diff --git a/libjava/javax/swing/JLabel.h b/libjava/javax/swing/JLabel.h
deleted file mode 100644
index 08f59ed8f8c..00000000000
--- a/libjava/javax/swing/JLabel.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JLabel__
-#define __javax_swing_JLabel__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Font;
-        class Image;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JLabel;
-      namespace plaf
-      {
-          class LabelUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JLabel : public ::javax::swing::JComponent
-{
-
-public:
-  JLabel();
-  JLabel(::javax::swing::Icon *);
-  JLabel(::javax::swing::Icon *, jint);
-  JLabel(::java::lang::String *);
-  JLabel(::java::lang::String *, jint);
-  JLabel(::java::lang::String *, ::javax::swing::Icon *, jint);
-  virtual ::javax::swing::plaf::LabelUI * getUI();
-  virtual void setUI(::javax::swing::plaf::LabelUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::java::lang::String * getText();
-  virtual void setText(::java::lang::String *);
-  virtual ::javax::swing::Icon * getIcon();
-  virtual void setIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getDisabledIcon();
-  virtual void setDisabledIcon(::javax::swing::Icon *);
-  virtual void setDisplayedMnemonic(jint);
-  virtual void setDisplayedMnemonic(jchar);
-  virtual jint getDisplayedMnemonic();
-  virtual void setDisplayedMnemonicIndex(jint);
-  virtual jint getDisplayedMnemonicIndex();
-public: // actually protected
-  virtual jint checkHorizontalKey(jint, ::java::lang::String *);
-  virtual jint checkVerticalKey(jint, ::java::lang::String *);
-public:
-  virtual jint getIconTextGap();
-  virtual void setIconTextGap(jint);
-  virtual jint getVerticalAlignment();
-  virtual void setVerticalAlignment(jint);
-  virtual jint getHorizontalAlignment();
-  virtual void setHorizontalAlignment(jint);
-  virtual jint getVerticalTextPosition();
-  virtual void setVerticalTextPosition(jint);
-  virtual jint getHorizontalTextPosition();
-  virtual void setHorizontalTextPosition(jint);
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Component * getLabelFor();
-  virtual void setLabelFor(::java::awt::Component *);
-  virtual void setFont(::java::awt::Font *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 5496508283662221534LL;
-public: // actually package-private
-  static ::java::lang::String * LABEL_PROPERTY;
-public: // actually protected
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) labelFor;
-public: // actually package-private
-  ::java::lang::String * text;
-private:
-  jint horizontalAlignment;
-  jint horizontalTextPosition;
-  jint verticalAlignment;
-  jint verticalTextPosition;
-  ::javax::swing::Icon * icon;
-  ::javax::swing::Icon * disabledIcon;
-  jint displayedMnemonic;
-  jint displayedMnemonicIndex;
-  jint iconTextGap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JLabel__
diff --git a/libjava/javax/swing/JLayeredPane$AccessibleJLayeredPane.h b/libjava/javax/swing/JLayeredPane$AccessibleJLayeredPane.h
deleted file mode 100644
index 64eaa6d8b3b..00000000000
--- a/libjava/javax/swing/JLayeredPane$AccessibleJLayeredPane.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JLayeredPane$AccessibleJLayeredPane__
-#define __javax_swing_JLayeredPane$AccessibleJLayeredPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JLayeredPane;
-        class JLayeredPane$AccessibleJLayeredPane;
-    }
-  }
-}
-
-class javax::swing::JLayeredPane$AccessibleJLayeredPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JLayeredPane$AccessibleJLayeredPane(::javax::swing::JLayeredPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JLayeredPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JLayeredPane$AccessibleJLayeredPane__
diff --git a/libjava/javax/swing/JLayeredPane.h b/libjava/javax/swing/JLayeredPane.h
deleted file mode 100644
index 3e6acaa9248..00000000000
--- a/libjava/javax/swing/JLayeredPane.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JLayeredPane__
-#define __javax_swing_JLayeredPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JLayeredPane;
-    }
-  }
-}
-
-class javax::swing::JLayeredPane : public ::javax::swing::JComponent
-{
-
-public:
-  JLayeredPane();
-  virtual jint getLayer(::java::awt::Component *);
-  static jint getLayer(::javax::swing::JComponent *);
-  static ::javax::swing::JLayeredPane * getLayeredPaneAbove(::java::awt::Component *);
-  virtual jint highestLayer();
-  virtual jint lowestLayer();
-  virtual void moveToFront(::java::awt::Component *);
-  virtual void moveToBack(::java::awt::Component *);
-  virtual jint getPosition(::java::awt::Component *);
-  virtual void setPosition(::java::awt::Component *, jint);
-  virtual JArray< ::java::awt::Component * > * getComponentsInLayer(jint);
-  virtual jint getComponentCountInLayer(jint);
-public: // actually protected
-  virtual ::java::util::Hashtable * getComponentToLayer();
-public:
-  virtual jint getIndexOf(::java::awt::Component *);
-public: // actually protected
-  virtual ::java::lang::Integer * getObjectForLayer(jint);
-  virtual jint insertIndexForLayer(jint, jint);
-private:
-  jint insertIndexForLayer(::java::awt::Component *, jint, jint);
-public:
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual void setLayer(::java::awt::Component *, jint);
-  virtual void setLayer(::java::awt::Component *, jint, jint);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  static void putLayer(::javax::swing::JComponent *, jint);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual void paint(::java::awt::Graphics *);
-  virtual jboolean isOptimizedDrawingEnabled();
-private:
-  static const jlong serialVersionUID = 5534920399324590459LL;
-public:
-  static ::java::lang::String * LAYER_PROPERTY;
-  static ::java::lang::Integer * FRAME_CONTENT_LAYER;
-  static ::java::lang::Integer * DEFAULT_LAYER;
-  static ::java::lang::Integer * PALETTE_LAYER;
-  static ::java::lang::Integer * MODAL_LAYER;
-  static ::java::lang::Integer * POPUP_LAYER;
-  static ::java::lang::Integer * DRAG_LAYER;
-private:
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) componentToLayer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JLayeredPane__
diff --git a/libjava/javax/swing/JList$1.h b/libjava/javax/swing/JList$1.h
deleted file mode 100644
index 92e7546fa8b..00000000000
--- a/libjava/javax/swing/JList$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$1__
-#define __javax_swing_JList$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-        class JList$1;
-    }
-  }
-}
-
-class javax::swing::JList$1 : public ::javax::swing::AbstractListModel
-{
-
-public: // actually package-private
-  JList$1(::javax::swing::JList *, JArray< ::java::lang::Object * > *);
-public:
-  jint getSize();
-  ::java::lang::Object * getElementAt(jint);
-public: // actually package-private
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
-private:
-  JArray< ::java::lang::Object * > * val$items;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$1__
diff --git a/libjava/javax/swing/JList$2.h b/libjava/javax/swing/JList$2.h
deleted file mode 100644
index 8c471ab8d22..00000000000
--- a/libjava/javax/swing/JList$2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$2__
-#define __javax_swing_JList$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-        class JList$2;
-    }
-  }
-}
-
-class javax::swing::JList$2 : public ::javax::swing::AbstractListModel
-{
-
-public: // actually package-private
-  JList$2(::javax::swing::JList *, ::java::util::Vector *);
-public:
-  jint getSize();
-  ::java::lang::Object * getElementAt(jint);
-public: // actually package-private
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
-private:
-  ::java::util::Vector * val$items;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$2__
diff --git a/libjava/javax/swing/JList$3.h b/libjava/javax/swing/JList$3.h
deleted file mode 100644
index 8d50682139d..00000000000
--- a/libjava/javax/swing/JList$3.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$3__
-#define __javax_swing_JList$3__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-        class JList$3;
-    }
-  }
-}
-
-class javax::swing::JList$3 : public ::javax::swing::AbstractListModel
-{
-
-public: // actually package-private
-  JList$3(::javax::swing::JList *, ::java::util::Vector *);
-public:
-  jint getSize();
-  ::java::lang::Object * getElementAt(jint);
-public: // actually package-private
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) this$0;
-private:
-  ::java::util::Vector * val$listData;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$3__
diff --git a/libjava/javax/swing/JList$AccessibleJList$AccessibleJListChild.h b/libjava/javax/swing/JList$AccessibleJList$AccessibleJListChild.h
deleted file mode 100644
index 1ca2d171014..00000000000
--- a/libjava/javax/swing/JList$AccessibleJList$AccessibleJListChild.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$AccessibleJList$AccessibleJListChild__
-#define __javax_swing_JList$AccessibleJList$AccessibleJListChild__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JList;
-        class JList$AccessibleJList;
-        class JList$AccessibleJList$AccessibleJListChild;
-    }
-  }
-}
-
-class javax::swing::JList$AccessibleJList$AccessibleJListChild : public ::javax::accessibility::AccessibleContext
-{
-
-public:
-  JList$AccessibleJList$AccessibleJListChild(::javax::swing::JList$AccessibleJList *, ::javax::swing::JList *, jint);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-  virtual jboolean isShowing();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jboolean isFocusTraversable();
-  virtual void requestFocus();
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-public: // actually package-private
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) parent;
-  jint listIndex;
-  ::java::awt::Cursor * cursor;
-  ::javax::swing::JList$AccessibleJList * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$AccessibleJList$AccessibleJListChild__
diff --git a/libjava/javax/swing/JList$AccessibleJList.h b/libjava/javax/swing/JList$AccessibleJList.h
deleted file mode 100644
index ca1842f5682..00000000000
--- a/libjava/javax/swing/JList$AccessibleJList.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$AccessibleJList__
-#define __javax_swing_JList$AccessibleJList__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JList;
-        class JList$AccessibleJList;
-      namespace event
-      {
-          class ListDataEvent;
-          class ListSelectionEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JList$AccessibleJList : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JList$AccessibleJList(::javax::swing::JList *);
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-public: // actually package-private
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$AccessibleJList__
diff --git a/libjava/javax/swing/JList$ListListener.h b/libjava/javax/swing/JList$ListListener.h
deleted file mode 100644
index 87854ebfd53..00000000000
--- a/libjava/javax/swing/JList$ListListener.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList$ListListener__
-#define __javax_swing_JList$ListListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-        class JList$ListListener;
-      namespace event
-      {
-          class ListDataEvent;
-          class ListSelectionEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JList$ListListener : public ::java::lang::Object
-{
-
-  JList$ListListener(::javax::swing::JList *);
-public:
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually package-private
-  JList$ListListener(::javax::swing::JList *, ::javax::swing::JList$ListListener *);
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList$ListListener__
diff --git a/libjava/javax/swing/JList.h b/libjava/javax/swing/JList.h
deleted file mode 100644
index 2e68ae501bd..00000000000
--- a/libjava/javax/swing/JList.h
+++ /dev/null
@@ -1,162 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JList__
-#define __javax_swing_JList__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JList;
-        class JList$ListListener;
-        class ListCellRenderer;
-        class ListModel;
-        class ListSelectionModel;
-      namespace event
-      {
-          class ListSelectionListener;
-      }
-      namespace plaf
-      {
-          class ListUI;
-      }
-      namespace text
-      {
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::JList : public ::javax::swing::JComponent
-{
-
-public: // actually protected
-  virtual void fireSelectionValueChanged(jint, jint, jboolean);
-public:
-  JList();
-  JList(JArray< ::java::lang::Object * > *);
-  JList(::java::util::Vector *);
-  JList(::javax::swing::ListModel *);
-private:
-  void init(::javax::swing::ListModel *);
-public: // actually protected
-  virtual ::javax::swing::ListSelectionModel * createSelectionModel();
-public:
-  virtual jint getFixedCellHeight();
-  virtual void setFixedCellHeight(jint);
-  virtual jint getFixedCellWidth();
-  virtual void setFixedCellWidth(jint);
-  virtual jint getVisibleRowCount();
-  virtual void setVisibleRowCount(jint);
-  virtual void addListSelectionListener(::javax::swing::event::ListSelectionListener *);
-  virtual void removeListSelectionListener(::javax::swing::event::ListSelectionListener *);
-  virtual JArray< ::javax::swing::event::ListSelectionListener * > * getListSelectionListeners();
-  virtual jint getSelectionMode();
-  virtual void setSelectionMode(jint);
-  virtual void setSelectedIndex(jint);
-  virtual void setSelectedIndices(JArray< jint > *);
-  virtual jint getSelectedIndex();
-  virtual jboolean isSelectionEmpty();
-  virtual jint getFirstVisibleIndex();
-  virtual jint locationToIndex(::java::awt::Point *);
-  virtual ::java::awt::Point * indexToLocation(jint);
-  virtual jint getLastVisibleIndex();
-  virtual JArray< jint > * getSelectedIndices();
-  virtual jboolean isSelectedIndex(jint);
-  virtual ::java::lang::Object * getSelectedValue();
-  virtual JArray< ::java::lang::Object * > * getSelectedValues();
-  virtual ::java::awt::Color * getSelectionBackground();
-  virtual void setSelectionBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getSelectionForeground();
-  virtual void setSelectionForeground(::java::awt::Color *);
-  virtual void setSelectedValue(::java::lang::Object *, jboolean);
-  virtual void ensureIndexIsVisible(jint);
-  virtual void setListData(JArray< ::java::lang::Object * > *);
-private:
-  ::javax::swing::ListModel * createListModel(JArray< ::java::lang::Object * > *);
-  ::javax::swing::ListModel * createListModel(::java::util::Vector *);
-public:
-  virtual void setListData(::java::util::Vector *);
-  virtual ::javax::swing::ListCellRenderer * getCellRenderer();
-  virtual void setCellRenderer(::javax::swing::ListCellRenderer *);
-  virtual ::javax::swing::ListModel * getModel();
-  virtual void setModel(::javax::swing::ListModel *);
-  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
-  virtual void setSelectionModel(::javax::swing::ListSelectionModel *);
-  virtual ::javax::swing::plaf::ListUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ListUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::lang::Object * getPrototypeCellValue();
-  virtual void setPrototypeCellValue(::java::lang::Object *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual jboolean getScrollableTracksViewportHeight();
-  virtual jint getAnchorSelectionIndex();
-  virtual jint getLeadSelectionIndex();
-  virtual jint getMinSelectionIndex();
-  virtual jint getMaxSelectionIndex();
-  virtual void clearSelection();
-  virtual void setSelectionInterval(jint, jint);
-  virtual void addSelectionInterval(jint, jint);
-  virtual void removeSelectionInterval(jint, jint);
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-  virtual jboolean getDragEnabled();
-  virtual void setDragEnabled(jboolean);
-  virtual jint getLayoutOrientation();
-  virtual void setLayoutOrientation(jint);
-  virtual ::java::awt::Rectangle * getCellBounds(jint, jint);
-  virtual jint getNextMatch(::java::lang::String *, jint, ::javax::swing::text::Position$Bias *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 4406629526391098046LL;
-public:
-  static const jint VERTICAL = 0;
-  static const jint VERTICAL_WRAP = 1;
-  static const jint HORIZONTAL_WRAP = 2;
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) dragEnabled;
-  ::javax::swing::ListCellRenderer * cellRenderer;
-  jint fixedCellWidth;
-  jint fixedCellHeight;
-  jint layoutOrientation;
-  ::javax::swing::ListModel * model;
-  ::java::lang::Object * prototypeCellValue;
-  ::java::awt::Color * selectionBackground;
-  ::java::awt::Color * selectionForeground;
-  ::javax::swing::ListSelectionModel * selectionModel;
-  jint visibleRowCount;
-  ::javax::swing::JList$ListListener * listListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JList__
diff --git a/libjava/javax/swing/JMenu$AccessibleJMenu.h b/libjava/javax/swing/JMenu$AccessibleJMenu.h
deleted file mode 100644
index 6c892b49193..00000000000
--- a/libjava/javax/swing/JMenu$AccessibleJMenu.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenu$AccessibleJMenu__
-#define __javax_swing_JMenu$AccessibleJMenu__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem$AccessibleJMenuItem.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleSelection;
-    }
-    namespace swing
-    {
-        class JMenu;
-        class JMenu$AccessibleJMenu;
-    }
-  }
-}
-
-class javax::swing::JMenu$AccessibleJMenu : public ::javax::swing::JMenuItem$AccessibleJMenuItem
-{
-
-public: // actually protected
-  JMenu$AccessibleJMenu(::javax::swing::JMenu *);
-public:
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual jint getAccessibleSelectionCount();
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-private:
-  static const jlong serialVersionUID = -8131864021059524309LL;
-public: // actually package-private
-  ::javax::swing::JMenu * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem$AccessibleJMenuItem)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenu$AccessibleJMenu__
diff --git a/libjava/javax/swing/JMenu$ActionChangedListener.h b/libjava/javax/swing/JMenu$ActionChangedListener.h
deleted file mode 100644
index 36623cf27b3..00000000000
--- a/libjava/javax/swing/JMenu$ActionChangedListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenu$ActionChangedListener__
-#define __javax_swing_JMenu$ActionChangedListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenu;
-        class JMenu$ActionChangedListener;
-        class JMenuItem;
-    }
-  }
-}
-
-class javax::swing::JMenu$ActionChangedListener : public ::java::lang::Object
-{
-
-public:
-  JMenu$ActionChangedListener(::javax::swing::JMenu *, ::javax::swing::JMenuItem *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-private:
-  ::javax::swing::JMenuItem * __attribute__((aligned(__alignof__( ::java::lang::Object)))) menuItem;
-public: // actually package-private
-  ::javax::swing::JMenu * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenu$ActionChangedListener__
diff --git a/libjava/javax/swing/JMenu$MenuChangeListener.h b/libjava/javax/swing/JMenu$MenuChangeListener.h
deleted file mode 100644
index 816f33e54d0..00000000000
--- a/libjava/javax/swing/JMenu$MenuChangeListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenu$MenuChangeListener__
-#define __javax_swing_JMenu$MenuChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenu;
-        class JMenu$MenuChangeListener;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JMenu$MenuChangeListener : public ::java::lang::Object
-{
-
-  JMenu$MenuChangeListener(::javax::swing::JMenu *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  JMenu$MenuChangeListener(::javax::swing::JMenu *, ::javax::swing::JMenu$MenuChangeListener *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) selected;
-public: // actually package-private
-  ::javax::swing::JMenu * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenu$MenuChangeListener__
diff --git a/libjava/javax/swing/JMenu$WinListener.h b/libjava/javax/swing/JMenu$WinListener.h
deleted file mode 100644
index e685e382ef5..00000000000
--- a/libjava/javax/swing/JMenu$WinListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenu$WinListener__
-#define __javax_swing_JMenu$WinListener__
-
-#pragma interface
-
-#include <java/awt/event/WindowAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenu;
-        class JMenu$WinListener;
-        class JPopupMenu;
-    }
-  }
-}
-
-class javax::swing::JMenu$WinListener : public ::java::awt::event::WindowAdapter
-{
-
-public:
-  JMenu$WinListener(::javax::swing::JMenu *, ::javax::swing::JPopupMenu *);
-  virtual void windowClosing(::java::awt::event::WindowEvent *);
-private:
-  static const jlong serialVersionUID = -6415815570638474823LL;
-public: // actually package-private
-  ::javax::swing::JMenu * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenu$WinListener__
diff --git a/libjava/javax/swing/JMenu.h b/libjava/javax/swing/JMenu.h
deleted file mode 100644
index 112d995a032..00000000000
--- a/libjava/javax/swing/JMenu.h
+++ /dev/null
@@ -1,141 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenu__
-#define __javax_swing_JMenu__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class ButtonModel;
-        class JMenu;
-        class JMenu$WinListener;
-        class JMenuItem;
-        class JPopupMenu;
-        class KeyStroke;
-        class MenuElement;
-      namespace event
-      {
-          class ChangeListener;
-          class MenuEvent;
-          class MenuListener;
-      }
-    }
-  }
-}
-
-class javax::swing::JMenu : public ::javax::swing::JMenuItem
-{
-
-public:
-  JMenu();
-  JMenu(::java::lang::String *);
-  JMenu(::javax::swing::Action *);
-  JMenu(::java::lang::String *, jboolean);
-  virtual ::javax::swing::JMenuItem * add(::javax::swing::JMenuItem *);
-  virtual ::java::awt::Component * add(::java::awt::Component *);
-  virtual ::java::awt::Component * add(::java::awt::Component *, jint);
-  virtual ::javax::swing::JMenuItem * add(::java::lang::String *);
-  virtual ::javax::swing::JMenuItem * add(::javax::swing::Action *);
-  virtual void remove(::javax::swing::JMenuItem *);
-  virtual void remove(jint);
-  virtual void remove(::java::awt::Component *);
-  virtual void removeAll();
-  virtual void insert(::java::lang::String *, jint);
-  virtual ::javax::swing::JMenuItem * insert(::javax::swing::JMenuItem *, jint);
-  virtual ::javax::swing::JMenuItem * insert(::javax::swing::Action *, jint);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual void setModel(::javax::swing::ButtonModel *);
-  virtual jboolean isSelected();
-  virtual void setSelected(jboolean);
-  virtual jboolean isPopupMenuVisible();
-  virtual void setPopupMenuVisible(jboolean);
-public: // actually protected
-  virtual ::java::awt::Point * getPopupMenuOrigin();
-public:
-  virtual jint getDelay();
-  virtual void setDelay(jint);
-  virtual void setMenuLocation(jint, jint);
-public: // actually protected
-  virtual ::javax::swing::JMenuItem * createActionComponent(::javax::swing::Action *);
-  virtual ::java::beans::PropertyChangeListener * createActionChangeListener(::javax::swing::JMenuItem *);
-public:
-  virtual void addSeparator();
-  virtual void insertSeparator(jint);
-  virtual ::javax::swing::JMenuItem * getItem(jint);
-  virtual jint getItemCount();
-  virtual jboolean isTearOff();
-  virtual jint getMenuComponentCount();
-  virtual ::java::awt::Component * getMenuComponent(jint);
-  virtual JArray< ::java::awt::Component * > * getMenuComponents();
-  virtual jboolean isTopLevelMenu();
-  virtual jboolean isMenuComponent(::java::awt::Component *);
-  virtual ::javax::swing::JPopupMenu * getPopupMenu();
-  virtual void addMenuListener(::javax::swing::event::MenuListener *);
-  virtual void removeMenuListener(::javax::swing::event::MenuListener *);
-  virtual JArray< ::javax::swing::event::MenuListener * > * getMenuListeners();
-public: // actually protected
-  virtual void fireMenuSelected();
-  virtual void fireMenuDeselected();
-  virtual void fireMenuCanceled();
-  virtual ::javax::swing::JMenu$WinListener * createWinListener(::javax::swing::JPopupMenu *);
-public:
-  virtual void menuSelectionChanged(jboolean);
-  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
-  virtual ::java::awt::Component * getComponent();
-  virtual void setAccelerator(::javax::swing::KeyStroke *);
-public: // actually protected
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  virtual void doClick(jint);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual JArray< ::javax::swing::MenuElement * > * createPath(::javax::swing::JMenu *);
-private:
-  static const jlong serialVersionUID = 4227225638931828014LL;
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem)))) popupMenu;
-  ::javax::swing::event::MenuEvent * menuEvent;
-  jint delay;
-public: // actually protected
-  ::javax::swing::JMenu$WinListener * popupListener;
-private:
-  ::java::awt::Point * menuLocation;
-  ::javax::swing::event::ChangeListener * menuChangeListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenu__
diff --git a/libjava/javax/swing/JMenuBar$AccessibleJMenuBar.h b/libjava/javax/swing/JMenuBar$AccessibleJMenuBar.h
deleted file mode 100644
index 2fcf3ad868d..00000000000
--- a/libjava/javax/swing/JMenuBar$AccessibleJMenuBar.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenuBar$AccessibleJMenuBar__
-#define __javax_swing_JMenuBar$AccessibleJMenuBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JMenuBar;
-        class JMenuBar$AccessibleJMenuBar;
-    }
-  }
-}
-
-class javax::swing::JMenuBar$AccessibleJMenuBar : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JMenuBar$AccessibleJMenuBar(::javax::swing::JMenuBar *);
-public:
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-public: // actually package-private
-  ::javax::swing::JMenuBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenuBar$AccessibleJMenuBar__
diff --git a/libjava/javax/swing/JMenuBar.h b/libjava/javax/swing/JMenuBar.h
deleted file mode 100644
index a33d051bacb..00000000000
--- a/libjava/javax/swing/JMenuBar.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenuBar__
-#define __javax_swing_JMenuBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JMenu;
-        class JMenuBar;
-        class KeyStroke;
-        class MenuElement;
-        class MenuSelectionManager;
-        class SingleSelectionModel;
-      namespace plaf
-      {
-          class MenuBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JMenuBar : public ::javax::swing::JComponent
-{
-
-public:
-  JMenuBar();
-  virtual ::javax::swing::JMenu * add(::javax::swing::JMenu *);
-  virtual void addNotify();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Component * getComponent();
-  virtual ::java::awt::Component * getComponentAtIndex(jint);
-  virtual jint getComponentIndex(::java::awt::Component *);
-  virtual ::javax::swing::JMenu * getHelpMenu();
-  virtual ::java::awt::Insets * getMargin();
-  virtual ::javax::swing::JMenu * getMenu(jint);
-  virtual jint getMenuCount();
-  virtual ::javax::swing::SingleSelectionModel * getSelectionModel();
-  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
-  virtual ::javax::swing::plaf::MenuBarUI * getUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jboolean isBorderPainted();
-  virtual jboolean isSelected();
-  virtual void menuSelectionChanged(jboolean);
-public: // actually protected
-  virtual void paintBorder(::java::awt::Graphics *);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-public: // actually protected
-  virtual jboolean processKeyBinding(::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, jint, jboolean);
-public: // actually package-private
-  static jboolean processKeyBindingHelper(::javax::swing::MenuElement *, ::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, jint, jboolean);
-public:
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual void removeNotify();
-  virtual void setBorderPainted(jboolean);
-  virtual void setHelpMenu(::javax::swing::JMenu *);
-  virtual void setMargin(::java::awt::Insets *);
-  virtual void setSelected(::java::awt::Component *);
-  virtual void setSelectionModel(::javax::swing::SingleSelectionModel *);
-  virtual void setUI(::javax::swing::plaf::MenuBarUI *);
-  virtual void updateUI();
-private:
-  static const jlong serialVersionUID = -8191026883931977036LL;
-  ::javax::swing::SingleSelectionModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) selectionModel;
-  jboolean borderPainted;
-  ::java::awt::Insets * margin;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenuBar__
diff --git a/libjava/javax/swing/JMenuItem$1.h b/libjava/javax/swing/JMenuItem$1.h
deleted file mode 100644
index fbf36207746..00000000000
--- a/libjava/javax/swing/JMenuItem$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenuItem$1__
-#define __javax_swing_JMenuItem$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenuItem;
-        class JMenuItem$1;
-    }
-  }
-}
-
-class javax::swing::JMenuItem$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JMenuItem$1(::javax::swing::JMenuItem *);
-public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JMenuItem * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenuItem$1__
diff --git a/libjava/javax/swing/JMenuItem$AccessibleJMenuItem.h b/libjava/javax/swing/JMenuItem$AccessibleJMenuItem.h
deleted file mode 100644
index 7e67e9df971..00000000000
--- a/libjava/javax/swing/JMenuItem$AccessibleJMenuItem.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenuItem$AccessibleJMenuItem__
-#define __javax_swing_JMenuItem$AccessibleJMenuItem__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton$AccessibleAbstractButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JMenuItem;
-        class JMenuItem$AccessibleJMenuItem;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JMenuItem$AccessibleJMenuItem : public ::javax::swing::AbstractButton$AccessibleAbstractButton
-{
-
-public: // actually package-private
-  JMenuItem$AccessibleJMenuItem(::javax::swing::JMenuItem *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 6748924232082076534LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton$AccessibleAbstractButton)))) armed;
-  jboolean focusOwner;
-  jboolean pressed;
-  jboolean selected;
-public: // actually package-private
-  ::javax::swing::JMenuItem * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenuItem$AccessibleJMenuItem__
diff --git a/libjava/javax/swing/JMenuItem.h b/libjava/javax/swing/JMenuItem.h
deleted file mode 100644
index 87d5ff98f59..00000000000
--- a/libjava/javax/swing/JMenuItem.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JMenuItem__
-#define __javax_swing_JMenuItem__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JMenuItem;
-        class KeyStroke;
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace event
-      {
-          class MenuDragMouseEvent;
-          class MenuDragMouseListener;
-          class MenuKeyEvent;
-          class MenuKeyListener;
-      }
-      namespace plaf
-      {
-          class MenuItemUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JMenuItem : public ::javax::swing::AbstractButton
-{
-
-public:
-  JMenuItem();
-  JMenuItem(::javax::swing::Icon *);
-  JMenuItem(::java::lang::String *);
-  JMenuItem(::javax::swing::Action *);
-  JMenuItem(::java::lang::String *, ::javax::swing::Icon *);
-  JMenuItem(::java::lang::String *, jint);
-public: // actually protected
-  virtual void init(::java::lang::String *, ::javax::swing::Icon *);
-public:
-  virtual void setUI(::javax::swing::plaf::MenuItemUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jboolean isArmed();
-  virtual void setArmed(jboolean);
-  virtual void setEnabled(jboolean);
-  virtual ::javax::swing::KeyStroke * getAccelerator();
-  virtual void setAccelerator(::javax::swing::KeyStroke *);
-public: // actually protected
-  virtual void configurePropertiesFromAction(::javax::swing::Action *);
-  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
-public:
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual void processMenuDragMouseEvent(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void processMenuKeyEvent(::javax::swing::event::MenuKeyEvent *);
-public: // actually protected
-  virtual void fireMenuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void fireMenuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void fireMenuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void fireMenuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void fireMenuKeyPressed(::javax::swing::event::MenuKeyEvent *);
-  virtual void fireMenuKeyReleased(::javax::swing::event::MenuKeyEvent *);
-  virtual void fireMenuKeyTyped(::javax::swing::event::MenuKeyEvent *);
-public:
-  virtual void menuSelectionChanged(jboolean);
-  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
-  virtual ::java::awt::Component * getComponent();
-  virtual void addMenuDragMouseListener(::javax::swing::event::MenuDragMouseListener *);
-  virtual void removeMenuDragMouseListener(::javax::swing::event::MenuDragMouseListener *);
-  virtual JArray< ::javax::swing::event::MenuDragMouseListener * > * getMenuDragMouseListeners();
-  virtual void addMenuKeyListener(::javax::swing::event::MenuKeyListener *);
-  virtual void removeMenuKeyListener(::javax::swing::event::MenuKeyListener *);
-  virtual JArray< ::javax::swing::event::MenuKeyListener * > * getMenuKeyListeners();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual jboolean onTop();
-private:
-  static const jlong serialVersionUID = -1681004643499461044LL;
-  ::javax::swing::KeyStroke * __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton)))) accelerator;
-  jboolean isDragging;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JMenuItem__
diff --git a/libjava/javax/swing/JOptionPane$1.h b/libjava/javax/swing/JOptionPane$1.h
deleted file mode 100644
index 89b46f359ff..00000000000
--- a/libjava/javax/swing/JOptionPane$1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JOptionPane$1__
-#define __javax_swing_JOptionPane$1__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JOptionPane$1;
-    }
-  }
-}
-
-class javax::swing::JOptionPane$1 : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  JOptionPane$1();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JOptionPane$1__
diff --git a/libjava/javax/swing/JOptionPane$2.h b/libjava/javax/swing/JOptionPane$2.h
deleted file mode 100644
index 9231d656a39..00000000000
--- a/libjava/javax/swing/JOptionPane$2.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JOptionPane$2__
-#define __javax_swing_JOptionPane$2__
-
-#pragma interface
-
-#include <java/awt/event/MouseMotionAdapter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JOptionPane$2;
-    }
-  }
-}
-
-class javax::swing::JOptionPane$2 : public ::java::awt::event::MouseMotionAdapter
-{
-
-public: // actually package-private
-  JOptionPane$2();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JOptionPane$2__
diff --git a/libjava/javax/swing/JOptionPane$AccessibleJOptionPane.h b/libjava/javax/swing/JOptionPane$AccessibleJOptionPane.h
deleted file mode 100644
index 70b9e984fad..00000000000
--- a/libjava/javax/swing/JOptionPane$AccessibleJOptionPane.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JOptionPane$AccessibleJOptionPane__
-#define __javax_swing_JOptionPane$AccessibleJOptionPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JOptionPane;
-        class JOptionPane$AccessibleJOptionPane;
-    }
-  }
-}
-
-class javax::swing::JOptionPane$AccessibleJOptionPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JOptionPane$AccessibleJOptionPane(::javax::swing::JOptionPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 686071432213084821LL;
-public: // actually package-private
-  ::javax::swing::JOptionPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JOptionPane$AccessibleJOptionPane__
diff --git a/libjava/javax/swing/JOptionPane$ValuePropertyHandler.h b/libjava/javax/swing/JOptionPane$ValuePropertyHandler.h
deleted file mode 100644
index a3d71cf409f..00000000000
--- a/libjava/javax/swing/JOptionPane$ValuePropertyHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JOptionPane$ValuePropertyHandler__
-#define __javax_swing_JOptionPane$ValuePropertyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JDialog;
-        class JOptionPane$ValuePropertyHandler;
-    }
-  }
-}
-
-class javax::swing::JOptionPane$ValuePropertyHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JOptionPane$ValuePropertyHandler(::javax::swing::JDialog *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JDialog * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dialog;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JOptionPane$ValuePropertyHandler__
diff --git a/libjava/javax/swing/JOptionPane.h b/libjava/javax/swing/JOptionPane.h
deleted file mode 100644
index 5bd63fd7ae8..00000000000
--- a/libjava/javax/swing/JOptionPane.h
+++ /dev/null
@@ -1,167 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JOptionPane__
-#define __javax_swing_JOptionPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Frame;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JDesktopPane;
-        class JDialog;
-        class JInternalFrame;
-        class JOptionPane;
-      namespace plaf
-      {
-          class OptionPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JOptionPane : public ::javax::swing::JComponent
-{
-
-public:
-  JOptionPane();
-  JOptionPane(::java::lang::Object *);
-  JOptionPane(::java::lang::Object *, jint);
-  JOptionPane(::java::lang::Object *, jint, jint);
-  JOptionPane(::java::lang::Object *, jint, jint, ::javax::swing::Icon *);
-  JOptionPane(::java::lang::Object *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *);
-  JOptionPane(::java::lang::Object *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  virtual ::javax::swing::JDialog * createDialog(::java::awt::Component *, ::java::lang::String *);
-  virtual ::javax::swing::JInternalFrame * createInternalFrame(::java::awt::Component *, ::java::lang::String *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  static ::javax::swing::JDesktopPane * getDesktopPaneForComponent(::java::awt::Component *);
-  static ::java::awt::Frame * getFrameForComponent(::java::awt::Component *);
-  virtual ::javax::swing::Icon * getIcon();
-  virtual ::java::lang::Object * getInitialSelectionValue();
-  virtual ::java::lang::Object * getInitialValue();
-  virtual ::java::lang::Object * getInputValue();
-  virtual jint getMaxCharactersPerLineCount();
-  virtual ::java::lang::Object * getMessage();
-  virtual jint getMessageType();
-  virtual JArray< ::java::lang::Object * > * getOptions();
-  virtual jint getOptionType();
-  static ::java::awt::Frame * getRootFrame();
-  virtual JArray< ::java::lang::Object * > * getSelectionValues();
-  virtual ::javax::swing::plaf::OptionPaneUI * getUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::lang::Object * getValue();
-  virtual jboolean getWantsInput();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void selectInitialValue();
-  virtual void setIcon(::javax::swing::Icon *);
-  virtual void setInitialSelectionValue(::java::lang::Object *);
-  virtual void setInitialValue(::java::lang::Object *);
-  virtual void setInputValue(::java::lang::Object *);
-  virtual void setMessage(::java::lang::Object *);
-  virtual void setMessageType(jint);
-  virtual void setOptions(JArray< ::java::lang::Object * > *);
-  virtual void setOptionType(jint);
-  static void setRootFrame(::java::awt::Frame *);
-  virtual void setSelectionValues(JArray< ::java::lang::Object * > *);
-  virtual void setUI(::javax::swing::plaf::OptionPaneUI *);
-  virtual void setValue(::java::lang::Object *);
-  virtual void setWantsInput(jboolean);
-  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *);
-  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint);
-  static jint showConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *);
-  static ::java::lang::String * showInputDialog(::java::awt::Component *, ::java::lang::Object *);
-  static ::java::lang::String * showInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::String * showInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static ::java::lang::Object * showInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  static ::java::lang::String * showInputDialog(::java::lang::Object *);
-  static ::java::lang::String * showInputDialog(::java::lang::Object *, ::java::lang::Object *);
-  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *);
-  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint);
-  static jint showInternalConfirmDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *);
-  static ::java::lang::String * showInternalInputDialog(::java::awt::Component *, ::java::lang::Object *);
-  static ::java::lang::String * showInternalInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static ::java::lang::Object * showInternalInputDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  static void showInternalMessageDialog(::java::awt::Component *, ::java::lang::Object *);
-  static void showInternalMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static void showInternalMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *);
-  static jint showInternalOptionDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  static void showMessageDialog(::java::awt::Component *, ::java::lang::Object *);
-  static void showMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint);
-  static void showMessageDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, ::javax::swing::Icon *);
-  static jint showOptionDialog(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint, ::javax::swing::Icon *, JArray< ::java::lang::Object * > *, ::java::lang::Object *);
-  virtual void updateUI();
-private:
-  jboolean validMessageType(jint);
-  jboolean validOptionType(jint);
-  static void startModal(::javax::swing::JInternalFrame *);
-  static const jlong serialVersionUID = 5231143276678566796LL;
-public:
-  static const jint CANCEL_OPTION = 2;
-  static const jint CLOSED_OPTION = -1;
-  static const jint DEFAULT_OPTION = -1;
-  static const jint NO_OPTION = 1;
-  static const jint OK_CANCEL_OPTION = 2;
-  static const jint OK_OPTION = 0;
-  static const jint YES_NO_CANCEL_OPTION = 1;
-  static const jint YES_NO_OPTION = 0;
-  static const jint YES_OPTION = 0;
-  static const jint ERROR_MESSAGE = 0;
-  static const jint INFORMATION_MESSAGE = 1;
-  static const jint PLAIN_MESSAGE = -1;
-  static const jint QUESTION_MESSAGE = 3;
-  static const jint WARNING_MESSAGE = 2;
-  static ::java::lang::String * ICON_PROPERTY;
-  static ::java::lang::String * INITIAL_SELECTION_VALUE_PROPERTY;
-  static ::java::lang::String * INITIAL_VALUE_PROPERTY;
-  static ::java::lang::String * INPUT_VALUE_PROPERTY;
-  static ::java::lang::String * MESSAGE_PROPERTY;
-  static ::java::lang::String * MESSAGE_TYPE_PROPERTY;
-  static ::java::lang::String * OPTION_TYPE_PROPERTY;
-  static ::java::lang::String * OPTIONS_PROPERTY;
-  static ::java::lang::String * SELECTION_VALUES_PROPERTY;
-  static ::java::lang::String * VALUE_PROPERTY;
-  static ::java::lang::String * WANTS_INPUT_PROPERTY;
-  static ::java::lang::Object * UNINITIALIZED_VALUE;
-public: // actually protected
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) icon;
-  ::java::lang::Object * initialSelectionValue;
-  ::java::lang::Object * initialValue;
-  ::java::lang::Object * inputValue;
-  ::java::lang::Object * message;
-  jint messageType;
-  JArray< ::java::lang::Object * > * options;
-  jint optionType;
-  JArray< ::java::lang::Object * > * selectionValues;
-  ::java::lang::Object * value;
-  jboolean wantsInput;
-private:
-  static ::java::awt::Frame * privFrame;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JOptionPane__
diff --git a/libjava/javax/swing/JPanel$AccessibleJPanel.h b/libjava/javax/swing/JPanel$AccessibleJPanel.h
deleted file mode 100644
index c4f9878ae6f..00000000000
--- a/libjava/javax/swing/JPanel$AccessibleJPanel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPanel$AccessibleJPanel__
-#define __javax_swing_JPanel$AccessibleJPanel__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JPanel;
-        class JPanel$AccessibleJPanel;
-    }
-  }
-}
-
-class javax::swing::JPanel$AccessibleJPanel : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JPanel$AccessibleJPanel(::javax::swing::JPanel *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JPanel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPanel$AccessibleJPanel__
diff --git a/libjava/javax/swing/JPanel.h b/libjava/javax/swing/JPanel.h
deleted file mode 100644
index 8270c8307d3..00000000000
--- a/libjava/javax/swing/JPanel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPanel__
-#define __javax_swing_JPanel__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class LayoutManager;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JPanel;
-      namespace plaf
-      {
-          class PanelUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JPanel : public ::javax::swing::JComponent
-{
-
-public:
-  JPanel();
-  JPanel(jboolean);
-  JPanel(::java::awt::LayoutManager *);
-  JPanel(::java::awt::LayoutManager *, jboolean);
-  virtual ::java::lang::String * getUIClassID();
-  virtual void setUI(::javax::swing::plaf::PanelUI *);
-  virtual ::javax::swing::plaf::PanelUI * getUI();
-  virtual void updateUI();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPanel__
diff --git a/libjava/javax/swing/JPasswordField$AccessibleJPasswordField.h b/libjava/javax/swing/JPasswordField$AccessibleJPasswordField.h
deleted file mode 100644
index 901558e1e6d..00000000000
--- a/libjava/javax/swing/JPasswordField$AccessibleJPasswordField.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPasswordField$AccessibleJPasswordField__
-#define __javax_swing_JPasswordField$AccessibleJPasswordField__
-
-#pragma interface
-
-#include <javax/swing/JTextField$AccessibleJTextField.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JPasswordField;
-        class JPasswordField$AccessibleJPasswordField;
-    }
-  }
-}
-
-class javax::swing::JPasswordField$AccessibleJPasswordField : public ::javax::swing::JTextField$AccessibleJTextField
-{
-
-public: // actually protected
-  JPasswordField$AccessibleJPasswordField(::javax::swing::JPasswordField *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -8477039424200681086LL;
-public: // actually package-private
-  ::javax::swing::JPasswordField * __attribute__((aligned(__alignof__( ::javax::swing::JTextField$AccessibleJTextField)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPasswordField$AccessibleJPasswordField__
diff --git a/libjava/javax/swing/JPasswordField.h b/libjava/javax/swing/JPasswordField.h
deleted file mode 100644
index 7e9a8259c42..00000000000
--- a/libjava/javax/swing/JPasswordField.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPasswordField__
-#define __javax_swing_JPasswordField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JPasswordField;
-      namespace text
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::JPasswordField : public ::javax::swing::JTextField
-{
-
-public:
-  JPasswordField();
-  JPasswordField(::java::lang::String *);
-  JPasswordField(jint);
-  JPasswordField(::java::lang::String *, jint);
-  JPasswordField(::javax::swing::text::Document *, ::java::lang::String *, jint);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  virtual ::java::lang::String * getUIClassID();
-  virtual jchar getEchoChar();
-  virtual void setEchoChar(jchar);
-  virtual jboolean echoCharIsSet();
-  virtual void copy();
-  virtual void cut();
-  virtual ::java::lang::String * getText();
-  virtual ::java::lang::String * getText(jint, jint);
-  virtual JArray< jchar > * getPassword();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  jchar __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) echoChar;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPasswordField__
diff --git a/libjava/javax/swing/JPopupMenu$1.h b/libjava/javax/swing/JPopupMenu$1.h
deleted file mode 100644
index 978cfc183c3..00000000000
--- a/libjava/javax/swing/JPopupMenu$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu$1__
-#define __javax_swing_JPopupMenu$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class JPopupMenu$1;
-    }
-  }
-}
-
-class javax::swing::JPopupMenu$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JPopupMenu$1(::javax::swing::JPopupMenu *);
-public:
-  void run();
-public: // actually package-private
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu$1__
diff --git a/libjava/javax/swing/JPopupMenu$2.h b/libjava/javax/swing/JPopupMenu$2.h
deleted file mode 100644
index c8d455b9311..00000000000
--- a/libjava/javax/swing/JPopupMenu$2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu$2__
-#define __javax_swing_JPopupMenu$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class JPopupMenu$2;
-    }
-  }
-}
-
-class javax::swing::JPopupMenu$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JPopupMenu$2(::javax::swing::JPopupMenu *, jboolean);
-public:
-  void run();
-public: // actually package-private
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  jboolean val$visible;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu$2__
diff --git a/libjava/javax/swing/JPopupMenu$AccessibleJPopupMenu.h b/libjava/javax/swing/JPopupMenu$AccessibleJPopupMenu.h
deleted file mode 100644
index d3ace0c6387..00000000000
--- a/libjava/javax/swing/JPopupMenu$AccessibleJPopupMenu.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu$AccessibleJPopupMenu__
-#define __javax_swing_JPopupMenu$AccessibleJPopupMenu__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JPopupMenu;
-        class JPopupMenu$AccessibleJPopupMenu;
-    }
-  }
-}
-
-class javax::swing::JPopupMenu$AccessibleJPopupMenu : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JPopupMenu$AccessibleJPopupMenu(::javax::swing::JPopupMenu *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 7423261328879849768LL;
-public: // actually package-private
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu$AccessibleJPopupMenu__
diff --git a/libjava/javax/swing/JPopupMenu$ActionChangeListener.h b/libjava/javax/swing/JPopupMenu$ActionChangeListener.h
deleted file mode 100644
index 4c2385e4587..00000000000
--- a/libjava/javax/swing/JPopupMenu$ActionChangeListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu$ActionChangeListener__
-#define __javax_swing_JPopupMenu$ActionChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class JPopupMenu$ActionChangeListener;
-    }
-  }
-}
-
-class javax::swing::JPopupMenu$ActionChangeListener : public ::java::lang::Object
-{
-
-  JPopupMenu$ActionChangeListener(::javax::swing::JPopupMenu *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  JPopupMenu$ActionChangeListener(::javax::swing::JPopupMenu *, ::javax::swing::JPopupMenu$ActionChangeListener *);
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu$ActionChangeListener__
diff --git a/libjava/javax/swing/JPopupMenu$Separator.h b/libjava/javax/swing/JPopupMenu$Separator.h
deleted file mode 100644
index e41bdedd6f6..00000000000
--- a/libjava/javax/swing/JPopupMenu$Separator.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu$Separator__
-#define __javax_swing_JPopupMenu$Separator__
-
-#pragma interface
-
-#include <javax/swing/JSeparator.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu$Separator;
-    }
-  }
-}
-
-class javax::swing::JPopupMenu$Separator : public ::javax::swing::JSeparator
-{
-
-public:
-  JPopupMenu$Separator();
-  virtual ::java::lang::String * getUIClassID();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu$Separator__
diff --git a/libjava/javax/swing/JPopupMenu.h b/libjava/javax/swing/JPopupMenu.h
deleted file mode 100644
index 44bbc89bd3e..00000000000
--- a/libjava/javax/swing/JPopupMenu.h
+++ /dev/null
@@ -1,148 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JPopupMenu__
-#define __javax_swing_JPopupMenu__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Insets;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class JMenuItem;
-        class JPopupMenu;
-        class MenuElement;
-        class MenuSelectionManager;
-        class Popup;
-        class SingleSelectionModel;
-      namespace event
-      {
-          class MenuKeyListener;
-          class PopupMenuListener;
-      }
-      namespace plaf
-      {
-          class PopupMenuUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JPopupMenu : public ::javax::swing::JComponent
-{
-
-public:
-  JPopupMenu();
-  JPopupMenu(::java::lang::String *);
-  virtual ::javax::swing::JMenuItem * add(::javax::swing::JMenuItem *);
-  virtual ::javax::swing::JMenuItem * add(::java::lang::String *);
-  virtual ::javax::swing::JMenuItem * add(::javax::swing::Action *);
-  virtual void remove(jint);
-  virtual void insert(::javax::swing::Action *, jint);
-  virtual void insert(::java::awt::Component *, jint);
-  static jboolean getDefaultLightWeightPopupEnabled();
-  static void setDefaultLightWeightPopupEnabled(jboolean);
-  virtual ::javax::swing::plaf::PopupMenuUI * getUI();
-  virtual void setUI(::javax::swing::plaf::PopupMenuUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::SingleSelectionModel * getSelectionModel();
-  virtual void setSelectionModel(::javax::swing::SingleSelectionModel *);
-public: // actually protected
-  virtual ::javax::swing::JMenuItem * createActionComponent(::javax::swing::Action *);
-  virtual ::java::beans::PropertyChangeListener * createActionChangeListener(::javax::swing::JMenuItem *);
-public:
-  virtual jboolean isLightWeightPopupEnabled();
-  virtual void setLightWeightPopupEnabled(jboolean);
-  virtual ::java::lang::String * getLabel();
-  virtual void setLabel(::java::lang::String *);
-  virtual void addSeparator();
-  virtual void addMenuKeyListener(::javax::swing::event::MenuKeyListener *);
-  virtual void removeMenuKeyListener(::javax::swing::event::MenuKeyListener *);
-  virtual JArray< ::javax::swing::event::MenuKeyListener * > * getMenuKeyListeners();
-  virtual void addPopupMenuListener(::javax::swing::event::PopupMenuListener *);
-  virtual void removePopupMenuListener(::javax::swing::event::PopupMenuListener *);
-  virtual JArray< ::javax::swing::event::PopupMenuListener * > * getPopupMenuListeners();
-public: // actually protected
-  virtual void firePopupMenuWillBecomeVisible();
-  virtual void firePopupMenuWillBecomeInvisible();
-  virtual void firePopupMenuCanceled();
-public:
-  virtual void pack();
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-  virtual void setLocation(jint, jint);
-  virtual ::java::awt::Component * getInvoker();
-  virtual void setInvoker(::java::awt::Component *);
-  virtual void show(::java::awt::Component *, jint, jint);
-  virtual ::java::awt::Component * getComponentAtIndex(jint);
-  virtual jint getComponentIndex(::java::awt::Component *);
-  virtual void setPopupSize(::java::awt::Dimension *);
-  virtual void setPopupSize(jint, jint);
-  virtual void setSelected(::java::awt::Component *);
-  virtual jboolean isBorderPainted();
-  virtual void setBorderPainted(jboolean);
-  virtual ::java::awt::Insets * getMargin();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual void menuSelectionChanged(jboolean);
-  virtual JArray< ::javax::swing::MenuElement * > * getSubElements();
-  virtual ::java::awt::Component * getComponent();
-  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually package-private
-  virtual jboolean onTop();
-private:
-  static const jlong serialVersionUID = -8336996630009646009LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) borderPainted;
-  static jboolean DefaultLightWeightPopupEnabled;
-public: // actually package-private
-  ::java::awt::Component * invoker;
-private:
-  ::java::lang::String * label;
-  ::java::awt::Insets * margin;
-  jboolean lightWeightPopupEnabled;
-public: // actually protected
-  ::javax::swing::SingleSelectionModel * selectionModel;
-private:
-  ::javax::swing::Popup * popup;
-  jint popupLocationX;
-  jint popupLocationY;
-  jboolean visible;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JPopupMenu__
diff --git a/libjava/javax/swing/JProgressBar$1.h b/libjava/javax/swing/JProgressBar$1.h
deleted file mode 100644
index a8340a32426..00000000000
--- a/libjava/javax/swing/JProgressBar$1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JProgressBar$1__
-#define __javax_swing_JProgressBar$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JProgressBar;
-        class JProgressBar$1;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JProgressBar$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JProgressBar$1(::javax::swing::JProgressBar *);
-public:
-  void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JProgressBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JProgressBar$1__
diff --git a/libjava/javax/swing/JProgressBar$AccessibleJProgressBar.h b/libjava/javax/swing/JProgressBar$AccessibleJProgressBar.h
deleted file mode 100644
index b5b7016359c..00000000000
--- a/libjava/javax/swing/JProgressBar$AccessibleJProgressBar.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JProgressBar$AccessibleJProgressBar__
-#define __javax_swing_JProgressBar$AccessibleJProgressBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JProgressBar;
-        class JProgressBar$AccessibleJProgressBar;
-    }
-  }
-}
-
-class javax::swing::JProgressBar$AccessibleJProgressBar : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JProgressBar$AccessibleJProgressBar(::javax::swing::JProgressBar *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-private:
-  static const jlong serialVersionUID = -2938130009392721813LL;
-public: // actually package-private
-  ::javax::swing::JProgressBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JProgressBar$AccessibleJProgressBar__
diff --git a/libjava/javax/swing/JProgressBar.h b/libjava/javax/swing/JProgressBar.h
deleted file mode 100644
index 459af9ad57a..00000000000
--- a/libjava/javax/swing/JProgressBar.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JProgressBar__
-#define __javax_swing_JProgressBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class BoundedRangeModel;
-        class JProgressBar;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ProgressBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JProgressBar : public ::javax::swing::JComponent
-{
-
-public:
-  JProgressBar();
-  JProgressBar(jint);
-  JProgressBar(jint, jint);
-  JProgressBar(jint, jint, jint);
-  JProgressBar(::javax::swing::BoundedRangeModel *);
-  virtual jint getValue();
-  virtual void setValue(jint);
-public: // actually protected
-  virtual void paintBorder(::java::awt::Graphics *);
-public:
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual jboolean isStringPainted();
-  virtual void setStringPainted(jboolean);
-  virtual ::java::lang::String * getString();
-  virtual void setString(::java::lang::String *);
-  virtual jdouble getPercentComplete();
-  virtual jboolean isBorderPainted();
-  virtual void setBorderPainted(jboolean);
-  virtual ::javax::swing::plaf::ProgressBarUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ProgressBarUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual ::javax::swing::BoundedRangeModel * getModel();
-  virtual void setModel(::javax::swing::BoundedRangeModel *);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void setIndeterminate(jboolean);
-  virtual jboolean isIndeterminate();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 1980046021813598781LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) indeterminate;
-public: // actually protected
-  jint orientation;
-  jboolean paintBorder__;
-  ::javax::swing::BoundedRangeModel * model;
-  ::java::lang::String * progressString;
-  jboolean paintString;
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  ::javax::swing::event::ChangeListener * changeListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JProgressBar__
diff --git a/libjava/javax/swing/JRadioButton$AccessibleJRadioButton.h b/libjava/javax/swing/JRadioButton$AccessibleJRadioButton.h
deleted file mode 100644
index 9dc147a8b43..00000000000
--- a/libjava/javax/swing/JRadioButton$AccessibleJRadioButton.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRadioButton$AccessibleJRadioButton__
-#define __javax_swing_JRadioButton$AccessibleJRadioButton__
-
-#pragma interface
-
-#include <javax/swing/JToggleButton$AccessibleJToggleButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JRadioButton;
-        class JRadioButton$AccessibleJRadioButton;
-    }
-  }
-}
-
-class javax::swing::JRadioButton$AccessibleJRadioButton : public ::javax::swing::JToggleButton$AccessibleJToggleButton
-{
-
-public: // actually protected
-  JRadioButton$AccessibleJRadioButton(::javax::swing::JRadioButton *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 4850967637026120674LL;
-public: // actually package-private
-  ::javax::swing::JRadioButton * __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton$AccessibleJToggleButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRadioButton$AccessibleJRadioButton__
diff --git a/libjava/javax/swing/JRadioButton.h b/libjava/javax/swing/JRadioButton.h
deleted file mode 100644
index 7c8bd4f6990..00000000000
--- a/libjava/javax/swing/JRadioButton.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRadioButton__
-#define __javax_swing_JRadioButton__
-
-#pragma interface
-
-#include <javax/swing/JToggleButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JRadioButton;
-    }
-  }
-}
-
-class javax::swing::JRadioButton : public ::javax::swing::JToggleButton
-{
-
-public:
-  JRadioButton();
-  JRadioButton(::javax::swing::Action *);
-  JRadioButton(::javax::swing::Icon *);
-  JRadioButton(::javax::swing::Icon *, jboolean);
-  JRadioButton(::java::lang::String *);
-  JRadioButton(::java::lang::String *, jboolean);
-  JRadioButton(::java::lang::String *, ::javax::swing::Icon *);
-  JRadioButton(::java::lang::String *, ::javax::swing::Icon *, jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void updateUI();
-private:
-  static const jlong serialVersionUID = 7751949583255506856LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRadioButton__
diff --git a/libjava/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.h b/libjava/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.h
deleted file mode 100644
index 7ef610cfcf3..00000000000
--- a/libjava/javax/swing/JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem__
-#define __javax_swing_JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem$AccessibleJMenuItem.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JRadioButtonMenuItem;
-        class JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem;
-    }
-  }
-}
-
-class javax::swing::JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem : public ::javax::swing::JMenuItem$AccessibleJMenuItem
-{
-
-public: // actually protected
-  JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem(::javax::swing::JRadioButtonMenuItem *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 4381471510145292179LL;
-public: // actually package-private
-  ::javax::swing::JRadioButtonMenuItem * __attribute__((aligned(__alignof__( ::javax::swing::JMenuItem$AccessibleJMenuItem)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRadioButtonMenuItem$AccessibleJRadioButtonMenuItem__
diff --git a/libjava/javax/swing/JRadioButtonMenuItem.h b/libjava/javax/swing/JRadioButtonMenuItem.h
deleted file mode 100644
index 4c982cff9b4..00000000000
--- a/libjava/javax/swing/JRadioButtonMenuItem.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRadioButtonMenuItem__
-#define __javax_swing_JRadioButtonMenuItem__
-
-#pragma interface
-
-#include <javax/swing/JMenuItem.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JRadioButtonMenuItem;
-    }
-  }
-}
-
-class javax::swing::JRadioButtonMenuItem : public ::javax::swing::JMenuItem
-{
-
-public:
-  JRadioButtonMenuItem();
-  JRadioButtonMenuItem(::javax::swing::Icon *);
-  JRadioButtonMenuItem(::java::lang::String *);
-  JRadioButtonMenuItem(::javax::swing::Action *);
-  JRadioButtonMenuItem(::java::lang::String *, ::javax::swing::Icon *);
-  JRadioButtonMenuItem(::java::lang::String *, jboolean);
-  JRadioButtonMenuItem(::javax::swing::Icon *, jboolean);
-  JRadioButtonMenuItem(::java::lang::String *, ::javax::swing::Icon *, jboolean);
-  virtual ::java::lang::String * getUIClassID();
-  virtual void requestFocus();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 8482658191548521743LL;
-  static ::java::lang::String * uiClassID;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRadioButtonMenuItem__
diff --git a/libjava/javax/swing/JRootPane$AccessibleJRootPane.h b/libjava/javax/swing/JRootPane$AccessibleJRootPane.h
deleted file mode 100644
index a527b57d27a..00000000000
--- a/libjava/javax/swing/JRootPane$AccessibleJRootPane.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRootPane$AccessibleJRootPane__
-#define __javax_swing_JRootPane$AccessibleJRootPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JRootPane;
-        class JRootPane$AccessibleJRootPane;
-    }
-  }
-}
-
-class javax::swing::JRootPane$AccessibleJRootPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JRootPane$AccessibleJRootPane(::javax::swing::JRootPane *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 1082432482784468088LL;
-public: // actually package-private
-  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRootPane$AccessibleJRootPane__
diff --git a/libjava/javax/swing/JRootPane$RootLayout.h b/libjava/javax/swing/JRootPane$RootLayout.h
deleted file mode 100644
index 22967dea0ad..00000000000
--- a/libjava/javax/swing/JRootPane$RootLayout.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRootPane$RootLayout__
-#define __javax_swing_JRootPane$RootLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JRootPane;
-        class JRootPane$RootLayout;
-    }
-  }
-}
-
-class javax::swing::JRootPane$RootLayout : public ::java::lang::Object
-{
-
-public: // actually protected
-  JRootPane$RootLayout(::javax::swing::JRootPane *);
-public:
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-private:
-  static const jlong serialVersionUID = -4100116998559815027LL;
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glassPaneBounds;
-  ::java::awt::Rectangle * layeredPaneBounds;
-  ::java::awt::Rectangle * contentPaneBounds;
-  ::java::awt::Rectangle * menuBarBounds;
-public: // actually package-private
-  ::javax::swing::JRootPane * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRootPane$RootLayout__
diff --git a/libjava/javax/swing/JRootPane.h b/libjava/javax/swing/JRootPane.h
deleted file mode 100644
index 7d415773ff8..00000000000
--- a/libjava/javax/swing/JRootPane.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JRootPane__
-#define __javax_swing_JRootPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class LayoutManager;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class JButton;
-        class JLayeredPane;
-        class JMenuBar;
-        class JRootPane;
-      namespace plaf
-      {
-          class RootPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JRootPane : public ::javax::swing::JComponent
-{
-
-public:
-  virtual void setJMenuBar(::javax::swing::JMenuBar *);
-  virtual void setMenuBar(::javax::swing::JMenuBar *);
-  virtual ::javax::swing::JMenuBar * getJMenuBar();
-  virtual ::javax::swing::JMenuBar * getMenuBar();
-  virtual jboolean isValidateRoot();
-  virtual ::java::awt::Container * getContentPane();
-  virtual void setContentPane(::java::awt::Container *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual ::java::awt::Component * getGlassPane();
-  virtual void setGlassPane(::java::awt::Component *);
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  JRootPane();
-public: // actually protected
-  virtual ::java::awt::LayoutManager * createRootLayout();
-  virtual ::java::awt::Container * createContentPane();
-  virtual ::java::awt::Component * createGlassPane();
-  virtual ::javax::swing::JLayeredPane * createLayeredPane();
-public:
-  virtual ::javax::swing::plaf::RootPaneUI * getUI();
-  virtual void setUI(::javax::swing::plaf::RootPaneUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::JButton * getDefaultButton();
-  virtual void setDefaultButton(::javax::swing::JButton *);
-  virtual jint getWindowDecorationStyle();
-  virtual void setWindowDecorationStyle(jint);
-  virtual jboolean isOptimizedDrawingEnable();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 8690748000348575668LL;
-public:
-  static const jint NONE = 0;
-  static const jint FRAME = 1;
-  static const jint PLAIN_DIALOG = 2;
-  static const jint INFORMATION_DIALOG = 3;
-  static const jint ERROR_DIALOG = 4;
-  static const jint COLOR_CHOOSER_DIALOG = 5;
-  static const jint FILE_CHOOSER_DIALOG = 6;
-  static const jint QUESTION_DIALOG = 7;
-  static const jint WARNING_DIALOG = 8;
-public: // actually protected
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) glassPane;
-  ::javax::swing::JLayeredPane * layeredPane;
-  ::javax::swing::JMenuBar * menuBar;
-  ::java::awt::Container * contentPane;
-  ::javax::swing::JButton * defaultButton;
-  ::javax::swing::Action * defaultPressAction;
-  ::javax::swing::Action * defaultReleaseAction;
-private:
-  jint windowDecorationStyle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JRootPane__
diff --git a/libjava/javax/swing/JScrollBar$AccessibleJScrollBar.h b/libjava/javax/swing/JScrollBar$AccessibleJScrollBar.h
deleted file mode 100644
index 1e57461a716..00000000000
--- a/libjava/javax/swing/JScrollBar$AccessibleJScrollBar.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollBar$AccessibleJScrollBar__
-#define __javax_swing_JScrollBar$AccessibleJScrollBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JScrollBar;
-        class JScrollBar$AccessibleJScrollBar;
-    }
-  }
-}
-
-class javax::swing::JScrollBar$AccessibleJScrollBar : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JScrollBar$AccessibleJScrollBar(::javax::swing::JScrollBar *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-private:
-  static const jlong serialVersionUID = -7758162392045586663LL;
-public: // actually package-private
-  ::javax::swing::JScrollBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollBar$AccessibleJScrollBar__
diff --git a/libjava/javax/swing/JScrollBar$ScrollBarChangeListener.h b/libjava/javax/swing/JScrollBar$ScrollBarChangeListener.h
deleted file mode 100644
index 9ac76b23a2a..00000000000
--- a/libjava/javax/swing/JScrollBar$ScrollBarChangeListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollBar$ScrollBarChangeListener__
-#define __javax_swing_JScrollBar$ScrollBarChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JScrollBar;
-        class JScrollBar$ScrollBarChangeListener;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JScrollBar$ScrollBarChangeListener : public ::java::lang::Object
-{
-
-  JScrollBar$ScrollBarChangeListener(::javax::swing::JScrollBar *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  JScrollBar$ScrollBarChangeListener(::javax::swing::JScrollBar *, ::javax::swing::JScrollBar$ScrollBarChangeListener *);
-  ::javax::swing::JScrollBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollBar$ScrollBarChangeListener__
diff --git a/libjava/javax/swing/JScrollBar.h b/libjava/javax/swing/JScrollBar.h
deleted file mode 100644
index b72d2698c7d..00000000000
--- a/libjava/javax/swing/JScrollBar.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollBar__
-#define __javax_swing_JScrollBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace event
-      {
-          class AdjustmentListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class BoundedRangeModel;
-        class JScrollBar;
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ScrollBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JScrollBar : public ::javax::swing::JComponent
-{
-
-public:
-  JScrollBar();
-  JScrollBar(jint);
-  JScrollBar(jint, jint, jint, jint, jint);
-  virtual void setUI(::javax::swing::plaf::ScrollBarUI *);
-  virtual ::javax::swing::plaf::ScrollBarUI * getUI();
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual ::javax::swing::BoundedRangeModel * getModel();
-  virtual void setModel(::javax::swing::BoundedRangeModel *);
-  virtual jint getUnitIncrement(jint);
-  virtual void setUnitIncrement(jint);
-  virtual jint getBlockIncrement(jint);
-  virtual void setBlockIncrement(jint);
-  virtual jint getUnitIncrement();
-  virtual jint getBlockIncrement();
-  virtual jint getValue();
-  virtual void setValue(jint);
-  virtual jint getVisibleAmount();
-  virtual void setVisibleAmount(jint);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-  virtual void setValues(jint, jint, jint, jint);
-  virtual void addAdjustmentListener(::java::awt::event::AdjustmentListener *);
-  virtual void removeAdjustmentListener(::java::awt::event::AdjustmentListener *);
-  virtual JArray< ::java::awt::event::AdjustmentListener * > * getAdjustmentListeners();
-public: // actually protected
-  virtual void fireAdjustmentValueChanged(jint, jint, jint);
-public: // actually package-private
-  virtual void fireAdjustmentValueChanged(jint, jint, jint, jboolean);
-public:
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual void setEnabled(jboolean);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -8195169869225066566LL;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) blockIncrement;
-  ::javax::swing::BoundedRangeModel * model;
-  jint orientation;
-  jint unitIncrement;
-private:
-  ::javax::swing::event::ChangeListener * sbChangeListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollBar__
diff --git a/libjava/javax/swing/JScrollPane$AccessibleJScrollPane.h b/libjava/javax/swing/JScrollPane$AccessibleJScrollPane.h
deleted file mode 100644
index 4075f51a966..00000000000
--- a/libjava/javax/swing/JScrollPane$AccessibleJScrollPane.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollPane$AccessibleJScrollPane__
-#define __javax_swing_JScrollPane$AccessibleJScrollPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JScrollPane;
-        class JScrollPane$AccessibleJScrollPane;
-        class JViewport;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JScrollPane$AccessibleJScrollPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JScrollPane$AccessibleJScrollPane(::javax::swing::JScrollPane *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void resetViewPort();
-public: // actually protected
-  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) viewPort;
-public: // actually package-private
-  ::javax::swing::JScrollPane * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollPane$AccessibleJScrollPane__
diff --git a/libjava/javax/swing/JScrollPane$ScrollBar.h b/libjava/javax/swing/JScrollPane$ScrollBar.h
deleted file mode 100644
index 92ca958e9df..00000000000
--- a/libjava/javax/swing/JScrollPane$ScrollBar.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollPane$ScrollBar__
-#define __javax_swing_JScrollPane$ScrollBar__
-
-#pragma interface
-
-#include <javax/swing/JScrollBar.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JScrollPane;
-        class JScrollPane$ScrollBar;
-    }
-  }
-}
-
-class javax::swing::JScrollPane$ScrollBar : public ::javax::swing::JScrollBar
-{
-
-public:
-  JScrollPane$ScrollBar(::javax::swing::JScrollPane *, jint);
-  virtual jint getBlockIncrement(jint);
-  virtual jint getUnitIncrement(jint);
-private:
-  static const jlong serialVersionUID = -42032395320987283LL;
-public: // actually package-private
-  ::javax::swing::JScrollPane * __attribute__((aligned(__alignof__( ::javax::swing::JScrollBar)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollPane$ScrollBar__
diff --git a/libjava/javax/swing/JScrollPane.h b/libjava/javax/swing/JScrollPane.h
deleted file mode 100644
index 6cef5ac4ff0..00000000000
--- a/libjava/javax/swing/JScrollPane.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JScrollPane__
-#define __javax_swing_JScrollPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class ComponentOrientation;
-        class LayoutManager;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JScrollBar;
-        class JScrollPane;
-        class JViewport;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class ScrollPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JScrollPane : public ::javax::swing::JComponent
-{
-
-public:
-  virtual ::javax::swing::JViewport * getColumnHeader();
-  virtual ::java::awt::Component * getCorner(::java::lang::String *);
-  virtual ::javax::swing::JScrollBar * getHorizontalScrollBar();
-  virtual jint getHorizontalScrollBarPolicy();
-  virtual ::javax::swing::JViewport * getRowHeader();
-  virtual ::javax::swing::JScrollBar * getVerticalScrollBar();
-  virtual jint getVerticalScrollBarPolicy();
-  virtual ::javax::swing::JViewport * getViewport();
-  virtual ::javax::swing::border::Border * getViewportBorder();
-  virtual ::java::awt::Rectangle * getViewportBorderBounds();
-  virtual jboolean isWheelScrollingEnabled();
-private:
-  void sync();
-  void removeNonNull(::java::awt::Component *);
-  void addNonNull(::java::awt::Component *, ::java::lang::Object *);
-public:
-  virtual void setComponentOrientation(::java::awt::ComponentOrientation *);
-  virtual void setColumnHeader(::javax::swing::JViewport *);
-  virtual void setColumnHeaderView(::java::awt::Component *);
-  virtual void setCorner(::java::lang::String *, ::java::awt::Component *);
-  virtual void setHorizontalScrollBar(::javax::swing::JScrollBar *);
-  virtual void setHorizontalScrollBarPolicy(jint);
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setRowHeader(::javax::swing::JViewport *);
-  virtual void setRowHeaderView(::java::awt::Component *);
-  virtual void setVerticalScrollBar(::javax::swing::JScrollBar *);
-  virtual void setVerticalScrollBarPolicy(jint);
-  virtual void setWheelScrollingEnabled(jboolean);
-  virtual void setViewport(::javax::swing::JViewport *);
-  virtual void setViewportBorder(::javax::swing::border::Border *);
-  virtual void setViewportView(::java::awt::Component *);
-  virtual jboolean isValidateRoot();
-  JScrollPane();
-  JScrollPane(::java::awt::Component *);
-  JScrollPane(jint, jint);
-  JScrollPane(::java::awt::Component *, jint, jint);
-  virtual ::javax::swing::JScrollBar * createHorizontalScrollBar();
-  virtual ::javax::swing::JScrollBar * createVerticalScrollBar();
-public: // actually protected
-  virtual ::javax::swing::JViewport * createViewport();
-public:
-  virtual ::java::lang::String * getUIClassID();
-  virtual void updateUI();
-  virtual ::javax::swing::plaf::ScrollPaneUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ScrollPaneUI *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 5203525440012340014LL;
-public: // actually protected
-  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) columnHeader;
-  ::javax::swing::JViewport * rowHeader;
-  ::java::awt::Component * lowerLeft;
-  ::java::awt::Component * lowerRight;
-  ::java::awt::Component * upperLeft;
-  ::java::awt::Component * upperRight;
-  ::javax::swing::JScrollBar * horizontalScrollBar;
-  jint horizontalScrollBarPolicy;
-  ::javax::swing::JScrollBar * verticalScrollBar;
-  jint verticalScrollBarPolicy;
-  ::javax::swing::JViewport * viewport;
-private:
-  ::javax::swing::border::Border * viewportBorder;
-  jboolean wheelScrollingEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JScrollPane__
diff --git a/libjava/javax/swing/JSeparator$AccessibleJSeparator.h b/libjava/javax/swing/JSeparator$AccessibleJSeparator.h
deleted file mode 100644
index 9d0db79d308..00000000000
--- a/libjava/javax/swing/JSeparator$AccessibleJSeparator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSeparator$AccessibleJSeparator__
-#define __javax_swing_JSeparator$AccessibleJSeparator__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JSeparator;
-        class JSeparator$AccessibleJSeparator;
-    }
-  }
-}
-
-class javax::swing::JSeparator$AccessibleJSeparator : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JSeparator$AccessibleJSeparator(::javax::swing::JSeparator *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = 916332890553201095LL;
-public: // actually package-private
-  ::javax::swing::JSeparator * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSeparator$AccessibleJSeparator__
diff --git a/libjava/javax/swing/JSeparator.h b/libjava/javax/swing/JSeparator.h
deleted file mode 100644
index 22d1a263f3f..00000000000
--- a/libjava/javax/swing/JSeparator.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSeparator__
-#define __javax_swing_JSeparator__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JSeparator;
-      namespace plaf
-      {
-          class SeparatorUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JSeparator : public ::javax::swing::JComponent
-{
-
-public:
-  JSeparator();
-  JSeparator(jint);
-  virtual ::javax::swing::plaf::SeparatorUI * getUI();
-  virtual void setUI(::javax::swing::plaf::SeparatorUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 125301223445282357LL;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) orientation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSeparator__
diff --git a/libjava/javax/swing/JSlider$1.h b/libjava/javax/swing/JSlider$1.h
deleted file mode 100644
index 498c4459fc5..00000000000
--- a/libjava/javax/swing/JSlider$1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSlider$1__
-#define __javax_swing_JSlider$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSlider;
-        class JSlider$1;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JSlider$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JSlider$1(::javax::swing::JSlider *);
-public:
-  void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JSlider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSlider$1__
diff --git a/libjava/javax/swing/JSlider$AccessibleJSlider.h b/libjava/javax/swing/JSlider$AccessibleJSlider.h
deleted file mode 100644
index 9e3c2e8df8c..00000000000
--- a/libjava/javax/swing/JSlider$AccessibleJSlider.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSlider$AccessibleJSlider__
-#define __javax_swing_JSlider$AccessibleJSlider__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JSlider;
-        class JSlider$AccessibleJSlider;
-    }
-  }
-}
-
-class javax::swing::JSlider$AccessibleJSlider : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JSlider$AccessibleJSlider(::javax::swing::JSlider *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-private:
-  static const jlong serialVersionUID = -6301740148041106789LL;
-public: // actually package-private
-  ::javax::swing::JSlider * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSlider$AccessibleJSlider__
diff --git a/libjava/javax/swing/JSlider$LabelUIResource.h b/libjava/javax/swing/JSlider$LabelUIResource.h
deleted file mode 100644
index 58832751561..00000000000
--- a/libjava/javax/swing/JSlider$LabelUIResource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSlider$LabelUIResource__
-#define __javax_swing_JSlider$LabelUIResource__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSlider;
-        class JSlider$LabelUIResource;
-    }
-  }
-}
-
-class javax::swing::JSlider$LabelUIResource : public ::javax::swing::JLabel
-{
-
-public: // actually package-private
-  JSlider$LabelUIResource(::javax::swing::JSlider *, ::java::lang::String *, jint);
-  ::javax::swing::JSlider * __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSlider$LabelUIResource__
diff --git a/libjava/javax/swing/JSlider.h b/libjava/javax/swing/JSlider.h
deleted file mode 100644
index e7a54950fc5..00000000000
--- a/libjava/javax/swing/JSlider.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSlider__
-#define __javax_swing_JSlider__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class BoundedRangeModel;
-        class JSlider;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class SliderUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JSlider : public ::javax::swing::JComponent
-{
-
-public:
-  JSlider();
-  JSlider(jint);
-  JSlider(jint, jint);
-  JSlider(jint, jint, jint);
-  JSlider(jint, jint, jint, jint);
-  JSlider(::javax::swing::BoundedRangeModel *);
-  virtual jint getValue();
-  virtual void setValue(jint);
-  virtual ::javax::swing::plaf::SliderUI * getUI();
-  virtual void setUI(::javax::swing::plaf::SliderUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual ::javax::swing::BoundedRangeModel * getModel();
-  virtual void setModel(::javax::swing::BoundedRangeModel *);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-  virtual jboolean getValueIsAdjusting();
-  virtual void setValueIsAdjusting(jboolean);
-  virtual jint getExtent();
-  virtual void setExtent(jint);
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual ::java::util::Dictionary * getLabelTable();
-  virtual void setLabelTable(::java::util::Dictionary *);
-public: // actually protected
-  virtual void updateLabelUIs();
-public:
-  virtual ::java::util::Hashtable * createStandardLabels(jint);
-  virtual ::java::util::Hashtable * createStandardLabels(jint, jint);
-  virtual jboolean getInverted();
-  virtual void setInverted(jboolean);
-  virtual jint getMajorTickSpacing();
-  virtual void setMajorTickSpacing(jint);
-  virtual jint getMinorTickSpacing();
-  virtual void setMinorTickSpacing(jint);
-  virtual jboolean getSnapToTicks();
-  virtual void setSnapToTicks(jboolean);
-  virtual jboolean getPaintTicks();
-  virtual void setPaintTicks(jboolean);
-  virtual jboolean getPaintTrack();
-  virtual void setPaintTrack(jboolean);
-  virtual jboolean getPaintLabels();
-  virtual void setPaintLabels(jboolean);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -1441275936141218479LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) paintTicks;
-  jboolean paintTrack;
-  jboolean paintLabels;
-  ::java::util::Dictionary * labelTable;
-public: // actually protected
-  ::javax::swing::BoundedRangeModel * sliderModel;
-  jint majorTickSpacing;
-  jint minorTickSpacing;
-  jboolean snapToTicks;
-  jint orientation;
-private:
-  jboolean isInverted;
-public: // actually protected
-  ::javax::swing::event::ChangeListener * changeListener;
-  ::javax::swing::event::ChangeEvent * changeEvent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSlider__
diff --git a/libjava/javax/swing/JSpinner$DateEditor.h b/libjava/javax/swing/JSpinner$DateEditor.h
deleted file mode 100644
index 228da355c91..00000000000
--- a/libjava/javax/swing/JSpinner$DateEditor.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$DateEditor__
-#define __javax_swing_JSpinner$DateEditor__
-
-#pragma interface
-
-#include <javax/swing/JSpinner$DefaultEditor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class SimpleDateFormat;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner;
-        class JSpinner$DateEditor;
-        class SpinnerDateModel;
-    }
-  }
-}
-
-class javax::swing::JSpinner$DateEditor : public ::javax::swing::JSpinner$DefaultEditor
-{
-
-public:
-  JSpinner$DateEditor(::javax::swing::JSpinner *);
-  JSpinner$DateEditor(::javax::swing::JSpinner *, ::java::lang::String *);
-  virtual ::java::text::SimpleDateFormat * getFormat();
-  virtual ::javax::swing::SpinnerDateModel * getModel();
-private:
-  static const jlong serialVersionUID = -4279356973770397815LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$DateEditor__
diff --git a/libjava/javax/swing/JSpinner$DateEditorFormatter.h b/libjava/javax/swing/JSpinner$DateEditorFormatter.h
deleted file mode 100644
index f83b4348a76..00000000000
--- a/libjava/javax/swing/JSpinner$DateEditorFormatter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$DateEditorFormatter__
-#define __javax_swing_JSpinner$DateEditorFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/DateFormatter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner$DateEditorFormatter;
-    }
-  }
-}
-
-class javax::swing::JSpinner$DateEditorFormatter : public ::javax::swing::text::DateFormatter
-{
-
-public:
-  JSpinner$DateEditorFormatter();
-  JSpinner$DateEditorFormatter(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$DateEditorFormatter__
diff --git a/libjava/javax/swing/JSpinner$DefaultEditor.h b/libjava/javax/swing/JSpinner$DefaultEditor.h
deleted file mode 100644
index b586f07b4b6..00000000000
--- a/libjava/javax/swing/JSpinner$DefaultEditor.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$DefaultEditor__
-#define __javax_swing_JSpinner$DefaultEditor__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFormattedTextField;
-        class JSpinner;
-        class JSpinner$DefaultEditor;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JSpinner$DefaultEditor : public ::javax::swing::JPanel
-{
-
-public:
-  JSpinner$DefaultEditor(::javax::swing::JSpinner *);
-  virtual ::javax::swing::JSpinner * getSpinner();
-  virtual void commitEdit();
-  virtual void dismiss(::javax::swing::JSpinner *);
-  virtual ::javax::swing::JFormattedTextField * getTextField();
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-private:
-  ::javax::swing::JSpinner * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) spinner;
-public: // actually package-private
-  ::javax::swing::JFormattedTextField * ftf;
-private:
-  static const jlong serialVersionUID = -5317788736173368172LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$DefaultEditor__
diff --git a/libjava/javax/swing/JSpinner$ListEditor.h b/libjava/javax/swing/JSpinner$ListEditor.h
deleted file mode 100644
index 9ee06ff71ea..00000000000
--- a/libjava/javax/swing/JSpinner$ListEditor.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$ListEditor__
-#define __javax_swing_JSpinner$ListEditor__
-
-#pragma interface
-
-#include <javax/swing/JSpinner$DefaultEditor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner;
-        class JSpinner$ListEditor;
-        class SpinnerListModel;
-    }
-  }
-}
-
-class javax::swing::JSpinner$ListEditor : public ::javax::swing::JSpinner$DefaultEditor
-{
-
-public:
-  JSpinner$ListEditor(::javax::swing::JSpinner *);
-  virtual ::javax::swing::SpinnerListModel * getModel();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$ListEditor__
diff --git a/libjava/javax/swing/JSpinner$ModelListener.h b/libjava/javax/swing/JSpinner$ModelListener.h
deleted file mode 100644
index b91ea5e30e7..00000000000
--- a/libjava/javax/swing/JSpinner$ModelListener.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$ModelListener__
-#define __javax_swing_JSpinner$ModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner;
-        class JSpinner$ModelListener;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JSpinner$ModelListener : public ::java::lang::Object
-{
-
-public:
-  JSpinner$ModelListener(::javax::swing::JSpinner *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JSpinner * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$ModelListener__
diff --git a/libjava/javax/swing/JSpinner$NumberEditor.h b/libjava/javax/swing/JSpinner$NumberEditor.h
deleted file mode 100644
index a3a8dd166e2..00000000000
--- a/libjava/javax/swing/JSpinner$NumberEditor.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$NumberEditor__
-#define __javax_swing_JSpinner$NumberEditor__
-
-#pragma interface
-
-#include <javax/swing/JSpinner$DefaultEditor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class DecimalFormat;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner;
-        class JSpinner$NumberEditor;
-        class SpinnerNumberModel;
-    }
-  }
-}
-
-class javax::swing::JSpinner$NumberEditor : public ::javax::swing::JSpinner$DefaultEditor
-{
-
-public:
-  JSpinner$NumberEditor(::javax::swing::JSpinner *);
-  JSpinner$NumberEditor(::javax::swing::JSpinner *, ::java::lang::String *);
-  virtual ::java::text::DecimalFormat * getFormat();
-  virtual ::javax::swing::SpinnerNumberModel * getModel();
-private:
-  static const jlong serialVersionUID = 3791956183098282942LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$NumberEditor__
diff --git a/libjava/javax/swing/JSpinner$NumberEditorFormatter.h b/libjava/javax/swing/JSpinner$NumberEditorFormatter.h
deleted file mode 100644
index 6c2550415cf..00000000000
--- a/libjava/javax/swing/JSpinner$NumberEditorFormatter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner$NumberEditorFormatter__
-#define __javax_swing_JSpinner$NumberEditorFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/NumberFormatter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSpinner$NumberEditorFormatter;
-    }
-  }
-}
-
-class javax::swing::JSpinner$NumberEditorFormatter : public ::javax::swing::text::NumberFormatter
-{
-
-public:
-  JSpinner$NumberEditorFormatter();
-  JSpinner$NumberEditorFormatter(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner$NumberEditorFormatter__
diff --git a/libjava/javax/swing/JSpinner.h b/libjava/javax/swing/JSpinner.h
deleted file mode 100644
index 5457d6f1123..00000000000
--- a/libjava/javax/swing/JSpinner.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSpinner__
-#define __javax_swing_JSpinner__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JSpinner;
-        class SpinnerModel;
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class SpinnerUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JSpinner : public ::javax::swing::JComponent
-{
-
-public:
-  JSpinner();
-  JSpinner(::javax::swing::SpinnerModel *);
-  virtual void commitEdit();
-  virtual ::javax::swing::JComponent * getEditor();
-  virtual void setEditor(::javax::swing::JComponent *);
-  virtual ::javax::swing::SpinnerModel * getModel();
-  virtual void setModel(::javax::swing::SpinnerModel *);
-  virtual ::java::lang::Object * getNextValue();
-  virtual ::java::lang::Object * getPreviousValue();
-  virtual ::javax::swing::plaf::SpinnerUI * getUI();
-  virtual ::java::lang::Object * getValue();
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::String * getUIClassID();
-  virtual void updateUI();
-  virtual void setUI(::javax::swing::plaf::SpinnerUI *);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireStateChanged();
-  virtual ::javax::swing::JComponent * createEditor(::javax::swing::SpinnerModel *);
-private:
-  ::javax::swing::SpinnerModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) model;
-  ::javax::swing::JComponent * editor;
-  static const jlong serialVersionUID = 3412663575706551720LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSpinner__
diff --git a/libjava/javax/swing/JSplitPane$AccessibleJSplitPane.h b/libjava/javax/swing/JSplitPane$AccessibleJSplitPane.h
deleted file mode 100644
index 3144301d52a..00000000000
--- a/libjava/javax/swing/JSplitPane$AccessibleJSplitPane.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSplitPane$AccessibleJSplitPane__
-#define __javax_swing_JSplitPane$AccessibleJSplitPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JSplitPane;
-        class JSplitPane$AccessibleJSplitPane;
-    }
-  }
-}
-
-class javax::swing::JSplitPane$AccessibleJSplitPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JSplitPane$AccessibleJSplitPane(::javax::swing::JSplitPane *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::lang::Number * getCurrentAccessibleValue();
-  virtual jboolean setCurrentAccessibleValue(::java::lang::Number *);
-  virtual ::java::lang::Number * getMinimumAccessibleValue();
-  virtual ::java::lang::Number * getMaximumAccessibleValue();
-private:
-  static const jlong serialVersionUID = -1788116871416305366LL;
-public: // actually package-private
-  ::javax::swing::JSplitPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSplitPane$AccessibleJSplitPane__
diff --git a/libjava/javax/swing/JSplitPane.h b/libjava/javax/swing/JSplitPane.h
deleted file mode 100644
index 31405bd8728..00000000000
--- a/libjava/javax/swing/JSplitPane.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JSplitPane__
-#define __javax_swing_JSplitPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JSplitPane;
-      namespace plaf
-      {
-          class SplitPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JSplitPane : public ::javax::swing::JComponent
-{
-
-public:
-  JSplitPane(jint, jboolean, ::java::awt::Component *, ::java::awt::Component *);
-  JSplitPane(jint, ::java::awt::Component *, ::java::awt::Component *);
-  JSplitPane(jint, jboolean);
-  JSplitPane(jint);
-  JSplitPane();
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Component * getBottomComponent();
-  virtual jint getDividerLocation();
-  virtual jint getDividerSize();
-  virtual jint getLastDividerLocation();
-  virtual ::java::awt::Component * getLeftComponent();
-  virtual jint getMaximumDividerLocation();
-  virtual jint getMinimumDividerLocation();
-  virtual jint getOrientation();
-  virtual jdouble getResizeWeight();
-  virtual ::java::awt::Component * getRightComponent();
-  virtual ::java::awt::Component * getTopComponent();
-  virtual ::javax::swing::plaf::SplitPaneUI * getUI();
-  virtual jboolean isContinuousLayout();
-  virtual jboolean isOneTouchExpandable();
-  virtual jboolean isValidateRoot();
-public: // actually protected
-  virtual void paintChildren(::java::awt::Graphics *);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void remove(::java::awt::Component *);
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual void resetToPreferredSizes();
-  virtual void setBottomComponent(::java::awt::Component *);
-  virtual void setContinuousLayout(jboolean);
-  virtual void setDividerLocation(jdouble);
-  virtual void setDividerLocation(jint);
-  virtual void setDividerSize(jint);
-  virtual void setLastDividerLocation(jint);
-  virtual void setLeftComponent(::java::awt::Component *);
-  virtual void setOneTouchExpandable(jboolean);
-  virtual void setOrientation(jint);
-  virtual void setResizeWeight(jdouble);
-  virtual void setRightComponent(::java::awt::Component *);
-  virtual void setTopComponent(::java::awt::Component *);
-  virtual void setUI(::javax::swing::plaf::SplitPaneUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually package-private
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = -5634142046175988380LL;
-public:
-  static ::java::lang::String * BOTTOM;
-  static ::java::lang::String * CONTINUOUS_LAYOUT_PROPERTY;
-  static ::java::lang::String * DIVIDER;
-  static ::java::lang::String * DIVIDER_LOCATION_PROPERTY;
-  static ::java::lang::String * DIVIDER_SIZE_PROPERTY;
-  static const jint HORIZONTAL_SPLIT = 1;
-  static ::java::lang::String * LAST_DIVIDER_LOCATION_PROPERTY;
-  static ::java::lang::String * LEFT;
-  static ::java::lang::String * ONE_TOUCH_EXPANDABLE_PROPERTY;
-  static ::java::lang::String * ORIENTATION_PROPERTY;
-  static ::java::lang::String * RESIZE_WEIGHT_PROPERTY;
-  static ::java::lang::String * RIGHT;
-  static ::java::lang::String * TOP;
-  static const jint VERTICAL_SPLIT = 0;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) continuousLayout;
-  jboolean oneTouchExpandable;
-  jint dividerSize;
-  jint lastDividerLocation;
-  jint orientation;
-  ::java::awt::Component * leftComponent;
-  ::java::awt::Component * rightComponent;
-private:
-  jint dividerLocation;
-  jdouble resizeWeight;
-  jboolean clientDividerSizeSet;
-  jboolean clientOneTouchExpandableSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JSplitPane__
diff --git a/libjava/javax/swing/JTabbedPane$AccessibleJTabbedPane.h b/libjava/javax/swing/JTabbedPane$AccessibleJTabbedPane.h
deleted file mode 100644
index 8769fad0477..00000000000
--- a/libjava/javax/swing/JTabbedPane$AccessibleJTabbedPane.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTabbedPane$AccessibleJTabbedPane__
-#define __javax_swing_JTabbedPane$AccessibleJTabbedPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleSelection;
-    }
-    namespace swing
-    {
-        class JTabbedPane;
-        class JTabbedPane$AccessibleJTabbedPane;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTabbedPane$AccessibleJTabbedPane : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JTabbedPane$AccessibleJTabbedPane(::javax::swing::JTabbedPane *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-private:
-  static const jlong serialVersionUID = 7610530885966830483LL;
-public: // actually package-private
-  ::javax::swing::JTabbedPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTabbedPane$AccessibleJTabbedPane__
diff --git a/libjava/javax/swing/JTabbedPane$ModelListener.h b/libjava/javax/swing/JTabbedPane$ModelListener.h
deleted file mode 100644
index 04ffcc1961c..00000000000
--- a/libjava/javax/swing/JTabbedPane$ModelListener.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTabbedPane$ModelListener__
-#define __javax_swing_JTabbedPane$ModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTabbedPane;
-        class JTabbedPane$ModelListener;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTabbedPane$ModelListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  JTabbedPane$ModelListener(::javax::swing::JTabbedPane *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-private:
-  static const jlong serialVersionUID = 497359819958114132LL;
-public: // actually package-private
-  ::javax::swing::JTabbedPane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTabbedPane$ModelListener__
diff --git a/libjava/javax/swing/JTabbedPane$Page.h b/libjava/javax/swing/JTabbedPane$Page.h
deleted file mode 100644
index 346289a538b..00000000000
--- a/libjava/javax/swing/JTabbedPane$Page.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTabbedPane$Page__
-#define __javax_swing_JTabbedPane$Page__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JTabbedPane;
-        class JTabbedPane$Page;
-    }
-  }
-}
-
-class javax::swing::JTabbedPane$Page : public ::javax::accessibility::AccessibleContext
-{
-
-public: // actually protected
-  JTabbedPane$Page(::javax::swing::JTabbedPane *, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *, ::java::lang::String *);
-public:
-  virtual ::java::awt::Component * getComponent();
-  virtual void setComponent(::java::awt::Component *);
-  virtual ::java::lang::String * getTip();
-  virtual void setTip(::java::lang::String *);
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::lang::String * getTitle();
-  virtual void setTitle(::java::lang::String *);
-  virtual ::javax::swing::Icon * getIcon();
-  virtual void setIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getDisabledIcon();
-  virtual void setDisabledIcon(::javax::swing::Icon *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual jint getMnemonic();
-  virtual void setMnemonic(jint);
-  virtual void setMnemonic(jchar);
-  virtual jint getDisplayedMnemonicIndex();
-  virtual void setDisplayedMnemonicIndex(jint);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) tip;
-  ::java::awt::Component * component;
-  ::javax::swing::Icon * icon;
-  ::javax::swing::Icon * disabledIcon;
-  jboolean enabled;
-  ::java::lang::String * title;
-  ::java::awt::Color * bg;
-  ::java::awt::Color * fg;
-  jint mnemonicKey;
-  jint underlinedChar;
-  static const jlong serialVersionUID = 1614381073220130939LL;
-public: // actually package-private
-  ::javax::swing::JTabbedPane * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTabbedPane$Page__
diff --git a/libjava/javax/swing/JTabbedPane.h b/libjava/javax/swing/JTabbedPane.h
deleted file mode 100644
index 8b286e5c1af..00000000000
--- a/libjava/javax/swing/JTabbedPane.h
+++ /dev/null
@@ -1,148 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTabbedPane__
-#define __javax_swing_JTabbedPane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Rectangle;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Icon;
-        class JTabbedPane;
-        class SingleSelectionModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class TabbedPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JTabbedPane : public ::javax::swing::JComponent
-{
-
-public:
-  JTabbedPane();
-  JTabbedPane(jint);
-  JTabbedPane(jint, jint);
-  virtual ::javax::swing::plaf::TabbedPaneUI * getUI();
-  virtual void setUI(::javax::swing::plaf::TabbedPaneUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual ::javax::swing::SingleSelectionModel * getModel();
-  virtual void setModel(::javax::swing::SingleSelectionModel *);
-  virtual jint getTabPlacement();
-  virtual void setTabPlacement(jint);
-  virtual jint getTabLayoutPolicy();
-  virtual void setTabLayoutPolicy(jint);
-  virtual jint getSelectedIndex();
-private:
-  void checkIndex(jint, jint, jint);
-public:
-  virtual void setSelectedIndex(jint);
-  virtual ::java::awt::Component * getSelectedComponent();
-  virtual void setSelectedComponent(::java::awt::Component *);
-  virtual void insertTab(::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *, ::java::lang::String *, jint);
-  virtual void addTab(::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *, ::java::lang::String *);
-  virtual void addTab(::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Component *);
-  virtual void addTab(::java::lang::String *, ::java::awt::Component *);
-  virtual ::java::awt::Component * add(::java::awt::Component *);
-  virtual ::java::awt::Component * add(::java::lang::String *, ::java::awt::Component *);
-  virtual ::java::awt::Component * add(::java::awt::Component *, jint);
-  virtual void add(::java::awt::Component *, ::java::lang::Object *);
-  virtual void add(::java::awt::Component *, ::java::lang::Object *, jint);
-  virtual void removeTabAt(jint);
-  virtual void remove(::java::awt::Component *);
-  virtual void remove(jint);
-  virtual void removeAll();
-  virtual jint getTabCount();
-  virtual jint getTabRunCount();
-  virtual ::java::lang::String * getTitleAt(jint);
-  virtual ::javax::swing::Icon * getIconAt(jint);
-  virtual ::javax::swing::Icon * getDisabledIconAt(jint);
-  virtual ::java::lang::String * getToolTipTextAt(jint);
-  virtual ::java::awt::Color * getForegroundAt(jint);
-  virtual ::java::awt::Color * getBackgroundAt(jint);
-  virtual ::java::awt::Component * getComponentAt(jint);
-  virtual jboolean isEnabledAt(jint);
-  virtual jint getMnemonicAt(jint);
-  virtual jint getDisplayedMnemonicIndexAt(jint);
-  virtual ::java::awt::Rectangle * getBoundsAt(jint);
-  virtual void setTitleAt(jint, ::java::lang::String *);
-  virtual void setIconAt(jint, ::javax::swing::Icon *);
-  virtual void setDisabledIconAt(jint, ::javax::swing::Icon *);
-  virtual void setToolTipTextAt(jint, ::java::lang::String *);
-  virtual void setBackgroundAt(jint, ::java::awt::Color *);
-  virtual void setForegroundAt(jint, ::java::awt::Color *);
-  virtual void setEnabledAt(jint, jboolean);
-  virtual void setComponentAt(jint, ::java::awt::Component *);
-  virtual void setDisplayedMnemonicIndexAt(jint, jint);
-  virtual void setMnemonicAt(jint, jint);
-  virtual jint indexOfTab(::java::lang::String *);
-  virtual jint indexOfTab(::javax::swing::Icon *);
-  virtual jint indexOfComponent(::java::awt::Component *);
-  virtual jint indexAtLocation(jint, jint);
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = 1614381073220130939LL;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) changeEvent;
-  ::javax::swing::event::ChangeListener * changeListener;
-  ::javax::swing::SingleSelectionModel * model;
-public:
-  static const jint SCROLL_TAB_LAYOUT = 1;
-  static const jint WRAP_TAB_LAYOUT = 0;
-public: // actually protected
-  jint tabPlacement;
-private:
-  jint layoutPolicy;
-public: // actually package-private
-  ::java::util::Vector * tabs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTabbedPane__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.h
deleted file mode 100644
index 0264034abc9..00000000000
--- a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableCell.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleJTableCell__
-#define __javax_swing_JTable$AccessibleJTable$AccessibleJTableCell__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JTable;
-        class JTable$AccessibleJTable;
-        class JTable$AccessibleJTable$AccessibleJTableCell;
-    }
-  }
-}
-
-class javax::swing::JTable$AccessibleJTable$AccessibleJTableCell : public ::javax::accessibility::AccessibleContext
-{
-
-public:
-  JTable$AccessibleJTable$AccessibleJTableCell(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::JTable *, jint, jint, jint);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-  virtual jboolean isShowing();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jboolean isFocusTraversable();
-  virtual void requestFocus();
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-private:
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) table;
-  jint row;
-  jint column;
-  jint index;
-public: // actually package-private
-  ::javax::swing::JTable$AccessibleJTable * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$AccessibleJTable$AccessibleJTableCell__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.h
deleted file mode 100644
index 2a7e6aa61af..00000000000
--- a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableHeaderCell.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleJTableHeaderCell__
-#define __javax_swing_JTable$AccessibleJTable$AccessibleJTableHeaderCell__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JTable$AccessibleJTable;
-        class JTable$AccessibleJTable$AccessibleJTableHeaderCell;
-      namespace table
-      {
-          class JTableHeader;
-      }
-    }
-  }
-}
-
-class javax::swing::JTable$AccessibleJTable$AccessibleJTableHeaderCell : public ::javax::accessibility::AccessibleContext
-{
-
-  JTable$AccessibleJTable$AccessibleJTableHeaderCell(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *, ::java::awt::Component *, jint, jint);
-public: // actually package-private
-  virtual ::java::awt::Component * getColumnHeaderRenderer();
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual jint getAccessibleIndexInParent();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::java::util::Locale * getLocale();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Color * getBackground();
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Color * getForeground();
-  virtual void setForeground(::java::awt::Color *);
-  virtual ::java::awt::Cursor * getCursor();
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual ::java::awt::Font * getFont();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual jboolean isEnabled();
-  virtual void setEnabled(jboolean);
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-  virtual jboolean isShowing();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Point * getLocation();
-  virtual void setLocation(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual ::java::awt::Dimension * getSize();
-  virtual void setSize(::java::awt::Dimension *);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual jboolean isFocusTraversable();
-  virtual void requestFocus();
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-public: // actually package-private
-  JTable$AccessibleJTable$AccessibleJTableHeaderCell(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *, ::java::awt::Component *, jint, jint, ::javax::swing::JTable$AccessibleJTable$AccessibleJTableHeaderCell *);
-  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) header;
-  jint columnIndex;
-  ::javax::swing::JTable$AccessibleJTable * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$AccessibleJTable$AccessibleJTableHeaderCell__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.h
deleted file mode 100644
index 256910ef678..00000000000
--- a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleJTableModelChange.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleJTableModelChange__
-#define __javax_swing_JTable$AccessibleJTable$AccessibleJTableModelChange__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable$AccessibleJTable;
-        class JTable$AccessibleJTable$AccessibleJTableModelChange;
-    }
-  }
-}
-
-class javax::swing::JTable$AccessibleJTable$AccessibleJTableModelChange : public ::java::lang::Object
-{
-
-public: // actually protected
-  JTable$AccessibleJTable$AccessibleJTableModelChange(::javax::swing::JTable$AccessibleJTable *, jint, jint, jint, jint, jint);
-public:
-  virtual jint getType();
-  virtual jint getFirstRow();
-  virtual jint getLastRow();
-  virtual jint getFirstColumn();
-  virtual jint getLastColumn();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jint firstRow;
-  jint lastRow;
-  jint firstColumn;
-  jint lastColumn;
-public: // actually package-private
-  ::javax::swing::JTable$AccessibleJTable * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$AccessibleJTable$AccessibleJTableModelChange__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.h b/libjava/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.h
deleted file mode 100644
index 64e8a51143e..00000000000
--- a/libjava/javax/swing/JTable$AccessibleJTable$AccessibleTableHeader.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$AccessibleJTable$AccessibleTableHeader__
-#define __javax_swing_JTable$AccessibleJTable$AccessibleTableHeader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleTable;
-    }
-    namespace swing
-    {
-        class JTable$AccessibleJTable;
-        class JTable$AccessibleJTable$AccessibleTableHeader;
-      namespace table
-      {
-          class JTableHeader;
-      }
-    }
-  }
-}
-
-class javax::swing::JTable$AccessibleJTable$AccessibleTableHeader : public ::java::lang::Object
-{
-
-  JTable$AccessibleJTable$AccessibleTableHeader(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *);
-public:
-  virtual ::javax::accessibility::Accessible * getAccessibleCaption();
-  virtual void setAccessibleCaption(::javax::accessibility::Accessible *);
-  virtual ::javax::accessibility::Accessible * getAccessibleSummary();
-  virtual void setAccessibleSummary(::javax::accessibility::Accessible *);
-  virtual jint getAccessibleRowCount();
-  virtual jint getAccessibleColumnCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(jint, jint);
-  virtual jint getAccessibleRowExtentAt(jint, jint);
-  virtual jint getAccessibleColumnExtentAt(jint, jint);
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleRowHeader();
-  virtual void setAccessibleRowHeader(::javax::accessibility::AccessibleTable *);
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleColumnHeader();
-  virtual void setAccessibleColumnHeader(::javax::accessibility::AccessibleTable *);
-  virtual ::javax::accessibility::Accessible * getAccessibleRowDescription(jint);
-  virtual void setAccessibleRowDescription(jint, ::javax::accessibility::Accessible *);
-  virtual ::javax::accessibility::Accessible * getAccessibleColumnDescription(jint);
-  virtual void setAccessibleColumnDescription(jint, ::javax::accessibility::Accessible *);
-  virtual jboolean isAccessibleSelected(jint, jint);
-  virtual jboolean isAccessibleRowSelected(jint);
-  virtual jboolean isAccessibleColumnSelected(jint);
-  virtual JArray< jint > * getSelectedAccessibleRows();
-  virtual JArray< jint > * getSelectedAccessibleColumns();
-public: // actually package-private
-  JTable$AccessibleJTable$AccessibleTableHeader(::javax::swing::JTable$AccessibleJTable *, ::javax::swing::table::JTableHeader *, ::javax::swing::JTable$AccessibleJTable$AccessibleTableHeader *);
-private:
-  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) header;
-public: // actually package-private
-  ::javax::swing::JTable$AccessibleJTable * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$AccessibleJTable$AccessibleTableHeader__
diff --git a/libjava/javax/swing/JTable$AccessibleJTable.h b/libjava/javax/swing/JTable$AccessibleJTable.h
deleted file mode 100644
index 71cb86b68e1..00000000000
--- a/libjava/javax/swing/JTable$AccessibleJTable.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$AccessibleJTable__
-#define __javax_swing_JTable$AccessibleJTable__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleTable;
-    }
-    namespace swing
-    {
-        class JTable;
-        class JTable$AccessibleJTable;
-      namespace event
-      {
-          class ChangeEvent;
-          class ListSelectionEvent;
-          class TableColumnModelEvent;
-          class TableModelEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTable$AccessibleJTable : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JTable$AccessibleJTable(::javax::swing::JTable *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleTable();
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void addAccessibleSelection(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void selectAllAccessibleSelection();
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void tableChanged(::javax::swing::event::TableModelEvent *);
-  virtual void tableRowsInserted(::javax::swing::event::TableModelEvent *);
-  virtual void tableRowsDeleted(::javax::swing::event::TableModelEvent *);
-private:
-  void handleRowChange(::javax::swing::event::TableModelEvent *);
-public:
-  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *);
-private:
-  void handleColumnChange(jint, jint, jint);
-public:
-  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *);
-  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
-  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual jint getAccessibleRow(jint);
-  virtual jint getAccessibleColumn(jint);
-  virtual jint getAccessibleIndex(jint, jint);
-  virtual ::javax::accessibility::Accessible * getAccessibleCaption();
-  virtual void setAccessibleCaption(::javax::accessibility::Accessible *);
-  virtual ::javax::accessibility::Accessible * getAccessibleSummary();
-  virtual void setAccessibleSummary(::javax::accessibility::Accessible *);
-  virtual jint getAccessibleRowCount();
-  virtual jint getAccessibleColumnCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(jint, jint);
-  virtual jint getAccessibleRowExtentAt(jint, jint);
-  virtual jint getAccessibleColumnExtentAt(jint, jint);
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleRowHeader();
-  virtual void setAccessibleRowHeader(::javax::accessibility::AccessibleTable *);
-  virtual ::javax::accessibility::AccessibleTable * getAccessibleColumnHeader();
-  virtual void setAccessibleColumnHeader(::javax::accessibility::AccessibleTable *);
-  virtual ::javax::accessibility::Accessible * getAccessibleRowDescription(jint);
-  virtual void setAccessibleRowDescription(jint, ::javax::accessibility::Accessible *);
-  virtual ::javax::accessibility::Accessible * getAccessibleColumnDescription(jint);
-  virtual void setAccessibleColumnDescription(jint, ::javax::accessibility::Accessible *);
-  virtual jboolean isAccessibleSelected(jint, jint);
-  virtual jboolean isAccessibleRowSelected(jint);
-  virtual jboolean isAccessibleColumnSelected(jint);
-  virtual JArray< jint > * getSelectedAccessibleRows();
-  virtual JArray< jint > * getSelectedAccessibleColumns();
-  virtual jint getAccessibleRowAtIndex(jint);
-  virtual jint getAccessibleColumnAtIndex(jint);
-  virtual jint getAccessibleIndexAt(jint, jint);
-public: // actually package-private
-  static ::javax::swing::JTable * access$0(::javax::swing::JTable$AccessibleJTable *);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) lastSelectedRow;
-  jint lastSelectedColumn;
-  ::javax::accessibility::Accessible * caption;
-  ::javax::accessibility::Accessible * summary;
-  JArray< ::javax::accessibility::Accessible * > * rowDescriptions;
-  JArray< ::javax::accessibility::Accessible * > * columnDescriptions;
-public: // actually package-private
-  ::javax::swing::JTable * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$AccessibleJTable__
diff --git a/libjava/javax/swing/JTable$BooleanCellRenderer.h b/libjava/javax/swing/JTable$BooleanCellRenderer.h
deleted file mode 100644
index 127540b10ae..00000000000
--- a/libjava/javax/swing/JTable$BooleanCellRenderer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$BooleanCellRenderer__
-#define __javax_swing_JTable$BooleanCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JCheckBox;
-        class JTable;
-        class JTable$BooleanCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$BooleanCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public: // actually package-private
-  JTable$BooleanCellRenderer(::javax::swing::JTable *);
-  virtual ::javax::swing::JCheckBox * getCheckBox();
-public:
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-private:
-  ::javax::swing::JCheckBox * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) checkBox;
-public: // actually package-private
-  ::javax::swing::JTable * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$BooleanCellRenderer__
diff --git a/libjava/javax/swing/JTable$DateCellRenderer.h b/libjava/javax/swing/JTable$DateCellRenderer.h
deleted file mode 100644
index 854751c30bc..00000000000
--- a/libjava/javax/swing/JTable$DateCellRenderer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$DateCellRenderer__
-#define __javax_swing_JTable$DateCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$DateCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$DateCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-  JTable$DateCellRenderer(::javax::swing::JTable *);
-public:
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-public: // actually package-private
-  JTable$DateCellRenderer(::javax::swing::JTable *, ::javax::swing::JTable$DateCellRenderer *);
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$DateCellRenderer__
diff --git a/libjava/javax/swing/JTable$DoubleCellRenderer.h b/libjava/javax/swing/JTable$DoubleCellRenderer.h
deleted file mode 100644
index 7b3ef733c66..00000000000
--- a/libjava/javax/swing/JTable$DoubleCellRenderer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$DoubleCellRenderer__
-#define __javax_swing_JTable$DoubleCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$DoubleCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$DoubleCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public:
-  JTable$DoubleCellRenderer(::javax::swing::JTable *);
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$DoubleCellRenderer__
diff --git a/libjava/javax/swing/JTable$FloatCellRenderer.h b/libjava/javax/swing/JTable$FloatCellRenderer.h
deleted file mode 100644
index b53038046e7..00000000000
--- a/libjava/javax/swing/JTable$FloatCellRenderer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$FloatCellRenderer__
-#define __javax_swing_JTable$FloatCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$FloatCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$FloatCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public:
-  JTable$FloatCellRenderer(::javax::swing::JTable *);
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$FloatCellRenderer__
diff --git a/libjava/javax/swing/JTable$IconCellRenderer.h b/libjava/javax/swing/JTable$IconCellRenderer.h
deleted file mode 100644
index 6b7556658db..00000000000
--- a/libjava/javax/swing/JTable$IconCellRenderer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$IconCellRenderer__
-#define __javax_swing_JTable$IconCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$IconCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$IconCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public: // actually package-private
-  JTable$IconCellRenderer(::javax::swing::JTable *);
-public:
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$IconCellRenderer__
diff --git a/libjava/javax/swing/JTable$NumberCellRenderer.h b/libjava/javax/swing/JTable$NumberCellRenderer.h
deleted file mode 100644
index 4b51472577d..00000000000
--- a/libjava/javax/swing/JTable$NumberCellRenderer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$NumberCellRenderer__
-#define __javax_swing_JTable$NumberCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$NumberCellRenderer;
-    }
-  }
-}
-
-class javax::swing::JTable$NumberCellRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public:
-  JTable$NumberCellRenderer(::javax::swing::JTable *);
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$NumberCellRenderer__
diff --git a/libjava/javax/swing/JTable$TableColumnPropertyChangeHandler.h b/libjava/javax/swing/JTable$TableColumnPropertyChangeHandler.h
deleted file mode 100644
index dc512796b9f..00000000000
--- a/libjava/javax/swing/JTable$TableColumnPropertyChangeHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$TableColumnPropertyChangeHandler__
-#define __javax_swing_JTable$TableColumnPropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$TableColumnPropertyChangeHandler;
-    }
-  }
-}
-
-class javax::swing::JTable$TableColumnPropertyChangeHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JTable$TableColumnPropertyChangeHandler(::javax::swing::JTable *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$TableColumnPropertyChangeHandler__
diff --git a/libjava/javax/swing/JTable$TableTextField.h b/libjava/javax/swing/JTable$TableTextField.h
deleted file mode 100644
index c0c118f7c77..00000000000
--- a/libjava/javax/swing/JTable$TableTextField.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable$TableTextField__
-#define __javax_swing_JTable$TableTextField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class JTable$TableTextField;
-    }
-  }
-}
-
-class javax::swing::JTable$TableTextField : public ::javax::swing::JTextField
-{
-
-public: // actually package-private
-  JTable$TableTextField(::javax::swing::JTable *);
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable$TableTextField__
diff --git a/libjava/javax/swing/JTable.h b/libjava/javax/swing/JTable.h
deleted file mode 100644
index 09feb7f226b..00000000000
--- a/libjava/javax/swing/JTable.h
+++ /dev/null
@@ -1,294 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTable__
-#define __javax_swing_JTable__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JScrollPane;
-        class JTable;
-        class JTable$TableColumnPropertyChangeHandler;
-        class ListSelectionModel;
-        class SizeSequence;
-      namespace event
-      {
-          class ChangeEvent;
-          class ListSelectionEvent;
-          class TableColumnModelEvent;
-          class TableModelEvent;
-      }
-      namespace plaf
-      {
-          class TableUI;
-      }
-      namespace table
-      {
-          class JTableHeader;
-          class TableCellEditor;
-          class TableCellRenderer;
-          class TableColumn;
-          class TableColumnModel;
-          class TableModel;
-      }
-    }
-  }
-}
-
-class javax::swing::JTable : public ::javax::swing::JComponent
-{
-
-public:
-  JTable();
-  JTable(jint, jint);
-  JTable(JArray< JArray< ::java::lang::Object * > * > *, JArray< ::java::lang::Object * > *);
-  JTable(::javax::swing::table::TableModel *);
-  JTable(::javax::swing::table::TableModel *, ::javax::swing::table::TableColumnModel *);
-  JTable(::javax::swing::table::TableModel *, ::javax::swing::table::TableColumnModel *, ::javax::swing::ListSelectionModel *);
-  JTable(::java::util::Vector *, ::java::util::Vector *);
-public: // actually protected
-  virtual void initializeLocalVars();
-public:
-  virtual void addColumn(::javax::swing::table::TableColumn *);
-public: // actually protected
-  virtual void createDefaultEditors();
-  virtual void createDefaultRenderers();
-public:
-  static ::javax::swing::JScrollPane * createScrollPaneForTable(::javax::swing::JTable *);
-public: // actually protected
-  virtual ::javax::swing::table::TableColumnModel * createDefaultColumnModel();
-  virtual ::javax::swing::table::TableModel * createDefaultDataModel();
-  virtual ::javax::swing::ListSelectionModel * createDefaultSelectionModel();
-  virtual ::javax::swing::table::JTableHeader * createDefaultTableHeader();
-public:
-  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *);
-  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
-  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
-  virtual void tableChanged(::javax::swing::event::TableModelEvent *);
-private:
-  void handleCompleteChange(::javax::swing::event::TableModelEvent *);
-  void handleInsert(::javax::swing::event::TableModelEvent *);
-  void handleDelete(::javax::swing::event::TableModelEvent *);
-  void handleUpdate(::javax::swing::event::TableModelEvent *);
-  void checkSelection();
-public:
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual jint columnAtPoint(::java::awt::Point *);
-  virtual jint rowAtPoint(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getCellRect(jint, jint, jboolean);
-  virtual void clearSelection();
-  virtual jint getSelectedRow();
-  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
-  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jboolean getScrollableTracksViewportHeight();
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual ::javax::swing::table::TableCellEditor * getCellEditor(jint, jint);
-  virtual ::javax::swing::table::TableCellEditor * getDefaultEditor(::java::lang::Class *);
-  virtual ::javax::swing::table::TableCellRenderer * getCellRenderer(jint, jint);
-  virtual void setDefaultRenderer(::java::lang::Class *, ::javax::swing::table::TableCellRenderer *);
-  virtual ::javax::swing::table::TableCellRenderer * getDefaultRenderer(::java::lang::Class *);
-  virtual jint convertColumnIndexToModel(jint);
-  virtual jint convertColumnIndexToView(jint);
-  virtual ::java::awt::Component * prepareRenderer(::javax::swing::table::TableCellRenderer *, jint, jint);
-  virtual jboolean getAutoCreateColumnsFromModel();
-  virtual jint getAutoResizeMode();
-  virtual jint getRowHeight();
-  virtual jint getRowHeight(jint);
-  virtual jint getRowMargin();
-  virtual jboolean getRowSelectionAllowed();
-  virtual jboolean getCellSelectionEnabled();
-  virtual ::javax::swing::table::TableModel * getModel();
-  virtual jint getColumnCount();
-  virtual jint getRowCount();
-  virtual ::javax::swing::table::TableColumnModel * getColumnModel();
-  virtual jint getSelectedColumn();
-private:
-  static jint countSelections(::javax::swing::ListSelectionModel *);
-  static JArray< jint > * getSelections(::javax::swing::ListSelectionModel *);
-public:
-  virtual jint getSelectedColumnCount();
-  virtual JArray< jint > * getSelectedColumns();
-  virtual jboolean getColumnSelectionAllowed();
-  virtual jint getSelectedRowCount();
-  virtual JArray< jint > * getSelectedRows();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::table::TableCellEditor * getCellEditor();
-  virtual jboolean getDragEnabled();
-  virtual ::java::awt::Color * getGridColor();
-  virtual ::java::awt::Dimension * getIntercellSpacing();
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
-  virtual ::java::awt::Color * getSelectionBackground();
-  virtual ::java::awt::Color * getSelectionForeground();
-  virtual jboolean getShowHorizontalLines();
-  virtual jboolean getShowVerticalLines();
-  virtual ::javax::swing::table::JTableHeader * getTableHeader();
-  virtual void removeColumn(::javax::swing::table::TableColumn *);
-  virtual void moveColumn(jint, jint);
-  virtual void setAutoCreateColumnsFromModel(jboolean);
-  virtual void setAutoResizeMode(jint);
-  virtual void setRowHeight(jint);
-  virtual void setRowHeight(jint, jint);
-  virtual void setRowMargin(jint);
-  virtual void setRowSelectionAllowed(jboolean);
-  virtual void setCellSelectionEnabled(jboolean);
-  virtual void setModel(::javax::swing::table::TableModel *);
-  virtual void setColumnModel(::javax::swing::table::TableColumnModel *);
-  virtual void setColumnSelectionAllowed(jboolean);
-  virtual void setSelectionModel(::javax::swing::ListSelectionModel *);
-  virtual void setSelectionMode(jint);
-  virtual void setCellEditor(::javax::swing::table::TableCellEditor *);
-  virtual void setDragEnabled(jboolean);
-  virtual void setGridColor(::java::awt::Color *);
-  virtual void setIntercellSpacing(::java::awt::Dimension *);
-  virtual void setPreferredScrollableViewportSize(::java::awt::Dimension *);
-  virtual void setSelectionBackground(::java::awt::Color *);
-  virtual void setSelectionForeground(::java::awt::Color *);
-  virtual void setShowGrid(jboolean);
-  virtual void setShowHorizontalLines(jboolean);
-  virtual void setShowVerticalLines(jboolean);
-  virtual void setTableHeader(::javax::swing::table::JTableHeader *);
-public: // actually protected
-  virtual void configureEnclosingScrollPane();
-  virtual void unconfigureEnclosingScrollPane();
-public:
-  virtual void addNotify();
-  virtual void removeNotify();
-private:
-  void distributeSpill(JArray< ::javax::swing::table::TableColumn * > *, jint);
-  void distributeSpillResizing(JArray< ::javax::swing::table::TableColumn * > *, jint, ::javax::swing::table::TableColumn *);
-public:
-  virtual void doLayout();
-public: // actually package-private
-  virtual jint getLeftResizingBoundary();
-public:
-  virtual void sizeColumnsToFit(jboolean);
-  virtual void sizeColumnsToFit(jint);
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::plaf::TableUI * getUI();
-  virtual void setUI(::javax::swing::plaf::TableUI *);
-  virtual void updateUI();
-  virtual ::java::lang::Class * getColumnClass(jint);
-  virtual ::java::lang::String * getColumnName(jint);
-  virtual jint getEditingColumn();
-  virtual void setEditingColumn(jint);
-  virtual jint getEditingRow();
-  virtual void setEditingRow(jint);
-  virtual ::java::awt::Component * getEditorComponent();
-  virtual jboolean isEditing();
-  virtual void setDefaultEditor(::java::lang::Class *, ::javax::swing::table::TableCellEditor *);
-  virtual void addColumnSelectionInterval(jint, jint);
-  virtual void addRowSelectionInterval(jint, jint);
-  virtual void setColumnSelectionInterval(jint, jint);
-  virtual void setRowSelectionInterval(jint, jint);
-  virtual void removeColumnSelectionInterval(jint, jint);
-  virtual void removeRowSelectionInterval(jint, jint);
-  virtual jboolean isColumnSelected(jint);
-  virtual jboolean isRowSelected(jint);
-  virtual jboolean isCellSelected(jint, jint);
-  virtual void selectAll();
-  virtual ::java::lang::Object * getValueAt(jint, jint);
-  virtual void setValueAt(::java::lang::Object *, jint, jint);
-  virtual ::javax::swing::table::TableColumn * getColumn(::java::lang::Object *);
-  virtual jboolean isCellEditable(jint, jint);
-  virtual void createDefaultColumnsFromModel();
-  virtual void changeSelection(jint, jint, jboolean, jboolean);
-  virtual jboolean editCellAt(jint, jint);
-private:
-  void moveToCellBeingEdited(::java::awt::Component *);
-public:
-  virtual jboolean editCellAt(jint, jint, ::java::util::EventObject *);
-  virtual void removeEditor();
-  virtual ::java::awt::Component * prepareEditor(::javax::swing::table::TableCellEditor *, jint, jint);
-public: // actually protected
-  virtual void resizeAndRepaint();
-public:
-  virtual void setSurrendersFocusOnKeystroke(jboolean);
-  virtual jboolean getSurrendersFocusOnKeystroke();
-public: // actually package-private
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 3876025080382781659LL;
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) this_table;
-public:
-  static const jint AUTO_RESIZE_OFF = 0;
-  static const jint AUTO_RESIZE_NEXT_COLUMN = 1;
-  static const jint AUTO_RESIZE_SUBSEQUENT_COLUMNS = 2;
-  static const jint AUTO_RESIZE_ALL_COLUMNS = 4;
-  static const jint AUTO_RESIZE_LAST_COLUMN = 3;
-public: // actually protected
-  ::java::util::Hashtable * defaultEditorsByColumnClass;
-  ::java::util::Hashtable * defaultRenderersByColumnClass;
-  jint editingColumn;
-  jint editingRow;
-  ::java::awt::Component * editorComp;
-  jboolean autoCreateColumnsFromModel;
-  jint autoResizeMode;
-  jint rowHeight;
-  jint rowMargin;
-  jboolean rowSelectionAllowed;
-  jboolean cellSelectionEnabled;
-  ::javax::swing::table::TableModel * dataModel;
-  ::javax::swing::table::TableColumnModel * columnModel;
-  ::javax::swing::ListSelectionModel * selectionModel;
-  ::javax::swing::table::TableCellEditor * cellEditor;
-private:
-  jboolean dragEnabled;
-public: // actually protected
-  ::java::awt::Color * gridColor;
-  ::java::awt::Dimension * preferredViewportSize;
-  ::java::awt::Color * selectionBackground;
-private:
-  static ::java::lang::String * SELECTION_BACKGROUND_CHANGED_PROPERTY;
-public: // actually protected
-  ::java::awt::Color * selectionForeground;
-private:
-  static ::java::lang::String * SELECTION_FOREGROUND_CHANGED_PROPERTY;
-public: // actually protected
-  jboolean showHorizontalLines;
-  jboolean showVerticalLines;
-  ::javax::swing::table::JTableHeader * tableHeader;
-public: // actually package-private
-  ::javax::swing::JTable$TableColumnPropertyChangeHandler * tableColumnPropertyChangeHandler;
-private:
-  jboolean surrendersFocusOnKeystroke;
-  ::java::awt::Rectangle * rectCache;
-  jboolean clientRowHeightSet;
-  ::javax::swing::SizeSequence * rowHeights;
-  ::javax::swing::table::TableCellEditor * booleanInvertingEditor;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTable__
diff --git a/libjava/javax/swing/JTextArea$AccessibleJTextArea.h b/libjava/javax/swing/JTextArea$AccessibleJTextArea.h
deleted file mode 100644
index 57d5b20fcf0..00000000000
--- a/libjava/javax/swing/JTextArea$AccessibleJTextArea.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextArea$AccessibleJTextArea__
-#define __javax_swing_JTextArea$AccessibleJTextArea__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent$AccessibleJTextComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JTextArea;
-        class JTextArea$AccessibleJTextArea;
-    }
-  }
-}
-
-class javax::swing::JTextArea$AccessibleJTextArea : public ::javax::swing::text::JTextComponent$AccessibleJTextComponent
-{
-
-public: // actually protected
-  JTextArea$AccessibleJTextArea(::javax::swing::JTextArea *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-public: // actually package-private
-  ::javax::swing::JTextArea * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent$AccessibleJTextComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextArea$AccessibleJTextArea__
diff --git a/libjava/javax/swing/JTextArea.h b/libjava/javax/swing/JTextArea.h
deleted file mode 100644
index c5248b94bb9..00000000000
--- a/libjava/javax/swing/JTextArea.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextArea__
-#define __javax_swing_JTextArea__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JTextArea;
-      namespace text
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::JTextArea : public ::javax::swing::text::JTextComponent
-{
-
-public:
-  JTextArea();
-  JTextArea(::java::lang::String *);
-  JTextArea(jint, jint);
-  JTextArea(::java::lang::String *, jint, jint);
-  JTextArea(::javax::swing::text::Document *);
-  JTextArea(::javax::swing::text::Document *, ::java::lang::String *, jint, jint);
-  virtual void append(::java::lang::String *);
-public: // actually protected
-  virtual ::javax::swing::text::Document * createDefaultModel();
-public:
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
-  virtual ::java::lang::String * getUIClassID();
-  virtual jint getColumns();
-  virtual void setColumns(jint);
-  virtual jint getRows();
-  virtual void setRows(jint);
-  virtual jboolean getLineWrap();
-  virtual void setLineWrap(jboolean);
-  virtual jboolean getWrapStyleWord();
-  virtual void setWrapStyleWord(jboolean);
-  virtual jint getTabSize();
-  virtual void setTabSize(jint);
-public: // actually protected
-  virtual jint getColumnWidth();
-public:
-  virtual jint getLineCount();
-  virtual jint getLineStartOffset(jint);
-  virtual jint getLineEndOffset(jint);
-  virtual jint getLineOfOffset(jint);
-public: // actually protected
-  virtual jint getRowHeight();
-public:
-  virtual void insert(::java::lang::String *, jint);
-  virtual void replaceRange(::java::lang::String *, jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -6141680179310439825LL;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent)))) rows;
-  jint columns;
-  jboolean lineWrap;
-  jint tabSize;
-  jboolean wrapStyleWord;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextArea__
diff --git a/libjava/javax/swing/JTextField$1.h b/libjava/javax/swing/JTextField$1.h
deleted file mode 100644
index ca59073a823..00000000000
--- a/libjava/javax/swing/JTextField$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextField$1__
-#define __javax_swing_JTextField$1__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTextField$1;
-    }
-  }
-}
-
-class javax::swing::JTextField$1 : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  JTextField$1(::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextField$1__
diff --git a/libjava/javax/swing/JTextField$2.h b/libjava/javax/swing/JTextField$2.h
deleted file mode 100644
index 20129e4bbac..00000000000
--- a/libjava/javax/swing/JTextField$2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextField$2__
-#define __javax_swing_JTextField$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTextField;
-        class JTextField$2;
-    }
-  }
-}
-
-class javax::swing::JTextField$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  JTextField$2(::javax::swing::JTextField *);
-public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextField$2__
diff --git a/libjava/javax/swing/JTextField$AccessibleJTextField.h b/libjava/javax/swing/JTextField$AccessibleJTextField.h
deleted file mode 100644
index 403fcae20e5..00000000000
--- a/libjava/javax/swing/JTextField$AccessibleJTextField.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextField$AccessibleJTextField__
-#define __javax_swing_JTextField$AccessibleJTextField__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent$AccessibleJTextComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JTextField;
-        class JTextField$AccessibleJTextField;
-    }
-  }
-}
-
-class javax::swing::JTextField$AccessibleJTextField : public ::javax::swing::text::JTextComponent$AccessibleJTextComponent
-{
-
-public: // actually protected
-  JTextField$AccessibleJTextField(::javax::swing::JTextField *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-private:
-  static const jlong serialVersionUID = 8255147276740453036LL;
-public: // actually package-private
-  ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent$AccessibleJTextComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextField$AccessibleJTextField__
diff --git a/libjava/javax/swing/JTextField.h b/libjava/javax/swing/JTextField.h
deleted file mode 100644
index de4ed3ab823..00000000000
--- a/libjava/javax/swing/JTextField.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextField__
-#define __javax_swing_JTextField__
-
-#pragma interface
-
-#include <javax/swing/text/JTextComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Font;
-        class Rectangle;
-      namespace event
-      {
-          class ActionListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class BoundedRangeModel;
-        class JTextField;
-      namespace text
-      {
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::JTextField : public ::javax::swing::text::JTextComponent
-{
-
-public:
-  JTextField();
-  JTextField(::java::lang::String *);
-  JTextField(jint);
-  JTextField(::java::lang::String *, jint);
-  JTextField(::javax::swing::text::Document *, ::java::lang::String *, jint);
-public: // actually protected
-  virtual ::javax::swing::text::Document * createDefaultModel();
-public:
-  virtual void setDocument(::javax::swing::text::Document *);
-  virtual ::java::lang::String * getUIClassID();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-public: // actually protected
-  virtual void fireActionPerformed();
-public:
-  virtual jint getColumns();
-  virtual void setColumns(jint);
-  virtual jint getHorizontalAlignment();
-  virtual void setHorizontalAlignment(jint);
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual jint getScrollOffset();
-  virtual void setScrollOffset(jint);
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual void postActionEvent();
-  virtual ::javax::swing::Action * getAction();
-  virtual void setAction(::javax::swing::Action *);
-  virtual void setActionCommand(::java::lang::String *);
-public: // actually protected
-  virtual ::java::beans::PropertyChangeListener * createActionPropertyChangeListener(::javax::swing::Action *);
-  virtual void configurePropertiesFromAction(::javax::swing::Action *);
-  virtual jint getColumnWidth();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::BoundedRangeModel * getHorizontalVisibility();
-  virtual jboolean isValidateRoot();
-  virtual void scrollRectToVisible(::java::awt::Rectangle *);
-private:
-  static const jlong serialVersionUID = 353853209832607592LL;
-  static JArray< ::javax::swing::Action * > * actions;
-public:
-  static ::java::lang::String * notifyAction;
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::JTextComponent)))) columns;
-  jint align;
-  ::javax::swing::Action * action;
-  ::java::lang::String * actionCommand;
-  ::java::beans::PropertyChangeListener * actionPropertyChangeListener;
-  ::javax::swing::BoundedRangeModel * horizontalVisibility;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextField__
diff --git a/libjava/javax/swing/JTextPane.h b/libjava/javax/swing/JTextPane.h
deleted file mode 100644
index dcc6f7da788..00000000000
--- a/libjava/javax/swing/JTextPane.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTextPane__
-#define __javax_swing_JTextPane__
-
-#pragma interface
-
-#include <javax/swing/JEditorPane.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JTextPane;
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class EditorKit;
-          class MutableAttributeSet;
-          class Style;
-          class StyledDocument;
-          class StyledEditorKit;
-      }
-    }
-  }
-}
-
-class javax::swing::JTextPane : public ::javax::swing::JEditorPane
-{
-
-public:
-  JTextPane();
-  JTextPane(::javax::swing::text::StyledDocument *);
-  virtual ::java::lang::String * getUIClassID();
-  virtual void setDocument(::javax::swing::text::Document *);
-  virtual ::javax::swing::text::StyledDocument * getStyledDocument();
-  virtual void setStyledDocument(::javax::swing::text::StyledDocument *);
-  virtual void replaceSelection(::java::lang::String *);
-  virtual void insertComponent(::java::awt::Component *);
-  virtual void insertIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *);
-  virtual void removeStyle(::java::lang::String *);
-  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *);
-  virtual ::javax::swing::text::Style * getLogicalStyle();
-  virtual void setLogicalStyle(::javax::swing::text::Style *);
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttributes();
-  virtual void setCharacterAttributes(::javax::swing::text::AttributeSet *, jboolean);
-  virtual ::javax::swing::text::AttributeSet * getParagraphAttributes();
-  virtual void setParagraphAttributes(::javax::swing::text::AttributeSet *, jboolean);
-  virtual ::javax::swing::text::MutableAttributeSet * getInputAttributes();
-public: // actually protected
-  virtual ::javax::swing::text::StyledEditorKit * getStyledEditorKit();
-  virtual ::javax::swing::text::EditorKit * createDefaultEditorKit();
-public:
-  virtual void setEditorKit(::javax::swing::text::EditorKit *);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTextPane__
diff --git a/libjava/javax/swing/JToggleButton$AccessibleJToggleButton.h b/libjava/javax/swing/JToggleButton$AccessibleJToggleButton.h
deleted file mode 100644
index a1f01f3378a..00000000000
--- a/libjava/javax/swing/JToggleButton$AccessibleJToggleButton.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToggleButton$AccessibleJToggleButton__
-#define __javax_swing_JToggleButton$AccessibleJToggleButton__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton$AccessibleAbstractButton.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JToggleButton;
-        class JToggleButton$AccessibleJToggleButton;
-    }
-  }
-}
-
-class javax::swing::JToggleButton$AccessibleJToggleButton : public ::javax::swing::AbstractButton$AccessibleAbstractButton
-{
-
-public:
-  JToggleButton$AccessibleJToggleButton(::javax::swing::JToggleButton *);
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-private:
-  static const jlong serialVersionUID = -8652952712161229225LL;
-public: // actually package-private
-  ::javax::swing::JToggleButton * __attribute__((aligned(__alignof__( ::javax::swing::AbstractButton$AccessibleAbstractButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToggleButton$AccessibleJToggleButton__
diff --git a/libjava/javax/swing/JToggleButton$ToggleButtonModel.h b/libjava/javax/swing/JToggleButton$ToggleButtonModel.h
deleted file mode 100644
index a8d3c22595d..00000000000
--- a/libjava/javax/swing/JToggleButton$ToggleButtonModel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToggleButton$ToggleButtonModel__
-#define __javax_swing_JToggleButton$ToggleButtonModel__
-
-#pragma interface
-
-#include <javax/swing/DefaultButtonModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JToggleButton$ToggleButtonModel;
-    }
-  }
-}
-
-class javax::swing::JToggleButton$ToggleButtonModel : public ::javax::swing::DefaultButtonModel
-{
-
-public:
-  JToggleButton$ToggleButtonModel();
-  virtual void setPressed(jboolean);
-  virtual jboolean isSelected();
-  virtual void setSelected(jboolean);
-private:
-  static const jlong serialVersionUID = -1589950750899943974LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToggleButton$ToggleButtonModel__
diff --git a/libjava/javax/swing/JToggleButton.h b/libjava/javax/swing/JToggleButton.h
deleted file mode 100644
index 88f281ac5ee..00000000000
--- a/libjava/javax/swing/JToggleButton.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToggleButton__
-#define __javax_swing_JToggleButton__
-
-#pragma interface
-
-#include <javax/swing/AbstractButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JToggleButton;
-    }
-  }
-}
-
-class javax::swing::JToggleButton : public ::javax::swing::AbstractButton
-{
-
-public:
-  JToggleButton();
-  JToggleButton(::javax::swing::Action *);
-  JToggleButton(::javax::swing::Icon *);
-  JToggleButton(::javax::swing::Icon *, jboolean);
-  JToggleButton(::java::lang::String *);
-  JToggleButton(::java::lang::String *, jboolean);
-  JToggleButton(::java::lang::String *, ::javax::swing::Icon *);
-  JToggleButton(::java::lang::String *, ::javax::swing::Icon *, jboolean);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void updateUI();
-private:
-  static const jlong serialVersionUID = -3128248873429850443LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToggleButton__
diff --git a/libjava/javax/swing/JToolBar$AccessibleJToolBar.h b/libjava/javax/swing/JToolBar$AccessibleJToolBar.h
deleted file mode 100644
index 0474a4e9183..00000000000
--- a/libjava/javax/swing/JToolBar$AccessibleJToolBar.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolBar$AccessibleJToolBar__
-#define __javax_swing_JToolBar$AccessibleJToolBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class JToolBar;
-        class JToolBar$AccessibleJToolBar;
-    }
-  }
-}
-
-class javax::swing::JToolBar$AccessibleJToolBar : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JToolBar$AccessibleJToolBar(::javax::swing::JToolBar *);
-public:
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -5516888265903814215LL;
-public: // actually package-private
-  ::javax::swing::JToolBar * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolBar$AccessibleJToolBar__
diff --git a/libjava/javax/swing/JToolBar$DefaultToolBarLayout.h b/libjava/javax/swing/JToolBar$DefaultToolBarLayout.h
deleted file mode 100644
index ba7d9cc5239..00000000000
--- a/libjava/javax/swing/JToolBar$DefaultToolBarLayout.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolBar$DefaultToolBarLayout__
-#define __javax_swing_JToolBar$DefaultToolBarLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JToolBar;
-        class JToolBar$DefaultToolBarLayout;
-    }
-  }
-}
-
-class javax::swing::JToolBar$DefaultToolBarLayout : public ::java::lang::Object
-{
-
-  JToolBar$DefaultToolBarLayout(::javax::swing::JToolBar *);
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  JToolBar$DefaultToolBarLayout(::javax::swing::JToolBar *, ::javax::swing::JToolBar$DefaultToolBarLayout *);
-  ::javax::swing::JToolBar * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolBar$DefaultToolBarLayout__
diff --git a/libjava/javax/swing/JToolBar$Separator.h b/libjava/javax/swing/JToolBar$Separator.h
deleted file mode 100644
index a30fc4e273a..00000000000
--- a/libjava/javax/swing/JToolBar$Separator.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolBar$Separator__
-#define __javax_swing_JToolBar$Separator__
-
-#pragma interface
-
-#include <javax/swing/JSeparator.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JToolBar$Separator;
-    }
-  }
-}
-
-class javax::swing::JToolBar$Separator : public ::javax::swing::JSeparator
-{
-
-public:
-  JToolBar$Separator();
-  JToolBar$Separator(::java::awt::Dimension *);
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getSeparatorSize();
-  virtual void setSeparatorSize(::java::awt::Dimension *);
-private:
-  static const jlong serialVersionUID = -1656745644823105219LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolBar$Separator__
diff --git a/libjava/javax/swing/JToolBar.h b/libjava/javax/swing/JToolBar.h
deleted file mode 100644
index ea7cd99b27e..00000000000
--- a/libjava/javax/swing/JToolBar.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolBar__
-#define __javax_swing_JToolBar__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class LayoutManager;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class JButton;
-        class JToolBar;
-      namespace plaf
-      {
-          class ToolBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JToolBar : public ::javax::swing::JComponent
-{
-
-public:
-  JToolBar();
-  JToolBar(jint);
-  JToolBar(::java::lang::String *);
-  JToolBar(::java::lang::String *, jint);
-  virtual ::javax::swing::JButton * add(::javax::swing::Action *);
-public: // actually protected
-  virtual void paintBorder(::java::awt::Graphics *);
-public:
-  virtual ::javax::swing::plaf::ToolBarUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ToolBarUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual void setRollover(jboolean);
-  virtual jboolean isRollover();
-  virtual jint getComponentIndex(::java::awt::Component *);
-  virtual ::java::awt::Component * getComponentAtIndex(jint);
-  virtual ::java::awt::Insets * getMargin();
-  virtual void setMargin(::java::awt::Insets *);
-  virtual jboolean isBorderPainted();
-  virtual void setBorderPainted(jboolean);
-  virtual jboolean isFloatable();
-  virtual void setFloatable(jboolean);
-  virtual jint getOrientation();
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setOrientation(jint);
-  virtual void addSeparator();
-  virtual void addSeparator(::java::awt::Dimension *);
-public: // actually protected
-  virtual ::javax::swing::JButton * createActionComponent(::javax::swing::Action *);
-  virtual ::java::beans::PropertyChangeListener * createActionChangeListener(::javax::swing::JButton *);
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-private:
-  static const jlong serialVersionUID = -1269915519555129643LL;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) paintBorder__;
-  ::java::awt::Insets * margin;
-  jboolean floatable;
-  jboolean rollover;
-  jint orientation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolBar__
diff --git a/libjava/javax/swing/JToolTip$AccessibleJToolTip.h b/libjava/javax/swing/JToolTip$AccessibleJToolTip.h
deleted file mode 100644
index f65575e8aac..00000000000
--- a/libjava/javax/swing/JToolTip$AccessibleJToolTip.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolTip$AccessibleJToolTip__
-#define __javax_swing_JToolTip$AccessibleJToolTip__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JToolTip;
-        class JToolTip$AccessibleJToolTip;
-    }
-  }
-}
-
-class javax::swing::JToolTip$AccessibleJToolTip : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JToolTip$AccessibleJToolTip(::javax::swing::JToolTip *);
-public:
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-private:
-  static const jlong serialVersionUID = -6222548177795408476LL;
-public: // actually package-private
-  ::javax::swing::JToolTip * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolTip$AccessibleJToolTip__
diff --git a/libjava/javax/swing/JToolTip.h b/libjava/javax/swing/JToolTip.h
deleted file mode 100644
index d622528f066..00000000000
--- a/libjava/javax/swing/JToolTip.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JToolTip__
-#define __javax_swing_JToolTip__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JToolTip;
-      namespace plaf
-      {
-          class ToolTipUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JToolTip : public ::javax::swing::JComponent
-{
-
-public:
-  JToolTip();
-  virtual ::java::lang::String * getTipText();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::JComponent * getComponent();
-  virtual ::javax::swing::plaf::ToolTipUI * getUI();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual void setComponent(::javax::swing::JComponent *);
-  virtual void setTipText(::java::lang::String *);
-  virtual void updateUI();
-public: // actually package-private
-  virtual jboolean onTop();
-private:
-  static const jlong serialVersionUID = -1138929898906751643LL;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) text;
-  ::javax::swing::JComponent * component;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JToolTip__
diff --git a/libjava/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.h b/libjava/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.h
deleted file mode 100644
index 40d1f977081..00000000000
--- a/libjava/javax/swing/JTree$AccessibleJTree$AccessibleJTreeNode.h
+++ /dev/null
@@ -1,140 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$AccessibleJTree$AccessibleJTreeNode__
-#define __javax_swing_JTree$AccessibleJTree$AccessibleJTreeNode__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleAction;
-        class AccessibleComponent;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-        class AccessibleText;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JTree;
-        class JTree$AccessibleJTree;
-        class JTree$AccessibleJTree$AccessibleJTreeNode;
-      namespace tree
-      {
-          class TreeModel;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$AccessibleJTree$AccessibleJTreeNode : public ::javax::accessibility::AccessibleContext
-{
-
-public:
-  JTree$AccessibleJTree$AccessibleJTreeNode(::javax::swing::JTree$AccessibleJTree *, ::javax::swing::JTree *, ::javax::swing::tree::TreePath *, ::javax::accessibility::Accessible *);
-  virtual void addAccessibleSelection(jint);
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void clearAccessibleSelection();
-  virtual jboolean contains(::java::awt::Point *);
-  virtual jboolean doAccessibleAction(jint);
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual jint getAccessibleIndexInParent();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::Accessible * getAccessibleParent();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jint getAccessibleSelectionCount();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Cursor * getCursor();
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::util::Locale * getLocale();
-  virtual ::java::awt::Point * getLocation();
-public: // actually protected
-  virtual ::java::awt::Point * getLocationInJTree();
-public:
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getSize();
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual jboolean isEnabled();
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isShowing();
-  virtual jboolean isVisible();
-  virtual void removeAccessibleSelection(jint);
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void requestFocus();
-  virtual void selectAllAccessibleSelection();
-  virtual void setAccessibleDescription(::java::lang::String *);
-  virtual void setAccessibleName(::java::lang::String *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setLocation(::java::awt::Point *);
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void setVisible(jboolean);
-private:
-  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) tree;
-  ::javax::swing::tree::TreePath * tp;
-  ::javax::accessibility::Accessible * acc;
-  ::javax::accessibility::AccessibleStateSet * states;
-  ::java::util::Vector * selectionList;
-  ::java::util::Vector * actionList;
-  ::javax::swing::tree::TreeModel * mod;
-  ::java::awt::Cursor * cursor;
-public: // actually package-private
-  ::javax::swing::JTree$AccessibleJTree * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$AccessibleJTree$AccessibleJTreeNode__
diff --git a/libjava/javax/swing/JTree$AccessibleJTree.h b/libjava/javax/swing/JTree$AccessibleJTree.h
deleted file mode 100644
index e4b60e1e167..00000000000
--- a/libjava/javax/swing/JTree$AccessibleJTree.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$AccessibleJTree__
-#define __javax_swing_JTree$AccessibleJTree__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-        class AccessibleSelection;
-    }
-    namespace swing
-    {
-        class JTree;
-        class JTree$AccessibleJTree;
-      namespace event
-      {
-          class TreeExpansionEvent;
-          class TreeModelEvent;
-          class TreeSelectionEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$AccessibleJTree : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JTree$AccessibleJTree(::javax::swing::JTree *);
-  virtual void addAccessibleSelection(jint);
-  virtual void clearAccessibleSelection();
-  virtual void fireVisibleDataPropertyChange();
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual jint getAccessibleChildrenCount();
-  virtual jint getAccessibleIndexInParent();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::Accessible * getAccessibleSelection(jint);
-  virtual jint getAccessibleSelectionCount();
-  virtual jboolean isAccessibleChildSelected(jint);
-  virtual void removeAccessibleSelection(jint);
-  virtual void selectAllAccessibleSelection();
-  virtual void treeCollapsed(::javax::swing::event::TreeExpansionEvent *);
-  virtual void treeExpanded(::javax::swing::event::TreeExpansionEvent *);
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
-public: // actually package-private
-  static ::javax::swing::JTree * access$0(::javax::swing::JTree$AccessibleJTree *);
-  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$AccessibleJTree__
diff --git a/libjava/javax/swing/JTree$DynamicUtilTreeNode.h b/libjava/javax/swing/JTree$DynamicUtilTreeNode.h
deleted file mode 100644
index 0d658dd371e..00000000000
--- a/libjava/javax/swing/JTree$DynamicUtilTreeNode.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$DynamicUtilTreeNode__
-#define __javax_swing_JTree$DynamicUtilTreeNode__
-
-#pragma interface
-
-#include <javax/swing/tree/DefaultMutableTreeNode.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree$DynamicUtilTreeNode;
-      namespace tree
-      {
-          class DefaultMutableTreeNode;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$DynamicUtilTreeNode : public ::javax::swing::tree::DefaultMutableTreeNode
-{
-
-public:
-  JTree$DynamicUtilTreeNode(::java::lang::Object *, ::java::lang::Object *);
-  virtual jint getChildCount();
-public: // actually protected
-  virtual void loadChildren();
-public:
-  virtual ::java::util::Enumeration * children();
-  virtual ::javax::swing::tree::TreeNode * getChildAt(jint);
-  virtual jboolean isLeaf();
-  static void createChildren(::javax::swing::tree::DefaultMutableTreeNode *, ::java::lang::Object *);
-public: // actually protected
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::swing::tree::DefaultMutableTreeNode)))) childValue;
-  jboolean loadedChildren;
-  jboolean hasChildren;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$DynamicUtilTreeNode__
diff --git a/libjava/javax/swing/JTree$EmptySelectionModel.h b/libjava/javax/swing/JTree$EmptySelectionModel.h
deleted file mode 100644
index bafe35f2d7e..00000000000
--- a/libjava/javax/swing/JTree$EmptySelectionModel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$EmptySelectionModel__
-#define __javax_swing_JTree$EmptySelectionModel__
-
-#pragma interface
-
-#include <javax/swing/tree/DefaultTreeSelectionModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree$EmptySelectionModel;
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$EmptySelectionModel : public ::javax::swing::tree::DefaultTreeSelectionModel
-{
-
-public: // actually protected
-  JTree$EmptySelectionModel();
-public:
-  static ::javax::swing::JTree$EmptySelectionModel * sharedInstance();
-  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-private:
-  static const jlong serialVersionUID = -5815023306225701477LL;
-public: // actually protected
-  static ::javax::swing::JTree$EmptySelectionModel * sharedInstance__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$EmptySelectionModel__
diff --git a/libjava/javax/swing/JTree$TreeModelHandler.h b/libjava/javax/swing/JTree$TreeModelHandler.h
deleted file mode 100644
index 3fc8f654993..00000000000
--- a/libjava/javax/swing/JTree$TreeModelHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$TreeModelHandler__
-#define __javax_swing_JTree$TreeModelHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree;
-        class JTree$TreeModelHandler;
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$TreeModelHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  JTree$TreeModelHandler(::javax::swing::JTree *);
-public:
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
-public: // actually package-private
-  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$TreeModelHandler__
diff --git a/libjava/javax/swing/JTree$TreeSelectionRedirector.h b/libjava/javax/swing/JTree$TreeSelectionRedirector.h
deleted file mode 100644
index a7a1a6e65bd..00000000000
--- a/libjava/javax/swing/JTree$TreeSelectionRedirector.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree$TreeSelectionRedirector__
-#define __javax_swing_JTree$TreeSelectionRedirector__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree;
-        class JTree$TreeSelectionRedirector;
-      namespace event
-      {
-          class TreeSelectionEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree$TreeSelectionRedirector : public ::java::lang::Object
-{
-
-public: // actually protected
-  JTree$TreeSelectionRedirector(::javax::swing::JTree *);
-public:
-  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
-private:
-  static const jlong serialVersionUID = -3505069663646241664LL;
-public: // actually package-private
-  ::javax::swing::JTree * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree$TreeSelectionRedirector__
diff --git a/libjava/javax/swing/JTree.h b/libjava/javax/swing/JTree.h
deleted file mode 100644
index c9e66df2cb0..00000000000
--- a/libjava/javax/swing/JTree.h
+++ /dev/null
@@ -1,270 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JTree__
-#define __javax_swing_JTree__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JTree;
-        class JTree$TreeSelectionRedirector;
-      namespace event
-      {
-          class TreeExpansionListener;
-          class TreeModelListener;
-          class TreeSelectionEvent;
-          class TreeSelectionListener;
-          class TreeWillExpandListener;
-      }
-      namespace plaf
-      {
-          class TreeUI;
-      }
-      namespace text
-      {
-          class Position$Bias;
-      }
-      namespace tree
-      {
-          class TreeCellEditor;
-          class TreeCellRenderer;
-          class TreeModel;
-          class TreeNode;
-          class TreePath;
-          class TreeSelectionModel;
-      }
-    }
-  }
-}
-
-class javax::swing::JTree : public ::javax::swing::JComponent
-{
-
-public:
-  JTree();
-  JTree(::java::util::Hashtable *);
-  JTree(JArray< ::java::lang::Object * > *);
-  JTree(::javax::swing::tree::TreeModel *);
-  JTree(::javax::swing::tree::TreeNode *);
-  JTree(::javax::swing::tree::TreeNode *, jboolean);
-  JTree(::java::util::Vector *);
-  virtual jint getRowForPath(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPathForRow(jint);
-public: // actually protected
-  virtual JArray< ::javax::swing::tree::TreePath * > * getPathBetweenRows(jint, jint);
-  static ::javax::swing::tree::TreeModel * createTreeModel(::java::lang::Object *);
-public:
-  virtual ::javax::swing::plaf::TreeUI * getUI();
-  virtual void setUI(::javax::swing::plaf::TreeUI *);
-  virtual void updateUI();
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jboolean getScrollableTracksViewportHeight();
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual void addTreeExpansionListener(::javax::swing::event::TreeExpansionListener *);
-  virtual void removeTreeExpansionListener(::javax::swing::event::TreeExpansionListener *);
-  virtual JArray< ::javax::swing::event::TreeExpansionListener * > * getTreeExpansionListeners();
-  virtual void fireTreeCollapsed(::javax::swing::tree::TreePath *);
-  virtual void fireTreeExpanded(::javax::swing::tree::TreePath *);
-  virtual void addTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
-  virtual void removeTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
-  virtual JArray< ::javax::swing::event::TreeSelectionListener * > * getTreeSelectionListeners();
-public: // actually protected
-  virtual void fireValueChanged(::javax::swing::event::TreeSelectionEvent *);
-public:
-  virtual void addTreeWillExpandListener(::javax::swing::event::TreeWillExpandListener *);
-  virtual void removeTreeWillExpandListener(::javax::swing::event::TreeWillExpandListener *);
-  virtual JArray< ::javax::swing::event::TreeWillExpandListener * > * getTreeWillExpandListeners();
-  virtual void fireTreeWillCollapse(::javax::swing::tree::TreePath *);
-  virtual void fireTreeWillExpand(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreeModel * getModel();
-  virtual void setModel(::javax::swing::tree::TreeModel *);
-  virtual jboolean isEditable();
-  virtual void setEditable(jboolean);
-  virtual jboolean isRootVisible();
-  virtual void setRootVisible(jboolean);
-  virtual jboolean getShowsRootHandles();
-  virtual void setShowsRootHandles(jboolean);
-  virtual ::javax::swing::tree::TreeCellEditor * getCellEditor();
-  virtual void setCellEditor(::javax::swing::tree::TreeCellEditor *);
-  virtual ::javax::swing::tree::TreeCellRenderer * getCellRenderer();
-  virtual void setCellRenderer(::javax::swing::tree::TreeCellRenderer *);
-  virtual ::javax::swing::tree::TreeSelectionModel * getSelectionModel();
-  virtual void setSelectionModel(::javax::swing::tree::TreeSelectionModel *);
-  virtual jint getVisibleRowCount();
-  virtual void setVisibleRowCount(jint);
-  virtual jboolean isLargeModel();
-  virtual void setLargeModel(jboolean);
-  virtual jint getRowHeight();
-  virtual void setRowHeight(jint);
-  virtual jboolean isFixedRowHeight();
-  virtual jboolean getInvokesStopCellEditing();
-  virtual void setInvokesStopCellEditing(jboolean);
-  virtual jint getToggleClickCount();
-  virtual void setToggleClickCount(jint);
-  virtual void scrollPathToVisible(::javax::swing::tree::TreePath *);
-  virtual void scrollRowToVisible(jint);
-  virtual jboolean getScrollsOnExpand();
-  virtual void setScrollsOnExpand(jboolean);
-  virtual void setSelectionPath(::javax::swing::tree::TreePath *);
-  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-private:
-  void clearSelectionPathStates();
-public:
-  virtual void setSelectionRow(jint);
-  virtual void setSelectionRows(JArray< jint > *);
-  virtual void setSelectionInterval(jint, jint);
-  virtual void addSelectionPath(::javax::swing::tree::TreePath *);
-  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void addSelectionRow(jint);
-  virtual void addSelectionRows(JArray< jint > *);
-  virtual void addSelectionInterval(jint, jint);
-  virtual void removeSelectionPath(::javax::swing::tree::TreePath *);
-  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void removeSelectionRow(jint);
-  virtual void removeSelectionRows(JArray< jint > *);
-  virtual void removeSelectionInterval(jint, jint);
-  virtual void clearSelection();
-  virtual ::javax::swing::tree::TreePath * getLeadSelectionPath();
-  virtual void setLeadSelectionPath(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getAnchorSelectionPath();
-  virtual void setAnchorSelectionPath(::javax::swing::tree::TreePath *);
-  virtual jint getLeadSelectionRow();
-  virtual jint getMaxSelectionRow();
-  virtual jint getMinSelectionRow();
-  virtual jint getSelectionCount();
-  virtual ::javax::swing::tree::TreePath * getSelectionPath();
-  virtual JArray< ::javax::swing::tree::TreePath * > * getSelectionPaths();
-  virtual JArray< jint > * getSelectionRows();
-  virtual jboolean isPathSelected(::javax::swing::tree::TreePath *);
-  virtual jboolean isRowSelected(jint);
-  virtual jboolean isSelectionEmpty();
-  virtual jboolean getDragEnabled();
-  virtual void setDragEnabled(jboolean);
-  virtual jint getRowCount();
-  virtual void collapsePath(::javax::swing::tree::TreePath *);
-  virtual void collapseRow(jint);
-  virtual void expandPath(::javax::swing::tree::TreePath *);
-  virtual void expandRow(jint);
-  virtual jboolean isCollapsed(::javax::swing::tree::TreePath *);
-  virtual jboolean isCollapsed(jint);
-  virtual jboolean isExpanded(::javax::swing::tree::TreePath *);
-  virtual jboolean isExpanded(jint);
-  virtual jboolean getExpandsSelectedPaths();
-  virtual void setExpandsSelectedPaths(jboolean);
-  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::tree::TreePath *);
-  virtual ::java::awt::Rectangle * getRowBounds(jint);
-  virtual jboolean isEditing();
-  virtual jboolean stopEditing();
-  virtual void cancelEditing();
-  virtual void startEditingAtPath(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getEditingPath();
-  virtual ::javax::swing::tree::TreePath * getPathForLocation(jint, jint);
-  virtual jint getRowForLocation(jint, jint);
-  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(jint, jint);
-  virtual jint getClosestRowForLocation(jint, jint);
-  virtual ::java::lang::Object * getLastSelectedPathComponent();
-private:
-  void doExpandParents(::javax::swing::tree::TreePath *, jboolean);
-public: // actually protected
-  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean);
-  virtual void clearToggledPaths();
-  virtual ::java::util::Enumeration * getDescendantToggledPaths(::javax::swing::tree::TreePath *);
-public:
-  virtual jboolean hasBeenExpanded(::javax::swing::tree::TreePath *);
-  virtual jboolean isVisible(::javax::swing::tree::TreePath *);
-  virtual void makeVisible(::javax::swing::tree::TreePath *);
-  virtual jboolean isPathEditable(::javax::swing::tree::TreePath *);
-public: // actually protected
-  virtual ::javax::swing::event::TreeModelListener * createTreeModelListener();
-  static ::javax::swing::tree::TreeModel * getDefaultTreeModel();
-public:
-  virtual ::java::lang::String * convertValueToText(::java::lang::Object *, jboolean, jboolean, jboolean, jint, jboolean);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::java::util::Enumeration * getExpandedDescendants(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getNextMatch(::java::lang::String *, jint, ::javax::swing::text::Position$Bias *);
-public: // actually protected
-  virtual jboolean removeDescendantSelectedPaths(::javax::swing::tree::TreePath *, jboolean);
-  virtual void removeDescendantToggledPaths(::java::util::Enumeration *);
-public:
-  virtual void treeDidChange();
-public: // actually package-private
-  virtual void setUIProperty(::java::lang::String *, ::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 7559816092864483649LL;
-public:
-  static ::java::lang::String * CELL_EDITOR_PROPERTY;
-  static ::java::lang::String * CELL_RENDERER_PROPERTY;
-  static ::java::lang::String * EDITABLE_PROPERTY;
-  static ::java::lang::String * INVOKES_STOP_CELL_EDITING_PROPERTY;
-  static ::java::lang::String * LARGE_MODEL_PROPERTY;
-  static ::java::lang::String * ROOT_VISIBLE_PROPERTY;
-  static ::java::lang::String * ROW_HEIGHT_PROPERTY;
-  static ::java::lang::String * SCROLLS_ON_EXPAND_PROPERTY;
-  static ::java::lang::String * SELECTION_MODEL_PROPERTY;
-  static ::java::lang::String * SHOWS_ROOT_HANDLES_PROPERTY;
-  static ::java::lang::String * TOGGLE_CLICK_COUNT_PROPERTY;
-  static ::java::lang::String * TREE_MODEL_PROPERTY;
-  static ::java::lang::String * VISIBLE_ROW_COUNT_PROPERTY;
-  static ::java::lang::String * ANCHOR_SELECTION_PATH_PROPERTY;
-  static ::java::lang::String * LEAD_SELECTION_PATH_PROPERTY;
-  static ::java::lang::String * EXPANDS_SELECTED_PATHS_PROPERTY;
-private:
-  static ::java::lang::Object * EXPANDED;
-  static ::java::lang::Object * COLLAPSED;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) dragEnabled;
-  jboolean expandsSelectedPaths;
-  ::javax::swing::tree::TreePath * anchorSelectionPath;
-public: // actually package-private
-  ::java::util::Hashtable * nodeStates;
-public: // actually protected
-  ::javax::swing::tree::TreeCellEditor * cellEditor;
-  ::javax::swing::tree::TreeCellRenderer * cellRenderer;
-  jboolean editable;
-  jboolean invokesStopCellEditing;
-  jboolean largeModel;
-  jboolean rootVisible;
-  jint rowHeight;
-  jboolean scrollsOnExpand;
-  ::javax::swing::tree::TreeSelectionModel * selectionModel;
-  jboolean showsRootHandles;
-  jint toggleClickCount;
-  ::javax::swing::tree::TreeModel * treeModel;
-  jint visibleRowCount;
-  ::javax::swing::event::TreeModelListener * treeModelListener;
-  ::javax::swing::JTree$TreeSelectionRedirector * selectionRedirector;
-private:
-  jboolean clientRowHeightSet;
-  jboolean clientScrollsOnExpandSet;
-  jboolean clientShowsRootHandlesSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JTree__
diff --git a/libjava/javax/swing/JViewport$AccessibleJViewport.h b/libjava/javax/swing/JViewport$AccessibleJViewport.h
deleted file mode 100644
index bccdb7f29b1..00000000000
--- a/libjava/javax/swing/JViewport$AccessibleJViewport.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JViewport$AccessibleJViewport__
-#define __javax_swing_JViewport$AccessibleJViewport__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-        class JViewport;
-        class JViewport$AccessibleJViewport;
-    }
-  }
-}
-
-class javax::swing::JViewport$AccessibleJViewport : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JViewport$AccessibleJViewport(::javax::swing::JViewport *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-public: // actually package-private
-  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JViewport$AccessibleJViewport__
diff --git a/libjava/javax/swing/JViewport$ViewListener.h b/libjava/javax/swing/JViewport$ViewListener.h
deleted file mode 100644
index a7de943b699..00000000000
--- a/libjava/javax/swing/JViewport$ViewListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JViewport$ViewListener__
-#define __javax_swing_JViewport$ViewListener__
-
-#pragma interface
-
-#include <java/awt/event/ComponentAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JViewport;
-        class JViewport$ViewListener;
-    }
-  }
-}
-
-class javax::swing::JViewport$ViewListener : public ::java::awt::event::ComponentAdapter
-{
-
-public: // actually protected
-  JViewport$ViewListener(::javax::swing::JViewport *);
-public:
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-private:
-  static const jlong serialVersionUID = -2812489404285958070LL;
-public: // actually package-private
-  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JViewport$ViewListener__
diff --git a/libjava/javax/swing/JViewport.h b/libjava/javax/swing/JViewport.h
deleted file mode 100644
index 0ac6b8fbddc..00000000000
--- a/libjava/javax/swing/JViewport.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JViewport__
-#define __javax_swing_JViewport__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Image;
-        class Insets;
-        class LayoutManager;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JViewport;
-        class JViewport$ViewListener;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ViewportUI;
-      }
-    }
-  }
-}
-
-class javax::swing::JViewport : public ::javax::swing::JComponent
-{
-
-public:
-  JViewport();
-  virtual ::java::awt::Dimension * getExtentSize();
-  virtual ::java::awt::Dimension * toViewCoordinates(::java::awt::Dimension *);
-  virtual ::java::awt::Point * toViewCoordinates(::java::awt::Point *);
-  virtual void setExtentSize(::java::awt::Dimension *);
-  virtual ::java::awt::Dimension * getViewSize();
-  virtual void setViewSize(::java::awt::Dimension *);
-  virtual ::java::awt::Point * getViewPosition();
-  virtual void setViewPosition(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getViewRect();
-  virtual jboolean isBackingStoreEnabled();
-  virtual void setBackingStoreEnabled(jboolean);
-  virtual void setScrollMode(jint);
-  virtual jint getScrollMode();
-  virtual ::java::awt::Component * getView();
-  virtual void setView(::java::awt::Component *);
-  virtual void reshape(jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Insets * getInsets(::java::awt::Insets *);
-  virtual jboolean isOptimizedDrawingEnabled();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual ::java::lang::String * getUIClassID();
-  virtual void updateUI();
-  virtual ::javax::swing::plaf::ViewportUI * getUI();
-  virtual void setUI(::javax::swing::plaf::ViewportUI *);
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual void scrollRectToVisible(::java::awt::Rectangle *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual void repaint(jlong, jint, jint, jint, jint);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-  virtual void fireStateChanged();
-  virtual ::javax::swing::JViewport$ViewListener * createViewListener();
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual jboolean computeBlit(jint, jint, ::java::awt::Point *, ::java::awt::Point *, ::java::awt::Dimension *, ::java::awt::Rectangle *);
-public: // actually package-private
-  virtual void paintSimple(::java::awt::Graphics *);
-  virtual void paintBackingStore(::java::awt::Graphics *);
-  virtual void paintBlit(::java::awt::Graphics *);
-  virtual void paintImmediately2(jint, jint, jint, jint);
-  virtual jboolean isPaintRoot();
-public:
-  static const jint SIMPLE_SCROLL_MODE = 0;
-  static const jint BLIT_SCROLL_MODE = 1;
-  static const jint BACKINGSTORE_SCROLL_MODE = 2;
-private:
-  static const jlong serialVersionUID = -6925142919680527970LL;
-  static jint defaultScrollMode;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) scrollUnderway;
-  jboolean isViewSizeSet;
-  jboolean backingStore;
-  ::java::awt::Image * backingStoreImage;
-  ::java::awt::Point * lastPaintPosition;
-public: // actually package-private
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  jint scrollMode;
-  ::javax::swing::JViewport$ViewListener * viewListener;
-  ::java::awt::Point * cachedBlitFrom;
-  ::java::awt::Point * cachedBlitTo;
-  ::java::awt::Dimension * cachedBlitSize;
-  ::java::awt::Rectangle * cachedBlitPaint;
-  jboolean damaged;
-  jboolean sizeChanged;
-private:
-  jboolean isPaintRoot__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JViewport__
diff --git a/libjava/javax/swing/JWindow$AccessibleJWindow.h b/libjava/javax/swing/JWindow$AccessibleJWindow.h
deleted file mode 100644
index f7aa58a2b9b..00000000000
--- a/libjava/javax/swing/JWindow$AccessibleJWindow.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JWindow$AccessibleJWindow__
-#define __javax_swing_JWindow$AccessibleJWindow__
-
-#pragma interface
-
-#include <java/awt/Window$AccessibleAWTWindow.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JWindow;
-        class JWindow$AccessibleJWindow;
-    }
-  }
-}
-
-class javax::swing::JWindow$AccessibleJWindow : public ::java::awt::Window$AccessibleAWTWindow
-{
-
-public: // actually protected
-  JWindow$AccessibleJWindow(::javax::swing::JWindow *);
-public: // actually package-private
-  ::javax::swing::JWindow * __attribute__((aligned(__alignof__( ::java::awt::Window$AccessibleAWTWindow)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JWindow$AccessibleJWindow__
diff --git a/libjava/javax/swing/JWindow.h b/libjava/javax/swing/JWindow.h
deleted file mode 100644
index 89a7ebab7d0..00000000000
--- a/libjava/javax/swing/JWindow.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_JWindow__
-#define __javax_swing_JWindow__
-
-#pragma interface
-
-#include <java/awt/Window.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Frame;
-        class Graphics;
-        class GraphicsConfiguration;
-        class LayoutManager;
-        class Window;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JLayeredPane;
-        class JRootPane;
-        class JWindow;
-    }
-  }
-}
-
-class javax::swing::JWindow : public ::java::awt::Window
-{
-
-public:
-  JWindow();
-  JWindow(::java::awt::GraphicsConfiguration *);
-  JWindow(::java::awt::Frame *);
-  JWindow(::java::awt::Window *);
-  JWindow(::java::awt::Window *, ::java::awt::GraphicsConfiguration *);
-public: // actually protected
-  virtual void windowInit();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void setLayout(::java::awt::LayoutManager *);
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *);
-  virtual ::javax::swing::JLayeredPane * getLayeredPane();
-  virtual ::javax::swing::JRootPane * getRootPane();
-public: // actually protected
-  virtual void setRootPane(::javax::swing::JRootPane *);
-  virtual ::javax::swing::JRootPane * createRootPane();
-public:
-  virtual ::java::awt::Container * getContentPane();
-  virtual void setContentPane(::java::awt::Container *);
-  virtual ::java::awt::Component * getGlassPane();
-  virtual void setGlassPane(::java::awt::Component *);
-public: // actually protected
-  virtual void addImpl(::java::awt::Component *, ::java::lang::Object *, jint);
-public:
-  virtual void remove(::java::awt::Component *);
-public: // actually protected
-  virtual jboolean isRootPaneCheckingEnabled();
-  virtual void setRootPaneCheckingEnabled(jboolean);
-public:
-  virtual void update(::java::awt::Graphics *);
-public: // actually protected
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = 5420698392125238833LL;
-public: // actually protected
-  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::java::awt::Window)))) rootPane;
-  jboolean rootPaneCheckingEnabled;
-  ::javax::accessibility::AccessibleContext * accessibleContext;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_JWindow__
diff --git a/libjava/javax/swing/KeyStroke.h b/libjava/javax/swing/KeyStroke.h
deleted file mode 100644
index 640225608dc..00000000000
--- a/libjava/javax/swing/KeyStroke.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_KeyStroke__
-#define __javax_swing_KeyStroke__
-
-#pragma interface
-
-#include <java/awt/AWTKeyStroke.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class KeyStroke;
-    }
-  }
-}
-
-class javax::swing::KeyStroke : public ::java::awt::AWTKeyStroke
-{
-
-  KeyStroke();
-  KeyStroke(jchar, jint, jint, jboolean);
-public:
-  static ::javax::swing::KeyStroke * getKeyStroke(jchar);
-  static ::javax::swing::KeyStroke * getKeyStroke(jchar, jboolean);
-  static ::javax::swing::KeyStroke * getKeyStroke(::java::lang::Character *, jint);
-  static ::javax::swing::KeyStroke * getKeyStroke(jint, jint, jboolean);
-  static ::javax::swing::KeyStroke * getKeyStroke(jint, jint);
-  static ::javax::swing::KeyStroke * getKeyStroke(::java::lang::String *);
-  static ::javax::swing::KeyStroke * getKeyStrokeForEvent(::java::awt::event::KeyEvent *);
-private:
-  static const jlong serialVersionUID = -9060180771037902530LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_KeyStroke__
diff --git a/libjava/javax/swing/KeyboardManager.h b/libjava/javax/swing/KeyboardManager.h
deleted file mode 100644
index 28679e6c28c..00000000000
--- a/libjava/javax/swing/KeyboardManager.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_KeyboardManager__
-#define __javax_swing_KeyboardManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComponentInputMap;
-        class JComponent;
-        class JMenuBar;
-        class KeyStroke;
-        class KeyboardManager;
-    }
-  }
-}
-
-class javax::swing::KeyboardManager : public ::java::lang::Object
-{
-
-public: // actually package-private
-  KeyboardManager();
-public:
-  static ::javax::swing::KeyboardManager * getManager();
-public: // actually package-private
-  static ::java::awt::Container * findTopLevel(::java::awt::Component *);
-  virtual ::java::util::Hashtable * getHashtableForTopLevel(::java::awt::Container *);
-public:
-  virtual void registerBinding(::javax::swing::JComponent *, ::javax::swing::KeyStroke *);
-  virtual void clearBindingsForComp(::javax::swing::JComponent *);
-  virtual void registerEntireMap(::javax::swing::ComponentInputMap *);
-  virtual jboolean processKeyStroke(::java::awt::Component *, ::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *);
-public: // actually package-private
-  virtual ::java::util::Vector * getVectorForTopLevel(::java::awt::Container *);
-public:
-  virtual void registerJMenuBar(::javax::swing::JMenuBar *);
-  virtual void unregisterJMenuBar(::javax::swing::JMenuBar *);
-public: // actually package-private
-  static ::javax::swing::KeyboardManager * manager;
-  ::java::util::WeakHashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) topLevelLookup;
-  ::java::util::Hashtable * menuBarLookup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_KeyboardManager__
diff --git a/libjava/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.h b/libjava/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.h
deleted file mode 100644
index 5687b1fb258..00000000000
--- a/libjava/javax/swing/LayoutFocusTraversalPolicy$LayoutComparator.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_LayoutFocusTraversalPolicy$LayoutComparator__
-#define __javax_swing_LayoutFocusTraversalPolicy$LayoutComparator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class LayoutFocusTraversalPolicy$LayoutComparator;
-    }
-  }
-}
-
-class javax::swing::LayoutFocusTraversalPolicy$LayoutComparator : public ::java::lang::Object
-{
-
-public:
-  LayoutFocusTraversalPolicy$LayoutComparator();
-  virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_LayoutFocusTraversalPolicy$LayoutComparator__
diff --git a/libjava/javax/swing/LayoutFocusTraversalPolicy.h b/libjava/javax/swing/LayoutFocusTraversalPolicy.h
deleted file mode 100644
index 29883c2217c..00000000000
--- a/libjava/javax/swing/LayoutFocusTraversalPolicy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_LayoutFocusTraversalPolicy__
-#define __javax_swing_LayoutFocusTraversalPolicy__
-
-#pragma interface
-
-#include <javax/swing/SortingFocusTraversalPolicy.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class LayoutFocusTraversalPolicy;
-    }
-  }
-}
-
-class javax::swing::LayoutFocusTraversalPolicy : public ::javax::swing::SortingFocusTraversalPolicy
-{
-
-public:
-  LayoutFocusTraversalPolicy();
-private:
-  static const jlong serialVersionUID = 4312146927238881442LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_LayoutFocusTraversalPolicy__
diff --git a/libjava/javax/swing/ListCellRenderer.h b/libjava/javax/swing/ListCellRenderer.h
deleted file mode 100644
index 324a2184857..00000000000
--- a/libjava/javax/swing/ListCellRenderer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ListCellRenderer__
-#define __javax_swing_ListCellRenderer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-        class ListCellRenderer;
-    }
-  }
-}
-
-class javax::swing::ListCellRenderer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ListCellRenderer__
diff --git a/libjava/javax/swing/ListModel.h b/libjava/javax/swing/ListModel.h
deleted file mode 100644
index 73f268f7e67..00000000000
--- a/libjava/javax/swing/ListModel.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ListModel__
-#define __javax_swing_ListModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ListModel;
-      namespace event
-      {
-          class ListDataListener;
-      }
-    }
-  }
-}
-
-class javax::swing::ListModel : public ::java::lang::Object
-{
-
-public:
-  virtual jint getSize() = 0;
-  virtual ::java::lang::Object * getElementAt(jint) = 0;
-  virtual void addListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  virtual void removeListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ListModel__
diff --git a/libjava/javax/swing/ListSelectionModel.h b/libjava/javax/swing/ListSelectionModel.h
deleted file mode 100644
index d7c7363cf12..00000000000
--- a/libjava/javax/swing/ListSelectionModel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ListSelectionModel__
-#define __javax_swing_ListSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ListSelectionModel;
-      namespace event
-      {
-          class ListSelectionListener;
-      }
-    }
-  }
-}
-
-class javax::swing::ListSelectionModel : public ::java::lang::Object
-{
-
-public:
-  virtual void setSelectionMode(jint) = 0;
-  virtual jint getSelectionMode() = 0;
-  virtual void clearSelection() = 0;
-  virtual jint getMinSelectionIndex() = 0;
-  virtual jint getMaxSelectionIndex() = 0;
-  virtual jboolean isSelectedIndex(jint) = 0;
-  virtual jboolean isSelectionEmpty() = 0;
-  virtual void setSelectionInterval(jint, jint) = 0;
-  virtual void addSelectionInterval(jint, jint) = 0;
-  virtual void removeSelectionInterval(jint, jint) = 0;
-  virtual void insertIndexInterval(jint, jint, jboolean) = 0;
-  virtual void removeIndexInterval(jint, jint) = 0;
-  virtual jint getAnchorSelectionIndex() = 0;
-  virtual void setAnchorSelectionIndex(jint) = 0;
-  virtual jint getLeadSelectionIndex() = 0;
-  virtual void setLeadSelectionIndex(jint) = 0;
-  virtual void setValueIsAdjusting(jboolean) = 0;
-  virtual jboolean getValueIsAdjusting() = 0;
-  virtual void addListSelectionListener(::javax::swing::event::ListSelectionListener *) = 0;
-  virtual void removeListSelectionListener(::javax::swing::event::ListSelectionListener *) = 0;
-  static const jint SINGLE_SELECTION = 0;
-  static const jint SINGLE_INTERVAL_SELECTION = 1;
-  static const jint MULTIPLE_INTERVAL_SELECTION = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ListSelectionModel__
diff --git a/libjava/javax/swing/LookAndFeel$1.h b/libjava/javax/swing/LookAndFeel$1.h
deleted file mode 100644
index 22987e5ec0f..00000000000
--- a/libjava/javax/swing/LookAndFeel$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_LookAndFeel$1__
-#define __javax_swing_LookAndFeel$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class LookAndFeel$1;
-        class UIDefaults;
-    }
-  }
-}
-
-class javax::swing::LookAndFeel$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  LookAndFeel$1(::java::net::URL *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_LookAndFeel$1__
diff --git a/libjava/javax/swing/LookAndFeel.h b/libjava/javax/swing/LookAndFeel.h
deleted file mode 100644
index 1a1fd217760..00000000000
--- a/libjava/javax/swing/LookAndFeel.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_LookAndFeel__
-#define __javax_swing_LookAndFeel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComponentInputMap;
-        class InputMap;
-        class JComponent;
-        class LookAndFeel;
-        class UIDefaults;
-      namespace text
-      {
-          class JTextComponent$KeyBinding;
-      }
-    }
-  }
-}
-
-class javax::swing::LookAndFeel : public ::java::lang::Object
-{
-
-public:
-  LookAndFeel();
-  virtual ::javax::swing::UIDefaults * getDefaults();
-  virtual ::java::lang::String * getDescription() = 0;
-  static ::java::lang::Object * getDesktopPropertyValue(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::String * getID() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual jboolean getSupportsWindowDecorations();
-  virtual void initialize();
-  static void installBorder(::javax::swing::JComponent *, ::java::lang::String *);
-  static void installColors(::javax::swing::JComponent *, ::java::lang::String *, ::java::lang::String *);
-  static void installColorsAndFont(::javax::swing::JComponent *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual jboolean isNativeLookAndFeel() = 0;
-  virtual jboolean isSupportedLookAndFeel() = 0;
-  static void loadKeyBindings(::javax::swing::InputMap *, JArray< ::java::lang::Object * > *);
-  static ::javax::swing::ComponentInputMap * makeComponentInputMap(::javax::swing::JComponent *, JArray< ::java::lang::Object * > *);
-  static ::java::lang::Object * makeIcon(::java::lang::Class *, ::java::lang::String *);
-  static ::javax::swing::InputMap * makeInputMap(JArray< ::java::lang::Object * > *);
-  static JArray< ::javax::swing::text::JTextComponent$KeyBinding * > * makeKeyBindings(JArray< ::java::lang::Object * > *);
-  virtual void provideErrorFeedback(::java::awt::Component *);
-  virtual ::java::lang::String * toString();
-  virtual void uninitialize();
-  static void uninstallBorder(::javax::swing::JComponent *);
-  static void installProperty(::javax::swing::JComponent *, ::java::lang::String *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_LookAndFeel__
diff --git a/libjava/javax/swing/MenuElement.h b/libjava/javax/swing/MenuElement.h
deleted file mode 100644
index d48ef967887..00000000000
--- a/libjava/javax/swing/MenuElement.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_MenuElement__
-#define __javax_swing_MenuElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class MenuElement;
-        class MenuSelectionManager;
-    }
-  }
-}
-
-class javax::swing::MenuElement : public ::java::lang::Object
-{
-
-public:
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *) = 0;
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *) = 0;
-  virtual void menuSelectionChanged(jboolean) = 0;
-  virtual JArray< ::javax::swing::MenuElement * > * getSubElements() = 0;
-  virtual ::java::awt::Component * getComponent() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_MenuElement__
diff --git a/libjava/javax/swing/MenuSelectionManager.h b/libjava/javax/swing/MenuSelectionManager.h
deleted file mode 100644
index 8e3cfa9e9a7..00000000000
--- a/libjava/javax/swing/MenuSelectionManager.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_MenuSelectionManager__
-#define __javax_swing_MenuSelectionManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::MenuSelectionManager : public ::java::lang::Object
-{
-
-public:
-  MenuSelectionManager();
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual void clearSelectedPath();
-  virtual ::java::awt::Component * componentForPoint(::java::awt::Component *, ::java::awt::Point *);
-  static ::javax::swing::MenuSelectionManager * defaultManager();
-  virtual JArray< ::javax::swing::MenuElement * > * getSelectedPath();
-  virtual jboolean isComponentPartOfCurrentMenu(::java::awt::Component *);
-  virtual void processKeyEvent(::java::awt::event::KeyEvent *);
-  virtual void processMouseEvent(::java::awt::event::MouseEvent *);
-  virtual void setSelectedPath(JArray< ::javax::swing::MenuElement * > *);
-private:
-  JArray< ::javax::swing::MenuElement * > * getPath(::java::awt::Component *);
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  static ::javax::swing::MenuSelectionManager * manager;
-  ::java::util::Vector * selectedPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_MenuSelectionManager__
diff --git a/libjava/javax/swing/MutableComboBoxModel.h b/libjava/javax/swing/MutableComboBoxModel.h
deleted file mode 100644
index cfc67715280..00000000000
--- a/libjava/javax/swing/MutableComboBoxModel.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_MutableComboBoxModel__
-#define __javax_swing_MutableComboBoxModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class MutableComboBoxModel;
-      namespace event
-      {
-          class ListDataListener;
-      }
-    }
-  }
-}
-
-class javax::swing::MutableComboBoxModel : public ::java::lang::Object
-{
-
-public:
-  virtual void addElement(::java::lang::Object *) = 0;
-  virtual void removeElementAt(jint) = 0;
-  virtual void insertElementAt(::java::lang::Object *, jint) = 0;
-  virtual void removeElement(::java::lang::Object *) = 0;
-  virtual void setSelectedItem(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getSelectedItem() = 0;
-  virtual jint getSize() = 0;
-  virtual ::java::lang::Object * getElementAt(jint) = 0;
-  virtual void addListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  virtual void removeListDataListener(::javax::swing::event::ListDataListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_MutableComboBoxModel__
diff --git a/libjava/javax/swing/OverlayLayout.h b/libjava/javax/swing/OverlayLayout.h
deleted file mode 100644
index 065b35f3b64..00000000000
--- a/libjava/javax/swing/OverlayLayout.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_OverlayLayout__
-#define __javax_swing_OverlayLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class OverlayLayout;
-        class SizeRequirements;
-    }
-  }
-}
-
-class javax::swing::OverlayLayout : public ::java::lang::Object
-{
-
-public:
-  OverlayLayout(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-private:
-  void checkRequirements();
-  void checkTotalRequirements();
-  void checkLayout();
-  static const jlong serialVersionUID = 18082829169631543LL;
-  ::java::awt::Container * __attribute__((aligned(__alignof__( ::java::lang::Object)))) target;
-  JArray< ::javax::swing::SizeRequirements * > * xChildren;
-  JArray< ::javax::swing::SizeRequirements * > * yChildren;
-  ::javax::swing::SizeRequirements * xTotal;
-  ::javax::swing::SizeRequirements * yTotal;
-  JArray< jint > * offsetsX;
-  JArray< jint > * offsetsY;
-  JArray< jint > * spansX;
-  JArray< jint > * spansY;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_OverlayLayout__
diff --git a/libjava/javax/swing/Popup$JWindowPopup.h b/libjava/javax/swing/Popup$JWindowPopup.h
deleted file mode 100644
index fd6d60d6721..00000000000
--- a/libjava/javax/swing/Popup$JWindowPopup.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Popup$JWindowPopup__
-#define __javax_swing_Popup$JWindowPopup__
-
-#pragma interface
-
-#include <javax/swing/Popup.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JWindow;
-        class Popup$JWindowPopup;
-    }
-  }
-}
-
-class javax::swing::Popup$JWindowPopup : public ::javax::swing::Popup
-{
-
-public:
-  Popup$JWindowPopup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
-  virtual void show();
-  virtual void hide();
-public: // actually package-private
-  ::javax::swing::JWindow * __attribute__((aligned(__alignof__( ::javax::swing::Popup)))) window;
-private:
-  ::java::awt::Component * contents;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Popup$JWindowPopup__
diff --git a/libjava/javax/swing/Popup$LightweightPopup.h b/libjava/javax/swing/Popup$LightweightPopup.h
deleted file mode 100644
index d9b0123af90..00000000000
--- a/libjava/javax/swing/Popup$LightweightPopup.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Popup$LightweightPopup__
-#define __javax_swing_Popup$LightweightPopup__
-
-#pragma interface
-
-#include <javax/swing/Popup.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JLayeredPane;
-        class JPanel;
-        class Popup$LightweightPopup;
-    }
-  }
-}
-
-class javax::swing::Popup$LightweightPopup : public ::javax::swing::Popup
-{
-
-public:
-  Popup$LightweightPopup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
-  virtual void show();
-  virtual void hide();
-public: // actually package-private
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Popup)))) owner;
-  ::java::awt::Component * contents;
-  jint x;
-  jint y;
-private:
-  ::javax::swing::JPanel * panel;
-  ::javax::swing::JLayeredPane * layeredPane;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Popup$LightweightPopup__
diff --git a/libjava/javax/swing/Popup.h b/libjava/javax/swing/Popup.h
deleted file mode 100644
index 8c7f4b1fe69..00000000000
--- a/libjava/javax/swing/Popup.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Popup__
-#define __javax_swing_Popup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Popup;
-    }
-  }
-}
-
-class javax::swing::Popup : public ::java::lang::Object
-{
-
-public: // actually protected
-  Popup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
-  Popup();
-public:
-  virtual void show();
-  virtual void hide();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Popup__
diff --git a/libjava/javax/swing/PopupFactory.h b/libjava/javax/swing/PopupFactory.h
deleted file mode 100644
index 69f15a72a4a..00000000000
--- a/libjava/javax/swing/PopupFactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_PopupFactory__
-#define __javax_swing_PopupFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Popup;
-        class PopupFactory;
-    }
-  }
-}
-
-class javax::swing::PopupFactory : public ::java::lang::Object
-{
-
-public:
-  PopupFactory();
-  static void setSharedInstance(::javax::swing::PopupFactory *);
-  static ::javax::swing::PopupFactory * getSharedInstance();
-  virtual ::javax::swing::Popup * getPopup(::java::awt::Component *, ::java::awt::Component *, jint, jint);
-private:
-  static ::javax::swing::PopupFactory * sharedFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_PopupFactory__
diff --git a/libjava/javax/swing/ProgressMonitor$1.h b/libjava/javax/swing/ProgressMonitor$1.h
deleted file mode 100644
index 8537aa4a5e6..00000000000
--- a/libjava/javax/swing/ProgressMonitor$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ProgressMonitor$1__
-#define __javax_swing_ProgressMonitor$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ProgressMonitor;
-        class ProgressMonitor$1;
-    }
-  }
-}
-
-class javax::swing::ProgressMonitor$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ProgressMonitor$1(::javax::swing::ProgressMonitor *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::ProgressMonitor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ProgressMonitor$1__
diff --git a/libjava/javax/swing/ProgressMonitor$TimerListener.h b/libjava/javax/swing/ProgressMonitor$TimerListener.h
deleted file mode 100644
index 747fa707d83..00000000000
--- a/libjava/javax/swing/ProgressMonitor$TimerListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ProgressMonitor$TimerListener__
-#define __javax_swing_ProgressMonitor$TimerListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ProgressMonitor;
-        class ProgressMonitor$TimerListener;
-    }
-  }
-}
-
-class javax::swing::ProgressMonitor$TimerListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ProgressMonitor$TimerListener(::javax::swing::ProgressMonitor *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) timestamp;
-  jint lastProgress;
-  jboolean first;
-  ::javax::swing::ProgressMonitor * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ProgressMonitor$TimerListener__
diff --git a/libjava/javax/swing/ProgressMonitor.h b/libjava/javax/swing/ProgressMonitor.h
deleted file mode 100644
index 6f5b072b67f..00000000000
--- a/libjava/javax/swing/ProgressMonitor.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ProgressMonitor__
-#define __javax_swing_ProgressMonitor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JDialog;
-        class JLabel;
-        class JProgressBar;
-        class ProgressMonitor;
-        class Timer;
-    }
-  }
-}
-
-class javax::swing::ProgressMonitor : public ::java::lang::Object
-{
-
-public:
-  ProgressMonitor(::java::awt::Component *, ::java::lang::Object *, ::java::lang::String *, jint, jint);
-  virtual void close();
-  virtual void setProgress(jint);
-  virtual jint getMinimum();
-  virtual void setMinimum(jint);
-  virtual jint getMaximum();
-  virtual void setMaximum(jint);
-  virtual jboolean isCanceled();
-  virtual jint getMillisToDecideToPopup();
-  virtual void setMillisToDecideToPopup(jint);
-  virtual jint getMillisToPopup();
-  virtual void setMillisToPopup(jint);
-  virtual ::java::lang::String * getNote();
-  virtual void setNote(::java::lang::String *);
-public: // actually package-private
-  virtual void createDialog();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-public: // actually protected
-  ::javax::accessibility::AccessibleContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) accessibleContext;
-public: // actually package-private
-  ::java::awt::Component * component;
-  ::java::lang::String * note;
-  ::java::lang::Object * message;
-  jint millisToDecideToPopup;
-  jint millisToPopup;
-  jint min;
-  jint max;
-  jint progress;
-  ::javax::swing::JProgressBar * progressBar;
-  ::javax::swing::JLabel * noteLabel;
-  ::javax::swing::JDialog * progressDialog;
-  ::javax::swing::Timer * timer;
-  jboolean canceled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ProgressMonitor__
diff --git a/libjava/javax/swing/ProgressMonitorInputStream.h b/libjava/javax/swing/ProgressMonitorInputStream.h
deleted file mode 100644
index 2f4f555b8a9..00000000000
--- a/libjava/javax/swing/ProgressMonitorInputStream.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ProgressMonitorInputStream__
-#define __javax_swing_ProgressMonitorInputStream__
-
-#pragma interface
-
-#include <java/io/FilterInputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ProgressMonitor;
-        class ProgressMonitorInputStream;
-    }
-  }
-}
-
-class javax::swing::ProgressMonitorInputStream : public ::java::io::FilterInputStream
-{
-
-public:
-  ProgressMonitorInputStream(::java::awt::Component *, ::java::lang::Object *, ::java::io::InputStream *);
-  virtual void reset();
-  virtual jint read();
-  virtual jint read(JArray< jbyte > *);
-  virtual jint read(JArray< jbyte > *, jint, jint);
-  virtual jlong skip(jlong);
-  virtual void close();
-  virtual ::javax::swing::ProgressMonitor * getProgressMonitor();
-private:
-  void checkMonitorCanceled();
-  ::javax::swing::ProgressMonitor * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) monitor;
-  jint read__;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ProgressMonitorInputStream__
diff --git a/libjava/javax/swing/Renderer.h b/libjava/javax/swing/Renderer.h
deleted file mode 100644
index de6ca6c72d7..00000000000
--- a/libjava/javax/swing/Renderer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Renderer__
-#define __javax_swing_Renderer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Renderer;
-    }
-  }
-}
-
-class javax::swing::Renderer : public ::java::lang::Object
-{
-
-public:
-  virtual void setValue(::java::lang::Object *, jboolean) = 0;
-  virtual ::java::awt::Component * getComponent() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_Renderer__
diff --git a/libjava/javax/swing/RepaintManager$RepaintWorker.h b/libjava/javax/swing/RepaintManager$RepaintWorker.h
deleted file mode 100644
index ba38b995dea..00000000000
--- a/libjava/javax/swing/RepaintManager$RepaintWorker.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_RepaintManager$RepaintWorker__
-#define __javax_swing_RepaintManager$RepaintWorker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class RepaintManager;
-        class RepaintManager$RepaintWorker;
-    }
-  }
-}
-
-class javax::swing::RepaintManager$RepaintWorker : public ::java::lang::Object
-{
-
-public:
-  RepaintManager$RepaintWorker(::javax::swing::RepaintManager *);
-  virtual void setLive(jboolean);
-  virtual jboolean isLive();
-  virtual void run();
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) live;
-  ::javax::swing::RepaintManager * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_RepaintManager$RepaintWorker__
diff --git a/libjava/javax/swing/RepaintManager$RepaintWorkerEvent.h b/libjava/javax/swing/RepaintManager$RepaintWorkerEvent.h
deleted file mode 100644
index 7b68871bd36..00000000000
--- a/libjava/javax/swing/RepaintManager$RepaintWorkerEvent.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_RepaintManager$RepaintWorkerEvent__
-#define __javax_swing_RepaintManager$RepaintWorkerEvent__
-
-#pragma interface
-
-#include <java/awt/event/InvocationEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class RepaintManager$RepaintWorkerEvent;
-    }
-  }
-}
-
-class javax::swing::RepaintManager$RepaintWorkerEvent : public ::java::awt::event::InvocationEvent
-{
-
-public:
-  RepaintManager$RepaintWorkerEvent(::java::lang::Object *, ::java::lang::Runnable *, ::java::lang::Object *, jboolean);
-  virtual void dispatch();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_RepaintManager$RepaintWorkerEvent__
diff --git a/libjava/javax/swing/RepaintManager.h b/libjava/javax/swing/RepaintManager.h
deleted file mode 100644
index c599a47cc79..00000000000
--- a/libjava/javax/swing/RepaintManager.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_RepaintManager__
-#define __javax_swing_RepaintManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Image;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class RepaintManager;
-        class RepaintManager$RepaintWorker;
-    }
-  }
-}
-
-class javax::swing::RepaintManager : public ::java::lang::Object
-{
-
-public:
-  RepaintManager();
-  static ::javax::swing::RepaintManager * currentManager(::java::awt::Component *);
-  static ::javax::swing::RepaintManager * currentManager(::javax::swing::JComponent *);
-  static void setCurrentManager(::javax::swing::RepaintManager *);
-  virtual void addInvalidComponent(::javax::swing::JComponent *);
-  virtual void removeInvalidComponent(::javax::swing::JComponent *);
-  virtual void addDirtyRegion(::javax::swing::JComponent *, jint, jint, jint, jint);
-  virtual ::java::awt::Rectangle * getDirtyRegion(::javax::swing::JComponent *);
-  virtual void markCompletelyDirty(::javax::swing::JComponent *);
-  virtual void markCompletelyClean(::javax::swing::JComponent *);
-  virtual jboolean isCompletelyDirty(::javax::swing::JComponent *);
-  virtual void validateInvalidComponents();
-  virtual void paintDirtyRegions();
-private:
-  void compileRepaintRoots(::java::util::HashMap *, ::javax::swing::JComponent *, ::java::util::HashSet *);
-public:
-  virtual ::java::awt::Image * getOffscreenBuffer(::java::awt::Component *, jint, jint);
-public: // actually package-private
-  virtual void commitBuffer(::java::awt::Component *, jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Image * getVolatileOffscreenBuffer(::java::awt::Component *, jint, jint);
-  virtual ::java::awt::Dimension * getDoubleBufferMaximumSize();
-  virtual void setDoubleBufferMaximumSize(::java::awt::Dimension *);
-  virtual void setDoubleBufferingEnabled(jboolean);
-  virtual jboolean isDoubleBufferingEnabled();
-  virtual ::java::lang::String * toString();
-private:
-  void invokeLater(::java::lang::Runnable *);
-public: // actually package-private
-  static ::java::util::WeakHashMap * currentRepaintManagers;
-private:
-  static ::java::awt::Rectangle * rectCache;
-  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dirtyComponents;
-  ::java::util::HashMap * dirtyComponentsWork;
-  ::javax::swing::RepaintManager$RepaintWorker * repaintWorker;
-  ::java::util::ArrayList * invalidComponents;
-  jboolean doubleBufferingEnabled;
-  ::java::util::WeakHashMap * offscreenBuffers;
-  ::java::awt::Dimension * doubleBufferMaximumSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_RepaintManager__
diff --git a/libjava/javax/swing/RootPaneContainer.h b/libjava/javax/swing/RootPaneContainer.h
deleted file mode 100644
index 9318d8bc174..00000000000
--- a/libjava/javax/swing/RootPaneContainer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_RootPaneContainer__
-#define __javax_swing_RootPaneContainer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JLayeredPane;
-        class JRootPane;
-        class RootPaneContainer;
-    }
-  }
-}
-
-class javax::swing::RootPaneContainer : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::JRootPane * getRootPane() = 0;
-  virtual void setContentPane(::java::awt::Container *) = 0;
-  virtual ::java::awt::Container * getContentPane() = 0;
-  virtual void setLayeredPane(::javax::swing::JLayeredPane *) = 0;
-  virtual ::javax::swing::JLayeredPane * getLayeredPane() = 0;
-  virtual void setGlassPane(::java::awt::Component *) = 0;
-  virtual ::java::awt::Component * getGlassPane() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_RootPaneContainer__
diff --git a/libjava/javax/swing/ScrollPaneConstants.h b/libjava/javax/swing/ScrollPaneConstants.h
deleted file mode 100644
index 830a49f0229..00000000000
--- a/libjava/javax/swing/ScrollPaneConstants.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ScrollPaneConstants__
-#define __javax_swing_ScrollPaneConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ScrollPaneConstants;
-    }
-  }
-}
-
-class javax::swing::ScrollPaneConstants : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::String * VIEWPORT;
-  static ::java::lang::String * VERTICAL_SCROLLBAR;
-  static ::java::lang::String * HORIZONTAL_SCROLLBAR;
-  static ::java::lang::String * ROW_HEADER;
-  static ::java::lang::String * COLUMN_HEADER;
-  static ::java::lang::String * LOWER_LEFT_CORNER;
-  static ::java::lang::String * LOWER_RIGHT_CORNER;
-  static ::java::lang::String * UPPER_LEFT_CORNER;
-  static ::java::lang::String * UPPER_RIGHT_CORNER;
-  static ::java::lang::String * LOWER_LEADING_CORNER;
-  static ::java::lang::String * LOWER_TRAILING_CORNER;
-  static ::java::lang::String * UPPER_LEADING_CORNER;
-  static ::java::lang::String * UPPER_TRAILING_CORNER;
-  static ::java::lang::String * VERTICAL_SCROLLBAR_POLICY;
-  static ::java::lang::String * HORIZONTAL_SCROLLBAR_POLICY;
-  static const jint VERTICAL_SCROLLBAR_AS_NEEDED = 20;
-  static const jint VERTICAL_SCROLLBAR_NEVER = 21;
-  static const jint VERTICAL_SCROLLBAR_ALWAYS = 22;
-  static const jint HORIZONTAL_SCROLLBAR_AS_NEEDED = 30;
-  static const jint HORIZONTAL_SCROLLBAR_NEVER = 31;
-  static const jint HORIZONTAL_SCROLLBAR_ALWAYS = 32;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_ScrollPaneConstants__
diff --git a/libjava/javax/swing/ScrollPaneLayout$UIResource.h b/libjava/javax/swing/ScrollPaneLayout$UIResource.h
deleted file mode 100644
index 24c0fab6487..00000000000
--- a/libjava/javax/swing/ScrollPaneLayout$UIResource.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ScrollPaneLayout$UIResource__
-#define __javax_swing_ScrollPaneLayout$UIResource__
-
-#pragma interface
-
-#include <javax/swing/ScrollPaneLayout.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ScrollPaneLayout$UIResource;
-    }
-  }
-}
-
-class javax::swing::ScrollPaneLayout$UIResource : public ::javax::swing::ScrollPaneLayout
-{
-
-public:
-  ScrollPaneLayout$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ScrollPaneLayout$UIResource__
diff --git a/libjava/javax/swing/ScrollPaneLayout.h b/libjava/javax/swing/ScrollPaneLayout.h
deleted file mode 100644
index d0fe8178019..00000000000
--- a/libjava/javax/swing/ScrollPaneLayout.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ScrollPaneLayout__
-#define __javax_swing_ScrollPaneLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JScrollBar;
-        class JScrollPane;
-        class JViewport;
-        class ScrollPaneLayout;
-    }
-  }
-}
-
-class javax::swing::ScrollPaneLayout : public ::java::lang::Object
-{
-
-public:
-  ScrollPaneLayout();
-  virtual void syncWithScrollPane(::javax::swing::JScrollPane *);
-public: // actually protected
-  virtual ::java::awt::Component * addSingletonComponent(::java::awt::Component *, ::java::awt::Component *);
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual jint getVerticalScrollBarPolicy();
-  virtual void setVerticalScrollBarPolicy(jint);
-  virtual jint getHorizontalScrollBarPolicy();
-  virtual void setHorizontalScrollBarPolicy(jint);
-  virtual ::javax::swing::JViewport * getViewport();
-  virtual ::javax::swing::JScrollBar * getHorizontalScrollBar();
-  virtual ::javax::swing::JScrollBar * getVerticalScrollBar();
-  virtual ::javax::swing::JViewport * getRowHeader();
-  virtual ::javax::swing::JViewport * getColumnHeader();
-  virtual ::java::awt::Component * getCorner(::java::lang::String *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Rectangle * getViewportBorderBounds(::javax::swing::JScrollPane *);
-private:
-  static const jlong serialVersionUID = -4480022884523193743LL;
-public: // actually protected
-  ::javax::swing::JViewport * __attribute__((aligned(__alignof__( ::java::lang::Object)))) viewport;
-  ::javax::swing::JScrollBar * vsb;
-  ::javax::swing::JScrollBar * hsb;
-  ::javax::swing::JViewport * rowHead;
-  ::javax::swing::JViewport * colHead;
-  ::java::awt::Component * lowerLeft;
-  ::java::awt::Component * lowerRight;
-  ::java::awt::Component * upperLeft;
-  ::java::awt::Component * upperRight;
-  jint vsbPolicy;
-  jint hsbPolicy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ScrollPaneLayout__
diff --git a/libjava/javax/swing/Scrollable.h b/libjava/javax/swing/Scrollable.h
deleted file mode 100644
index 7030c9265f7..00000000000
--- a/libjava/javax/swing/Scrollable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Scrollable__
-#define __javax_swing_Scrollable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Scrollable;
-    }
-  }
-}
-
-class javax::swing::Scrollable : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize() = 0;
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint) = 0;
-  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint) = 0;
-  virtual jboolean getScrollableTracksViewportWidth() = 0;
-  virtual jboolean getScrollableTracksViewportHeight() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_Scrollable__
diff --git a/libjava/javax/swing/SingleSelectionModel.h b/libjava/javax/swing/SingleSelectionModel.h
deleted file mode 100644
index f8120e1116a..00000000000
--- a/libjava/javax/swing/SingleSelectionModel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SingleSelectionModel__
-#define __javax_swing_SingleSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SingleSelectionModel;
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::SingleSelectionModel : public ::java::lang::Object
-{
-
-public:
-  virtual jint getSelectedIndex() = 0;
-  virtual void setSelectedIndex(jint) = 0;
-  virtual void clearSelection() = 0;
-  virtual jboolean isSelected() = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_SingleSelectionModel__
diff --git a/libjava/javax/swing/SizeRequirements.h b/libjava/javax/swing/SizeRequirements.h
deleted file mode 100644
index 7a9672a77a7..00000000000
--- a/libjava/javax/swing/SizeRequirements.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SizeRequirements__
-#define __javax_swing_SizeRequirements__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-    }
-  }
-}
-
-class javax::swing::SizeRequirements : public ::java::lang::Object
-{
-
-public:
-  SizeRequirements();
-  SizeRequirements(jint, jint, jint, jfloat);
-  virtual ::java::lang::String * toString();
-  static ::javax::swing::SizeRequirements * getTiledSizeRequirements(JArray< ::javax::swing::SizeRequirements * > *);
-  static ::javax::swing::SizeRequirements * getAlignedSizeRequirements(JArray< ::javax::swing::SizeRequirements * > *);
-  static void calculateTiledPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *);
-  static void calculateTiledPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *, jboolean);
-private:
-  static void adjustSmaller(jint, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, jint);
-  static void adjustGreater(jint, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, jint);
-public:
-  static void calculateAlignedPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *);
-  static void calculateAlignedPositions(jint, ::javax::swing::SizeRequirements *, JArray< ::javax::swing::SizeRequirements * > *, JArray< jint > *, JArray< jint > *, jboolean);
-private:
-  static void adjustFromRight(::javax::swing::SizeRequirements *, jfloat, jint, JArray< jint > *);
-  static void adjustFromLeft(::javax::swing::SizeRequirements *, jfloat, jint, JArray< jint > *);
-public:
-  static JArray< jint > * adjustSizes(jint, JArray< ::javax::swing::SizeRequirements * > *);
-private:
-  static const jlong serialVersionUID = 9217749429906736553LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) minimum;
-  jint preferred;
-  jint maximum;
-  jfloat alignment;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SizeRequirements__
diff --git a/libjava/javax/swing/SizeSequence.h b/libjava/javax/swing/SizeSequence.h
deleted file mode 100644
index 8bae12cf6af..00000000000
--- a/libjava/javax/swing/SizeSequence.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SizeSequence__
-#define __javax_swing_SizeSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeSequence;
-    }
-  }
-}
-
-class javax::swing::SizeSequence : public ::java::lang::Object
-{
-
-public:
-  SizeSequence();
-  SizeSequence(jint);
-  SizeSequence(jint, jint);
-  SizeSequence(JArray< jint > *);
-  virtual void setSize(jint, jint);
-  virtual jint getIndex(jint);
-  virtual jint getSize(jint);
-  virtual void setSizes(JArray< jint > *);
-  virtual JArray< jint > * getSizes();
-  virtual jint getPosition(jint);
-  virtual void insertEntries(jint, jint, jint);
-  virtual void removeEntries(jint, jint);
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sizes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SizeSequence__
diff --git a/libjava/javax/swing/SortingFocusTraversalPolicy.h b/libjava/javax/swing/SortingFocusTraversalPolicy.h
deleted file mode 100644
index fc3d570b66f..00000000000
--- a/libjava/javax/swing/SortingFocusTraversalPolicy.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SortingFocusTraversalPolicy__
-#define __javax_swing_SortingFocusTraversalPolicy__
-
-#pragma interface
-
-#include <javax/swing/InternalFrameFocusTraversalPolicy.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SortingFocusTraversalPolicy;
-    }
-  }
-}
-
-class javax::swing::SortingFocusTraversalPolicy : public ::javax::swing::InternalFrameFocusTraversalPolicy
-{
-
-public: // actually protected
-  SortingFocusTraversalPolicy();
-public:
-  SortingFocusTraversalPolicy(::java::util::Comparator *);
-public: // actually protected
-  virtual jboolean accept(::java::awt::Component *);
-  virtual ::java::util::Comparator * getComparator();
-  virtual void setComparator(::java::util::Comparator *);
-private:
-  ::java::util::TreeSet * getSortedCycle(::java::awt::Container *, ::java::util::TreeSet *);
-public:
-  virtual ::java::awt::Component * getComponentAfter(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getComponentBefore(::java::awt::Container *, ::java::awt::Component *);
-  virtual ::java::awt::Component * getDefaultComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getFirstComponent(::java::awt::Container *);
-  virtual ::java::awt::Component * getLastComponent(::java::awt::Container *);
-  virtual jboolean getImplicitDownCycleTraversal();
-  virtual void setImplicitDownCycleTraversal(jboolean);
-public: // actually package-private
-  ::java::util::Comparator * __attribute__((aligned(__alignof__( ::javax::swing::InternalFrameFocusTraversalPolicy)))) comparator;
-  jboolean implicitDownCycleTraversal;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SortingFocusTraversalPolicy__
diff --git a/libjava/javax/swing/SpinnerDateModel.h b/libjava/javax/swing/SpinnerDateModel.h
deleted file mode 100644
index ae25fbe4c82..00000000000
--- a/libjava/javax/swing/SpinnerDateModel.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpinnerDateModel__
-#define __javax_swing_SpinnerDateModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractSpinnerModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpinnerDateModel;
-    }
-  }
-}
-
-class javax::swing::SpinnerDateModel : public ::javax::swing::AbstractSpinnerModel
-{
-
-public:
-  SpinnerDateModel();
-  SpinnerDateModel(::java::util::Date *, ::java::lang::Comparable *, ::java::lang::Comparable *, jint);
-  virtual jint getCalendarField();
-  virtual ::java::util::Date * getDate();
-  virtual ::java::lang::Comparable * getStart();
-  virtual ::java::lang::Comparable * getEnd();
-  virtual ::java::lang::Object * getValue();
-  virtual ::java::lang::Object * getNextValue();
-  virtual ::java::lang::Object * getPreviousValue();
-  virtual void setCalendarField(jint);
-  virtual void setStart(::java::lang::Comparable *);
-  virtual void setEnd(::java::lang::Comparable *);
-  virtual void setValue(::java::lang::Object *);
-private:
-  ::java::util::Calendar * __attribute__((aligned(__alignof__( ::javax::swing::AbstractSpinnerModel)))) date;
-  ::java::lang::Comparable * start;
-  ::java::lang::Comparable * end;
-  jint calendarField;
-  static const jlong serialVersionUID = -4802518107105940612LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpinnerDateModel__
diff --git a/libjava/javax/swing/SpinnerListModel.h b/libjava/javax/swing/SpinnerListModel.h
deleted file mode 100644
index b5a65939ede..00000000000
--- a/libjava/javax/swing/SpinnerListModel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpinnerListModel__
-#define __javax_swing_SpinnerListModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractSpinnerModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpinnerListModel;
-    }
-  }
-}
-
-class javax::swing::SpinnerListModel : public ::javax::swing::AbstractSpinnerModel
-{
-
-public:
-  SpinnerListModel();
-  SpinnerListModel(::java::util::List *);
-  SpinnerListModel(JArray< ::java::lang::Object * > *);
-  virtual ::java::util::List * getList();
-  virtual ::java::lang::Object * getNextValue();
-  virtual ::java::lang::Object * getPreviousValue();
-  virtual ::java::lang::Object * getValue();
-  virtual void setList(::java::util::List *);
-  virtual void setValue(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 3358804052191994516LL;
-  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::swing::AbstractSpinnerModel)))) list;
-  jint index;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpinnerListModel__
diff --git a/libjava/javax/swing/SpinnerModel.h b/libjava/javax/swing/SpinnerModel.h
deleted file mode 100644
index c762ac64a68..00000000000
--- a/libjava/javax/swing/SpinnerModel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpinnerModel__
-#define __javax_swing_SpinnerModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpinnerModel;
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::SpinnerModel : public ::java::lang::Object
-{
-
-public:
-  virtual void setValue(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getValue() = 0;
-  virtual ::java::lang::Object * getNextValue() = 0;
-  virtual ::java::lang::Object * getPreviousValue() = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_SpinnerModel__
diff --git a/libjava/javax/swing/SpinnerNumberModel.h b/libjava/javax/swing/SpinnerNumberModel.h
deleted file mode 100644
index 185205472f8..00000000000
--- a/libjava/javax/swing/SpinnerNumberModel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpinnerNumberModel__
-#define __javax_swing_SpinnerNumberModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractSpinnerModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpinnerNumberModel;
-    }
-  }
-}
-
-class javax::swing::SpinnerNumberModel : public ::javax::swing::AbstractSpinnerModel
-{
-
-public:
-  SpinnerNumberModel();
-  SpinnerNumberModel(jdouble, jdouble, jdouble, jdouble);
-  SpinnerNumberModel(jint, jint, jint, jint);
-  SpinnerNumberModel(::java::lang::Number *, ::java::lang::Comparable *, ::java::lang::Comparable *, ::java::lang::Number *);
-  virtual void setValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getValue();
-  virtual ::java::lang::Object * getNextValue();
-  virtual ::java::lang::Object * getPreviousValue();
-  virtual ::java::lang::Number * getNumber();
-  virtual ::java::lang::Comparable * getMinimum();
-  virtual void setMinimum(::java::lang::Comparable *);
-  virtual ::java::lang::Comparable * getMaximum();
-  virtual void setMaximum(::java::lang::Comparable *);
-  virtual ::java::lang::Number * getStepSize();
-  virtual void setStepSize(::java::lang::Number *);
-private:
-  static const jlong serialVersionUID = 7279176385485777821LL;
-  ::java::lang::Number * __attribute__((aligned(__alignof__( ::javax::swing::AbstractSpinnerModel)))) value;
-  ::java::lang::Comparable * minimum;
-  ::java::lang::Comparable * maximum;
-  ::java::lang::Number * stepSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpinnerNumberModel__
diff --git a/libjava/javax/swing/Spring$1.h b/libjava/javax/swing/Spring$1.h
deleted file mode 100644
index 22d14adf409..00000000000
--- a/libjava/javax/swing/Spring$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$1__
-#define __javax_swing_Spring$1__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class Spring$1;
-    }
-  }
-}
-
-class javax::swing::Spring$1 : public ::javax::swing::Spring
-{
-
-public: // actually package-private
-  Spring$1(jfloat, ::javax::swing::Spring *);
-public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  jfloat __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$factor;
-  ::javax::swing::Spring * val$spring;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$1__
diff --git a/libjava/javax/swing/Spring$2.h b/libjava/javax/swing/Spring$2.h
deleted file mode 100644
index 14fdf5899e4..00000000000
--- a/libjava/javax/swing/Spring$2.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$2__
-#define __javax_swing_Spring$2__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring$2;
-    }
-  }
-}
-
-class javax::swing::Spring$2 : public ::javax::swing::Spring
-{
-
-public: // actually package-private
-  Spring$2(::java::awt::Component *);
-public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$component;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$2__
diff --git a/libjava/javax/swing/Spring$3.h b/libjava/javax/swing/Spring$3.h
deleted file mode 100644
index 30934e64ad6..00000000000
--- a/libjava/javax/swing/Spring$3.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$3__
-#define __javax_swing_Spring$3__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring$3;
-    }
-  }
-}
-
-class javax::swing::Spring$3 : public ::javax::swing::Spring
-{
-
-public: // actually package-private
-  Spring$3(::java::awt::Component *);
-public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) val$component;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$3__
diff --git a/libjava/javax/swing/Spring$AddSpring.h b/libjava/javax/swing/Spring$AddSpring.h
deleted file mode 100644
index 9c455fead45..00000000000
--- a/libjava/javax/swing/Spring$AddSpring.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$AddSpring__
-#define __javax_swing_Spring$AddSpring__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class Spring$AddSpring;
-    }
-  }
-}
-
-class javax::swing::Spring$AddSpring : public ::javax::swing::Spring
-{
-
-public:
-  ::java::lang::String * toString();
-public: // actually protected
-  Spring$AddSpring(::javax::swing::Spring *, ::javax::swing::Spring *);
-public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) s1;
-  ::javax::swing::Spring * s2;
-  jint value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$AddSpring__
diff --git a/libjava/javax/swing/Spring$MaxSpring.h b/libjava/javax/swing/Spring$MaxSpring.h
deleted file mode 100644
index c3272b2ce78..00000000000
--- a/libjava/javax/swing/Spring$MaxSpring.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$MaxSpring__
-#define __javax_swing_Spring$MaxSpring__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class Spring$MaxSpring;
-    }
-  }
-}
-
-class javax::swing::Spring$MaxSpring : public ::javax::swing::Spring
-{
-
-public:
-  ::java::lang::String * toString();
-public: // actually protected
-  Spring$MaxSpring(::javax::swing::Spring *, ::javax::swing::Spring *);
-public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) s1;
-  ::javax::swing::Spring * s2;
-  jint value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$MaxSpring__
diff --git a/libjava/javax/swing/Spring$MinusSpring.h b/libjava/javax/swing/Spring$MinusSpring.h
deleted file mode 100644
index 7b74f661301..00000000000
--- a/libjava/javax/swing/Spring$MinusSpring.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$MinusSpring__
-#define __javax_swing_Spring$MinusSpring__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class Spring$MinusSpring;
-    }
-  }
-}
-
-class javax::swing::Spring$MinusSpring : public ::javax::swing::Spring
-{
-
-public:
-  ::java::lang::String * toString();
-public: // actually protected
-  Spring$MinusSpring(::javax::swing::Spring *);
-public:
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) s;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$MinusSpring__
diff --git a/libjava/javax/swing/Spring$SimpleSpring.h b/libjava/javax/swing/Spring$SimpleSpring.h
deleted file mode 100644
index b28437cca0f..00000000000
--- a/libjava/javax/swing/Spring$SimpleSpring.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring$SimpleSpring__
-#define __javax_swing_Spring$SimpleSpring__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring$SimpleSpring;
-    }
-  }
-}
-
-class javax::swing::Spring$SimpleSpring : public ::javax::swing::Spring
-{
-
-public:
-  ::java::lang::String * toString();
-  Spring$SimpleSpring(jint, jint, jint);
-  jint getMaximumValue();
-  jint getMinimumValue();
-  jint getPreferredValue();
-  jint getValue();
-  void setValue(jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) min;
-  jint pref;
-  jint max;
-  jint value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring$SimpleSpring__
diff --git a/libjava/javax/swing/Spring.h b/libjava/javax/swing/Spring.h
deleted file mode 100644
index 9459f630f8e..00000000000
--- a/libjava/javax/swing/Spring.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Spring__
-#define __javax_swing_Spring__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-    }
-  }
-}
-
-class javax::swing::Spring : public ::java::lang::Object
-{
-
-public: // actually protected
-  Spring();
-public:
-  static ::javax::swing::Spring * constant(jint);
-  static ::javax::swing::Spring * constant(jint, jint, jint);
-  virtual jint getMaximumValue() = 0;
-  virtual jint getMinimumValue() = 0;
-  virtual jint getPreferredValue() = 0;
-  virtual jint getValue() = 0;
-  static ::javax::swing::Spring * max(::javax::swing::Spring *, ::javax::swing::Spring *);
-  static ::javax::swing::Spring * minus(::javax::swing::Spring *);
-  virtual void setValue(jint) = 0;
-private:
-  jint getShrinkRange();
-  jint getExpandRange();
-public: // actually package-private
-  virtual jdouble getStrain();
-  virtual void setStrain(jdouble);
-public:
-  static ::javax::swing::Spring * sum(::javax::swing::Spring *, ::javax::swing::Spring *);
-  static ::javax::swing::Spring * scale(::javax::swing::Spring *, jfloat);
-  static ::javax::swing::Spring * width(::java::awt::Component *);
-  static ::javax::swing::Spring * height(::java::awt::Component *);
-  static const jint UNSET = -2147483647 - 1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Spring__
diff --git a/libjava/javax/swing/SpringLayout$Constraints.h b/libjava/javax/swing/SpringLayout$Constraints.h
deleted file mode 100644
index 200318910d6..00000000000
--- a/libjava/javax/swing/SpringLayout$Constraints.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout$Constraints__
-#define __javax_swing_SpringLayout$Constraints__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class SpringLayout$Constraints;
-    }
-  }
-}
-
-class javax::swing::SpringLayout$Constraints : public ::java::lang::Object
-{
-
-public:
-  SpringLayout$Constraints();
-  SpringLayout$Constraints(::javax::swing::Spring *, ::javax::swing::Spring *);
-  SpringLayout$Constraints(::javax::swing::Spring *, ::javax::swing::Spring *, ::javax::swing::Spring *, ::javax::swing::Spring *);
-  SpringLayout$Constraints(::java::awt::Component *);
-  virtual ::javax::swing::Spring * getConstraint(::java::lang::String *);
-  virtual ::javax::swing::Spring * getHeight();
-  virtual ::javax::swing::Spring * getWidth();
-  virtual ::javax::swing::Spring * getX();
-  virtual ::javax::swing::Spring * getY();
-  virtual ::javax::swing::Spring * getSouth();
-  virtual ::javax::swing::Spring * getEast();
-  virtual void setConstraint(::java::lang::String *, ::javax::swing::Spring *);
-  virtual void setHeight(::javax::swing::Spring *);
-  virtual void setWidth(::javax::swing::Spring *);
-  virtual void setX(::javax::swing::Spring *);
-  virtual void setY(::javax::swing::Spring *);
-  virtual void setSouth(::javax::swing::Spring *);
-  virtual void setEast(::javax::swing::Spring *);
-  virtual void dropCalcResult();
-private:
-  ::javax::swing::Spring * __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
-  ::javax::swing::Spring * y;
-  ::javax::swing::Spring * height;
-  ::javax::swing::Spring * width;
-  ::javax::swing::Spring * east;
-  ::javax::swing::Spring * south;
-  ::javax::swing::Spring * v;
-  ::javax::swing::Spring * h;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout$Constraints__
diff --git a/libjava/javax/swing/SpringLayout$DeferredDimension.h b/libjava/javax/swing/SpringLayout$DeferredDimension.h
deleted file mode 100644
index 0d72960b284..00000000000
--- a/libjava/javax/swing/SpringLayout$DeferredDimension.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout$DeferredDimension__
-#define __javax_swing_SpringLayout$DeferredDimension__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpringLayout$DeferredDimension;
-    }
-  }
-}
-
-class javax::swing::SpringLayout$DeferredDimension : public ::javax::swing::Spring
-{
-
-public:
-  SpringLayout$DeferredDimension();
-  virtual void setValue(jint);
-  virtual jint getValue();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout$DeferredDimension__
diff --git a/libjava/javax/swing/SpringLayout$DeferredHeight.h b/libjava/javax/swing/SpringLayout$DeferredHeight.h
deleted file mode 100644
index c08de85b630..00000000000
--- a/libjava/javax/swing/SpringLayout$DeferredHeight.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout$DeferredHeight__
-#define __javax_swing_SpringLayout$DeferredHeight__
-
-#pragma interface
-
-#include <javax/swing/SpringLayout$DeferredDimension.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpringLayout$DeferredHeight;
-    }
-  }
-}
-
-class javax::swing::SpringLayout$DeferredHeight : public ::javax::swing::SpringLayout$DeferredDimension
-{
-
-public:
-  virtual ::java::lang::String * toString();
-  SpringLayout$DeferredHeight(::java::awt::Component *);
-  virtual jint getMaximumValue();
-  virtual jint getMinimumValue();
-  virtual jint getPreferredValue();
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::SpringLayout$DeferredDimension)))) c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout$DeferredHeight__
diff --git a/libjava/javax/swing/SpringLayout$DeferredSpring.h b/libjava/javax/swing/SpringLayout$DeferredSpring.h
deleted file mode 100644
index 691515408ff..00000000000
--- a/libjava/javax/swing/SpringLayout$DeferredSpring.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout$DeferredSpring__
-#define __javax_swing_SpringLayout$DeferredSpring__
-
-#pragma interface
-
-#include <javax/swing/Spring.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class SpringLayout;
-        class SpringLayout$DeferredSpring;
-    }
-  }
-}
-
-class javax::swing::SpringLayout$DeferredSpring : public ::javax::swing::Spring
-{
-
-public:
-  virtual ::java::lang::String * toString();
-  SpringLayout$DeferredSpring(::javax::swing::SpringLayout *, ::java::lang::String *, ::java::awt::Component *);
-private:
-  ::javax::swing::Spring * resolveSpring();
-public:
-  virtual jint getMaximumValue();
-  virtual jint getMinimumValue();
-  virtual jint getPreferredValue();
-  virtual jint getValue();
-  virtual void setValue(jint);
-private:
-  ::javax::swing::SpringLayout * __attribute__((aligned(__alignof__( ::javax::swing::Spring)))) sl;
-  ::java::lang::String * edgeName;
-  ::java::awt::Component * c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout$DeferredSpring__
diff --git a/libjava/javax/swing/SpringLayout$DeferredWidth.h b/libjava/javax/swing/SpringLayout$DeferredWidth.h
deleted file mode 100644
index fea7e4959ff..00000000000
--- a/libjava/javax/swing/SpringLayout$DeferredWidth.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout$DeferredWidth__
-#define __javax_swing_SpringLayout$DeferredWidth__
-
-#pragma interface
-
-#include <javax/swing/SpringLayout$DeferredDimension.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SpringLayout$DeferredWidth;
-    }
-  }
-}
-
-class javax::swing::SpringLayout$DeferredWidth : public ::javax::swing::SpringLayout$DeferredDimension
-{
-
-public:
-  SpringLayout$DeferredWidth(::java::awt::Component *);
-  virtual ::java::lang::String * toString();
-  virtual jint getMaximumValue();
-  virtual jint getMinimumValue();
-  virtual jint getPreferredValue();
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::SpringLayout$DeferredDimension)))) c;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout$DeferredWidth__
diff --git a/libjava/javax/swing/SpringLayout.h b/libjava/javax/swing/SpringLayout.h
deleted file mode 100644
index 426d0d84972..00000000000
--- a/libjava/javax/swing/SpringLayout.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SpringLayout__
-#define __javax_swing_SpringLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Spring;
-        class SpringLayout;
-        class SpringLayout$Constraints;
-    }
-  }
-}
-
-class javax::swing::SpringLayout : public ::java::lang::Object
-{
-
-public:
-  SpringLayout();
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual ::javax::swing::Spring * getConstraint(::java::lang::String *, ::java::awt::Component *);
-  virtual ::javax::swing::SpringLayout$Constraints * getConstraints(::java::awt::Component *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-private:
-  ::javax::swing::SpringLayout$Constraints * initContainer(::java::awt::Container *);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void putConstraint(::java::lang::String *, ::java::awt::Component *, jint, ::java::lang::String *, ::java::awt::Component *);
-  virtual void putConstraint(::java::lang::String *, ::java::awt::Component *, ::javax::swing::Spring *, ::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  static ::java::lang::String * EAST;
-  static ::java::lang::String * NORTH;
-  static ::java::lang::String * SOUTH;
-  static ::java::lang::String * WEST;
-private:
-  ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) constraintsMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SpringLayout__
diff --git a/libjava/javax/swing/SwingConstants.h b/libjava/javax/swing/SwingConstants.h
deleted file mode 100644
index 7ca0a9bcf8e..00000000000
--- a/libjava/javax/swing/SwingConstants.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SwingConstants__
-#define __javax_swing_SwingConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SwingConstants;
-    }
-  }
-}
-
-class javax::swing::SwingConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint CENTER = 0;
-  static const jint TOP = 1;
-  static const jint LEFT = 2;
-  static const jint BOTTOM = 3;
-  static const jint RIGHT = 4;
-  static const jint NORTH = 1;
-  static const jint NORTH_EAST = 2;
-  static const jint EAST = 3;
-  static const jint SOUTH_EAST = 4;
-  static const jint SOUTH = 5;
-  static const jint SOUTH_WEST = 6;
-  static const jint WEST = 7;
-  static const jint NORTH_WEST = 8;
-  static const jint HORIZONTAL = 0;
-  static const jint VERTICAL = 1;
-  static const jint LEADING = 10;
-  static const jint TRAILING = 11;
-  static const jint NEXT = 12;
-  static const jint PREVIOUS = 13;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_SwingConstants__
diff --git a/libjava/javax/swing/SwingUtilities$OwnerFrame.h b/libjava/javax/swing/SwingUtilities$OwnerFrame.h
deleted file mode 100644
index deb4d8412aa..00000000000
--- a/libjava/javax/swing/SwingUtilities$OwnerFrame.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SwingUtilities$OwnerFrame__
-#define __javax_swing_SwingUtilities$OwnerFrame__
-
-#pragma interface
-
-#include <java/awt/Frame.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SwingUtilities$OwnerFrame;
-    }
-  }
-}
-
-class javax::swing::SwingUtilities$OwnerFrame : public ::java::awt::Frame
-{
-
-  SwingUtilities$OwnerFrame();
-public:
-  virtual void setVisible(jboolean);
-  virtual jboolean isShowing();
-public: // actually package-private
-  SwingUtilities$OwnerFrame(::javax::swing::SwingUtilities$OwnerFrame *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SwingUtilities$OwnerFrame__
diff --git a/libjava/javax/swing/SwingUtilities.h b/libjava/javax/swing/SwingUtilities.h
deleted file mode 100644
index 3f75d967f72..00000000000
--- a/libjava/javax/swing/SwingUtilities.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_SwingUtilities__
-#define __javax_swing_SwingUtilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class FontMetrics;
-        class Graphics;
-        class Point;
-        class Rectangle;
-        class Window;
-      namespace event
-      {
-          class KeyEvent;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleStateSet;
-    }
-    namespace swing
-    {
-        class Action;
-        class ActionMap;
-        class Icon;
-        class InputMap;
-        class JComponent;
-        class JRootPane;
-        class KeyStroke;
-        class SwingUtilities;
-        class SwingUtilities$OwnerFrame;
-    }
-  }
-}
-
-class javax::swing::SwingUtilities : public ::java::lang::Object
-{
-
-  SwingUtilities();
-public:
-  static ::java::awt::Rectangle * calculateInnerArea(::javax::swing::JComponent *, ::java::awt::Rectangle *);
-  static ::java::awt::Component * findFocusOwner(::java::awt::Component *);
-  static ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Component *, ::java::awt::Point *);
-  static ::javax::accessibility::Accessible * getAccessibleChild(::java::awt::Component *, jint);
-  static jint getAccessibleChildrenCount(::java::awt::Component *);
-  static jint getAccessibleIndexInParent(::java::awt::Component *);
-  static ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet(::java::awt::Component *);
-  static ::java::awt::Rectangle * getLocalBounds(::java::awt::Component *);
-  static ::javax::swing::JRootPane * getRootPane(::java::awt::Component *);
-  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 * getWindowAncestor(::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::Point * convertPoint(::java::awt::Component *, ::java::awt::Point *, ::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 updateComponentTreeUI(::java::awt::Component *);
-private:
-  static void updateComponentTreeUIImpl(::java::awt::Component *);
-public:
-  static ::java::lang::String * layoutCompoundLabel(::javax::swing::JComponent *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
-  static ::java::lang::String * layoutCompoundLabel(::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
-private:
-  static ::java::lang::String * layoutCompoundLabelImpl(::javax::swing::JComponent *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
-  static ::java::lang::String * clipString(::javax::swing::JComponent *, ::java::awt::FontMetrics *, ::java::lang::String *, jint);
-public:
-  static void invokeLater(::java::lang::Runnable *);
-  static void invokeAndWait(::java::lang::Runnable *);
-  static jboolean isEventDispatchThread();
-  static void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, jint, jint, jint, jint);
-  static void paintComponent(::java::awt::Graphics *, ::java::awt::Component *, ::java::awt::Container *, ::java::awt::Rectangle *);
-public: // actually package-private
-  static ::java::awt::Window * getOwnerFrame(::java::awt::Window *);
-public:
-  static jboolean isLeftMouseButton(::java::awt::event::MouseEvent *);
-  static jboolean isMiddleMouseButton(::java::awt::event::MouseEvent *);
-  static jboolean isRightMouseButton(::java::awt::event::MouseEvent *);
-  static jboolean notifyAction(::javax::swing::Action *, ::javax::swing::KeyStroke *, ::java::awt::event::KeyEvent *, ::java::lang::Object *, jint);
-  static void replaceUIActionMap(::javax::swing::JComponent *, ::javax::swing::ActionMap *);
-  static void replaceUIInputMap(::javax::swing::JComponent *, jint, ::javax::swing::InputMap *);
-  static JArray< ::java::awt::Rectangle * > * computeDifference(::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
-  static jint computeStringWidth(::java::awt::FontMetrics *, ::java::lang::String *);
-  static ::java::awt::Rectangle * computeUnion(jint, jint, jint, jint, ::java::awt::Rectangle *);
-  static jboolean isRectangleContainingRectangle(::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  static ::javax::swing::InputMap * getUIInputMap(::javax::swing::JComponent *, jint);
-  static ::javax::swing::ActionMap * getUIActionMap(::javax::swing::JComponent *);
-  static jboolean processKeyBindings(::java::awt::event::KeyEvent *);
-public: // actually package-private
-  static ::java::lang::String * convertHorizontalAlignmentCodeToString(jint);
-  static ::java::lang::String * convertVerticalAlignmentCodeToString(jint);
-  static ::java::lang::String * convertWindowConstantToString(jint);
-  static void convertRectangleToAncestor(::java::awt::Component *, ::java::awt::Rectangle *, ::java::awt::Component *);
-private:
-  static ::javax::swing::SwingUtilities$OwnerFrame * ownerFrame;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_SwingUtilities__
diff --git a/libjava/javax/swing/Timer$1.h b/libjava/javax/swing/Timer$1.h
deleted file mode 100644
index e0057f6590e..00000000000
--- a/libjava/javax/swing/Timer$1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Timer$1__
-#define __javax_swing_Timer$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-        class Timer$1;
-    }
-  }
-}
-
-class javax::swing::Timer$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Timer$1(::javax::swing::Timer *);
-public:
-  void run();
-public: // actually package-private
-  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Timer$1__
diff --git a/libjava/javax/swing/Timer$Task.h b/libjava/javax/swing/Timer$Task.h
deleted file mode 100644
index 94005aaccd9..00000000000
--- a/libjava/javax/swing/Timer$Task.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Timer$Task__
-#define __javax_swing_Timer$Task__
-
-#pragma interface
-
-#include <java/util/TimerTask.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-        class Timer$Task;
-    }
-  }
-}
-
-class javax::swing::Timer$Task : public ::java::util::TimerTask
-{
-
-  Timer$Task(::javax::swing::Timer *);
-public:
-  virtual void run();
-public: // actually package-private
-  Timer$Task(::javax::swing::Timer *, ::javax::swing::Timer$Task *);
-  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::util::TimerTask)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Timer$Task__
diff --git a/libjava/javax/swing/Timer.h b/libjava/javax/swing/Timer.h
deleted file mode 100644
index 9768bdfb7a9..00000000000
--- a/libjava/javax/swing/Timer.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_Timer__
-#define __javax_swing_Timer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-        class Timer$Task;
-      namespace event
-      {
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::Timer : public ::java::lang::Object
-{
-
-public:
-  Timer(jint, ::java::awt::event::ActionListener *);
-  virtual JArray< ::java::awt::event::ActionListener * > * getActionListeners();
-  virtual void setCoalesce(jboolean);
-  virtual jboolean isCoalesce();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  static void setLogTimers(jboolean);
-  static jboolean getLogTimers();
-  virtual void setDelay(jint);
-  virtual jint getDelay();
-  virtual void setInitialDelay(jint);
-  virtual jint getInitialDelay();
-  virtual void setRepeats(jboolean);
-  virtual jboolean isRepeats();
-  virtual jboolean isRunning();
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-  virtual void restart();
-  virtual void start();
-  virtual void stop();
-public: // actually protected
-  virtual void fireActionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  virtual void fireActionPerformed();
-  virtual void drainEvents();
-  virtual void queueEvent();
-private:
-  static const jlong serialVersionUID = -1116180831621385484LL;
-  ::java::lang::Runnable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) drainer;
-  static ::java::util::Timer * timer;
-public: // actually package-private
-  static jboolean logTimers;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * listenerList;
-public: // actually package-private
-  jboolean coalesce;
-  jboolean repeats;
-  jint delay;
-  jint initialDelay;
-  jint ticks;
-  ::javax::swing::Timer$Task * task;
-private:
-  jlong queue;
-  ::java::lang::Object * queueLock;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_Timer__
diff --git a/libjava/javax/swing/ToolTipManager$insideTimerAction.h b/libjava/javax/swing/ToolTipManager$insideTimerAction.h
deleted file mode 100644
index 52fe573fe20..00000000000
--- a/libjava/javax/swing/ToolTipManager$insideTimerAction.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ToolTipManager$insideTimerAction__
-#define __javax_swing_ToolTipManager$insideTimerAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ToolTipManager;
-        class ToolTipManager$insideTimerAction;
-    }
-  }
-}
-
-class javax::swing::ToolTipManager$insideTimerAction : public ::java::lang::Object
-{
-
-public: // actually protected
-  ToolTipManager$insideTimerAction(::javax::swing::ToolTipManager *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::ToolTipManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ToolTipManager$insideTimerAction__
diff --git a/libjava/javax/swing/ToolTipManager$outsideTimerAction.h b/libjava/javax/swing/ToolTipManager$outsideTimerAction.h
deleted file mode 100644
index 1f418783b61..00000000000
--- a/libjava/javax/swing/ToolTipManager$outsideTimerAction.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ToolTipManager$outsideTimerAction__
-#define __javax_swing_ToolTipManager$outsideTimerAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ToolTipManager;
-        class ToolTipManager$outsideTimerAction;
-    }
-  }
-}
-
-class javax::swing::ToolTipManager$outsideTimerAction : public ::java::lang::Object
-{
-
-public: // actually protected
-  ToolTipManager$outsideTimerAction(::javax::swing::ToolTipManager *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::ToolTipManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ToolTipManager$outsideTimerAction__
diff --git a/libjava/javax/swing/ToolTipManager$stillInsideTimerAction.h b/libjava/javax/swing/ToolTipManager$stillInsideTimerAction.h
deleted file mode 100644
index 2e334c56496..00000000000
--- a/libjava/javax/swing/ToolTipManager$stillInsideTimerAction.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ToolTipManager$stillInsideTimerAction__
-#define __javax_swing_ToolTipManager$stillInsideTimerAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ToolTipManager;
-        class ToolTipManager$stillInsideTimerAction;
-    }
-  }
-}
-
-class javax::swing::ToolTipManager$stillInsideTimerAction : public ::java::lang::Object
-{
-
-public: // actually protected
-  ToolTipManager$stillInsideTimerAction(::javax::swing::ToolTipManager *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::ToolTipManager * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ToolTipManager$stillInsideTimerAction__
diff --git a/libjava/javax/swing/ToolTipManager.h b/libjava/javax/swing/ToolTipManager.h
deleted file mode 100644
index c838ac43daf..00000000000
--- a/libjava/javax/swing/ToolTipManager.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ToolTipManager__
-#define __javax_swing_ToolTipManager__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JToolTip;
-        class Popup;
-        class Timer;
-        class ToolTipManager;
-    }
-  }
-}
-
-class javax::swing::ToolTipManager : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  ToolTipManager();
-public:
-  static ::javax::swing::ToolTipManager * sharedInstance();
-  virtual void setEnabled(jboolean);
-  virtual jboolean isEnabled();
-  virtual jboolean isLightWeightPopupEnabled();
-  virtual void setLightWeightPopupEnabled(jboolean);
-  virtual jint getInitialDelay();
-  virtual void setInitialDelay(jint);
-  virtual jint getDismissDelay();
-  virtual void setDismissDelay(jint);
-  virtual jint getReshowDelay();
-  virtual void setReshowDelay(jint);
-  virtual void registerComponent(::javax::swing::JComponent *);
-  virtual void unregisterComponent(::javax::swing::JComponent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-private:
-  void checkTipUpdate(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void showTip();
-private:
-  ::java::awt::Point * adjustLocation(::java::awt::Point *, ::java::awt::Component *, ::java::awt::Dimension *);
-public: // actually package-private
-  virtual void hideTip();
-private:
-  ::java::awt::Component * getContentPaneDeepestComponent(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) enterTimer;
-  ::javax::swing::Timer * exitTimer;
-  ::javax::swing::Timer * insideTimer;
-private:
-  jboolean enabled;
-public: // actually protected
-  jboolean lightWeightPopupEnabled;
-  jboolean heavyWeightPopupEnabled;
-private:
-  static ::javax::swing::ToolTipManager * shared;
-  ::javax::swing::JComponent * currentComponent;
-  ::javax::swing::JToolTip * currentTip;
-  ::java::lang::String * toolTipText;
-  ::java::awt::Point * currentPoint;
-  ::javax::swing::Popup * popup;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ToolTipManager__
diff --git a/libjava/javax/swing/TransferHandler$PropertyTransferable.h b/libjava/javax/swing/TransferHandler$PropertyTransferable.h
deleted file mode 100644
index 662bce0cac2..00000000000
--- a/libjava/javax/swing/TransferHandler$PropertyTransferable.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_TransferHandler$PropertyTransferable__
-#define __javax_swing_TransferHandler$PropertyTransferable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class DataFlavor;
-      }
-    }
-    namespace beans
-    {
-        class PropertyDescriptor;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class TransferHandler$PropertyTransferable;
-    }
-  }
-}
-
-class javax::swing::TransferHandler$PropertyTransferable : public ::java::lang::Object
-{
-
-public: // actually package-private
-  TransferHandler$PropertyTransferable(::javax::swing::JComponent *, ::java::beans::PropertyDescriptor *);
-public:
-  virtual JArray< ::java::awt::datatransfer::DataFlavor * > * getTransferDataFlavors();
-  virtual jboolean isDataFlavorSupported(::java::awt::datatransfer::DataFlavor *);
-  virtual ::java::lang::Object * getTransferData(::java::awt::datatransfer::DataFlavor *);
-private:
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
-  ::java::beans::PropertyDescriptor * property;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_TransferHandler$PropertyTransferable__
diff --git a/libjava/javax/swing/TransferHandler$TransferAction.h b/libjava/javax/swing/TransferHandler$TransferAction.h
deleted file mode 100644
index f11d879681b..00000000000
--- a/libjava/javax/swing/TransferHandler$TransferAction.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_TransferHandler$TransferAction__
-#define __javax_swing_TransferHandler$TransferAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-      }
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class TransferHandler$TransferAction;
-    }
-  }
-}
-
-class javax::swing::TransferHandler$TransferAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  TransferHandler$TransferAction(::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  static ::java::awt::datatransfer::Clipboard * getClipboard(::javax::swing::JComponent *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) command;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_TransferHandler$TransferAction__
diff --git a/libjava/javax/swing/TransferHandler.h b/libjava/javax/swing/TransferHandler.h
deleted file mode 100644
index 24220c88c1a..00000000000
--- a/libjava/javax/swing/TransferHandler.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_TransferHandler__
-#define __javax_swing_TransferHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class DataFlavor;
-          class Transferable;
-      }
-      namespace event
-      {
-          class InputEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyDescriptor;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JComponent;
-        class TransferHandler;
-    }
-  }
-}
-
-class javax::swing::TransferHandler : public ::java::lang::Object
-{
-
-public:
-  static ::javax::swing::Action * getCopyAction();
-  static ::javax::swing::Action * getCutAction();
-  static ::javax::swing::Action * getPasteAction();
-public: // actually protected
-  TransferHandler();
-public:
-  TransferHandler(::java::lang::String *);
-  virtual jboolean canImport(::javax::swing::JComponent *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
-public: // actually protected
-  virtual ::java::awt::datatransfer::Transferable * createTransferable(::javax::swing::JComponent *);
-public:
-  virtual void exportAsDrag(::javax::swing::JComponent *, ::java::awt::event::InputEvent *, jint);
-public: // actually protected
-  virtual void exportDone(::javax::swing::JComponent *, ::java::awt::datatransfer::Transferable *, jint);
-public:
-  virtual void exportToClipboard(::javax::swing::JComponent *, ::java::awt::datatransfer::Clipboard *, jint);
-  virtual jint getSourceActions(::javax::swing::JComponent *);
-  virtual ::javax::swing::Icon * getVisualRepresentation(::java::awt::datatransfer::Transferable *);
-  virtual jboolean importData(::javax::swing::JComponent *, ::java::awt::datatransfer::Transferable *);
-private:
-  ::java::beans::PropertyDescriptor * getPropertyDescriptor(::javax::swing::JComponent *);
-  ::java::awt::datatransfer::DataFlavor * getPropertyDataFlavor(::java::lang::Class *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
-  static const jlong serialVersionUID = -967749805571669910LL;
-  static ::java::lang::String * COMMAND_COPY;
-  static ::java::lang::String * COMMAND_CUT;
-  static ::java::lang::String * COMMAND_PASTE;
-public:
-  static const jint NONE = 0;
-  static const jint COPY = 1;
-  static const jint MOVE = 2;
-  static const jint COPY_OR_MOVE = 3;
-private:
-  static ::javax::swing::Action * copyAction;
-  static ::javax::swing::Action * cutAction;
-  static ::javax::swing::Action * pasteAction;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) sourceActions;
-  ::javax::swing::Icon * visualRepresentation;
-  ::java::lang::String * propertyName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_TransferHandler__
diff --git a/libjava/javax/swing/UIDefaults$1.h b/libjava/javax/swing/UIDefaults$1.h
deleted file mode 100644
index ac0aecd754d..00000000000
--- a/libjava/javax/swing/UIDefaults$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$1__
-#define __javax_swing_UIDefaults$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$1;
-        class UIDefaults$ProxyLazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UIDefaults$1(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::java::lang::String * val$className;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$1__
diff --git a/libjava/javax/swing/UIDefaults$2.h b/libjava/javax/swing/UIDefaults$2.h
deleted file mode 100644
index 3250ba983aa..00000000000
--- a/libjava/javax/swing/UIDefaults$2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$2__
-#define __javax_swing_UIDefaults$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$2;
-        class UIDefaults$ProxyLazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UIDefaults$2(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, ::java::lang::String *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::java::lang::String * val$className;
-  ::java::lang::String * val$methodName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$2__
diff --git a/libjava/javax/swing/UIDefaults$3.h b/libjava/javax/swing/UIDefaults$3.h
deleted file mode 100644
index f3faaf71e4f..00000000000
--- a/libjava/javax/swing/UIDefaults$3.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$3__
-#define __javax_swing_UIDefaults$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$3;
-        class UIDefaults$ProxyLazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UIDefaults$3(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::Object * > *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::java::lang::String * val$className;
-  JArray< ::java::lang::Class * > * val$clss;
-  JArray< ::java::lang::Object * > * val$objs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$3__
diff --git a/libjava/javax/swing/UIDefaults$4.h b/libjava/javax/swing/UIDefaults$4.h
deleted file mode 100644
index e5ff98dafb4..00000000000
--- a/libjava/javax/swing/UIDefaults$4.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$4__
-#define __javax_swing_UIDefaults$4__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$4;
-        class UIDefaults$ProxyLazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$4 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UIDefaults$4(::javax::swing::UIDefaults$ProxyLazyValue *, ::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Class * > *, JArray< ::java::lang::Object * > *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::UIDefaults$ProxyLazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::java::lang::String * val$className;
-  ::java::lang::String * val$methodName;
-  JArray< ::java::lang::Class * > * val$clss;
-  JArray< ::java::lang::Object * > * val$objs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$4__
diff --git a/libjava/javax/swing/UIDefaults$ActiveValue.h b/libjava/javax/swing/UIDefaults$ActiveValue.h
deleted file mode 100644
index 37d1b403418..00000000000
--- a/libjava/javax/swing/UIDefaults$ActiveValue.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$ActiveValue__
-#define __javax_swing_UIDefaults$ActiveValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$ActiveValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$ActiveValue : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_UIDefaults$ActiveValue__
diff --git a/libjava/javax/swing/UIDefaults$LazyInputMap.h b/libjava/javax/swing/UIDefaults$LazyInputMap.h
deleted file mode 100644
index 1072c003043..00000000000
--- a/libjava/javax/swing/UIDefaults$LazyInputMap.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$LazyInputMap__
-#define __javax_swing_UIDefaults$LazyInputMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$LazyInputMap;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$LazyInputMap : public ::java::lang::Object
-{
-
-public:
-  UIDefaults$LazyInputMap(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) bind;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$LazyInputMap__
diff --git a/libjava/javax/swing/UIDefaults$LazyValue.h b/libjava/javax/swing/UIDefaults$LazyValue.h
deleted file mode 100644
index bd451e45b34..00000000000
--- a/libjava/javax/swing/UIDefaults$LazyValue.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$LazyValue__
-#define __javax_swing_UIDefaults$LazyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$LazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$LazyValue : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_UIDefaults$LazyValue__
diff --git a/libjava/javax/swing/UIDefaults$ProxyLazyValue.h b/libjava/javax/swing/UIDefaults$ProxyLazyValue.h
deleted file mode 100644
index ea6632c18ad..00000000000
--- a/libjava/javax/swing/UIDefaults$ProxyLazyValue.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults$ProxyLazyValue__
-#define __javax_swing_UIDefaults$ProxyLazyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIDefaults$LazyValue;
-        class UIDefaults$ProxyLazyValue;
-    }
-  }
-}
-
-class javax::swing::UIDefaults$ProxyLazyValue : public ::java::lang::Object
-{
-
-public:
-  UIDefaults$ProxyLazyValue(::java::lang::String *);
-  UIDefaults$ProxyLazyValue(::java::lang::String *, ::java::lang::String *);
-  UIDefaults$ProxyLazyValue(::java::lang::String *, JArray< ::java::lang::Object * > *);
-  UIDefaults$ProxyLazyValue(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::UIDefaults$LazyValue * __attribute__((aligned(__alignof__( ::java::lang::Object)))) inner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults$ProxyLazyValue__
diff --git a/libjava/javax/swing/UIDefaults.h b/libjava/javax/swing/UIDefaults.h
deleted file mode 100644
index 2daecceee58..00000000000
--- a/libjava/javax/swing/UIDefaults.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIDefaults__
-#define __javax_swing_UIDefaults__
-
-#pragma interface
-
-#include <java/util/Hashtable.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Font;
-        class Insets;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class UIDefaults;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-      }
-    }
-  }
-}
-
-class javax::swing::UIDefaults : public ::java::util::Hashtable
-{
-
-public:
-  UIDefaults();
-  UIDefaults(JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  virtual void putDefaults(JArray< ::java::lang::Object * > *);
-private:
-  ::java::lang::Object * checkAndPut(::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual ::java::awt::Font * getFont(::java::lang::Object *);
-  virtual ::java::awt::Font * getFont(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::awt::Color * getColor(::java::lang::Object *);
-  virtual ::java::awt::Color * getColor(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::javax::swing::Icon * getIcon(::java::lang::Object *);
-  virtual ::javax::swing::Icon * getIcon(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::javax::swing::border::Border * getBorder(::java::lang::Object *);
-  virtual ::javax::swing::border::Border * getBorder(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::lang::String * getString(::java::lang::Object *);
-  virtual ::java::lang::String * getString(::java::lang::Object *, ::java::util::Locale *);
-  virtual jint getInt(::java::lang::Object *);
-  virtual jint getInt(::java::lang::Object *, ::java::util::Locale *);
-  virtual jboolean getBoolean(::java::lang::Object *);
-  virtual jboolean getBoolean(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::awt::Insets * getInsets(::java::lang::Object *);
-  virtual ::java::awt::Insets * getInsets(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::awt::Dimension * getDimension(::java::lang::Object *);
-  virtual ::java::awt::Dimension * getDimension(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::lang::Class * getUIClass(::java::lang::String *, ::java::lang::ClassLoader *);
-  virtual ::java::lang::Class * getUIClass(::java::lang::String *);
-public: // actually protected
-  virtual void getUIError(::java::lang::String *);
-public:
-  virtual ::javax::swing::plaf::ComponentUI * getUI(::javax::swing::JComponent *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void addResourceBundle(::java::lang::String *);
-  virtual void removeResourceBundle(::java::lang::String *);
-  virtual void setDefaultLocale(::java::util::Locale *);
-  virtual ::java::util::Locale * getDefaultLocale();
-private:
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::util::Hashtable)))) bundles;
-  ::java::util::Locale * defaultLocale;
-  ::java::beans::PropertyChangeSupport * propertyChangeSupport;
-  static const jlong serialVersionUID = 7341222528856548117LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIDefaults__
diff --git a/libjava/javax/swing/UIManager$LookAndFeelInfo.h b/libjava/javax/swing/UIManager$LookAndFeelInfo.h
deleted file mode 100644
index 581d76beef7..00000000000
--- a/libjava/javax/swing/UIManager$LookAndFeelInfo.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIManager$LookAndFeelInfo__
-#define __javax_swing_UIManager$LookAndFeelInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIManager$LookAndFeelInfo;
-    }
-  }
-}
-
-class javax::swing::UIManager$LookAndFeelInfo : public ::java::lang::Object
-{
-
-public:
-  UIManager$LookAndFeelInfo(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getClassName();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::java::lang::String * clazz;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIManager$LookAndFeelInfo__
diff --git a/libjava/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.h b/libjava/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.h
deleted file mode 100644
index a256eaf3e70..00000000000
--- a/libjava/javax/swing/UIManager$MultiplexUIDefaults$MultiplexEnumeration.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIManager$MultiplexUIDefaults$MultiplexEnumeration__
-#define __javax_swing_UIManager$MultiplexUIDefaults$MultiplexEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIManager$MultiplexUIDefaults;
-        class UIManager$MultiplexUIDefaults$MultiplexEnumeration;
-    }
-  }
-}
-
-class javax::swing::UIManager$MultiplexUIDefaults$MultiplexEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  UIManager$MultiplexUIDefaults$MultiplexEnumeration(::javax::swing::UIManager$MultiplexUIDefaults *, ::java::util::Enumeration *, ::java::util::Enumeration *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  JArray< ::java::util::Enumeration * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) enums;
-  jint i;
-  ::javax::swing::UIManager$MultiplexUIDefaults * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIManager$MultiplexUIDefaults$MultiplexEnumeration__
diff --git a/libjava/javax/swing/UIManager$MultiplexUIDefaults.h b/libjava/javax/swing/UIManager$MultiplexUIDefaults.h
deleted file mode 100644
index 16a03c60dd2..00000000000
--- a/libjava/javax/swing/UIManager$MultiplexUIDefaults.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIManager$MultiplexUIDefaults__
-#define __javax_swing_UIManager$MultiplexUIDefaults__
-
-#pragma interface
-
-#include <javax/swing/UIDefaults.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-        class UIManager$MultiplexUIDefaults;
-    }
-  }
-}
-
-class javax::swing::UIManager$MultiplexUIDefaults : public ::javax::swing::UIDefaults
-{
-
-public: // actually package-private
-  UIManager$MultiplexUIDefaults(::javax::swing::UIDefaults *);
-public:
-  virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * get(::java::lang::Object *, ::java::util::Locale *);
-  virtual ::java::lang::Object * remove(::java::lang::Object *);
-  virtual jint size();
-  virtual ::java::util::Enumeration * keys();
-  virtual ::java::util::Enumeration * elements();
-public: // actually package-private
-  ::javax::swing::UIDefaults * __attribute__((aligned(__alignof__( ::javax::swing::UIDefaults)))) fallback;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIManager$MultiplexUIDefaults__
diff --git a/libjava/javax/swing/UIManager.h b/libjava/javax/swing/UIManager.h
deleted file mode 100644
index c2cdf16cfed..00000000000
--- a/libjava/javax/swing/UIManager.h
+++ /dev/null
@@ -1,109 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UIManager__
-#define __javax_swing_UIManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Font;
-        class Insets;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-        class PropertyChangeSupport;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class LookAndFeel;
-        class UIDefaults;
-        class UIManager;
-        class UIManager$LookAndFeelInfo;
-        class UIManager$MultiplexUIDefaults;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-      }
-    }
-  }
-}
-
-class javax::swing::UIManager : public ::java::lang::Object
-{
-
-public:
-  UIManager();
-  static void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  static void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  static JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-  static void addAuxiliaryLookAndFeel(::javax::swing::LookAndFeel *);
-  static jboolean removeAuxiliaryLookAndFeel(::javax::swing::LookAndFeel *);
-  static JArray< ::javax::swing::LookAndFeel * > * getAuxiliaryLookAndFeels();
-  static ::java::lang::Object * get(::java::lang::Object *);
-  static ::java::lang::Object * get(::java::lang::Object *, ::java::util::Locale *);
-  static jboolean getBoolean(::java::lang::Object *);
-  static jboolean getBoolean(::java::lang::Object *, ::java::util::Locale *);
-  static ::javax::swing::border::Border * getBorder(::java::lang::Object *);
-  static ::javax::swing::border::Border * getBorder(::java::lang::Object *, ::java::util::Locale *);
-  static ::java::awt::Color * getColor(::java::lang::Object *);
-  static ::java::awt::Color * getColor(::java::lang::Object *, ::java::util::Locale *);
-  static ::java::lang::String * getCrossPlatformLookAndFeelClassName();
-  static ::javax::swing::UIDefaults * getDefaults();
-  static ::java::awt::Dimension * getDimension(::java::lang::Object *);
-  static ::java::awt::Dimension * getDimension(::java::lang::Object *, ::java::util::Locale *);
-  static ::java::awt::Font * getFont(::java::lang::Object *);
-  static ::java::awt::Font * getFont(::java::lang::Object *, ::java::util::Locale *);
-  static ::javax::swing::Icon * getIcon(::java::lang::Object *);
-  static ::javax::swing::Icon * getIcon(::java::lang::Object *, ::java::util::Locale *);
-  static ::java::awt::Insets * getInsets(::java::lang::Object *);
-  static ::java::awt::Insets * getInsets(::java::lang::Object *, ::java::util::Locale *);
-  static JArray< ::javax::swing::UIManager$LookAndFeelInfo * > * getInstalledLookAndFeels();
-  static jint getInt(::java::lang::Object *);
-  static jint getInt(::java::lang::Object *, ::java::util::Locale *);
-  static ::javax::swing::LookAndFeel * getLookAndFeel();
-  static ::javax::swing::UIDefaults * getLookAndFeelDefaults();
-  static ::java::lang::String * getString(::java::lang::Object *);
-  static ::java::lang::String * getString(::java::lang::Object *, ::java::util::Locale *);
-  static ::java::lang::String * getSystemLookAndFeelClassName();
-  static ::javax::swing::plaf::ComponentUI * getUI(::javax::swing::JComponent *);
-  static void installLookAndFeel(::java::lang::String *, ::java::lang::String *);
-  static void installLookAndFeel(::javax::swing::UIManager$LookAndFeelInfo *);
-  static ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
-  static void setInstalledLookAndFeels(JArray< ::javax::swing::UIManager$LookAndFeelInfo * > *);
-  static void setLookAndFeel(::javax::swing::LookAndFeel *);
-  static void setLookAndFeel(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5547433830339189365LL;
-public: // actually package-private
-  static JArray< ::javax::swing::UIManager$LookAndFeelInfo * > * installed;
-  static JArray< ::javax::swing::LookAndFeel * > * auxLookAndFeels;
-  static ::javax::swing::LookAndFeel * currentLookAndFeel;
-  static ::javax::swing::UIManager$MultiplexUIDefaults * currentUIDefaults;
-  static ::javax::swing::UIDefaults * lookAndFeelDefaults;
-  static ::java::beans::PropertyChangeSupport * listeners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UIManager__
diff --git a/libjava/javax/swing/UnsupportedLookAndFeelException.h b/libjava/javax/swing/UnsupportedLookAndFeelException.h
deleted file mode 100644
index bf5e35c1510..00000000000
--- a/libjava/javax/swing/UnsupportedLookAndFeelException.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_UnsupportedLookAndFeelException__
-#define __javax_swing_UnsupportedLookAndFeelException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UnsupportedLookAndFeelException;
-    }
-  }
-}
-
-class javax::swing::UnsupportedLookAndFeelException : public ::java::lang::Exception
-{
-
-public:
-  UnsupportedLookAndFeelException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_UnsupportedLookAndFeelException__
diff --git a/libjava/javax/swing/ViewportLayout.h b/libjava/javax/swing/ViewportLayout.h
deleted file mode 100644
index 9dadb49eafd..00000000000
--- a/libjava/javax/swing/ViewportLayout.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_ViewportLayout__
-#define __javax_swing_ViewportLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ViewportLayout;
-    }
-  }
-}
-
-class javax::swing::ViewportLayout : public ::java::lang::Object
-{
-
-public:
-  ViewportLayout();
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-private:
-  static const jlong serialVersionUID = -788225906076097229LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_ViewportLayout__
diff --git a/libjava/javax/swing/WindowConstants.h b/libjava/javax/swing/WindowConstants.h
deleted file mode 100644
index 8cad3c26829..00000000000
--- a/libjava/javax/swing/WindowConstants.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_WindowConstants__
-#define __javax_swing_WindowConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class WindowConstants;
-    }
-  }
-}
-
-class javax::swing::WindowConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint DO_NOTHING_ON_CLOSE = 0;
-  static const jint HIDE_ON_CLOSE = 1;
-  static const jint DISPOSE_ON_CLOSE = 2;
-  static const jint EXIT_ON_CLOSE = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_WindowConstants__
diff --git a/libjava/javax/swing/border/AbstractBorder.h b/libjava/javax/swing/border/AbstractBorder.h
deleted file mode 100644
index e91b5e98e87..00000000000
--- a/libjava/javax/swing/border/AbstractBorder.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_AbstractBorder__
-#define __javax_swing_border_AbstractBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class AbstractBorder;
-          class Border;
-      }
-    }
-  }
-}
-
-class javax::swing::border::AbstractBorder : public ::java::lang::Object
-{
-
-public:
-  AbstractBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual jboolean isBorderOpaque();
-  virtual ::java::awt::Rectangle * getInteriorRectangle(::java::awt::Component *, jint, jint, jint, jint);
-  static ::java::awt::Rectangle * getInteriorRectangle(::java::awt::Component *, ::javax::swing::border::Border *, jint, jint, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = -545885975315191844LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_AbstractBorder__
diff --git a/libjava/javax/swing/border/BevelBorder.h b/libjava/javax/swing/border/BevelBorder.h
deleted file mode 100644
index 369c1c57d1a..00000000000
--- a/libjava/javax/swing/border/BevelBorder.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_BevelBorder__
-#define __javax_swing_border_BevelBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class BevelBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::BevelBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  BevelBorder(jint);
-  BevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
-  BevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Color * getHighlightOuterColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getHighlightInnerColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getShadowInnerColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getShadowOuterColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getHighlightOuterColor();
-  virtual ::java::awt::Color * getHighlightInnerColor();
-  virtual ::java::awt::Color * getShadowInnerColor();
-  virtual ::java::awt::Color * getShadowOuterColor();
-  virtual jint getBevelType();
-  virtual jboolean isBorderOpaque();
-public: // actually protected
-  virtual void paintRaisedBevel(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintLoweredBevel(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static void paintBevel(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-public: // actually package-private
-  static const jlong serialVersionUID = -1034942243356299676LL;
-public:
-  static const jint RAISED = 0;
-  static const jint LOWERED = 1;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) bevelType;
-  ::java::awt::Color * highlightOuter;
-  ::java::awt::Color * highlightInner;
-  ::java::awt::Color * shadowOuter;
-  ::java::awt::Color * shadowInner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_BevelBorder__
diff --git a/libjava/javax/swing/border/Border.h b/libjava/javax/swing/border/Border.h
deleted file mode 100644
index 7fe11ee4640..00000000000
--- a/libjava/javax/swing/border/Border.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_Border__
-#define __javax_swing_border_Border__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-    }
-  }
-}
-
-class javax::swing::border::Border : public ::java::lang::Object
-{
-
-public:
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint) = 0;
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *) = 0;
-  virtual jboolean isBorderOpaque() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_border_Border__
diff --git a/libjava/javax/swing/border/CompoundBorder.h b/libjava/javax/swing/border/CompoundBorder.h
deleted file mode 100644
index 703398a730b..00000000000
--- a/libjava/javax/swing/border/CompoundBorder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_CompoundBorder__
-#define __javax_swing_border_CompoundBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-          class CompoundBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::CompoundBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  CompoundBorder();
-  CompoundBorder(::javax::swing::border::Border *, ::javax::swing::border::Border *);
-  virtual jboolean isBorderOpaque();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::javax::swing::border::Border * getOutsideBorder();
-  virtual ::javax::swing::border::Border * getInsideBorder();
-public: // actually package-private
-  static const jlong serialVersionUID = 9054540377030555103LL;
-public: // actually protected
-  ::javax::swing::border::Border * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) insideBorder;
-  ::javax::swing::border::Border * outsideBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_CompoundBorder__
diff --git a/libjava/javax/swing/border/EmptyBorder.h b/libjava/javax/swing/border/EmptyBorder.h
deleted file mode 100644
index 8658371ad61..00000000000
--- a/libjava/javax/swing/border/EmptyBorder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_EmptyBorder__
-#define __javax_swing_border_EmptyBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class EmptyBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::EmptyBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  EmptyBorder(jint, jint, jint, jint);
-  EmptyBorder(::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Insets * getBorderInsets();
-  virtual jboolean isBorderOpaque();
-public: // actually package-private
-  static const jlong serialVersionUID = -8116076291731988694LL;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) left;
-  jint right;
-  jint top;
-  jint bottom;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_EmptyBorder__
diff --git a/libjava/javax/swing/border/EtchedBorder.h b/libjava/javax/swing/border/EtchedBorder.h
deleted file mode 100644
index f760547eb66..00000000000
--- a/libjava/javax/swing/border/EtchedBorder.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_EtchedBorder__
-#define __javax_swing_border_EtchedBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class EtchedBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::EtchedBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  EtchedBorder();
-  EtchedBorder(jint);
-  EtchedBorder(::java::awt::Color *, ::java::awt::Color *);
-  EtchedBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual jboolean isBorderOpaque();
-  virtual jint getEtchType();
-  virtual ::java::awt::Color * getHighlightColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getHighlightColor();
-  virtual ::java::awt::Color * getShadowColor(::java::awt::Component *);
-  virtual ::java::awt::Color * getShadowColor();
-private:
-  static void paintEtchedBorder(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
-public: // actually package-private
-  static const jlong serialVersionUID = 4001244046866360638LL;
-public:
-  static const jint RAISED = 0;
-  static const jint LOWERED = 1;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) etchType;
-  ::java::awt::Color * highlight;
-  ::java::awt::Color * shadow;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_EtchedBorder__
diff --git a/libjava/javax/swing/border/LineBorder.h b/libjava/javax/swing/border/LineBorder.h
deleted file mode 100644
index dd8d05dc57e..00000000000
--- a/libjava/javax/swing/border/LineBorder.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_LineBorder__
-#define __javax_swing_border_LineBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-          class LineBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::LineBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  LineBorder(::java::awt::Color *);
-  LineBorder(::java::awt::Color *, jint);
-  LineBorder(::java::awt::Color *, jint, jboolean);
-  static ::javax::swing::border::Border * createBlackLineBorder();
-  static ::javax::swing::border::Border * createGrayLineBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Color * getLineColor();
-  virtual jint getThickness();
-  virtual jboolean getRoundedCorners();
-  virtual jboolean isBorderOpaque();
-public: // actually package-private
-  static const jlong serialVersionUID = -787563427772288970LL;
-private:
-  static ::javax::swing::border::LineBorder * blackLineBorder;
-  static ::javax::swing::border::LineBorder * grayLineBorder;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) thickness;
-  ::java::awt::Color * lineColor;
-  jboolean roundedCorners;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_LineBorder__
diff --git a/libjava/javax/swing/border/MatteBorder.h b/libjava/javax/swing/border/MatteBorder.h
deleted file mode 100644
index 76dc3d981aa..00000000000
--- a/libjava/javax/swing/border/MatteBorder.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_MatteBorder__
-#define __javax_swing_border_MatteBorder__
-
-#pragma interface
-
-#include <javax/swing/border/EmptyBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace border
-      {
-          class MatteBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::MatteBorder : public ::javax::swing::border::EmptyBorder
-{
-
-public:
-  MatteBorder(jint, jint, jint, jint, ::java::awt::Color *);
-  MatteBorder(::java::awt::Insets *, ::java::awt::Color *);
-  MatteBorder(jint, jint, jint, jint, ::javax::swing::Icon *);
-  MatteBorder(::java::awt::Insets *, ::javax::swing::Icon *);
-  MatteBorder(::javax::swing::Icon *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Insets * getBorderInsets();
-  virtual ::java::awt::Color * getMatteColor();
-  virtual ::javax::swing::Icon * getTileIcon();
-  virtual jboolean isBorderOpaque();
-private:
-  void paintEdge(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = 4422248989617298224LL;
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::EmptyBorder)))) color;
-  ::javax::swing::Icon * tileIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_MatteBorder__
diff --git a/libjava/javax/swing/border/SoftBevelBorder.h b/libjava/javax/swing/border/SoftBevelBorder.h
deleted file mode 100644
index fa8ff5e6f51..00000000000
--- a/libjava/javax/swing/border/SoftBevelBorder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_SoftBevelBorder__
-#define __javax_swing_border_SoftBevelBorder__
-
-#pragma interface
-
-#include <javax/swing/border/BevelBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class SoftBevelBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::SoftBevelBorder : public ::javax::swing::border::BevelBorder
-{
-
-public:
-  SoftBevelBorder(jint);
-  SoftBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *);
-  SoftBevelBorder(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual jboolean isBorderOpaque();
-private:
-  static void paintSoftBevel(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-public: // actually package-private
-  static const jlong serialVersionUID = 5248789787305979975LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_SoftBevelBorder__
diff --git a/libjava/javax/swing/border/TitledBorder.h b/libjava/javax/swing/border/TitledBorder.h
deleted file mode 100644
index 42d6b599dae..00000000000
--- a/libjava/javax/swing/border/TitledBorder.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_border_TitledBorder__
-#define __javax_swing_border_TitledBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Insets;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-          class TitledBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::border::TitledBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  TitledBorder(::java::lang::String *);
-  TitledBorder(::javax::swing::border::Border *);
-  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *);
-  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint);
-  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *);
-  TitledBorder(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  void layoutBorderWithTitle(::java::awt::Component *, ::java::awt::FontMetrics *, ::java::awt::Rectangle *, ::java::awt::Point *);
-  void paintBorderWithTitle(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Point *, ::java::awt::FontMetrics *);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual jboolean isBorderOpaque();
-  virtual ::java::lang::String * getTitle();
-  virtual ::javax::swing::border::Border * getBorder();
-  virtual jint getTitlePosition();
-  virtual jint getTitleJustification();
-  virtual ::java::awt::Font * getTitleFont();
-  virtual ::java::awt::Color * getTitleColor();
-  virtual void setTitle(::java::lang::String *);
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual void setTitlePosition(jint);
-  virtual void setTitleJustification(jint);
-  virtual void setTitleFont(::java::awt::Font *);
-  virtual void setTitleColor(::java::awt::Color *);
-  virtual ::java::awt::Dimension * getMinimumSize(::java::awt::Component *);
-public: // actually protected
-  virtual ::java::awt::Font * getFont(::java::awt::Component *);
-public:
-  static const jint DEFAULT_POSITION = 0;
-  static const jint ABOVE_TOP = 1;
-  static const jint TOP = 2;
-  static const jint BELOW_TOP = 3;
-  static const jint ABOVE_BOTTOM = 4;
-  static const jint BOTTOM = 5;
-  static const jint BELOW_BOTTOM = 6;
-  static const jint DEFAULT_JUSTIFICATION = 0;
-  static const jint LEFT = 1;
-  static const jint CENTER = 2;
-  static const jint RIGHT = 3;
-  static const jint LEADING = 4;
-  static const jint TRAILING = 5;
-public: // actually protected
-  static const jint EDGE_SPACING = 2;
-  static const jint TEXT_INSET_H = 5;
-  static const jint TEXT_SPACING = 2;
-public: // actually package-private
-  static const jlong serialVersionUID = 8012999415147721601LL;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) title;
-  ::javax::swing::border::Border * border;
-  jint titlePosition;
-  jint titleJustification;
-  ::java::awt::Font * titleFont;
-  ::java::awt::Color * titleColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_border_TitledBorder__
diff --git a/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.h b/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.h
deleted file mode 100644
index 99a4e743fb4..00000000000
--- a/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_AbstractColorChooserPanel__
-#define __javax_swing_colorchooser_AbstractColorChooserPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JColorChooser;
-      namespace colorchooser
-      {
-          class AbstractColorChooserPanel;
-          class ColorSelectionModel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::AbstractColorChooserPanel : public ::javax::swing::JPanel
-{
-
-public:
-  AbstractColorChooserPanel();
-  virtual ::java::lang::String * getDisplayName() = 0;
-  virtual jint getMnemonic();
-  virtual jint getDisplayedMnemonicIndex();
-  virtual void updateChooser() = 0;
-public: // actually protected
-  virtual void buildChooser() = 0;
-public:
-  virtual ::javax::swing::Icon * getSmallDisplayIcon() = 0;
-  virtual ::javax::swing::Icon * getLargeDisplayIcon() = 0;
-  virtual void installChooserPanel(::javax::swing::JColorChooser *);
-  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
-  virtual ::javax::swing::colorchooser::ColorSelectionModel * getColorSelectionModel();
-public: // actually protected
-  virtual ::java::awt::Color * getColorFromModel();
-public:
-  virtual void paint(::java::awt::Graphics *);
-private:
-  static const jlong serialVersionUID = -977469671210173863LL;
-  ::javax::swing::JColorChooser * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) chooser;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_AbstractColorChooserPanel__
diff --git a/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.h b/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.h
deleted file mode 100644
index 495a5d14de2..00000000000
--- a/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_ColorChooserComponentFactory__
-#define __javax_swing_colorchooser_ColorChooserComponentFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace colorchooser
-      {
-          class AbstractColorChooserPanel;
-          class ColorChooserComponentFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::ColorChooserComponentFactory : public ::java::lang::Object
-{
-
-  ColorChooserComponentFactory();
-public:
-  static JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * getDefaultChooserPanels();
-  static ::javax::swing::JComponent * getPreviewPanel();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_ColorChooserComponentFactory__
diff --git a/libjava/javax/swing/colorchooser/ColorSelectionModel.h b/libjava/javax/swing/colorchooser/ColorSelectionModel.h
deleted file mode 100644
index 93bdab49304..00000000000
--- a/libjava/javax/swing/colorchooser/ColorSelectionModel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_ColorSelectionModel__
-#define __javax_swing_colorchooser_ColorSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class ColorSelectionModel;
-      }
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::ColorSelectionModel : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Color * getSelectedColor() = 0;
-  virtual void setSelectedColor(::java::awt::Color *) = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_colorchooser_ColorSelectionModel__
diff --git a/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.h b/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.h
deleted file mode 100644
index 52de9a3032c..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultColorSelectionModel__
-#define __javax_swing_colorchooser_DefaultColorSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultColorSelectionModel;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultColorSelectionModel : public ::java::lang::Object
-{
-
-public:
-  DefaultColorSelectionModel();
-  DefaultColorSelectionModel(::java::awt::Color *);
-  virtual ::java::awt::Color * getSelectedColor();
-  virtual void setSelectedColor(::java::awt::Color *);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireStateChanged();
-private:
-  static const jlong serialVersionUID = -8117143602864778804LL;
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::lang::Object)))) selectedColor;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultColorSelectionModel__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$1.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$1.h
deleted file mode 100644
index 441c35006a6..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$1__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$1__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$1;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$1 : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$1(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  ::java::awt::Dimension * getPreferredSize();
-  void paint(::java::awt::Graphics *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$1__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$2.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$2.h
deleted file mode 100644
index fa787a9286d..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$2.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$2__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$2__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$2;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$2 : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$2(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  ::java::awt::Dimension * getPreferredSize();
-  void paint(::java::awt::Graphics *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$2__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.h
deleted file mode 100644
index fdac4c42fe3..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$ImageScrollListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$ImageScrollListener__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$ImageScrollListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$ImageScrollListener;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$ImageScrollListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$ImageScrollListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$ImageScrollListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.h
deleted file mode 100644
index 009e2ec8442..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$MainGradientMouseListener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$MainGradientMouseListener__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$MainGradientMouseListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$MainGradientMouseListener;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$MainGradientMouseListener : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$MainGradientMouseListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-private:
-  void update(::java::awt::Point *);
-  void updateH(::java::awt::Point *);
-  void updateS(::java::awt::Point *);
-  void updateB(::java::awt::Point *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$MainGradientMouseListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.h
deleted file mode 100644
index 9384d465dad..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$RadioStateListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$RadioStateListener__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$RadioStateListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$RadioStateListener;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$RadioStateListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$RadioStateListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$RadioStateListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.h
deleted file mode 100644
index 22bb90d55c2..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel$SliderChangeListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel$SliderChangeListener__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel$SliderChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-          class DefaultHSBChooserPanel$SliderChangeListener;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel$SliderChangeListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel$SliderChangeListener(::javax::swing::colorchooser::DefaultHSBChooserPanel *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultHSBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel$SliderChangeListener__
diff --git a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel.h b/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel.h
deleted file mode 100644
index f6fc5d95017..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultHSBChooserPanel.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultHSBChooserPanel__
-#define __javax_swing_colorchooser_DefaultHSBChooserPanel__
-
-#pragma interface
-
-#include <javax/swing/colorchooser/AbstractColorChooserPanel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Image;
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JColorChooser;
-        class JLabel;
-        class JPanel;
-        class JRadioButton;
-        class JSlider;
-        class JSpinner;
-      namespace colorchooser
-      {
-          class DefaultHSBChooserPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultHSBChooserPanel : public ::javax::swing::colorchooser::AbstractColorChooserPanel
-{
-
-public: // actually package-private
-  DefaultHSBChooserPanel();
-public:
-  virtual ::java::lang::String * getDisplayName();
-  virtual void updateChooser();
-public: // actually protected
-  virtual void buildChooser();
-public:
-  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
-private:
-  ::java::awt::Container * buildRightPanel();
-public:
-  virtual ::javax::swing::Icon * getSmallDisplayIcon();
-  virtual ::javax::swing::Icon * getLargeDisplayIcon();
-  virtual void paint(::java::awt::Graphics *);
-private:
-  void updateHLockImage();
-  void updateBLockImage();
-  void updateSLockImage();
-public: // actually package-private
-  virtual void updateImage();
-private:
-  void updateTextFields();
-public: // actually package-private
-  virtual void updateSlider();
-  virtual void updateTrack();
-private:
-  void updateHTrack();
-  void updateSTrack();
-  void updateBTrack();
-  JArray< jfloat > * getHSBValues();
-public: // actually package-private
-  ::java::awt::Image * __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::AbstractColorChooserPanel)))) gradientImage;
-private:
-  ::javax::swing::JPanel * gradientPanel;
-public: // actually package-private
-  ::java::awt::Image * trackImage;
-private:
-  ::javax::swing::JPanel * trackPanel;
-public: // actually package-private
-  ::javax::swing::JSlider * slider;
-  ::javax::swing::JRadioButton * hRadio;
-  ::javax::swing::JRadioButton * sRadio;
-  ::javax::swing::JRadioButton * bRadio;
-  ::javax::swing::JSpinner * hSpinner;
-  ::javax::swing::JSpinner * sSpinner;
-  ::javax::swing::JSpinner * bSpinner;
-private:
-  static const jint imgWidth = 200;
-  static const jint imgHeight = 200;
-  static const jint trackWidth = 30;
-  static ::javax::swing::JLabel * R;
-  static ::javax::swing::JLabel * G;
-  static ::javax::swing::JLabel * B;
-  ::javax::swing::JLabel * rFull;
-  ::javax::swing::JLabel * gFull;
-  ::javax::swing::JLabel * bFull;
-public: // actually package-private
-  ::java::awt::Point * gradientPoint;
-  jboolean internalChange;
-  jboolean spinnerTrigger;
-  jint locked;
-  static const jint HLOCKED = 0;
-  static const jint SLOCKED = 1;
-  static const jint BLOCKED = 2;
-  jboolean handlingMouse;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultHSBChooserPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.h b/libjava/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.h
deleted file mode 100644
index f6b0997923a..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultPreviewPanel$PreviewBorder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultPreviewPanel$PreviewBorder__
-#define __javax_swing_colorchooser_DefaultPreviewPanel$PreviewBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultPreviewPanel;
-          class DefaultPreviewPanel$PreviewBorder;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultPreviewPanel$PreviewBorder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultPreviewPanel$PreviewBorder(::javax::swing::colorchooser::DefaultPreviewPanel *);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static const jint edge = 20;
-  static const jint lead = 5;
-  static const jint gap = 3;
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultPreviewPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultPreviewPanel$PreviewBorder__
diff --git a/libjava/javax/swing/colorchooser/DefaultPreviewPanel.h b/libjava/javax/swing/colorchooser/DefaultPreviewPanel.h
deleted file mode 100644
index 7348bd53b47..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultPreviewPanel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultPreviewPanel__
-#define __javax_swing_colorchooser_DefaultPreviewPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultPreviewPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultPreviewPanel : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  DefaultPreviewPanel();
-public:
-  virtual void paint(::java::awt::Graphics *);
-private:
-  void paintSquare(::java::awt::Graphics *, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, jint, jint, jint);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-private:
-  static jint largeGap;
-  static jint smallGap;
-  static jint squareSize;
-  static jint textPadding;
-  static jint rightSideRectWidth;
-  static ::java::lang::String * sample;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultPreviewPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.h b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.h
deleted file mode 100644
index 1026b6d1a4a..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SliderHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultRGBChooserPanel$SliderHandler__
-#define __javax_swing_colorchooser_DefaultRGBChooserPanel$SliderHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultRGBChooserPanel;
-          class DefaultRGBChooserPanel$SliderHandler;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultRGBChooserPanel$SliderHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultRGBChooserPanel$SliderHandler(::javax::swing::colorchooser::DefaultRGBChooserPanel *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultRGBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultRGBChooserPanel$SliderHandler__
diff --git a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.h b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.h
deleted file mode 100644
index 85ba288ce81..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel$SpinnerHandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultRGBChooserPanel$SpinnerHandler__
-#define __javax_swing_colorchooser_DefaultRGBChooserPanel$SpinnerHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultRGBChooserPanel;
-          class DefaultRGBChooserPanel$SpinnerHandler;
-      }
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultRGBChooserPanel$SpinnerHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultRGBChooserPanel$SpinnerHandler(::javax::swing::colorchooser::DefaultRGBChooserPanel *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultRGBChooserPanel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultRGBChooserPanel$SpinnerHandler__
diff --git a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel.h b/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel.h
deleted file mode 100644
index c9cc7afc372..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultRGBChooserPanel.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultRGBChooserPanel__
-#define __javax_swing_colorchooser_DefaultRGBChooserPanel__
-
-#pragma interface
-
-#include <javax/swing/colorchooser/AbstractColorChooserPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JColorChooser;
-        class JLabel;
-        class JSlider;
-        class JSpinner;
-      namespace colorchooser
-      {
-          class DefaultRGBChooserPanel;
-      }
-      namespace event
-      {
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultRGBChooserPanel : public ::javax::swing::colorchooser::AbstractColorChooserPanel
-{
-
-public:
-  DefaultRGBChooserPanel();
-  virtual ::java::lang::String * getDisplayName();
-  virtual void updateChooser();
-public: // actually protected
-  virtual void buildChooser();
-public:
-  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
-private:
-  void uninstallListeners();
-  void installListeners();
-public:
-  virtual ::javax::swing::Icon * getSmallDisplayIcon();
-  virtual ::javax::swing::Icon * getLargeDisplayIcon();
-  virtual void paint(::java::awt::Graphics *);
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::AbstractColorChooserPanel)))) spinnerChange;
-  jboolean sliderChange;
-  jboolean updateChange;
-private:
-  ::javax::swing::event::ChangeListener * colorChanger;
-  ::javax::swing::event::ChangeListener * spinnerHandler;
-public: // actually package-private
-  ::javax::swing::JSlider * R;
-  ::javax::swing::JSlider * G;
-  ::javax::swing::JSlider * B;
-private:
-  ::javax::swing::JLabel * RLabel;
-  ::javax::swing::JLabel * GLabel;
-  ::javax::swing::JLabel * BLabel;
-public: // actually package-private
-  ::javax::swing::JSpinner * RSpinner;
-  ::javax::swing::JSpinner * GSpinner;
-  ::javax::swing::JSpinner * BSpinner;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultRGBChooserPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.h
deleted file mode 100644
index 41193308521..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainPanelLayout.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainPanelLayout__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainPanelLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel$MainPanelLayout;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$MainPanelLayout : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$MainPanelLayout();
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainPanelLayout__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.h
deleted file mode 100644
index 9a33fe149f3..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MainSwatchPanel.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainSwatchPanel__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainSwatchPanel__
-
-#pragma interface
-
-#include <javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel$MainSwatchPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$MainSwatchPanel : public ::javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$MainSwatchPanel();
-public:
-  virtual ::java::awt::Color * getColorForPosition(jint, jint);
-public: // actually protected
-  virtual void initializeColors();
-public:
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-  static ::java::awt::Color * C204255255;
-  static ::java::awt::Color * C255204204;
-  static ::java::awt::Color * C204255204;
-  static ::java::awt::Color * C204204204;
-  static ::java::awt::Color * C153153255;
-  static ::java::awt::Color * C051051255;
-  static ::java::awt::Color * C153000153;
-  static ::java::awt::Color * C000051051;
-  static ::java::awt::Color * C051000051;
-  static ::java::awt::Color * C051051000;
-  static ::java::awt::Color * C102102000;
-  static ::java::awt::Color * C153255153;
-  static ::java::awt::Color * C102255102;
-  static ::java::awt::Color * C000102102;
-  static ::java::awt::Color * C102000102;
-  static ::java::awt::Color * C000153153;
-  static ::java::awt::Color * C153153000;
-  static ::java::awt::Color * C204204000;
-  static ::java::awt::Color * C204000204;
-  static ::java::awt::Color * C000204204;
-  static ::java::awt::Color * C051255051;
-  static ::java::awt::Color * C255051051;
-  static ::java::awt::Color * C255102102;
-  static ::java::awt::Color * C102102255;
-  static ::java::awt::Color * C255153153;
-public: // actually package-private
-  static JArray< ::java::awt::Color * > * colors;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$MainSwatchPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.h
deleted file mode 100644
index b1de67fc4ff..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$MouseHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$MouseHandler__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$MouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel;
-          class DefaultSwatchChooserPanel$MouseHandler;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$MouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$MouseHandler(::javax::swing::colorchooser::DefaultSwatchChooserPanel *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultSwatchChooserPanel * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$MouseHandler__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.h
deleted file mode 100644
index d4ce35b1808..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentPanelLayout.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentPanelLayout__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentPanelLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel$RecentPanelLayout;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$RecentPanelLayout : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$RecentPanelLayout();
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentPanelLayout__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.h
deleted file mode 100644
index bbb78b807d9..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$RecentSwatchPanel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentSwatchPanel__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentSwatchPanel__
-
-#pragma interface
-
-#include <javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel$RecentSwatchPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$RecentSwatchPanel : public ::javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$RecentSwatchPanel();
-public:
-  virtual ::java::awt::Color * getColorForPosition(jint, jint);
-public: // actually protected
-  virtual void initializeColors();
-private:
-  jint getIndexForCell(jint, jint);
-public: // actually package-private
-  virtual void addColorToQueue(::java::awt::Color *);
-public:
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  JArray< ::java::awt::Color * > * __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel)))) colors;
-public:
-  static ::java::awt::Color * defaultColor;
-public: // actually package-private
-  jint start;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$RecentSwatchPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h
deleted file mode 100644
index 39c05392648..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel$SwatchPanel.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel$SwatchPanel__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel$SwatchPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel$SwatchPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel$SwatchPanel : public ::javax::swing::JPanel
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel$SwatchPanel();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Color * getColorForPosition(jint, jint) = 0;
-public: // actually protected
-  virtual void initializeColors() = 0;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) cellWidth;
-  jint cellHeight;
-  jint gap;
-  jint numRows;
-  jint numCols;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel$SwatchPanel__
diff --git a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel.h b/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel.h
deleted file mode 100644
index 8db2fc6648c..00000000000
--- a/libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_colorchooser_DefaultSwatchChooserPanel__
-#define __javax_swing_colorchooser_DefaultSwatchChooserPanel__
-
-#pragma interface
-
-#include <javax/swing/colorchooser/AbstractColorChooserPanel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-      namespace event
-      {
-          class MouseEvent;
-          class MouseListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JColorChooser;
-      namespace colorchooser
-      {
-          class DefaultSwatchChooserPanel;
-          class DefaultSwatchChooserPanel$MainSwatchPanel;
-          class DefaultSwatchChooserPanel$RecentSwatchPanel;
-      }
-    }
-  }
-}
-
-class javax::swing::colorchooser::DefaultSwatchChooserPanel : public ::javax::swing::colorchooser::AbstractColorChooserPanel
-{
-
-public: // actually package-private
-  DefaultSwatchChooserPanel();
-public:
-  virtual void updateChooser();
-public: // actually protected
-  virtual void buildChooser();
-public:
-  virtual void uninstallChooserPanel(::javax::swing::JColorChooser *);
-  virtual ::java::lang::String * getDisplayName();
-  virtual ::javax::swing::Icon * getSmallDisplayIcon();
-  virtual ::javax::swing::Icon * getLargeDisplayIcon();
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::colorchooser::DefaultSwatchChooserPanel$MainSwatchPanel * __attribute__((aligned(__alignof__( ::javax::swing::colorchooser::AbstractColorChooserPanel)))) mainPalette;
-  ::javax::swing::colorchooser::DefaultSwatchChooserPanel$RecentSwatchPanel * recentPalette;
-  ::java::awt::event::MouseListener * mouseHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_colorchooser_DefaultSwatchChooserPanel__
diff --git a/libjava/javax/swing/event/AncestorEvent.h b/libjava/javax/swing/event/AncestorEvent.h
deleted file mode 100644
index 6966e58fc64..00000000000
--- a/libjava/javax/swing/event/AncestorEvent.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_AncestorEvent__
-#define __javax_swing_event_AncestorEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace event
-      {
-          class AncestorEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::AncestorEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  AncestorEvent(::javax::swing::JComponent *, jint, ::java::awt::Container *, ::java::awt::Container *);
-  virtual ::java::awt::Container * getAncestor();
-  virtual ::java::awt::Container * getAncestorParent();
-  virtual ::javax::swing::JComponent * getComponent();
-private:
-  static const jlong serialVersionUID = -8079801679695605002LL;
-public:
-  static const jint ANCESTOR_ADDED = 1;
-  static const jint ANCESTOR_REMOVED = 2;
-  static const jint ANCESTOR_MOVED = 3;
-private:
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::awt::AWTEvent)))) sourceComponent;
-  ::java::awt::Container * ancestor;
-  ::java::awt::Container * ancestorParent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_AncestorEvent__
diff --git a/libjava/javax/swing/event/AncestorListener.h b/libjava/javax/swing/event/AncestorListener.h
deleted file mode 100644
index 2e2a162c03d..00000000000
--- a/libjava/javax/swing/event/AncestorListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_AncestorListener__
-#define __javax_swing_event_AncestorListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class AncestorEvent;
-          class AncestorListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::AncestorListener : public ::java::lang::Object
-{
-
-public:
-  virtual void ancestorAdded(::javax::swing::event::AncestorEvent *) = 0;
-  virtual void ancestorRemoved(::javax::swing::event::AncestorEvent *) = 0;
-  virtual void ancestorMoved(::javax::swing::event::AncestorEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_AncestorListener__
diff --git a/libjava/javax/swing/event/CaretEvent.h b/libjava/javax/swing/event/CaretEvent.h
deleted file mode 100644
index 29f32e8d0dc..00000000000
--- a/libjava/javax/swing/event/CaretEvent.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_CaretEvent__
-#define __javax_swing_event_CaretEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class CaretEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::CaretEvent : public ::java::util::EventObject
-{
-
-public:
-  CaretEvent(::java::lang::Object *);
-  virtual jint getDot() = 0;
-  virtual jint getMark() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_CaretEvent__
diff --git a/libjava/javax/swing/event/CaretListener.h b/libjava/javax/swing/event/CaretListener.h
deleted file mode 100644
index 9169c866aea..00000000000
--- a/libjava/javax/swing/event/CaretListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_CaretListener__
-#define __javax_swing_event_CaretListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class CaretEvent;
-          class CaretListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::CaretListener : public ::java::lang::Object
-{
-
-public:
-  virtual void caretUpdate(::javax::swing::event::CaretEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_CaretListener__
diff --git a/libjava/javax/swing/event/CellEditorListener.h b/libjava/javax/swing/event/CellEditorListener.h
deleted file mode 100644
index 8f4bcfeb5d1..00000000000
--- a/libjava/javax/swing/event/CellEditorListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_CellEditorListener__
-#define __javax_swing_event_CellEditorListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class CellEditorListener;
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::CellEditorListener : public ::java::lang::Object
-{
-
-public:
-  virtual void editingCanceled(::javax::swing::event::ChangeEvent *) = 0;
-  virtual void editingStopped(::javax::swing::event::ChangeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_CellEditorListener__
diff --git a/libjava/javax/swing/event/ChangeEvent.h b/libjava/javax/swing/event/ChangeEvent.h
deleted file mode 100644
index afec4258b6a..00000000000
--- a/libjava/javax/swing/event/ChangeEvent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ChangeEvent__
-#define __javax_swing_event_ChangeEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ChangeEvent : public ::java::util::EventObject
-{
-
-public:
-  ChangeEvent(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_ChangeEvent__
diff --git a/libjava/javax/swing/event/ChangeListener.h b/libjava/javax/swing/event/ChangeListener.h
deleted file mode 100644
index fc80ec7fe6d..00000000000
--- a/libjava/javax/swing/event/ChangeListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ChangeListener__
-#define __javax_swing_event_ChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ChangeListener : public ::java::lang::Object
-{
-
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_ChangeListener__
diff --git a/libjava/javax/swing/event/DocumentEvent$ElementChange.h b/libjava/javax/swing/event/DocumentEvent$ElementChange.h
deleted file mode 100644
index c94fc69413c..00000000000
--- a/libjava/javax/swing/event/DocumentEvent$ElementChange.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_DocumentEvent$ElementChange__
-#define __javax_swing_event_DocumentEvent$ElementChange__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::event::DocumentEvent$ElementChange : public ::java::lang::Object
-{
-
-public:
-  virtual jint getIndex() = 0;
-  virtual ::javax::swing::text::Element * getElement() = 0;
-  virtual JArray< ::javax::swing::text::Element * > * getChildrenRemoved() = 0;
-  virtual JArray< ::javax::swing::text::Element * > * getChildrenAdded() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_DocumentEvent$ElementChange__
diff --git a/libjava/javax/swing/event/DocumentEvent$EventType.h b/libjava/javax/swing/event/DocumentEvent$EventType.h
deleted file mode 100644
index b09a8e2bf3b..00000000000
--- a/libjava/javax/swing/event/DocumentEvent$EventType.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_DocumentEvent$EventType__
-#define __javax_swing_event_DocumentEvent$EventType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent$EventType;
-      }
-    }
-  }
-}
-
-class javax::swing::event::DocumentEvent$EventType : public ::java::lang::Object
-{
-
-  DocumentEvent$EventType(::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-  static ::javax::swing::event::DocumentEvent$EventType * INSERT;
-  static ::javax::swing::event::DocumentEvent$EventType * REMOVE;
-  static ::javax::swing::event::DocumentEvent$EventType * CHANGE;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_DocumentEvent$EventType__
diff --git a/libjava/javax/swing/event/DocumentEvent.h b/libjava/javax/swing/event/DocumentEvent.h
deleted file mode 100644
index 7d6587d2fcc..00000000000
--- a/libjava/javax/swing/event/DocumentEvent.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_DocumentEvent__
-#define __javax_swing_event_DocumentEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-          class DocumentEvent$EventType;
-      }
-      namespace text
-      {
-          class Document;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::event::DocumentEvent : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::event::DocumentEvent$EventType * getType() = 0;
-  virtual jint getOffset() = 0;
-  virtual jint getLength() = 0;
-  virtual ::javax::swing::text::Document * getDocument() = 0;
-  virtual ::javax::swing::event::DocumentEvent$ElementChange * getChange(::javax::swing::text::Element *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_DocumentEvent__
diff --git a/libjava/javax/swing/event/DocumentListener.h b/libjava/javax/swing/event/DocumentListener.h
deleted file mode 100644
index e836e5f3f23..00000000000
--- a/libjava/javax/swing/event/DocumentListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_DocumentListener__
-#define __javax_swing_event_DocumentListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::DocumentListener : public ::java::lang::Object
-{
-
-public:
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *) = 0;
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *) = 0;
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_DocumentListener__
diff --git a/libjava/javax/swing/event/EventListenerList.h b/libjava/javax/swing/event/EventListenerList.h
deleted file mode 100644
index 25209af6269..00000000000
--- a/libjava/javax/swing/event/EventListenerList.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_EventListenerList__
-#define __javax_swing_event_EventListenerList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class EventListenerList;
-      }
-    }
-  }
-}
-
-class javax::swing::event::EventListenerList : public ::java::lang::Object
-{
-
-public:
-  EventListenerList();
-  virtual void add(::java::lang::Class *, ::java::util::EventListener *);
-  virtual jint getListenerCount();
-  virtual jint getListenerCount(::java::lang::Class *);
-  virtual JArray< ::java::lang::Object * > * getListenerList();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual void remove(::java::lang::Class *, ::java::util::EventListener *);
-  virtual ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public: // actually package-private
-  static const jlong serialVersionUID = -5677132037850737084LL;
-private:
-  static JArray< ::java::lang::Object * > * NO_LISTENERS;
-public: // actually protected
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_EventListenerList__
diff --git a/libjava/javax/swing/event/HyperlinkEvent$EventType.h b/libjava/javax/swing/event/HyperlinkEvent$EventType.h
deleted file mode 100644
index 65bc22e17d4..00000000000
--- a/libjava/javax/swing/event/HyperlinkEvent$EventType.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_HyperlinkEvent$EventType__
-#define __javax_swing_event_HyperlinkEvent$EventType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class HyperlinkEvent$EventType;
-      }
-    }
-  }
-}
-
-class javax::swing::event::HyperlinkEvent$EventType : public ::java::lang::Object
-{
-
-  HyperlinkEvent$EventType(::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-  static ::javax::swing::event::HyperlinkEvent$EventType * ENTERED;
-  static ::javax::swing::event::HyperlinkEvent$EventType * EXITED;
-  static ::javax::swing::event::HyperlinkEvent$EventType * ACTIVATED;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_HyperlinkEvent$EventType__
diff --git a/libjava/javax/swing/event/HyperlinkEvent.h b/libjava/javax/swing/event/HyperlinkEvent.h
deleted file mode 100644
index af86e8c1f28..00000000000
--- a/libjava/javax/swing/event/HyperlinkEvent.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_HyperlinkEvent__
-#define __javax_swing_event_HyperlinkEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class HyperlinkEvent;
-          class HyperlinkEvent$EventType;
-      }
-      namespace text
-      {
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::event::HyperlinkEvent : public ::java::util::EventObject
-{
-
-public:
-  HyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *);
-  HyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *);
-  HyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *, ::javax::swing::text::Element *);
-  virtual ::javax::swing::text::Element * getSourceElement();
-  virtual ::java::net::URL * getURL();
-  virtual ::javax::swing::event::HyperlinkEvent$EventType * getEventType();
-  virtual ::java::lang::String * getDescription();
-private:
-  static const jlong serialVersionUID = -2054640811732867012LL;
-  ::javax::swing::event::HyperlinkEvent$EventType * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) type;
-  ::java::net::URL * url;
-  ::java::lang::String * description;
-  ::javax::swing::text::Element * element;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_HyperlinkEvent__
diff --git a/libjava/javax/swing/event/HyperlinkListener.h b/libjava/javax/swing/event/HyperlinkListener.h
deleted file mode 100644
index ab76042e6b1..00000000000
--- a/libjava/javax/swing/event/HyperlinkListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_HyperlinkListener__
-#define __javax_swing_event_HyperlinkListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class HyperlinkEvent;
-          class HyperlinkListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::HyperlinkListener : public ::java::lang::Object
-{
-
-public:
-  virtual void hyperlinkUpdate(::javax::swing::event::HyperlinkEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_HyperlinkListener__
diff --git a/libjava/javax/swing/event/InternalFrameAdapter.h b/libjava/javax/swing/event/InternalFrameAdapter.h
deleted file mode 100644
index 53aa9ba7a00..00000000000
--- a/libjava/javax/swing/event/InternalFrameAdapter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_InternalFrameAdapter__
-#define __javax_swing_event_InternalFrameAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class InternalFrameAdapter;
-          class InternalFrameEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::InternalFrameAdapter : public ::java::lang::Object
-{
-
-public:
-  InternalFrameAdapter();
-  virtual void internalFrameActivated(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameClosed(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameClosing(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameDeactivated(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameDeiconified(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameIconified(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameOpened(::javax::swing::event::InternalFrameEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_InternalFrameAdapter__
diff --git a/libjava/javax/swing/event/InternalFrameEvent.h b/libjava/javax/swing/event/InternalFrameEvent.h
deleted file mode 100644
index e8ec9e17d0f..00000000000
--- a/libjava/javax/swing/event/InternalFrameEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_InternalFrameEvent__
-#define __javax_swing_event_InternalFrameEvent__
-
-#pragma interface
-
-#include <java/awt/AWTEvent.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JInternalFrame;
-      namespace event
-      {
-          class InternalFrameEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::InternalFrameEvent : public ::java::awt::AWTEvent
-{
-
-public:
-  InternalFrameEvent(::javax::swing::JInternalFrame *, jint);
-  virtual ::javax::swing::JInternalFrame * getInternalFrame();
-  virtual ::java::lang::String * paramString();
-private:
-  static const jlong serialVersionUID = -5204823611874873183LL;
-public:
-  static const jint INTERNAL_FRAME_ACTIVATED = 25554;
-  static const jint INTERNAL_FRAME_CLOSED = 25551;
-  static const jint INTERNAL_FRAME_CLOSING = 25550;
-  static const jint INTERNAL_FRAME_DEACTIVATED = 25555;
-  static const jint INTERNAL_FRAME_DEICONIFIED = 25553;
-  static const jint INTERNAL_FRAME_FIRST = 25549;
-  static const jint INTERNAL_FRAME_ICONIFIED = 25552;
-  static const jint INTERNAL_FRAME_LAST = 25555;
-  static const jint INTERNAL_FRAME_OPENED = 25549;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_InternalFrameEvent__
diff --git a/libjava/javax/swing/event/InternalFrameListener.h b/libjava/javax/swing/event/InternalFrameListener.h
deleted file mode 100644
index 03f3e3b8c68..00000000000
--- a/libjava/javax/swing/event/InternalFrameListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_InternalFrameListener__
-#define __javax_swing_event_InternalFrameListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class InternalFrameEvent;
-          class InternalFrameListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::InternalFrameListener : public ::java::lang::Object
-{
-
-public:
-  virtual void internalFrameActivated(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameClosed(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameClosing(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameDeactivated(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameDeiconified(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameIconified(::javax::swing::event::InternalFrameEvent *) = 0;
-  virtual void internalFrameOpened(::javax::swing::event::InternalFrameEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_InternalFrameListener__
diff --git a/libjava/javax/swing/event/ListDataEvent.h b/libjava/javax/swing/event/ListDataEvent.h
deleted file mode 100644
index 35920f22c78..00000000000
--- a/libjava/javax/swing/event/ListDataEvent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ListDataEvent__
-#define __javax_swing_event_ListDataEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListDataEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ListDataEvent : public ::java::util::EventObject
-{
-
-public:
-  ListDataEvent(::java::lang::Object *, jint, jint, jint);
-  virtual jint getIndex0();
-  virtual jint getIndex1();
-  virtual jint getType();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 2510353260071004774LL;
-public:
-  static const jint CONTENTS_CHANGED = 0;
-  static const jint INTERVAL_ADDED = 1;
-  static const jint INTERVAL_REMOVED = 2;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) type;
-  jint index0;
-  jint index1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_ListDataEvent__
diff --git a/libjava/javax/swing/event/ListDataListener.h b/libjava/javax/swing/event/ListDataListener.h
deleted file mode 100644
index b00dfb139f8..00000000000
--- a/libjava/javax/swing/event/ListDataListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ListDataListener__
-#define __javax_swing_event_ListDataListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListDataEvent;
-          class ListDataListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ListDataListener : public ::java::lang::Object
-{
-
-public:
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *) = 0;
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *) = 0;
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_ListDataListener__
diff --git a/libjava/javax/swing/event/ListSelectionEvent.h b/libjava/javax/swing/event/ListSelectionEvent.h
deleted file mode 100644
index b981d49f2be..00000000000
--- a/libjava/javax/swing/event/ListSelectionEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ListSelectionEvent__
-#define __javax_swing_event_ListSelectionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ListSelectionEvent : public ::java::util::EventObject
-{
-
-public:
-  ListSelectionEvent(::java::lang::Object *, jint, jint, jboolean);
-  virtual jint getFirstIndex();
-  virtual jint getLastIndex();
-  virtual jboolean getValueIsAdjusting();
-  virtual ::java::lang::String * toString();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) firstIndex;
-  jint lastIndex;
-  jboolean isAdjusting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_ListSelectionEvent__
diff --git a/libjava/javax/swing/event/ListSelectionListener.h b/libjava/javax/swing/event/ListSelectionListener.h
deleted file mode 100644
index 252c9b5541d..00000000000
--- a/libjava/javax/swing/event/ListSelectionListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_ListSelectionListener__
-#define __javax_swing_event_ListSelectionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-          class ListSelectionListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::ListSelectionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_ListSelectionListener__
diff --git a/libjava/javax/swing/event/MenuDragMouseEvent.h b/libjava/javax/swing/event/MenuDragMouseEvent.h
deleted file mode 100644
index aa19d3c3655..00000000000
--- a/libjava/javax/swing/event/MenuDragMouseEvent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuDragMouseEvent__
-#define __javax_swing_event_MenuDragMouseEvent__
-
-#pragma interface
-
-#include <java/awt/event/MouseEvent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace event
-      {
-          class MenuDragMouseEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuDragMouseEvent : public ::java::awt::event::MouseEvent
-{
-
-public:
-  MenuDragMouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual JArray< ::javax::swing::MenuElement * > * getPath();
-  virtual ::javax::swing::MenuSelectionManager * getMenuSelectionManager();
-private:
-  JArray< ::javax::swing::MenuElement * > * __attribute__((aligned(__alignof__( ::java::awt::event::MouseEvent)))) path;
-  ::javax::swing::MenuSelectionManager * manager;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_MenuDragMouseEvent__
diff --git a/libjava/javax/swing/event/MenuDragMouseListener.h b/libjava/javax/swing/event/MenuDragMouseListener.h
deleted file mode 100644
index 760fe8448d3..00000000000
--- a/libjava/javax/swing/event/MenuDragMouseListener.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuDragMouseListener__
-#define __javax_swing_event_MenuDragMouseListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuDragMouseEvent;
-          class MenuDragMouseListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuDragMouseListener : public ::java::lang::Object
-{
-
-public:
-  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *) = 0;
-  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *) = 0;
-  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *) = 0;
-  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_MenuDragMouseListener__
diff --git a/libjava/javax/swing/event/MenuEvent.h b/libjava/javax/swing/event/MenuEvent.h
deleted file mode 100644
index 988e7405979..00000000000
--- a/libjava/javax/swing/event/MenuEvent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuEvent__
-#define __javax_swing_event_MenuEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuEvent : public ::java::util::EventObject
-{
-
-public:
-  MenuEvent(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_MenuEvent__
diff --git a/libjava/javax/swing/event/MenuKeyEvent.h b/libjava/javax/swing/event/MenuKeyEvent.h
deleted file mode 100644
index ac61c98693e..00000000000
--- a/libjava/javax/swing/event/MenuKeyEvent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuKeyEvent__
-#define __javax_swing_event_MenuKeyEvent__
-
-#pragma interface
-
-#include <java/awt/event/KeyEvent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace event
-      {
-          class MenuKeyEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuKeyEvent : public ::java::awt::event::KeyEvent
-{
-
-public:
-  MenuKeyEvent(::java::awt::Component *, jint, jlong, jint, jint, jchar, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  virtual JArray< ::javax::swing::MenuElement * > * getPath();
-  virtual ::javax::swing::MenuSelectionManager * getMenuSelectionManager();
-private:
-  JArray< ::javax::swing::MenuElement * > * __attribute__((aligned(__alignof__( ::java::awt::event::KeyEvent)))) path;
-  ::javax::swing::MenuSelectionManager * manager;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_MenuKeyEvent__
diff --git a/libjava/javax/swing/event/MenuKeyListener.h b/libjava/javax/swing/event/MenuKeyListener.h
deleted file mode 100644
index cec8947cdd7..00000000000
--- a/libjava/javax/swing/event/MenuKeyListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuKeyListener__
-#define __javax_swing_event_MenuKeyListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuKeyEvent;
-          class MenuKeyListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuKeyListener : public ::java::lang::Object
-{
-
-public:
-  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *) = 0;
-  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *) = 0;
-  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_MenuKeyListener__
diff --git a/libjava/javax/swing/event/MenuListener.h b/libjava/javax/swing/event/MenuListener.h
deleted file mode 100644
index 356a633bcb8..00000000000
--- a/libjava/javax/swing/event/MenuListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MenuListener__
-#define __javax_swing_event_MenuListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuEvent;
-          class MenuListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MenuListener : public ::java::lang::Object
-{
-
-public:
-  virtual void menuCanceled(::javax::swing::event::MenuEvent *) = 0;
-  virtual void menuDeselected(::javax::swing::event::MenuEvent *) = 0;
-  virtual void menuSelected(::javax::swing::event::MenuEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_MenuListener__
diff --git a/libjava/javax/swing/event/MouseInputAdapter.h b/libjava/javax/swing/event/MouseInputAdapter.h
deleted file mode 100644
index 05e75898539..00000000000
--- a/libjava/javax/swing/event/MouseInputAdapter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MouseInputAdapter__
-#define __javax_swing_event_MouseInputAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MouseInputAdapter;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MouseInputAdapter : public ::java::lang::Object
-{
-
-public:
-  MouseInputAdapter();
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_MouseInputAdapter__
diff --git a/libjava/javax/swing/event/MouseInputListener.h b/libjava/javax/swing/event/MouseInputListener.h
deleted file mode 100644
index 10deab46527..00000000000
--- a/libjava/javax/swing/event/MouseInputListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_MouseInputListener__
-#define __javax_swing_event_MouseInputListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MouseInputListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::MouseInputListener : public ::java::lang::Object
-{
-
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *) = 0;
-  virtual void mousePressed(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseReleased(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseEntered(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseExited(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseDragged(::java::awt::event::MouseEvent *) = 0;
-  virtual void mouseMoved(::java::awt::event::MouseEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_MouseInputListener__
diff --git a/libjava/javax/swing/event/PopupMenuEvent.h b/libjava/javax/swing/event/PopupMenuEvent.h
deleted file mode 100644
index 4292f10c652..00000000000
--- a/libjava/javax/swing/event/PopupMenuEvent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_PopupMenuEvent__
-#define __javax_swing_event_PopupMenuEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class PopupMenuEvent;
-      }
-    }
-  }
-}
-
-class javax::swing::event::PopupMenuEvent : public ::java::util::EventObject
-{
-
-public:
-  PopupMenuEvent(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_PopupMenuEvent__
diff --git a/libjava/javax/swing/event/PopupMenuListener.h b/libjava/javax/swing/event/PopupMenuListener.h
deleted file mode 100644
index 8446bc3a254..00000000000
--- a/libjava/javax/swing/event/PopupMenuListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_PopupMenuListener__
-#define __javax_swing_event_PopupMenuListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class PopupMenuEvent;
-          class PopupMenuListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::PopupMenuListener : public ::java::lang::Object
-{
-
-public:
-  virtual void popupMenuCanceled(::javax::swing::event::PopupMenuEvent *) = 0;
-  virtual void popupMenuWillBecomeInvisible(::javax::swing::event::PopupMenuEvent *) = 0;
-  virtual void popupMenuWillBecomeVisible(::javax::swing::event::PopupMenuEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_PopupMenuListener__
diff --git a/libjava/javax/swing/event/SwingPropertyChangeSupport.h b/libjava/javax/swing/event/SwingPropertyChangeSupport.h
deleted file mode 100644
index 7d997085c0f..00000000000
--- a/libjava/javax/swing/event/SwingPropertyChangeSupport.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_SwingPropertyChangeSupport__
-#define __javax_swing_event_SwingPropertyChangeSupport__
-
-#pragma interface
-
-#include <java/beans/PropertyChangeSupport.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class SwingPropertyChangeSupport;
-      }
-    }
-  }
-}
-
-class javax::swing::event::SwingPropertyChangeSupport : public ::java::beans::PropertyChangeSupport
-{
-
-public:
-  SwingPropertyChangeSupport(::java::lang::Object *);
-private:
-  static const jlong serialVersionUID = 7162625831330845068LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_SwingPropertyChangeSupport__
diff --git a/libjava/javax/swing/event/TableColumnModelEvent.h b/libjava/javax/swing/event/TableColumnModelEvent.h
deleted file mode 100644
index 0de5a8f5138..00000000000
--- a/libjava/javax/swing/event/TableColumnModelEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TableColumnModelEvent__
-#define __javax_swing_event_TableColumnModelEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TableColumnModelEvent;
-      }
-      namespace table
-      {
-          class TableColumnModel;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TableColumnModelEvent : public ::java::util::EventObject
-{
-
-public:
-  TableColumnModelEvent(::javax::swing::table::TableColumnModel *, jint, jint);
-  virtual jint getFromIndex();
-  virtual jint getToIndex();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) fromIndex;
-  jint toIndex;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_TableColumnModelEvent__
diff --git a/libjava/javax/swing/event/TableColumnModelListener.h b/libjava/javax/swing/event/TableColumnModelListener.h
deleted file mode 100644
index 3712b2e27e8..00000000000
--- a/libjava/javax/swing/event/TableColumnModelListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TableColumnModelListener__
-#define __javax_swing_event_TableColumnModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-          class ListSelectionEvent;
-          class TableColumnModelEvent;
-          class TableColumnModelListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TableColumnModelListener : public ::java::lang::Object
-{
-
-public:
-  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *) = 0;
-  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *) = 0;
-  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *) = 0;
-  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *) = 0;
-  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TableColumnModelListener__
diff --git a/libjava/javax/swing/event/TableModelEvent.h b/libjava/javax/swing/event/TableModelEvent.h
deleted file mode 100644
index dff48f5eb68..00000000000
--- a/libjava/javax/swing/event/TableModelEvent.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TableModelEvent__
-#define __javax_swing_event_TableModelEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TableModelEvent;
-      }
-      namespace table
-      {
-          class TableModel;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TableModelEvent : public ::java::util::EventObject
-{
-
-public:
-  TableModelEvent(::javax::swing::table::TableModel *);
-  TableModelEvent(::javax::swing::table::TableModel *, jint);
-  TableModelEvent(::javax::swing::table::TableModel *, jint, jint);
-  TableModelEvent(::javax::swing::table::TableModel *, jint, jint, jint);
-  TableModelEvent(::javax::swing::table::TableModel *, jint, jint, jint, jint);
-  virtual jint getColumn();
-  virtual jint getFirstRow();
-  virtual jint getLastRow();
-  virtual jint getType();
-private:
-  static const jlong serialVersionUID = -7849342674552212824LL;
-public:
-  static const jint ALL_COLUMNS = -1;
-  static const jint DELETE = -1;
-  static const jint HEADER_ROW = -1;
-  static const jint INSERT = 1;
-  static const jint UPDATE = 0;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::util::EventObject)))) column;
-  jint firstRow;
-  jint lastRow;
-  jint type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_TableModelEvent__
diff --git a/libjava/javax/swing/event/TableModelListener.h b/libjava/javax/swing/event/TableModelListener.h
deleted file mode 100644
index db47af49fdb..00000000000
--- a/libjava/javax/swing/event/TableModelListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TableModelListener__
-#define __javax_swing_event_TableModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TableModelEvent;
-          class TableModelListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TableModelListener : public ::java::lang::Object
-{
-
-public:
-  virtual void tableChanged(::javax::swing::event::TableModelEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TableModelListener__
diff --git a/libjava/javax/swing/event/TreeExpansionEvent.h b/libjava/javax/swing/event/TreeExpansionEvent.h
deleted file mode 100644
index 8694a2b3307..00000000000
--- a/libjava/javax/swing/event/TreeExpansionEvent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeExpansionEvent__
-#define __javax_swing_event_TreeExpansionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeExpansionEvent;
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeExpansionEvent : public ::java::util::EventObject
-{
-
-public:
-  TreeExpansionEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPath();
-public: // actually protected
-  ::javax::swing::tree::TreePath * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) path;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_TreeExpansionEvent__
diff --git a/libjava/javax/swing/event/TreeExpansionListener.h b/libjava/javax/swing/event/TreeExpansionListener.h
deleted file mode 100644
index 86960dbccaf..00000000000
--- a/libjava/javax/swing/event/TreeExpansionListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeExpansionListener__
-#define __javax_swing_event_TreeExpansionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeExpansionEvent;
-          class TreeExpansionListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeExpansionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void treeCollapsed(::javax::swing::event::TreeExpansionEvent *) = 0;
-  virtual void treeExpanded(::javax::swing::event::TreeExpansionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TreeExpansionListener__
diff --git a/libjava/javax/swing/event/TreeModelEvent.h b/libjava/javax/swing/event/TreeModelEvent.h
deleted file mode 100644
index 857ebf532bd..00000000000
--- a/libjava/javax/swing/event/TreeModelEvent.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeModelEvent__
-#define __javax_swing_event_TreeModelEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeModelEvent : public ::java::util::EventObject
-{
-
-public:
-  TreeModelEvent(::java::lang::Object *, JArray< ::java::lang::Object * > *);
-  TreeModelEvent(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  TreeModelEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *);
-  TreeModelEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  virtual JArray< jint > * getChildIndices();
-  virtual JArray< ::java::lang::Object * > * getChildren();
-  virtual JArray< ::java::lang::Object * > * getPath();
-  virtual ::javax::swing::tree::TreePath * getTreePath();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) childIndices;
-  JArray< ::java::lang::Object * > * children;
-  ::javax::swing::tree::TreePath * path;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_TreeModelEvent__
diff --git a/libjava/javax/swing/event/TreeModelListener.h b/libjava/javax/swing/event/TreeModelListener.h
deleted file mode 100644
index cde0849debe..00000000000
--- a/libjava/javax/swing/event/TreeModelListener.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeModelListener__
-#define __javax_swing_event_TreeModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-          class TreeModelListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeModelListener : public ::java::lang::Object
-{
-
-public:
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TreeModelListener__
diff --git a/libjava/javax/swing/event/TreeSelectionEvent.h b/libjava/javax/swing/event/TreeSelectionEvent.h
deleted file mode 100644
index 82bdfd61db5..00000000000
--- a/libjava/javax/swing/event/TreeSelectionEvent.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeSelectionEvent__
-#define __javax_swing_event_TreeSelectionEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeSelectionEvent;
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeSelectionEvent : public ::java::util::EventObject
-{
-
-public:
-  TreeSelectionEvent(::java::lang::Object *, JArray< ::javax::swing::tree::TreePath * > *, JArray< jboolean > *, ::javax::swing::tree::TreePath *, ::javax::swing::tree::TreePath *);
-  TreeSelectionEvent(::java::lang::Object *, ::javax::swing::tree::TreePath *, jboolean, ::javax::swing::tree::TreePath *, ::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPath();
-  virtual JArray< ::javax::swing::tree::TreePath * > * getPaths();
-  virtual jboolean isAddedPath();
-  virtual jboolean isAddedPath(::javax::swing::tree::TreePath *);
-  virtual jboolean isAddedPath(jint);
-  virtual ::javax::swing::tree::TreePath * getOldLeadSelectionPath();
-  virtual ::javax::swing::tree::TreePath * getNewLeadSelectionPath();
-  virtual ::java::lang::Object * cloneWithSource(::java::lang::Object *);
-public: // actually protected
-  JArray< ::javax::swing::tree::TreePath * > * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) paths;
-  JArray< jboolean > * areNew;
-  ::javax::swing::tree::TreePath * oldLeadSelectionPath;
-  ::javax::swing::tree::TreePath * newLeadSelectionPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_TreeSelectionEvent__
diff --git a/libjava/javax/swing/event/TreeSelectionListener.h b/libjava/javax/swing/event/TreeSelectionListener.h
deleted file mode 100644
index 121f05f8892..00000000000
--- a/libjava/javax/swing/event/TreeSelectionListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeSelectionListener__
-#define __javax_swing_event_TreeSelectionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeSelectionEvent;
-          class TreeSelectionListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeSelectionListener : public ::java::lang::Object
-{
-
-public:
-  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TreeSelectionListener__
diff --git a/libjava/javax/swing/event/TreeWillExpandListener.h b/libjava/javax/swing/event/TreeWillExpandListener.h
deleted file mode 100644
index fea233e55c8..00000000000
--- a/libjava/javax/swing/event/TreeWillExpandListener.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_TreeWillExpandListener__
-#define __javax_swing_event_TreeWillExpandListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeExpansionEvent;
-          class TreeWillExpandListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::TreeWillExpandListener : public ::java::lang::Object
-{
-
-public:
-  virtual void treeWillCollapse(::javax::swing::event::TreeExpansionEvent *) = 0;
-  virtual void treeWillExpand(::javax::swing::event::TreeExpansionEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_TreeWillExpandListener__
diff --git a/libjava/javax/swing/event/UndoableEditEvent.h b/libjava/javax/swing/event/UndoableEditEvent.h
deleted file mode 100644
index 244795301ec..00000000000
--- a/libjava/javax/swing/event/UndoableEditEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_UndoableEditEvent__
-#define __javax_swing_event_UndoableEditEvent__
-
-#pragma interface
-
-#include <java/util/EventObject.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class UndoableEditEvent;
-      }
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::event::UndoableEditEvent : public ::java::util::EventObject
-{
-
-public:
-  UndoableEditEvent(::java::lang::Object *, ::javax::swing::undo::UndoableEdit *);
-  virtual ::javax::swing::undo::UndoableEdit * getEdit();
-private:
-  static const jlong serialVersionUID = 4418044561759134484LL;
-  ::javax::swing::undo::UndoableEdit * __attribute__((aligned(__alignof__( ::java::util::EventObject)))) edit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_event_UndoableEditEvent__
diff --git a/libjava/javax/swing/event/UndoableEditListener.h b/libjava/javax/swing/event/UndoableEditListener.h
deleted file mode 100644
index 738c5329a7f..00000000000
--- a/libjava/javax/swing/event/UndoableEditListener.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_event_UndoableEditListener__
-#define __javax_swing_event_UndoableEditListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class UndoableEditEvent;
-          class UndoableEditListener;
-      }
-    }
-  }
-}
-
-class javax::swing::event::UndoableEditListener : public ::java::lang::Object
-{
-
-public:
-  virtual void undoableEditHappened(::javax::swing::event::UndoableEditEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_event_UndoableEditListener__
diff --git a/libjava/javax/swing/filechooser/FileFilter.h b/libjava/javax/swing/filechooser/FileFilter.h
deleted file mode 100644
index ce2d75e746e..00000000000
--- a/libjava/javax/swing/filechooser/FileFilter.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_filechooser_FileFilter__
-#define __javax_swing_filechooser_FileFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace filechooser
-      {
-          class FileFilter;
-      }
-    }
-  }
-}
-
-class javax::swing::filechooser::FileFilter : public ::java::lang::Object
-{
-
-public:
-  FileFilter();
-  virtual jboolean accept(::java::io::File *) = 0;
-  virtual ::java::lang::String * getDescription() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_filechooser_FileFilter__
diff --git a/libjava/javax/swing/filechooser/FileSystemView.h b/libjava/javax/swing/filechooser/FileSystemView.h
deleted file mode 100644
index 48b35954c40..00000000000
--- a/libjava/javax/swing/filechooser/FileSystemView.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_filechooser_FileSystemView__
-#define __javax_swing_filechooser_FileSystemView__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace filechooser
-      {
-          class FileSystemView;
-      }
-    }
-  }
-}
-
-class javax::swing::filechooser::FileSystemView : public ::java::lang::Object
-{
-
-public:
-  FileSystemView();
-  virtual ::java::io::File * createFileObject(::java::io::File *, ::java::lang::String *);
-  virtual ::java::io::File * createFileObject(::java::lang::String *);
-public: // actually protected
-  virtual ::java::io::File * createFileSystemRoot(::java::io::File *);
-public:
-  virtual ::java::io::File * createNewFolder(::java::io::File *) = 0;
-  virtual ::java::io::File * getChild(::java::io::File *, ::java::lang::String *);
-  virtual ::java::io::File * getDefaultDirectory();
-  virtual JArray< ::java::io::File * > * getFiles(::java::io::File *, jboolean);
-  static ::javax::swing::filechooser::FileSystemView * getFileSystemView();
-  virtual ::java::io::File * getHomeDirectory();
-  virtual ::java::io::File * getParentDirectory(::java::io::File *);
-  virtual JArray< ::java::io::File * > * getRoots();
-  virtual ::java::lang::String * getSystemDisplayName(::java::io::File *);
-  virtual ::javax::swing::Icon * getSystemIcon(::java::io::File *);
-  virtual ::java::lang::String * getSystemTypeDescription(::java::io::File *);
-  virtual jboolean isComputerNode(::java::io::File *);
-  virtual jboolean isDrive(::java::io::File *);
-  virtual jboolean isFileSystem(::java::io::File *);
-  virtual jboolean isFileSystemRoot(::java::io::File *);
-  virtual jboolean isFloppyDrive(::java::io::File *);
-  virtual jboolean isHiddenFile(::java::io::File *);
-  virtual jboolean isParent(::java::io::File *, ::java::io::File *);
-  virtual jboolean isRoot(::java::io::File *);
-  virtual ::java::lang::Boolean * isTraversable(::java::io::File *);
-private:
-  static ::javax::swing::filechooser::FileSystemView * defaultFileSystemView;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_filechooser_FileSystemView__
diff --git a/libjava/javax/swing/filechooser/FileView.h b/libjava/javax/swing/filechooser/FileView.h
deleted file mode 100644
index dffaa0f2bdb..00000000000
--- a/libjava/javax/swing/filechooser/FileView.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_filechooser_FileView__
-#define __javax_swing_filechooser_FileView__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace filechooser
-      {
-          class FileView;
-      }
-    }
-  }
-}
-
-class javax::swing::filechooser::FileView : public ::java::lang::Object
-{
-
-public:
-  FileView();
-  virtual ::java::lang::String * getName(::java::io::File *);
-  virtual ::java::lang::String * getDescription(::java::io::File *);
-  virtual ::java::lang::String * getTypeDescription(::java::io::File *);
-  virtual ::javax::swing::Icon * getIcon(::java::io::File *);
-  virtual ::java::lang::Boolean * isTraversable(::java::io::File *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_filechooser_FileView__
diff --git a/libjava/javax/swing/filechooser/UnixFileSystemView.h b/libjava/javax/swing/filechooser/UnixFileSystemView.h
deleted file mode 100644
index e06f9b8f0d0..00000000000
--- a/libjava/javax/swing/filechooser/UnixFileSystemView.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_filechooser_UnixFileSystemView__
-#define __javax_swing_filechooser_UnixFileSystemView__
-
-#pragma interface
-
-#include <javax/swing/filechooser/FileSystemView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace filechooser
-      {
-          class UnixFileSystemView;
-      }
-    }
-  }
-}
-
-class javax::swing::filechooser::UnixFileSystemView : public ::javax::swing::filechooser::FileSystemView
-{
-
-public: // actually package-private
-  UnixFileSystemView();
-public:
-  virtual ::java::io::File * createNewFolder(::java::io::File *);
-  virtual JArray< ::java::io::File * > * getRoots();
-  virtual ::java::lang::String * getSystemDisplayName(::java::io::File *);
-  virtual ::javax::swing::Icon * getSystemIcon(::java::io::File *);
-  virtual ::java::lang::String * getSystemTypeDescription(::java::io::File *);
-  virtual jboolean isRoot(::java::io::File *);
-private:
-  static ::java::lang::String * NEW_FOLDER_NAME;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_filechooser_UnixFileSystemView__
diff --git a/libjava/javax/swing/plaf/ActionMapUIResource.h b/libjava/javax/swing/plaf/ActionMapUIResource.h
deleted file mode 100644
index a9364d8e2d2..00000000000
--- a/libjava/javax/swing/plaf/ActionMapUIResource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ActionMapUIResource__
-#define __javax_swing_plaf_ActionMapUIResource__
-
-#pragma interface
-
-#include <javax/swing/ActionMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ActionMapUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ActionMapUIResource : public ::javax::swing::ActionMap
-{
-
-public:
-  ActionMapUIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ActionMapUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h
deleted file mode 100644
index c85a1ba6ebf..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$BevelBorderUIResource.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/BevelBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class BorderUIResource$BevelBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$BevelBorderUIResource : public ::javax::swing::border::BevelBorder
-{
-
-public:
-  BorderUIResource$BevelBorderUIResource(jint);
-  BorderUIResource$BevelBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *);
-  BorderUIResource$BevelBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-private:
-  static const jlong serialVersionUID = -1275542891108351642LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$BevelBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h
deleted file mode 100644
index 8161ecbe9fd..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$CompoundBorderUIResource.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/CompoundBorder.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class BorderUIResource$CompoundBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$CompoundBorderUIResource : public ::javax::swing::border::CompoundBorder
-{
-
-public:
-  BorderUIResource$CompoundBorderUIResource(::javax::swing::border::Border *, ::javax::swing::border::Border *);
-private:
-  static const jlong serialVersionUID = 7550017084975167341LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$CompoundBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h
deleted file mode 100644
index 15ba53faecd..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$EmptyBorderUIResource.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/EmptyBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class BorderUIResource$EmptyBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$EmptyBorderUIResource : public ::javax::swing::border::EmptyBorder
-{
-
-public:
-  BorderUIResource$EmptyBorderUIResource(jint, jint, jint, jint);
-  BorderUIResource$EmptyBorderUIResource(::java::awt::Insets *);
-private:
-  static const jlong serialVersionUID = -4914187529340071708LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$EmptyBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h
deleted file mode 100644
index 89934717a2d..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$EtchedBorderUIResource.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/EtchedBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class BorderUIResource$EtchedBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$EtchedBorderUIResource : public ::javax::swing::border::EtchedBorder
-{
-
-public:
-  BorderUIResource$EtchedBorderUIResource();
-  BorderUIResource$EtchedBorderUIResource(jint);
-  BorderUIResource$EtchedBorderUIResource(::java::awt::Color *, ::java::awt::Color *);
-  BorderUIResource$EtchedBorderUIResource(jint, ::java::awt::Color *, ::java::awt::Color *);
-private:
-  static const jlong serialVersionUID = -8186391754165296656LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$EtchedBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h
deleted file mode 100644
index fe3669c0014..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$LineBorderUIResource.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/LineBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class BorderUIResource$LineBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$LineBorderUIResource : public ::javax::swing::border::LineBorder
-{
-
-public:
-  BorderUIResource$LineBorderUIResource(::java::awt::Color *);
-  BorderUIResource$LineBorderUIResource(::java::awt::Color *, jint);
-private:
-  static const jlong serialVersionUID = -6171232338180172310LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$LineBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h
deleted file mode 100644
index b5925fce775..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$MatteBorderUIResource.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/MatteBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-          class BorderUIResource$MatteBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$MatteBorderUIResource : public ::javax::swing::border::MatteBorder
-{
-
-public:
-  BorderUIResource$MatteBorderUIResource(jint, jint, jint, jint, ::java::awt::Color *);
-  BorderUIResource$MatteBorderUIResource(jint, jint, jint, jint, ::javax::swing::Icon *);
-  BorderUIResource$MatteBorderUIResource(::javax::swing::Icon *);
-private:
-  static const jlong serialVersionUID = -8107923147541851122LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$MatteBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h
deleted file mode 100644
index a20193f6d01..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource$TitledBorderUIResource.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
-#define __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
-
-#pragma interface
-
-#include <javax/swing/border/TitledBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class BorderUIResource$TitledBorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource$TitledBorderUIResource : public ::javax::swing::border::TitledBorder
-{
-
-public:
-  BorderUIResource$TitledBorderUIResource(::java::lang::String *);
-  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *);
-  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *);
-  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint);
-  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *);
-  BorderUIResource$TitledBorderUIResource(::javax::swing::border::Border *, ::java::lang::String *, jint, jint, ::java::awt::Font *, ::java::awt::Color *);
-private:
-  static const jlong serialVersionUID = 7667113547406407427LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource$TitledBorderUIResource__
diff --git a/libjava/javax/swing/plaf/BorderUIResource.h b/libjava/javax/swing/plaf/BorderUIResource.h
deleted file mode 100644
index 3a89c2c00c5..00000000000
--- a/libjava/javax/swing/plaf/BorderUIResource.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_BorderUIResource__
-#define __javax_swing_plaf_BorderUIResource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class BorderUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::BorderUIResource : public ::java::lang::Object
-{
-
-public:
-  static ::javax::swing::border::Border * getEtchedBorderUIResource();
-  static ::javax::swing::border::Border * getLoweredBevelBorderUIResource();
-  static ::javax::swing::border::Border * getRaisedBevelBorderUIResource();
-  static ::javax::swing::border::Border * getBlackLineBorderUIResource();
-  BorderUIResource(::javax::swing::border::Border *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-public: // actually package-private
-  static const jlong serialVersionUID = -3440553684010079691LL;
-private:
-  static ::javax::swing::border::Border * etchedBorderUIResource;
-  static ::javax::swing::border::Border * loweredBevelBorderUIResource;
-  static ::javax::swing::border::Border * raisedBevelBorderUIResource;
-  static ::javax::swing::border::Border * blackLineBorderUIResource;
-  ::javax::swing::border::Border * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_BorderUIResource__
diff --git a/libjava/javax/swing/plaf/ButtonUI.h b/libjava/javax/swing/plaf/ButtonUI.h
deleted file mode 100644
index 61cb852b83c..00000000000
--- a/libjava/javax/swing/plaf/ButtonUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ButtonUI__
-#define __javax_swing_plaf_ButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ButtonUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ButtonUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ButtonUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ButtonUI__
diff --git a/libjava/javax/swing/plaf/ColorChooserUI.h b/libjava/javax/swing/plaf/ColorChooserUI.h
deleted file mode 100644
index 9db0d0e891b..00000000000
--- a/libjava/javax/swing/plaf/ColorChooserUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ColorChooserUI__
-#define __javax_swing_plaf_ColorChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ColorChooserUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ColorChooserUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ColorChooserUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ColorChooserUI__
diff --git a/libjava/javax/swing/plaf/ColorUIResource.h b/libjava/javax/swing/plaf/ColorUIResource.h
deleted file mode 100644
index 37ef2238288..00000000000
--- a/libjava/javax/swing/plaf/ColorUIResource.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ColorUIResource__
-#define __javax_swing_plaf_ColorUIResource__
-
-#pragma interface
-
-#include <java/awt/Color.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ColorUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ColorUIResource : public ::java::awt::Color
-{
-
-public:
-  ColorUIResource(jint, jint, jint);
-  ColorUIResource(jint);
-  ColorUIResource(jfloat, jfloat, jfloat);
-  ColorUIResource(::java::awt::Color *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ColorUIResource__
diff --git a/libjava/javax/swing/plaf/ComboBoxUI.h b/libjava/javax/swing/plaf/ComboBoxUI.h
deleted file mode 100644
index bdcdfe3f0ea..00000000000
--- a/libjava/javax/swing/plaf/ComboBoxUI.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ComboBoxUI__
-#define __javax_swing_plaf_ComboBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComboBox;
-      namespace plaf
-      {
-          class ComboBoxUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ComboBoxUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ComboBoxUI();
-  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean) = 0;
-  virtual jboolean isPopupVisible(::javax::swing::JComboBox *) = 0;
-  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ComboBoxUI__
diff --git a/libjava/javax/swing/plaf/ComponentInputMapUIResource.h b/libjava/javax/swing/plaf/ComponentInputMapUIResource.h
deleted file mode 100644
index 52accf48001..00000000000
--- a/libjava/javax/swing/plaf/ComponentInputMapUIResource.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ComponentInputMapUIResource__
-#define __javax_swing_plaf_ComponentInputMapUIResource__
-
-#pragma interface
-
-#include <javax/swing/ComponentInputMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentInputMapUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ComponentInputMapUIResource : public ::javax::swing::ComponentInputMap
-{
-
-public:
-  ComponentInputMapUIResource(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ComponentInputMapUIResource__
diff --git a/libjava/javax/swing/plaf/ComponentUI.h b/libjava/javax/swing/plaf/ComponentUI.h
deleted file mode 100644
index 3f14af6c89e..00000000000
--- a/libjava/javax/swing/plaf/ComponentUI.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ComponentUI__
-#define __javax_swing_plaf_ComponentUI__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ComponentUI : public ::java::lang::Object
-{
-
-public:
-  ComponentUI();
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ComponentUI__
diff --git a/libjava/javax/swing/plaf/DesktopIconUI.h b/libjava/javax/swing/plaf/DesktopIconUI.h
deleted file mode 100644
index 6f3fb24d68e..00000000000
--- a/libjava/javax/swing/plaf/DesktopIconUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_DesktopIconUI__
-#define __javax_swing_plaf_DesktopIconUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class DesktopIconUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::DesktopIconUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  DesktopIconUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_DesktopIconUI__
diff --git a/libjava/javax/swing/plaf/DesktopPaneUI.h b/libjava/javax/swing/plaf/DesktopPaneUI.h
deleted file mode 100644
index 308120dc131..00000000000
--- a/libjava/javax/swing/plaf/DesktopPaneUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_DesktopPaneUI__
-#define __javax_swing_plaf_DesktopPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class DesktopPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::DesktopPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  DesktopPaneUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_DesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/DimensionUIResource.h b/libjava/javax/swing/plaf/DimensionUIResource.h
deleted file mode 100644
index 620a35d05c2..00000000000
--- a/libjava/javax/swing/plaf/DimensionUIResource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_DimensionUIResource__
-#define __javax_swing_plaf_DimensionUIResource__
-
-#pragma interface
-
-#include <java/awt/Dimension.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class DimensionUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::DimensionUIResource : public ::java::awt::Dimension
-{
-
-public:
-  DimensionUIResource(jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_DimensionUIResource__
diff --git a/libjava/javax/swing/plaf/FileChooserUI.h b/libjava/javax/swing/plaf/FileChooserUI.h
deleted file mode 100644
index 3a166bac0aa..00000000000
--- a/libjava/javax/swing/plaf/FileChooserUI.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_FileChooserUI__
-#define __javax_swing_plaf_FileChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-      namespace filechooser
-      {
-          class FileFilter;
-          class FileView;
-      }
-      namespace plaf
-      {
-          class FileChooserUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::FileChooserUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  FileChooserUI();
-  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *) = 0;
-  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *) = 0;
-  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *) = 0;
-  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *) = 0;
-  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *) = 0;
-  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_FileChooserUI__
diff --git a/libjava/javax/swing/plaf/FontUIResource.h b/libjava/javax/swing/plaf/FontUIResource.h
deleted file mode 100644
index 4f2b8353ba0..00000000000
--- a/libjava/javax/swing/plaf/FontUIResource.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_FontUIResource__
-#define __javax_swing_plaf_FontUIResource__
-
-#pragma interface
-
-#include <java/awt/Font.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class FontUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::FontUIResource : public ::java::awt::Font
-{
-
-public:
-  FontUIResource(::java::lang::String *, jint, jint);
-  FontUIResource(::java::awt::Font *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_FontUIResource__
diff --git a/libjava/javax/swing/plaf/IconUIResource.h b/libjava/javax/swing/plaf/IconUIResource.h
deleted file mode 100644
index f1e7047494c..00000000000
--- a/libjava/javax/swing/plaf/IconUIResource.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_IconUIResource__
-#define __javax_swing_plaf_IconUIResource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-          class IconUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::IconUIResource : public ::java::lang::Object
-{
-
-public:
-  IconUIResource(::javax::swing::Icon *);
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-public: // actually package-private
-  static const jlong serialVersionUID = 3327049506004830542LL;
-private:
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_IconUIResource__
diff --git a/libjava/javax/swing/plaf/InputMapUIResource.h b/libjava/javax/swing/plaf/InputMapUIResource.h
deleted file mode 100644
index 448fc817ee2..00000000000
--- a/libjava/javax/swing/plaf/InputMapUIResource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_InputMapUIResource__
-#define __javax_swing_plaf_InputMapUIResource__
-
-#pragma interface
-
-#include <javax/swing/InputMap.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class InputMapUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::InputMapUIResource : public ::javax::swing::InputMap
-{
-
-public:
-  InputMapUIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_InputMapUIResource__
diff --git a/libjava/javax/swing/plaf/InsetsUIResource.h b/libjava/javax/swing/plaf/InsetsUIResource.h
deleted file mode 100644
index f9621375d95..00000000000
--- a/libjava/javax/swing/plaf/InsetsUIResource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_InsetsUIResource__
-#define __javax_swing_plaf_InsetsUIResource__
-
-#pragma interface
-
-#include <java/awt/Insets.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class InsetsUIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::InsetsUIResource : public ::java::awt::Insets
-{
-
-public:
-  InsetsUIResource(jint, jint, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = 5622110143266315421LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_InsetsUIResource__
diff --git a/libjava/javax/swing/plaf/InternalFrameUI.h b/libjava/javax/swing/plaf/InternalFrameUI.h
deleted file mode 100644
index 1aa4f76afd9..00000000000
--- a/libjava/javax/swing/plaf/InternalFrameUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_InternalFrameUI__
-#define __javax_swing_plaf_InternalFrameUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class InternalFrameUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::InternalFrameUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  InternalFrameUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_InternalFrameUI__
diff --git a/libjava/javax/swing/plaf/LabelUI.h b/libjava/javax/swing/plaf/LabelUI.h
deleted file mode 100644
index 018087af033..00000000000
--- a/libjava/javax/swing/plaf/LabelUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_LabelUI__
-#define __javax_swing_plaf_LabelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class LabelUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::LabelUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  LabelUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_LabelUI__
diff --git a/libjava/javax/swing/plaf/ListUI.h b/libjava/javax/swing/plaf/ListUI.h
deleted file mode 100644
index 241768f021b..00000000000
--- a/libjava/javax/swing/plaf/ListUI.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ListUI__
-#define __javax_swing_plaf_ListUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace plaf
-      {
-          class ListUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ListUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ListUI();
-  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *) = 0;
-  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint) = 0;
-  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ListUI__
diff --git a/libjava/javax/swing/plaf/MenuBarUI.h b/libjava/javax/swing/plaf/MenuBarUI.h
deleted file mode 100644
index cf2aba65494..00000000000
--- a/libjava/javax/swing/plaf/MenuBarUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_MenuBarUI__
-#define __javax_swing_plaf_MenuBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class MenuBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::MenuBarUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  MenuBarUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_MenuBarUI__
diff --git a/libjava/javax/swing/plaf/MenuItemUI.h b/libjava/javax/swing/plaf/MenuItemUI.h
deleted file mode 100644
index 9f4692bd89f..00000000000
--- a/libjava/javax/swing/plaf/MenuItemUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_MenuItemUI__
-#define __javax_swing_plaf_MenuItemUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ButtonUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class MenuItemUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::MenuItemUI : public ::javax::swing::plaf::ButtonUI
-{
-
-public:
-  MenuItemUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_MenuItemUI__
diff --git a/libjava/javax/swing/plaf/OptionPaneUI.h b/libjava/javax/swing/plaf/OptionPaneUI.h
deleted file mode 100644
index 1dbd6b8c896..00000000000
--- a/libjava/javax/swing/plaf/OptionPaneUI.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_OptionPaneUI__
-#define __javax_swing_plaf_OptionPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JOptionPane;
-      namespace plaf
-      {
-          class OptionPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::OptionPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  OptionPaneUI();
-  virtual void selectInitialValue(::javax::swing::JOptionPane *) = 0;
-  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_OptionPaneUI__
diff --git a/libjava/javax/swing/plaf/PanelUI.h b/libjava/javax/swing/plaf/PanelUI.h
deleted file mode 100644
index 9b962235b9f..00000000000
--- a/libjava/javax/swing/plaf/PanelUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_PanelUI__
-#define __javax_swing_plaf_PanelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class PanelUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::PanelUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  PanelUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_PanelUI__
diff --git a/libjava/javax/swing/plaf/PopupMenuUI.h b/libjava/javax/swing/plaf/PopupMenuUI.h
deleted file mode 100644
index 16aa6b5a1d7..00000000000
--- a/libjava/javax/swing/plaf/PopupMenuUI.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_PopupMenuUI__
-#define __javax_swing_plaf_PopupMenuUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class Popup;
-      namespace plaf
-      {
-          class PopupMenuUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::PopupMenuUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  PopupMenuUI();
-  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
-  virtual ::javax::swing::Popup * getPopup(::javax::swing::JPopupMenu *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_PopupMenuUI__
diff --git a/libjava/javax/swing/plaf/ProgressBarUI.h b/libjava/javax/swing/plaf/ProgressBarUI.h
deleted file mode 100644
index d9e6714acc8..00000000000
--- a/libjava/javax/swing/plaf/ProgressBarUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ProgressBarUI__
-#define __javax_swing_plaf_ProgressBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ProgressBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ProgressBarUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ProgressBarUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ProgressBarUI__
diff --git a/libjava/javax/swing/plaf/RootPaneUI.h b/libjava/javax/swing/plaf/RootPaneUI.h
deleted file mode 100644
index 3e82895d7c2..00000000000
--- a/libjava/javax/swing/plaf/RootPaneUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_RootPaneUI__
-#define __javax_swing_plaf_RootPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class RootPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::RootPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  RootPaneUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_RootPaneUI__
diff --git a/libjava/javax/swing/plaf/ScrollBarUI.h b/libjava/javax/swing/plaf/ScrollBarUI.h
deleted file mode 100644
index 24854eff2aa..00000000000
--- a/libjava/javax/swing/plaf/ScrollBarUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ScrollBarUI__
-#define __javax_swing_plaf_ScrollBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ScrollBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ScrollBarUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ScrollBarUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ScrollBarUI__
diff --git a/libjava/javax/swing/plaf/ScrollPaneUI.h b/libjava/javax/swing/plaf/ScrollPaneUI.h
deleted file mode 100644
index 7253175358d..00000000000
--- a/libjava/javax/swing/plaf/ScrollPaneUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ScrollPaneUI__
-#define __javax_swing_plaf_ScrollPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ScrollPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ScrollPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ScrollPaneUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/SeparatorUI.h b/libjava/javax/swing/plaf/SeparatorUI.h
deleted file mode 100644
index c968d73cc55..00000000000
--- a/libjava/javax/swing/plaf/SeparatorUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_SeparatorUI__
-#define __javax_swing_plaf_SeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class SeparatorUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::SeparatorUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  SeparatorUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_SeparatorUI__
diff --git a/libjava/javax/swing/plaf/SliderUI.h b/libjava/javax/swing/plaf/SliderUI.h
deleted file mode 100644
index bc18a5f739f..00000000000
--- a/libjava/javax/swing/plaf/SliderUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_SliderUI__
-#define __javax_swing_plaf_SliderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class SliderUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::SliderUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  SliderUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_SliderUI__
diff --git a/libjava/javax/swing/plaf/SpinnerUI.h b/libjava/javax/swing/plaf/SpinnerUI.h
deleted file mode 100644
index c20f12d9216..00000000000
--- a/libjava/javax/swing/plaf/SpinnerUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_SpinnerUI__
-#define __javax_swing_plaf_SpinnerUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class SpinnerUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::SpinnerUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  SpinnerUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_SpinnerUI__
diff --git a/libjava/javax/swing/plaf/SplitPaneUI.h b/libjava/javax/swing/plaf/SplitPaneUI.h
deleted file mode 100644
index 31c1ec1699c..00000000000
--- a/libjava/javax/swing/plaf/SplitPaneUI.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_SplitPaneUI__
-#define __javax_swing_plaf_SplitPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSplitPane;
-      namespace plaf
-      {
-          class SplitPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::SplitPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  SplitPaneUI();
-  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *) = 0;
-  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint) = 0;
-  virtual jint getDividerLocation(::javax::swing::JSplitPane *) = 0;
-  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *) = 0;
-  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *) = 0;
-  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_SplitPaneUI__
diff --git a/libjava/javax/swing/plaf/TabbedPaneUI.h b/libjava/javax/swing/plaf/TabbedPaneUI.h
deleted file mode 100644
index 725554a386e..00000000000
--- a/libjava/javax/swing/plaf/TabbedPaneUI.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_TabbedPaneUI__
-#define __javax_swing_plaf_TabbedPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTabbedPane;
-      namespace plaf
-      {
-          class TabbedPaneUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::TabbedPaneUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  TabbedPaneUI();
-  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint) = 0;
-  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint) = 0;
-  virtual jint getTabRunCount(::javax::swing::JTabbedPane *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_TabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/TableHeaderUI.h b/libjava/javax/swing/plaf/TableHeaderUI.h
deleted file mode 100644
index cc0c5c8f383..00000000000
--- a/libjava/javax/swing/plaf/TableHeaderUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_TableHeaderUI__
-#define __javax_swing_plaf_TableHeaderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class TableHeaderUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::TableHeaderUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  TableHeaderUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_TableHeaderUI__
diff --git a/libjava/javax/swing/plaf/TableUI.h b/libjava/javax/swing/plaf/TableUI.h
deleted file mode 100644
index 5e8c51d777b..00000000000
--- a/libjava/javax/swing/plaf/TableUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_TableUI__
-#define __javax_swing_plaf_TableUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class TableUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::TableUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  TableUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_TableUI__
diff --git a/libjava/javax/swing/plaf/TextUI.h b/libjava/javax/swing/plaf/TextUI.h
deleted file mode 100644
index 1c4faf66d82..00000000000
--- a/libjava/javax/swing/plaf/TextUI.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_TextUI__
-#define __javax_swing_plaf_TextUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class TextUI;
-      }
-      namespace text
-      {
-          class EditorKit;
-          class JTextComponent;
-          class Position$Bias;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::TextUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  TextUI();
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint) = 0;
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *) = 0;
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *) = 0;
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
-  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint) = 0;
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *) = 0;
-  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *) = 0;
-  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *) = 0;
-  virtual ::java::lang::String * getToolTipText(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_TextUI__
diff --git a/libjava/javax/swing/plaf/ToolBarUI.h b/libjava/javax/swing/plaf/ToolBarUI.h
deleted file mode 100644
index 79600b2a9fd..00000000000
--- a/libjava/javax/swing/plaf/ToolBarUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ToolBarUI__
-#define __javax_swing_plaf_ToolBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ToolBarUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ToolBarUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ToolBarUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ToolBarUI__
diff --git a/libjava/javax/swing/plaf/ToolTipUI.h b/libjava/javax/swing/plaf/ToolTipUI.h
deleted file mode 100644
index 2c061abb8b3..00000000000
--- a/libjava/javax/swing/plaf/ToolTipUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ToolTipUI__
-#define __javax_swing_plaf_ToolTipUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ToolTipUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ToolTipUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ToolTipUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ToolTipUI__
diff --git a/libjava/javax/swing/plaf/TreeUI.h b/libjava/javax/swing/plaf/TreeUI.h
deleted file mode 100644
index 69bbc1215d8..00000000000
--- a/libjava/javax/swing/plaf/TreeUI.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_TreeUI__
-#define __javax_swing_plaf_TreeUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree;
-      namespace plaf
-      {
-          class TreeUI;
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::TreeUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  TreeUI();
-  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
-  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint) = 0;
-  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
-  virtual jint getRowCount(::javax::swing::JTree *) = 0;
-  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint) = 0;
-  virtual jboolean isEditing(::javax::swing::JTree *) = 0;
-  virtual jboolean stopEditing(::javax::swing::JTree *) = 0;
-  virtual void cancelEditing(::javax::swing::JTree *) = 0;
-  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *) = 0;
-  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_TreeUI__
diff --git a/libjava/javax/swing/plaf/UIResource.h b/libjava/javax/swing/plaf/UIResource.h
deleted file mode 100644
index 0ddd789264d..00000000000
--- a/libjava/javax/swing/plaf/UIResource.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_UIResource__
-#define __javax_swing_plaf_UIResource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class UIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::UIResource : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_plaf_UIResource__
diff --git a/libjava/javax/swing/plaf/ViewportUI.h b/libjava/javax/swing/plaf/ViewportUI.h
deleted file mode 100644
index 64855b17a9a..00000000000
--- a/libjava/javax/swing/plaf/ViewportUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_ViewportUI__
-#define __javax_swing_plaf_ViewportUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComponentUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ViewportUI;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::ViewportUI : public ::javax::swing::plaf::ComponentUI
-{
-
-public:
-  ViewportUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_ViewportUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicArrowButton.h b/libjava/javax/swing/plaf/basic/BasicArrowButton.h
deleted file mode 100644
index 033f499aaf8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicArrowButton.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicArrowButton__
-#define __javax_swing_plaf_basic_BasicArrowButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicArrowButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicArrowButton : public ::javax::swing::JButton
-{
-
-public:
-  BasicArrowButton(jint);
-  BasicArrowButton(jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual jboolean isFocusTraversable();
-  virtual jint getDirection();
-  virtual void setDirection(jint);
-  virtual void paint(::java::awt::Graphics *);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual void paintTriangle(::java::awt::Graphics *, jint, jint, jint, jint, jboolean);
-private:
-  void paintTriangleNorth(::java::awt::Graphics *, jint, jint, jint, jboolean);
-  void paintTriangleSouth(::java::awt::Graphics *, jint, jint, jint, jboolean);
-  void paintTriangleEast(::java::awt::Graphics *, jint, jint, jint, jboolean);
-  void paintTriangleWest(::java::awt::Graphics *, jint, jint, jint, jboolean);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) direction;
-public: // actually package-private
-  ::java::awt::Color * shadow;
-  ::java::awt::Color * darkShadow;
-  ::java::awt::Color * highlight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicArrowButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h
deleted file mode 100644
index b4a2c915729..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$ButtonBorder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
-#define __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$ButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$ButtonBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  BasicBorders$ButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = -157053874580739687LL;
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
-  ::java::awt::Color * darkShadow;
-  ::java::awt::Color * highlight;
-  ::java::awt::Color * lightHighlight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$ButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h
deleted file mode 100644
index 455b711c0ce..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$FieldBorder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$FieldBorder__
-#define __javax_swing_plaf_basic_BasicBorders$FieldBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$FieldBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$FieldBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  BasicBorders$FieldBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = 949220756998454908LL;
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
-  ::java::awt::Color * darkShadow;
-  ::java::awt::Color * highlight;
-  ::java::awt::Color * lightHighlight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$FieldBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h
deleted file mode 100644
index a974a460a8d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$MarginBorder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$MarginBorder__
-#define __javax_swing_plaf_basic_BasicBorders$MarginBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$MarginBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$MarginBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  BasicBorders$MarginBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = -3035848353448896090LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$MarginBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h
deleted file mode 100644
index fcf26ba5918..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$MenuBarBorder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
-#define __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$MenuBarBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$MenuBarBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  BasicBorders$MenuBarBorder(::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = -6909056571935227506LL;
-private:
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) shadow;
-  ::java::awt::Color * highlight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$MenuBarBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h
deleted file mode 100644
index b737890ede1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$RadioButtonBorder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
-#define __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$RadioButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$RadioButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
-{
-
-public:
-  BasicBorders$RadioButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = 1596945751743747369LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$RadioButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h
deleted file mode 100644
index 84d6ee07631..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$RolloverButtonBorder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
-#define __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$RolloverButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$RolloverButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
-{
-
-public:
-  BasicBorders$RolloverButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually package-private
-  static const jlong serialVersionUID = 1976364864896996846LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$RolloverButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h
deleted file mode 100644
index 3a7d22f30aa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneBorder.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
-#define __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$SplitPaneBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$SplitPaneBorder : public ::java::lang::Object
-{
-
-public:
-  BasicBorders$SplitPaneBorder(::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  void paintRect(::java::awt::Graphics *, jint, jboolean, jint, jint, ::java::awt::Rectangle *);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-private:
-  static const jint SUPPRESS_TOP = 1;
-  static const jint SUPPRESS_LEFT = 2;
-  static const jint SUPPRESS_BOTTOM = 4;
-  static const jint SUPPRESS_RIGHT = 8;
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::lang::Object)))) highlight;
-  ::java::awt::Color * shadow;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$SplitPaneBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h
deleted file mode 100644
index 90a89464be5..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
-#define __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSplitPane;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$SplitPaneDividerBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$SplitPaneDividerBorder : public ::java::lang::Object
-{
-
-public:
-  BasicBorders$SplitPaneDividerBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-private:
-  ::javax::swing::JSplitPane * getSplitPane(::java::awt::Component *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$SplitPaneDividerBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h b/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h
deleted file mode 100644
index 73d1f1c4e67..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders$ToggleButtonBorder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
-#define __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicBorders$ButtonBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$ToggleButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders$ToggleButtonBorder : public ::javax::swing::plaf::basic::BasicBorders$ButtonBorder
-{
-
-public:
-  BasicBorders$ToggleButtonBorder(::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually package-private
-  static const jlong serialVersionUID = -3528666548001058394LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders$ToggleButtonBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders.h b/libjava/javax/swing/plaf/basic/BasicBorders.h
deleted file mode 100644
index e32e2b266c3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicBorders.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicBorders__
-#define __javax_swing_plaf_basic_BasicBorders__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders;
-            class BasicBorders$MarginBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicBorders : public ::java::lang::Object
-{
-
-public:
-  BasicBorders();
-  static ::javax::swing::border::Border * getButtonBorder();
-  static ::javax::swing::border::Border * getRadioButtonBorder();
-  static ::javax::swing::border::Border * getToggleButtonBorder();
-  static ::javax::swing::border::Border * getMenuBarBorder();
-  static ::javax::swing::border::Border * getSplitPaneBorder();
-  static ::javax::swing::border::Border * getSplitPaneDividerBorder();
-  static ::javax::swing::border::Border * getTextFieldBorder();
-  static ::javax::swing::border::Border * getProgressBarBorder();
-  static ::javax::swing::border::Border * getInternalFrameBorder();
-public: // actually package-private
-  static ::javax::swing::border::Border * getMarginBorder();
-private:
-  static ::javax::swing::plaf::basic::BasicBorders$MarginBorder * sharedMarginBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicBorders__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h
deleted file mode 100644
index ae787f71f62..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicButtonListener$1__
-#define __javax_swing_plaf_basic_BasicButtonListener$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicButtonListener;
-            class BasicButtonListener$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicButtonListener$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicButtonListener$1(::javax::swing::plaf::basic::BasicButtonListener *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicButtonListener$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h
deleted file mode 100644
index 9605bfcccdc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicButtonListener$2__
-#define __javax_swing_plaf_basic_BasicButtonListener$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicButtonListener;
-            class BasicButtonListener$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicButtonListener$2 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicButtonListener$2(::javax::swing::plaf::basic::BasicButtonListener *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicButtonListener$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h b/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h
deleted file mode 100644
index 6e08aa431f0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener$ButtonAction.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
-#define __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicButtonListener;
-            class BasicButtonListener$ButtonAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicButtonListener$ButtonAction : public ::javax::swing::AbstractAction
-{
-
-  BasicButtonListener$ButtonAction(::javax::swing::plaf::basic::BasicButtonListener *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled(::java::lang::Object *);
-public: // actually package-private
-  BasicButtonListener$ButtonAction(::javax::swing::plaf::basic::BasicButtonListener *, ::javax::swing::plaf::basic::BasicButtonListener$ButtonAction *);
-  static ::java::lang::String * PRESSED;
-  static ::java::lang::String * RELEASED;
-  ::javax::swing::plaf::basic::BasicButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicButtonListener$ButtonAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener.h b/libjava/javax/swing/plaf/basic/BasicButtonListener.h
deleted file mode 100644
index 8b7cd51d2eb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonListener.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicButtonListener__
-#define __javax_swing_plaf_basic_BasicButtonListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-          class MouseEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class ActionMap;
-        class JComponent;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicButtonListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicButtonListener : public ::java::lang::Object
-{
-
-public:
-  BasicButtonListener(::javax::swing::AbstractButton *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually protected
-  virtual void checkOpacity(::javax::swing::AbstractButton *);
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-  virtual void installKeyboardActions(::javax::swing::JComponent *);
-private:
-  ::javax::swing::ActionMap * createDefaultActionMap();
-public:
-  virtual void uninstallKeyboardActions(::javax::swing::JComponent *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  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 *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicButtonListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.h b/libjava/javax/swing/plaf/basic/BasicButtonUI.h
deleted file mode 100644
index c7209c0a312..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicButtonUI.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicButtonUI__
-#define __javax_swing_plaf_basic_BasicButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class Icon;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicButtonListener;
-            class BasicButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicButtonUI : public ::javax::swing::plaf::ButtonUI
-{
-
-public:
-  BasicButtonUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual jint getDefaultTextIconGap(::javax::swing::AbstractButton *);
-public: // actually protected
-  virtual void clearTextShiftOffset();
-  virtual jint getTextShiftOffset();
-  virtual void setTextShiftOffset();
-  virtual ::java::lang::String * getPropertyPrefix();
-  virtual void installDefaults(::javax::swing::AbstractButton *);
-  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
-  virtual ::javax::swing::plaf::basic::BasicButtonListener * createButtonListener(::javax::swing::AbstractButton *);
-  virtual void installListeners(::javax::swing::AbstractButton *);
-  virtual void uninstallListeners(::javax::swing::AbstractButton *);
-  virtual void installKeyboardActions(::javax::swing::AbstractButton *);
-  virtual void uninstallKeyboardActions(::javax::swing::AbstractButton *);
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually package-private
-  static ::javax::swing::Icon * currentIcon(::javax::swing::AbstractButton *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  virtual void paintIcon(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
-  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
-  virtual void paintText(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::lang::String *);
-private:
-  ::javax::swing::plaf::basic::BasicButtonListener * getButtonListener(::javax::swing::AbstractButton *);
-public: // actually package-private
-  static ::java::awt::Rectangle * viewR;
-  static ::java::awt::Rectangle * iconR;
-  static ::java::awt::Rectangle * textR;
-  static ::java::awt::Insets * cachedInsets;
-private:
-  static ::javax::swing::plaf::basic::BasicButtonUI * sharedUI;
-  static ::javax::swing::plaf::basic::BasicButtonListener * sharedListener;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::ButtonUI)))) defaultTextIconGap;
-  jint defaultTextShiftOffset;
-private:
-  jint textShiftOffset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h
deleted file mode 100644
index 68f69f589a7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
-#define __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JMenuItem;
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicCheckBoxMenuItemUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicCheckBoxMenuItemUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
-{
-
-public:
-  BasicCheckBoxMenuItemUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual void processMouseEvent(::javax::swing::JMenuItem *, ::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicCheckBoxMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h b/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h
deleted file mode 100644
index ca6b44b3c9f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicCheckBoxUI__
-#define __javax_swing_plaf_basic_BasicCheckBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicRadioButtonUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicCheckBoxUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicCheckBoxUI : public ::javax::swing::plaf::basic::BasicRadioButtonUI
-{
-
-public:
-  BasicCheckBoxUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::lang::String * getPropertyPrefix();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicCheckBoxUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h
deleted file mode 100644
index b5b58f51b5c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$1__
-#define __javax_swing_plaf_basic_BasicColorChooserUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicColorChooserUI;
-            class BasicColorChooserUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicColorChooserUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicColorChooserUI$1(::javax::swing::plaf::basic::BasicColorChooserUI *);
-public:
-  void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicColorChooserUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h
deleted file mode 100644
index a7c3a279a08..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PreviewListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
-#define __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicColorChooserUI;
-            class BasicColorChooserUI$PreviewListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicColorChooserUI$PreviewListener : public ::java::lang::Object
-{
-
-  BasicColorChooserUI$PreviewListener(::javax::swing::plaf::basic::BasicColorChooserUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  BasicColorChooserUI$PreviewListener(::javax::swing::plaf::basic::BasicColorChooserUI *, ::javax::swing::plaf::basic::BasicColorChooserUI$PreviewListener *);
-  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicColorChooserUI$PreviewListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h
deleted file mode 100644
index ed5743feb8d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$PropertyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
-#define __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicColorChooserUI;
-            class BasicColorChooserUI$PropertyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicColorChooserUI$PropertyHandler : public ::java::lang::Object
-{
-
-public:
-  BasicColorChooserUI$PropertyHandler(::javax::swing::plaf::basic::BasicColorChooserUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicColorChooserUI$PropertyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h
deleted file mode 100644
index 3ca157fe9d9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI$TabPaneListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
-#define __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicColorChooserUI;
-            class BasicColorChooserUI$TabPaneListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicColorChooserUI$TabPaneListener : public ::java::lang::Object
-{
-
-  BasicColorChooserUI$TabPaneListener(::javax::swing::plaf::basic::BasicColorChooserUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  BasicColorChooserUI$TabPaneListener(::javax::swing::plaf::basic::BasicColorChooserUI *, ::javax::swing::plaf::basic::BasicColorChooserUI$TabPaneListener *);
-  ::javax::swing::plaf::basic::BasicColorChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicColorChooserUI$TabPaneListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h b/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h
deleted file mode 100644
index 83a41b05d81..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicColorChooserUI.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicColorChooserUI__
-#define __javax_swing_plaf_basic_BasicColorChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ColorChooserUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JColorChooser;
-        class JComponent;
-        class JTabbedPane;
-      namespace colorchooser
-      {
-          class AbstractColorChooserPanel;
-      }
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicColorChooserUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicColorChooserUI : public ::javax::swing::plaf::ColorChooserUI
-{
-
-public:
-  BasicColorChooserUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * createDefaultChoosers();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually package-private
-  virtual void makeTabs(JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > *);
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaultChoosers();
-  virtual void installPreviewPanel();
-public: // actually package-private
-  virtual void updatePreviewPanel(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void installListeners();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual void uninstallListeners();
-  JArray< ::javax::swing::colorchooser::AbstractColorChooserPanel * > * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ColorChooserUI)))) defaultChoosers;
-  ::javax::swing::event::ChangeListener * previewListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::JColorChooser * chooser;
-public: // actually package-private
-  ::javax::swing::JTabbedPane * pane;
-private:
-  ::java::awt::Container * prevContainer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicColorChooserUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h
deleted file mode 100644
index 36a4682b0ac..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor$UIResource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
-#define __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxEditor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxEditor$UIResource;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxEditor$UIResource : public ::javax::swing::plaf::basic::BasicComboBoxEditor
-{
-
-public:
-  BasicComboBoxEditor$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxEditor$UIResource__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h
deleted file mode 100644
index 5bde099f2ba..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxEditor__
-#define __javax_swing_plaf_basic_BasicComboBoxEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class ActionListener;
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTextField;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxEditor;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxEditor : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxEditor();
-  virtual ::java::awt::Component * getEditorComponent();
-  virtual void setItem(::java::lang::Object *);
-  virtual ::java::lang::Object * getItem();
-  virtual void selectAll();
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-  virtual void addActionListener(::java::awt::event::ActionListener *);
-  virtual void removeActionListener(::java::awt::event::ActionListener *);
-public: // actually protected
-  ::javax::swing::JTextField * __attribute__((aligned(__alignof__( ::java::lang::Object)))) editor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxEditor__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h
deleted file mode 100644
index 76eaa5c09f7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
-#define __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxRenderer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxRenderer$UIResource;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxRenderer$UIResource : public ::javax::swing::plaf::basic::BasicComboBoxRenderer
-{
-
-public:
-  BasicComboBoxRenderer$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxRenderer$UIResource__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h
deleted file mode 100644
index 746cf3ce132..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxRenderer__
-#define __javax_swing_plaf_basic_BasicComboBoxRenderer__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxRenderer;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxRenderer : public ::javax::swing::JLabel
-{
-
-public:
-  BasicComboBoxRenderer();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
-public: // actually protected
-  static ::javax::swing::border::Border * noFocusBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h
deleted file mode 100644
index e907fe231e4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$ComboBoxLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxUI$ComboBoxLayoutManager(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ComboBoxLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h
deleted file mode 100644
index e5f84c171c8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$FocusHandler : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxUI$FocusHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h
deleted file mode 100644
index e07a4649409..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ItemHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$ItemHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$ItemHandler : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxUI$ItemHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h
deleted file mode 100644
index b2657b802cb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$KeyHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
-
-#pragma interface
-
-#include <java/awt/event/KeyAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$KeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$KeyHandler : public ::java::awt::event::KeyAdapter
-{
-
-public:
-  BasicComboBoxUI$KeyHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void keyPressed(::java::awt::event::KeyEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h
deleted file mode 100644
index 8647c7fd412..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$ListDataHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListDataEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$ListDataHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$ListDataHandler : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxUI$ListDataHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h
deleted file mode 100644
index 987d5406e2b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class BasicComboBoxUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicComboBoxUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicComboBoxUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboBoxUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h b/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h
deleted file mode 100644
index 77f1f53d41c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI.h
+++ /dev/null
@@ -1,154 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboBoxUI__
-#define __javax_swing_plaf_basic_BasicComboBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComboBoxUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class LayoutManager;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-          class ItemListener;
-          class KeyListener;
-          class MouseListener;
-          class MouseMotionListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class CellRendererPane;
-        class ComboBoxEditor;
-        class JButton;
-        class JComboBox;
-        class JComponent;
-        class JList;
-        class ListCellRenderer;
-      namespace event
-      {
-          class ListDataListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicComboBoxUI;
-            class ComboPopup;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboBoxUI : public ::javax::swing::plaf::ComboBoxUI
-{
-
-public:
-  BasicComboBoxUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installListeners();
-  virtual void uninstallDefaults();
-  virtual void uninstallListeners();
-  virtual ::javax::swing::plaf::basic::ComboPopup * createPopup();
-  virtual ::java::awt::event::KeyListener * createKeyListener();
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::javax::swing::event::ListDataListener * createListDataListener();
-  virtual ::java::awt::event::ItemListener * createItemListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual ::javax::swing::ListCellRenderer * createRenderer();
-  virtual ::javax::swing::ComboBoxEditor * createEditor();
-  virtual void installComponents();
-  virtual void uninstallComponents();
-public:
-  virtual void addEditor();
-  virtual void removeEditor();
-public: // actually protected
-  virtual void configureEditor();
-  virtual void unconfigureEditor();
-public:
-  virtual void configureArrowButton();
-  virtual void unconfigureArrowButton();
-public: // actually protected
-  virtual ::javax::swing::JButton * createArrowButton();
-public:
-  virtual jboolean isPopupVisible(::javax::swing::JComboBox *);
-  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean);
-  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  virtual jboolean isNavigationKey(jint);
-  virtual void selectNextPossibleValue();
-  virtual void selectPreviousPossibleValue();
-  virtual void toggleOpenClose();
-  virtual ::java::awt::Rectangle * rectangleForCurrentValue();
-  virtual ::java::awt::Insets * getInsets();
-public:
-  virtual void paintCurrentValue(::java::awt::Graphics *, ::java::awt::Rectangle *, jboolean);
-  virtual void paintCurrentValueBackground(::java::awt::Graphics *, ::java::awt::Rectangle *, jboolean);
-public: // actually protected
-  virtual ::java::awt::Dimension * getDefaultSize();
-  virtual ::java::awt::Dimension * getDisplaySize();
-  virtual void installKeyboardActions();
-  virtual void uninstallKeyboardActions();
-  ::javax::swing::JButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ComboBoxUI)))) arrowButton;
-  ::javax::swing::JComboBox * comboBox;
-  ::java::awt::Component * editor;
-  ::java::awt::event::FocusListener * focusListener;
-  jboolean hasFocus;
-  ::java::awt::event::ItemListener * itemListener;
-  ::java::awt::event::KeyListener * keyListener;
-  ::javax::swing::JList * listBox;
-  ::javax::swing::event::ListDataListener * listDataListener;
-  ::javax::swing::plaf::basic::ComboPopup * popup;
-  ::java::awt::event::KeyListener * popupKeyListener;
-  ::java::awt::event::MouseListener * popupMouseListener;
-  ::java::awt::event::MouseMotionListener * popupMouseMotionListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-public: // actually package-private
-  ::java::awt::Dimension * displaySize;
-public: // actually protected
-  ::javax::swing::CellRendererPane * currentValuePane;
-  ::java::awt::Dimension * cachedMinimumSize;
-  jboolean isMinimumSizeDirty;
-private:
-  static ::javax::swing::ListCellRenderer * DEFAULT_RENDERER;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboBoxUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h
deleted file mode 100644
index ecf7e1b8ef1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationKeyHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
-
-#pragma interface
-
-#include <java/awt/event/KeyAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$InvocationKeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$InvocationKeyHandler : public ::java::awt::event::KeyAdapter
-{
-
-public:
-  BasicComboPopup$InvocationKeyHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-  virtual void keyReleased(::java::awt::event::KeyEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h
deleted file mode 100644
index b04fb475d3a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$InvocationMouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$InvocationMouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  BasicComboPopup$InvocationMouseHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h
deleted file mode 100644
index b8c7bae477e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$InvocationMouseMotionHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseMotionAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$InvocationMouseMotionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$InvocationMouseMotionHandler : public ::java::awt::event::MouseMotionAdapter
-{
-
-public: // actually protected
-  BasicComboPopup$InvocationMouseMotionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseMotionAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$InvocationMouseMotionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h
deleted file mode 100644
index 017c66bce0c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ItemHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$ItemHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$ItemHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicComboPopup$ItemHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h
deleted file mode 100644
index d7924a453bc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListDataHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListDataEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$ListDataHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$ListDataHandler : public ::java::lang::Object
-{
-
-public:
-  BasicComboPopup$ListDataHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h
deleted file mode 100644
index 84b748854d3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$ListMouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$ListMouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  BasicComboPopup$ListMouseHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$ListMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h
deleted file mode 100644
index d772569baf4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListMouseMotionHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseMotionAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$ListMouseMotionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$ListMouseMotionHandler : public ::java::awt::event::MouseMotionAdapter
-{
-
-public: // actually protected
-  BasicComboPopup$ListMouseMotionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::awt::event::MouseMotionAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$ListMouseMotionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h
deleted file mode 100644
index dd3caad107f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$ListSelectionHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$ListSelectionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$ListSelectionHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicComboPopup$ListSelectionHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$ListSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h
deleted file mode 100644
index 5bff9aa4c19..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-            class BasicComboPopup$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicComboPopup$PropertyChangeHandler(::javax::swing::plaf::basic::BasicComboPopup *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicComboPopup * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup.h b/libjava/javax/swing/plaf/basic/BasicComboPopup.h
deleted file mode 100644
index 4c878caa61c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup.h
+++ /dev/null
@@ -1,135 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicComboPopup__
-#define __javax_swing_plaf_basic_BasicComboPopup__
-
-#pragma interface
-
-#include <javax/swing/JPopupMenu.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace event
-      {
-          class ItemListener;
-          class KeyListener;
-          class MouseEvent;
-          class MouseListener;
-          class MouseMotionListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxModel;
-        class JComboBox;
-        class JList;
-        class JScrollPane;
-        class Timer;
-      namespace event
-      {
-          class ListDataListener;
-          class ListSelectionListener;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicComboPopup;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicComboPopup : public ::javax::swing::JPopupMenu
-{
-
-public:
-  BasicComboPopup(::javax::swing::JComboBox *);
-  virtual void show();
-  virtual void hide();
-  virtual ::javax::swing::JList * getList();
-  virtual ::java::awt::event::MouseListener * getMouseListener();
-  virtual ::java::awt::event::MouseMotionListener * getMouseMotionListener();
-  virtual ::java::awt::event::KeyListener * getKeyListener();
-  virtual void uninstallingUI();
-public: // actually protected
-  virtual void uninstallComboBoxModelListeners(::javax::swing::ComboBoxModel *);
-  virtual void uninstallKeyboardActions();
-  virtual void firePopupMenuWillBecomeVisible();
-  virtual void firePopupMenuWillBecomeInvisible();
-  virtual void firePopupMenuCanceled();
-  virtual ::java::awt::event::MouseListener * createMouseListener();
-  virtual ::java::awt::event::MouseMotionListener * createMouseMotionListener();
-  virtual ::java::awt::event::KeyListener * createKeyListener();
-  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener();
-  virtual ::javax::swing::event::ListDataListener * createListDataListener();
-  virtual ::java::awt::event::MouseListener * createListMouseListener();
-  virtual ::java::awt::event::MouseMotionListener * createListMouseMotionListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::event::ItemListener * createItemListener();
-  virtual ::javax::swing::JList * createList();
-  virtual void configureList();
-  virtual void installListListeners();
-  virtual ::javax::swing::JScrollPane * createScroller();
-  virtual void configureScroller();
-  virtual void configurePopup();
-  virtual void installComboBoxListeners();
-  virtual void installComboBoxModelListeners(::javax::swing::ComboBoxModel *);
-  virtual void installKeyboardActions();
-public:
-  virtual jboolean isFocusTraversable();
-public: // actually protected
-  virtual void startAutoScrolling(jint);
-  virtual void stopAutoScrolling();
-  virtual void autoScrollUp();
-  virtual void autoScrollDown();
-  virtual void delegateFocus(::java::awt::event::MouseEvent *);
-  virtual void togglePopup();
-  virtual ::java::awt::event::MouseEvent * convertMouseEvent(::java::awt::event::MouseEvent *);
-  virtual jint getPopupHeightForRowCount(jint);
-  virtual ::java::awt::Rectangle * computePopupBounds(jint, jint, jint, jint);
-  virtual void updateListBoxSelectionForEvent(::java::awt::event::MouseEvent *, jboolean);
-private:
-  void uninstallListeners();
-  void uninstallListListeners();
-  void uninstallComboBoxListeners();
-public: // actually package-private
-  virtual void syncListSelection();
-public: // actually protected
-  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::javax::swing::JPopupMenu)))) autoscrollTimer;
-  ::javax::swing::JComboBox * comboBox;
-  jboolean hasEntered;
-  jboolean isAutoScrolling;
-  ::java::awt::event::ItemListener * itemListener;
-  ::java::awt::event::KeyListener * keyListener;
-  ::javax::swing::JList * list;
-  ::javax::swing::event::ListDataListener * listDataListener;
-  ::java::awt::event::MouseListener * listMouseListener;
-  ::java::awt::event::MouseMotionListener * listMouseMotionListener;
-  ::javax::swing::event::ListSelectionListener * listSelectionListener;
-  ::java::awt::event::MouseListener * mouseListener;
-  ::java::awt::event::MouseMotionListener * mouseMotionListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  static const jint SCROLL_DOWN = 1;
-  static const jint SCROLL_UP = 0;
-  jint scrollDirection;
-  ::javax::swing::JScrollPane * scroller;
-  jboolean valueIsAdjusting;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicComboPopup__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h
deleted file mode 100644
index 1f42bbcd33b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$1__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicDesktopIconUI$1(::javax::swing::plaf::basic::BasicDesktopIconUI *);
-public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h
deleted file mode 100644
index 97ffeb9dee3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$2__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicDesktopIconUI$2(::javax::swing::plaf::basic::BasicDesktopIconUI *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h
deleted file mode 100644
index 7a67871449f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$BoundButton.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$BoundButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$BoundButton : public ::javax::swing::JButton
-{
-
-public:
-  BasicDesktopIconUI$BoundButton(::javax::swing::plaf::basic::BasicDesktopIconUI *, ::java::lang::String *);
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$BoundButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h
deleted file mode 100644
index cfce73806cf..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$DesktopIconBorder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$DesktopIconBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$DesktopIconBorder : public ::java::lang::Object
-{
-
-  BasicDesktopIconUI$DesktopIconBorder(::javax::swing::plaf::basic::BasicDesktopIconUI *);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually package-private
-  BasicDesktopIconUI$DesktopIconBorder(::javax::swing::plaf::basic::BasicDesktopIconUI *, ::javax::swing::plaf::basic::BasicDesktopIconUI$DesktopIconBorder *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
-  jint top;
-  jint right;
-  jint bottom;
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$DesktopIconBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h
deleted file mode 100644
index 4a53e9a62c8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$InternalFrameDefaultMenuIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI$InternalFrameDefaultMenuIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$InternalFrameDefaultMenuIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicDesktopIconUI$InternalFrameDefaultMenuIcon();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$InternalFrameDefaultMenuIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h
deleted file mode 100644
index 0829e1ff9b4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI$MouseInputHandler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
-
-#pragma interface
-
-#include <javax/swing/event/MouseInputAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JDesktopPane;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI$MouseInputHandler : public ::javax::swing::event::MouseInputAdapter
-{
-
-public:
-  BasicDesktopIconUI$MouseInputHandler(::javax::swing::plaf::basic::BasicDesktopIconUI *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void moveAndRepaint(::javax::swing::JComponent *, jint, jint, jint, jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) xOffset;
-  jint yOffset;
-  ::javax::swing::JDesktopPane * pane;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h b/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h
deleted file mode 100644
index bafff1a0692..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopIconUI.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopIconUI__
-#define __javax_swing_plaf_basic_BasicDesktopIconUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/DesktopIconUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Insets;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class JInternalFrame;
-        class JInternalFrame$JDesktopIcon;
-      namespace event
-      {
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicDesktopIconUI;
-            class BasicDesktopIconUI$BoundButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopIconUI : public ::javax::swing::plaf::DesktopIconUI
-{
-
-public:
-  BasicDesktopIconUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installComponents();
-  virtual void uninstallComponents();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Insets * getInsets(::javax::swing::JComponent *);
-  virtual void deiconize();
-private:
-  static const jint iconSize = 16;
-  static const jint iconWidth = 160;
-  static const jint iconHeight = 35;
-public: // actually protected
-  ::javax::swing::JInternalFrame$JDesktopIcon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopIconUI)))) desktopIcon;
-  ::javax::swing::JInternalFrame * frame;
-private:
-  ::javax::swing::event::MouseInputListener * mouseHandler;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopIconUI$BoundButton * button;
-private:
-  ::java::beans::PropertyChangeListener * propertyHandler;
-public: // actually package-private
-  static ::javax::swing::Icon * defaultIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h
deleted file mode 100644
index da7e843ab7c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$CloseAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-            class BasicDesktopPaneUI$CloseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI$CloseAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicDesktopPaneUI$CloseAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$CloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h
deleted file mode 100644
index 2733cec79fa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MaximizeAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-            class BasicDesktopPaneUI$MaximizeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI$MaximizeAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicDesktopPaneUI$MaximizeAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h
deleted file mode 100644
index c834c71de9c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$MinimizeAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-            class BasicDesktopPaneUI$MinimizeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI$MinimizeAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicDesktopPaneUI$MinimizeAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$MinimizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h
deleted file mode 100644
index b327f1cb3d4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$NavigateAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-            class BasicDesktopPaneUI$NavigateAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI$NavigateAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicDesktopPaneUI$NavigateAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h
deleted file mode 100644
index 0fc733b6f15..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI$OpenAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-            class BasicDesktopPaneUI$OpenAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI$OpenAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicDesktopPaneUI$OpenAction(::javax::swing::plaf::basic::BasicDesktopPaneUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDesktopPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI$OpenAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h b/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h
deleted file mode 100644
index c67ca088d26..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDesktopPaneUI.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDesktopPaneUI__
-#define __javax_swing_plaf_basic_BasicDesktopPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/DesktopPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DesktopManager;
-        class JComponent;
-        class JDesktopPane;
-        class KeyStroke;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicDesktopPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDesktopPaneUI : public ::javax::swing::plaf::DesktopPaneUI
-{
-
-public:
-  BasicDesktopPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installDesktopManager();
-  virtual void installKeyboardActions();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void registerKeyboardActions();
-  virtual void uninstallDefaults();
-  virtual void uninstallDesktopManager();
-  virtual void uninstallKeyboardActions();
-  virtual void unregisterKeyboardActions();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  ::javax::swing::KeyStroke * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopPaneUI)))) closeKey;
-  ::javax::swing::KeyStroke * maximizeKey;
-  ::javax::swing::KeyStroke * minimizeKey;
-  ::javax::swing::KeyStroke * navigateKey;
-  ::javax::swing::KeyStroke * navigateKey2;
-  ::javax::swing::DesktopManager * desktopManager;
-  ::javax::swing::JDesktopPane * desktop;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h
deleted file mode 100644
index 4d14a6f25a2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$1__
-#define __javax_swing_plaf_basic_BasicDirectoryModel$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDirectoryModel;
-            class BasicDirectoryModel$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDirectoryModel$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicDirectoryModel$1(::javax::swing::plaf::basic::BasicDirectoryModel *);
-public:
-  jint compare(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDirectoryModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDirectoryModel$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h
deleted file mode 100644
index a5d2a719d3c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
-#define __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDirectoryModel$DirectoryLoadThread;
-            class BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread *, ::java::util::List *, jint, ::java::util::List *, jint);
-public:
-  virtual void run();
-public: // actually package-private
-  virtual void cancel();
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) added;
-  jint addIndex;
-  ::java::util::List * removed;
-  jint removeIndex;
-  jboolean cancel__;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h
deleted file mode 100644
index d20f830c24a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel$DirectoryLoadThread.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
-#define __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDirectoryModel;
-            class BasicDirectoryModel$DirectoryLoadThread;
-            class BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  BasicDirectoryModel$DirectoryLoadThread(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::io::File *);
-public:
-  virtual void run();
-private:
-  void invokeLater(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest *);
-public: // actually package-private
-  virtual void cancelPending();
-  static ::javax::swing::plaf::basic::BasicDirectoryModel * access$0(::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread *);
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) directory;
-private:
-  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread$UpdateSwingRequest * pending;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicDirectoryModel * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDirectoryModel$DirectoryLoadThread__
diff --git a/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h b/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h
deleted file mode 100644
index f13550f7100..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicDirectoryModel.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicDirectoryModel__
-#define __javax_swing_plaf_basic_BasicDirectoryModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-      namespace event
-      {
-          class ListDataEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicDirectoryModel;
-            class BasicDirectoryModel$DirectoryLoadThread;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicDirectoryModel : public ::javax::swing::AbstractListModel
-{
-
-public:
-  BasicDirectoryModel(::javax::swing::JFileChooser *);
-  virtual jboolean contains(::java::lang::Object *);
-  virtual void fireContentsChanged();
-  virtual ::java::util::Vector * getDirectories();
-  virtual ::java::lang::Object * getElementAt(jint);
-  virtual ::java::util::Vector * getFiles();
-  virtual jint getSize();
-  virtual jint indexOf(::java::lang::Object *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-  virtual void invalidateFileCache();
-public: // actually protected
-  virtual jboolean lt(::java::io::File *, ::java::io::File *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual jboolean renameFile(::java::io::File *, ::java::io::File *);
-public: // actually protected
-  virtual void sort(::java::util::Vector *);
-public:
-  virtual void validateFileCache();
-public: // actually package-private
-  static ::java::util::Vector * access$0(::javax::swing::plaf::basic::BasicDirectoryModel *);
-  static void access$1(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::util::Vector *);
-  static void access$2(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::util::Vector *);
-  static void access$3(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::lang::Object *, jint, jint);
-  static void access$4(::javax::swing::plaf::basic::BasicDirectoryModel *, ::java::lang::Object *, jint, jint);
-  static ::javax::swing::JFileChooser * access$5(::javax::swing::plaf::basic::BasicDirectoryModel *);
-private:
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) contents;
-  ::java::util::Vector * directories;
-  ::java::util::Vector * files;
-  jint listingMode;
-  ::javax::swing::JFileChooser * filechooser;
-  ::javax::swing::plaf::basic::BasicDirectoryModel$DirectoryLoadThread * loadThread;
-  ::java::util::Comparator * comparator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicDirectoryModel__
diff --git a/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h b/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h
deleted file mode 100644
index b0033edb185..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicEditorPaneUI__
-#define __javax_swing_plaf_basic_BasicEditorPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicEditorPaneUI;
-        }
-      }
-      namespace text
-      {
-          class EditorKit;
-          class JTextComponent;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicEditorPaneUI : public ::javax::swing::plaf::basic::BasicTextUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  BasicEditorPaneUI();
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicEditorPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h
deleted file mode 100644
index 72434cc649f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$AcceptAllFileFilter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
-
-#pragma interface
-
-#include <javax/swing/filechooser/FileFilter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$AcceptAllFileFilter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$AcceptAllFileFilter : public ::javax::swing::filechooser::FileFilter
-{
-
-public:
-  BasicFileChooserUI$AcceptAllFileFilter(::javax::swing::plaf::basic::BasicFileChooserUI *);
-  virtual jboolean accept(::java::io::File *);
-  virtual ::java::lang::String * getDescription();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::filechooser::FileFilter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$AcceptAllFileFilter__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h
deleted file mode 100644
index b650369befd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ApproveSelectionAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$ApproveSelectionAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$ApproveSelectionAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$ApproveSelectionAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$ApproveSelectionAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h
deleted file mode 100644
index dece5a2e955..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$BasicFileView.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
-
-#pragma interface
-
-#include <javax/swing/filechooser/FileView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$BasicFileView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$BasicFileView : public ::javax::swing::filechooser::FileView
-{
-
-public:
-  BasicFileChooserUI$BasicFileView(::javax::swing::plaf::basic::BasicFileChooserUI *);
-  virtual void cacheIcon(::java::io::File *, ::javax::swing::Icon *);
-  virtual void clearIconCache();
-  virtual ::javax::swing::Icon * getCachedIcon(::java::io::File *);
-  virtual ::java::lang::String * getDescription(::java::io::File *);
-  virtual ::javax::swing::Icon * getIcon(::java::io::File *);
-  virtual ::java::lang::String * getName(::java::io::File *);
-  virtual ::java::lang::String * getTypeDescription(::java::io::File *);
-  virtual ::java::lang::Boolean * isHidden(::java::io::File *);
-public: // actually protected
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::javax::swing::filechooser::FileView)))) iconCache;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$BasicFileView__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h
deleted file mode 100644
index 03af702d390..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$CancelSelectionAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$CancelSelectionAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$CancelSelectionAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$CancelSelectionAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$CancelSelectionAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h
deleted file mode 100644
index 75b99b56b03..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$ChangeToParentDirectoryAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$ChangeToParentDirectoryAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$ChangeToParentDirectoryAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$ChangeToParentDirectoryAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$ChangeToParentDirectoryAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h
deleted file mode 100644
index 79df9920515..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$DoubleClickListener.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$DoubleClickListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$DoubleClickListener : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  BasicFileChooserUI$DoubleClickListener(::javax::swing::plaf::basic::BasicFileChooserUI *, ::javax::swing::JList *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) lastSelected;
-  ::javax::swing::JList * list;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$DoubleClickListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h
deleted file mode 100644
index 219143eb5fb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$GoHomeAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$GoHomeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$GoHomeAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$GoHomeAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$GoHomeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h
deleted file mode 100644
index da249e43aae..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$NewFolderAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$NewFolderAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$NewFolderAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$NewFolderAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$NewFolderAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h
deleted file mode 100644
index af8c2d0ba6e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$SelectionListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$SelectionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$SelectionListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicFileChooserUI$SelectionListener(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$SelectionListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h
deleted file mode 100644
index a3db6b1345b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI$UpdateAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
-#define __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$UpdateAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI$UpdateAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  BasicFileChooserUI$UpdateAction(::javax::swing::plaf::basic::BasicFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI$UpdateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h b/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h
deleted file mode 100644
index 8565a6757b1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFileChooserUI.h
+++ /dev/null
@@ -1,187 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFileChooserUI__
-#define __javax_swing_plaf_basic_BasicFileChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/FileChooserUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JButton;
-        class JComponent;
-        class JFileChooser;
-        class JList;
-        class JPanel;
-        class JTextField;
-      namespace event
-      {
-          class ListSelectionListener;
-      }
-      namespace filechooser
-      {
-          class FileFilter;
-          class FileView;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicDirectoryModel;
-            class BasicFileChooserUI;
-            class BasicFileChooserUI$ApproveSelectionAction;
-            class BasicFileChooserUI$CancelSelectionAction;
-            class BasicFileChooserUI$ChangeToParentDirectoryAction;
-            class BasicFileChooserUI$GoHomeAction;
-            class BasicFileChooserUI$NewFolderAction;
-            class BasicFileChooserUI$UpdateAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFileChooserUI : public ::javax::swing::plaf::FileChooserUI
-{
-
-public: // actually package-private
-  virtual void closeDialog();
-public:
-  BasicFileChooserUI(::javax::swing::JFileChooser *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually package-private
-  virtual void boxEntries();
-public:
-  virtual void installComponents(::javax::swing::JFileChooser *);
-  virtual void uninstallComponents(::javax::swing::JFileChooser *);
-public: // actually protected
-  virtual void installListeners(::javax::swing::JFileChooser *);
-  virtual void uninstallListeners(::javax::swing::JFileChooser *);
-  virtual void installDefaults(::javax::swing::JFileChooser *);
-  virtual void uninstallDefaults(::javax::swing::JFileChooser *);
-  virtual void installIcons(::javax::swing::JFileChooser *);
-  virtual void uninstallIcons(::javax::swing::JFileChooser *);
-  virtual void installStrings(::javax::swing::JFileChooser *);
-  virtual void uninstallStrings(::javax::swing::JFileChooser *);
-  virtual void createModel();
-public:
-  virtual ::javax::swing::plaf::basic::BasicDirectoryModel * getModel();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getFileName();
-  virtual ::java::lang::String * getDirectoryName();
-  virtual void setFileName(::java::lang::String *);
-  virtual void setDirectoryName(::java::lang::String *);
-  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
-  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *);
-  virtual ::javax::swing::JFileChooser * getFileChooser();
-  virtual ::javax::swing::JPanel * getAccessoryPanel();
-public: // actually protected
-  virtual ::javax::swing::JButton * getApproveButton(::javax::swing::JFileChooser *);
-public:
-  virtual ::java::lang::String * getApproveButtonToolTipText(::javax::swing::JFileChooser *);
-  virtual void clearIconCache();
-  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener(::javax::swing::JFileChooser *);
-public: // actually protected
-  virtual ::java::awt::event::MouseListener * createDoubleClickListener(::javax::swing::JFileChooser *, ::javax::swing::JList *);
-  virtual jboolean isDirectorySelected();
-  virtual void setDirectorySelected(jboolean);
-  virtual ::java::io::File * getDirectory();
-  virtual void setDirectory(::java::io::File *);
-public:
-  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *);
-  virtual jint getApproveButtonMnemonic(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::Action * getNewFolderAction();
-  virtual ::javax::swing::Action * getGoHomeAction();
-  virtual ::javax::swing::Action * getChangeToParentDirectoryAction();
-  virtual ::javax::swing::Action * getApproveSelectionAction();
-  virtual ::javax::swing::Action * getCancelSelectionAction();
-  virtual ::javax::swing::Action * getUpdateAction();
-public: // actually package-private
-  static ::java::io::File * access$0(::javax::swing::plaf::basic::BasicFileChooserUI *);
-  static void access$1(::javax::swing::plaf::basic::BasicFileChooserUI *, ::java::io::File *);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::FileChooserUI)))) cancelButtonMnemonic;
-  ::java::lang::String * cancelButtonText;
-  ::java::lang::String * cancelButtonToolTipText;
-  ::javax::swing::Icon * computerIcon;
-  ::javax::swing::Icon * detailsViewIcon;
-  ::javax::swing::Icon * directoryIcon;
-  jint directoryOpenButtonMnemonic;
-  ::java::lang::String * directoryOpenButtonText;
-  ::java::lang::String * directoryOpenButtonToolTipText;
-  ::javax::swing::Icon * fileIcon;
-  ::javax::swing::Icon * floppyDriveIcon;
-  ::javax::swing::Icon * hardDriveIcon;
-  jint helpButtonMnemonic;
-  ::java::lang::String * helpButtonText;
-  ::java::lang::String * helpButtonToolTipText;
-  ::javax::swing::Icon * homeFolderIcon;
-  ::javax::swing::Icon * listViewIcon;
-  ::javax::swing::Icon * newFolderIcon;
-  jint openButtonMnemonic;
-  ::java::lang::String * openButtonText;
-  ::java::lang::String * openButtonToolTipText;
-  jint saveButtonMnemonic;
-  ::java::lang::String * saveButtonText;
-  ::java::lang::String * saveButtonToolTipText;
-  jint updateButtonMnemonic;
-  ::java::lang::String * updateButtonText;
-  ::java::lang::String * updateButtonToolTipText;
-  ::javax::swing::Icon * upFolderIcon;
-public: // actually package-private
-  ::javax::swing::JFileChooser * filechooser;
-  ::javax::swing::plaf::basic::BasicDirectoryModel * model;
-  ::javax::swing::filechooser::FileFilter * acceptAll;
-  ::javax::swing::filechooser::FileView * fv;
-  ::javax::swing::JButton * accept;
-  ::javax::swing::JPanel * accessoryPanel;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::java::lang::String * acceptAllFileFilterText;
-  ::java::lang::String * dirDescText;
-  ::java::lang::String * fileDescText;
-  jboolean dirSelected;
-  ::java::io::File * currDir;
-  ::javax::swing::JPanel * bottomPanel;
-  ::javax::swing::JPanel * closePanel;
-  ::javax::swing::JTextField * entry;
-  ::java::lang::String * parentPath;
-private:
-  ::javax::swing::plaf::basic::BasicFileChooserUI$ApproveSelectionAction * approveSelectionAction;
-  ::javax::swing::plaf::basic::BasicFileChooserUI$CancelSelectionAction * cancelSelectionAction;
-  ::javax::swing::plaf::basic::BasicFileChooserUI$GoHomeAction * goHomeAction;
-  ::javax::swing::plaf::basic::BasicFileChooserUI$ChangeToParentDirectoryAction * changeToParentDirectoryAction;
-  ::javax::swing::plaf::basic::BasicFileChooserUI$NewFolderAction * newFolderAction;
-  ::javax::swing::plaf::basic::BasicFileChooserUI$UpdateAction * updateAction;
-  ::java::io::File * selectedDir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFileChooserUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h b/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h
deleted file mode 100644
index f024fbb63d9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicFormattedTextFieldUI.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
-#define __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicFormattedTextFieldUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicFormattedTextFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
-{
-
-public:
-  BasicFormattedTextFieldUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicFormattedTextFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h
deleted file mode 100644
index 5cab989ac60..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicGraphicsUtils__
-#define __javax_swing_plaf_basic_BasicGraphicsUtils__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class JComponent;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicGraphicsUtils;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicGraphicsUtils : public ::java::lang::Object
-{
-
-public:
-  BasicGraphicsUtils();
-  static void drawEtchedRect(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  static ::java::awt::Insets * getEtchedInsets();
-  static void drawGroove(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
-  static ::java::awt::Insets * getGrooveInsets();
-  static void drawBezel(::java::awt::Graphics *, jint, jint, jint, jint, jboolean, jboolean, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  static void drawLoweredBezel(::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *);
-  static void drawString(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
-  static void drawStringUnderlineCharAt(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
-public: // actually package-private
-  static void drawString(::javax::swing::JComponent *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
-  static void drawStringUnderlineCharAt(::javax::swing::JComponent *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
-public:
-  static void drawDashedRect(::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::awt::Dimension * getPreferredButtonSize(::javax::swing::AbstractButton *, jint);
-public: // actually package-private
-  static ::java::lang::String * CACHED_TEXT_LAYOUT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicGraphicsUtils__
diff --git a/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h b/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h
deleted file mode 100644
index 368ab871540..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicHTML$HTMLRootView.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
-#define __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicHTML$HTMLRootView;
-        }
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class EditorKit;
-          class Element;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicHTML$HTMLRootView : public ::javax::swing::text::View
-{
-
-public:
-  BasicHTML$HTMLRootView(::javax::swing::JComponent *, ::javax::swing::text::View *, ::javax::swing::text::EditorKit *, ::javax::swing::text::Document *);
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-  virtual void setView(::javax::swing::text::View *);
-  virtual void setSize(jfloat, jfloat);
-  virtual ::javax::swing::text::View * getView(jint);
-  virtual jint getViewCount();
-  virtual ::java::awt::Container * getContainer();
-  virtual jfloat getPreferredSpan(jint);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual ::javax::swing::text::Element * getElement();
-private:
-  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) view;
-  ::javax::swing::JComponent * component;
-  ::javax::swing::text::EditorKit * editorKit;
-  ::javax::swing::text::Document * document;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicHTML$HTMLRootView__
diff --git a/libjava/javax/swing/plaf/basic/BasicHTML.h b/libjava/javax/swing/plaf/basic/BasicHTML.h
deleted file mode 100644
index 7ae85956eca..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicHTML.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicHTML__
-#define __javax_swing_plaf_basic_BasicHTML__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicHTML;
-        }
-      }
-      namespace text
-      {
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicHTML : public ::java::lang::Object
-{
-
-public:
-  BasicHTML();
-  static ::javax::swing::text::View * createHTMLView(::javax::swing::JComponent *, ::java::lang::String *);
-  static jboolean isHTMLString(::java::lang::String *);
-  static void updateRenderer(::javax::swing::JComponent *, ::java::lang::String *);
-  static ::java::lang::String * propertyKey;
-  static ::java::lang::String * documentBaseKey;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicHTML__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h
deleted file mode 100644
index 5a75dbb60ca..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$1__
-#define __javax_swing_plaf_basic_BasicIconFactory$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicIconFactory$1();
-public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
deleted file mode 100644
index be87bf9d96a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$2.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$2__
-#define __javax_swing_plaf_basic_BasicIconFactory$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicIconFactory$2();
-public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
deleted file mode 100644
index 0287f1c7acb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
-#define __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$CheckBoxIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$CheckBoxIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicIconFactory$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 // __javax_swing_plaf_basic_BasicIconFactory$CheckBoxIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h
deleted file mode 100644
index 9c1d7f0262e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$CheckBoxMenuItemIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
-#define __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$CheckBoxMenuItemIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$CheckBoxMenuItemIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicIconFactory$CheckBoxMenuItemIcon();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory$CheckBoxMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h
deleted file mode 100644
index d7771903215..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$DummyIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
-#define __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$DummyIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$DummyIcon : public ::java::lang::Object
-{
-
-  BasicIconFactory$DummyIcon();
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  BasicIconFactory$DummyIcon(::javax::swing::plaf::basic::BasicIconFactory$DummyIcon *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory$DummyIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h b/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h
deleted file mode 100644
index a30f4d0d4a9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory$RadioButtonIcon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
-#define __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory$RadioButtonIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory$RadioButtonIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicIconFactory$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 // __javax_swing_plaf_basic_BasicIconFactory$RadioButtonIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicIconFactory.h b/libjava/javax/swing/plaf/basic/BasicIconFactory.h
deleted file mode 100644
index fc851373dda..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicIconFactory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicIconFactory__
-#define __javax_swing_plaf_basic_BasicIconFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicIconFactory;
-            class BasicIconFactory$CheckBoxIcon;
-            class BasicIconFactory$RadioButtonIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicIconFactory : public ::java::lang::Object
-{
-
-public:
-  BasicIconFactory();
-  static ::javax::swing::Icon * getMenuItemCheckIcon();
-  static ::javax::swing::Icon * getMenuItemArrowIcon();
-  static ::javax::swing::Icon * getMenuArrowIcon();
-  static ::javax::swing::Icon * getCheckBoxIcon();
-  static ::javax::swing::Icon * getRadioButtonIcon();
-  static ::javax::swing::Icon * getCheckBoxMenuItemIcon();
-  static ::javax::swing::Icon * getRadioButtonMenuItemIcon();
-  static ::javax::swing::Icon * createEmptyFrameIcon();
-public: // actually package-private
-  static const jlong serialVersionUID = 5605588811185324383LL;
-private:
-  static ::javax::swing::plaf::basic::BasicIconFactory$CheckBoxIcon * checkBoxIcon;
-  static ::javax::swing::plaf::basic::BasicIconFactory$RadioButtonIcon * radioButtonIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicIconFactory__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h
deleted file mode 100644
index efce70e9db2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$CloseAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$CloseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$CloseAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$CloseAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$CloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h
deleted file mode 100644
index 4ed9a7f741f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$IconifyAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$IconifyAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$IconifyAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$IconifyAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$IconifyAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h
deleted file mode 100644
index cf31b3c0d10..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MaximizeAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$MaximizeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$MaximizeAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$MaximizeAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h
deleted file mode 100644
index 6c4570f1f9c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$MoveAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$MoveAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$MoveAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$MoveAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$MoveAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h
deleted file mode 100644
index 3177afec5c7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PaneButton.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$PaneButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$PaneButton : public ::javax::swing::JButton
-{
-
-public:
-  BasicInternalFrameTitlePane$PaneButton(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *, ::javax::swing::Action *);
-  virtual jboolean isFocusable();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PaneButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h
deleted file mode 100644
index be7bb8be66f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicInternalFrameTitlePane$PropertyChangeHandler(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h
deleted file mode 100644
index b33c5e0cda1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$RestoreAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$RestoreAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$RestoreAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$RestoreAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$RestoreAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h
deleted file mode 100644
index edf1553f8d3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SizeAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$SizeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$SizeAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicInternalFrameTitlePane$SizeAction(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SizeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h
deleted file mode 100644
index 9510859b96a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$SystemMenuBar.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
-
-#pragma interface
-
-#include <javax/swing/JMenuBar.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$SystemMenuBar;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$SystemMenuBar : public ::javax::swing::JMenuBar
-{
-
-public:
-  BasicInternalFrameTitlePane$SystemMenuBar(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isOpaque();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void requestFocus();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JMenuBar)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$SystemMenuBar__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h
deleted file mode 100644
index 4dedb42bd2c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane$TitlePaneLayout.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameTitlePane$TitlePaneLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane$TitlePaneLayout : public ::java::lang::Object
-{
-
-public:
-  BasicInternalFrameTitlePane$TitlePaneLayout(::javax::swing::plaf::basic::BasicInternalFrameTitlePane *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane$TitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h
deleted file mode 100644
index 68b826b2f97..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
-#define __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class FontMetrics;
-        class Graphics;
-        class LayoutManager;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JButton;
-        class JInternalFrame;
-        class JLabel;
-        class JMenu;
-        class JMenuBar;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameTitlePane : public ::javax::swing::JComponent
-{
-
-public:
-  BasicInternalFrameTitlePane(::javax::swing::JInternalFrame *);
-public: // actually protected
-  virtual void installTitlePane();
-  virtual void addSubComponents();
-  virtual void createActions();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void createButtons();
-  virtual void setButtonIcons();
-  virtual void assembleSystemMenu();
-  virtual void addSystemMenuItems(::javax::swing::JMenu *);
-  virtual ::javax::swing::JMenuBar * createSystemMenuBar();
-  virtual ::javax::swing::JMenu * createSystemMenu();
-  virtual void showSystemMenu();
-public:
-  virtual void paintComponent(::java::awt::Graphics *);
-public: // actually protected
-  virtual void paintTitleBackground(::java::awt::Graphics *);
-  virtual ::java::lang::String * getTitle(::java::lang::String *, ::java::awt::FontMetrics *, jint);
-  virtual void postClosingEvent(::javax::swing::JInternalFrame *);
-  virtual void enableActions();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::LayoutManager * createLayout();
-  static ::java::lang::String * CLOSE_CMD;
-  static ::java::lang::String * ICONIFY_CMD;
-  static ::java::lang::String * MAXIMIZE_CMD;
-  static ::java::lang::String * MOVE_CMD;
-  static ::java::lang::String * RESTORE_CMD;
-  static ::java::lang::String * SIZE_CMD;
-  ::javax::swing::Action * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) closeAction;
-  ::javax::swing::Action * iconifyAction;
-  ::javax::swing::Action * maximizeAction;
-  ::javax::swing::Action * moveAction;
-  ::javax::swing::Action * restoreAction;
-  ::javax::swing::Action * sizeAction;
-  ::javax::swing::JButton * closeButton;
-  ::javax::swing::JButton * iconButton;
-  ::javax::swing::JButton * maxButton;
-  ::javax::swing::Icon * minIcon;
-  ::javax::swing::Icon * maxIcon;
-  ::javax::swing::Icon * iconIcon;
-  ::javax::swing::Icon * closeIcon;
-  ::javax::swing::JInternalFrame * frame;
-  ::javax::swing::JMenuBar * menuBar;
-  ::javax::swing::JMenu * windowMenu;
-  ::java::awt::Color * notSelectedTextColor;
-  ::java::awt::Color * notSelectedTitleColor;
-  ::java::awt::Color * selectedTextColor;
-  ::java::awt::Color * selectedTitleColor;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-public: // actually package-private
-  ::javax::swing::JLabel * title;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameTitlePane__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h
deleted file mode 100644
index d1d36649a61..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BasicInternalFrameListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class InternalFrameEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$BasicInternalFrameListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$BasicInternalFrameListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicInternalFrameUI$BasicInternalFrameListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual void internalFrameActivated(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameClosed(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameClosing(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameDeactivated(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameDeiconified(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameIconified(::javax::swing::event::InternalFrameEvent *);
-  virtual void internalFrameOpened(::javax::swing::event::InternalFrameEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$BasicInternalFrameListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h
deleted file mode 100644
index 18a50e63a35..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$BorderListener.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
-
-#pragma interface
-
-#include <javax/swing/event/MouseInputAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$BorderListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$BorderListener : public ::javax::swing::event::MouseInputAdapter
-{
-
-public: // actually protected
-  BasicInternalFrameUI$BorderListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void setCursor(::java::awt::event::MouseEvent *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-private:
-  jint sectionOfClick(jint, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) showingCursor;
-public: // actually protected
-  const jint RESIZE_NONE;
-private:
-  jint xOffset;
-  jint yOffset;
-  jint direction;
-  ::java::awt::Rectangle * cacheRect;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$BorderListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h
deleted file mode 100644
index aeedc9352f0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ComponentHandler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$ComponentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$ComponentHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicInternalFrameUI$ComponentHandler(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual void componentHidden(::java::awt::event::ComponentEvent *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-  virtual void componentShown(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h
deleted file mode 100644
index 24529023260..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$GlassPaneDispatcher.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$GlassPaneDispatcher;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$GlassPaneDispatcher : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicInternalFrameUI$GlassPaneDispatcher(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-private:
-  void handleEvent(::java::awt::event::MouseEvent *);
-  void redispatch(jint, ::java::awt::event::MouseEvent *, ::java::awt::Component *);
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mouseEventTarget;
-  ::java::awt::Component * dragTarget;
-  jboolean isDragging;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * this$0;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$GlassPaneDispatcher__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h
deleted file mode 100644
index a5ddab06727..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameBorder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$InternalFrameBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFrameBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public: // actually package-private
-  BasicInternalFrameUI$InternalFrameBorder(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual jboolean isBorderOpaque();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually package-private
-  static const jint bSize = 5;
-  static const jint cornerSize = 10;
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h
deleted file mode 100644
index 6ff8ae9abf5..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFrameLayout.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$InternalFrameLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFrameLayout : public ::java::lang::Object
-{
-
-public:
-  BasicInternalFrameUI$InternalFrameLayout(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-private:
-  ::java::awt::Dimension * getSize(::java::awt::Container *, jboolean);
-public:
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFrameLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h
deleted file mode 100644
index c1a37ba0d18..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$InternalFramePropertyChangeListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$InternalFramePropertyChangeListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$InternalFramePropertyChangeListener : public ::java::lang::Object
-{
-
-public:
-  BasicInternalFrameUI$InternalFramePropertyChangeListener(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$InternalFramePropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h
deleted file mode 100644
index 9b43d26dfdf..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI$ShowSystemMenuAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$ShowSystemMenuAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI$ShowSystemMenuAction : public ::javax::swing::AbstractAction
-{
-
-  BasicInternalFrameUI$ShowSystemMenuAction(::javax::swing::plaf::basic::BasicInternalFrameUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  BasicInternalFrameUI$ShowSystemMenuAction(::javax::swing::plaf::basic::BasicInternalFrameUI *, ::javax::swing::plaf::basic::BasicInternalFrameUI$ShowSystemMenuAction *);
-  ::javax::swing::plaf::basic::BasicInternalFrameUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI$ShowSystemMenuAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h
deleted file mode 100644
index 18aa9207e30..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.h
+++ /dev/null
@@ -1,139 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicInternalFrameUI__
-#define __javax_swing_plaf_basic_BasicInternalFrameUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/InternalFrameUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class LayoutManager;
-      namespace event
-      {
-          class ComponentListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DesktopManager;
-        class JComponent;
-        class JDesktopPane;
-        class JInternalFrame;
-        class KeyStroke;
-      namespace event
-      {
-          class MouseInputAdapter;
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicInternalFrameTitlePane;
-            class BasicInternalFrameUI;
-            class BasicInternalFrameUI$BasicInternalFrameListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicInternalFrameUI : public ::javax::swing::plaf::InternalFrameUI
-{
-
-public:
-  BasicInternalFrameUI(::javax::swing::JInternalFrame *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-  virtual void installComponents();
-  virtual void installListeners();
-  virtual void uninstallDefaults();
-  virtual void uninstallComponents();
-  virtual void uninstallListeners();
-  virtual void uninstallKeyboardActions();
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void replacePane(::javax::swing::JComponent *, ::javax::swing::JComponent *);
-  virtual void deinstallMouseHandlers(::javax::swing::JComponent *);
-  virtual void installMouseHandlers(::javax::swing::JComponent *);
-  virtual ::javax::swing::JComponent * createNorthPane(::javax::swing::JInternalFrame *);
-  virtual ::javax::swing::JComponent * createWestPane(::javax::swing::JInternalFrame *);
-  virtual ::javax::swing::JComponent * createSouthPane(::javax::swing::JInternalFrame *);
-  virtual ::javax::swing::JComponent * createEastPane(::javax::swing::JInternalFrame *);
-  virtual ::javax::swing::event::MouseInputAdapter * createBorderListener(::javax::swing::JInternalFrame *);
-  virtual void createInternalFrameListener();
-  virtual jboolean isKeyBindingRegistered();
-  virtual void setKeyBindingRegistered(jboolean);
-public:
-  virtual jboolean isKeyBindingActive();
-public: // actually protected
-  virtual void setKeyBindingActive(jboolean);
-  virtual void setupMenuOpenKey();
-  virtual void setupMenuCloseKey();
-public:
-  virtual ::javax::swing::JComponent * getNorthPane();
-  virtual void setNorthPane(::javax::swing::JComponent *);
-  virtual ::javax::swing::JComponent * getSouthPane();
-  virtual void setSouthPane(::javax::swing::JComponent *);
-  virtual void setEastPane(::javax::swing::JComponent *);
-  virtual ::javax::swing::JComponent * getEastPane();
-  virtual void setWestPane(::javax::swing::JComponent *);
-  virtual ::javax::swing::JComponent * getWestPane();
-public: // actually protected
-  virtual ::javax::swing::DesktopManager * getDesktopManager();
-  virtual ::javax::swing::DesktopManager * createDesktopManager();
-  virtual void closeFrame(::javax::swing::JInternalFrame *);
-  virtual void maximizeFrame(::javax::swing::JInternalFrame *);
-  virtual void minimizeFrame(::javax::swing::JInternalFrame *);
-  virtual void iconifyFrame(::javax::swing::JInternalFrame *);
-  virtual void deiconifyFrame(::javax::swing::JInternalFrame *);
-  virtual void activateFrame(::javax::swing::JInternalFrame *);
-  virtual void deactivateFrame(::javax::swing::JInternalFrame *);
-  virtual ::java::awt::event::ComponentListener * createComponentListener();
-  virtual ::javax::swing::event::MouseInputListener * createGlassPaneDispatcher();
-  ::javax::swing::event::MouseInputAdapter * __attribute__((aligned(__alignof__( ::javax::swing::plaf::InternalFrameUI)))) borderListener;
-  ::java::awt::event::ComponentListener * componentListener;
-  ::javax::swing::event::MouseInputListener * glassPaneDispatcher;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-private:
-  ::javax::swing::plaf::basic::BasicInternalFrameUI$BasicInternalFrameListener * internalFrameListener;
-public: // actually protected
-  ::javax::swing::JComponent * eastPane;
-  ::javax::swing::JComponent * northPane;
-  ::javax::swing::JComponent * southPane;
-  ::javax::swing::JComponent * westPane;
-  ::javax::swing::KeyStroke * openMenuKey;
-  ::javax::swing::plaf::basic::BasicInternalFrameTitlePane * titlePane;
-  ::javax::swing::JInternalFrame * frame;
-  ::java::awt::LayoutManager * internalFrameLayout;
-private:
-  ::javax::swing::JDesktopPane * desktopPane;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h b/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h
deleted file mode 100644
index 3ef661852f6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLabelUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLabelUI$1__
-#define __javax_swing_plaf_basic_BasicLabelUI$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLabelUI;
-            class BasicLabelUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLabelUI$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicLabelUI$1(::javax::swing::plaf::basic::BasicLabelUI *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLabelUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLabelUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI.h b/libjava/javax/swing/plaf/basic/BasicLabelUI.h
deleted file mode 100644
index e0d39a24189..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLabelUI.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLabelUI__
-#define __javax_swing_plaf_basic_BasicLabelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/LabelUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class FontMetrics;
-        class Graphics;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class JLabel;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicLabelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLabelUI : public ::javax::swing::plaf::LabelUI
-{
-
-public:
-  BasicLabelUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * layoutCL(::javax::swing::JLabel *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  virtual void paintDisabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
-  virtual void paintEnabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installComponents(::javax::swing::JLabel *);
-  virtual void uninstallComponents(::javax::swing::JLabel *);
-  virtual void installDefaults(::javax::swing::JLabel *);
-  virtual void uninstallDefaults(::javax::swing::JLabel *);
-  virtual void installKeyboardActions(::javax::swing::JLabel *);
-  virtual void uninstallKeyboardActions(::javax::swing::JLabel *);
-  virtual void installListeners(::javax::swing::JLabel *);
-  virtual void uninstallListeners(::javax::swing::JLabel *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually protected
-  static ::javax::swing::plaf::basic::BasicLabelUI * labelUI;
-private:
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::plaf::LabelUI)))) vr;
-  ::java::awt::Rectangle * ir;
-  ::java::awt::Rectangle * tr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLabelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h b/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h
deleted file mode 100644
index 48cfc19f080..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ActionListenerProxy.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
-#define __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ActionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI$ActionListenerProxy;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$ActionListenerProxy : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicListUI$ActionListenerProxy(::java::awt::event::ActionListener *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::java::awt::event::ActionListener * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) target;
-  ::java::lang::String * bindingCommandName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$ActionListenerProxy__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h
deleted file mode 100644
index a79c2a9fb77..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$FocusHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicListUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$FocusHandler : public ::java::lang::Object
-{
-
-public:
-  BasicListUI$FocusHandler(::javax::swing::plaf::basic::BasicListUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually protected
-  virtual void repaintCellFocus();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h
deleted file mode 100644
index 0cec9aa6e6f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ListAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$ListAction__
-#define __javax_swing_plaf_basic_BasicListUI$ListAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$ListAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$ListAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicListUI$ListAction(::javax::swing::plaf::basic::BasicListUI *, ::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$ListAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h
deleted file mode 100644
index f0c6a1579aa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ListDataHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
-#define __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListDataEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$ListDataHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$ListDataHandler : public ::java::lang::Object
-{
-
-public:
-  BasicListUI$ListDataHandler(::javax::swing::plaf::basic::BasicListUI *);
-  virtual void contentsChanged(::javax::swing::event::ListDataEvent *);
-  virtual void intervalAdded(::javax::swing::event::ListDataEvent *);
-  virtual void intervalRemoved(::javax::swing::event::ListDataEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$ListDataHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h
deleted file mode 100644
index 8211c698210..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$ListSelectionHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
-#define __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$ListSelectionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$ListSelectionHandler : public ::java::lang::Object
-{
-
-public:
-  BasicListUI$ListSelectionHandler(::javax::swing::plaf::basic::BasicListUI *);
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$ListSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h
deleted file mode 100644
index deb7b583233..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$MouseInputHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public:
-  BasicListUI$MouseInputHandler(::javax::swing::plaf::basic::BasicListUI *);
-  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 *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h
deleted file mode 100644
index 8993d1b387b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicListUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicListUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI.h b/libjava/javax/swing/plaf/basic/BasicListUI.h
deleted file mode 100644
index 2d0d79d84d0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicListUI.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicListUI__
-#define __javax_swing_plaf_basic_BasicListUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ListUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class CellRendererPane;
-        class JComponent;
-        class JList;
-        class ListCellRenderer;
-        class ListModel;
-        class ListSelectionModel;
-      namespace event
-      {
-          class ListDataListener;
-          class ListSelectionListener;
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicListUI;
-            class BasicListUI$ListAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicListUI : public ::javax::swing::plaf::ListUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual jint getRowHeight(jint);
-public:
-  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint);
-private:
-  jint getCellHeight(jint);
-public: // actually protected
-  virtual jint convertRowToY(jint);
-  virtual jint convertYToRow(jint);
-  virtual void updateLayoutState();
-  virtual void maybeUpdateLayoutState();
-public:
-  BasicListUI();
-public: // actually protected
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-  virtual void installKeyboardActions();
-  virtual void uninstallKeyboardActions();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintCell(::java::awt::Graphics *, jint, ::java::awt::Rectangle *, ::javax::swing::ListCellRenderer *, ::javax::swing::ListModel *, ::javax::swing::ListSelectionModel *, jint);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *);
-  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint);
-public: // actually protected
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::javax::swing::event::ListDataListener * createListDataListener();
-  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener();
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual void selectNextIndex();
-  virtual void selectPreviousIndex();
-  static const jint modelChanged = 1;
-  static const jint selectionModelChanged = 2;
-  static const jint fontChanged = 4;
-  static const jint fixedCellWidthChanged = 8;
-  static const jint fixedCellHeightChanged = 16;
-  static const jint prototypeCellValueChanged = 32;
-  static const jint cellRendererChanged = 64;
-  ::java::awt::event::FocusListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ListUI)))) focusListener;
-  ::javax::swing::event::ListDataListener * listDataListener;
-  ::javax::swing::event::ListSelectionListener * listSelectionListener;
-  ::javax::swing::event::MouseInputListener * mouseInputListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::JList * list;
-  jint cellHeight;
-  jint cellWidth;
-  JArray< jint > * cellHeights;
-  jint updateLayoutStateNeeded;
-  ::javax::swing::CellRendererPane * rendererPane;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicListUI$ListAction * action;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicListUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h
deleted file mode 100644
index f9fdb495a01..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$1__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$1(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h
deleted file mode 100644
index fccc19c0343..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$2__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$2(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h
deleted file mode 100644
index 5410fc36638..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$3.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$3__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$3(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h
deleted file mode 100644
index 6a9c8c77d55..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$4.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$4__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$4__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$4 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$4(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h
deleted file mode 100644
index 605519940f3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$5.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$5__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$5__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$5 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$5(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h
deleted file mode 100644
index 71ba0d5a477..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$6.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$6__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$6__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$6;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$6 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$6(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h
deleted file mode 100644
index 37d256cd95b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$7.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$7__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$7__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$7;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$7 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicLookAndFeel$7(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h
deleted file mode 100644
index 0227ab30e5e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$AudioAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$AudioAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$AudioAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicLookAndFeel$AudioAction(::javax::swing::plaf::basic::BasicLookAndFeel *, ::java::lang::Object *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) key;
-  ::javax::swing::plaf::basic::BasicLookAndFeel * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$AudioAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h
deleted file mode 100644
index 03118997e46..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel$PopupHelper.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
-#define __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class AWTEvent;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$PopupHelper;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper : public ::java::lang::Object
-{
-
-  BasicLookAndFeel$PopupHelper(::javax::swing::plaf::basic::BasicLookAndFeel *);
-public:
-  virtual void eventDispatched(::java::awt::AWTEvent *);
-private:
-  void mousePressed(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  BasicLookAndFeel$PopupHelper(::javax::swing::plaf::basic::BasicLookAndFeel *, ::javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper *);
-  ::javax::swing::plaf::basic::BasicLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel$PopupHelper__
diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h
deleted file mode 100644
index 13b4adac44a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicLookAndFeel__
-#define __javax_swing_plaf_basic_BasicLookAndFeel__
-
-#pragma interface
-
-#include <javax/swing/LookAndFeel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class ActionMap;
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicLookAndFeel;
-            class BasicLookAndFeel$PopupHelper;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicLookAndFeel : public ::javax::swing::LookAndFeel
-{
-
-public:
-  BasicLookAndFeel();
-  virtual ::javax::swing::UIDefaults * getDefaults();
-public: // actually protected
-  virtual void initClassDefaults(::javax::swing::UIDefaults *);
-  virtual void initSystemColorDefaults(::javax::swing::UIDefaults *);
-  virtual void loadSystemColors(::javax::swing::UIDefaults *, JArray< ::java::lang::String * > *, jboolean);
-private:
-  void loadResourceBundle(::javax::swing::UIDefaults *);
-public: // actually protected
-  virtual void initComponentDefaults(::javax::swing::UIDefaults *);
-  virtual ::javax::swing::ActionMap * getAudioActionMap();
-  virtual ::javax::swing::Action * createAudioAction(::java::lang::Object *);
-  virtual void playSound(::javax::swing::Action *);
-public:
-  virtual void initialize();
-  virtual void uninitialize();
-public: // actually package-private
-  static const jlong serialVersionUID = -6096995660290287879LL;
-  static ::java::lang::String * DONT_CANCEL_POPUP;
-private:
-  ::javax::swing::plaf::basic::BasicLookAndFeel$PopupHelper * __attribute__((aligned(__alignof__( ::javax::swing::LookAndFeel)))) popupHelper;
-  ::javax::swing::ActionMap * audioActionMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicLookAndFeel__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h
deleted file mode 100644
index 106c4d95b7d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ChangeHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
-#define __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuBarUI;
-            class BasicMenuBarUI$ChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI$ChangeHandler : public ::java::lang::Object
-{
-
-  BasicMenuBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  BasicMenuBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$ChangeHandler *);
-  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h
deleted file mode 100644
index fe9e6810ab0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$ContainerHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
-#define __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuBarUI;
-            class BasicMenuBarUI$ContainerHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI$ContainerHandler : public ::java::lang::Object
-{
-
-  BasicMenuBarUI$ContainerHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-public: // actually package-private
-  BasicMenuBarUI$ContainerHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$ContainerHandler *);
-  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI$ContainerHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h
deleted file mode 100644
index b1882e190cc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$FocusAction.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
-#define __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuBarUI$FocusAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI$FocusAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicMenuBarUI$FocusAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI$FocusAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h
deleted file mode 100644
index 80b279360c4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$MouseInputHandler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuBarUI;
-            class BasicMenuBarUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI$MouseInputHandler : public ::java::lang::Object
-{
-
-  BasicMenuBarUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::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 *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  BasicMenuBarUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$MouseInputHandler *);
-  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h
deleted file mode 100644
index 0365962d28a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuBarUI;
-            class BasicMenuBarUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicMenuBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicMenuBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuBarUI *, ::javax::swing::plaf::basic::BasicMenuBarUI$PropertyChangeHandler *);
-  ::javax::swing::plaf::basic::BasicMenuBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h b/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h
deleted file mode 100644
index 27b85de909a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuBarUI__
-#define __javax_swing_plaf_basic_BasicMenuBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/MenuBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace event
-      {
-          class ContainerListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class JComponent;
-        class JMenuBar;
-      namespace event
-      {
-          class ChangeListener;
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicMenuBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuBarUI : public ::javax::swing::plaf::MenuBarUI
-{
-
-public:
-  BasicMenuBarUI();
-public: // actually protected
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-  virtual ::java::awt::event::ContainerListener * createContainerListener();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-public: // actually protected
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuBarUI)))) changeListener;
-  ::java::awt::event::ContainerListener * containerListener;
-private:
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-public: // actually protected
-  ::javax::swing::JMenuBar * menuBar;
-private:
-  ::javax::swing::event::MouseInputListener * mouseListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h
deleted file mode 100644
index ffdf9672aaa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ClickAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$ClickAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$ClickAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicMenuItemUI$ClickAction(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$ClickAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h
deleted file mode 100644
index f2746bf14c3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$ItemHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ItemEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$ItemHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$ItemHandler : public ::java::lang::Object
-{
-
-  BasicMenuItemUI$ItemHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void itemStateChanged(::java::awt::event::ItemEvent *);
-public: // actually package-private
-  BasicMenuItemUI$ItemHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$ItemHandler *);
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$ItemHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h
deleted file mode 100644
index 775a4f78ca1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuDragMouseHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuDragMouseEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$MenuDragMouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$MenuDragMouseHandler : public ::java::lang::Object
-{
-
-  BasicMenuItemUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
-public: // actually package-private
-  BasicMenuItemUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$MenuDragMouseHandler *);
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MenuDragMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h
deleted file mode 100644
index db70c21c631..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MenuKeyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuKeyEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$MenuKeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$MenuKeyHandler : public ::java::lang::Object
-{
-
-  BasicMenuItemUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *);
-  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *);
-  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *);
-public: // actually package-private
-  BasicMenuItemUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuItemUI *, ::javax::swing::plaf::basic::BasicMenuItemUI$MenuKeyHandler *);
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MenuKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h
deleted file mode 100644
index 6f735f39320..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicMenuItemUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h
deleted file mode 100644
index 203bd657685..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicMenuItemUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicMenuItemUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuItemUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h
deleted file mode 100644
index c602c23106e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuItemUI__
-#define __javax_swing_plaf_basic_BasicMenuItemUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/MenuItemUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Font;
-        class Graphics;
-        class Rectangle;
-      namespace event
-      {
-          class ItemListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class JMenuItem;
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace event
-      {
-          class MenuDragMouseListener;
-          class MenuKeyListener;
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicMenuItemUI;
-            class BasicMenuItemUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuItemUI : public ::javax::swing::plaf::MenuItemUI
-{
-
-public:
-  BasicMenuItemUI();
-public: // actually protected
-  virtual ::javax::swing::event::MenuDragMouseListener * createMenuDragMouseListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MenuKeyListener * createMenuKeyListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener(::javax::swing::JComponent *);
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void doClick(::javax::swing::MenuSelectionManager *);
-public:
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::MenuElement * > * getPath();
-public: // actually protected
-  virtual ::java::awt::Dimension * getPreferredMenuItemSize(::javax::swing::JComponent *, ::javax::swing::Icon *, ::javax::swing::Icon *, jint);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-  virtual void installComponents(::javax::swing::JMenuItem *);
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintBackground(::java::awt::Graphics *, ::javax::swing::JMenuItem *, ::java::awt::Color *);
-  virtual void paintMenuItem(::java::awt::Graphics *, ::javax::swing::JComponent *, ::javax::swing::Icon *, ::javax::swing::Icon *, ::java::awt::Color *, ::java::awt::Color *, jint);
-  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JMenuItem *, ::java::awt::Rectangle *, ::java::lang::String *);
-  virtual void uninstallComponents(::javax::swing::JMenuItem *);
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  ::java::lang::String * getAcceleratorString(::javax::swing::JMenuItem *);
-  void resetRectangles(::javax::swing::JMenuItem *);
-  void layoutMenuItem(::javax::swing::JMenuItem *, ::java::lang::String *);
-public: // actually protected
-  ::java::awt::Font * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuItemUI)))) acceleratorFont;
-  ::java::awt::Color * acceleratorForeground;
-  ::java::awt::Color * acceleratorSelectionForeground;
-  ::javax::swing::Icon * arrowIcon;
-  ::javax::swing::Icon * checkIcon;
-  jint defaultTextIconGap;
-  ::java::awt::Color * disabledForeground;
-  ::javax::swing::event::MenuDragMouseListener * menuDragMouseListener;
-  ::javax::swing::JMenuItem * menuItem;
-  ::javax::swing::event::MenuKeyListener * menuKeyListener;
-  ::javax::swing::event::MouseInputListener * mouseInputListener;
-  jboolean oldBorderPainted;
-  ::java::awt::Color * selectionBackground;
-  ::java::awt::Color * selectionForeground;
-private:
-  ::java::lang::String * acceleratorDelimiter;
-  ::java::awt::event::ItemListener * itemListener;
-  ::javax::swing::plaf::basic::BasicMenuItemUI$PropertyChangeHandler * propertyChangeListener;
-  ::java::awt::Rectangle * viewRect;
-  ::java::awt::Rectangle * textRect;
-  ::java::awt::Rectangle * accelRect;
-  ::java::awt::Rectangle * iconRect;
-  ::java::awt::Rectangle * arrowIconRect;
-  ::java::awt::Rectangle * checkIconRect;
-  ::java::awt::Rectangle * cachedRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h
deleted file mode 100644
index 44eeca1219c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$ChangeHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
-#define __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JMenu;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$ChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$ChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicMenuUI$ChangeHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::JMenu *, ::javax::swing::plaf::basic::BasicMenuUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isSelected;
-  ::javax::swing::JMenu * menu;
-  ::javax::swing::plaf::basic::BasicMenuUI * ui;
-  ::java::awt::Component * wasFocused;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h
deleted file mode 100644
index 39cc8f9f8c6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuDragMouseHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
-#define __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuDragMouseEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$MenuDragMouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$MenuDragMouseHandler : public ::java::lang::Object
-{
-
-  BasicMenuUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuUI *);
-public:
-  virtual void menuDragMouseDragged(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseEntered(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseExited(::javax::swing::event::MenuDragMouseEvent *);
-  virtual void menuDragMouseReleased(::javax::swing::event::MenuDragMouseEvent *);
-public: // actually package-private
-  BasicMenuUI$MenuDragMouseHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuDragMouseHandler *);
-  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuDragMouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h
deleted file mode 100644
index eb519164dae..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
-#define __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$MenuHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$MenuHandler : public ::java::lang::Object
-{
-
-  BasicMenuUI$MenuHandler(::javax::swing::plaf::basic::BasicMenuUI *);
-public:
-  virtual void menuCanceled(::javax::swing::event::MenuEvent *);
-  virtual void menuDeselected(::javax::swing::event::MenuEvent *);
-  virtual void menuSelected(::javax::swing::event::MenuEvent *);
-public: // actually package-private
-  BasicMenuUI$MenuHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuHandler *);
-  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h
deleted file mode 100644
index be2f9ca155d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MenuKeyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
-#define __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class MenuKeyEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$MenuKeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$MenuKeyHandler : public ::java::lang::Object
-{
-
-  BasicMenuUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuUI *);
-public:
-  virtual void menuKeyPressed(::javax::swing::event::MenuKeyEvent *);
-  virtual void menuKeyReleased(::javax::swing::event::MenuKeyEvent *);
-  virtual void menuKeyTyped(::javax::swing::event::MenuKeyEvent *);
-public: // actually package-private
-  BasicMenuUI$MenuKeyHandler(::javax::swing::plaf::basic::BasicMenuUI *, ::javax::swing::plaf::basic::BasicMenuUI$MenuKeyHandler *);
-  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$MenuKeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h
deleted file mode 100644
index c5e1e4064dd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$MouseInputHandler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicMenuUI$MouseInputHandler(::javax::swing::plaf::basic::BasicMenuUI *);
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-private:
-  jboolean popupVisible();
-public:
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h b/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h
deleted file mode 100644
index 97815775285..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI$SelectMenuAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
-#define __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicMenuUI;
-            class BasicMenuUI$SelectMenuAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI$SelectMenuAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicMenuUI$SelectMenuAction(::javax::swing::plaf::basic::BasicMenuUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicMenuUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI$SelectMenuAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI.h b/libjava/javax/swing/plaf/basic/BasicMenuUI.h
deleted file mode 100644
index d3ae59e3592..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicMenuUI__
-#define __javax_swing_plaf_basic_BasicMenuUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JMenu;
-      namespace event
-      {
-          class ChangeListener;
-          class MenuDragMouseListener;
-          class MenuKeyListener;
-          class MenuListener;
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicMenuUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicMenuUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
-{
-
-public:
-  BasicMenuUI();
-public: // actually protected
-  virtual ::javax::swing::event::ChangeListener * createChangeListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MenuDragMouseListener * createMenuDragMouseListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MenuKeyListener * createMenuKeyListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MenuListener * createMenuListener(::javax::swing::JComponent *);
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener(::javax::swing::JComponent *);
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JComponent *);
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-  virtual void installListeners();
-  virtual void setupPostTimer(::javax::swing::JMenu *);
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicMenuItemUI)))) changeListener;
-  ::javax::swing::event::MenuListener * menuListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicMenuUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h
deleted file mode 100644
index a79d5d0abdd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$1__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$1__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$1 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
-{
-
-public: // actually package-private
-  BasicOptionPaneUI$1();
-public:
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h
deleted file mode 100644
index 3a5048f2575..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$2.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$2__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$2__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$2 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
-{
-
-public: // actually package-private
-  BasicOptionPaneUI$2();
-public:
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h
deleted file mode 100644
index b93960b0de3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$3.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$3__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$3__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$3 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
-{
-
-public: // actually package-private
-  BasicOptionPaneUI$3();
-public:
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h
deleted file mode 100644
index 952df65bb7d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$4.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$4__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$4__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$4 : public ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon
-{
-
-public: // actually package-private
-  BasicOptionPaneUI$4();
-public:
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h
deleted file mode 100644
index 575b2b79c74..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonActionListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI;
-            class BasicOptionPaneUI$ButtonActionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$ButtonActionListener : public ::java::lang::Object
-{
-
-public:
-  BasicOptionPaneUI$ButtonActionListener(::javax::swing::plaf::basic::BasicOptionPaneUI *, jint);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) buttonIndex;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicOptionPaneUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonActionListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h
deleted file mode 100644
index 06671ddd4fa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$ButtonAreaLayout.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$ButtonAreaLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$ButtonAreaLayout : public ::java::lang::Object
-{
-
-public:
-  BasicOptionPaneUI$ButtonAreaLayout(jboolean, jint);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual jboolean getCentersChildren();
-  virtual jint getPadding();
-  virtual jboolean getSyncAllWidths();
-  virtual void layoutContainer(::java::awt::Container *);
-private:
-  jint buttonRowLength(::java::awt::Container *);
-public:
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void setCentersChildren(jboolean);
-  virtual void setPadding(jint);
-  virtual void setSyncAllWidths(jboolean);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) centersChildren;
-  jint padding;
-  jboolean syncAllWidths;
-private:
-  jint widthOfWidestButton;
-  jint tallestButton;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$ButtonAreaLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h
deleted file mode 100644
index a820f3cbe25..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$MessageIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$MessageIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon : public ::java::lang::Object
-{
-
-  BasicOptionPaneUI$MessageIcon();
-public:
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  BasicOptionPaneUI$MessageIcon(::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$MessageIcon__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h
deleted file mode 100644
index 81dcc99f3e9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$OptionPaneCloseAction.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI$OptionPaneCloseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$OptionPaneCloseAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicOptionPaneUI$OptionPaneCloseAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$OptionPaneCloseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h
deleted file mode 100644
index 02b236c47a6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicOptionPaneUI;
-            class BasicOptionPaneUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicOptionPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicOptionPaneUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicOptionPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h
deleted file mode 100644
index 50aa3b4ee65..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.h
+++ /dev/null
@@ -1,148 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicOptionPaneUI__
-#define __javax_swing_plaf_basic_BasicOptionPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/OptionPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class GridBagConstraints;
-        class LayoutManager;
-      namespace event
-      {
-          class ActionListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class Icon;
-        class JComponent;
-        class JLabel;
-        class JOptionPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicOptionPaneUI;
-            class BasicOptionPaneUI$MessageIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicOptionPaneUI : public ::javax::swing::plaf::OptionPaneUI
-{
-
-public:
-  BasicOptionPaneUI();
-public: // actually protected
-  virtual void addButtonComponents(::java::awt::Container *, JArray< ::java::lang::Object * > *, jint);
-  virtual void addIcon(::java::awt::Container *);
-private:
-  static ::java::awt::GridBagConstraints * createConstraints();
-public: // actually protected
-  virtual void addMessageComponents(::java::awt::Container *, ::java::awt::GridBagConstraints *, ::java::lang::Object *, jint, jboolean);
-  virtual void burstStringInto(::java::awt::Container *, ::java::lang::String *, jint);
-public:
-  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *);
-public: // actually protected
-  virtual ::java::awt::event::ActionListener * createButtonActionListener(jint);
-  virtual ::java::awt::Container * createButtonArea();
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual ::java::awt::Container * createMessageArea();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::Container * createSeparator();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual JArray< ::java::lang::Object * > * getButtons();
-  virtual ::javax::swing::Icon * getIcon();
-  virtual ::javax::swing::Icon * getIconForType(jint);
-  virtual jint getInitialValueIndex();
-  virtual jint getMaxCharactersPerLineCount();
-public:
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::Object * getMessage();
-public:
-  virtual ::java::awt::Dimension * getMinimumOptionPaneSize();
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual jboolean getSizeButtonsToSameWidth();
-  virtual void installComponents();
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-public: // actually protected
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void resetInputValue();
-public:
-  virtual void selectInitialValue(::javax::swing::JOptionPane *);
-public: // actually package-private
-  virtual void resetSelectedValue();
-public: // actually protected
-  virtual void uninstallComponents();
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-private:
-  void configureLabel(::javax::swing::JLabel *);
-public:
-  static const jint MinimumWidth = 262;
-  static const jint MinimumHeight = 90;
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::OptionPaneUI)))) hasCustomComponents;
-  ::java::awt::Component * initialFocusComponent;
-  ::javax::swing::JComponent * inputComponent;
-  ::java::awt::Dimension * minimumSize;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::JOptionPane * optionPane;
-private:
-  static const jint ICON_SIZE = 36;
-  static ::java::lang::String * OK_STRING;
-  static ::java::lang::String * YES_STRING;
-  static ::java::lang::String * NO_STRING;
-  static ::java::lang::String * CANCEL_STRING;
-public: // actually package-private
-  ::java::awt::Container * messageAreaContainer;
-  ::java::awt::Container * buttonContainer;
-private:
-  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * errorIcon;
-  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * infoIcon;
-  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * warningIcon;
-  static ::javax::swing::plaf::basic::BasicOptionPaneUI$MessageIcon * questionIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicOptionPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPanelUI.h b/libjava/javax/swing/plaf/basic/BasicPanelUI.h
deleted file mode 100644
index 5fcf6fe892a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPanelUI.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPanelUI__
-#define __javax_swing_plaf_basic_BasicPanelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/PanelUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JPanel;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicPanelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPanelUI : public ::javax::swing::plaf::PanelUI
-{
-
-public:
-  BasicPanelUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JPanel *);
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults(::javax::swing::JPanel *);
-public: // actually package-private
-  static ::javax::swing::plaf::basic::BasicPanelUI * sharedUI;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPanelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h b/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h
deleted file mode 100644
index fcbb8732fa3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPasswordFieldUI.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPasswordFieldUI__
-#define __javax_swing_plaf_basic_BasicPasswordFieldUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicPasswordFieldUI;
-        }
-      }
-      namespace text
-      {
-          class Element;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPasswordFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
-{
-
-public:
-  BasicPasswordFieldUI();
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPasswordFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h
deleted file mode 100644
index d5082f9d18e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
-#define __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicPopupMenuSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
-{
-
-public:
-  BasicPopupMenuSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h
deleted file mode 100644
index 5fb04078aea..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$KeyboardHelper.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
-#define __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class JRootPane;
-        class MenuElement;
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicPopupMenuUI;
-            class BasicPopupMenuUI$KeyboardHelper;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper : public ::java::lang::Object
-{
-
-  BasicPopupMenuUI$KeyboardHelper(::javax::swing::plaf::basic::BasicPopupMenuUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-private:
-  ::javax::swing::JPopupMenu * getActivePopup(JArray< ::javax::swing::MenuElement * > *);
-  jboolean invokerEquals(::javax::swing::MenuElement *, ::javax::swing::MenuElement *);
-public: // actually package-private
-  BasicPopupMenuUI$KeyboardHelper(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper *);
-private:
-  JArray< ::javax::swing::MenuElement * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastSelectedPath;
-  ::java::awt::Component * lastFocused;
-  ::javax::swing::JRootPane * invokerRootPane;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicPopupMenuUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$KeyboardHelper__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h
deleted file mode 100644
index 03fb5accb8d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$NavigateAction.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
-#define __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JPopupMenu;
-        class MenuElement;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicPopupMenuUI$NavigateAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuUI$NavigateAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicPopupMenuUI$NavigateAction(::java::lang::String *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  void navigateNextPrevious(jboolean);
-  ::javax::swing::MenuElement * findEnabledChild(JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuElement *, jboolean);
-  ::javax::swing::MenuElement * findEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jboolean);
-  ::javax::swing::MenuElement * findNextEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jint);
-  ::javax::swing::MenuElement * findPreviousEnabledChild(JArray< ::javax::swing::MenuElement * > *, jint, jint);
-  void navigateParentChild(jboolean);
-  void cancel();
-  ::javax::swing::JPopupMenu * getLastPopup();
-  void doReturn();
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h
deleted file mode 100644
index 3b8b580abb3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$PopupMenuHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
-#define __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class PopupMenuEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicPopupMenuUI;
-            class BasicPopupMenuUI$PopupMenuHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuUI$PopupMenuHandler : public ::java::lang::Object
-{
-
-  BasicPopupMenuUI$PopupMenuHandler(::javax::swing::plaf::basic::BasicPopupMenuUI *);
-public:
-  virtual void popupMenuCanceled(::javax::swing::event::PopupMenuEvent *);
-  virtual void popupMenuWillBecomeInvisible(::javax::swing::event::PopupMenuEvent *);
-  virtual void popupMenuWillBecomeVisible(::javax::swing::event::PopupMenuEvent *);
-public: // actually package-private
-  BasicPopupMenuUI$PopupMenuHandler(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$PopupMenuHandler *);
-  ::javax::swing::plaf::basic::BasicPopupMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$PopupMenuHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h
deleted file mode 100644
index e88a2f884ff..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI$TopWindowListener.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
-#define __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicPopupMenuUI;
-            class BasicPopupMenuUI$TopWindowListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener : public ::java::lang::Object
-{
-
-  BasicPopupMenuUI$TopWindowListener(::javax::swing::plaf::basic::BasicPopupMenuUI *);
-public:
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-  virtual void componentShown(::java::awt::event::ComponentEvent *);
-  virtual void componentHidden(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  BasicPopupMenuUI$TopWindowListener(::javax::swing::plaf::basic::BasicPopupMenuUI *, ::javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener *);
-  ::javax::swing::plaf::basic::BasicPopupMenuUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuUI$TopWindowListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h
deleted file mode 100644
index 95bf37a9373..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicPopupMenuUI__
-#define __javax_swing_plaf_basic_BasicPopupMenuUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/PopupMenuUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class JComponent;
-        class JPopupMenu;
-      namespace event
-      {
-          class PopupMenuListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicPopupMenuUI;
-            class BasicPopupMenuUI$KeyboardHelper;
-            class BasicPopupMenuUI$TopWindowListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicPopupMenuUI : public ::javax::swing::plaf::PopupMenuUI
-{
-
-public:
-  BasicPopupMenuUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void installDefaults();
-public: // actually protected
-  virtual void installListeners();
-  virtual void installKeyboardActions();
-public: // actually package-private
-  virtual void installKeyboardActionsImpl();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults();
-  virtual void uninstallListeners();
-  virtual void uninstallKeyboardActions();
-public: // actually package-private
-  virtual void uninstallKeyboardActionsImpl();
-public:
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jboolean isPopupTrigger(::java::awt::event::MouseEvent *);
-public: // actually protected
-  ::javax::swing::JPopupMenu * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PopupMenuUI)))) popupMenu;
-private:
-  ::javax::swing::event::PopupMenuListener * popupMenuListener;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicPopupMenuUI$TopWindowListener * topWindowListener;
-private:
-  static jint numPopups;
-  static ::javax::swing::plaf::basic::BasicPopupMenuUI$KeyboardHelper * keyboardHelper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicPopupMenuUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h
deleted file mode 100644
index 54768d3a388..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$AncestorHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
-#define __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class AncestorEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$AncestorHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI$AncestorHandler : public ::java::lang::Object
-{
-
-  BasicProgressBarUI$AncestorHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
-public:
-  virtual void ancestorAdded(::javax::swing::event::AncestorEvent *);
-  virtual void ancestorRemoved(::javax::swing::event::AncestorEvent *);
-  virtual void ancestorMoved(::javax::swing::event::AncestorEvent *);
-public: // actually package-private
-  BasicProgressBarUI$AncestorHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$AncestorHandler *);
-  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI$AncestorHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h
deleted file mode 100644
index 31c00bc61ee..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$Animator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
-#define __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$Animator;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI$Animator : public ::java::lang::Object
-{
-
-  BasicProgressBarUI$Animator(::javax::swing::plaf::basic::BasicProgressBarUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  BasicProgressBarUI$Animator(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$Animator *);
-  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI$Animator__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h
deleted file mode 100644
index e8296621a2d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ChangeHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
-#define __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$ChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI$ChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicProgressBarUI$ChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h
deleted file mode 100644
index 2f20e0f2490..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$ComponentHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
-#define __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
-
-#pragma interface
-
-#include <java/awt/event/ComponentAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$ComponentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
-{
-
-  BasicProgressBarUI$ComponentHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
-public:
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  BasicProgressBarUI$ComponentHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$ComponentHandler *);
-  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h
deleted file mode 100644
index 9d0d136fcaf..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicProgressBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicProgressBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicProgressBarUI *, ::javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler *);
-  ::javax::swing::plaf::basic::BasicProgressBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h b/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h
deleted file mode 100644
index 85263b9378e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.h
+++ /dev/null
@@ -1,123 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicProgressBarUI__
-#define __javax_swing_plaf_basic_BasicProgressBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ProgressBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class ComponentListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JProgressBar;
-        class Timer;
-      namespace event
-      {
-          class AncestorListener;
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicProgressBarUI;
-            class BasicProgressBarUI$Animator;
-            class BasicProgressBarUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicProgressBarUI : public ::javax::swing::plaf::ProgressBarUI
-{
-
-public:
-  BasicProgressBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual jint getAmountFull(::java::awt::Insets *, jint, jint);
-  virtual jint getAnimationIndex();
-  virtual ::java::awt::Rectangle * getBox(::java::awt::Rectangle *);
-  virtual jint getCellLength();
-  virtual jint getCellSpacing();
-public:
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Dimension * getPreferredInnerHorizontal();
-  virtual ::java::awt::Dimension * getPreferredInnerVertical();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Color * getSelectionBackground();
-  virtual ::java::awt::Color * getSelectionForeground();
-  virtual ::java::awt::Point * getStringPlacement(::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint, jint);
-  virtual void incrementAnimationIndex();
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintDeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paintIndeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paintString(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Insets *);
-  virtual void setAnimationIndex(jint);
-  virtual void setCellLength(jint);
-  virtual void setCellSpacing(jint);
-  virtual void startAnimationTimer();
-  virtual void stopAnimationTimer();
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ProgressBarUI)))) boxRect;
-private:
-  ::javax::swing::Timer * animationTimer;
-  jint animationIndex;
-  jint numFrames;
-  ::javax::swing::plaf::basic::BasicProgressBarUI$Animator * animation;
-  ::javax::swing::plaf::basic::BasicProgressBarUI$PropertyChangeHandler * propertyListener;
-public: // actually protected
-  ::javax::swing::event::ChangeListener * changeListener;
-  ::javax::swing::JProgressBar * progressBar;
-public: // actually package-private
-  jdouble boxDependent;
-  jint boxIndependent;
-  jdouble incr;
-private:
-  jint cellLength;
-  jint cellSpacing;
-  ::java::awt::Color * selectionBackground;
-  ::java::awt::Color * selectionForeground;
-  ::javax::swing::event::AncestorListener * ancestorListener;
-  ::java::awt::event::ComponentListener * componentListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicProgressBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h b/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h
deleted file mode 100644
index 5439b6722fe..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
-#define __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicMenuItemUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JMenuItem;
-        class MenuElement;
-        class MenuSelectionManager;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicRadioButtonMenuItemUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicRadioButtonMenuItemUI : public ::javax::swing::plaf::basic::BasicMenuItemUI
-{
-
-public:
-  BasicRadioButtonMenuItemUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual void processMouseEvent(::javax::swing::JMenuItem *, ::java::awt::event::MouseEvent *, JArray< ::javax::swing::MenuElement * > *, ::javax::swing::MenuSelectionManager *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicRadioButtonMenuItemUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h b/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
deleted file mode 100644
index 62b3a3c2823..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicRadioButtonUI__
-#define __javax_swing_plaf_basic_BasicRadioButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToggleButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class Icon;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicRadioButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicRadioButtonUI : public ::javax::swing::plaf::basic::BasicToggleButtonUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  BasicRadioButtonUI();
-public: // actually protected
-  virtual void installDefaults(::javax::swing::AbstractButton *);
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual ::javax::swing::Icon * getDefaultIcon();
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintFocus(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Dimension *);
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToggleButtonUI)))) icon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicRadioButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h
deleted file mode 100644
index 040c915022d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultPressAction.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
-#define __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JRootPane;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicRootPaneUI;
-            class BasicRootPaneUI$DefaultPressAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicRootPaneUI$DefaultPressAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicRootPaneUI$DefaultPressAction(::javax::swing::plaf::basic::BasicRootPaneUI *, ::javax::swing::JRootPane *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) rootPane;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicRootPaneUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicRootPaneUI$DefaultPressAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h
deleted file mode 100644
index 1728960926d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI$DefaultReleaseAction.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
-#define __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JRootPane;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicRootPaneUI;
-            class BasicRootPaneUI$DefaultReleaseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicRootPaneUI$DefaultReleaseAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicRootPaneUI$DefaultReleaseAction(::javax::swing::plaf::basic::BasicRootPaneUI *, ::javax::swing::JRootPane *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) rootPane;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicRootPaneUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicRootPaneUI$DefaultReleaseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h b/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h
deleted file mode 100644
index cf222b76fb6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicRootPaneUI__
-#define __javax_swing_plaf_basic_BasicRootPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/RootPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JRootPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicRootPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicRootPaneUI : public ::javax::swing::plaf::RootPaneUI
-{
-
-public:
-  BasicRootPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JRootPane *);
-  virtual void installComponents(::javax::swing::JRootPane *);
-  virtual void installListeners(::javax::swing::JRootPane *);
-  virtual void installKeyboardActions(::javax::swing::JRootPane *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults(::javax::swing::JRootPane *);
-  virtual void uninstallComponents(::javax::swing::JRootPane *);
-  virtual void uninstallListeners(::javax::swing::JRootPane *);
-  virtual void uninstallKeyboardActions(::javax::swing::JRootPane *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicRootPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h
deleted file mode 100644
index 740dea9e590..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$1__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$1(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h
deleted file mode 100644
index 1eeb4071191..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$2__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$2 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$2(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h
deleted file mode 100644
index 1ae61baf033..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$3__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$3__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$3 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$3(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h
deleted file mode 100644
index e8c2e5c5ea6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$4__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$4__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$4 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$4(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h
deleted file mode 100644
index 49c987f31e9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$5__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$5__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$5 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$5(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h
deleted file mode 100644
index 9c0fb6671cf..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$6__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$6__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$6;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$6 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollBarUI$6(::javax::swing::plaf::basic::BasicScrollBarUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h
deleted file mode 100644
index 85d942986d5..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$ArrowButtonListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  BasicScrollBarUI$ArrowButtonListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ArrowButtonListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h
deleted file mode 100644
index 472d5bd4b19..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ModelListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$ModelListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$ModelListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicScrollBarUI$ModelListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ModelListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h
deleted file mode 100644
index b2afd716343..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicScrollBarUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicScrollBarUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h
deleted file mode 100644
index 193e13f595e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$ScrollListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener : public ::java::lang::Object
-{
-
-public:
-  BasicScrollBarUI$ScrollListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
-  BasicScrollBarUI$ScrollListener(::javax::swing::plaf::basic::BasicScrollBarUI *, jint, jboolean);
-  virtual void setDirection(jint);
-  virtual void setScrollByBlock(jboolean);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) direction;
-  jboolean block;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$ScrollListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h
deleted file mode 100644
index b78648a31e2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI$TrackListener.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
-#define __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$TrackListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI$TrackListener : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  BasicScrollBarUI$TrackListener(::javax::swing::plaf::basic::BasicScrollBarUI *);
-public:
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual jboolean shouldScroll(jint);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) currentMouseX;
-  jint currentMouseY;
-  jint offset;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollBarUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI$TrackListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h
deleted file mode 100644
index 64cd923aca4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.h
+++ /dev/null
@@ -1,174 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollBarUI__
-#define __javax_swing_plaf_basic_BasicScrollBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ScrollBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Container;
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class InputMap;
-        class JButton;
-        class JComponent;
-        class JScrollBar;
-        class Timer;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicScrollBarUI;
-            class BasicScrollBarUI$ArrowButtonListener;
-            class BasicScrollBarUI$ModelListener;
-            class BasicScrollBarUI$ScrollListener;
-            class BasicScrollBarUI$TrackListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollBarUI : public ::javax::swing::plaf::ScrollBarUI
-{
-
-public:
-  BasicScrollBarUI();
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-public: // actually protected
-  virtual void configureScrollBarColors();
-  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener * createArrowButtonListener();
-  virtual ::javax::swing::JButton * createIncreaseButton(jint);
-  virtual ::javax::swing::JButton * createDecreaseButton(jint);
-  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ModelListener * createModelListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener * createScrollListener();
-  virtual ::javax::swing::plaf::basic::BasicScrollBarUI$TrackListener * createTrackListener();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Dimension * getMaximumThumbSize();
-public:
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Dimension * getMinimumThumbSize();
-public: // actually package-private
-  virtual void calculatePreferredSize();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Rectangle * getThumbBounds();
-  virtual ::java::awt::Rectangle * getTrackBounds();
-  virtual void installComponents();
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-  virtual void uninstallKeyboardActions();
-public: // actually package-private
-  virtual ::javax::swing::InputMap * getInputMap(jint);
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-public: // actually protected
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void layoutContainer(::java::awt::Container *);
-public: // actually protected
-  virtual void layoutHScrollbar(::javax::swing::JScrollBar *);
-  virtual void layoutVScrollbar(::javax::swing::JScrollBar *);
-public: // actually package-private
-  virtual void updateThumbRect();
-public:
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintDecreaseHighlight(::java::awt::Graphics *);
-  virtual void paintIncreaseHighlight(::java::awt::Graphics *);
-  virtual void paintThumb(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-  virtual void paintTrack(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-public:
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually protected
-  virtual void scrollByBlock(jint);
-public: // actually package-private
-  static void scrollByBlock(::javax::swing::JScrollBar *, jint);
-public: // actually protected
-  virtual void scrollByUnit(jint);
-public: // actually package-private
-  static void scrollByUnits(::javax::swing::JScrollBar *, jint, jint);
-public: // actually protected
-  virtual void setThumbBounds(jint, jint, jint, jint);
-  virtual void uninstallComponents();
-  virtual void uninstallDefaults();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually package-private
-  virtual jint valueForYPosition(jint);
-  virtual jint valueForXPosition(jint);
-public:
-  virtual jboolean isThumbRollover();
-public: // actually protected
-  virtual void setThumbRollover(jboolean);
-public:
-  virtual jboolean getSupportsAbsolutePositioning();
-public: // actually protected
-  ::javax::swing::plaf::basic::BasicScrollBarUI$ArrowButtonListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollBarUI)))) buttonListener;
-  ::javax::swing::plaf::basic::BasicScrollBarUI$ModelListener * modelListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::plaf::basic::BasicScrollBarUI$ScrollListener * scrollListener;
-  ::javax::swing::plaf::basic::BasicScrollBarUI$TrackListener * trackListener;
-  ::javax::swing::JButton * decrButton;
-  ::javax::swing::JButton * incrButton;
-  ::java::awt::Dimension * maximumThumbSize;
-  ::java::awt::Dimension * minimumThumbSize;
-  ::java::awt::Color * thumbColor;
-  ::java::awt::Color * thumbDarkShadowColor;
-  ::java::awt::Color * thumbHighlightColor;
-  ::java::awt::Color * thumbLightShadowColor;
-  ::java::awt::Color * trackHighlightColor;
-  ::java::awt::Color * trackColor;
-  ::java::awt::Rectangle * trackRect;
-  ::java::awt::Rectangle * thumbRect;
-  static const jint DECREASE_HIGHLIGHT = 1;
-  static const jint INCREASE_HIGHLIGHT = 2;
-  static const jint NO_HIGHLIGHT = 0;
-private:
-  static const jint POSITIVE_SCROLL = 1;
-  static const jint NEGATIVE_SCROLL = -1;
-  ::java::awt::Dimension * preferredSize;
-public: // actually protected
-  jint trackHighlight;
-  jboolean isDragging;
-  ::javax::swing::Timer * scrollTimer;
-  ::javax::swing::JScrollBar * scrollbar;
-public: // actually package-private
-  jboolean thumbRollover;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h
deleted file mode 100644
index d2f99fd0748..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$1__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$1(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h
deleted file mode 100644
index ca4ee4a0a11..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$10.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$10__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$10__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$10;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$10 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$10(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$10__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h
deleted file mode 100644
index 7cf273faac2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$2__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$2 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$2(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h
deleted file mode 100644
index 08fdef8fae3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$3__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$3__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$3 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$3(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h
deleted file mode 100644
index 619ffa5af10..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$4__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$4__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$4 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$4(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h
deleted file mode 100644
index 474733112e7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$5__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$5__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$5 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$5(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h
deleted file mode 100644
index 03dad8e7411..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$6__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$6__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$6;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$6 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$6(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h
deleted file mode 100644
index df4635ef2e9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$7.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$7__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$7__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$7;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$7 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$7(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h
deleted file mode 100644
index 04e372cbe51..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$8.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$8__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$8__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$8;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$8 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$8(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$8__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h
deleted file mode 100644
index 24028ace0ac..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$9.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$9__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$9__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$9;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$9 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$9(::javax::swing::plaf::basic::BasicScrollPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$9__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h
deleted file mode 100644
index b4cd0559369..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$HSBChangeListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$HSBChangeListener : public ::java::lang::Object
-{
-
-public:
-  BasicScrollPaneUI$HSBChangeListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$HSBChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h
deleted file mode 100644
index 33a3deb5d0b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$MouseWheelHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-      namespace event
-      {
-          class MouseWheelEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$MouseWheelHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$MouseWheelHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicScrollPaneUI$MouseWheelHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-public:
-  virtual void mouseWheelMoved(::java::awt::event::MouseWheelEvent *);
-public: // actually package-private
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rect;
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$MouseWheelHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h
deleted file mode 100644
index d41feb6d487..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicScrollPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h
deleted file mode 100644
index 53c4f804bf2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$VSBChangeListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$VSBChangeListener : public ::java::lang::Object
-{
-
-public:
-  BasicScrollPaneUI$VSBChangeListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$VSBChangeListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h
deleted file mode 100644
index abbdc71b258..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$ViewportChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$ViewportChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicScrollPaneUI$ViewportChangeHandler(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h
deleted file mode 100644
index d0ca2438dbc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI$ViewportContainerListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-            class BasicScrollPaneUI$ViewportContainerListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI$ViewportContainerListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicScrollPaneUI$ViewportContainerListener(::javax::swing::plaf::basic::BasicScrollPaneUI *);
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicScrollPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI$ViewportContainerListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h
deleted file mode 100644
index c06cf939f6f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicScrollPaneUI__
-#define __javax_swing_plaf_basic_BasicScrollPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ScrollPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-      namespace event
-      {
-          class ContainerListener;
-          class MouseWheelListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class InputMap;
-        class JComponent;
-        class JScrollPane;
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicScrollPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicScrollPaneUI : public ::javax::swing::plaf::ScrollPaneUI
-{
-
-public:
-  BasicScrollPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JScrollPane *);
-  virtual void uninstallDefaults(::javax::swing::JScrollPane *);
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installListeners(::javax::swing::JScrollPane *);
-public: // actually package-private
-  virtual ::javax::swing::InputMap * getInputMap(jint);
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-public: // actually protected
-  virtual void installKeyboardActions(::javax::swing::JScrollPane *);
-  virtual void uninstallKeyboardActions(::javax::swing::JScrollPane *);
-  virtual ::javax::swing::event::ChangeListener * createHSBChangeListener();
-  virtual ::javax::swing::event::ChangeListener * createVSBChangeListener();
-  virtual ::javax::swing::event::ChangeListener * createViewportChangeListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::event::MouseWheelListener * createMouseWheelListener();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallListeners(::javax::swing::JComponent *);
-public:
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void syncScrollPaneWithViewport();
-  virtual void updateColumnHeader(::java::beans::PropertyChangeEvent *);
-  virtual void updateRowHeader(::java::beans::PropertyChangeEvent *);
-  virtual void updateScrollBarDisplayPolicy(::java::beans::PropertyChangeEvent *);
-  virtual void updateViewport(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  static jint SCROLL_NON_SCROLLABLES;
-  static jint ROWS_PER_WHEEL_CLICK;
-public: // actually protected
-  ::javax::swing::JScrollPane * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollPaneUI)))) scrollpane;
-  ::javax::swing::event::ChangeListener * hsbChangeListener;
-  ::javax::swing::event::ChangeListener * vsbChangeListener;
-  ::javax::swing::event::ChangeListener * viewportChangeListener;
-  ::java::beans::PropertyChangeListener * spPropertyChangeListener;
-public: // actually package-private
-  ::java::awt::event::MouseWheelListener * mouseWheelListener;
-  ::java::awt::event::ContainerListener * containerListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h
deleted file mode 100644
index f16b625f691..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSeparatorUI.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSeparatorUI__
-#define __javax_swing_plaf_basic_BasicSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SeparatorUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JSeparator;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSeparatorUI : public ::javax::swing::plaf::SeparatorUI
-{
-
-public:
-  BasicSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JSeparator *);
-  virtual void uninstallDefaults(::javax::swing::JSeparator *);
-  virtual void installListeners(::javax::swing::JSeparator *);
-  virtual void uninstallListeners(::javax::swing::JSeparator *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SeparatorUI)))) shadow;
-  ::java::awt::Color * highlight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h
deleted file mode 100644
index aeab13d16a1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$1__
-#define __javax_swing_plaf_basic_BasicSliderUI$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$1(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
deleted file mode 100644
index b5b1f9a5047..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$2__
-#define __javax_swing_plaf_basic_BasicSliderUI$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$2 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$2(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
deleted file mode 100644
index f5ebcd7bbb2..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$3__
-#define __javax_swing_plaf_basic_BasicSliderUI$3__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$3 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$3(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
deleted file mode 100644
index e239d8ba159..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$4__
-#define __javax_swing_plaf_basic_BasicSliderUI$4__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$4 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$4(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
deleted file mode 100644
index 1832658cd40..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$5__
-#define __javax_swing_plaf_basic_BasicSliderUI$5__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$5 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$5(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
deleted file mode 100644
index ef27bdf0f9b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$6__
-#define __javax_swing_plaf_basic_BasicSliderUI$6__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$6;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$6 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSliderUI$6(::javax::swing::plaf::basic::BasicSliderUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
deleted file mode 100644
index 739b384edb7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ActionScroller.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
-#define __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JSlider;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$ActionScroller;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$ActionScroller : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicSliderUI$ActionScroller(::javax::swing::plaf::basic::BasicSliderUI *, ::javax::swing::JSlider *, jint, jboolean);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$ActionScroller__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h
deleted file mode 100644
index ee9305b54d8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ChangeHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
-#define __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$ChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$ChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSliderUI$ChangeHandler(::javax::swing::plaf::basic::BasicSliderUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$ChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h
deleted file mode 100644
index f192a5bf04f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ComponentHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
-#define __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
-
-#pragma interface
-
-#include <java/awt/event/ComponentAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$ComponentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
-{
-
-public:
-  BasicSliderUI$ComponentHandler(::javax::swing::plaf::basic::BasicSliderUI *);
-  virtual void componentResized(::java::awt::event::ComponentEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h
deleted file mode 100644
index bc91028571d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$FocusHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSliderUI$FocusHandler(::javax::swing::plaf::basic::BasicSliderUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h
deleted file mode 100644
index b03823785a6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSliderUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicSliderUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h
deleted file mode 100644
index 0032d4943cc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$ScrollListener.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
-#define __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$ScrollListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$ScrollListener : public ::java::lang::Object
-{
-
-public:
-  BasicSliderUI$ScrollListener(::javax::swing::plaf::basic::BasicSliderUI *);
-  BasicSliderUI$ScrollListener(::javax::swing::plaf::basic::BasicSliderUI *, jint, jboolean);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual void setDirection(jint);
-  virtual void setScrollByBlock(jboolean);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) direction;
-  jboolean block;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$ScrollListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h b/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h
deleted file mode 100644
index 1d6bda1eb47..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI$TrackListener.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
-#define __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
-
-#pragma interface
-
-#include <javax/swing/event/MouseInputAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$TrackListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI$TrackListener : public ::javax::swing::event::MouseInputAdapter
-{
-
-public:
-  BasicSliderUI$TrackListener(::javax::swing::plaf::basic::BasicSliderUI *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual jboolean shouldScroll(jint);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) currentMouseX;
-  jint currentMouseY;
-  jint offset;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSliderUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI$TrackListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI.h b/libjava/javax/swing/plaf/basic/BasicSliderUI.h
deleted file mode 100644
index cb35faa26b0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSliderUI.h
+++ /dev/null
@@ -1,188 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSliderUI__
-#define __javax_swing_plaf_basic_BasicSliderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SliderUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-      namespace event
-      {
-          class ComponentListener;
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class InputMap;
-        class JComponent;
-        class JSlider;
-        class Timer;
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicSliderUI;
-            class BasicSliderUI$ScrollListener;
-            class BasicSliderUI$TrackListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSliderUI : public ::javax::swing::plaf::SliderUI
-{
-
-public:
-  BasicSliderUI(::javax::swing::JSlider *);
-public: // actually protected
-  virtual jboolean isDragging();
-  virtual ::java::awt::Color * getShadowColor();
-  virtual ::java::awt::Color * getHighlightColor();
-  virtual ::java::awt::Color * getFocusColor();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JSlider *);
-  virtual ::javax::swing::plaf::basic::BasicSliderUI$TrackListener * createTrackListener(::javax::swing::JSlider *);
-  virtual ::javax::swing::event::ChangeListener * createChangeListener(::javax::swing::JSlider *);
-  virtual ::java::awt::event::ComponentListener * createComponentListener(::javax::swing::JSlider *);
-  virtual ::java::awt::event::FocusListener * createFocusListener(::javax::swing::JSlider *);
-  virtual ::javax::swing::plaf::basic::BasicSliderUI$ScrollListener * createScrollListener(::javax::swing::JSlider *);
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JSlider *);
-  virtual void installListeners(::javax::swing::JSlider *);
-  virtual void uninstallListeners(::javax::swing::JSlider *);
-  virtual void installKeyboardActions(::javax::swing::JSlider *);
-  virtual void uninstallKeyboardActions(::javax::swing::JSlider *);
-public:
-  virtual ::java::awt::Dimension * getPreferredHorizontalSize();
-  virtual ::java::awt::Dimension * getPreferredVerticalSize();
-  virtual ::java::awt::Dimension * getMinimumHorizontalSize();
-  virtual ::java::awt::Dimension * getMinimumVerticalSize();
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void calculateGeometry();
-  virtual void calculateFocusRect();
-  virtual void calculateThumbSize();
-  virtual void calculateContentRect();
-  virtual void calculateThumbLocation();
-  virtual void calculateTrackBuffer();
-  virtual ::java::awt::Dimension * getThumbSize();
-  virtual void calculateTrackRect();
-  virtual jint getTickLength();
-  virtual void calculateTickRect();
-  virtual void calculateLabelRect();
-  virtual jint getWidthOfWidestLabel();
-  virtual jint getHeightOfTallestLabel();
-  virtual jint getWidthOfHighValueLabel();
-  virtual jint getWidthOfLowValueLabel();
-  virtual jint getHeightOfHighValueLabel();
-  virtual jint getHeightOfLowValueLabel();
-  virtual jboolean drawInverted();
-  virtual ::java::awt::Component * getLowestValueLabel();
-  virtual ::java::awt::Component * getHighestValueLabel();
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void recalculateIfInsetsChanged();
-  virtual void recalculateIfOrientationChanged();
-public:
-  virtual void paintFocus(::java::awt::Graphics *);
-  virtual void paintTrack(::java::awt::Graphics *);
-  virtual void paintTicks(::java::awt::Graphics *);
-public: // actually protected
-  virtual void paintMinorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMajorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMinorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMajorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-public:
-  virtual void paintLabels(::java::awt::Graphics *);
-public: // actually protected
-  virtual void paintHorizontalLabel(::java::awt::Graphics *, jint, ::java::awt::Component *);
-  virtual void paintVerticalLabel(::java::awt::Graphics *, jint, ::java::awt::Component *);
-public:
-  virtual void paintThumb(::java::awt::Graphics *);
-  virtual void setThumbLocation(jint, jint);
-  virtual void scrollByBlock(jint);
-  virtual void scrollByUnit(jint);
-public: // actually protected
-  virtual void scrollDueToClickInTrack(jint);
-  virtual jint xPositionForValue(jint);
-  virtual jint yPositionForValue(jint);
-public:
-  virtual jint valueForYPosition(jint);
-  virtual jint valueForXPosition(jint);
-public: // actually package-private
-  virtual jint findClosestTick(jint);
-  virtual ::javax::swing::InputMap * getInputMap(jint);
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-private:
-  jboolean hitClip(::java::awt::Graphics *, ::java::awt::Rectangle *);
-public: // actually protected
-  ::javax::swing::event::ChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SliderUI)))) changeListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::plaf::basic::BasicSliderUI$ScrollListener * scrollListener;
-  ::java::awt::event::ComponentListener * componentListener;
-  ::java::awt::event::FocusListener * focusListener;
-  ::javax::swing::plaf::basic::BasicSliderUI$TrackListener * trackListener;
-  ::java::awt::Insets * focusInsets;
-  ::java::awt::Insets * insetCache;
-  ::java::awt::Rectangle * contentRect;
-  ::java::awt::Rectangle * focusRect;
-  ::java::awt::Rectangle * thumbRect;
-  ::java::awt::Rectangle * tickRect;
-  ::java::awt::Rectangle * labelRect;
-  ::java::awt::Rectangle * trackRect;
-public:
-  static const jint MAX_SCROLL = 2;
-  static const jint MIN_SCROLL = -2;
-  static const jint NEGATIVE_SCROLL = -1;
-  static const jint POSITIVE_SCROLL = 1;
-public: // actually protected
-  jint trackBuffer;
-  jboolean leftToRightCache;
-  ::javax::swing::Timer * scrollTimer;
-  ::javax::swing::JSlider * slider;
-private:
-  ::java::awt::Color * shadowColor;
-  ::java::awt::Color * highlightColor;
-  ::java::awt::Color * focusColor;
-public: // actually package-private
-  jboolean dragging;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSliderUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h
deleted file mode 100644
index 267014e841c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$1__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI;
-            class BasicSpinnerUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicSpinnerUI$1(::javax::swing::plaf::basic::BasicSpinnerUI *);
-public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSpinnerUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
deleted file mode 100644
index 5d8697b83c5..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$2__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$2__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI;
-            class BasicSpinnerUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$2 : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  BasicSpinnerUI$2(::javax::swing::plaf::basic::BasicSpinnerUI *);
-public:
-  void mousePressed(::java::awt::event::MouseEvent *);
-  void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  void increment();
-  volatile jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
-  ::javax::swing::Timer * timer;
-  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h
deleted file mode 100644
index 1df1e20cc5f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$3__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI$2;
-            class BasicSpinnerUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicSpinnerUI$3(::javax::swing::plaf::basic::BasicSpinnerUI$2 *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSpinnerUI$2 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
deleted file mode 100644
index 0d9dddce85a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$4__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$4__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI;
-            class BasicSpinnerUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$4 : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually package-private
-  BasicSpinnerUI$4(::javax::swing::plaf::basic::BasicSpinnerUI *);
-public:
-  void mousePressed(::java::awt::event::MouseEvent *);
-  void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  void decrement();
-  volatile jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown;
-  ::javax::swing::Timer * timer;
-  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h
deleted file mode 100644
index f9a941a6559..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$5__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$5__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI$4;
-            class BasicSpinnerUI$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$5 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicSpinnerUI$5(::javax::swing::plaf::basic::BasicSpinnerUI$4 *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSpinnerUI$4 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h
deleted file mode 100644
index 552ee52f5dd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$DefaultLayoutManager.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
-#define __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSpinnerUI;
-            class BasicSpinnerUI$DefaultLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI$DefaultLayoutManager : public ::java::lang::Object
-{
-
-  BasicSpinnerUI$DefaultLayoutManager(::javax::swing::plaf::basic::BasicSpinnerUI *);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-private:
-  ::java::awt::Dimension * prefSize(::java::awt::Component *);
-  void setBounds(::java::awt::Component *, jint, jint, jint, jint);
-public: // actually package-private
-  BasicSpinnerUI$DefaultLayoutManager(::javax::swing::plaf::basic::BasicSpinnerUI *, ::javax::swing::plaf::basic::BasicSpinnerUI$DefaultLayoutManager *);
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) editor;
-  ::java::awt::Component * next;
-  ::java::awt::Component * previous;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSpinnerUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI$DefaultLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h
deleted file mode 100644
index aa148b77187..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSpinnerUI__
-#define __javax_swing_plaf_basic_BasicSpinnerUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SpinnerUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class LayoutManager;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JSpinner;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicSpinnerUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSpinnerUI : public ::javax::swing::plaf::SpinnerUI
-{
-
-public:
-  BasicSpinnerUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::javax::swing::JComponent * createEditor();
-  virtual ::java::awt::LayoutManager * createLayout();
-  virtual ::java::awt::Component * createNextButton();
-  virtual ::java::awt::Component * createPreviousButton();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual void installDefaults();
-  virtual void installListeners();
-  virtual void installNextButtonListeners(::java::awt::Component *);
-  virtual void installPreviousButtonListeners(::java::awt::Component *);
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void replaceEditor(::javax::swing::JComponent *, ::javax::swing::JComponent *);
-  virtual void uninstallDefaults();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  ::javax::swing::JSpinner * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SpinnerUI)))) spinner;
-private:
-  ::java::beans::PropertyChangeListener * listener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSpinnerUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h
deleted file mode 100644
index cd51091307b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$BasicOneTouchButton.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$BasicOneTouchButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$BasicOneTouchButton : public ::javax::swing::JButton
-{
-
-public: // actually package-private
-  BasicSplitPaneDivider$BasicOneTouchButton(::javax::swing::plaf::basic::BasicSplitPaneDivider *, jint);
-public:
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual jboolean isFocusTraversable();
-  virtual void paint(::java::awt::Graphics *);
-public: // actually package-private
-  static const jint LEFT = 0;
-  static const jint RIGHT = 1;
-private:
-  JArray< jint > * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) xpoints;
-  JArray< jint > * ypoints;
-  jint direction;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$BasicOneTouchButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h
deleted file mode 100644
index 418b6dcd845..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$DividerLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$DividerLayout : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicSplitPaneDivider$DividerLayout(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
-public:
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$DividerLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h
deleted file mode 100644
index 902a5725ca3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$DragController;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$DragController : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicSplitPaneDivider$DragController(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::java::awt::event::MouseEvent *);
-  virtual jboolean isValid();
-  virtual jint positionForMouseEvent(::java::awt::event::MouseEvent *);
-  virtual jint getNeededLocation(jint, jint);
-  virtual void continueDrag(jint, jint);
-  virtual void continueDrag(::java::awt::event::MouseEvent *);
-  virtual void completeDrag(jint, jint);
-  virtual void completeDrag(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual jint adjust(jint, jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) offset;
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$DragController__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h
deleted file mode 100644
index bafbfee1b78..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$MouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$MouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  BasicSplitPaneDivider$MouseHandler(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) isDragging;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h
deleted file mode 100644
index bc1538536ea..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$OneTouchAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$OneTouchAction : public ::java::lang::Object
-{
-
-  BasicSplitPaneDivider$OneTouchAction(::javax::swing::plaf::basic::BasicSplitPaneDivider *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  BasicSplitPaneDivider$OneTouchAction(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::javax::swing::plaf::basic::BasicSplitPaneDivider$OneTouchAction *);
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$OneTouchAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h
deleted file mode 100644
index cc1a14915bc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider$VerticalDragController.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSplitPaneDivider$DragController.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$VerticalDragController;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider$VerticalDragController : public ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController
-{
-
-public: // actually protected
-  BasicSplitPaneDivider$VerticalDragController(::javax::swing::plaf::basic::BasicSplitPaneDivider *, ::java::awt::event::MouseEvent *);
-  virtual jint getNeededLocation(jint, jint);
-  virtual jint positionForMouseEvent(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual jint adjust(jint, jint);
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider$VerticalDragController__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h
deleted file mode 100644
index a4c51fc5588..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.h
+++ /dev/null
@@ -1,97 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneDivider__
-#define __javax_swing_plaf_basic_BasicSplitPaneDivider__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JButton;
-        class JSplitPane;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneDivider$DragController;
-            class BasicSplitPaneDivider$MouseHandler;
-            class BasicSplitPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneDivider : public ::java::awt::Container
-{
-
-public:
-  BasicSplitPaneDivider(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void setBasicSplitPaneUI(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual ::javax::swing::plaf::basic::BasicSplitPaneUI * getBasicSplitPaneUI();
-  virtual void setDividerSize(jint);
-  virtual jint getDividerSize();
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual ::javax::swing::border::Border * getBorder();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void paint(::java::awt::Graphics *);
-public: // actually protected
-  virtual void oneTouchExpandableChanged();
-  virtual ::javax::swing::JButton * createLeftOneTouchButton();
-  virtual ::javax::swing::JButton * createRightOneTouchButton();
-  virtual void prepareForDragging();
-  virtual void dragDividerTo(jint);
-  virtual void finishDraggingTo(jint);
-public: // actually package-private
-  virtual void moveDividerTo(jint);
-  static const jlong serialVersionUID = 1463404307042803342LL;
-public: // actually protected
-  static const jint ONE_TOUCH_SIZE = 6;
-  static const jint ONE_TOUCH_OFFSET = 2;
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider$DragController * __attribute__((aligned(__alignof__( ::java::awt::Container)))) dragger;
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * splitPaneUI;
-  jint dividerSize;
-  ::java::awt::Component * hiddenDivider;
-  ::javax::swing::JSplitPane * splitPane;
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider$MouseHandler * mouseHandler;
-  jint orientation;
-  ::javax::swing::JButton * leftButton;
-  ::javax::swing::JButton * rightButton;
-private:
-  ::javax::swing::border::Border * border;
-public: // actually package-private
-  jint currentDividerLocation;
-  jboolean centerOneTouchButtons;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneDivider__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h
deleted file mode 100644
index 0d1602b3068..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$1__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$1__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$1 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$1(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h
deleted file mode 100644
index af65cc5c583..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$2__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$2__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$2 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$2(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h
deleted file mode 100644
index 6dd5e761355..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$3__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$3__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$3 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$3(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$3__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h
deleted file mode 100644
index f66fe4b021d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$4__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$4__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$4;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$4 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$4(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$4__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h
deleted file mode 100644
index c9a3e266e06..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$5.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$5__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$5__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$5;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$5 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$5(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$5__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h
deleted file mode 100644
index 9a4facee9cc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$6.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$6__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$6__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$6;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$6 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$6(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$6__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h
deleted file mode 100644
index d464dded6c9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$7.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$7__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$7__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$7;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$7 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$7(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$7__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h
deleted file mode 100644
index e2248856328..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$8.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$8__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$8__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$8;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$8 : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$8(::javax::swing::plaf::basic::BasicSplitPaneUI *, ::java::lang::String *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$8__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h
deleted file mode 100644
index 7f3b3932f36..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$BasicHorizontalLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicSplitPaneUI$BasicHorizontalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  BasicSplitPaneUI$BasicHorizontalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *, jint);
-public:
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-public: // actually protected
-  virtual jint getAvailableSize(::java::awt::Dimension *, ::java::awt::Insets *);
-  virtual jint getInitialLocation(::java::awt::Insets *);
-public:
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-public: // actually protected
-  virtual jint getPreferredSizeOfComponent(::java::awt::Component *);
-  virtual jint getSizeOfComponent(::java::awt::Component *);
-  virtual JArray< jint > * getSizes();
-public:
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually protected
-  virtual void resetSizeAt(jint);
-public:
-  virtual void resetToPreferredSizes();
-public: // actually protected
-  virtual void setComponentToSize(::java::awt::Component *, jint, jint, ::java::awt::Insets *, ::java::awt::Dimension *);
-  virtual void setSizes(JArray< jint > *);
-  virtual void updateComponents();
-public: // actually package-private
-  virtual void distributeExtraSpace();
-  virtual jint minimumSizeOfComponent(jint);
-public: // actually protected
-  JArray< ::java::awt::Component * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) components;
-  JArray< jint > * sizes;
-private:
-  jint axis;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$BasicHorizontalLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h
deleted file mode 100644
index 47f78ce61c4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$BasicVerticalLayoutManager.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$BasicVerticalLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$BasicVerticalLayoutManager : public ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager
-{
-
-public:
-  BasicSplitPaneUI$BasicVerticalLayoutManager(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$BasicVerticalLayoutManager__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h
deleted file mode 100644
index a338ae8cfb9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
-
-#pragma interface
-
-#include <java/awt/event/FocusAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$FocusHandler : public ::java::awt::event::FocusAdapter
-{
-
-public:
-  BasicSplitPaneUI$FocusHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::FocusAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h
deleted file mode 100644
index 439de5c724a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardDownRightHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$KeyboardDownRightHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardDownRightHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$KeyboardDownRightHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardDownRightHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h
deleted file mode 100644
index 4b474d91246..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardEndHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$KeyboardEndHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardEndHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$KeyboardEndHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardEndHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h
deleted file mode 100644
index 755d657f059..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardHomeHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$KeyboardHomeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardHomeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$KeyboardHomeHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardHomeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h
deleted file mode 100644
index 34e9acdc21c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardResizeToggleHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$KeyboardResizeToggleHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardResizeToggleHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$KeyboardResizeToggleHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardResizeToggleHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h
deleted file mode 100644
index ce00ebc9d91..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$KeyboardUpLeftHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$KeyboardUpLeftHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$KeyboardUpLeftHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$KeyboardUpLeftHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$KeyboardUpLeftHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h
deleted file mode 100644
index 87f023b5fed..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI$PropertyHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$PropertyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI$PropertyHandler : public ::java::lang::Object
-{
-
-public:
-  BasicSplitPaneUI$PropertyHandler(::javax::swing::plaf::basic::BasicSplitPaneUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicSplitPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI$PropertyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h b/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h
deleted file mode 100644
index fdbcb1519f6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicSplitPaneUI.h
+++ /dev/null
@@ -1,149 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicSplitPaneUI__
-#define __javax_swing_plaf_basic_BasicSplitPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SplitPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-      namespace event
-      {
-          class ActionListener;
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class InputMap;
-        class JComponent;
-        class JSplitPane;
-        class KeyStroke;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-            class BasicSplitPaneUI;
-            class BasicSplitPaneUI$BasicHorizontalLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicSplitPaneUI : public ::javax::swing::plaf::SplitPaneUI
-{
-
-public:
-  BasicSplitPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-public: // actually package-private
-  virtual ::javax::swing::InputMap * getInputMap(jint);
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-public: // actually protected
-  virtual void installKeyboardActions();
-  virtual void uninstallKeyboardActions();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::java::awt::event::ActionListener * createKeyboardUpLeftListener();
-  virtual ::java::awt::event::ActionListener * createKeyboardDownRightListener();
-  virtual ::java::awt::event::ActionListener * createKeyboardHomeListener();
-  virtual ::java::awt::event::ActionListener * createKeyboardEndListener();
-  virtual ::java::awt::event::ActionListener * createKeyboardResizeToggleListener();
-public:
-  virtual jint getOrientation();
-  virtual void setOrientation(jint);
-  virtual jboolean isContinuousLayout();
-  virtual void setContinuousLayout(jboolean);
-  virtual jint getLastDragLocation();
-  virtual void setLastDragLocation(jint);
-  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * getDivider();
-public: // actually protected
-  virtual ::java::awt::Component * createDefaultNonContinuousLayoutDivider();
-  virtual void setNonContinuousLayoutDivider(::java::awt::Component *);
-  virtual void setNonContinuousLayoutDivider(::java::awt::Component *, jboolean);
-public:
-  virtual ::java::awt::Component * getNonContinuousLayoutDivider();
-  virtual ::javax::swing::JSplitPane * getSplitPane();
-  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * createDefaultDivider();
-  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *);
-  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint);
-  virtual jint getDividerLocation(::javax::swing::JSplitPane *);
-  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *);
-  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *);
-  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Insets * getInsets(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void resetLayoutManager();
-  virtual void startDragging();
-  virtual void dragDividerTo(jint);
-  virtual void finishDraggingTo(jint);
-  virtual jint getDividerBorderSize();
-private:
-  jint validLocation(jint);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::SplitPaneUI)))) beginDragDividerLocation;
-  jint dividerSize;
-public: // actually package-private
-  jint lastDragLocation;
-public: // actually protected
-  static jint KEYBOARD_DIVIDER_MOVE_OFFSET;
-  ::javax::swing::plaf::basic::BasicSplitPaneDivider * divider;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::java::awt::event::FocusListener * focusListener;
-  ::java::awt::event::ActionListener * keyboardDownRightListener;
-  ::java::awt::event::ActionListener * keyboardEndListener;
-  ::java::awt::event::ActionListener * keyboardHomeListener;
-  ::java::awt::event::ActionListener * keyboardResizeToggleListener;
-  ::java::awt::event::ActionListener * keyboardUpLeftListener;
-  ::javax::swing::plaf::basic::BasicSplitPaneUI$BasicHorizontalLayoutManager * layoutManager;
-  ::javax::swing::KeyStroke * dividerResizeToggleKey;
-  ::javax::swing::KeyStroke * downKey;
-  ::javax::swing::KeyStroke * endKey;
-  ::javax::swing::KeyStroke * homeKey;
-  ::javax::swing::KeyStroke * leftKey;
-  ::javax::swing::KeyStroke * rightKey;
-  ::javax::swing::KeyStroke * upKey;
-  jboolean draggingHW;
-  static ::java::lang::String * NON_CONTINUOUS_DIVIDER;
-  ::java::awt::Component * nonContinuousLayoutDivider;
-  ::javax::swing::JSplitPane * splitPane;
-public: // actually package-private
-  jboolean dividerLocationSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h
deleted file mode 100644
index 4545f105d1d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$FocusHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
-
-#pragma interface
-
-#include <java/awt/event/FocusAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$FocusHandler : public ::java::awt::event::FocusAdapter
-{
-
-public:
-  BasicTabbedPaneUI$FocusHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::FocusAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h
deleted file mode 100644
index c36fc50205b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$MouseHandler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$MouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$MouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  BasicTabbedPaneUI$MouseHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void redispatchEvent(::java::awt::event::MouseEvent *);
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h
deleted file mode 100644
index 17596c23215..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigateAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$NavigateAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigateAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicTabbedPaneUI$NavigateAction(::java::lang::String *, jint);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigateAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h
deleted file mode 100644
index 52e7e35cdc7..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageDownAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$NavigatePageDownAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigatePageDownAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTabbedPaneUI$NavigatePageDownAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageDownAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h
deleted file mode 100644
index c5195afb580..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$NavigatePageUpAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$NavigatePageUpAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$NavigatePageUpAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTabbedPaneUI$NavigatePageUpAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$NavigatePageUpAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h
deleted file mode 100644
index 09e568fe4de..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTabbedPaneUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h
deleted file mode 100644
index 1ee8f725be1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$RequestFocusAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$RequestFocusAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTabbedPaneUI$RequestFocusAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h
deleted file mode 100644
index cbb776a3474..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$RequestFocusForVisibleComponentAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$RequestFocusForVisibleComponentAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$RequestFocusForVisibleComponentAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTabbedPaneUI$RequestFocusForVisibleComponentAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$RequestFocusForVisibleComponentAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h
deleted file mode 100644
index 895072d427e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingButton.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicArrowButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$ScrollingButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton : public ::javax::swing::plaf::basic::BasicArrowButton
-{
-
-public:
-  BasicTabbedPaneUI$ScrollingButton(::javax::swing::plaf::basic::BasicTabbedPaneUI *, jint);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicArrowButton)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingButton__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h
deleted file mode 100644
index d896ca00a56..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicPanelUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI$ScrollingPanel;
-            class BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI : public ::javax::swing::plaf::basic::BasicPanelUI
-{
-
-  BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually package-private
-  BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI *);
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicPanelUI)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel$ScrollingPanelUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h
deleted file mode 100644
index 4c1d483448c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingPanel.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
-
-#pragma interface
-
-#include <javax/swing/JPanel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$ScrollingPanel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel : public ::javax::swing::JPanel
-{
-
-  BasicTabbedPaneUI$ScrollingPanel(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-public:
-  virtual void updateUI();
-public: // actually package-private
-  BasicTabbedPaneUI$ScrollingPanel(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
-  static ::javax::swing::plaf::basic::BasicTabbedPaneUI * access$1(::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel *);
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::JPanel)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingPanel__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h
deleted file mode 100644
index 2469bbe27e0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$ScrollingViewport.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
-
-#pragma interface
-
-#include <javax/swing/JViewport.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$ScrollingViewport;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport : public ::javax::swing::JViewport
-{
-
-  BasicTabbedPaneUI$ScrollingViewport(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-public: // actually package-private
-  BasicTabbedPaneUI$ScrollingViewport(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport *);
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::JViewport)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$ScrollingViewport__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h
deleted file mode 100644
index ad26176e00e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabSelectionHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$TabSelectionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$TabSelectionHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTabbedPaneUI$TabSelectionHandler(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h
deleted file mode 100644
index a56abd9f4c8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$TabbedPaneLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout : public ::java::lang::Object
-{
-
-public:
-  BasicTabbedPaneUI$TabbedPaneLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void calculateLayoutInfo();
-public: // actually protected
-  virtual ::java::awt::Dimension * calculateSize(jboolean);
-  virtual void calculateTabRects(jint, jint);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-public: // actually protected
-  virtual void normalizeTabRuns(jint, jint, jint, jint);
-  virtual void padSelectedTab(jint, jint);
-  virtual void padTabRun(jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-public: // actually protected
-  virtual jint preferredTabAreaHeight(jint, jint);
-  virtual jint preferredTabAreaWidth(jint, jint);
-  virtual void rotateTabRuns(jint, jint);
-public:
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h
deleted file mode 100644
index 87642f720ab..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$TabbedPaneScrollLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneScrollLayout : public ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout
-{
-
-  BasicTabbedPaneUI$TabbedPaneScrollLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *);
-public:
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-public: // actually protected
-  virtual jint preferredTabAreaHeight(jint, jint);
-  virtual jint preferredTabAreaWidth(jint, jint);
-  virtual void calculateTabRects(jint, jint);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-public: // actually package-private
-  BasicTabbedPaneUI$TabbedPaneScrollLayout(::javax::swing::plaf::basic::BasicTabbedPaneUI *, ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneScrollLayout *);
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI$TabbedPaneScrollLayout__
diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h
deleted file mode 100644
index a20eedbb569..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.h
+++ /dev/null
@@ -1,223 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTabbedPaneUI__
-#define __javax_swing_plaf_basic_BasicTabbedPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TabbedPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Insets;
-        class LayoutManager;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-          class MouseListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class Icon;
-        class JComponent;
-        class JTabbedPane;
-        class KeyStroke;
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTabbedPaneUI;
-            class BasicTabbedPaneUI$ScrollingButton;
-            class BasicTabbedPaneUI$ScrollingPanel;
-            class BasicTabbedPaneUI$ScrollingViewport;
-        }
-      }
-      namespace text
-      {
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTabbedPaneUI : public ::javax::swing::plaf::TabbedPaneUI
-{
-
-public:
-  BasicTabbedPaneUI();
-public: // actually package-private
-  virtual ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * createIncreaseButton();
-  virtual ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * createDecreaseButton();
-  virtual ::java::awt::Point * findPointForIndex(jint);
-  virtual void scrollTab(jint, jint);
-  virtual void updateButtons();
-  virtual void updateViewPosition();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual void installComponents();
-  virtual void uninstallComponents();
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void installListeners();
-  virtual void uninstallListeners();
-  virtual ::java::awt::event::MouseListener * createMouseListener();
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::javax::swing::event::ChangeListener * createChangeListener();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual void installKeyboardActions();
-  virtual void uninstallKeyboardActions();
-public:
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintTabArea(::java::awt::Graphics *, jint, jint);
-  virtual void paintTab(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  virtual void layoutLabel(jint, ::java::awt::FontMetrics *, jint, ::java::lang::String *, ::javax::swing::Icon *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
-  virtual void paintIcon(::java::awt::Graphics *, jint, jint, ::javax::swing::Icon *, ::java::awt::Rectangle *, jboolean);
-  virtual void paintText(::java::awt::Graphics *, jint, ::java::awt::Font *, ::java::awt::FontMetrics *, jint, ::java::lang::String *, ::java::awt::Rectangle *, jboolean);
-  virtual jint getTabLabelShiftX(jint, jint, jboolean);
-  virtual jint getTabLabelShiftY(jint, jint, jboolean);
-  virtual void paintFocusIndicator(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
-  virtual void paintTabBorder(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintTabBackground(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintContentBorder(::java::awt::Graphics *, jint, jint);
-  virtual void paintContentBorderTopEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderLeftEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderBottomEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderRightEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint);
-  virtual jint getTabRunCount(::javax::swing::JTabbedPane *);
-  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint);
-public: // actually protected
-  virtual ::java::awt::Rectangle * getTabBounds(jint, ::java::awt::Rectangle *);
-  virtual ::java::awt::Component * getVisibleComponent();
-  virtual void setVisibleComponent(::java::awt::Component *);
-  virtual void assureRectsCreated(jint);
-  virtual void expandTabRunsArray();
-  virtual jint getRunForTab(jint, jint);
-  virtual jint lastTabInRun(jint, jint);
-  virtual jint getTabRunOverlay(jint);
-  virtual jint getTabRunIndent(jint, jint);
-  virtual jboolean shouldPadTabRun(jint, jint);
-  virtual jboolean shouldRotateTabRuns(jint);
-  virtual ::javax::swing::Icon * getIconForTab(jint);
-  virtual ::javax::swing::text::View * getTextViewForTab(jint);
-  virtual jint calculateTabHeight(jint, jint, jint);
-  virtual jint calculateMaxTabHeight(jint);
-  virtual jint calculateTabWidth(jint, jint, ::java::awt::FontMetrics *);
-  virtual jint calculateMaxTabWidth(jint);
-  virtual jint calculateTabAreaHeight(jint, jint, jint);
-  virtual jint calculateTabAreaWidth(jint, jint, jint);
-  virtual ::java::awt::Insets * getTabInsets(jint, jint);
-  virtual ::java::awt::Insets * getSelectedTabPadInsets(jint);
-  virtual ::java::awt::Insets * getTabAreaInsets(jint);
-  virtual ::java::awt::Insets * getContentBorderInsets(jint);
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual void navigateSelectedTab(jint);
-  virtual void selectNextTabInRun(jint);
-  virtual void selectPreviousTabInRun(jint);
-  virtual void selectNextTab(jint);
-  virtual void selectPreviousTab(jint);
-  virtual void selectAdjacentRunTab(jint, jint, jint);
-  virtual jint getTabRunOffset(jint, jint, jint, jboolean);
-  virtual jint getPreviousTabIndex(jint);
-  virtual jint getNextTabIndex(jint);
-  virtual jint getNextTabIndexInRun(jint, jint);
-  virtual jint getPreviousTabIndexInRun(jint, jint);
-  virtual jint getPreviousTabRun(jint);
-  virtual jint getNextTabRun(jint);
-  static void rotateInsets(::java::awt::Insets *, ::java::awt::Insets *, jint);
-public: // actually package-private
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-public: // actually protected
-  virtual void setRolloverTab(jint);
-  virtual jint getRolloverTab();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TabbedPaneUI)))) incrButton;
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingButton * decrButton;
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingViewport * viewport;
-  ::javax::swing::plaf::basic::BasicTabbedPaneUI$ScrollingPanel * panel;
-  jint currentScrollLocation;
-  jint currentScrollOffset;
-public: // actually protected
-  ::java::awt::Rectangle * calcRect;
-  JArray< ::java::awt::Rectangle * > * rects;
-  ::java::awt::Insets * contentBorderInsets;
-  ::java::awt::Insets * selectedTabPadInsets;
-  ::java::awt::Insets * tabAreaInsets;
-  ::java::awt::Insets * tabInsets;
-  ::java::awt::Color * darkShadow;
-  ::java::awt::Color * focus;
-  ::java::awt::Color * highlight;
-  ::java::awt::Color * lightHighlight;
-  ::java::awt::Color * shadow;
-  jint maxTabHeight;
-  jint maxTabWidth;
-  jint runCount;
-  jint selectedRun;
-  jint tabRunOverlay;
-  jint textIconGap;
-  JArray< jint > * tabRuns;
-public: // actually package-private
-  jboolean tabRunsDirty;
-public: // actually protected
-  ::javax::swing::KeyStroke * downKey;
-  ::javax::swing::KeyStroke * leftKey;
-  ::javax::swing::KeyStroke * rightKey;
-  ::javax::swing::KeyStroke * upKey;
-  ::java::awt::event::FocusListener * focusListener;
-  ::java::awt::event::MouseListener * mouseListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::event::ChangeListener * tabChangeListener;
-  ::javax::swing::JTabbedPane * tabPane;
-public: // actually package-private
-  ::java::awt::LayoutManager * layoutManager;
-  ::java::awt::Rectangle * tabAreaRect;
-  ::java::awt::Rectangle * contentRect;
-private:
-  jint rolloverTab;
-  jboolean tabsOpaque;
-  ::java::awt::Component * visibleComponent;
-  ::java::awt::Color * selectedColor;
-  ::java::awt::Rectangle * tempTextRect;
-  ::java::awt::Rectangle * tempIconRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h
deleted file mode 100644
index 76e0a4d77c3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI$1__
-#define __javax_swing_plaf_basic_BasicTableHeaderUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableHeaderUI$1;
-            class BasicTableHeaderUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableHeaderUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTableHeaderUI$1(::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler *);
-public:
-  void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableHeaderUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h
deleted file mode 100644
index 379f3ac293f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableHeaderUI;
-            class BasicTableHeaderUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTableHeaderUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTableHeaderUI *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void endResizing();
-  virtual void endDragging(::java::awt::event::MouseEvent *);
-  static ::javax::swing::plaf::basic::BasicTableHeaderUI * access$0(::javax::swing::plaf::basic::BasicTableHeaderUI$MouseInputHandler *);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) showingResizeCursor;
-  jint draggingFrom;
-  jint draggingColumnNumber;
-  jint prevPrefWidth;
-  ::javax::swing::Timer * timer;
-  ::javax::swing::plaf::basic::BasicTableHeaderUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableHeaderUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h
deleted file mode 100644
index 4a31c132e4a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableHeaderUI__
-#define __javax_swing_plaf_basic_BasicTableHeaderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TableHeaderUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Cursor;
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class CellRendererPane;
-        class JComponent;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTableHeaderUI;
-        }
-      }
-      namespace table
-      {
-          class JTableHeader;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableHeaderUI : public ::javax::swing::plaf::TableHeaderUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
-public:
-  BasicTableHeaderUI();
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually package-private
-  static void access$0(::javax::swing::plaf::basic::BasicTableHeaderUI *, ::java::awt::Cursor *);
-  static ::java::awt::Cursor * access$1(::javax::swing::plaf::basic::BasicTableHeaderUI *);
-  static jint COLUMN_BOUNDARY_TOLERANCE;
-public: // actually protected
-  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableHeaderUI)))) header;
-  ::javax::swing::event::MouseInputListener * mouseInputListener;
-  ::javax::swing::CellRendererPane * rendererPane;
-private:
-  ::javax::swing::border::Border * cellBorder;
-  ::java::awt::Cursor * originalCursor;
-public: // actually package-private
-  ::java::awt::Rectangle * draggingHeaderRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableHeaderUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h
deleted file mode 100644
index e7ff31e5d6d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$FocusHandler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableUI;
-            class BasicTableUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI$FocusHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTableUI$FocusHandler(::javax::swing::plaf::basic::BasicTableUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-private:
-  void repaintLeadCell();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h
deleted file mode 100644
index f70e6d3c8dc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$KeyHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
-#define __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableUI;
-            class BasicTableUI$KeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI$KeyHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTableUI$KeyHandler(::javax::swing::plaf::basic::BasicTableUI *);
-  virtual void keyTyped(::java::awt::event::KeyEvent *);
-  virtual void keyPressed(::java::awt::event::KeyEvent *);
-  virtual void keyReleased(::java::awt::event::KeyEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h
deleted file mode 100644
index a0fb583afe0..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$MouseInputHandler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableUI;
-            class BasicTableUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTableUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTableUI *);
-private:
-  void updateSelection(jboolean);
-public:
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::java::awt::Point * __attribute__((aligned(__alignof__( ::java::lang::Object)))) begin;
-  ::java::awt::Point * curr;
-  ::javax::swing::plaf::basic::BasicTableUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h
deleted file mode 100644
index e51aad5c042..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableUI;
-            class BasicTableUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicTableUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTableUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicTableUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTableUI *, ::javax::swing::plaf::basic::BasicTableUI$PropertyChangeHandler *);
-  ::javax::swing::plaf::basic::BasicTableUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h b/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h
deleted file mode 100644
index 44a245c51cc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI$TableAction.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI$TableAction__
-#define __javax_swing_plaf_basic_BasicTableUI$TableAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-        class ListSelectionModel;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTableUI$TableAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI$TableAction : public ::javax::swing::AbstractAction
-{
-
-  BasicTableUI$TableAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  virtual jint getFirstVisibleColumnIndex(::javax::swing::JTable *);
-  virtual jint getLastVisibleColumnIndex(::javax::swing::JTable *);
-  virtual jint getFirstVisibleRowIndex(::javax::swing::JTable *);
-  virtual jint getLastVisibleRowIndex(::javax::swing::JTable *);
-  virtual void advanceMultipleSelection(::javax::swing::JTable *, ::javax::swing::ListSelectionModel *, jint, jint, ::javax::swing::ListSelectionModel *, jint, jint, jboolean, jboolean);
-  virtual void advanceSingleSelection(::javax::swing::ListSelectionModel *, jint, ::javax::swing::ListSelectionModel *, jint, jboolean);
-  BasicTableUI$TableAction(::javax::swing::plaf::basic::BasicTableUI$TableAction *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI$TableAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI.h b/libjava/javax/swing/plaf/basic/BasicTableUI.h
deleted file mode 100644
index 6abd88fcbfe..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTableUI.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTableUI__
-#define __javax_swing_plaf_basic_BasicTableUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TableUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-          class KeyListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class CellRendererPane;
-        class JComponent;
-        class JTable;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTableUI;
-            class BasicTableUI$TableAction;
-        }
-      }
-      namespace table
-      {
-          class TableCellRenderer;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTableUI : public ::javax::swing::plaf::TableUI
-{
-
-public:
-  BasicTableUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::javax::swing::event::MouseInputListener * createMouseInputListener();
-  virtual ::java::awt::event::KeyListener * createKeyListener();
-public:
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-private:
-  jint getHeight();
-public: // actually protected
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-public: // actually protected
-  virtual void installListeners();
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually package-private
-  virtual void paintCell(::java::awt::Graphics *, jint, jint, ::java::awt::Rectangle *, ::javax::swing::table::TableCellRenderer *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  ::java::awt::event::FocusListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableUI)))) focusListener;
-  ::java::awt::event::KeyListener * keyListener;
-  ::javax::swing::event::MouseInputListener * mouseInputListener;
-  ::javax::swing::CellRendererPane * rendererPane;
-  ::javax::swing::JTable * table;
-public: // actually package-private
-  ::javax::swing::border::Border * cellBorder;
-  ::javax::swing::plaf::basic::BasicTableUI$TableAction * action;
-private:
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTableUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h b/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h
deleted file mode 100644
index c05b92a0c88..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextAreaUI.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextAreaUI__
-#define __javax_swing_plaf_basic_BasicTextAreaUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTextAreaUI;
-        }
-      }
-      namespace text
-      {
-          class Element;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextAreaUI : public ::javax::swing::plaf::basic::BasicTextUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  BasicTextAreaUI();
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextAreaUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h b/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h
deleted file mode 100644
index be9a77ca0ed..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextFieldUI.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextFieldUI__
-#define __javax_swing_plaf_basic_BasicTextFieldUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTextFieldUI;
-        }
-      }
-      namespace text
-      {
-          class Element;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextFieldUI : public ::javax::swing::plaf::basic::BasicTextUI
-{
-
-public:
-  BasicTextFieldUI();
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextFieldUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h b/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h
deleted file mode 100644
index 62d9deb3f35..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextPaneUI.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextPaneUI__
-#define __javax_swing_plaf_basic_BasicTextPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicEditorPaneUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTextPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextPaneUI : public ::javax::swing::plaf::basic::BasicEditorPaneUI
-{
-
-public:
-  BasicTextPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextPaneUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$1.h b/libjava/javax/swing/plaf/basic/BasicTextUI$1.h
deleted file mode 100644
index 8736761e504..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$1.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$1__
-#define __javax_swing_plaf_basic_BasicTextUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTextUI$1(::javax::swing::plaf::basic::BasicTextUI *);
-public:
-  void focusGained(::java::awt::event::FocusEvent *);
-  void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
deleted file mode 100644
index c89238e10d4..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicCaret.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
-#define __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultCaret.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI$BasicCaret;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$BasicCaret : public ::javax::swing::text::DefaultCaret
-{
-
-public:
-  BasicTextUI$BasicCaret();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$BasicCaret__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h b/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h
deleted file mode 100644
index 657f780f93d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$BasicHighlighter.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
-#define __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultHighlighter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI$BasicHighlighter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$BasicHighlighter : public ::javax::swing::text::DefaultHighlighter
-{
-
-public:
-  BasicTextUI$BasicHighlighter();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$BasicHighlighter__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h
deleted file mode 100644
index 38e9f49998a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
-#define __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$DocumentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$DocumentHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTextUI$DocumentHandler(::javax::swing::plaf::basic::BasicTextUI *);
-public:
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
deleted file mode 100644
index 05267889e7a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$FocusHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$FocusHandler : public ::java::lang::Object
-{
-
-  BasicTextUI$FocusHandler();
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  BasicTextUI$FocusHandler(::javax::swing::plaf::basic::BasicTextUI$FocusHandler *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h
deleted file mode 100644
index a8ca57be7bd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$Handler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$Handler__
-#define __javax_swing_plaf_basic_BasicTextUI$Handler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$Handler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$Handler : public ::java::lang::Object
-{
-
-  BasicTextUI$Handler(::javax::swing::plaf::basic::BasicTextUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
-public: // actually package-private
-  BasicTextUI$Handler(::javax::swing::plaf::basic::BasicTextUI *, ::javax::swing::plaf::basic::BasicTextUI$Handler *);
-  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$Handler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h
deleted file mode 100644
index bba4ad46b7b..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTextUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicTextUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTextUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicTextUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTextUI *, ::javax::swing::plaf::basic::BasicTextUI$PropertyChangeHandler *);
-  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h b/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
deleted file mode 100644
index 33044598a04..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$RootView.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$RootView__
-#define __javax_swing_plaf_basic_BasicTextUI$RootView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$RootView;
-        }
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$RootView : public ::javax::swing::text::View
-{
-
-public:
-  BasicTextUI$RootView(::javax::swing::plaf::basic::BasicTextUI *);
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-  virtual void setView(::javax::swing::text::View *);
-  virtual ::javax::swing::text::View * getView(jint);
-  virtual jint getViewCount();
-  virtual ::java::awt::Container * getContainer();
-  virtual void setSize(jfloat, jfloat);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getMaximumSpan(jint);
-private:
-  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) view;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTextUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$RootView__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI.h b/libjava/javax/swing/plaf/basic/BasicTextUI.h
deleted file mode 100644
index f96f1332309..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI__
-#define __javax_swing_plaf_basic_BasicTextUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TextUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class InputMap;
-        class JComponent;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$Handler;
-            class BasicTextUI$RootView;
-        }
-      }
-      namespace text
-      {
-          class Caret;
-          class EditorKit;
-          class Element;
-          class Highlighter;
-          class JTextComponent;
-          class Keymap;
-          class Position$Bias;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI : public ::javax::swing::plaf::TextUI
-{
-
-public:
-  BasicTextUI();
-public: // actually protected
-  virtual ::javax::swing::text::Caret * createCaret();
-  virtual ::javax::swing::text::Highlighter * createHighlighter();
-  virtual ::javax::swing::text::JTextComponent * getComponent();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-private:
-  void installFixedDefaults();
-public: // actually protected
-  virtual void installListeners();
-  virtual ::java::lang::String * getKeymapName();
-  virtual ::javax::swing::text::Keymap * createKeymap();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createActionMap();
-  ::javax::swing::InputMap * getInputMap();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults();
-private:
-  void uninstallFixedDefaults();
-public: // actually protected
-  virtual void uninstallListeners();
-  virtual void uninstallKeyboardActions();
-  virtual ::java::lang::String * getPropertyPrefix() = 0;
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintSafely(::java::awt::Graphics *);
-  virtual void paintBackground(::java::awt::Graphics *);
-public:
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint);
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *);
-  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
-  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *);
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint);
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *, jint, jint);
-public: // actually protected
-  virtual ::java::awt::Rectangle * getVisibleEditorRect();
-  virtual void setView(::javax::swing::text::View *);
-  virtual void modelChanged();
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-private:
-  static ::java::awt::event::FocusListener * focusListener;
-  static ::javax::swing::text::EditorKit * kit;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTextUI$Handler * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TextUI)))) handler;
-  ::javax::swing::plaf::basic::BasicTextUI$RootView * rootView;
-  ::javax::swing::text::JTextComponent * textComponent;
-private:
-  ::java::awt::Insets * cachedInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h
deleted file mode 100644
index 45a77348c9a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToggleButtonUI__
-#define __javax_swing_plaf_basic_BasicToggleButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicToggleButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToggleButtonUI : public ::javax::swing::plaf::basic::BasicButtonUI
-{
-
-public:
-  BasicToggleButtonUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::lang::String * getPropertyPrefix();
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintIcon(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToggleButtonUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h b/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h
deleted file mode 100644
index a277f3293bd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarSeparatorUI.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
-#define __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JSeparator;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicToolBarSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
-{
-
-public:
-  BasicToolBarSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JSeparator *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-private:
-  ::java::awt::Dimension * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSeparatorUI)))) size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarSeparatorUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h
deleted file mode 100644
index 36511145a51..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
-#define __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JToolBar;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$DockingListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$DockingListener : public ::java::lang::Object
-{
-
-public:
-  BasicToolBarUI$DockingListener(::javax::swing::plaf::basic::BasicToolBarUI *, ::javax::swing::JToolBar *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isDragging;
-  ::java::awt::Point * origin;
-  ::javax::swing::JToolBar * toolBar;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$DockingListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h
deleted file mode 100644
index 0545be03f3f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$DragWindow.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
-#define __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
-
-#pragma interface
-
-#include <java/awt/Window.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Insets;
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$DragWindow;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$DragWindow : public ::java::awt::Window
-{
-
-public: // actually package-private
-  BasicToolBarUI$DragWindow(::javax::swing::plaf::basic::BasicToolBarUI *);
-public:
-  virtual ::java::awt::Color * getBorderColor();
-  virtual ::java::awt::Insets * getInsets();
-  virtual ::java::awt::Point * getOffset();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void setBorderColor(::java::awt::Color *);
-  virtual void setOffset(::java::awt::Point *);
-  virtual void setOrientation(jint);
-private:
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::java::awt::Window)))) borderColor;
-  ::java::awt::Point * offset;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$DragWindow__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h
deleted file mode 100644
index 6041d7403fa..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$FrameListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
-#define __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
-
-#pragma interface
-
-#include <java/awt/event/WindowAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class WindowEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$FrameListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$FrameListener : public ::java::awt::event::WindowAdapter
-{
-
-public: // actually protected
-  BasicToolBarUI$FrameListener(::javax::swing::plaf::basic::BasicToolBarUI *);
-public:
-  virtual void windowClosing(::java::awt::event::WindowEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::awt::event::WindowAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$FrameListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h
deleted file mode 100644
index 39dafa84aba..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
-#define __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$PropertyListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$PropertyListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicToolBarUI$PropertyListener(::javax::swing::plaf::basic::BasicToolBarUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$PropertyListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h
deleted file mode 100644
index ff10a58dd0a..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
-#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI$ToolBarAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$ToolBarAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually package-private
-  BasicToolBarUI$ToolBarAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h
deleted file mode 100644
index bcdc5378b59..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarBorder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
-#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI$ToolBarBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$ToolBarBorder : public ::java::lang::Object
-{
-
-  BasicToolBarUI$ToolBarBorder();
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-private:
-  void paintBumps(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *);
-public:
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static const jint offset = 10;
-  static const jint regular = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarBorder__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h
deleted file mode 100644
index 0b5d6690dbb..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
-#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ContainerEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$ToolBarContListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicToolBarUI$ToolBarContListener(::javax::swing::plaf::basic::BasicToolBarUI *);
-public:
-  virtual void componentAdded(::java::awt::event::ContainerEvent *);
-  virtual void componentRemoved(::java::awt::event::ContainerEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarContListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h
deleted file mode 100644
index b7ee7b89fdc..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarDialog.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
-#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
-
-#pragma interface
-
-#include <javax/swing/JDialog.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$ToolBarDialog;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$ToolBarDialog : public ::javax::swing::JDialog
-{
-
-public:
-  BasicToolBarUI$ToolBarDialog(::javax::swing::plaf::basic::BasicToolBarUI *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::JDialog)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarDialog__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h
deleted file mode 100644
index 4b5f7de7228..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI$ToolBarFocusListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
-#define __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$ToolBarFocusListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI$ToolBarFocusListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  BasicToolBarUI$ToolBarFocusListener(::javax::swing::plaf::basic::BasicToolBarUI *);
-public:
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicToolBarUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI$ToolBarFocusListener__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI.h b/libjava/javax/swing/plaf/basic/BasicToolBarUI.h
deleted file mode 100644
index 3b3c1497818..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolBarUI.h
+++ /dev/null
@@ -1,170 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolBarUI__
-#define __javax_swing_plaf_basic_BasicToolBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ToolBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Container;
-        class Dimension;
-        class Point;
-        class Window;
-      namespace event
-      {
-          class ContainerListener;
-          class FocusListener;
-          class WindowListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class JComponent;
-        class JFrame;
-        class JToolBar;
-        class KeyStroke;
-        class RootPaneContainer;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicToolBarUI;
-            class BasicToolBarUI$DragWindow;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolBarUI : public ::javax::swing::plaf::ToolBarUI
-{
-
-public:
-  BasicToolBarUI();
-  virtual jboolean canDock(::java::awt::Component *, ::java::awt::Point *);
-private:
-  jint areaOfClick(::java::awt::Component *, ::java::awt::Point *);
-public: // actually protected
-  virtual ::javax::swing::event::MouseInputListener * createDockingListener();
-  virtual ::javax::swing::plaf::basic::BasicToolBarUI$DragWindow * createDragWindow(::javax::swing::JToolBar *);
-  virtual ::javax::swing::JFrame * createFloatingFrame(::javax::swing::JToolBar *);
-  virtual ::javax::swing::RootPaneContainer * createFloatingWindow(::javax::swing::JToolBar *);
-  virtual ::java::awt::event::WindowListener * createFrameListener();
-  virtual ::javax::swing::border::Border * createNonRolloverBorder();
-  virtual ::java::beans::PropertyChangeListener * createPropertyListener();
-  virtual ::javax::swing::border::Border * createRolloverBorder();
-  virtual ::java::awt::event::ContainerListener * createToolBarContListener();
-  virtual ::java::awt::event::FocusListener * createToolBarFocusListener();
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void dragTo(::java::awt::Point *, ::java::awt::Point *);
-  virtual void floatAt(::java::awt::Point *, ::java::awt::Point *);
-public:
-  virtual ::java::awt::Color * getDockingColor();
-  virtual ::java::awt::Color * getFloatingColor();
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installComponents();
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-public: // actually protected
-  virtual void installListeners();
-  virtual void installNonRolloverBorders(::javax::swing::JComponent *);
-  virtual void installNormalBorders(::javax::swing::JComponent *);
-  virtual void installRolloverBorders(::javax::swing::JComponent *);
-private:
-  void fillHashtable();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual jboolean isFloating();
-  virtual jboolean isRolloverBorders();
-public: // actually protected
-  virtual void navigateFocusedComp(jint);
-  virtual void setBorderToNonRollover(::java::awt::Component *);
-  virtual void setBorderToNormal(::java::awt::Component *);
-  virtual void setBorderToRollover(::java::awt::Component *);
-public:
-  virtual void setDockingColor(::java::awt::Color *);
-  virtual void setFloating(jboolean, ::java::awt::Point *);
-  virtual void setFloatingColor(::java::awt::Color *);
-  virtual void setFloatingLocation(jint, jint);
-  virtual void setOrientation(jint);
-  virtual void setRolloverBorders(jboolean);
-public: // actually protected
-  virtual void uninstallComponents();
-  virtual void uninstallDefaults();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallListeners();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually package-private
-  static ::javax::swing::JFrame * owner;
-private:
-  static ::javax::swing::border::Border * nonRolloverBorder;
-  static ::javax::swing::border::Border * rolloverBorder;
-public: // actually protected
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolBarUI)))) constraintBeforeFloating;
-public: // actually package-private
-  jint lastGoodOrientation;
-public: // actually protected
-  ::java::awt::Color * dockingBorderColor;
-  ::java::awt::Color * dockingColor;
-  ::javax::swing::event::MouseInputListener * dockingListener;
-  ::javax::swing::plaf::basic::BasicToolBarUI$DragWindow * dragWindow;
-  ::java::awt::Color * floatingBorderColor;
-  ::java::awt::Color * floatingColor;
-  jint focusedCompIndex;
-  ::java::beans::PropertyChangeListener * propertyListener;
-  ::javax::swing::JToolBar * toolBar;
-  ::java::awt::event::ContainerListener * toolBarContListener;
-  ::java::awt::event::FocusListener * toolBarFocusListener;
-  ::javax::swing::KeyStroke * leftKey;
-  ::javax::swing::KeyStroke * rightKey;
-  ::javax::swing::KeyStroke * upKey;
-  ::javax::swing::KeyStroke * downKey;
-private:
-  ::java::awt::Window * floatFrame;
-public: // actually package-private
-  ::java::awt::Container * origParent;
-  ::java::util::Hashtable * borders;
-private:
-  ::java::awt::event::WindowListener * windowListener;
-public: // actually package-private
-  ::java::awt::Dimension * cachedBounds;
-  jint cachedOrientation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolBarUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h
deleted file mode 100644
index 9bc19d1ba82..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolTipUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicToolTipUI;
-            class BasicToolTipUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolTipUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicToolTipUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicToolTipUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicToolTipUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicToolTipUI *, ::javax::swing::plaf::basic::BasicToolTipUI$PropertyChangeHandler *);
-  ::javax::swing::plaf::basic::BasicToolTipUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolTipUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicToolTipUI.h b/libjava/javax/swing/plaf/basic/BasicToolTipUI.h
deleted file mode 100644
index a204e00e1e1..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicToolTipUI.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicToolTipUI__
-#define __javax_swing_plaf_basic_BasicToolTipUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ToolTipUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicToolTipUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicToolTipUI : public ::javax::swing::plaf::ToolTipUI
-{
-
-public:
-  BasicToolTipUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JComponent *);
-  virtual void installListeners(::javax::swing::JComponent *);
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults(::javax::swing::JComponent *);
-  virtual void uninstallListeners(::javax::swing::JComponent *);
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-private:
-  static ::javax::swing::plaf::basic::BasicToolTipUI * shared;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolTipUI)))) text;
-  ::java::beans::PropertyChangeListener * propertyChangeHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicToolTipUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h
deleted file mode 100644
index 944d09abf9d..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$1.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$1__
-#define __javax_swing_plaf_basic_BasicTreeUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTreeUI$1(::javax::swing::plaf::basic::BasicTreeUI *);
-public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h
deleted file mode 100644
index d71232d451f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$2__
-#define __javax_swing_plaf_basic_BasicTreeUI$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTreeUI$2(::javax::swing::plaf::basic::BasicTreeUI *);
-public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$2__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
deleted file mode 100644
index 07bc329e3c3..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$CellEditorHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$CellEditorHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$CellEditorHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$CellEditorHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
-  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$CellEditorHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h
deleted file mode 100644
index ec6d8185735..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$ComponentHandler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
-
-#pragma interface
-
-#include <java/awt/event/ComponentAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-          class ComponentEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JScrollBar;
-        class JScrollPane;
-        class Timer;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$ComponentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$ComponentHandler : public ::java::awt::event::ComponentAdapter
-{
-
-public:
-  BasicTreeUI$ComponentHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void componentMoved(::java::awt::event::ComponentEvent *);
-public: // actually protected
-  virtual void startTimer();
-  virtual ::javax::swing::JScrollPane * getScrollPane();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  ::javax::swing::Timer * __attribute__((aligned(__alignof__( ::java::awt::event::ComponentAdapter)))) timer;
-  ::javax::swing::JScrollBar * scrollBar;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$ComponentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h
deleted file mode 100644
index 232e989a2e9..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$FocusHandler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$FocusHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$FocusHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$FocusHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  virtual void repaintLeadRow();
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$FocusHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h
deleted file mode 100644
index 2be990a8ea5..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$KeyHandler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
-
-#pragma interface
-
-#include <java/awt/event/KeyAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$KeyHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$KeyHandler : public ::java::awt::event::KeyAdapter
-{
-
-public:
-  BasicTreeUI$KeyHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void keyTyped(::java::awt::event::KeyEvent *);
-public: // actually package-private
-  virtual jboolean checkMatch(jint, jchar);
-public:
-  virtual void keyPressed(::java::awt::event::KeyEvent *);
-  virtual void keyReleased(::java::awt::event::KeyEvent *);
-public: // actually protected
-  ::javax::swing::Action * __attribute__((aligned(__alignof__( ::java::awt::event::KeyAdapter)))) repeatKeyAction;
-  jboolean isKeyDown;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$KeyHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h
deleted file mode 100644
index 2a0893ba233..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$MouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$MouseHandler : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  BasicTreeUI$MouseHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-private:
-  void handleEvent(::java::awt::event::MouseEvent *);
-  jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) selectedOnPress;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$MouseHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h
deleted file mode 100644
index 574d8b56a50..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$MouseInputHandler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$MouseInputHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$MouseInputHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$MouseInputHandler(::javax::swing::plaf::basic::BasicTreeUI *, ::java::awt::Component *, ::java::awt::Component *, ::java::awt::event::MouseEvent *);
-  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 *);
-public: // actually protected
-  virtual void removeFromSource();
-private:
-  void dispatch(::java::awt::event::MouseEvent *);
-public: // actually protected
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) source;
-  ::java::awt::Component * destination;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$MouseInputHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h
deleted file mode 100644
index 352a37067cd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
-
-#pragma interface
-
-#include <javax/swing/tree/AbstractLayoutCache$NodeDimensions.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$NodeDimensionsHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$NodeDimensionsHandler : public ::javax::swing::tree::AbstractLayoutCache$NodeDimensions
-{
-
-public:
-  BasicTreeUI$NodeDimensionsHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual ::java::awt::Rectangle * getNodeDimensions(::java::lang::Object *, jint, jint, jboolean, ::java::awt::Rectangle *);
-public: // actually protected
-  virtual jint getRowX(jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::tree::AbstractLayoutCache$NodeDimensions)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$NodeDimensionsHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h
deleted file mode 100644
index 54386de9cbd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h
deleted file mode 100644
index 52b52d1c375..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$SelectionModelPropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$SelectionModelPropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$SelectionModelPropertyChangeHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$SelectionModelPropertyChangeHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$SelectionModelPropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h
deleted file mode 100644
index b64ba698eda..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeCancelEditingAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeCancelEditingAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeCancelEditingAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeCancelEditingAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeCancelEditingAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h
deleted file mode 100644
index 52ba7c8bb1f..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeExpansionHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeExpansionEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeExpansionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeExpansionHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$TreeExpansionHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void treeExpanded(::javax::swing::event::TreeExpansionEvent *);
-  virtual void treeCollapsed(::javax::swing::event::TreeExpansionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeExpansionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h
deleted file mode 100644
index 1b25c11646c..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeHomeAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeHomeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeHomeAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeHomeAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeHomeAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h
deleted file mode 100644
index 03ed852179e..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeIncrementAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeIncrementAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeIncrementAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeIncrementAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeIncrementAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h
deleted file mode 100644
index 9ea52685087..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeModelHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeModelHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeModelHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$TreeModelHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeModelHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h
deleted file mode 100644
index 5cb1725d4fd..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreePageAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreePageAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreePageAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreePageAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreePageAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h
deleted file mode 100644
index 73ff33b1c15..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeSelectionHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeSelectionEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeSelectionHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeSelectionHandler : public ::java::lang::Object
-{
-
-public:
-  BasicTreeUI$TreeSelectionHandler(::javax::swing::plaf::basic::BasicTreeUI *);
-  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeSelectionHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h
deleted file mode 100644
index fa01f97ddbf..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeStartEditingAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeStartEditingAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeStartEditingAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeStartEditingAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeStartEditingAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h
deleted file mode 100644
index 59b5c5e2ea6..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeToggleAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeToggleAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeToggleAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeToggleAction(::javax::swing::plaf::basic::BasicTreeUI *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeToggleAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h
deleted file mode 100644
index 617dbd65299..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$TreeTraverseAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
-#define __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$TreeTraverseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$TreeTraverseAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  BasicTreeUI$TreeTraverseAction(::javax::swing::plaf::basic::BasicTreeUI *, jint, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  virtual jboolean isEnabled();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) direction;
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$TreeTraverseAction__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI.h b/libjava/javax/swing/plaf/basic/BasicTreeUI.h
deleted file mode 100644
index 134cb2f3df8..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI.h
+++ /dev/null
@@ -1,280 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI__
-#define __javax_swing_plaf_basic_BasicTreeUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TreeUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Graphics;
-        class Insets;
-        class Rectangle;
-      namespace event
-      {
-          class ComponentListener;
-          class FocusListener;
-          class KeyListener;
-          class MouseEvent;
-          class MouseListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class CellRendererPane;
-        class Icon;
-        class JComponent;
-        class JTree;
-      namespace event
-      {
-          class CellEditorListener;
-          class TreeExpansionListener;
-          class TreeModelListener;
-          class TreeSelectionListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicTreeUI;
-        }
-      }
-      namespace tree
-      {
-          class AbstractLayoutCache;
-          class AbstractLayoutCache$NodeDimensions;
-          class TreeCellEditor;
-          class TreeCellRenderer;
-          class TreeModel;
-          class TreePath;
-          class TreeSelectionModel;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI : public ::javax::swing::plaf::TreeUI
-{
-
-public:
-  BasicTreeUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::Color * getHashColor();
-  virtual void setHashColor(::java::awt::Color *);
-public:
-  virtual void setLeftChildIndent(jint);
-  virtual jint getLeftChildIndent();
-  virtual void setRightChildIndent(jint);
-  virtual jint getRightChildIndent();
-  virtual void setExpandedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getExpandedIcon();
-  virtual void setCollapsedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getCollapsedIcon();
-public: // actually protected
-  virtual void setLargeModel(jboolean);
-  virtual jboolean isLargeModel();
-  virtual void setRowHeight(jint);
-  virtual jint getRowHeight();
-  virtual void setCellRenderer(::javax::swing::tree::TreeCellRenderer *);
-  virtual ::javax::swing::tree::TreeCellRenderer * getCellRenderer();
-  virtual void setModel(::javax::swing::tree::TreeModel *);
-  virtual ::javax::swing::tree::TreeModel * getModel();
-  virtual void setRootVisible(jboolean);
-  virtual jboolean isRootVisible();
-  virtual void setShowsRootHandles(jboolean);
-  virtual jboolean getShowsRootHandles();
-  virtual void setCellEditor(::javax::swing::tree::TreeCellEditor *);
-  virtual ::javax::swing::tree::TreeCellEditor * getCellEditor();
-  virtual void setEditable(jboolean);
-  virtual jboolean isEditable();
-  virtual void setSelectionModel(::javax::swing::tree::TreeSelectionModel *);
-  virtual ::javax::swing::tree::TreeSelectionModel * getSelectionModel();
-public:
-  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-public: // actually package-private
-  virtual jint getMaxHeight(::javax::swing::JTree *);
-  virtual ::javax::swing::Icon * getNodeIcon(::javax::swing::tree::TreePath *);
-public:
-  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint);
-  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual jint getRowCount(::javax::swing::JTree *);
-  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint);
-  virtual jboolean isEditing(::javax::swing::JTree *);
-  virtual jboolean stopEditing(::javax::swing::JTree *);
-  virtual void cancelEditing(::javax::swing::JTree *);
-  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *);
-public: // actually protected
-  virtual void prepareForUIInstall();
-  virtual void completeUIInstall();
-  virtual void completeUIUninstall();
-  virtual void installComponents();
-  virtual ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * createNodeDimensions();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::java::awt::event::MouseListener * createMouseListener();
-  virtual ::java::awt::event::FocusListener * createFocusListener();
-  virtual ::java::awt::event::KeyListener * createKeyListener();
-  virtual ::java::beans::PropertyChangeListener * createSelectionModelPropertyChangeListener();
-  virtual ::javax::swing::event::TreeSelectionListener * createTreeSelectionListener();
-  virtual ::javax::swing::event::CellEditorListener * createCellEditorListener();
-  virtual ::java::awt::event::ComponentListener * createComponentListener();
-  virtual ::javax::swing::event::TreeExpansionListener * createTreeExpansionListener();
-  virtual ::javax::swing::tree::AbstractLayoutCache * createLayoutCache();
-  virtual ::javax::swing::CellRendererPane * createCellRendererPane();
-  virtual ::javax::swing::tree::TreeCellEditor * createDefaultCellEditor();
-  virtual ::javax::swing::tree::TreeCellRenderer * createDefaultCellRenderer();
-  virtual ::javax::swing::event::TreeModelListener * createTreeModelListener();
-  virtual void uninstallListeners();
-  virtual void uninstallKeyboardActions();
-  virtual void uninstallComponents();
-  virtual jint getVerticalLegBuffer();
-  virtual jint getHorizontalLegBuffer();
-  virtual void updateLayoutCacheExpandedNodes();
-  virtual void updateExpandedDescendants(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getLastChildPath(::javax::swing::tree::TreePath *);
-  virtual void updateDepthOffset();
-  virtual void updateCellEditor();
-  virtual void updateRenderer();
-  virtual void configureLayoutCache();
-  virtual void updateSize();
-  virtual void updateCachedPreferredSize();
-  virtual void pathWasExpanded(::javax::swing::tree::TreePath *);
-  virtual void pathWasCollapsed(::javax::swing::tree::TreePath *);
-  virtual void installDefaults();
-  virtual void installKeyboardActions();
-private:
-  ::javax::swing::ActionMap * getActionMap();
-  ::javax::swing::ActionMap * createDefaultActions();
-  jint convertModifiers(jint);
-public: // actually protected
-  virtual void installListeners();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void uninstallDefaults();
-public:
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  jboolean isLastChild(::javax::swing::tree::TreePath *);
-public: // actually protected
-  virtual void ensureRowsAreVisible(jint, jint);
-public:
-  virtual void setPreferredMinSize(::java::awt::Dimension *);
-  virtual ::java::awt::Dimension * getPreferredMinSize();
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *, jboolean);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void completeEditing();
-  virtual void completeEditing(jboolean, jboolean, jboolean);
-  virtual jboolean startEditing(::javax::swing::tree::TreePath *, ::java::awt::event::MouseEvent *);
-private:
-  void editorRequestFocus(::java::awt::Component *);
-public: // actually protected
-  virtual void checkForClickInExpandControl(::javax::swing::tree::TreePath *, jint, jint);
-  virtual jboolean isLocationInExpandControl(::javax::swing::tree::TreePath *, jint, jint);
-  virtual void handleExpandControlClick(::javax::swing::tree::TreePath *, jint, jint);
-  virtual void toggleExpandState(::javax::swing::tree::TreePath *);
-  virtual jboolean isToggleSelectionEvent(::java::awt::event::MouseEvent *);
-  virtual jboolean isMultiSelectEvent(::java::awt::event::MouseEvent *);
-  virtual jboolean isToggleEvent(::java::awt::event::MouseEvent *);
-  virtual void selectPathForEvent(::javax::swing::tree::TreePath *, ::java::awt::event::MouseEvent *);
-  virtual jboolean isLeaf(jint);
-public: // actually package-private
-  virtual jboolean hasControlIcons();
-  virtual ::javax::swing::Icon * getCurrentControlIcon(::javax::swing::tree::TreePath *);
-  virtual ::java::lang::Object * getParent(::java::lang::Object *, ::java::lang::Object *);
-private:
-  ::java::lang::Object * findNode(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  virtual void selectPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual JArray< ::java::lang::Object * > * getPathToRoot(::java::lang::Object *, jint);
-public: // actually protected
-  virtual void paintVerticalLine(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint);
-  virtual void paintHorizontalLine(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint);
-  virtual void drawCentered(::java::awt::Component *, ::java::awt::Graphics *, ::javax::swing::Icon *, jint, jint);
-  virtual void drawDashedHorizontalLine(::java::awt::Graphics *, jint, jint, jint);
-  virtual void drawDashedVerticalLine(::java::awt::Graphics *, jint, jint, jint);
-  virtual void paintExpandControl(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
-  virtual void paintHorizontalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
-  virtual void paintVerticalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::javax::swing::tree::TreePath *);
-  virtual void paintRow(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
-  virtual void prepareForUIUninstall();
-  virtual jboolean shouldPaintExpandControl(::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
-  virtual jint getRowX(jint, jint);
-public: // actually package-private
-  static jint WAIT_TILL_EDITING;
-public: // actually protected
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TreeUI)))) collapsedIcon;
-  ::javax::swing::Icon * expandedIcon;
-  jint leftChildIndent;
-  jint rightChildIndent;
-  jint totalChildIndent;
-  jint lastSelectedRow;
-  ::javax::swing::JTree * tree;
-  ::javax::swing::tree::TreeCellRenderer * currentCellRenderer;
-  jboolean createdRenderer;
-  ::javax::swing::tree::TreeCellEditor * cellEditor;
-  jboolean createdCellEditor;
-  jboolean stopEditingInCompleteEditing;
-  ::javax::swing::CellRendererPane * rendererPane;
-  ::java::awt::Dimension * preferredSize;
-  ::java::awt::Dimension * preferredMinSize;
-  jboolean validCachedPreferredSize;
-  ::javax::swing::tree::AbstractLayoutCache * treeState;
-  ::java::util::Hashtable * drawingCache;
-  jboolean largeModel;
-  ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * nodeDimensions;
-  ::javax::swing::tree::TreeModel * treeModel;
-  ::javax::swing::tree::TreeSelectionModel * treeSelectionModel;
-  jint depthOffset;
-  ::java::awt::Component * editingComponent;
-  ::javax::swing::tree::TreePath * editingPath;
-  jint editingRow;
-  jboolean editorHasDifferentSize;
-public: // actually package-private
-  jboolean isEditing__;
-  ::javax::swing::tree::TreePath * currentVisiblePath;
-  jint gap;
-  jint maxHeight;
-  ::java::awt::Color * hashColor;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::java::awt::event::FocusListener * focusListener;
-  ::javax::swing::event::TreeSelectionListener * treeSelectionListener;
-  ::java::awt::event::MouseListener * mouseListener;
-  ::java::awt::event::KeyListener * keyListener;
-  ::java::beans::PropertyChangeListener * selectionModelPropertyChangeListener;
-  ::java::awt::event::ComponentListener * componentListener;
-  ::javax::swing::event::CellEditorListener * cellEditorListener;
-  ::javax::swing::event::TreeExpansionListener * treeExpansionListener;
-  ::javax::swing::event::TreeModelListener * treeModelListener;
-  static ::javax::swing::Icon * nullIcon;
-  static ::java::awt::event::MouseEvent * EDIT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI__
diff --git a/libjava/javax/swing/plaf/basic/BasicViewportUI.h b/libjava/javax/swing/plaf/basic/BasicViewportUI.h
deleted file mode 100644
index f657f7dc098..00000000000
--- a/libjava/javax/swing/plaf/basic/BasicViewportUI.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicViewportUI__
-#define __javax_swing_plaf_basic_BasicViewportUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ViewportUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicViewportUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicViewportUI : public ::javax::swing::plaf::ViewportUI
-{
-
-public:
-  BasicViewportUI();
-public: // actually protected
-  virtual void installDefaults(::javax::swing::JComponent *);
-  virtual void uninstallDefaults(::javax::swing::JComponent *);
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicViewportUI__
diff --git a/libjava/javax/swing/plaf/basic/ComboPopup.h b/libjava/javax/swing/plaf/basic/ComboPopup.h
deleted file mode 100644
index 9f01bedb340..00000000000
--- a/libjava/javax/swing/plaf/basic/ComboPopup.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_ComboPopup__
-#define __javax_swing_plaf_basic_ComboPopup__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class KeyListener;
-          class MouseListener;
-          class MouseMotionListener;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace plaf
-      {
-        namespace basic
-        {
-            class ComboPopup;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::ComboPopup : public ::java::lang::Object
-{
-
-public:
-  virtual void show() = 0;
-  virtual void hide() = 0;
-  virtual jboolean isVisible() = 0;
-  virtual ::javax::swing::JList * getList() = 0;
-  virtual ::java::awt::event::MouseListener * getMouseListener() = 0;
-  virtual ::java::awt::event::MouseMotionListener * getMouseMotionListener() = 0;
-  virtual ::java::awt::event::KeyListener * getKeyListener() = 0;
-  virtual void uninstallingUI() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_plaf_basic_ComboPopup__
diff --git a/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h b/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h
deleted file mode 100644
index 15b06f2a807..00000000000
--- a/libjava/javax/swing/plaf/basic/DefaultMenuLayout.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_DefaultMenuLayout__
-#define __javax_swing_plaf_basic_DefaultMenuLayout__
-
-#pragma interface
-
-#include <javax/swing/BoxLayout.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class DefaultMenuLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::DefaultMenuLayout : public ::javax::swing::BoxLayout
-{
-
-public:
-  DefaultMenuLayout(::java::awt::Container *, jint);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_DefaultMenuLayout__
diff --git a/libjava/javax/swing/plaf/basic/SharedUIDefaults.h b/libjava/javax/swing/plaf/basic/SharedUIDefaults.h
deleted file mode 100644
index 7db5a2f3b50..00000000000
--- a/libjava/javax/swing/plaf/basic/SharedUIDefaults.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_SharedUIDefaults__
-#define __javax_swing_plaf_basic_SharedUIDefaults__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class SharedUIDefaults;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::SharedUIDefaults : public ::java::lang::Object
-{
-
-public:
-  SharedUIDefaults();
-public: // actually package-private
-  static ::java::lang::Object * get(::java::lang::String *);
-  static ::java::awt::Color * getColor(::java::lang::String *);
-private:
-  static ::java::util::HashMap * sharedDefaults;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_SharedUIDefaults__
diff --git a/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h b/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h
deleted file mode 100644
index 8ce9a8c1b5a..00000000000
--- a/libjava/javax/swing/plaf/metal/DefaultMetalTheme.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_DefaultMetalTheme__
-#define __javax_swing_plaf_metal_DefaultMetalTheme__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalTheme.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-          class ColorUIResource;
-          class FontUIResource;
-        namespace metal
-        {
-            class DefaultMetalTheme;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::DefaultMetalTheme : public ::javax::swing::plaf::metal::MetalTheme
-{
-
-public:
-  DefaultMetalTheme();
-  virtual ::java::lang::String * getName();
-public: // actually protected
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3();
-public:
-  virtual ::javax::swing::plaf::FontUIResource * getControlTextFont();
-  virtual ::javax::swing::plaf::FontUIResource * getMenuTextFont();
-  virtual ::javax::swing::plaf::FontUIResource * getSubTextFont();
-  virtual ::javax::swing::plaf::FontUIResource * getSystemTextFont();
-  virtual ::javax::swing::plaf::FontUIResource * getUserTextFont();
-  virtual ::javax::swing::plaf::FontUIResource * getWindowTitleFont();
-private:
-  ::javax::swing::plaf::FontUIResource * getFont(jint);
-  jboolean isBoldMetal();
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY1;
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY2;
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY3;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY1;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY2;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY3;
-  static ::javax::swing::plaf::FontUIResource * SUB_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * SYSTEM_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * USER_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * WINDOW_TITLE_FONT;
-  static ::javax::swing::plaf::FontUIResource * PLAIN_CONTROL_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * BOLD_CONTROL_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * PLAIN_MENU_TEXT_FONT;
-  static ::javax::swing::plaf::FontUIResource * BOLD_MENU_TEXT_FONT;
-public: // actually package-private
-  static const jint CONTROL_TEXT_FONT = 1;
-  static const jint MENU_TEXT_FONT = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_DefaultMetalTheme__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h
deleted file mode 100644
index 23e18daddbb..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$ButtonBorder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
-#define __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$ButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$ButtonBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$ButtonBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  void paintDefaultButtonBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  void paintOceanButtonBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually protected
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$ButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h
deleted file mode 100644
index ba3739cf631..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$DesktopIconBorder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
-#define __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$DesktopIconBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$DesktopIconBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$DesktopIconBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$DesktopIconBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h
deleted file mode 100644
index be51edc5bf1..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
-#define __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$Flush3DBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$Flush3DBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$Flush3DBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$Flush3DBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h
deleted file mode 100644
index e85132faef8..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$InternalFrameBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
-#define __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$InternalFrameBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$InternalFrameBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$InternalFrameBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$InternalFrameBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h
deleted file mode 100644
index b42e516e8fb..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$MenuBarBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
-#define __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$MenuBarBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$MenuBarBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$MenuBarBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually protected
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$MenuBarBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h
deleted file mode 100644
index b339b8758bb..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$MenuItemBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
-#define __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$MenuItemBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$MenuItemBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$MenuItemBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually protected
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$MenuItemBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h
deleted file mode 100644
index 1a04e67ec7e..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$OptionDialogBorder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
-#define __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$OptionDialogBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$OptionDialogBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$OptionDialogBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$OptionDialogBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h
deleted file mode 100644
index 853bd4cef7c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$PaletteBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
-#define __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$PaletteBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$PaletteBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$PaletteBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$PaletteBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h
deleted file mode 100644
index cc66966b672..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$PopupMenuBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
-#define __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$PopupMenuBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$PopupMenuBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$PopupMenuBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually protected
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$PopupMenuBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h
deleted file mode 100644
index e34c0cf372e..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
-#define __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalBorders$ButtonBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$RolloverButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$RolloverButtonBorder : public ::javax::swing::plaf::metal::MetalBorders$ButtonBorder
-{
-
-public:
-  MetalBorders$RolloverButtonBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$RolloverButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h
deleted file mode 100644
index 78e6c4f00c1..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
-#define __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$RolloverMarginBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$RolloverMarginBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$RolloverMarginBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-public: // actually protected
-  static ::java::awt::Insets * borderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$RolloverMarginBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h
deleted file mode 100644
index d6baf243933..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
-#define __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$ScrollPaneBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$ScrollPaneBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$ScrollPaneBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  static ::java::awt::Insets * insets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$ScrollPaneBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h
deleted file mode 100644
index 94874119183..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$TableHeaderBorder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
-#define __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$TableHeaderBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$TableHeaderBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$TableHeaderBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually protected
-  ::java::awt::Insets * __attribute__((aligned(__alignof__( ::javax::swing::border::AbstractBorder)))) editorBorderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$TableHeaderBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h
deleted file mode 100644
index de1e4e7d864..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$TextFieldBorder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
-#define __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalBorders$Flush3DBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$TextFieldBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$TextFieldBorder : public ::javax::swing::plaf::metal::MetalBorders$Flush3DBorder
-{
-
-public:
-  MetalBorders$TextFieldBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$TextFieldBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h
deleted file mode 100644
index 6d9f3de5c03..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
-#define __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalBorders$ButtonBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$ToggleButtonBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$ToggleButtonBorder : public ::javax::swing::plaf::metal::MetalBorders$ButtonBorder
-{
-
-public:
-  MetalBorders$ToggleButtonBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$ToggleButtonBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h b/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h
deleted file mode 100644
index da97e79e506..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders$ToolBarBorder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
-#define __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$ToolBarBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders$ToolBarBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalBorders$ToolBarBorder();
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders$ToolBarBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalBorders.h b/libjava/javax/swing/plaf/metal/MetalBorders.h
deleted file mode 100644
index 63101bfb525..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalBorders.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalBorders__
-#define __javax_swing_plaf_metal_MetalBorders__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicBorders$MarginBorder;
-        }
-        namespace metal
-        {
-            class MetalBorders;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalBorders : public ::java::lang::Object
-{
-
-public:
-  MetalBorders();
-  static ::javax::swing::border::Border * getButtonBorder();
-  static ::javax::swing::border::Border * getToggleButtonBorder();
-  static ::javax::swing::border::Border * getDesktopIconBorder();
-  static ::javax::swing::border::Border * getTextFieldBorder();
-  static ::javax::swing::border::Border * getTextBorder();
-public: // actually package-private
-  static ::javax::swing::border::Border * getToolbarButtonBorder();
-  static ::javax::swing::border::Border * getMarginBorder();
-  static ::javax::swing::border::Border * getRolloverBorder();
-private:
-  static ::javax::swing::border::Border * buttonBorder;
-  static ::javax::swing::border::Border * toggleButtonBorder;
-  static ::javax::swing::border::Border * desktopIconBorder;
-  static ::javax::swing::border::Border * toolbarButtonBorder;
-  static ::javax::swing::border::Border * textFieldBorder;
-  static ::javax::swing::border::Border * textBorder;
-  static ::javax::swing::border::Border * rolloverBorder;
-  static ::javax::swing::plaf::basic::BasicBorders$MarginBorder * marginBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalBorders__
diff --git a/libjava/javax/swing/plaf/metal/MetalButtonListener.h b/libjava/javax/swing/plaf/metal/MetalButtonListener.h
deleted file mode 100644
index 0beeef1718a..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalButtonListener.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalButtonListener__
-#define __javax_swing_plaf_metal_MetalButtonListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicButtonListener.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalButtonListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalButtonListener : public ::javax::swing::plaf::basic::BasicButtonListener
-{
-
-public:
-  MetalButtonListener(::javax::swing::AbstractButton *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalButtonListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalButtonUI.h b/libjava/javax/swing/plaf/metal/MetalButtonUI.h
deleted file mode 100644
index d2e6ced26a1..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalButtonUI.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalButtonUI__
-#define __javax_swing_plaf_metal_MetalButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalButtonUI : public ::javax::swing::plaf::basic::BasicButtonUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  MetalButtonUI();
-public: // actually protected
-  virtual ::java::awt::Color * getFocusColor();
-  virtual ::java::awt::Color * getSelectColor();
-  virtual ::java::awt::Color * getDisabledTextColor();
-public:
-  virtual void installDefaults(::javax::swing::AbstractButton *);
-  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
-public: // actually protected
-  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
-  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
-public:
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  jboolean isToolbarButton(::java::awt::Component *);
-  jboolean isDrawingGradient(::java::lang::String *);
-  static ::javax::swing::plaf::metal::MetalButtonUI * sharedUI;
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicButtonUI)))) focusColor;
-  ::java::awt::Color * selectColor;
-  ::java::awt::Color * disabledTextColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h b/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h
deleted file mode 100644
index b30ae97ba21..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalCheckBoxIcon.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalCheckBoxIcon__
-#define __javax_swing_plaf_metal_MetalCheckBoxIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalBorders$ButtonBorder;
-            class MetalCheckBoxIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalCheckBoxIcon : public ::java::lang::Object
-{
-
-public:
-  MetalCheckBoxIcon();
-public: // actually protected
-  virtual void drawCheck(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  virtual jint getControlSize();
-public:
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalBorders$ButtonBorder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) border;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalCheckBoxIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h b/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h
deleted file mode 100644
index fff6cd27ef1..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalCheckBoxUI.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalCheckBoxUI__
-#define __javax_swing_plaf_metal_MetalCheckBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalRadioButtonUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalCheckBoxUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalCheckBoxUI : public ::javax::swing::plaf::metal::MetalRadioButtonUI
-{
-
-public:
-  MetalCheckBoxUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::lang::String * getPropertyPrefix();
-private:
-  static ::javax::swing::plaf::metal::MetalCheckBoxUI * instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalCheckBoxUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h b/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h
deleted file mode 100644
index 000e755fbe0..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxButton.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxButton__
-#define __javax_swing_plaf_metal_MetalComboBoxButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class CellRendererPane;
-        class Icon;
-        class JComboBox;
-        class JList;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxButton : public ::javax::swing::JButton
-{
-
-public:
-  MetalComboBoxButton(::javax::swing::JComboBox *, ::javax::swing::Icon *, ::javax::swing::CellRendererPane *, ::javax::swing::JList *);
-  MetalComboBoxButton(::javax::swing::JComboBox *, ::javax::swing::Icon *, jboolean, ::javax::swing::CellRendererPane *, ::javax::swing::JList *);
-  virtual ::javax::swing::JComboBox * getComboBox();
-  virtual void setComboBox(::javax::swing::JComboBox *);
-  virtual ::javax::swing::Icon * getComboIcon();
-  virtual void setComboIcon(::javax::swing::Icon *);
-  virtual jboolean isIconOnly();
-  virtual void setIconOnly(jboolean);
-  virtual jboolean isFocusTraversable();
-  virtual void setEnabled(jboolean);
-  virtual void paintComponent(::java::awt::Graphics *);
-public: // actually protected
-  ::javax::swing::JComboBox * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) comboBox;
-  ::javax::swing::JList * listBox;
-  ::javax::swing::CellRendererPane * rendererPane;
-  ::javax::swing::Icon * comboIcon;
-  jboolean iconOnly;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h
deleted file mode 100644
index 501e1386457..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$EditorTextField.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
-#define __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxEditor;
-            class MetalComboBoxEditor$EditorTextField;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxEditor$EditorTextField : public ::javax::swing::JTextField
-{
-
-public: // actually package-private
-  MetalComboBoxEditor$EditorTextField(::javax::swing::plaf::metal::MetalComboBoxEditor *, ::java::lang::String *, jint);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalComboBoxEditor * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$EditorTextField__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h
deleted file mode 100644
index 4f8166c503b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$MetalComboBoxEditorBorder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
-#define __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxEditor$MetalComboBoxEditorBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxEditor$MetalComboBoxEditorBorder : public ::javax::swing::border::AbstractBorder
-{
-
-public:
-  MetalComboBoxEditor$MetalComboBoxEditorBorder();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$MetalComboBoxEditorBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h
deleted file mode 100644
index edf8097d42d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor$UIResource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
-#define __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalComboBoxEditor.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxEditor$UIResource;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxEditor$UIResource : public ::javax::swing::plaf::metal::MetalComboBoxEditor
-{
-
-public:
-  MetalComboBoxEditor$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxEditor$UIResource__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h b/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h
deleted file mode 100644
index 89d3edfe4af..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxEditor.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxEditor__
-#define __javax_swing_plaf_metal_MetalComboBoxEditor__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxEditor.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxEditor;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxEditor : public ::javax::swing::plaf::basic::BasicComboBoxEditor
-{
-
-public:
-  MetalComboBoxEditor();
-public: // actually protected
-  static ::java::awt::Insets * editorBorderInsets;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxEditor__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h b/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h
deleted file mode 100644
index a51d9aa3cf4..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxIcon__
-#define __javax_swing_plaf_metal_MetalComboBoxIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxIcon : public ::java::lang::Object
-{
-
-public:
-  MetalComboBoxIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h
deleted file mode 100644
index d2a909c445d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
-#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxUI;
-            class MetalComboBoxUI$MetalComboBoxLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxUI$MetalComboBoxLayoutManager : public ::javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager
-{
-
-public:
-  MetalComboBoxUI$MetalComboBoxLayoutManager(::javax::swing::plaf::metal::MetalComboBoxUI *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual void superLayout(::java::awt::Container *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboBoxUI$ComboBoxLayoutManager)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboBoxLayoutManager__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h
deleted file mode 100644
index ac9789ff0d2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalComboPopup.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
-#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboPopup.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComboBox;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxUI;
-            class MetalComboBoxUI$MetalComboPopup;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxUI$MetalComboPopup : public ::javax::swing::plaf::basic::BasicComboPopup
-{
-
-public:
-  MetalComboBoxUI$MetalComboPopup(::javax::swing::plaf::metal::MetalComboBoxUI *, ::javax::swing::JComboBox *);
-  virtual void delegateFocus(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboPopup)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalComboPopup__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h
deleted file mode 100644
index fee1da1a459..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
-#define __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalComboBoxUI;
-            class MetalComboBoxUI$MetalPropertyChangeListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxUI$MetalPropertyChangeListener : public ::javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler
-{
-
-public:
-  MetalComboBoxUI$MetalPropertyChangeListener(::javax::swing::plaf::metal::MetalComboBoxUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalComboBoxUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicComboBoxUI$PropertyChangeHandler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxUI$MetalPropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h b/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h
deleted file mode 100644
index 047d1442b05..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalComboBoxUI.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalComboBoxUI__
-#define __javax_swing_plaf_metal_MetalComboBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicComboBoxUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Dimension;
-        class Graphics;
-        class LayoutManager;
-    }
-    namespace beans
-    {
-        class PropertyChangeEvent;
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ComboBoxEditor;
-        class JButton;
-        class JComboBox;
-        class JComponent;
-        class JList;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class ComboPopup;
-        }
-        namespace metal
-        {
-            class MetalComboBoxUI;
-            class MetalComboBoxUI$MetalComboBoxLayoutManager;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalComboBoxUI : public ::javax::swing::plaf::basic::BasicComboBoxUI
-{
-
-public:
-  MetalComboBoxUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::javax::swing::ComboBoxEditor * createEditor();
-  virtual ::javax::swing::plaf::basic::ComboPopup * createPopup();
-  virtual ::javax::swing::JButton * createArrowButton();
-public:
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void editablePropertyChanged(::java::beans::PropertyChangeEvent *);
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual void removeListeners();
-public:
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual void configureEditor();
-  virtual void unconfigureEditor();
-  virtual void layoutComboBox(::java::awt::Container *, ::javax::swing::plaf::metal::MetalComboBoxUI$MetalComboBoxLayoutManager *);
-public: // actually package-private
-  static ::javax::swing::JButton * access$0(::javax::swing::plaf::metal::MetalComboBoxUI *);
-  static ::javax::swing::JComboBox * access$1(::javax::swing::plaf::metal::MetalComboBoxUI *);
-  static ::javax::swing::JList * access$2(::javax::swing::plaf::metal::MetalComboBoxUI *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalComboBoxUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h b/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h
deleted file mode 100644
index 1b1de7b5776..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalDesktopIconUI.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalDesktopIconUI__
-#define __javax_swing_plaf_metal_MetalDesktopIconUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicDesktopIconUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalDesktopIconUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalDesktopIconUI : public ::javax::swing::plaf::basic::BasicDesktopIconUI
-{
-
-public:
-  MetalDesktopIconUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h
deleted file mode 100644
index 9900aed3910..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ButtonLayout.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$ButtonLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$ButtonLayout : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$ButtonLayout(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  static const jint GAP = 4;
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$ButtonLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h
deleted file mode 100644
index 92fac4ca2f9..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DetailViewActionListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$DetailViewActionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$DetailViewActionListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$DetailViewActionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DetailViewActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h
deleted file mode 100644
index da666e12989..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$DirectoryComboBoxAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxAction : public ::javax::swing::AbstractAction
-{
-
-public: // actually protected
-  MetalFileChooserUI$DirectoryComboBoxAction(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h
deleted file mode 100644
index 27a72e053e6..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxModel.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$DirectoryComboBoxModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel : public ::javax::swing::AbstractListModel
-{
-
-public:
-  MetalFileChooserUI$DirectoryComboBoxModel(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  virtual jint getSize();
-  virtual ::java::lang::Object * getElementAt(jint);
-  virtual jint getDepth(jint);
-  virtual ::java::lang::Object * getSelectedItem();
-  virtual void setSelectedItem(::java::lang::Object *);
-private:
-  ::java::util::List * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) items;
-  jint selectedIndex;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxModel__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h
deleted file mode 100644
index 6e88691ae5b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$DirectoryComboBoxRenderer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
-
-#pragma interface
-
-#include <javax/swing/DefaultListCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-        class JList;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$DirectoryComboBoxRenderer;
-            class MetalFileChooserUI$IndentIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxRenderer : public ::javax::swing::DefaultListCellRenderer
-{
-
-public:
-  MetalFileChooserUI$DirectoryComboBoxRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JFileChooser *);
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
-private:
-  ::javax::swing::plaf::metal::MetalFileChooserUI$IndentIcon * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) indentIcon;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$DirectoryComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h
deleted file mode 100644
index 235c7c968c4..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FileRenderer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
-
-#pragma interface
-
-#include <javax/swing/DefaultListCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$FileRenderer;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$FileRenderer : public ::javax::swing::DefaultListCellRenderer
-{
-
-public: // actually protected
-  MetalFileChooserUI$FileRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FileRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h
deleted file mode 100644
index 48ce51fe151..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxModel.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
-
-#pragma interface
-
-#include <javax/swing/AbstractListModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace filechooser
-      {
-          class FileFilter;
-      }
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$FilterComboBoxModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel : public ::javax::swing::AbstractListModel
-{
-
-public: // actually protected
-  MetalFileChooserUI$FilterComboBoxModel(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void setSelectedItem(::java::lang::Object *);
-  virtual ::java::lang::Object * getSelectedItem();
-  virtual jint getSize();
-  virtual ::java::lang::Object * getElementAt(jint);
-public: // actually protected
-  JArray< ::javax::swing::filechooser::FileFilter * > * __attribute__((aligned(__alignof__( ::javax::swing::AbstractListModel)))) filters;
-private:
-  ::java::lang::Object * selected;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxModel__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h
deleted file mode 100644
index 60260fa49ce..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$FilterComboBoxRenderer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
-
-#pragma interface
-
-#include <javax/swing/DefaultListCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JList;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$FilterComboBoxRenderer;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxRenderer : public ::javax::swing::DefaultListCellRenderer
-{
-
-public:
-  MetalFileChooserUI$FilterComboBoxRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  virtual ::java::awt::Component * getListCellRendererComponent(::javax::swing::JList *, ::java::lang::Object *, jint, jboolean, jboolean);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$FilterComboBoxRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h
deleted file mode 100644
index c1b25f6718c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$IndentIcon.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$IndentIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$IndentIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$IndentIcon(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  virtual void setIcon(::javax::swing::Icon *);
-  virtual void setDepth(jint);
-public:
-  virtual jint getIconHeight();
-  virtual jint getIconWidth();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-private:
-  static const jint INDENT = 10;
-  ::javax::swing::Icon * __attribute__((aligned(__alignof__( ::java::lang::Object)))) icon;
-  jint depth;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$IndentIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h
deleted file mode 100644
index 79b8f71ef31..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$ListViewActionListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$ListViewActionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$ListViewActionListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$ListViewActionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$ListViewActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h
deleted file mode 100644
index 7c0368ca90b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserPropertyChangeListener.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$MetalFileChooserPropertyChangeListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$MetalFileChooserPropertyChangeListener : public ::java::lang::Object
-{
-
-public:
-  MetalFileChooserUI$MetalFileChooserPropertyChangeListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserPropertyChangeListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h
deleted file mode 100644
index 460f121b92e..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$MetalFileChooserSelectionListener.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ListSelectionEvent;
-      }
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$MetalFileChooserSelectionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$MetalFileChooserSelectionListener : public ::java::lang::Object
-{
-
-public: // actually protected
-  MetalFileChooserUI$MetalFileChooserSelectionListener(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$MetalFileChooserSelectionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h
deleted file mode 100644
index 02fe27e49dd..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener$EditingActionListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI$SingleClickListener;
-            class MetalFileChooserUI$SingleClickListener$EditingActionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener$EditingActionListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$SingleClickListener$EditingActionListener(::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener$EditingActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h
deleted file mode 100644
index 66c7b0d10f0..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$SingleClickListener.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-        class JList;
-        class JTextField;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$SingleClickListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  MetalFileChooserUI$SingleClickListener(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JList *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void editFile(jint);
-  virtual void completeEditing();
-  ::javax::swing::JList * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) list;
-  ::java::io::File * editFile__;
-  ::javax::swing::JFileChooser * fc;
-  ::java::lang::Object * lastSelected;
-  ::javax::swing::JTextField * editField;
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$SingleClickListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h
deleted file mode 100644
index bacd2d07e89..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener$EditingActionListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI$TableClickListener;
-            class MetalFileChooserUI$TableClickListener$EditingActionListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener$EditingActionListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$TableClickListener$EditingActionListener(::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener$EditingActionListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h
deleted file mode 100644
index 2e536e45637..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableClickListener.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFileChooser;
-        class JTable;
-        class JTextField;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$TableClickListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  MetalFileChooserUI$TableClickListener(::javax::swing::plaf::metal::MetalFileChooserUI *, ::javax::swing::JTable *, ::javax::swing::JFileChooser *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  virtual void editFile(jint);
-  virtual void completeEditing();
-public:
-  virtual void closeDialog();
-public: // actually package-private
-  ::javax::swing::JTable * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) table;
-  ::javax::swing::JFileChooser * fc;
-  ::java::lang::Object * lastSelected;
-  ::java::io::File * editFile__;
-  ::javax::swing::JTextField * editField;
-  ::javax::swing::plaf::metal::MetalFileChooserUI * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableClickListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h
deleted file mode 100644
index e5b5029f733..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$TableFileRenderer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$TableFileRenderer;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$TableFileRenderer : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public:
-  MetalFileChooserUI$TableFileRenderer(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::javax::swing::table::DefaultTableCellRenderer)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$TableFileRenderer__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h
deleted file mode 100644
index 64f4be6c619..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI$VerticalMidLayout.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
-#define __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$VerticalMidLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI$VerticalMidLayout : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalFileChooserUI$VerticalMidLayout(::javax::swing::plaf::metal::MetalFileChooserUI *);
-public:
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI$VerticalMidLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h b/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h
deleted file mode 100644
index cf8ceae94e4..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalFileChooserUI.h
+++ /dev/null
@@ -1,159 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalFileChooserUI__
-#define __javax_swing_plaf_metal_MetalFileChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicFileChooserUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-      namespace event
-      {
-          class MouseListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ActionMap;
-        class JButton;
-        class JComboBox;
-        class JComponent;
-        class JFileChooser;
-        class JLabel;
-        class JList;
-        class JPanel;
-        class JScrollPane;
-        class JTable;
-        class JTextField;
-      namespace event
-      {
-          class ListSelectionEvent;
-          class ListSelectionListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalFileChooserUI;
-            class MetalFileChooserUI$DirectoryComboBoxModel;
-            class MetalFileChooserUI$DirectoryComboBoxRenderer;
-            class MetalFileChooserUI$FilterComboBoxModel;
-            class MetalFileChooserUI$FilterComboBoxRenderer;
-            class MetalFileChooserUI$SingleClickListener;
-            class MetalFileChooserUI$TableClickListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalFileChooserUI : public ::javax::swing::plaf::basic::BasicFileChooserUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  MetalFileChooserUI(::javax::swing::JFileChooser *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void installComponents(::javax::swing::JFileChooser *);
-  virtual void uninstallComponents(::javax::swing::JFileChooser *);
-public: // actually protected
-  virtual ::javax::swing::JPanel * getButtonPanel();
-  virtual ::javax::swing::JPanel * getBottomPanel();
-  virtual void installStrings(::javax::swing::JFileChooser *);
-  virtual void installListeners(::javax::swing::JFileChooser *);
-  virtual void uninstallListeners(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::ActionMap * getActionMap();
-  virtual ::javax::swing::ActionMap * createActionMap();
-  virtual ::javax::swing::JPanel * createList(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::JPanel * createDetailsView(::javax::swing::JFileChooser *);
-public: // actually package-private
-  virtual ::javax::swing::JPanel * updateTable();
-private:
-  ::java::lang::String * formatSize(jlong);
-public:
-  virtual ::javax::swing::event::ListSelectionListener * createListSelectionListener(::javax::swing::JFileChooser *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JFileChooser *);
-public: // actually protected
-  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel * createDirectoryComboBoxModel(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxRenderer * createDirectoryComboBoxRenderer(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * createFilterComboBoxModel();
-  virtual ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxRenderer * createFilterComboBoxRenderer();
-  virtual void addControlButtons();
-  virtual void removeControlButtons();
-public:
-  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getFileName();
-  virtual void setFileName(::java::lang::String *);
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually protected
-  virtual ::javax::swing::JButton * getApproveButton(::javax::swing::JFileChooser *);
-public: // actually package-private
-  static void access$0(::javax::swing::plaf::metal::MetalFileChooserUI *, ::java::lang::String *);
-  static ::java::lang::String * access$1(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::java::lang::String * access$2(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::java::lang::String * access$3(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::java::lang::String * access$4(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::java::lang::String * access$5(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static void access$6(::javax::swing::plaf::metal::MetalFileChooserUI *, jboolean);
-  static void access$7(::javax::swing::plaf::metal::MetalFileChooserUI *, ::java::io::File *);
-  static ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * access$8(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::javax::swing::JButton * access$9(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::javax::swing::JPanel * access$10(::javax::swing::plaf::metal::MetalFileChooserUI *);
-  static ::javax::swing::JPanel * access$11(::javax::swing::plaf::metal::MetalFileChooserUI *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicFileChooserUI)))) directoryLabel;
-  ::javax::swing::JComboBox * directoryComboBox;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalFileChooserUI$DirectoryComboBoxModel * directoryModel;
-private:
-  ::java::lang::String * fileLabel;
-  ::javax::swing::JTextField * fileTextField;
-  ::java::lang::String * filterLabel;
-  ::javax::swing::JPanel * topPanel;
-  ::javax::swing::JPanel * controls;
-  ::javax::swing::JPanel * bottomPanel;
-  ::javax::swing::JPanel * buttonPanel;
-  ::javax::swing::JButton * approveButton;
-public: // actually package-private
-  ::javax::swing::JList * fileList;
-  ::javax::swing::JTable * fileTable;
-  ::javax::swing::JPanel * fileListPanel;
-  ::javax::swing::JPanel * fileTablePanel;
-private:
-  ::javax::swing::plaf::metal::MetalFileChooserUI$FilterComboBoxModel * filterModel;
-  ::javax::swing::ActionMap * actionMap;
-public: // actually package-private
-  jboolean listView;
-  jboolean startEditing;
-  ::javax::swing::JScrollPane * scrollPane;
-  ::java::lang::String * save;
-  ::java::lang::String * look;
-  ::javax::swing::JLabel * dirLabel;
-  ::javax::swing::event::ListSelectionListener * listSelList;
-  ::java::awt::event::MouseListener * doubleClickList;
-  ::javax::swing::plaf::metal::MetalFileChooserUI$SingleClickListener * singleClickList;
-  ::javax::swing::plaf::metal::MetalFileChooserUI$TableClickListener * tableClickList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalFileChooserUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h
deleted file mode 100644
index e57034fa61a..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$1__
-#define __javax_swing_plaf_metal_MetalIconFactory$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalIconFactory$1();
-public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h
deleted file mode 100644
index 3f359f80e6a..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$2.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$2__
-#define __javax_swing_plaf_metal_MetalIconFactory$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalIconFactory$2();
-public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$2__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h
deleted file mode 100644
index f86819ac917..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$3.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$3__
-#define __javax_swing_plaf_metal_MetalIconFactory$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$3;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalIconFactory$3();
-public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$3__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h
deleted file mode 100644
index 0625a9b249e..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$CheckBoxMenuItemIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$CheckBoxMenuItemIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$CheckBoxMenuItemIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$CheckBoxMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h
deleted file mode 100644
index 67b065fb412..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserDetailViewIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileChooserDetailViewIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileChooserDetailViewIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FileChooserDetailViewIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserDetailViewIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h
deleted file mode 100644
index 5395249ab7b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserHomeFolderIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileChooserHomeFolderIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileChooserHomeFolderIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FileChooserHomeFolderIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserHomeFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h
deleted file mode 100644
index d1e479a83fc..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserListViewIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileChooserListViewIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileChooserListViewIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FileChooserListViewIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserListViewIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h
deleted file mode 100644
index f34373e9565..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileChooserNewFolderIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileChooserNewFolderIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FileChooserNewFolderIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserNewFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h
deleted file mode 100644
index ad83e262363..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileChooserUpFolderIcon.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalIconFactory$FileChooserNewFolderIcon.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileChooserUpFolderIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileChooserUpFolderIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FileChooserNewFolderIcon
-{
-
-public:
-  MetalIconFactory$FileChooserUpFolderIcon();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileChooserUpFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h
deleted file mode 100644
index 90f451b9127..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
-#define __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FileIcon16;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FileIcon16 : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FileIcon16();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  virtual jint getAdditionalHeight();
-  virtual jint getShift();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FileIcon16__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h
deleted file mode 100644
index 80ed1ebdd4d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
-#define __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$FolderIcon16;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$FolderIcon16 : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$FolderIcon16();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  virtual jint getAdditionalHeight();
-  virtual jint getShift();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$FolderIcon16__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h
deleted file mode 100644
index cf726d87d54..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$HorizontalSliderThumbIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$HorizontalSliderThumbIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$HorizontalSliderThumbIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gradientMask;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$HorizontalSliderThumbIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h
deleted file mode 100644
index 07a8d256acd..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameAltMaximizeIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$InternalFrameAltMaximizeIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$InternalFrameAltMaximizeIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$InternalFrameAltMaximizeIcon(jint);
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameAltMaximizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h
deleted file mode 100644
index 30289db5cfc..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameCloseIcon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$InternalFrameCloseIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$InternalFrameCloseIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$InternalFrameCloseIcon(jint);
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameCloseIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h
deleted file mode 100644
index 0c111ca032c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameDefaultMenuIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$InternalFrameDefaultMenuIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$InternalFrameDefaultMenuIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$InternalFrameDefaultMenuIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameDefaultMenuIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h
deleted file mode 100644
index 95014b00c7b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMaximizeIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$InternalFrameMaximizeIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$InternalFrameMaximizeIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$InternalFrameMaximizeIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMaximizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h
deleted file mode 100644
index 122d0282877..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$InternalFrameMinimizeIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$InternalFrameMinimizeIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$InternalFrameMinimizeIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$InternalFrameMinimizeIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$InternalFrameMinimizeIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h
deleted file mode 100644
index 11ee59a1575..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$PaletteCloseIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$PaletteCloseIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$PaletteCloseIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$PaletteCloseIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$PaletteCloseIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h
deleted file mode 100644
index 8d7eb638a28..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$RadioButtonIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$RadioButtonIcon : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalIconFactory$RadioButtonIcon();
-public:
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-private:
-  static JArray< JArray< jint > * > * gradientMask;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$RadioButtonIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h
deleted file mode 100644
index 4d0e722ad00..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$RadioButtonMenuItemIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$RadioButtonMenuItemIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$RadioButtonMenuItemIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$RadioButtonMenuItemIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h
deleted file mode 100644
index f469798827d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeComputerIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeComputerIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeComputerIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$TreeComputerIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeComputerIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h
deleted file mode 100644
index c0e9716dcc8..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeControlIcon.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeControlIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeControlIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$TreeControlIcon(jboolean);
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  virtual void paintMe(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) isLight;
-private:
-  jboolean collapsed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeControlIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h
deleted file mode 100644
index ad69d2d496b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFloppyDriveIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeFloppyDriveIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeFloppyDriveIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$TreeFloppyDriveIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeFloppyDriveIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h
deleted file mode 100644
index 4993efdb24d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalIconFactory$FolderIcon16.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeFolderIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeFolderIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FolderIcon16
-{
-
-public:
-  MetalIconFactory$TreeFolderIcon();
-  virtual jint getAdditionalHeight();
-  virtual jint getShift();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeFolderIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h
deleted file mode 100644
index 1eb1d51434b..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeHardDriveIcon.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeHardDriveIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeHardDriveIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$TreeHardDriveIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeHardDriveIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h
deleted file mode 100644
index df2b8e8dab5..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$TreeLeafIcon.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalIconFactory$FileIcon16.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$TreeLeafIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$TreeLeafIcon : public ::javax::swing::plaf::metal::MetalIconFactory$FileIcon16
-{
-
-public:
-  MetalIconFactory$TreeLeafIcon();
-  virtual jint getAdditionalHeight();
-  virtual jint getShift();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$TreeLeafIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h b/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h
deleted file mode 100644
index 7618da789f3..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
-#define __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory$VerticalSliderThumbIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory$VerticalSliderThumbIcon : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory$VerticalSliderThumbIcon();
-  virtual jint getIconWidth();
-  virtual jint getIconHeight();
-  virtual void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) gradientMask;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory$VerticalSliderThumbIcon__
diff --git a/libjava/javax/swing/plaf/metal/MetalIconFactory.h b/libjava/javax/swing/plaf/metal/MetalIconFactory.h
deleted file mode 100644
index f1cb1d77e23..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalIconFactory.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalIconFactory__
-#define __javax_swing_plaf_metal_MetalIconFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalIconFactory;
-            class MetalIconFactory$RadioButtonIcon;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalIconFactory : public ::java::lang::Object
-{
-
-public:
-  MetalIconFactory();
-  static ::javax::swing::Icon * getCheckBoxIcon();
-  static ::javax::swing::Icon * getCheckBoxMenuItemIcon();
-  static ::javax::swing::Icon * getFileChooserDetailViewIcon();
-  static ::javax::swing::Icon * getFileChooserHomeFolderIcon();
-  static ::javax::swing::Icon * getFileChooserListViewIcon();
-  static ::javax::swing::Icon * getFileChooserNewFolderIcon();
-  static ::javax::swing::Icon * getFileChooserUpFolderIcon();
-  static ::javax::swing::Icon * getRadioButtonIcon();
-  static ::javax::swing::Icon * getRadioButtonMenuItemIcon();
-  static ::javax::swing::Icon * getHorizontalSliderThumbIcon();
-  static ::javax::swing::Icon * getInternalFrameCloseIcon(jint);
-  static ::javax::swing::Icon * getInternalFrameDefaultMenuIcon();
-  static ::javax::swing::Icon * getInternalFrameMaximizeIcon(jint);
-  static ::javax::swing::Icon * getInternalFrameMinimizeIcon(jint);
-  static ::javax::swing::Icon * getInternalFrameAltMaximizeIcon(jint);
-  static ::javax::swing::Icon * getVerticalSliderThumbIcon();
-  static ::javax::swing::Icon * getTreeFolderIcon();
-  static ::javax::swing::Icon * getTreeLeafIcon();
-  static ::javax::swing::Icon * getTreeControlIcon(jboolean);
-  static ::javax::swing::Icon * getTreeComputerIcon();
-  static ::javax::swing::Icon * getTreeFloppyDriveIcon();
-  static ::javax::swing::Icon * getTreeHardDriveIcon();
-  static ::javax::swing::Icon * getMenuArrowIcon();
-  static ::javax::swing::Icon * getMenuItemArrowIcon();
-  static ::javax::swing::Icon * getMenuItemCheckIcon();
-  static const jboolean DARK = 0;
-  static const jboolean LIGHT = 1;
-private:
-  static ::javax::swing::Icon * menuArrow;
-  static ::javax::swing::Icon * menuItemArrow;
-  static ::javax::swing::Icon * checkBoxIcon;
-  static ::javax::swing::Icon * checkBoxMenuItemIcon;
-  static ::javax::swing::Icon * fileChooserDetailViewIcon;
-  static ::javax::swing::Icon * fileChooserHomeFolderIcon;
-  static ::javax::swing::Icon * fileChooserListViewIcon;
-  static ::javax::swing::Icon * fileChooserNewFolderIcon;
-  static ::javax::swing::Icon * fileChooserUpFolderIcon;
-  static ::javax::swing::plaf::metal::MetalIconFactory$RadioButtonIcon * radioButtonIcon;
-  static ::javax::swing::Icon * radioButtonMenuItemIcon;
-  static ::javax::swing::Icon * internalFrameDefaultMenuIcon;
-  static ::javax::swing::Icon * treeComputerIcon;
-  static ::javax::swing::Icon * treeFloppyDriveIcon;
-  static ::javax::swing::Icon * treeHardDriveIcon;
-  static ::javax::swing::Icon * horizontalSliderThumbIcon;
-  static ::javax::swing::Icon * verticalSliderThumbIcon;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalIconFactory__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h
deleted file mode 100644
index ba566882302..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
-#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicInternalFrameTitlePane$PropertyChangeHandler.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalInternalFrameTitlePane;
-            class MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler : public ::javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler
-{
-
-public:
-  MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameTitlePane$PropertyChangeHandler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalInternalFrameTitlePanePropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h
deleted file mode 100644
index da7e76cb710..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane$MetalTitlePaneLayout.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
-#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalInternalFrameTitlePane;
-            class MetalInternalFrameTitlePane$MetalTitlePaneLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalInternalFrameTitlePane$MetalTitlePaneLayout : public ::java::lang::Object
-{
-
-public:
-  MetalInternalFrameTitlePane$MetalTitlePaneLayout(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalInternalFrameTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane$MetalTitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h
deleted file mode 100644
index f3c0e7faba8..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalInternalFrameTitlePane.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
-#define __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicInternalFrameTitlePane.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class LayoutManager;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JButton;
-        class JInternalFrame;
-        class JLabel;
-        class JMenu;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalInternalFrameTitlePane;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalInternalFrameTitlePane : public ::javax::swing::plaf::basic::BasicInternalFrameTitlePane
-{
-
-public:
-  MetalInternalFrameTitlePane(::javax::swing::JInternalFrame *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual void uninstallDefaults();
-  virtual void createButtons();
-  virtual void addSystemMenuItems(::javax::swing::JMenu *);
-  virtual void showSystemMenu();
-  virtual void addSubComponents();
-  virtual ::java::awt::LayoutManager * createLayout();
-public:
-  virtual void paintPalette(::java::awt::Graphics *);
-  virtual void paintComponent(::java::awt::Graphics *);
-  virtual void setPalette(jboolean);
-public: // actually protected
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-public: // actually package-private
-  static ::javax::swing::JInternalFrame * access$0(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::JButton * access$1(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::Icon * access$2(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::JButton * access$3(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::Icon * access$4(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::JButton * access$5(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-  static ::javax::swing::Icon * access$6(::javax::swing::plaf::metal::MetalInternalFrameTitlePane *);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameTitlePane)))) isPalette;
-  ::javax::swing::Icon * paletteCloseIcon;
-  jint paletteTitleHeight;
-public: // actually package-private
-  ::javax::swing::JLabel * title;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalInternalFrameTitlePane__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h
deleted file mode 100644
index 9ac979b2b10..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI$1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalInternalFrameUI$1__
-#define __javax_swing_plaf_metal_MetalInternalFrameUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalInternalFrameUI;
-            class MetalInternalFrameUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalInternalFrameUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalInternalFrameUI$1(::javax::swing::plaf::metal::MetalInternalFrameUI *);
-public:
-  void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalInternalFrameUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalInternalFrameUI$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h b/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h
deleted file mode 100644
index db9fe9d86c9..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalInternalFrameUI.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalInternalFrameUI__
-#define __javax_swing_plaf_metal_MetalInternalFrameUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicInternalFrameUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JInternalFrame;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalInternalFrameUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalInternalFrameUI : public ::javax::swing::plaf::basic::BasicInternalFrameUI
-{
-
-public:
-  MetalInternalFrameUI(::javax::swing::JInternalFrame *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::javax::swing::JComponent * createNorthPane(::javax::swing::JInternalFrame *);
-public:
-  virtual void setPalette(jboolean);
-public: // actually protected
-  virtual void installListeners();
-  virtual void uninstallListeners();
-  virtual void installKeyboardActions();
-  static ::java::lang::String * IS_PALETTE;
-private:
-  ::java::beans::PropertyChangeListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicInternalFrameUI)))) paletteListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalLabelUI.h b/libjava/javax/swing/plaf/metal/MetalLabelUI.h
deleted file mode 100644
index f91d0993d3a..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalLabelUI.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalLabelUI__
-#define __javax_swing_plaf_metal_MetalLabelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicLabelUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JLabel;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalLabelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalLabelUI : public ::javax::swing::plaf::basic::BasicLabelUI
-{
-
-public:
-  MetalLabelUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintDisabledText(::javax::swing::JLabel *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint);
-  static ::javax::swing::plaf::metal::MetalLabelUI * metalLabelUI;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalLabelUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h b/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h
deleted file mode 100644
index 9159117de4d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalLookAndFeel$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalLookAndFeel$1__
-#define __javax_swing_plaf_metal_MetalLookAndFeel$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalLookAndFeel;
-            class MetalLookAndFeel$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalLookAndFeel$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalLookAndFeel$1(::javax::swing::plaf::metal::MetalLookAndFeel *);
-public:
-  ::java::lang::Object * createValue(::javax::swing::UIDefaults *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalLookAndFeel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalLookAndFeel$1__
diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
deleted file mode 100644
index 9985b60b9e6..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalLookAndFeel__
-#define __javax_swing_plaf_metal_MetalLookAndFeel__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicLookAndFeel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-          class ColorUIResource;
-          class FontUIResource;
-        namespace metal
-        {
-            class MetalLookAndFeel;
-            class MetalTheme;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalLookAndFeel : public ::javax::swing::plaf::basic::BasicLookAndFeel
-{
-
-public:
-  MetalLookAndFeel();
-public: // actually protected
-  virtual void createDefaultTheme();
-public:
-  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();
-  static ::javax::swing::plaf::ColorUIResource * getAcceleratorForeground();
-  static ::javax::swing::plaf::ColorUIResource * getAcceleratorSelectedForeground();
-  static ::javax::swing::plaf::ColorUIResource * getBlack();
-  static ::javax::swing::plaf::ColorUIResource * getControl();
-  static ::javax::swing::plaf::ColorUIResource * getControlDarkShadow();
-  static ::javax::swing::plaf::ColorUIResource * getControlDisabled();
-  static ::javax::swing::plaf::ColorUIResource * getControlHighlight();
-  static ::javax::swing::plaf::ColorUIResource * getControlInfo();
-  static ::javax::swing::plaf::ColorUIResource * getControlShadow();
-  static ::javax::swing::plaf::ColorUIResource * getControlTextColor();
-  static ::javax::swing::plaf::FontUIResource * getControlTextFont();
-  static ::javax::swing::plaf::ColorUIResource * getDesktopColor();
-  static ::javax::swing::plaf::ColorUIResource * getFocusColor();
-  static ::javax::swing::plaf::ColorUIResource * getHighlightedTextColor();
-  static ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
-  static ::javax::swing::plaf::ColorUIResource * getInactiveSystemTextColor();
-  static ::javax::swing::plaf::ColorUIResource * getMenuBackground();
-  static ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
-  static ::javax::swing::plaf::ColorUIResource * getMenuForeground();
-  static ::javax::swing::plaf::ColorUIResource * getMenuSelectedBackground();
-  static ::javax::swing::plaf::ColorUIResource * getMenuSelectedForeground();
-  static ::javax::swing::plaf::FontUIResource * getMenuTextFont();
-  static ::javax::swing::plaf::ColorUIResource * getPrimaryControl();
-  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlDarkShadow();
-  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlHighlight();
-  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlInfo();
-  static ::javax::swing::plaf::ColorUIResource * getPrimaryControlShadow();
-  static ::javax::swing::plaf::ColorUIResource * getSeparatorBackground();
-  static ::javax::swing::plaf::ColorUIResource * getSeparatorForeground();
-  static ::javax::swing::plaf::FontUIResource * getSubTextFont();
-  static ::javax::swing::plaf::ColorUIResource * getSystemTextColor();
-  static ::javax::swing::plaf::FontUIResource * getSystemTextFont();
-  static ::javax::swing::plaf::ColorUIResource * getTextHighlightColor();
-  static ::javax::swing::plaf::ColorUIResource * getUserTextColor();
-  static ::javax::swing::plaf::FontUIResource * getUserTextFont();
-  static ::javax::swing::plaf::ColorUIResource * getWhite();
-  static ::javax::swing::plaf::ColorUIResource * getWindowBackground();
-  static ::javax::swing::plaf::ColorUIResource * getWindowTitleBackground();
-  static ::javax::swing::plaf::FontUIResource * getWindowTitleFont();
-  static ::javax::swing::plaf::ColorUIResource * getWindowTitleForeground();
-  static ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveBackground();
-  static ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveForeground();
-  static void setCurrentTheme(::javax::swing::plaf::metal::MetalTheme *);
-public: // actually protected
-  virtual void initClassDefaults(::javax::swing::UIDefaults *);
-  virtual void initComponentDefaults(::javax::swing::UIDefaults *);
-  virtual void initSystemColorDefaults(::javax::swing::UIDefaults *);
-public:
-  static ::javax::swing::plaf::metal::MetalTheme * getCurrentTheme();
-  virtual jboolean getSupportsWindowDecorations();
-private:
-  static const jlong serialVersionUID = 6680646159193457980LL;
-  static ::javax::swing::plaf::metal::MetalTheme * theme;
-  ::javax::swing::UIDefaults * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicLookAndFeel)))) LAF_defaults;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalLookAndFeel__
diff --git a/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h b/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h
deleted file mode 100644
index 598291e4005..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalMenuBarUI.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalMenuBarUI__
-#define __javax_swing_plaf_metal_MetalMenuBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicMenuBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalMenuBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalMenuBarUI : public ::javax::swing::plaf::basic::BasicMenuBarUI
-{
-
-public:
-  MetalMenuBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalMenuBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h b/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h
deleted file mode 100644
index ca38d005b4d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
-#define __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/MetalSeparatorUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalPopupMenuSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalPopupMenuSeparatorUI : public ::javax::swing::plaf::metal::MetalSeparatorUI
-{
-
-public:
-  MetalPopupMenuSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-private:
-  static ::javax::swing::plaf::metal::MetalPopupMenuSeparatorUI * instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalPopupMenuSeparatorUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h b/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h
deleted file mode 100644
index ca9500ac5b2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalProgressBarUI.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalProgressBarUI__
-#define __javax_swing_plaf_metal_MetalProgressBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicProgressBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalProgressBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalProgressBarUI : public ::javax::swing::plaf::basic::BasicProgressBarUI
-{
-
-public:
-  MetalProgressBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void paintDeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paintIndeterminate(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalProgressBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h b/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h
deleted file mode 100644
index 477bca7cacc..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRadioButtonUI.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRadioButtonUI__
-#define __javax_swing_plaf_metal_MetalRadioButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicRadioButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalRadioButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRadioButtonUI : public ::javax::swing::plaf::basic::BasicRadioButtonUI
-{
-
-public:
-  MetalRadioButtonUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installDefaults(::javax::swing::AbstractButton *);
-public: // actually protected
-  virtual void uninstallDefaults(::javax::swing::AbstractButton *);
-  virtual ::java::awt::Color * getSelectColor();
-  virtual ::java::awt::Color * getDisabledTextColor();
-  virtual ::java::awt::Color * getFocusColor();
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintFocus(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Dimension *);
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicRadioButtonUI)))) focusColor;
-  ::java::awt::Color * selectColor;
-  ::java::awt::Color * disabledTextColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRadioButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h
deleted file mode 100644
index aa5a0eb84d9..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalFrameBorder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
-
-#pragma interface
-
-#include <javax/swing/border/AbstractBorder.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalFrameBorder;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalFrameBorder : public ::javax::swing::border::AbstractBorder
-{
-
-  MetalRootPaneUI$MetalFrameBorder();
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *, ::java::awt::Insets *);
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-public: // actually package-private
-  MetalRootPaneUI$MetalFrameBorder(::javax::swing::plaf::metal::MetalRootPaneUI$MetalFrameBorder *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalFrameBorder__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h
deleted file mode 100644
index 8cf2767d29d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayout.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalRootLayout;
-            class MetalRootPaneUI$MetalTitlePane;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalRootLayout : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalRootPaneUI$MetalRootLayout(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-public:
-  virtual void addLayoutComponent(::java::awt::Component *, ::java::lang::Object *);
-  virtual ::java::awt::Dimension * maximumLayoutSize(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentX(::java::awt::Container *);
-  virtual jfloat getLayoutAlignmentY(::java::awt::Container *);
-  virtual void invalidateLayout(::java::awt::Container *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual void layoutContainer(::java::awt::Container *);
-private:
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) glassPaneBounds;
-  ::java::awt::Rectangle * layeredPaneBounds;
-  ::java::awt::Rectangle * contentPaneBounds;
-  ::java::awt::Rectangle * menuBarBounds;
-  ::java::awt::Rectangle * titlePaneBounds;
-  ::java::awt::Dimension * prefSize;
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * titlePane;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalRootLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h
deleted file mode 100644
index 5837b81a47a..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$CloseAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$CloseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$CloseAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  MetalRootPaneUI$MetalTitlePane$CloseAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$CloseAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h
deleted file mode 100644
index ea82f56189e..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$IconifyAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$IconifyAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$IconifyAction : public ::javax::swing::AbstractAction
-{
-
-  MetalRootPaneUI$MetalTitlePane$IconifyAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  MetalRootPaneUI$MetalTitlePane$IconifyAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$IconifyAction *);
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$IconifyAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h
deleted file mode 100644
index bad5edc2aca..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MaximizeAction.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$MaximizeAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MaximizeAction : public ::javax::swing::AbstractAction
-{
-
-  MetalRootPaneUI$MetalTitlePane$MaximizeAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  MetalRootPaneUI$MetalTitlePane$MaximizeAction(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MaximizeAction *);
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::AbstractAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MaximizeAction__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h
deleted file mode 100644
index 5bc79486c69..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout : public ::java::lang::Object
-{
-
-public:
-  MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MetalTitlePaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h
deleted file mode 100644
index a1ee9cd5ca2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$MouseHandler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
-
-#pragma interface
-
-#include <javax/swing/event/MouseInputAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$MouseHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MouseHandler : public ::javax::swing::event::MouseInputAdapter
-{
-
-  MetalRootPaneUI$MetalTitlePane$MouseHandler(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *);
-public:
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  MetalRootPaneUI$MetalTitlePane$MouseHandler(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$MouseHandler *);
-  ::java::awt::Point * __attribute__((aligned(__alignof__( ::javax::swing::event::MouseInputAdapter)))) lastDragLocation;
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$MouseHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h
deleted file mode 100644
index 1505f5c47c6..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane$PaneButton.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-            class MetalRootPaneUI$MetalTitlePane$PaneButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane$PaneButton : public ::javax::swing::JButton
-{
-
-public:
-  MetalRootPaneUI$MetalTitlePane$PaneButton(::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane *, ::javax::swing::Action *);
-  virtual jboolean isFocusable();
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane$PaneButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h
deleted file mode 100644
index d9adc9b8a64..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI$MetalTitlePane.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
-#define __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class LayoutManager;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class Icon;
-        class JButton;
-        class JLabel;
-        class JMenu;
-        class JMenuBar;
-        class JRootPane;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalRootPaneUI$MetalTitlePane;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI$MetalTitlePane : public ::javax::swing::JComponent
-{
-
-public: // actually package-private
-  MetalRootPaneUI$MetalTitlePane(::javax::swing::JRootPane *);
-public: // actually protected
-  virtual ::java::awt::LayoutManager * createLayout();
-  virtual void installTitlePane();
-private:
-  void enableActions();
-  void addSubComponents();
-  void installListeners();
-  void createActions();
-  void assembleSystemMenu();
-public: // actually protected
-  virtual ::javax::swing::JMenuBar * createSystemMenuBar();
-  virtual ::javax::swing::JMenu * createSystemMenu();
-private:
-  void addSystemMenuItems(::javax::swing::JMenu *);
-public: // actually protected
-  virtual void createButtons();
-  virtual void setButtonIcons();
-public:
-  virtual void paintComponent(::java::awt::Graphics *);
-public: // actually protected
-  virtual void paintTitleBackground(::java::awt::Graphics *);
-private:
-  void installDefaults();
-public: // actually package-private
-  ::javax::swing::JRootPane * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) rootPane;
-  ::javax::swing::JButton * closeButton;
-  ::javax::swing::JButton * iconButton;
-  ::javax::swing::JButton * maxButton;
-  ::javax::swing::Icon * minIcon;
-  ::javax::swing::Icon * maxIcon;
-private:
-  ::javax::swing::Icon * iconIcon;
-public: // actually package-private
-  ::javax::swing::Icon * closeIcon;
-private:
-  ::java::awt::Color * notSelectedTitleColor;
-  ::java::awt::Color * selectedTitleColor;
-public: // actually package-private
-  ::javax::swing::JLabel * title;
-private:
-  ::javax::swing::Action * closeAction;
-  ::javax::swing::Action * iconifyAction;
-  ::javax::swing::Action * maximizeAction;
-  ::javax::swing::JMenuBar * menuBar;
-public: // actually protected
-  ::javax::swing::JMenu * windowMenu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI$MetalTitlePane__
diff --git a/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h b/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h
deleted file mode 100644
index dad96a54484..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalRootPaneUI.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalRootPaneUI__
-#define __javax_swing_plaf_metal_MetalRootPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicRootPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JRootPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalRootPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalRootPaneUI : public ::javax::swing::plaf::basic::BasicRootPaneUI
-{
-
-public:
-  MetalRootPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-private:
-  void installWindowDecorations(::javax::swing::JRootPane *);
-  void uninstallWindowDecorations(::javax::swing::JRootPane *);
-  static ::javax::swing::plaf::metal::MetalRootPaneUI * instance;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalRootPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h b/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h
deleted file mode 100644
index 911ed4ddeb1..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalScrollBarUI$MetalScrollBarPropertyChangeHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
-#define __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalScrollBarUI;
-            class MetalScrollBarUI$MetalScrollBarPropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalScrollBarUI$MetalScrollBarPropertyChangeHandler : public ::javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler
-{
-
-public:
-  MetalScrollBarUI$MetalScrollBarPropertyChangeHandler(::javax::swing::plaf::metal::MetalScrollBarUI *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalScrollBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicScrollBarUI$PropertyChangeHandler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalScrollBarUI$MetalScrollBarPropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h b/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h
deleted file mode 100644
index f76d33bddfb..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalScrollBarUI.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalScrollBarUI__
-#define __javax_swing_plaf_metal_MetalScrollBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicScrollBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JButton;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalScrollBarUI;
-            class MetalScrollButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalScrollBarUI : public ::javax::swing::plaf::basic::BasicScrollBarUI
-{
-
-public:
-  MetalScrollBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void installDefaults();
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener();
-  virtual ::javax::swing::JButton * createDecreaseButton(jint);
-  virtual ::javax::swing::JButton * createIncreaseButton(jint);
-  virtual void paintTrack(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-private:
-  void paintTrackHorizontal(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint, jint);
-  void paintTrackVertical(::java::awt::Graphics *, ::javax::swing::JComponent *, jint, jint, jint, jint);
-public: // actually protected
-  virtual void paintThumb(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-private:
-  void paintThumbHorizontal(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-  void paintThumbVertical(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *);
-public: // actually protected
-  virtual ::java::awt::Dimension * getMinimumThumbSize();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  static ::java::lang::String * FREE_STANDING_PROP;
-private:
-  static ::java::awt::Dimension * MIN_THUMB_SIZE;
-  static ::java::awt::Dimension * MIN_THUMB_SIZE_FREE_STANDING;
-public: // actually protected
-  ::javax::swing::plaf::metal::MetalScrollButton * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicScrollBarUI)))) increaseButton;
-  ::javax::swing::plaf::metal::MetalScrollButton * decreaseButton;
-  jint scrollBarWidth;
-  jboolean isFreeStanding;
-public: // actually package-private
-  ::java::awt::Color * scrollBarShadowColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalScrollBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollButton.h b/libjava/javax/swing/plaf/metal/MetalScrollButton.h
deleted file mode 100644
index 3a3d86125f2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalScrollButton.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalScrollButton__
-#define __javax_swing_plaf_metal_MetalScrollButton__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicArrowButton.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalScrollButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalScrollButton : public ::javax::swing::plaf::basic::BasicArrowButton
-{
-
-public:
-  MetalScrollButton(jint, jint, jboolean);
-  virtual jint getButtonWidth();
-  virtual void setFreeStanding(jboolean);
-  virtual void paint(::java::awt::Graphics *);
-private:
-  void paintArrow(::java::awt::Graphics *, jint, jint);
-  void paintNorthBorderFreeStanding(::java::awt::Graphics *, jint, jint);
-  void paintSouthBorderFreeStanding(::java::awt::Graphics *, jint, jint);
-  void paintEastBorderFreeStanding(::java::awt::Graphics *, jint, jint);
-  void paintWestBorderFreeStanding(::java::awt::Graphics *, jint, jint);
-  void paintNorthBorder(::java::awt::Graphics *, jint, jint);
-  void paintSouthBorder(::java::awt::Graphics *, jint, jint);
-  void paintEastBorder(::java::awt::Graphics *, jint, jint);
-  void paintWestBorder(::java::awt::Graphics *, jint, jint);
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-private:
-  static ::java::awt::Dimension * maximumSize;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicArrowButton)))) buttonWidth;
-  jboolean freeStanding;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalScrollButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h b/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h
deleted file mode 100644
index f751c355ee2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalScrollPaneUI.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalScrollPaneUI__
-#define __javax_swing_plaf_metal_MetalScrollPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicScrollPaneUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class JScrollPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalScrollPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalScrollPaneUI : public ::javax::swing::plaf::basic::BasicScrollPaneUI
-{
-
-public:
-  MetalScrollPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void installListeners(::javax::swing::JScrollPane *);
-  virtual void uninstallListeners(::javax::swing::JScrollPane *);
-public: // actually protected
-  virtual ::java::beans::PropertyChangeListener * createScrollBarSwapListener();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h b/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h
deleted file mode 100644
index afa4a33c713..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSeparatorUI.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSeparatorUI__
-#define __javax_swing_plaf_metal_MetalSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSeparatorUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSeparatorUI : public ::javax::swing::plaf::basic::BasicSeparatorUI
-{
-
-public:
-  MetalSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  static ::javax::swing::plaf::metal::MetalSeparatorUI * instance;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSeparatorUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h b/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h
deleted file mode 100644
index a3b9554cb12..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
-#define __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalSliderUI;
-            class MetalSliderUI$MetalPropertyListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSliderUI$MetalPropertyListener : public ::javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler
-{
-
-public: // actually protected
-  MetalSliderUI$MetalPropertyListener(::javax::swing::plaf::metal::MetalSliderUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalSliderUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSliderUI$PropertyChangeHandler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSliderUI$MetalPropertyListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalSliderUI.h b/libjava/javax/swing/plaf/metal/MetalSliderUI.h
deleted file mode 100644
index 555e0b37dd5..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSliderUI.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSliderUI__
-#define __javax_swing_plaf_metal_MetalSliderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSliderUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JComponent;
-        class JSlider;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalSliderUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSliderUI : public ::javax::swing::plaf::basic::BasicSliderUI
-{
-
-public:
-  MetalSliderUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::beans::PropertyChangeListener * createPropertyChangeListener(::javax::swing::JSlider *);
-public:
-  virtual void paintThumb(::java::awt::Graphics *);
-  virtual void paintTrack(::java::awt::Graphics *);
-  virtual void paintFocus(::java::awt::Graphics *);
-public: // actually protected
-  virtual ::java::awt::Dimension * getThumbSize();
-public:
-  virtual jint getTickLength();
-public: // actually protected
-  virtual jint getTrackWidth();
-  virtual jint getTrackLength();
-  virtual jint getThumbOverhang();
-  virtual void scrollDueToClickInTrack(jint);
-  virtual void paintMinorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMajorTickForHorizSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMinorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void paintMajorTickForVertSlider(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  static ::java::awt::Color * thumbColor;
-  static ::java::awt::Color * highlightColor;
-  static ::java::awt::Color * darkShadowColor;
-  static jint trackWidth;
-  static jint tickLength;
-  static ::javax::swing::Icon * horizThumbIcon;
-  static ::javax::swing::Icon * vertThumbIcon;
-  const jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSliderUI)))) TICK_BUFFER;
-  ::java::lang::String * SLIDER_FILL;
-  jboolean filledSlider;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSliderUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalDividerLayout.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalDividerLayout.h
deleted file mode 100644
index 707fe29327c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalDividerLayout.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalDividerLayout__
-#define __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalDividerLayout__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Container;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicArrowButton;
-        }
-        namespace metal
-        {
-            class MetalSplitPaneDivider;
-            class MetalSplitPaneDivider$MetalDividerLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSplitPaneDivider$MetalDividerLayout : public ::java::lang::Object
-{
-
-public:
-  MetalSplitPaneDivider$MetalDividerLayout(::javax::swing::plaf::metal::MetalSplitPaneDivider *);
-  virtual void addLayoutComponent(::java::lang::String *, ::java::awt::Component *);
-  virtual void layoutContainer(::java::awt::Container *);
-  virtual ::java::awt::Dimension * minimumLayoutSize(::java::awt::Container *);
-  virtual ::java::awt::Dimension * preferredLayoutSize(::java::awt::Container *);
-  virtual void removeLayoutComponent(::java::awt::Component *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicArrowButton * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rb;
-  ::javax::swing::plaf::basic::BasicArrowButton * lb;
-  ::javax::swing::plaf::metal::MetalSplitPaneDivider * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalDividerLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h
deleted file mode 100644
index ee348d7779d..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider$MetalOneTouchButton.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
-#define __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
-
-#pragma interface
-
-#include <javax/swing/JButton.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalSplitPaneDivider;
-            class MetalSplitPaneDivider$MetalOneTouchButton;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSplitPaneDivider$MetalOneTouchButton : public ::javax::swing::JButton
-{
-
-public: // actually package-private
-  MetalSplitPaneDivider$MetalOneTouchButton(::javax::swing::plaf::metal::MetalSplitPaneDivider *, jint);
-public:
-  virtual void setBorder(::javax::swing::border::Border *);
-  virtual jboolean isFocusTraversable();
-  virtual void paint(::java::awt::Graphics *);
-public: // actually package-private
-  static const jint LEFT = 0;
-  static const jint RIGHT = 1;
-private:
-  JArray< ::java::awt::Color * > * __attribute__((aligned(__alignof__( ::javax::swing::JButton)))) colors;
-  jint direction;
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalSplitPaneDivider * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider$MetalOneTouchButton__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h
deleted file mode 100644
index 7230f6051e7..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSplitPaneDivider.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSplitPaneDivider__
-#define __javax_swing_plaf_metal_MetalSplitPaneDivider__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSplitPaneDivider.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JButton;
-        class JSplitPane;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalSplitPaneDivider;
-            class MetalSplitPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSplitPaneDivider : public ::javax::swing::plaf::basic::BasicSplitPaneDivider
-{
-
-public:
-  MetalSplitPaneDivider(::javax::swing::plaf::metal::MetalSplitPaneUI *, ::java::awt::Color *, ::java::awt::Color *);
-  virtual void paint(::java::awt::Graphics *);
-public: // actually protected
-  virtual ::javax::swing::JButton * createLeftOneTouchButton();
-  virtual ::javax::swing::JButton * createRightOneTouchButton();
-public: // actually package-private
-  static JArray< JArray< jbyte > * > * BUTTON_SPRITE_L;
-  static JArray< JArray< jbyte > * > * BUTTON_SPRITE_R;
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicSplitPaneDivider)))) dark;
-  ::java::awt::Color * light;
-  ::javax::swing::JSplitPane * splitPane;
-  jint orientation;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSplitPaneDivider__
diff --git a/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h b/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h
deleted file mode 100644
index 2505e06c27c..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalSplitPaneUI.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalSplitPaneUI__
-#define __javax_swing_plaf_metal_MetalSplitPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicSplitPaneUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace basic
-        {
-            class BasicSplitPaneDivider;
-        }
-        namespace metal
-        {
-            class MetalSplitPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalSplitPaneUI : public ::javax::swing::plaf::basic::BasicSplitPaneUI
-{
-
-public:
-  MetalSplitPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::javax::swing::plaf::basic::BasicSplitPaneDivider * createDefaultDivider();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h
deleted file mode 100644
index 0aa2214c5a2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
-#define __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalTabbedPaneUI;
-            class MetalTabbedPaneUI$TabbedPaneLayout;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTabbedPaneUI$TabbedPaneLayout : public ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout
-{
-
-public:
-  MetalTabbedPaneUI$TabbedPaneLayout(::javax::swing::plaf::metal::MetalTabbedPaneUI *);
-public: // actually protected
-  virtual void rotateTabRuns(jint, jint);
-  virtual void padSelectedTab(jint, jint);
-  virtual void normalizeTabRuns(jint, jint, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalTabbedPaneUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI$TabbedPaneLayout)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTabbedPaneUI$TabbedPaneLayout__
diff --git a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h b/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h
deleted file mode 100644
index 12fdef6c931..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTabbedPaneUI.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTabbedPaneUI__
-#define __javax_swing_plaf_metal_MetalTabbedPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTabbedPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class LayoutManager;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalTabbedPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTabbedPaneUI : public ::javax::swing::plaf::basic::BasicTabbedPaneUI
-{
-
-public:
-  MetalTabbedPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::awt::LayoutManager * createLayoutManager();
-  virtual void paintTabBorder(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintTopTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintLeftTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintRightTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintBottomTabBorder(jint, ::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintTabBackground(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, jboolean);
-  virtual void paintFocusIndicator(::java::awt::Graphics *, jint, JArray< ::java::awt::Rectangle * > *, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jboolean);
-  virtual jboolean shouldPadTabRun(jint, jint);
-  virtual void installDefaults();
-  virtual ::java::awt::Color * getColorForGap(jint, jint, jint);
-  virtual jboolean shouldFillGap(jint, jint, jint, jint);
-  virtual void paintHighlightBelowTab();
-  virtual jboolean shouldRotateTabRuns(jint, jint);
-  virtual jint calculateMaxTabHeight(jint);
-  virtual jint getTabRunOverlay(jint);
-  virtual void paintContentBorderTopEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderBottomEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderLeftEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-  virtual void paintContentBorderRightEdge(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint);
-private:
-  jboolean isLastTabInRun(jint);
-  ::java::awt::Color * getUnselectedBackground(jint);
-public: // actually protected
-  virtual jint getTabLabelShiftX(jint, jint, jboolean);
-  virtual jint getTabLabelShiftY(jint, jint, jboolean);
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTabbedPaneUI)))) minTabWidth;
-  ::java::awt::Color * selectColor;
-  ::java::awt::Color * selectHighlight;
-  ::java::awt::Color * tabAreaBackground;
-private:
-  ::java::awt::Graphics * hg;
-  jboolean tabsOpaque;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h b/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h
deleted file mode 100644
index 610de0bfbde..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTextFieldUI.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTextFieldUI__
-#define __javax_swing_plaf_metal_MetalTextFieldUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextFieldUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalTextFieldUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTextFieldUI : public ::javax::swing::plaf::basic::BasicTextFieldUI
-{
-
-public:
-  MetalTextFieldUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTextFieldUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTheme.h b/libjava/javax/swing/plaf/metal/MetalTheme.h
deleted file mode 100644
index e8e813a88d5..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTheme.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTheme__
-#define __javax_swing_plaf_metal_MetalTheme__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-          class ColorUIResource;
-          class FontUIResource;
-        namespace metal
-        {
-            class MetalTheme;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTheme : public ::java::lang::Object
-{
-
-public:
-  MetalTheme();
-  virtual ::java::lang::String * getName() = 0;
-  virtual void addCustomEntriesToTable(::javax::swing::UIDefaults *);
-  virtual ::javax::swing::plaf::ColorUIResource * getAcceleratorForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getAcceleratorSelectedForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getControl();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlDarkShadow();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlDisabled();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlHighlight();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlInfo();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlShadow();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getDesktopColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getFocusColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getHighlightedTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getInactiveSystemTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuSelectedBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuSelectedForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControl();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlDarkShadow();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlHighlight();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlInfo();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimaryControlShadow();
-  virtual ::javax::swing::plaf::ColorUIResource * getSeparatorBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getSeparatorForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getSystemTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getTextHighlightColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getUserTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getWindowBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleForeground();
-  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveBackground();
-  virtual ::javax::swing::plaf::ColorUIResource * getWindowTitleInactiveForeground();
-public: // actually protected
-  virtual ::javax::swing::plaf::ColorUIResource * getBlack();
-  virtual ::javax::swing::plaf::ColorUIResource * getWhite();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1() = 0;
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2() = 0;
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3() = 0;
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1() = 0;
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2() = 0;
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3() = 0;
-public:
-  virtual ::javax::swing::plaf::FontUIResource * getControlTextFont() = 0;
-  virtual ::javax::swing::plaf::FontUIResource * getMenuTextFont() = 0;
-  virtual ::javax::swing::plaf::FontUIResource * getSubTextFont() = 0;
-  virtual ::javax::swing::plaf::FontUIResource * getSystemTextFont() = 0;
-  virtual ::javax::swing::plaf::FontUIResource * getUserTextFont() = 0;
-  virtual ::javax::swing::plaf::FontUIResource * getWindowTitleFont() = 0;
-private:
-  ::javax::swing::plaf::ColorUIResource * __attribute__((aligned(__alignof__( ::java::lang::Object)))) BLACK;
-  ::javax::swing::plaf::ColorUIResource * WHITE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTheme__
diff --git a/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h b/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h
deleted file mode 100644
index a53cb8b0118..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToggleButtonUI.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToggleButtonUI__
-#define __javax_swing_plaf_metal_MetalToggleButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToggleButtonUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class AbstractButton;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalToggleButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToggleButtonUI : public ::javax::swing::plaf::basic::BasicToggleButtonUI
-{
-
-public:
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  MetalToggleButtonUI();
-public: // actually protected
-  virtual ::java::awt::Color * getFocusColor();
-  virtual ::java::awt::Color * getSelectColor();
-  virtual ::java::awt::Color * getDisabledTextColor();
-public:
-  virtual void installDefaults(::javax::swing::AbstractButton *);
-public: // actually protected
-  virtual void paintButtonPressed(::java::awt::Graphics *, ::javax::swing::AbstractButton *);
-  virtual void paintText(::java::awt::Graphics *, ::javax::swing::JComponent *, ::java::awt::Rectangle *, ::java::lang::String *);
-  virtual void paintFocus(::java::awt::Graphics *, ::javax::swing::AbstractButton *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *);
-public:
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToggleButtonUI)))) focusColor;
-  ::java::awt::Color * selectColor;
-  ::java::awt::Color * disabledTextColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToggleButtonUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h
deleted file mode 100644
index b04a7bb6353..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalContainerListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
-#define __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToolBarUI$ToolBarContListener.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalToolBarUI;
-            class MetalToolBarUI$MetalContainerListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToolBarUI$MetalContainerListener : public ::javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener
-{
-
-public: // actually protected
-  MetalToolBarUI$MetalContainerListener(::javax::swing::plaf::metal::MetalToolBarUI *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$ToolBarContListener)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalContainerListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h
deleted file mode 100644
index f509544b3aa..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
-#define __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToolBarUI$DockingListener.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JToolBar;
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalToolBarUI;
-            class MetalToolBarUI$MetalDockingListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToolBarUI$MetalDockingListener : public ::javax::swing::plaf::basic::BasicToolBarUI$DockingListener
-{
-
-public:
-  MetalToolBarUI$MetalDockingListener(::javax::swing::plaf::metal::MetalToolBarUI *, ::javax::swing::JToolBar *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$DockingListener)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalDockingListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h
deleted file mode 100644
index 8b254a6c133..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToolBarUI$MetalRolloverListener.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
-#define __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToolBarUI$PropertyListener.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalToolBarUI;
-            class MetalToolBarUI$MetalRolloverListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToolBarUI$MetalRolloverListener : public ::javax::swing::plaf::basic::BasicToolBarUI$PropertyListener
-{
-
-public: // actually protected
-  MetalToolBarUI$MetalRolloverListener(::javax::swing::plaf::metal::MetalToolBarUI *);
-public: // actually package-private
-  ::javax::swing::plaf::metal::MetalToolBarUI * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI$PropertyListener)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToolBarUI$MetalRolloverListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolBarUI.h b/libjava/javax/swing/plaf/metal/MetalToolBarUI.h
deleted file mode 100644
index 95be69ffd07..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToolBarUI.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToolBarUI__
-#define __javax_swing_plaf_metal_MetalToolBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToolBarUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Point;
-      namespace event
-      {
-          class ContainerListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace border
-      {
-          class Border;
-      }
-      namespace event
-      {
-          class MouseInputListener;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalToolBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToolBarUI : public ::javax::swing::plaf::basic::BasicToolBarUI
-{
-
-public:
-  MetalToolBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual ::java::beans::PropertyChangeListener * createRolloverListener();
-  virtual ::java::awt::event::ContainerListener * createContainerListener();
-  virtual ::javax::swing::border::Border * createNonRolloverBorder();
-  virtual void setDragOffset(::java::awt::Point *);
-  virtual ::javax::swing::event::MouseInputListener * createDockingListener();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  ::java::awt::event::ContainerListener * __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolBarUI)))) contListener;
-  ::java::beans::PropertyChangeListener * rolloverListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToolBarUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalToolTipUI.h b/libjava/javax/swing/plaf/metal/MetalToolTipUI.h
deleted file mode 100644
index f38637c6db2..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalToolTipUI.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalToolTipUI__
-#define __javax_swing_plaf_metal_MetalToolTipUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicToolTipUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Font;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class KeyStroke;
-      namespace border
-      {
-          class Border;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalToolTipUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalToolTipUI : public ::javax::swing::plaf::basic::BasicToolTipUI
-{
-
-public:
-  MetalToolTipUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual ::java::lang::String * getAcceleratorString();
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual jboolean isAcceleratorHidden();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-private:
-  ::java::lang::String * fetchAcceleratorString(::javax::swing::JComponent *);
-  ::java::lang::String * acceleratorToString(::javax::swing::KeyStroke *);
-public:
-  static const jint padSpaceBetweenStrings = 12;
-private:
-  static ::javax::swing::plaf::metal::MetalToolTipUI * instance;
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicToolTipUI)))) isAcceleratorHidden__;
-  ::java::lang::String * acceleratorString;
-  ::java::lang::String * acceleratorDelimiter;
-  ::java::awt::Font * acceleratorFont;
-  ::java::awt::Color * acceleratorForeground;
-  ::javax::swing::border::Border * activeBorder;
-  ::javax::swing::border::Border * inactiveBorder;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalToolTipUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h b/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h
deleted file mode 100644
index e0ffe068fc3..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTreeUI$LineStyleListener.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
-#define __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalTreeUI;
-            class MetalTreeUI$LineStyleListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTreeUI$LineStyleListener : public ::java::lang::Object
-{
-
-  MetalTreeUI$LineStyleListener(::javax::swing::plaf::metal::MetalTreeUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  MetalTreeUI$LineStyleListener(::javax::swing::plaf::metal::MetalTreeUI *, ::javax::swing::plaf::metal::MetalTreeUI$LineStyleListener *);
-  ::javax::swing::plaf::metal::MetalTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTreeUI$LineStyleListener__
diff --git a/libjava/javax/swing/plaf/metal/MetalTreeUI.h b/libjava/javax/swing/plaf/metal/MetalTreeUI.h
deleted file mode 100644
index 98cf994a24f..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalTreeUI.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalTreeUI__
-#define __javax_swing_plaf_metal_MetalTreeUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTreeUI.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Insets;
-        class Rectangle;
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace metal
-        {
-            class MetalTreeUI;
-        }
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalTreeUI : public ::javax::swing::plaf::basic::BasicTreeUI
-{
-
-public:
-  MetalTreeUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual jint getHorizontalLegBuffer();
-public:
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-public: // actually protected
-  virtual void decodeLineStyle(::java::lang::Object *);
-  virtual jboolean isLocationInExpandControl(jint, jint, jint, jint);
-public:
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-public: // actually protected
-  virtual void paintHorizontalSeparators(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paintVerticalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::javax::swing::tree::TreePath *);
-  virtual void paintHorizontalPartOfLeg(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Insets *, ::java::awt::Rectangle *, ::javax::swing::tree::TreePath *, jint, jboolean, jboolean, jboolean);
-private:
-  static ::java::lang::String * LINE_STYLE_PROPERTY;
-  static ::java::lang::String * LINE_STYLE_VALUE_NONE;
-  static ::java::lang::String * LINE_STYLE_VALUE_ANGLED;
-  static ::java::lang::String * LINE_STYLE_VALUE_HORIZONTAL;
-  static const jint LINE_STYLE_NONE = 0;
-  static const jint LINE_STYLE_ANGLED = 1;
-  static const jint LINE_STYLE_HORIZONTAL = 2;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::plaf::basic::BasicTreeUI)))) lineStyle;
-  ::java::beans::PropertyChangeListener * lineStyleListener;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalTreeUI__
diff --git a/libjava/javax/swing/plaf/metal/MetalUtils.h b/libjava/javax/swing/plaf/metal/MetalUtils.h
deleted file mode 100644
index 3dd94a23fde..00000000000
--- a/libjava/javax/swing/plaf/metal/MetalUtils.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_MetalUtils__
-#define __javax_swing_plaf_metal_MetalUtils__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Graphics2D;
-      namespace image
-      {
-          class BufferedImage;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace metal
-        {
-            class MetalUtils;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::MetalUtils : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MetalUtils();
-  static void fillMetalPattern(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
-  static void fillMetalPattern2D(::java::awt::Graphics2D *, jint, jint, jint, jint, ::java::awt::Color *, ::java::awt::Color *);
-  static void initializePattern(::java::awt::Color *, ::java::awt::Color *);
-  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::lang::String *);
-  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::lang::String *, JArray< JArray< jint > * > *);
-  static void paintGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, jint, JArray< JArray< jint > * > *);
-  static void paintHorizontalGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
-  static void paintVerticalGradient(::java::awt::Graphics *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
-private:
-  static void paintHorizontalGradient2D(::java::awt::Graphics2D *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
-  static void paintVerticalGradient2D(::java::awt::Graphics2D *, jint, jint, jint, jint, jfloat, jfloat, ::java::awt::Color *, ::java::awt::Color *, ::java::awt::Color *, JArray< JArray< jint > * > *);
-public: // actually package-private
-  static ::java::awt::image::BufferedImage * pattern2D;
-  static ::java::awt::Color * lightColor;
-  static ::java::awt::Color * darkColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_MetalUtils__
diff --git a/libjava/javax/swing/plaf/metal/OceanTheme.h b/libjava/javax/swing/plaf/metal/OceanTheme.h
deleted file mode 100644
index 2587609811f..00000000000
--- a/libjava/javax/swing/plaf/metal/OceanTheme.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_metal_OceanTheme__
-#define __javax_swing_plaf_metal_OceanTheme__
-
-#pragma interface
-
-#include <javax/swing/plaf/metal/DefaultMetalTheme.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class UIDefaults;
-      namespace plaf
-      {
-          class ColorUIResource;
-        namespace metal
-        {
-            class OceanTheme;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::metal::OceanTheme : public ::javax::swing::plaf::metal::DefaultMetalTheme
-{
-
-public:
-  OceanTheme();
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::plaf::ColorUIResource * getControlTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getDesktopColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getInactiveControlTextColor();
-  virtual ::javax::swing::plaf::ColorUIResource * getMenuDisabledForeground();
-public: // actually protected
-  virtual ::javax::swing::plaf::ColorUIResource * getBlack();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary1();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary2();
-  virtual ::javax::swing::plaf::ColorUIResource * getPrimary3();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary1();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary2();
-  virtual ::javax::swing::plaf::ColorUIResource * getSecondary3();
-public:
-  virtual void addCustomEntriesToTable(::javax::swing::UIDefaults *);
-public: // actually package-private
-  static ::javax::swing::plaf::ColorUIResource * BLACK;
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY1;
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY2;
-  static ::javax::swing::plaf::ColorUIResource * PRIMARY3;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY1;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY2;
-  static ::javax::swing::plaf::ColorUIResource * SECONDARY3;
-  static ::javax::swing::plaf::ColorUIResource * INACTIVE_CONTROL_TEXT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_metal_OceanTheme__
diff --git a/libjava/javax/swing/plaf/multi/MultiButtonUI.h b/libjava/javax/swing/plaf/multi/MultiButtonUI.h
deleted file mode 100644
index 3481b6eee4e..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiButtonUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiButtonUI__
-#define __javax_swing_plaf_multi_MultiButtonUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ButtonUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiButtonUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiButtonUI : public ::javax::swing::plaf::ButtonUI
-{
-
-public:
-  MultiButtonUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ButtonUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiButtonUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h b/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h
deleted file mode 100644
index d890eeabef3..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiColorChooserUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiColorChooserUI__
-#define __javax_swing_plaf_multi_MultiColorChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ColorChooserUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiColorChooserUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiColorChooserUI : public ::javax::swing::plaf::ColorChooserUI
-{
-
-public:
-  MultiColorChooserUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ColorChooserUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiColorChooserUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h b/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h
deleted file mode 100644
index 9e92a3237d6..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiComboBoxUI.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiComboBoxUI__
-#define __javax_swing_plaf_multi_MultiComboBoxUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ComboBoxUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComboBox;
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiComboBoxUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiComboBoxUI : public ::javax::swing::plaf::ComboBoxUI
-{
-
-public:
-  MultiComboBoxUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual void setPopupVisible(::javax::swing::JComboBox *, jboolean);
-  virtual jboolean isPopupVisible(::javax::swing::JComboBox *);
-  virtual jboolean isFocusTraversable(::javax::swing::JComboBox *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ComboBoxUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiComboBoxUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h b/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h
deleted file mode 100644
index d7a5f47fe08..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiDesktopIconUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiDesktopIconUI__
-#define __javax_swing_plaf_multi_MultiDesktopIconUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/DesktopIconUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiDesktopIconUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiDesktopIconUI : public ::javax::swing::plaf::DesktopIconUI
-{
-
-public:
-  MultiDesktopIconUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopIconUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiDesktopIconUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h b/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h
deleted file mode 100644
index d6dcff2c2b8..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiDesktopPaneUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiDesktopPaneUI__
-#define __javax_swing_plaf_multi_MultiDesktopPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/DesktopPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiDesktopPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiDesktopPaneUI : public ::javax::swing::plaf::DesktopPaneUI
-{
-
-public:
-  MultiDesktopPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::DesktopPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiDesktopPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h b/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h
deleted file mode 100644
index e459d3280a7..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiFileChooserUI.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiFileChooserUI__
-#define __javax_swing_plaf_multi_MultiFileChooserUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/FileChooserUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JFileChooser;
-      namespace filechooser
-      {
-          class FileFilter;
-          class FileView;
-      }
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiFileChooserUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiFileChooserUI : public ::javax::swing::plaf::FileChooserUI
-{
-
-public:
-  MultiFileChooserUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual ::javax::swing::filechooser::FileFilter * getAcceptAllFileFilter(::javax::swing::JFileChooser *);
-  virtual ::javax::swing::filechooser::FileView * getFileView(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getApproveButtonText(::javax::swing::JFileChooser *);
-  virtual ::java::lang::String * getDialogTitle(::javax::swing::JFileChooser *);
-  virtual void rescanCurrentDirectory(::javax::swing::JFileChooser *);
-  virtual void ensureFileIsVisible(::javax::swing::JFileChooser *, ::java::io::File *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::FileChooserUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiFileChooserUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h b/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h
deleted file mode 100644
index ab260b70989..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiInternalFrameUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiInternalFrameUI__
-#define __javax_swing_plaf_multi_MultiInternalFrameUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/InternalFrameUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiInternalFrameUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiInternalFrameUI : public ::javax::swing::plaf::InternalFrameUI
-{
-
-public:
-  MultiInternalFrameUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::InternalFrameUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiInternalFrameUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiLabelUI.h b/libjava/javax/swing/plaf/multi/MultiLabelUI.h
deleted file mode 100644
index 7f5049cecb1..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiLabelUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiLabelUI__
-#define __javax_swing_plaf_multi_MultiLabelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/LabelUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiLabelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiLabelUI : public ::javax::swing::plaf::LabelUI
-{
-
-public:
-  MultiLabelUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::LabelUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiLabelUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiListUI.h b/libjava/javax/swing/plaf/multi/MultiListUI.h
deleted file mode 100644
index 3147894c629..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiListUI.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiListUI__
-#define __javax_swing_plaf_multi_MultiListUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ListUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JList;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiListUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiListUI : public ::javax::swing::plaf::ListUI
-{
-
-public:
-  MultiListUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual jint locationToIndex(::javax::swing::JList *, ::java::awt::Point *);
-  virtual ::java::awt::Point * indexToLocation(::javax::swing::JList *, jint);
-  virtual ::java::awt::Rectangle * getCellBounds(::javax::swing::JList *, jint, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ListUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiListUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h b/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h
deleted file mode 100644
index 83925d036ed..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiLookAndFeel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiLookAndFeel__
-#define __javax_swing_plaf_multi_MultiLookAndFeel__
-
-#pragma interface
-
-#include <javax/swing/LookAndFeel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class UIDefaults;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiLookAndFeel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiLookAndFeel : public ::javax::swing::LookAndFeel
-{
-
-public:
-  MultiLookAndFeel();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * getID();
-  virtual ::java::lang::String * getDescription();
-  virtual jboolean isNativeLookAndFeel();
-  virtual jboolean isSupportedLookAndFeel();
-  virtual ::javax::swing::UIDefaults * getDefaults();
-  static ::javax::swing::plaf::ComponentUI * createUIs(::javax::swing::plaf::ComponentUI *, ::java::util::Vector *, ::javax::swing::JComponent *);
-public: // actually protected
-  static JArray< ::javax::swing::plaf::ComponentUI * > * uisToArray(::java::util::Vector *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiLookAndFeel__
diff --git a/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h b/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h
deleted file mode 100644
index 9056557b4c7..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiMenuBarUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiMenuBarUI__
-#define __javax_swing_plaf_multi_MultiMenuBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/MenuBarUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiMenuBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiMenuBarUI : public ::javax::swing::plaf::MenuBarUI
-{
-
-public:
-  MultiMenuBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuBarUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiMenuBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h b/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h
deleted file mode 100644
index 7bbe2f23173..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiMenuItemUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiMenuItemUI__
-#define __javax_swing_plaf_multi_MultiMenuItemUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/MenuItemUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiMenuItemUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiMenuItemUI : public ::javax::swing::plaf::MenuItemUI
-{
-
-public:
-  MultiMenuItemUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::MenuItemUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiMenuItemUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h b/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h
deleted file mode 100644
index ce895299c71..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiOptionPaneUI.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiOptionPaneUI__
-#define __javax_swing_plaf_multi_MultiOptionPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/OptionPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JOptionPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiOptionPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiOptionPaneUI : public ::javax::swing::plaf::OptionPaneUI
-{
-
-public:
-  MultiOptionPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual void selectInitialValue(::javax::swing::JOptionPane *);
-  virtual jboolean containsCustomComponents(::javax::swing::JOptionPane *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::OptionPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiOptionPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiPanelUI.h b/libjava/javax/swing/plaf/multi/MultiPanelUI.h
deleted file mode 100644
index 83ac57c09d0..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiPanelUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiPanelUI__
-#define __javax_swing_plaf_multi_MultiPanelUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/PanelUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiPanelUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiPanelUI : public ::javax::swing::plaf::PanelUI
-{
-
-public:
-  MultiPanelUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PanelUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiPanelUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h b/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h
deleted file mode 100644
index 717775652cd..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiPopupMenuUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiPopupMenuUI__
-#define __javax_swing_plaf_multi_MultiPopupMenuUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/PopupMenuUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiPopupMenuUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiPopupMenuUI : public ::javax::swing::plaf::PopupMenuUI
-{
-
-public:
-  MultiPopupMenuUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::PopupMenuUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiPopupMenuUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h b/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h
deleted file mode 100644
index 797f3cab584..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiProgressBarUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiProgressBarUI__
-#define __javax_swing_plaf_multi_MultiProgressBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ProgressBarUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiProgressBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiProgressBarUI : public ::javax::swing::plaf::ProgressBarUI
-{
-
-public:
-  MultiProgressBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ProgressBarUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiProgressBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h b/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h
deleted file mode 100644
index b45c22996f9..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiRootPaneUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiRootPaneUI__
-#define __javax_swing_plaf_multi_MultiRootPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/RootPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiRootPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiRootPaneUI : public ::javax::swing::plaf::RootPaneUI
-{
-
-public:
-  MultiRootPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::RootPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiRootPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h b/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h
deleted file mode 100644
index 0fd88116ad8..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiScrollBarUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiScrollBarUI__
-#define __javax_swing_plaf_multi_MultiScrollBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ScrollBarUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiScrollBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiScrollBarUI : public ::javax::swing::plaf::ScrollBarUI
-{
-
-public:
-  MultiScrollBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollBarUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiScrollBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h b/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h
deleted file mode 100644
index a05716a60a0..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiScrollPaneUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiScrollPaneUI__
-#define __javax_swing_plaf_multi_MultiScrollPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ScrollPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiScrollPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiScrollPaneUI : public ::javax::swing::plaf::ScrollPaneUI
-{
-
-public:
-  MultiScrollPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ScrollPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiScrollPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h b/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h
deleted file mode 100644
index b62235a18cd..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiSeparatorUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiSeparatorUI__
-#define __javax_swing_plaf_multi_MultiSeparatorUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SeparatorUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiSeparatorUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiSeparatorUI : public ::javax::swing::plaf::SeparatorUI
-{
-
-public:
-  MultiSeparatorUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SeparatorUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiSeparatorUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSliderUI.h b/libjava/javax/swing/plaf/multi/MultiSliderUI.h
deleted file mode 100644
index b66d32ab54e..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiSliderUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiSliderUI__
-#define __javax_swing_plaf_multi_MultiSliderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SliderUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiSliderUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiSliderUI : public ::javax::swing::plaf::SliderUI
-{
-
-public:
-  MultiSliderUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SliderUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiSliderUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h b/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h
deleted file mode 100644
index 32a9d868252..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiSpinnerUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiSpinnerUI__
-#define __javax_swing_plaf_multi_MultiSpinnerUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SpinnerUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiSpinnerUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiSpinnerUI : public ::javax::swing::plaf::SpinnerUI
-{
-
-public:
-  MultiSpinnerUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SpinnerUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiSpinnerUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h b/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h
deleted file mode 100644
index 5ed5638fe88..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiSplitPaneUI.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiSplitPaneUI__
-#define __javax_swing_plaf_multi_MultiSplitPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/SplitPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JSplitPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiSplitPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiSplitPaneUI : public ::javax::swing::plaf::SplitPaneUI
-{
-
-public:
-  MultiSplitPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual void resetToPreferredSizes(::javax::swing::JSplitPane *);
-  virtual void setDividerLocation(::javax::swing::JSplitPane *, jint);
-  virtual jint getDividerLocation(::javax::swing::JSplitPane *);
-  virtual jint getMinimumDividerLocation(::javax::swing::JSplitPane *);
-  virtual jint getMaximumDividerLocation(::javax::swing::JSplitPane *);
-  virtual void finishedPaintingChildren(::javax::swing::JSplitPane *, ::java::awt::Graphics *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::SplitPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiSplitPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h b/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h
deleted file mode 100644
index 7740c3fd183..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiTabbedPaneUI.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiTabbedPaneUI__
-#define __javax_swing_plaf_multi_MultiTabbedPaneUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TabbedPaneUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JTabbedPane;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiTabbedPaneUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiTabbedPaneUI : public ::javax::swing::plaf::TabbedPaneUI
-{
-
-public:
-  MultiTabbedPaneUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual jint tabForCoordinate(::javax::swing::JTabbedPane *, jint, jint);
-  virtual ::java::awt::Rectangle * getTabBounds(::javax::swing::JTabbedPane *, jint);
-  virtual jint getTabRunCount(::javax::swing::JTabbedPane *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TabbedPaneUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiTabbedPaneUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h b/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h
deleted file mode 100644
index 87cf03ef5a5..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiTableHeaderUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiTableHeaderUI__
-#define __javax_swing_plaf_multi_MultiTableHeaderUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TableHeaderUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiTableHeaderUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiTableHeaderUI : public ::javax::swing::plaf::TableHeaderUI
-{
-
-public:
-  MultiTableHeaderUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableHeaderUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiTableHeaderUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTableUI.h b/libjava/javax/swing/plaf/multi/MultiTableUI.h
deleted file mode 100644
index cb84f0f2c53..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiTableUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiTableUI__
-#define __javax_swing_plaf_multi_MultiTableUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TableUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiTableUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiTableUI : public ::javax::swing::plaf::TableUI
-{
-
-public:
-  MultiTableUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TableUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiTableUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTextUI.h b/libjava/javax/swing/plaf/multi/MultiTextUI.h
deleted file mode 100644
index 6d0440e7a88..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiTextUI.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiTextUI__
-#define __javax_swing_plaf_multi_MultiTextUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TextUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiTextUI;
-        }
-      }
-      namespace text
-      {
-          class EditorKit;
-          class JTextComponent;
-          class Position$Bias;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiTextUI : public ::javax::swing::plaf::TextUI
-{
-
-public:
-  MultiTextUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint);
-  virtual ::java::awt::Rectangle * modelToView(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *);
-  virtual jint viewToModel(::javax::swing::text::JTextComponent *, ::java::awt::Point *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint);
-  virtual void damageRange(::javax::swing::text::JTextComponent *, jint, jint, ::javax::swing::text::Position$Bias *, ::javax::swing::text::Position$Bias *);
-  virtual ::javax::swing::text::EditorKit * getEditorKit(::javax::swing::text::JTextComponent *);
-  virtual ::javax::swing::text::View * getRootView(::javax::swing::text::JTextComponent *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TextUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiTextUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiToolBarUI.h b/libjava/javax/swing/plaf/multi/MultiToolBarUI.h
deleted file mode 100644
index 91c89162895..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiToolBarUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiToolBarUI__
-#define __javax_swing_plaf_multi_MultiToolBarUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ToolBarUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiToolBarUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiToolBarUI : public ::javax::swing::plaf::ToolBarUI
-{
-
-public:
-  MultiToolBarUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolBarUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiToolBarUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiToolTipUI.h b/libjava/javax/swing/plaf/multi/MultiToolTipUI.h
deleted file mode 100644
index 07ed28e7372..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiToolTipUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiToolTipUI__
-#define __javax_swing_plaf_multi_MultiToolTipUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ToolTipUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiToolTipUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiToolTipUI : public ::javax::swing::plaf::ToolTipUI
-{
-
-public:
-  MultiToolTipUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ToolTipUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiToolTipUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiTreeUI.h b/libjava/javax/swing/plaf/multi/MultiTreeUI.h
deleted file mode 100644
index 0477cc6267e..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiTreeUI.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiTreeUI__
-#define __javax_swing_plaf_multi_MultiTreeUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/TreeUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-        class JTree;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiTreeUI;
-        }
-      }
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiTreeUI : public ::javax::swing::plaf::TreeUI
-{
-
-public:
-  MultiTreeUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-  virtual ::java::awt::Rectangle * getPathBounds(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPathForRow(::javax::swing::JTree *, jint);
-  virtual jint getRowForPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual jint getRowCount(::javax::swing::JTree *);
-  virtual ::javax::swing::tree::TreePath * getClosestPathForLocation(::javax::swing::JTree *, jint, jint);
-  virtual jboolean isEditing(::javax::swing::JTree *);
-  virtual jboolean stopEditing(::javax::swing::JTree *);
-  virtual void cancelEditing(::javax::swing::JTree *);
-  virtual void startEditingAtPath(::javax::swing::JTree *, ::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getEditingPath(::javax::swing::JTree *);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::TreeUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiTreeUI__
diff --git a/libjava/javax/swing/plaf/multi/MultiViewportUI.h b/libjava/javax/swing/plaf/multi/MultiViewportUI.h
deleted file mode 100644
index 6ddbb0b9bd1..00000000000
--- a/libjava/javax/swing/plaf/multi/MultiViewportUI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_multi_MultiViewportUI__
-#define __javax_swing_plaf_multi_MultiViewportUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/ViewportUI.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-    }
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace multi
-        {
-            class MultiViewportUI;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::multi::MultiViewportUI : public ::javax::swing::plaf::ViewportUI
-{
-
-public:
-  MultiViewportUI();
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void installUI(::javax::swing::JComponent *);
-  virtual void uninstallUI(::javax::swing::JComponent *);
-  virtual JArray< ::javax::swing::plaf::ComponentUI * > * getUIs();
-  virtual jboolean contains(::javax::swing::JComponent *, jint, jint);
-  virtual void update(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::JComponent *);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::JComponent *);
-  virtual jint getAccessibleChildrenCount(::javax::swing::JComponent *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(::javax::swing::JComponent *, jint);
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::plaf::ViewportUI)))) uis;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_multi_MultiViewportUI__
diff --git a/libjava/javax/swing/plaf/synth/ColorType.h b/libjava/javax/swing/plaf/synth/ColorType.h
deleted file mode 100644
index 99a238cf302..00000000000
--- a/libjava/javax/swing/plaf/synth/ColorType.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_ColorType__
-#define __javax_swing_plaf_synth_ColorType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace synth
-        {
-            class ColorType;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::ColorType : public ::java::lang::Object
-{
-
-public: // actually protected
-  ColorType(::java::lang::String *);
-public:
-  virtual jint getID();
-  virtual ::java::lang::String * toString();
-  static ::javax::swing::plaf::synth::ColorType * FOREGROUND;
-  static ::javax::swing::plaf::synth::ColorType * BACKGROUND;
-  static ::javax::swing::plaf::synth::ColorType * TEXT_FOREGROUND;
-  static ::javax::swing::plaf::synth::ColorType * TEXT_BACKGROUND;
-  static ::javax::swing::plaf::synth::ColorType * FOCUS;
-  static jint MAX_COUNT;
-private:
-  static jint count;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::lang::String * description;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_ColorType__
diff --git a/libjava/javax/swing/plaf/synth/Region.h b/libjava/javax/swing/plaf/synth/Region.h
deleted file mode 100644
index 1df2b4f9fc6..00000000000
--- a/libjava/javax/swing/plaf/synth/Region.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_Region__
-#define __javax_swing_plaf_synth_Region__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace synth
-        {
-            class Region;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::Region : public ::java::lang::Object
-{
-
-public: // actually protected
-  Region(::java::lang::String *, ::java::lang::String *, jboolean);
-public:
-  virtual jboolean isSubregion();
-  virtual ::java::lang::String * getName();
-  virtual ::java::lang::String * toString();
-  static ::javax::swing::plaf::synth::Region * ARROW_BUTTON;
-  static ::javax::swing::plaf::synth::Region * BUTTON;
-  static ::javax::swing::plaf::synth::Region * CHECK_BOX;
-  static ::javax::swing::plaf::synth::Region * CHECK_BOX_MENU_ITEM;
-  static ::javax::swing::plaf::synth::Region * COLOR_CHOOSER;
-  static ::javax::swing::plaf::synth::Region * COMBO_BOX;
-  static ::javax::swing::plaf::synth::Region * DESKTOP_PANE;
-  static ::javax::swing::plaf::synth::Region * DESKTOP_ICON;
-  static ::javax::swing::plaf::synth::Region * EDITOR_PANE;
-  static ::javax::swing::plaf::synth::Region * FILE_CHOOSER;
-  static ::javax::swing::plaf::synth::Region * FORMATTED_TEXT_FIELD;
-  static ::javax::swing::plaf::synth::Region * INTERNAL_FRAME;
-  static ::javax::swing::plaf::synth::Region * INTERNAL_FRAME_TITLE_PANE;
-  static ::javax::swing::plaf::synth::Region * LABEL;
-  static ::javax::swing::plaf::synth::Region * LIST;
-  static ::javax::swing::plaf::synth::Region * MENU;
-  static ::javax::swing::plaf::synth::Region * MENU_BAR;
-  static ::javax::swing::plaf::synth::Region * MENU_ITEM;
-  static ::javax::swing::plaf::synth::Region * MENU_ITEM_ACCELERATOR;
-  static ::javax::swing::plaf::synth::Region * OPTION_PANE;
-  static ::javax::swing::plaf::synth::Region * PANEL;
-  static ::javax::swing::plaf::synth::Region * PASSWORD_FIELD;
-  static ::javax::swing::plaf::synth::Region * POPUP_MENU;
-  static ::javax::swing::plaf::synth::Region * POPUP_MENU_SEPARATOR;
-  static ::javax::swing::plaf::synth::Region * PROGRESS_BAR;
-  static ::javax::swing::plaf::synth::Region * RADIO_BUTTON;
-  static ::javax::swing::plaf::synth::Region * RADIO_BUTTON_MENU_ITEM;
-  static ::javax::swing::plaf::synth::Region * ROOT_PANE;
-  static ::javax::swing::plaf::synth::Region * SCROLL_BAR;
-  static ::javax::swing::plaf::synth::Region * SCROLL_BAR_TRACK;
-  static ::javax::swing::plaf::synth::Region * SCROLL_BAR_THUMB;
-  static ::javax::swing::plaf::synth::Region * SCROLL_PANE;
-  static ::javax::swing::plaf::synth::Region * SEPARATOR;
-  static ::javax::swing::plaf::synth::Region * SLIDER;
-  static ::javax::swing::plaf::synth::Region * SLIDER_TRACK;
-  static ::javax::swing::plaf::synth::Region * SLIDER_THUMB;
-  static ::javax::swing::plaf::synth::Region * SPINNER;
-  static ::javax::swing::plaf::synth::Region * SPLIT_PANE;
-  static ::javax::swing::plaf::synth::Region * SPLIT_PANE_DIVIDER;
-  static ::javax::swing::plaf::synth::Region * TABBED_PANE;
-  static ::javax::swing::plaf::synth::Region * TABBED_PANE_TAB;
-  static ::javax::swing::plaf::synth::Region * TABBED_PANE_TAB_AREA;
-  static ::javax::swing::plaf::synth::Region * TABBED_PANE_CONTENT;
-  static ::javax::swing::plaf::synth::Region * TABLE;
-  static ::javax::swing::plaf::synth::Region * TABLE_HEADER;
-  static ::javax::swing::plaf::synth::Region * TEXT_AREA;
-  static ::javax::swing::plaf::synth::Region * TEXT_FIELD;
-  static ::javax::swing::plaf::synth::Region * TEXT_PANE;
-  static ::javax::swing::plaf::synth::Region * TOGGLE_BUTTON;
-  static ::javax::swing::plaf::synth::Region * TOOL_BAR;
-  static ::javax::swing::plaf::synth::Region * TOOL_BAR_CONTENT;
-  static ::javax::swing::plaf::synth::Region * TOOL_BAR_DRAG_WINDOW;
-  static ::javax::swing::plaf::synth::Region * TOOL_TIP;
-  static ::javax::swing::plaf::synth::Region * TOOL_BAR_SEPARATOR;
-  static ::javax::swing::plaf::synth::Region * TREE;
-  static ::javax::swing::plaf::synth::Region * TREE_CELL;
-  static ::javax::swing::plaf::synth::Region * VIEWPORT;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ui;
-private:
-  ::java::lang::String * name;
-  jboolean subregion;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_Region__
diff --git a/libjava/javax/swing/plaf/synth/SynthConstants.h b/libjava/javax/swing/plaf/synth/SynthConstants.h
deleted file mode 100644
index a6ae6deb832..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthConstants.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthConstants__
-#define __javax_swing_plaf_synth_SynthConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace synth
-        {
-            class SynthConstants;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint ENABLED = 1;
-  static const jint DISABLED = 8;
-  static const jint MOUSE_OVER = 2;
-  static const jint PRESSED = 4;
-  static const jint FOCUSED = 256;
-  static const jint SELECTED = 512;
-  static const jint DEFAULT = 1024;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_plaf_synth_SynthConstants__
diff --git a/libjava/javax/swing/plaf/synth/SynthContext.h b/libjava/javax/swing/plaf/synth/SynthContext.h
deleted file mode 100644
index 7e2eadb6dc7..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthContext.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthContext__
-#define __javax_swing_plaf_synth_SynthContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-        namespace synth
-        {
-            class Region;
-            class SynthContext;
-            class SynthStyle;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthContext : public ::java::lang::Object
-{
-
-public:
-  SynthContext(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *, ::javax::swing::plaf::synth::SynthStyle *, jint);
-  virtual ::javax::swing::JComponent * getComponent();
-  virtual ::javax::swing::plaf::synth::Region * getRegion();
-  virtual ::javax::swing::plaf::synth::SynthStyle * getStyle();
-  virtual jint getComponentState();
-private:
-  ::javax::swing::JComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) component;
-  ::javax::swing::plaf::synth::Region * region;
-  ::javax::swing::plaf::synth::SynthStyle * style;
-  jint state;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthContext__
diff --git a/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h b/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h
deleted file mode 100644
index 36c09c1a0d5..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthGraphicsUtils.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthGraphicsUtils__
-#define __javax_swing_plaf_synth_SynthGraphicsUtils__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace synth
-        {
-            class SynthContext;
-            class SynthGraphicsUtils;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthGraphicsUtils : public ::java::lang::Object
-{
-
-public:
-  SynthGraphicsUtils();
-  virtual void drawLine(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual ::java::lang::String * layoutText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::FontMetrics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, ::java::awt::Rectangle *, ::java::awt::Rectangle *, ::java::awt::Rectangle *, jint);
-  virtual jint computeStringWidth(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::awt::FontMetrics *, ::java::lang::String *);
-  virtual ::java::awt::Dimension * getMinimumSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
-  virtual ::java::awt::Dimension * getMaximumSize(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Font *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint);
-  virtual jint getMaximumCharHeight(::javax::swing::plaf::synth::SynthContext *);
-  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, ::java::awt::Rectangle *, jint);
-  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, jint, jint, jint);
-  virtual void paintText(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, ::java::lang::String *, ::javax::swing::Icon *, jint, jint, jint, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthGraphicsUtils__
diff --git a/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h b/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h
deleted file mode 100644
index d0b40a878b7..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthLookAndFeel.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthLookAndFeel__
-#define __javax_swing_plaf_synth_SynthLookAndFeel__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicLookAndFeel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-        class UIDefaults;
-      namespace plaf
-      {
-          class ComponentUI;
-        namespace synth
-        {
-            class Region;
-            class SynthLookAndFeel;
-            class SynthStyle;
-            class SynthStyleFactory;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthLookAndFeel : public ::javax::swing::plaf::basic::BasicLookAndFeel
-{
-
-public:
-  SynthLookAndFeel();
-  static void setStyleFactory(::javax::swing::plaf::synth::SynthStyleFactory *);
-  static ::javax::swing::plaf::synth::SynthStyleFactory * getStyleFactory();
-  static ::javax::swing::plaf::synth::SynthStyle * getStyle(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *);
-  static void updateStyles(::java::awt::Component *);
-  static ::javax::swing::plaf::synth::Region * getRegion(::javax::swing::JComponent *);
-  static ::javax::swing::plaf::ComponentUI * createUI(::javax::swing::JComponent *);
-  virtual void initialize();
-  virtual void uninitialize();
-  virtual ::javax::swing::UIDefaults * getDefaults();
-  virtual jboolean shouldUpdateStyleOnAncestorChanged();
-  virtual void load(::java::io::InputStream *, ::java::lang::Class *);
-  virtual ::java::lang::String * getDescription();
-  virtual ::java::lang::String * getID();
-  virtual ::java::lang::String * getName();
-  virtual jboolean isNativeLookAndFeel();
-  virtual jboolean isSupportedLookAndFeel();
-private:
-  static ::javax::swing::plaf::synth::SynthStyleFactory * styleFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthLookAndFeel__
diff --git a/libjava/javax/swing/plaf/synth/SynthPainter.h b/libjava/javax/swing/plaf/synth/SynthPainter.h
deleted file mode 100644
index 23172a0ad59..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthPainter.h
+++ /dev/null
@@ -1,156 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthPainter__
-#define __javax_swing_plaf_synth_SynthPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace synth
-        {
-            class SynthContext;
-            class SynthPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthPainter : public ::java::lang::Object
-{
-
-public:
-  SynthPainter();
-  virtual void paintArrowButtonForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintProgressBarForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintSeparatorForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintSplitPaneDividerForeground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintSplitPaneDragDivider(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintTreeCellFocus(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintArrowButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintArrowButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintCheckBoxBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintCheckBoxBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintCheckBoxMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintCheckBoxMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintColorChooserBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintColorChooserBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintComboBoxBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintComboBoxBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintDesktopIconBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintDesktopIconBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintDesktopPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintDesktopPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintEditorPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintEditorPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintFileChooserBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintFileChooserBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintFormattedTextFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintFormattedTextFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintInternalFrameBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintInternalFrameBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintInternalFrameTitlePaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintInternalFrameTitlePaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintLabelBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintLabelBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintListBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintListBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintOptionPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintOptionPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPanelBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPanelBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPasswordFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPasswordFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPopupMenuBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintPopupMenuBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintProgressBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintProgressBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRadioButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRadioButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRadioButtonMenuItemBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRadioButtonMenuItemBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRootPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintRootPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollBarThumbBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintScrollBarThumbBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintScrollBarTrackBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollBarTrackBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintScrollPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSeparatorBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSeparatorBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSliderBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSliderBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSliderThumbBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintSliderThumbBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintSliderTrackBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSliderTrackBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSpinnerBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSpinnerBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSplitPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSplitPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintSplitPaneDividerBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneContentBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneContentBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneTabAreaBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneTabAreaBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTabbedPaneTabBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintTabbedPaneTabBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint, jint);
-  virtual void paintTableBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTableBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTableHeaderBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTableHeaderBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextAreaBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextAreaBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextFieldBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextFieldBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextPaneBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTextPaneBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToggleButtonBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToggleButtonBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarContentBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarContentBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarDragWindowBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolBarDragWindowBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolTipBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintToolTipBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTreeBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTreeBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTreeCellBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintTreeCellBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintViewportBackground(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void paintViewportBorder(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Graphics *, jint, jint, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthPainter__
diff --git a/libjava/javax/swing/plaf/synth/SynthStyle.h b/libjava/javax/swing/plaf/synth/SynthStyle.h
deleted file mode 100644
index b8779f2b394..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthStyle.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthStyle__
-#define __javax_swing_plaf_synth_SynthStyle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace plaf
-      {
-        namespace synth
-        {
-            class ColorType;
-            class SynthContext;
-            class SynthGraphicsUtils;
-            class SynthPainter;
-            class SynthStyle;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthStyle : public ::java::lang::Object
-{
-
-public:
-  SynthStyle();
-  virtual ::javax::swing::plaf::synth::SynthGraphicsUtils * getGraphicsUtils(::javax::swing::plaf::synth::SynthContext *);
-  virtual ::java::awt::Color * getColor(::javax::swing::plaf::synth::SynthContext *, ::javax::swing::plaf::synth::ColorType *);
-public: // actually protected
-  virtual ::java::awt::Color * getColorForState(::javax::swing::plaf::synth::SynthContext *, ::javax::swing::plaf::synth::ColorType *) = 0;
-public:
-  virtual ::java::awt::Font * getFont(::javax::swing::plaf::synth::SynthContext *);
-public: // actually protected
-  virtual ::java::awt::Font * getFontForState(::javax::swing::plaf::synth::SynthContext *) = 0;
-public:
-  virtual ::java::awt::Insets * getInsets(::javax::swing::plaf::synth::SynthContext *, ::java::awt::Insets *);
-  virtual ::javax::swing::plaf::synth::SynthPainter * getPainter(::javax::swing::plaf::synth::SynthContext *);
-  virtual jboolean isOpaque(::javax::swing::plaf::synth::SynthContext *);
-  virtual ::java::lang::Object * get(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *);
-  virtual void installDefaults(::javax::swing::plaf::synth::SynthContext *);
-  virtual void uninstallDefaults(::javax::swing::plaf::synth::SynthContext *);
-  virtual jint getInt(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, jint);
-  virtual jboolean getBoolean(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, jboolean);
-  virtual ::javax::swing::Icon * getIcon(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *);
-  virtual ::java::lang::String * getString(::javax::swing::plaf::synth::SynthContext *, ::java::lang::Object *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthStyle__
diff --git a/libjava/javax/swing/plaf/synth/SynthStyleFactory.h b/libjava/javax/swing/plaf/synth/SynthStyleFactory.h
deleted file mode 100644
index 2f6905676a7..00000000000
--- a/libjava/javax/swing/plaf/synth/SynthStyleFactory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_synth_SynthStyleFactory__
-#define __javax_swing_plaf_synth_SynthStyleFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace plaf
-      {
-        namespace synth
-        {
-            class Region;
-            class SynthStyle;
-            class SynthStyleFactory;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::synth::SynthStyleFactory : public ::java::lang::Object
-{
-
-public:
-  SynthStyleFactory();
-  virtual ::javax::swing::plaf::synth::SynthStyle * getStyle(::javax::swing::JComponent *, ::javax::swing::plaf::synth::Region *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_synth_SynthStyleFactory__
diff --git a/libjava/javax/swing/table/AbstractTableModel.h b/libjava/javax/swing/table/AbstractTableModel.h
deleted file mode 100644
index 307aa95f9d6..00000000000
--- a/libjava/javax/swing/table/AbstractTableModel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_AbstractTableModel__
-#define __javax_swing_table_AbstractTableModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class EventListenerList;
-          class TableModelEvent;
-          class TableModelListener;
-      }
-      namespace table
-      {
-          class AbstractTableModel;
-      }
-    }
-  }
-}
-
-class javax::swing::table::AbstractTableModel : public ::java::lang::Object
-{
-
-public:
-  AbstractTableModel();
-  virtual ::java::lang::String * getColumnName(jint);
-  virtual jint findColumn(::java::lang::String *);
-  virtual ::java::lang::Class * getColumnClass(jint);
-  virtual jboolean isCellEditable(jint, jint);
-  virtual void setValueAt(::java::lang::Object *, jint, jint);
-  virtual void addTableModelListener(::javax::swing::event::TableModelListener *);
-  virtual void removeTableModelListener(::javax::swing::event::TableModelListener *);
-  virtual JArray< ::javax::swing::event::TableModelListener * > * getTableModelListeners();
-  virtual void fireTableDataChanged();
-  virtual void fireTableStructureChanged();
-  virtual void fireTableRowsInserted(jint, jint);
-  virtual void fireTableRowsUpdated(jint, jint);
-  virtual void fireTableRowsDeleted(jint, jint);
-  virtual void fireTableCellUpdated(jint, jint);
-  virtual void fireTableChanged(::javax::swing::event::TableModelEvent *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual jint getRowCount() = 0;
-  virtual jint getColumnCount() = 0;
-  virtual ::java::lang::Object * getValueAt(jint, jint) = 0;
-public: // actually package-private
-  static const jlong serialVersionUID = -5798593159423650347LL;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_AbstractTableModel__
diff --git a/libjava/javax/swing/table/DefaultTableCellRenderer$UIResource.h b/libjava/javax/swing/table/DefaultTableCellRenderer$UIResource.h
deleted file mode 100644
index ba101048b2a..00000000000
--- a/libjava/javax/swing/table/DefaultTableCellRenderer$UIResource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_DefaultTableCellRenderer$UIResource__
-#define __javax_swing_table_DefaultTableCellRenderer$UIResource__
-
-#pragma interface
-
-#include <javax/swing/table/DefaultTableCellRenderer.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace table
-      {
-          class DefaultTableCellRenderer$UIResource;
-      }
-    }
-  }
-}
-
-class javax::swing::table::DefaultTableCellRenderer$UIResource : public ::javax::swing::table::DefaultTableCellRenderer
-{
-
-public:
-  DefaultTableCellRenderer$UIResource();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_DefaultTableCellRenderer$UIResource__
diff --git a/libjava/javax/swing/table/DefaultTableCellRenderer.h b/libjava/javax/swing/table/DefaultTableCellRenderer.h
deleted file mode 100644
index 7865b5a4a99..00000000000
--- a/libjava/javax/swing/table/DefaultTableCellRenderer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_DefaultTableCellRenderer__
-#define __javax_swing_table_DefaultTableCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-      namespace border
-      {
-          class Border;
-      }
-      namespace table
-      {
-          class DefaultTableCellRenderer;
-      }
-    }
-  }
-}
-
-class javax::swing::table::DefaultTableCellRenderer : public ::javax::swing::JLabel
-{
-
-public:
-  DefaultTableCellRenderer();
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void updateUI();
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint);
-  virtual jboolean isOpaque();
-  virtual void validate();
-  virtual void revalidate();
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void repaint(::java::awt::Rectangle *);
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-public: // actually protected
-  virtual void setValue(::java::lang::Object *);
-public: // actually package-private
-  static const jlong serialVersionUID = 7878911414715528324LL;
-public: // actually protected
-  static ::javax::swing::border::Border * noFocusBorder;
-public: // actually package-private
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) foreground;
-  ::java::awt::Color * background;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_DefaultTableCellRenderer__
diff --git a/libjava/javax/swing/table/DefaultTableColumnModel.h b/libjava/javax/swing/table/DefaultTableColumnModel.h
deleted file mode 100644
index bdbb4e7758c..00000000000
--- a/libjava/javax/swing/table/DefaultTableColumnModel.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_DefaultTableColumnModel__
-#define __javax_swing_table_DefaultTableColumnModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class ListSelectionModel;
-      namespace event
-      {
-          class ChangeEvent;
-          class EventListenerList;
-          class ListSelectionEvent;
-          class TableColumnModelEvent;
-          class TableColumnModelListener;
-      }
-      namespace table
-      {
-          class DefaultTableColumnModel;
-          class TableColumn;
-      }
-    }
-  }
-}
-
-class javax::swing::table::DefaultTableColumnModel : public ::java::lang::Object
-{
-
-public:
-  DefaultTableColumnModel();
-  virtual void addColumn(::javax::swing::table::TableColumn *);
-  virtual void removeColumn(::javax::swing::table::TableColumn *);
-  virtual void moveColumn(jint, jint);
-  virtual void setColumnMargin(jint);
-  virtual jint getColumnCount();
-  virtual ::java::util::Enumeration * getColumns();
-  virtual jint getColumnIndex(::java::lang::Object *);
-  virtual ::javax::swing::table::TableColumn * getColumn(jint);
-  virtual jint getColumnMargin();
-  virtual jint getColumnIndexAtX(jint);
-  virtual jint getTotalColumnWidth();
-  virtual void setSelectionModel(::javax::swing::ListSelectionModel *);
-  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
-  virtual void setColumnSelectionAllowed(jboolean);
-  virtual jboolean getColumnSelectionAllowed();
-  virtual JArray< jint > * getSelectedColumns();
-  virtual jint getSelectedColumnCount();
-  virtual void addColumnModelListener(::javax::swing::event::TableColumnModelListener *);
-  virtual void removeColumnModelListener(::javax::swing::event::TableColumnModelListener *);
-  virtual JArray< ::javax::swing::event::TableColumnModelListener * > * getColumnModelListeners();
-public: // actually protected
-  virtual void fireColumnAdded(::javax::swing::event::TableColumnModelEvent *);
-  virtual void fireColumnRemoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void fireColumnMoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void fireColumnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void fireColumnMarginChanged();
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-  virtual void valueChanged(::javax::swing::event::ListSelectionEvent *);
-public: // actually protected
-  virtual ::javax::swing::ListSelectionModel * createSelectionModel();
-  virtual void recalcWidthCache();
-private:
-  void invalidateWidthCache();
-  static const jlong serialVersionUID = 6580012493508960512LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tableColumns;
-  ::javax::swing::ListSelectionModel * selectionModel;
-  jint columnMargin;
-  ::javax::swing::event::EventListenerList * listenerList;
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  jboolean columnSelectionAllowed;
-  jint totalColumnWidth;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_DefaultTableColumnModel__
diff --git a/libjava/javax/swing/table/DefaultTableModel.h b/libjava/javax/swing/table/DefaultTableModel.h
deleted file mode 100644
index a5f3bd4eca8..00000000000
--- a/libjava/javax/swing/table/DefaultTableModel.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_DefaultTableModel__
-#define __javax_swing_table_DefaultTableModel__
-
-#pragma interface
-
-#include <javax/swing/table/AbstractTableModel.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TableModelEvent;
-      }
-      namespace table
-      {
-          class DefaultTableModel;
-      }
-    }
-  }
-}
-
-class javax::swing::table::DefaultTableModel : public ::javax::swing::table::AbstractTableModel
-{
-
-public:
-  DefaultTableModel();
-  DefaultTableModel(jint, jint);
-  DefaultTableModel(::java::util::Vector *, jint);
-  DefaultTableModel(JArray< ::java::lang::Object * > *, jint);
-  DefaultTableModel(::java::util::Vector *, ::java::util::Vector *);
-  DefaultTableModel(JArray< JArray< ::java::lang::Object * > * > *, JArray< ::java::lang::Object * > *);
-  virtual ::java::util::Vector * getDataVector();
-  virtual void setDataVector(::java::util::Vector *, ::java::util::Vector *);
-  virtual void setDataVector(JArray< JArray< ::java::lang::Object * > * > *, JArray< ::java::lang::Object * > *);
-  virtual void newDataAvailable(::javax::swing::event::TableModelEvent *);
-  virtual void newRowsAdded(::javax::swing::event::TableModelEvent *);
-  virtual void rowsRemoved(::javax::swing::event::TableModelEvent *);
-  virtual void setColumnIdentifiers(::java::util::Vector *);
-  virtual void setColumnIdentifiers(JArray< ::java::lang::Object * > *);
-  virtual void setNumRows(jint);
-  virtual void setRowCount(jint);
-  virtual void setColumnCount(jint);
-  virtual void addColumn(::java::lang::Object *);
-  virtual void addColumn(::java::lang::Object *, ::java::util::Vector *);
-  virtual void addColumn(::java::lang::Object *, JArray< ::java::lang::Object * > *);
-  virtual void addRow(::java::util::Vector *);
-  virtual void addRow(JArray< ::java::lang::Object * > *);
-  virtual void insertRow(jint, ::java::util::Vector *);
-  virtual void insertRow(jint, JArray< ::java::lang::Object * > *);
-  virtual void moveRow(jint, jint, jint);
-  virtual void removeRow(jint);
-  virtual jint getRowCount();
-  virtual jint getColumnCount();
-  virtual ::java::lang::String * getColumnName(jint);
-  virtual jboolean isCellEditable(jint, jint);
-  virtual ::java::lang::Object * getValueAt(jint, jint);
-  virtual void setValueAt(::java::lang::Object *, jint, jint);
-public: // actually protected
-  static ::java::util::Vector * convertToVector(JArray< ::java::lang::Object * > *);
-  static ::java::util::Vector * convertToVector(JArray< JArray< ::java::lang::Object * > * > *);
-private:
-  void addExtraRows(jint, jint);
-  void checkSize();
-public: // actually package-private
-  static const jlong serialVersionUID = 6680042567037222321LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::table::AbstractTableModel)))) dataVector;
-  ::java::util::Vector * columnIdentifiers;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_DefaultTableModel__
diff --git a/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.h b/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.h
deleted file mode 100644
index c5febbb2c65..00000000000
--- a/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry__
-#define __javax_swing_table_JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry__
-
-#pragma interface
-
-#include <javax/accessibility/AccessibleContext.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Cursor;
-        class Dimension;
-        class Font;
-        class FontMetrics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusListener;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleAction;
-        class AccessibleComponent;
-        class AccessibleContext;
-        class AccessibleRole;
-        class AccessibleSelection;
-        class AccessibleStateSet;
-        class AccessibleText;
-        class AccessibleValue;
-    }
-    namespace swing
-    {
-        class JTable;
-      namespace table
-      {
-          class JTableHeader;
-          class JTableHeader$AccessibleJTableHeader;
-          class JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry;
-      }
-    }
-  }
-}
-
-class javax::swing::table::JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry : public ::javax::accessibility::AccessibleContext
-{
-
-public:
-  JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry(::javax::swing::table::JTableHeader$AccessibleJTableHeader *, jint, ::javax::swing::table::JTableHeader *, ::javax::swing::JTable *);
-public: // actually package-private
-  virtual ::java::awt::Component * getColumnHeaderRenderer();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleColumnHeaderRenderer();
-public:
-  virtual void addFocusListener(::java::awt::event::FocusListener *);
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual jboolean contains(::java::awt::Point *);
-  virtual ::javax::accessibility::AccessibleAction * getAccessibleAction();
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::AccessibleComponent * getAccessibleComponent();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::java::lang::String * getAccessibleDescription();
-  virtual jint getAccessibleIndexInParent();
-  virtual ::java::lang::String * getAccessibleName();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleSelection * getAccessibleSelection();
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual ::javax::accessibility::AccessibleValue * getAccessibleValue();
-  virtual ::java::awt::Color * getBackground();
-  virtual ::java::awt::Rectangle * getBounds();
-  virtual ::java::awt::Cursor * getCursor();
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::util::Locale * getLocale();
-  virtual ::java::awt::Point * getLocation();
-  virtual ::java::awt::Point * getLocationOnScreen();
-  virtual ::java::awt::Dimension * getSize();
-  virtual jboolean isEnabled();
-  virtual jboolean isFocusTraversable();
-  virtual jboolean isShowing();
-  virtual jboolean isVisible();
-  virtual void removeFocusListener(::java::awt::event::FocusListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void requestFocus();
-  virtual void setAccessibleDescription(::java::lang::String *);
-  virtual void setAccessibleName(::java::lang::String *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual void setBounds(::java::awt::Rectangle *);
-  virtual void setCursor(::java::awt::Cursor *);
-  virtual void setEnabled(jboolean);
-  virtual void setFont(::java::awt::Font *);
-  virtual void setForeground(::java::awt::Color *);
-  virtual void setLocation(::java::awt::Point *);
-  virtual void setSize(::java::awt::Dimension *);
-  virtual void setVisible(jboolean);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::accessibility::AccessibleContext)))) columnIndex;
-  ::javax::swing::table::JTableHeader * parent;
-  ::javax::swing::JTable * table;
-public: // actually package-private
-  ::javax::swing::table::JTableHeader$AccessibleJTableHeader * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_JTableHeader$AccessibleJTableHeader$AccessibleJTableHeaderEntry__
diff --git a/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader.h b/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader.h
deleted file mode 100644
index 64fd44e7156..00000000000
--- a/libjava/javax/swing/table/JTableHeader$AccessibleJTableHeader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_JTableHeader$AccessibleJTableHeader__
-#define __javax_swing_table_JTableHeader$AccessibleJTableHeader__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class Accessible;
-        class AccessibleRole;
-    }
-    namespace swing
-    {
-      namespace table
-      {
-          class JTableHeader;
-          class JTableHeader$AccessibleJTableHeader;
-      }
-    }
-  }
-}
-
-class javax::swing::table::JTableHeader$AccessibleJTableHeader : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public: // actually protected
-  JTableHeader$AccessibleJTableHeader(::javax::swing::table::JTableHeader *);
-public:
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual jint getAccessibleChildrenCount();
-  virtual ::javax::accessibility::Accessible * getAccessibleChild(jint);
-  virtual ::javax::accessibility::Accessible * getAccessibleAt(::java::awt::Point *);
-public: // actually package-private
-  ::javax::swing::table::JTableHeader * __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_JTableHeader$AccessibleJTableHeader__
diff --git a/libjava/javax/swing/table/JTableHeader.h b/libjava/javax/swing/table/JTableHeader.h
deleted file mode 100644
index 0c92ad30aa3..00000000000
--- a/libjava/javax/swing/table/JTableHeader.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_JTableHeader__
-#define __javax_swing_table_JTableHeader__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class JTable;
-      namespace event
-      {
-          class ChangeEvent;
-          class ListSelectionEvent;
-          class TableColumnModelEvent;
-      }
-      namespace plaf
-      {
-          class TableHeaderUI;
-      }
-      namespace table
-      {
-          class JTableHeader;
-          class TableCellRenderer;
-          class TableColumn;
-          class TableColumnModel;
-      }
-    }
-  }
-}
-
-class javax::swing::table::JTableHeader : public ::javax::swing::JComponent
-{
-
-public:
-  JTableHeader();
-  JTableHeader(::javax::swing::table::TableColumnModel *);
-public: // actually protected
-  virtual ::javax::swing::table::TableColumnModel * createDefaultColumnModel();
-public:
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual ::javax::swing::table::TableColumnModel * getColumnModel();
-  virtual ::javax::swing::table::TableColumn * getDraggedColumn();
-  virtual jint getDraggedDistance();
-  virtual jboolean getReorderingAllowed();
-  virtual jboolean getResizingAllowed();
-  virtual ::javax::swing::table::TableColumn * getResizingColumn();
-  virtual ::javax::swing::JTable * getTable();
-  virtual jboolean getUpdateTableInRealTime();
-  virtual jboolean isOpaque();
-  virtual void setColumnModel(::javax::swing::table::TableColumnModel *);
-  virtual void setDraggedColumn(::javax::swing::table::TableColumn *);
-  virtual void setDraggedDistance(jint);
-  virtual void setOpaque(jboolean);
-  virtual void setReorderingAllowed(jboolean);
-  virtual void setResizingAllowed(jboolean);
-  virtual void setResizingColumn(::javax::swing::table::TableColumn *);
-  virtual void setTable(::javax::swing::JTable *);
-  virtual void setUpdateTableInRealTime(jboolean);
-public: // actually protected
-  virtual ::javax::swing::table::TableCellRenderer * createDefaultRenderer();
-public:
-  virtual ::javax::swing::table::TableCellRenderer * getDefaultRenderer();
-  virtual void setDefaultRenderer(::javax::swing::table::TableCellRenderer *);
-  virtual ::java::awt::Rectangle * getHeaderRect(jint);
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::java::lang::String * getUIClassID();
-  virtual ::javax::swing::plaf::TableHeaderUI * getUI();
-  virtual void setUI(::javax::swing::plaf::TableHeaderUI *);
-  virtual void updateUI();
-  virtual jint columnAtPoint(::java::awt::Point *);
-  virtual void columnAdded(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnMarginChanged(::javax::swing::event::ChangeEvent *);
-  virtual void columnMoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnRemoved(::javax::swing::event::TableColumnModelEvent *);
-  virtual void columnSelectionChanged(::javax::swing::event::ListSelectionEvent *);
-  virtual void resizeAndRepaint();
-public: // actually protected
-  virtual void initializeLocalVars();
-private:
-  static const jlong serialVersionUID = 5144633983372967710LL;
-public: // actually protected
-  ::javax::swing::table::TableColumnModel * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) columnModel;
-  ::javax::swing::table::TableColumn * draggedColumn;
-  jint draggedDistance;
-public: // actually package-private
-  jboolean opaque;
-public: // actually protected
-  jboolean reorderingAllowed;
-  jboolean resizingAllowed;
-  ::javax::swing::table::TableColumn * resizingColumn;
-  ::javax::swing::JTable * table;
-  jboolean updateTableInRealTime;
-public: // actually package-private
-  ::javax::swing::table::TableCellRenderer * cellRenderer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_JTableHeader__
diff --git a/libjava/javax/swing/table/TableCellEditor.h b/libjava/javax/swing/table/TableCellEditor.h
deleted file mode 100644
index a84088452c5..00000000000
--- a/libjava/javax/swing/table/TableCellEditor.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_TableCellEditor__
-#define __javax_swing_table_TableCellEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-      namespace event
-      {
-          class CellEditorListener;
-      }
-      namespace table
-      {
-          class TableCellEditor;
-      }
-    }
-  }
-}
-
-class javax::swing::table::TableCellEditor : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getTableCellEditorComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jint, jint) = 0;
-  virtual ::java::lang::Object * getCellEditorValue() = 0;
-  virtual jboolean isCellEditable(::java::util::EventObject *) = 0;
-  virtual jboolean shouldSelectCell(::java::util::EventObject *) = 0;
-  virtual jboolean stopCellEditing() = 0;
-  virtual void cancelCellEditing() = 0;
-  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_table_TableCellEditor__
diff --git a/libjava/javax/swing/table/TableCellRenderer.h b/libjava/javax/swing/table/TableCellRenderer.h
deleted file mode 100644
index 46e7eff87a4..00000000000
--- a/libjava/javax/swing/table/TableCellRenderer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_TableCellRenderer__
-#define __javax_swing_table_TableCellRenderer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTable;
-      namespace table
-      {
-          class TableCellRenderer;
-      }
-    }
-  }
-}
-
-class javax::swing::table::TableCellRenderer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getTableCellRendererComponent(::javax::swing::JTable *, ::java::lang::Object *, jboolean, jboolean, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_table_TableCellRenderer__
diff --git a/libjava/javax/swing/table/TableColumn.h b/libjava/javax/swing/table/TableColumn.h
deleted file mode 100644
index 11ca5758b6f..00000000000
--- a/libjava/javax/swing/table/TableColumn.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_TableColumn__
-#define __javax_swing_table_TableColumn__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class SwingPropertyChangeSupport;
-      }
-      namespace table
-      {
-          class TableCellEditor;
-          class TableCellRenderer;
-          class TableColumn;
-      }
-    }
-  }
-}
-
-class javax::swing::table::TableColumn : public ::java::lang::Object
-{
-
-public:
-  TableColumn();
-  TableColumn(jint);
-  TableColumn(jint, jint);
-  TableColumn(jint, jint, ::javax::swing::table::TableCellRenderer *, ::javax::swing::table::TableCellEditor *);
-  virtual void setModelIndex(jint);
-  virtual jint getModelIndex();
-  virtual void setIdentifier(::java::lang::Object *);
-  virtual ::java::lang::Object * getIdentifier();
-  virtual void setHeaderValue(::java::lang::Object *);
-  virtual ::java::lang::Object * getHeaderValue();
-  virtual void setHeaderRenderer(::javax::swing::table::TableCellRenderer *);
-  virtual ::javax::swing::table::TableCellRenderer * getHeaderRenderer();
-  virtual void setCellRenderer(::javax::swing::table::TableCellRenderer *);
-  virtual ::javax::swing::table::TableCellRenderer * getCellRenderer();
-  virtual void setCellEditor(::javax::swing::table::TableCellEditor *);
-  virtual ::javax::swing::table::TableCellEditor * getCellEditor();
-  virtual void setWidth(jint);
-  virtual jint getWidth();
-  virtual void setPreferredWidth(jint);
-  virtual jint getPreferredWidth();
-  virtual void setMinWidth(jint);
-  virtual jint getMinWidth();
-  virtual void setMaxWidth(jint);
-  virtual jint getMaxWidth();
-  virtual void setResizable(jboolean);
-  virtual jboolean getResizable();
-  virtual void sizeWidthToFit();
-  virtual void disableResizedPosting();
-  virtual void enableResizedPosting();
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-public: // actually protected
-  virtual ::javax::swing::table::TableCellRenderer * createDefaultHeaderRenderer();
-public: // actually package-private
-  static const jlong serialVersionUID = -6113660025878112608LL;
-public:
-  static ::java::lang::String * COLUMN_WIDTH_PROPERTY;
-  static ::java::lang::String * HEADER_VALUE_PROPERTY;
-  static ::java::lang::String * HEADER_RENDERER_PROPERTY;
-  static ::java::lang::String * CELL_RENDERER_PROPERTY;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) modelIndex;
-  ::java::lang::Object * identifier;
-  jint width;
-  jint minWidth;
-private:
-  jint preferredWidth;
-public: // actually protected
-  jint maxWidth;
-  ::javax::swing::table::TableCellRenderer * headerRenderer;
-  ::java::lang::Object * headerValue;
-  ::javax::swing::table::TableCellRenderer * cellRenderer;
-  ::javax::swing::table::TableCellEditor * cellEditor;
-  jboolean isResizable;
-  jint resizedPostingDisableCount;
-private:
-  ::javax::swing::event::SwingPropertyChangeSupport * changeSupport;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_table_TableColumn__
diff --git a/libjava/javax/swing/table/TableColumnModel.h b/libjava/javax/swing/table/TableColumnModel.h
deleted file mode 100644
index ea60322422a..00000000000
--- a/libjava/javax/swing/table/TableColumnModel.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_TableColumnModel__
-#define __javax_swing_table_TableColumnModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class ListSelectionModel;
-      namespace event
-      {
-          class TableColumnModelListener;
-      }
-      namespace table
-      {
-          class TableColumn;
-          class TableColumnModel;
-      }
-    }
-  }
-}
-
-class javax::swing::table::TableColumnModel : public ::java::lang::Object
-{
-
-public:
-  virtual void addColumn(::javax::swing::table::TableColumn *) = 0;
-  virtual void removeColumn(::javax::swing::table::TableColumn *) = 0;
-  virtual void moveColumn(jint, jint) = 0;
-  virtual void setColumnMargin(jint) = 0;
-  virtual jint getColumnCount() = 0;
-  virtual ::java::util::Enumeration * getColumns() = 0;
-  virtual jint getColumnIndex(::java::lang::Object *) = 0;
-  virtual ::javax::swing::table::TableColumn * getColumn(jint) = 0;
-  virtual jint getColumnMargin() = 0;
-  virtual jint getColumnIndexAtX(jint) = 0;
-  virtual jint getTotalColumnWidth() = 0;
-  virtual void setColumnSelectionAllowed(jboolean) = 0;
-  virtual jboolean getColumnSelectionAllowed() = 0;
-  virtual JArray< jint > * getSelectedColumns() = 0;
-  virtual jint getSelectedColumnCount() = 0;
-  virtual void setSelectionModel(::javax::swing::ListSelectionModel *) = 0;
-  virtual ::javax::swing::ListSelectionModel * getSelectionModel() = 0;
-  virtual void addColumnModelListener(::javax::swing::event::TableColumnModelListener *) = 0;
-  virtual void removeColumnModelListener(::javax::swing::event::TableColumnModelListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_table_TableColumnModel__
diff --git a/libjava/javax/swing/table/TableModel.h b/libjava/javax/swing/table/TableModel.h
deleted file mode 100644
index 29494c5e102..00000000000
--- a/libjava/javax/swing/table/TableModel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_table_TableModel__
-#define __javax_swing_table_TableModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TableModelListener;
-      }
-      namespace table
-      {
-          class TableModel;
-      }
-    }
-  }
-}
-
-class javax::swing::table::TableModel : public ::java::lang::Object
-{
-
-public:
-  virtual jint getRowCount() = 0;
-  virtual jint getColumnCount() = 0;
-  virtual ::java::lang::String * getColumnName(jint) = 0;
-  virtual ::java::lang::Class * getColumnClass(jint) = 0;
-  virtual jboolean isCellEditable(jint, jint) = 0;
-  virtual ::java::lang::Object * getValueAt(jint, jint) = 0;
-  virtual void setValueAt(::java::lang::Object *, jint, jint) = 0;
-  virtual void addTableModelListener(::javax::swing::event::TableModelListener *) = 0;
-  virtual void removeTableModelListener(::javax::swing::event::TableModelListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_table_TableModel__
diff --git a/libjava/javax/swing/text/AbstractDocument$1.h b/libjava/javax/swing/text/AbstractDocument$1.h
deleted file mode 100644
index b433e142189..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$1__
-#define __javax_swing_text_AbstractDocument$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$1;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractDocument$1(::javax::swing::text::AbstractDocument *);
-public:
-  jint getOffset();
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$1__
diff --git a/libjava/javax/swing/text/AbstractDocument$2.h b/libjava/javax/swing/text/AbstractDocument$2.h
deleted file mode 100644
index dc504ce9eea..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$2__
-#define __javax_swing_text_AbstractDocument$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$2;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractDocument$2(::javax::swing::text::AbstractDocument *);
-public:
-  jint getOffset();
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$2__
diff --git a/libjava/javax/swing/text/AbstractDocument$AbstractElement.h b/libjava/javax/swing/text/AbstractDocument$AbstractElement.h
deleted file mode 100644
index 1aae4dc3660..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$AbstractElement.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$AbstractElement__
-#define __javax_swing_text_AbstractDocument$AbstractElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$AbstractElement;
-          class AttributeSet;
-          class Document;
-          class Element;
-      }
-      namespace tree
-      {
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$AbstractElement : public ::java::lang::Object
-{
-
-public:
-  AbstractDocument$AbstractElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-  virtual ::java::util::Enumeration * children() = 0;
-  virtual jboolean getAllowsChildren() = 0;
-  virtual ::javax::swing::tree::TreeNode * getChildAt(jint);
-  virtual jint getChildCount();
-  virtual jint getIndex(::javax::swing::tree::TreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getParent();
-  virtual jboolean isLeaf() = 0;
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual void addAttributes(::javax::swing::text::AttributeSet *);
-  virtual void removeAttribute(::java::lang::Object *);
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void removeAttributes(::java::util::Enumeration *);
-  virtual void setResolveParent(::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 *);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual ::javax::swing::text::Element * getElement(jint) = 0;
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::text::Element * getParentElement();
-  virtual jint getEndOffset() = 0;
-  virtual jint getElementCount() = 0;
-  virtual jint getElementIndex(jint) = 0;
-  virtual jint getStartOffset() = 0;
-  virtual void dump(::java::io::PrintStream *, jint);
-private:
-  static const jlong serialVersionUID = 1712240033321461704LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
-  jint offset;
-  ::javax::swing::text::AttributeSet * attributes;
-  ::javax::swing::text::Element * element_parent;
-  ::javax::swing::tree::TreeNode * tree_parent;
-  ::java::util::Vector * tree_children;
-  ::javax::swing::text::AbstractDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$AbstractElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$AttributeContext.h b/libjava/javax/swing/text/AbstractDocument$AttributeContext.h
deleted file mode 100644
index d02f88831e1..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$AttributeContext.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$AttributeContext__
-#define __javax_swing_text_AbstractDocument$AttributeContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$AttributeContext;
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$AttributeContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::text::AttributeSet * addAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual ::javax::swing::text::AttributeSet * addAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * getEmptySet() = 0;
-  virtual void reclaim(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * removeAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *) = 0;
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::java::util::Enumeration *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AbstractDocument$AttributeContext__
diff --git a/libjava/javax/swing/text/AbstractDocument$BidiElement.h b/libjava/javax/swing/text/AbstractDocument$BidiElement.h
deleted file mode 100644
index 4d8a0c8dfca..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$BidiElement.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$BidiElement__
-#define __javax_swing_text_AbstractDocument$BidiElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$LeafElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$BidiElement;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$BidiElement : public ::javax::swing::text::AbstractDocument$LeafElement
-{
-
-public: // actually package-private
-  AbstractDocument$BidiElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, jint, jint, jint);
-public:
-  virtual ::java::lang::String * getName();
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$LeafElement)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$BidiElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$BidiRootElement.h b/libjava/javax/swing/text/AbstractDocument$BidiRootElement.h
deleted file mode 100644
index b9a908b7ba1..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$BidiRootElement.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$BidiRootElement__
-#define __javax_swing_text_AbstractDocument$BidiRootElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$BranchElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$BidiRootElement;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$BidiRootElement : public ::javax::swing::text::AbstractDocument$BranchElement
-{
-
-public: // actually package-private
-  AbstractDocument$BidiRootElement(::javax::swing::text::AbstractDocument *);
-public:
-  virtual ::java::lang::String * getName();
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$BranchElement)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$BidiRootElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$BranchElement.h b/libjava/javax/swing/text/AbstractDocument$BranchElement.h
deleted file mode 100644
index 1fb3a680aff..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$BranchElement.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$BranchElement__
-#define __javax_swing_text_AbstractDocument$BranchElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$AbstractElement.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$BranchElement;
-          class AttributeSet;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$BranchElement : public ::javax::swing::text::AbstractDocument$AbstractElement
-{
-
-public:
-  AbstractDocument$BranchElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-  virtual ::java::util::Enumeration * children();
-  virtual jboolean getAllowsChildren();
-  virtual ::javax::swing::text::Element * getElement(jint);
-  virtual jint getElementCount();
-  virtual jint getElementIndex(jint);
-  virtual jint getEndOffset();
-  virtual ::java::lang::String * getName();
-  virtual jint getStartOffset();
-  virtual jboolean isLeaf();
-  virtual ::javax::swing::text::Element * positionToElement(jint);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::Element * > *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6037216547466333183LL;
-  JArray< ::javax::swing::text::Element * > * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$AbstractElement)))) children__;
-  jint numChildren;
-  jint lastIndex;
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$BranchElement__
diff --git a/libjava/javax/swing/text/AbstractDocument$Bypass.h b/libjava/javax/swing/text/AbstractDocument$Bypass.h
deleted file mode 100644
index bb850d91e09..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$Bypass.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$Bypass__
-#define __javax_swing_text_AbstractDocument$Bypass__
-
-#pragma interface
-
-#include <javax/swing/text/DocumentFilter$FilterBypass.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$Bypass;
-          class AttributeSet;
-          class Document;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$Bypass : public ::javax::swing::text::DocumentFilter$FilterBypass
-{
-
-public: // actually package-private
-  AbstractDocument$Bypass(::javax::swing::text::AbstractDocument *);
-public:
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-  virtual void remove(jint, jint);
-  virtual void replace(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::DocumentFilter$FilterBypass)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$Bypass__
diff --git a/libjava/javax/swing/text/AbstractDocument$Content.h b/libjava/javax/swing/text/AbstractDocument$Content.h
deleted file mode 100644
index be16e410b1b..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$Content.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$Content__
-#define __javax_swing_text_AbstractDocument$Content__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$Content;
-          class Position;
-          class Segment;
-      }
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$Content : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::text::Position * createPosition(jint) = 0;
-  virtual jint length() = 0;
-  virtual ::javax::swing::undo::UndoableEdit * insertString(jint, ::java::lang::String *) = 0;
-  virtual ::javax::swing::undo::UndoableEdit * remove(jint, jint) = 0;
-  virtual ::java::lang::String * getString(jint, jint) = 0;
-  virtual void getChars(jint, jint, ::javax::swing::text::Segment *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AbstractDocument$Content__
diff --git a/libjava/javax/swing/text/AbstractDocument$DefaultDocumentEvent.h b/libjava/javax/swing/text/AbstractDocument$DefaultDocumentEvent.h
deleted file mode 100644
index ab7c2a01ccf..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$DefaultDocumentEvent.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$DefaultDocumentEvent__
-#define __javax_swing_text_AbstractDocument$DefaultDocumentEvent__
-
-#pragma interface
-
-#include <javax/swing/undo/CompoundEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent$ElementChange;
-          class DocumentEvent$EventType;
-      }
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$DefaultDocumentEvent;
-          class Document;
-          class Element;
-      }
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$DefaultDocumentEvent : public ::javax::swing::undo::CompoundEdit
-{
-
-public:
-  AbstractDocument$DefaultDocumentEvent(::javax::swing::text::AbstractDocument *, jint, jint, ::javax::swing::event::DocumentEvent$EventType *);
-  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual jint getLength();
-  virtual jint getOffset();
-  virtual ::javax::swing::event::DocumentEvent$EventType * getType();
-  virtual ::javax::swing::event::DocumentEvent$ElementChange * getChange(::javax::swing::text::Element *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 5230037221564563284LL;
-  static const jint THRESHOLD = 10;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::CompoundEdit)))) offset;
-  jint length;
-  ::javax::swing::event::DocumentEvent$EventType * type;
-  ::java::util::HashMap * changes;
-  jboolean modified;
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$DefaultDocumentEvent__
diff --git a/libjava/javax/swing/text/AbstractDocument$ElementEdit.h b/libjava/javax/swing/text/AbstractDocument$ElementEdit.h
deleted file mode 100644
index 68eb020d11b..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$ElementEdit.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$ElementEdit__
-#define __javax_swing_text_AbstractDocument$ElementEdit__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$ElementEdit;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$ElementEdit : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  AbstractDocument$ElementEdit(::javax::swing::text::Element *, jint, JArray< ::javax::swing::text::Element * > *, JArray< ::javax::swing::text::Element * > *);
-  virtual JArray< ::javax::swing::text::Element * > * getChildrenAdded();
-  virtual JArray< ::javax::swing::text::Element * > * getChildrenRemoved();
-  virtual ::javax::swing::text::Element * getElement();
-  virtual jint getIndex();
-private:
-  static const jlong serialVersionUID = -1216620962142928304LL;
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) elem;
-  jint index;
-  JArray< ::javax::swing::text::Element * > * removed;
-  JArray< ::javax::swing::text::Element * > * added;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$ElementEdit__
diff --git a/libjava/javax/swing/text/AbstractDocument$LeafElement.h b/libjava/javax/swing/text/AbstractDocument$LeafElement.h
deleted file mode 100644
index 0b8d671b6ce..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$LeafElement.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$LeafElement__
-#define __javax_swing_text_AbstractDocument$LeafElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$AbstractElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$LeafElement;
-          class AttributeSet;
-          class Element;
-          class Position;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$LeafElement : public ::javax::swing::text::AbstractDocument$AbstractElement
-{
-
-public:
-  AbstractDocument$LeafElement(::javax::swing::text::AbstractDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
-  virtual ::java::util::Enumeration * children();
-  virtual jboolean getAllowsChildren();
-  virtual ::javax::swing::text::Element * getElement(jint);
-  virtual jint getElementCount();
-  virtual jint getElementIndex(jint);
-  virtual jint getEndOffset();
-  virtual ::java::lang::String * getName();
-  virtual jint getStartOffset();
-  virtual jboolean isLeaf();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -8906306331347768017LL;
-  ::javax::swing::text::Position * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$AbstractElement)))) startPos;
-  ::javax::swing::text::Position * endPos;
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$LeafElement__
diff --git a/libjava/javax/swing/text/AbstractDocument.h b/libjava/javax/swing/text/AbstractDocument.h
deleted file mode 100644
index 65110f0cee7..00000000000
--- a/libjava/javax/swing/text/AbstractDocument.h
+++ /dev/null
@@ -1,166 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument__
-#define __javax_swing_text_AbstractDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class Bidi;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentListener;
-          class EventListenerList;
-          class UndoableEditEvent;
-          class UndoableEditListener;
-      }
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$AttributeContext;
-          class AbstractDocument$BidiRootElement;
-          class AbstractDocument$Content;
-          class AbstractDocument$DefaultDocumentEvent;
-          class AttributeSet;
-          class DocumentFilter;
-          class DocumentFilter$FilterBypass;
-          class Element;
-          class Position;
-          class Segment;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractDocument(::javax::swing::text::AbstractDocument$Content *);
-  AbstractDocument(::javax::swing::text::AbstractDocument$Content *, ::javax::swing::text::AbstractDocument$AttributeContext *);
-private:
-  ::javax::swing::text::DocumentFilter$FilterBypass * getBypass();
-public:
-  virtual ::javax::swing::text::Element * getParagraphElement(jint) = 0;
-  virtual ::javax::swing::text::Element * getDefaultRootElement() = 0;
-public: // actually protected
-  virtual ::javax::swing::text::Element * createBranchElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::Element * createLeafElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
-public:
-  virtual ::javax::swing::text::Position * createPosition(jint);
-public: // actually protected
-  virtual void fireChangedUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void fireInsertUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void fireRemoveUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void fireUndoableEditUpdate(::javax::swing::event::UndoableEditEvent *);
-public:
-  virtual jint getAsynchronousLoadPriority();
-public: // actually protected
-  virtual ::javax::swing::text::AbstractDocument$AttributeContext * getAttributeContext();
-public:
-  virtual ::javax::swing::text::Element * getBidiRootElement();
-public: // actually protected
-  virtual ::javax::swing::text::AbstractDocument$Content * getContent();
-  virtual ::java::lang::Thread * getCurrentWriter();
-public:
-  virtual ::java::util::Dictionary * getDocumentProperties();
-  virtual ::javax::swing::text::Position * getEndPosition();
-  virtual jint getLength();
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual ::java::lang::Object * getProperty(::java::lang::Object *);
-  virtual JArray< ::javax::swing::text::Element * > * getRootElements();
-  virtual ::javax::swing::text::Position * getStartPosition();
-  virtual ::java::lang::String * getText(jint, jint);
-  virtual void getText(jint, jint, ::javax::swing::text::Segment *);
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  virtual void insertStringImpl(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-public: // actually protected
-  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
-  virtual void postRemoveUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public:
-  virtual void putProperty(::java::lang::Object *, ::java::lang::Object *);
-private:
-  void updateBidi(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-  JArray< ::java::text::Bidi * > * getBidis(jint, jint);
-public:
-  virtual void readLock();
-  virtual void readUnlock();
-  virtual void remove(jint, jint);
-public: // actually package-private
-  virtual void removeImpl(jint, jint);
-public:
-  virtual void replace(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  virtual void replaceImpl(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-public:
-  virtual void addDocumentListener(::javax::swing::event::DocumentListener *);
-  virtual void removeDocumentListener(::javax::swing::event::DocumentListener *);
-  virtual JArray< ::javax::swing::event::DocumentListener * > * getDocumentListeners();
-  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *);
-  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *);
-  virtual JArray< ::javax::swing::event::UndoableEditListener * > * getUndoableEditListeners();
-public: // actually protected
-  virtual void removeUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public:
-  virtual void render(::java::lang::Runnable *);
-  virtual void setAsynchronousLoadPriority(jint);
-  virtual void setDocumentProperties(::java::util::Dictionary *);
-public: // actually protected
-  virtual void writeLock();
-  virtual void writeUnlock();
-public:
-  virtual ::javax::swing::text::DocumentFilter * getDocumentFilter();
-  virtual void setDocumentFilter(::javax::swing::text::DocumentFilter *);
-  virtual void dump(::java::io::PrintStream *);
-private:
-  static const jlong serialVersionUID = 6842927725919637215LL;
-public: // actually protected
-  static ::java::lang::String * BAD_LOCATION;
-public:
-  static ::java::lang::String * BidiElementName;
-  static ::java::lang::String * ContentElementName;
-  static ::java::lang::String * ParagraphElementName;
-  static ::java::lang::String * SectionElementName;
-  static ::java::lang::String * ElementNameAttribute;
-private:
-  static ::java::lang::String * BidiRootName;
-  static ::java::lang::String * AsyncLoadPriority;
-  static ::java::lang::String * I18N;
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument$Content * __attribute__((aligned(__alignof__( ::java::lang::Object)))) content;
-  ::javax::swing::text::AbstractDocument$AttributeContext * context;
-  ::javax::swing::text::DocumentFilter * documentFilter;
-  ::java::util::Dictionary * properties;
-public: // actually protected
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  ::java::lang::Thread * currentWriter;
-  jint numReaders;
-  jint numWriters;
-  ::javax::swing::text::DocumentFilter$FilterBypass * bypass;
-  ::javax::swing::text::AbstractDocument$BidiRootElement * bidiRoot;
-  jboolean notifyListeners;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument__
diff --git a/libjava/javax/swing/text/AbstractWriter.h b/libjava/javax/swing/text/AbstractWriter.h
deleted file mode 100644
index b22be6e6fa1..00000000000
--- a/libjava/javax/swing/text/AbstractWriter.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractWriter__
-#define __javax_swing_text_AbstractWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractWriter;
-          class AttributeSet;
-          class Document;
-          class Element;
-          class ElementIterator;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractWriter : public ::java::lang::Object
-{
-
-public: // actually protected
-  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Document *);
-  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint);
-  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Element *);
-  AbstractWriter(::java::io::Writer *, ::javax::swing::text::Element *, jint, jint);
-  virtual ::javax::swing::text::ElementIterator * getElementIterator();
-  virtual ::java::io::Writer * getWriter();
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual void write() = 0;
-  virtual ::java::lang::String * getText(::javax::swing::text::Element *);
-  virtual void output(JArray< jchar > *, jint, jint);
-  virtual void writeLineSeparator();
-  virtual void write(jchar);
-  virtual void write(::java::lang::String *);
-  virtual void write(JArray< jchar > *, jint, jint);
-  virtual void indent();
-public:
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-public: // actually protected
-  virtual jboolean inRange(::javax::swing::text::Element *);
-  virtual void text(::javax::swing::text::Element *);
-  virtual void setLineLength(jint);
-  virtual jint getLineLength();
-  virtual void setCurrentLineLength(jint);
-  virtual jint getCurrentLineLength();
-  virtual jboolean isLineEmpty();
-  virtual void setCanWrapLines(jboolean);
-  virtual jboolean getCanWrapLines();
-  virtual void setIndentSpace(jint);
-  virtual jint getIndentSpace();
-public:
-  virtual void setLineSeparator(::java::lang::String *);
-  virtual ::java::lang::String * getLineSeparator();
-public: // actually protected
-  virtual void incrIndent();
-  virtual void decrIndent();
-  virtual jint getIndentLevel();
-  virtual void writeAttributes(::javax::swing::text::AttributeSet *);
-  static const jchar NEWLINE = 10;
-private:
-  ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer;
-  ::javax::swing::text::ElementIterator * iter;
-  ::javax::swing::text::Document * document;
-  jint maxLineLength;
-  jint lineLength;
-  jboolean canWrapLines;
-  jint indentSpace;
-  jint indentLevel;
-  jboolean indented;
-  jint startOffset;
-  jint endOffset;
-  ::java::lang::String * lineSeparator;
-  JArray< jchar > * lineSeparatorChars;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractWriter__
diff --git a/libjava/javax/swing/text/AsyncBoxView$ChildLocator.h b/libjava/javax/swing/text/AsyncBoxView$ChildLocator.h
deleted file mode 100644
index 72b0f9a6c3c..00000000000
--- a/libjava/javax/swing/text/AsyncBoxView$ChildLocator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AsyncBoxView$ChildLocator__
-#define __javax_swing_text_AsyncBoxView$ChildLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AsyncBoxView;
-          class AsyncBoxView$ChildLocator;
-          class AsyncBoxView$ChildState;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AsyncBoxView$ChildLocator : public ::java::lang::Object
-{
-
-public:
-  AsyncBoxView$ChildLocator(::javax::swing::text::AsyncBoxView *);
-  virtual void childChanged(::javax::swing::text::AsyncBoxView$ChildState *);
-  virtual jint getViewIndexAtPoint(jfloat, jfloat, ::java::awt::Shape *);
-  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
-  virtual void paintChildren(::java::awt::Graphics *);
-public: // actually protected
-  virtual ::java::awt::Shape * getChildAllocation(jint);
-  virtual void setAllocation(::java::awt::Shape *);
-  virtual jint getViewIndexAtVisualOffset(jfloat);
-private:
-  jint updateChildOffsets(jfloat);
-  void updateChildOffsetsToIndex(jint);
-public: // actually protected
-  ::javax::swing::text::AsyncBoxView$ChildState * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastValidOffset;
-  ::java::awt::Rectangle * lastAlloc;
-  ::java::awt::Rectangle * childAlloc;
-public: // actually package-private
-  ::javax::swing::text::AsyncBoxView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AsyncBoxView$ChildLocator__
diff --git a/libjava/javax/swing/text/AsyncBoxView$ChildState.h b/libjava/javax/swing/text/AsyncBoxView$ChildState.h
deleted file mode 100644
index 3bce589a205..00000000000
--- a/libjava/javax/swing/text/AsyncBoxView$ChildState.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AsyncBoxView$ChildState__
-#define __javax_swing_text_AsyncBoxView$ChildState__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AsyncBoxView;
-          class AsyncBoxView$ChildState;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AsyncBoxView$ChildState : public ::java::lang::Object
-{
-
-public:
-  AsyncBoxView$ChildState(::javax::swing::text::AsyncBoxView *, ::javax::swing::text::View *);
-  virtual ::javax::swing::text::View * getChildView();
-  virtual jboolean isLayoutValid();
-  virtual void run();
-private:
-  void update();
-public:
-  virtual jfloat getMinorSpan();
-  virtual jfloat getMinorOffset();
-  virtual jfloat getMajorSpan();
-  virtual jfloat getMajorOffset();
-  virtual void setMajorOffset(jfloat);
-  virtual void preferenceChanged(jboolean, jboolean);
-private:
-  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::java::lang::Object)))) childView;
-  jboolean minorValid;
-  jboolean majorValid;
-public: // actually package-private
-  jboolean childSizeValid;
-  jfloat minimum;
-  jfloat preferred;
-private:
-  jfloat majorSpan;
-  jfloat majorOffset;
-  jfloat minorSpan;
-  jfloat minorOffset;
-  jfloat maximum;
-public: // actually package-private
-  ::javax::swing::text::AsyncBoxView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AsyncBoxView$ChildState__
diff --git a/libjava/javax/swing/text/AsyncBoxView$FlushTask.h b/libjava/javax/swing/text/AsyncBoxView$FlushTask.h
deleted file mode 100644
index bd9378b4ead..00000000000
--- a/libjava/javax/swing/text/AsyncBoxView$FlushTask.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AsyncBoxView$FlushTask__
-#define __javax_swing_text_AsyncBoxView$FlushTask__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AsyncBoxView;
-          class AsyncBoxView$FlushTask;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AsyncBoxView$FlushTask : public ::java::lang::Object
-{
-
-  AsyncBoxView$FlushTask(::javax::swing::text::AsyncBoxView *);
-public:
-  virtual void run();
-public: // actually package-private
-  AsyncBoxView$FlushTask(::javax::swing::text::AsyncBoxView *, ::javax::swing::text::AsyncBoxView$FlushTask *);
-  ::javax::swing::text::AsyncBoxView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AsyncBoxView$FlushTask__
diff --git a/libjava/javax/swing/text/AsyncBoxView.h b/libjava/javax/swing/text/AsyncBoxView.h
deleted file mode 100644
index 80a965f49a0..00000000000
--- a/libjava/javax/swing/text/AsyncBoxView.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AsyncBoxView__
-#define __javax_swing_text_AsyncBoxView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class AsyncBoxView;
-          class AsyncBoxView$ChildLocator;
-          class AsyncBoxView$ChildState;
-          class Element;
-          class LayoutQueue;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AsyncBoxView : public ::javax::swing::text::View
-{
-
-public:
-  AsyncBoxView(::javax::swing::text::Element *, jint);
-  virtual jint getMajorAxis();
-  virtual jint getMinorAxis();
-  virtual ::javax::swing::text::View * getView(jint);
-  virtual jint getViewCount();
-  virtual jint getViewIndex(jint, ::javax::swing::text::Position$Bias *);
-  virtual jfloat getTopInset();
-  virtual void setTopInset(jfloat);
-  virtual jfloat getBottomInset();
-  virtual void setBottomInset(jfloat);
-  virtual jfloat getLeftInset();
-  virtual void setLeftInset(jfloat);
-  virtual jfloat getRightInset();
-  virtual void setRightInset(jfloat);
-public: // actually protected
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual jfloat getInsetSpan(jint);
-  virtual void setEstimatedMajorSpan(jboolean);
-  virtual jboolean getEstimatedMajorSpan();
-  virtual void minorRequirementChange(::javax::swing::text::AsyncBoxView$ChildState *);
-  virtual void majorRequirementChange(::javax::swing::text::AsyncBoxView$ChildState *, jfloat);
-public:
-  virtual void setParent(::javax::swing::text::View *);
-  virtual void setSize(jfloat, jfloat);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-public: // actually protected
-  virtual void updateLayout(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *);
-  virtual ::javax::swing::text::AsyncBoxView$ChildState * getChildState(jint);
-  virtual ::javax::swing::text::LayoutQueue * getLayoutQueue();
-  virtual jint getViewIndexAtPosition(jint, ::javax::swing::text::Position$Bias *);
-  virtual ::javax::swing::text::AsyncBoxView$ChildState * createChildState(::javax::swing::text::View *);
-  virtual void flushRequirementChanges();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) majorAxis;
-  jfloat topInset;
-  jfloat bottomInset;
-  jfloat leftInset;
-  jboolean estimatedMajorSpan;
-  jfloat rightInset;
-  ::java::util::ArrayList * childStates;
-public: // actually package-private
-  ::javax::swing::text::AsyncBoxView$ChildState * changing;
-  ::javax::swing::text::AsyncBoxView$ChildState * minReq;
-  ::javax::swing::text::AsyncBoxView$ChildState * prefReq;
-private:
-  jboolean majorChanged;
-public: // actually package-private
-  jboolean minorChanged;
-  jfloat majorSpan;
-  jfloat minorSpan;
-private:
-  ::java::lang::Runnable * flushTask;
-public: // actually protected
-  ::javax::swing::text::AsyncBoxView$ChildLocator * locator;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AsyncBoxView__
diff --git a/libjava/javax/swing/text/AttributeSet$CharacterAttribute.h b/libjava/javax/swing/text/AttributeSet$CharacterAttribute.h
deleted file mode 100644
index ddc9c19f482..00000000000
--- a/libjava/javax/swing/text/AttributeSet$CharacterAttribute.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AttributeSet$CharacterAttribute__
-#define __javax_swing_text_AttributeSet$CharacterAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet$CharacterAttribute;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AttributeSet$CharacterAttribute : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AttributeSet$CharacterAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet$ColorAttribute.h b/libjava/javax/swing/text/AttributeSet$ColorAttribute.h
deleted file mode 100644
index c04b096d06b..00000000000
--- a/libjava/javax/swing/text/AttributeSet$ColorAttribute.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AttributeSet$ColorAttribute__
-#define __javax_swing_text_AttributeSet$ColorAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet$ColorAttribute;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AttributeSet$ColorAttribute : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AttributeSet$ColorAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet$FontAttribute.h b/libjava/javax/swing/text/AttributeSet$FontAttribute.h
deleted file mode 100644
index eff25222ae2..00000000000
--- a/libjava/javax/swing/text/AttributeSet$FontAttribute.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AttributeSet$FontAttribute__
-#define __javax_swing_text_AttributeSet$FontAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet$FontAttribute;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AttributeSet$FontAttribute : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AttributeSet$FontAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet$ParagraphAttribute.h b/libjava/javax/swing/text/AttributeSet$ParagraphAttribute.h
deleted file mode 100644
index 05f67c16b7e..00000000000
--- a/libjava/javax/swing/text/AttributeSet$ParagraphAttribute.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AttributeSet$ParagraphAttribute__
-#define __javax_swing_text_AttributeSet$ParagraphAttribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet$ParagraphAttribute;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AttributeSet$ParagraphAttribute : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AttributeSet$ParagraphAttribute__
diff --git a/libjava/javax/swing/text/AttributeSet.h b/libjava/javax/swing/text/AttributeSet.h
deleted file mode 100644
index ba1f4d100e9..00000000000
--- a/libjava/javax/swing/text/AttributeSet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AttributeSet__
-#define __javax_swing_text_AttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * copyAttributes() = 0;
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *) = 0;
-  virtual jint getAttributeCount() = 0;
-  virtual ::java::util::Enumeration * getAttributeNames() = 0;
-  virtual ::javax::swing::text::AttributeSet * getResolveParent() = 0;
-  virtual jboolean isDefined(::java::lang::Object *) = 0;
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *) = 0;
-  static ::java::lang::Object * NameAttribute;
-  static ::java::lang::Object * ResolveAttribute;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_AttributeSet__
diff --git a/libjava/javax/swing/text/BadLocationException.h b/libjava/javax/swing/text/BadLocationException.h
deleted file mode 100644
index 3102b7a37a5..00000000000
--- a/libjava/javax/swing/text/BadLocationException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_BadLocationException__
-#define __javax_swing_text_BadLocationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class BadLocationException;
-      }
-    }
-  }
-}
-
-class javax::swing::text::BadLocationException : public ::java::lang::Exception
-{
-
-public:
-  BadLocationException(::java::lang::String *, jint);
-  virtual jint offsetRequested();
-private:
-  static const jlong serialVersionUID = -7712259886815656766LL;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) offset;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_BadLocationException__
diff --git a/libjava/javax/swing/text/BoxView.h b/libjava/javax/swing/text/BoxView.h
deleted file mode 100644
index c00436887f6..00000000000
--- a/libjava/javax/swing/text/BoxView.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_BoxView__
-#define __javax_swing_text_BoxView__
-
-#pragma interface
-
-#include <javax/swing/text/CompositeView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class BoxView;
-          class Element;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::BoxView : public ::javax::swing::text::CompositeView
-{
-
-public:
-  BoxView(::javax::swing::text::Element *, jint);
-  virtual jint getAxis();
-  virtual void setAxis(jint);
-  virtual void layoutChanged(jint);
-public: // actually protected
-  virtual jboolean isLayoutValid(jint);
-  virtual void paintChild(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-public:
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-private:
-  JArray< jint > * replaceLayoutArray(JArray< jint > *, jint, jint);
-public:
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-public: // actually protected
-  virtual ::javax::swing::SizeRequirements * baselineRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void baselineLayout(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual jboolean isBefore(jint, jint, ::java::awt::Rectangle *);
-  virtual jboolean isAfter(jint, jint, ::java::awt::Rectangle *);
-  virtual ::javax::swing::text::View * getViewAtPoint(jint, jint, ::java::awt::Rectangle *);
-  virtual void childAllocation(jint, ::java::awt::Rectangle *);
-  virtual void layout(jint, jint);
-private:
-  void layoutAxis(jint, jint);
-public: // actually protected
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual jboolean isAllocationValid();
-public:
-  virtual jint getWidth();
-  virtual jint getHeight();
-  virtual void setSize(jfloat, jfloat);
-public: // actually protected
-  virtual jint getSpan(jint, jint);
-  virtual jint getOffset(jint, jint);
-public:
-  virtual jfloat getAlignment(jint);
-  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint getResizeWeight(jint);
-  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
-public: // actually protected
-  virtual void forwardUpdate(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public:
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually protected
-  virtual jboolean flipEastAndWestAtEnds(jint, ::javax::swing::text::Position$Bias *);
-private:
-  void updateRequirements(jint);
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::CompositeView)))) myAxis;
-  JArray< jboolean > * layoutValid;
-  JArray< jboolean > * requirementsValid;
-  JArray< JArray< jint > * > * spans;
-  JArray< JArray< jint > * > * offsets;
-  JArray< ::javax::swing::SizeRequirements * > * requirements;
-  JArray< jint > * span;
-  ::java::awt::Rectangle * tmpRect;
-  ::java::awt::Rectangle * clipRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_BoxView__
diff --git a/libjava/javax/swing/text/Caret.h b/libjava/javax/swing/text/Caret.h
deleted file mode 100644
index 024933a0485..00000000000
--- a/libjava/javax/swing/text/Caret.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Caret__
-#define __javax_swing_text_Caret__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Point;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace text
-      {
-          class Caret;
-          class JTextComponent;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Caret : public ::java::lang::Object
-{
-
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void install(::javax::swing::text::JTextComponent *) = 0;
-  virtual void deinstall(::javax::swing::text::JTextComponent *) = 0;
-  virtual jint getBlinkRate() = 0;
-  virtual void setBlinkRate(jint) = 0;
-  virtual jint getDot() = 0;
-  virtual void setDot(jint) = 0;
-  virtual void moveDot(jint) = 0;
-  virtual jint getMark() = 0;
-  virtual ::java::awt::Point * getMagicCaretPosition() = 0;
-  virtual void setMagicCaretPosition(::java::awt::Point *) = 0;
-  virtual jboolean isSelectionVisible() = 0;
-  virtual void setSelectionVisible(jboolean) = 0;
-  virtual jboolean isVisible() = 0;
-  virtual void setVisible(jboolean) = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Caret__
diff --git a/libjava/javax/swing/text/ChangedCharSetException.h b/libjava/javax/swing/text/ChangedCharSetException.h
deleted file mode 100644
index d25d88cd98c..00000000000
--- a/libjava/javax/swing/text/ChangedCharSetException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ChangedCharSetException__
-#define __javax_swing_text_ChangedCharSetException__
-
-#pragma interface
-
-#include <java/io/IOException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class ChangedCharSetException;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ChangedCharSetException : public ::java::io::IOException
-{
-
-public:
-  ChangedCharSetException(::java::lang::String *, jboolean);
-  virtual ::java::lang::String * getCharSetSpec();
-  virtual jboolean keyEqualsCharSet();
-private:
-  static const jlong serialVersionUID = 9119851554465432389LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::io::IOException)))) m_charSetSpec;
-  jboolean m_charSetKey;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ChangedCharSetException__
diff --git a/libjava/javax/swing/text/ComponentView$1.h b/libjava/javax/swing/text/ComponentView$1.h
deleted file mode 100644
index fa00c157eb7..00000000000
--- a/libjava/javax/swing/text/ComponentView$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ComponentView$1__
-#define __javax_swing_text_ComponentView$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class ComponentView;
-          class ComponentView$1;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ComponentView$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ComponentView$1(::javax::swing::text::ComponentView *);
-public:
-  void run();
-public: // actually package-private
-  ::javax::swing::text::ComponentView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ComponentView$1__
diff --git a/libjava/javax/swing/text/ComponentView$Interceptor.h b/libjava/javax/swing/text/ComponentView$Interceptor.h
deleted file mode 100644
index 57a14a5abac..00000000000
--- a/libjava/javax/swing/text/ComponentView$Interceptor.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ComponentView$Interceptor__
-#define __javax_swing_text_ComponentView$Interceptor__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Dimension;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class ComponentView;
-          class ComponentView$Interceptor;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ComponentView$Interceptor : public ::java::awt::Container
-{
-
-public: // actually package-private
-  ComponentView$Interceptor(::javax::swing::text::ComponentView *, ::java::awt::Component *);
-public:
-  virtual void invalidate();
-  virtual void doLayout();
-  virtual void reshape(jint, jint, jint, jint);
-  virtual void show();
-  virtual void hide();
-  virtual ::java::awt::Dimension * getMinimumSize();
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual ::java::awt::Dimension * getMaximumSize();
-  virtual jfloat getAlignmentX();
-  virtual jfloat getAlignmentY();
-private:
-  void maybeValidate();
-  void cacheComponentSizes();
-public: // actually package-private
-  ::java::awt::Dimension * __attribute__((aligned(__alignof__( ::java::awt::Container)))) min;
-  ::java::awt::Dimension * pref;
-  ::java::awt::Dimension * max;
-  jfloat alignX;
-  jfloat alignY;
-  ::javax::swing::text::ComponentView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ComponentView$Interceptor__
diff --git a/libjava/javax/swing/text/ComponentView.h b/libjava/javax/swing/text/ComponentView.h
deleted file mode 100644
index 0a333cf86d7..00000000000
--- a/libjava/javax/swing/text/ComponentView.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ComponentView__
-#define __javax_swing_text_ComponentView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class ComponentView;
-          class ComponentView$Interceptor;
-          class Element;
-          class Position$Bias;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ComponentView : public ::javax::swing::text::View
-{
-
-public:
-  ComponentView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::java::awt::Component * createComponent();
-public:
-  virtual jfloat getAlignment(jint);
-  virtual ::java::awt::Component * getComponent();
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual void setParent(::javax::swing::text::View *);
-public: // actually package-private
-  virtual void setParentImpl();
-public:
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-private:
-  ::java::awt::Component * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) comp;
-  ::javax::swing::text::ComponentView$Interceptor * interceptor;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ComponentView__
diff --git a/libjava/javax/swing/text/CompositeView.h b/libjava/javax/swing/text/CompositeView.h
deleted file mode 100644
index 2e708ffa1cc..00000000000
--- a/libjava/javax/swing/text/CompositeView.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_CompositeView__
-#define __javax_swing_text_CompositeView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class CompositeView;
-          class Element;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::CompositeView : public ::javax::swing::text::View
-{
-
-public:
-  CompositeView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-public:
-  virtual void setParent(::javax::swing::text::View *);
-  virtual jint getViewCount();
-  virtual ::javax::swing::text::View * getView(jint);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual ::java::awt::Shape * modelToView(jint, ::javax::swing::text::Position$Bias *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getViewIndex(jint, ::javax::swing::text::Position$Bias *);
-public: // actually protected
-  virtual jboolean isBefore(jint, jint, ::java::awt::Rectangle *) = 0;
-  virtual jboolean isAfter(jint, jint, ::java::awt::Rectangle *) = 0;
-  virtual ::javax::swing::text::View * getViewAtPoint(jint, jint, ::java::awt::Rectangle *) = 0;
-  virtual void childAllocation(jint, ::java::awt::Rectangle *) = 0;
-  virtual ::javax::swing::text::View * getViewAtPosition(jint, ::java::awt::Rectangle *);
-  virtual jint getViewIndexAtPosition(jint);
-  virtual ::java::awt::Rectangle * getInsideAllocation(::java::awt::Shape *);
-  virtual void setParagraphInsets(::javax::swing::text::AttributeSet *);
-  virtual void setInsets(jshort, jshort, jshort, jshort);
-  virtual jshort getLeftInset();
-  virtual jshort getRightInset();
-  virtual jshort getTopInset();
-  virtual jshort getBottomInset();
-  virtual jint getNextNorthSouthVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jint getNextEastWestVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jboolean flipEastAndWestAtEnds(jint, ::javax::swing::text::Position$Bias *);
-private:
-  JArray< ::javax::swing::text::View * > * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) children;
-  jint numChildren;
-  ::java::awt::Rectangle * insideAllocation;
-  jshort top;
-  jshort bottom;
-  jshort left;
-  jshort right;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_CompositeView__
diff --git a/libjava/javax/swing/text/DateFormatter.h b/libjava/javax/swing/text/DateFormatter.h
deleted file mode 100644
index 47da776dacb..00000000000
--- a/libjava/javax/swing/text/DateFormatter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DateFormatter__
-#define __javax_swing_text_DateFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/InternationalFormatter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class DateFormat;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DateFormatter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DateFormatter : public ::javax::swing::text::InternationalFormatter
-{
-
-public:
-  DateFormatter();
-  DateFormatter(::java::text::DateFormat *);
-  virtual void setFormat(::java::text::DateFormat *);
-private:
-  static const jlong serialVersionUID = 5423279572591848797LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DateFormatter__
diff --git a/libjava/javax/swing/text/DefaultCaret$BlinkTimerListener.h b/libjava/javax/swing/text/DefaultCaret$BlinkTimerListener.h
deleted file mode 100644
index a29c4aaa2bf..00000000000
--- a/libjava/javax/swing/text/DefaultCaret$BlinkTimerListener.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultCaret$BlinkTimerListener__
-#define __javax_swing_text_DefaultCaret$BlinkTimerListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultCaret;
-          class DefaultCaret$BlinkTimerListener;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultCaret$BlinkTimerListener : public ::java::lang::Object
-{
-
-  DefaultCaret$BlinkTimerListener(::javax::swing::text::DefaultCaret *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually package-private
-  DefaultCaret$BlinkTimerListener(::javax::swing::text::DefaultCaret *, ::javax::swing::text::DefaultCaret$BlinkTimerListener *);
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) ignoreNextEvent;
-  ::javax::swing::text::DefaultCaret * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultCaret$BlinkTimerListener__
diff --git a/libjava/javax/swing/text/DefaultCaret$Bypass.h b/libjava/javax/swing/text/DefaultCaret$Bypass.h
deleted file mode 100644
index 045d191f153..00000000000
--- a/libjava/javax/swing/text/DefaultCaret$Bypass.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultCaret$Bypass__
-#define __javax_swing_text_DefaultCaret$Bypass__
-
-#pragma interface
-
-#include <javax/swing/text/NavigationFilter$FilterBypass.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultCaret;
-          class DefaultCaret$Bypass;
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultCaret$Bypass : public ::javax::swing::text::NavigationFilter$FilterBypass
-{
-
-public: // actually package-private
-  DefaultCaret$Bypass(::javax::swing::text::DefaultCaret *);
-public:
-  virtual ::javax::swing::text::Caret * getCaret();
-  virtual void moveDot(jint, ::javax::swing::text::Position$Bias *);
-  virtual void setDot(jint, ::javax::swing::text::Position$Bias *);
-public: // actually package-private
-  ::javax::swing::text::DefaultCaret * __attribute__((aligned(__alignof__( ::javax::swing::text::NavigationFilter$FilterBypass)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultCaret$Bypass__
diff --git a/libjava/javax/swing/text/DefaultCaret$DocumentHandler.h b/libjava/javax/swing/text/DefaultCaret$DocumentHandler.h
deleted file mode 100644
index 64b15b178d4..00000000000
--- a/libjava/javax/swing/text/DefaultCaret$DocumentHandler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultCaret$DocumentHandler__
-#define __javax_swing_text_DefaultCaret$DocumentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class DefaultCaret;
-          class DefaultCaret$DocumentHandler;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultCaret$DocumentHandler : public ::java::lang::Object
-{
-
-  DefaultCaret$DocumentHandler(::javax::swing::text::DefaultCaret *);
-public:
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
-public: // actually package-private
-  DefaultCaret$DocumentHandler(::javax::swing::text::DefaultCaret *, ::javax::swing::text::DefaultCaret$DocumentHandler *);
-  ::javax::swing::text::DefaultCaret * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultCaret$DocumentHandler__
diff --git a/libjava/javax/swing/text/DefaultCaret$PropertyChangeHandler.h b/libjava/javax/swing/text/DefaultCaret$PropertyChangeHandler.h
deleted file mode 100644
index 469a8858ed7..00000000000
--- a/libjava/javax/swing/text/DefaultCaret$PropertyChangeHandler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultCaret$PropertyChangeHandler__
-#define __javax_swing_text_DefaultCaret$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultCaret;
-          class DefaultCaret$PropertyChangeHandler;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultCaret$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  DefaultCaret$PropertyChangeHandler(::javax::swing::text::DefaultCaret *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  DefaultCaret$PropertyChangeHandler(::javax::swing::text::DefaultCaret *, ::javax::swing::text::DefaultCaret$PropertyChangeHandler *);
-  ::javax::swing::text::DefaultCaret * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultCaret$PropertyChangeHandler__
diff --git a/libjava/javax/swing/text/DefaultCaret.h b/libjava/javax/swing/text/DefaultCaret.h
deleted file mode 100644
index 882bda70ca2..00000000000
--- a/libjava/javax/swing/text/DefaultCaret.h
+++ /dev/null
@@ -1,161 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultCaret__
-#define __javax_swing_text_DefaultCaret__
-
-#pragma interface
-
-#include <java/awt/Rectangle.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class FocusEvent;
-          class MouseEvent;
-      }
-    }
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Timer;
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class DocumentListener;
-          class EventListenerList;
-      }
-      namespace text
-      {
-          class DefaultCaret;
-          class DefaultCaret$BlinkTimerListener;
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-          class NavigationFilter$FilterBypass;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultCaret : public ::java::awt::Rectangle
-{
-
-public:
-  DefaultCaret();
-private:
-  ::javax::swing::text::NavigationFilter$FilterBypass * getBypass();
-public:
-  virtual void setUpdatePolicy(jint);
-  virtual jint getUpdatePolicy();
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseEntered(::java::awt::event::MouseEvent *);
-  virtual void mouseExited(::java::awt::event::MouseEvent *);
-  virtual void mousePressed(::java::awt::event::MouseEvent *);
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-  virtual void focusGained(::java::awt::event::FocusEvent *);
-  virtual void focusLost(::java::awt::event::FocusEvent *);
-private:
-  void updateTimerStatus();
-public: // actually protected
-  virtual void moveCaret(::java::awt::event::MouseEvent *);
-  virtual void positionCaret(::java::awt::event::MouseEvent *);
-public:
-  virtual void deinstall(::javax::swing::text::JTextComponent *);
-  virtual void install(::javax::swing::text::JTextComponent *);
-  virtual void setMagicCaretPosition(::java::awt::Point *);
-  virtual ::java::awt::Point * getMagicCaretPosition();
-  virtual jint getMark();
-private:
-  void clearHighlight();
-  void handleHighlight();
-public:
-  virtual void setSelectionVisible(jboolean);
-  virtual jboolean isSelectionVisible();
-public: // actually protected
-  virtual void repaint();
-public:
-  virtual void paint(::java::awt::Graphics *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireStateChanged();
-  virtual ::javax::swing::text::JTextComponent * getComponent();
-public:
-  virtual jint getBlinkRate();
-  virtual void setBlinkRate(jint);
-  virtual jint getDot();
-  virtual void moveDot(jint);
-public: // actually package-private
-  virtual void moveDotImpl(jint);
-public:
-  virtual void setDot(jint);
-public: // actually package-private
-  virtual void setDotImpl(jint);
-  virtual void appear();
-public:
-  virtual jboolean isActive();
-  virtual jboolean isVisible();
-  virtual void setVisible(jboolean);
-public: // actually protected
-  virtual ::javax::swing::text::Highlighter$HighlightPainter * getSelectionPainter();
-  virtual void damage(::java::awt::Rectangle *);
-  virtual void adjustVisibility(::java::awt::Rectangle *);
-private:
-  void initBlinkTimer();
-public: // actually package-private
-  static ::javax::swing::text::JTextComponent * componentWithSelection;
-private:
-  static const jlong serialVersionUID = 4325555698756477346LL;
-public:
-  static const jint ALWAYS_UPDATE = 2;
-  static const jint NEVER_UPDATE = 1;
-  static const jint UPDATE_WHEN_ON_EDT = 0;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::awt::Rectangle)))) policy;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-public: // actually package-private
-  ::javax::swing::event::DocumentListener * documentListener;
-  ::java::beans::PropertyChangeListener * propertyChangeListener;
-  ::javax::swing::text::JTextComponent * textComponent;
-private:
-  jboolean selectionVisible;
-  jint blinkRate;
-  jint dot;
-  jint mark;
-  ::java::awt::Point * magicCaretPosition;
-public: // actually package-private
-  jboolean visible;
-  jboolean active;
-private:
-  ::java::lang::Object * highlightEntry;
-  ::javax::swing::Timer * blinkTimer;
-  ::javax::swing::text::DefaultCaret$BlinkTimerListener * blinkListener;
-public: // actually package-private
-  ::javax::swing::text::NavigationFilter$FilterBypass * bypass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultCaret__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BackwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$BackwardAction.h
deleted file mode 100644
index 7161c7a53f0..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$BackwardAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$BackwardAction__
-#define __javax_swing_text_DefaultEditorKit$BackwardAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$BackwardAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$BackwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$BackwardAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$BackwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeepAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeepAction.h
deleted file mode 100644
index dfeb6a8707b..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$BeepAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$BeepAction__
-#define __javax_swing_text_DefaultEditorKit$BeepAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$BeepAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$BeepAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$BeepAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$BeepAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeginAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeginAction.h
deleted file mode 100644
index c208fa266e2..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$BeginAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$BeginAction__
-#define __javax_swing_text_DefaultEditorKit$BeginAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$BeginAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$BeginAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$BeginAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$BeginAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeginLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeginLineAction.h
deleted file mode 100644
index 5e253e7dca4..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$BeginLineAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$BeginLineAction__
-#define __javax_swing_text_DefaultEditorKit$BeginLineAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$BeginLineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$BeginLineAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$BeginLineAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$BeginLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$BeginWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$BeginWordAction.h
deleted file mode 100644
index 24494a80116..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$BeginWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$BeginWordAction__
-#define __javax_swing_text_DefaultEditorKit$BeginWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$BeginWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$BeginWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$BeginWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$BeginWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$CopyAction.h b/libjava/javax/swing/text/DefaultEditorKit$CopyAction.h
deleted file mode 100644
index 30e8dc2f01d..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$CopyAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$CopyAction__
-#define __javax_swing_text_DefaultEditorKit$CopyAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$CopyAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$CopyAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$CopyAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$CopyAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$CutAction.h b/libjava/javax/swing/text/DefaultEditorKit$CutAction.h
deleted file mode 100644
index 603d1685726..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$CutAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$CutAction__
-#define __javax_swing_text_DefaultEditorKit$CutAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$CutAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$CutAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$CutAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$CutAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.h b/libjava/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.h
deleted file mode 100644
index a467b07c05b..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$DefaultKeyTypedAction__
-#define __javax_swing_text_DefaultEditorKit$DefaultKeyTypedAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$DefaultKeyTypedAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$DefaultKeyTypedAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$DefaultKeyTypedAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$DefaultKeyTypedAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.h b/libjava/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.h
deleted file mode 100644
index b623fa55fac..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$DeleteNextCharAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$DeleteNextCharAction__
-#define __javax_swing_text_DefaultEditorKit$DeleteNextCharAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$DeleteNextCharAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$DeleteNextCharAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$DeleteNextCharAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$DeleteNextCharAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.h b/libjava/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.h
deleted file mode 100644
index 9e4f2bf6d18..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$DeletePrevCharAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$DeletePrevCharAction__
-#define __javax_swing_text_DefaultEditorKit$DeletePrevCharAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$DeletePrevCharAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$DeletePrevCharAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$DeletePrevCharAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$DeletePrevCharAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$DownAction.h b/libjava/javax/swing/text/DefaultEditorKit$DownAction.h
deleted file mode 100644
index facbd833be1..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$DownAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$DownAction__
-#define __javax_swing_text_DefaultEditorKit$DownAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$VerticalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$DownAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$DownAction : public ::javax::swing::text::TextAction$VerticalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$DownAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$DownAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$EndAction.h b/libjava/javax/swing/text/DefaultEditorKit$EndAction.h
deleted file mode 100644
index b2cedfe98f3..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$EndAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$EndAction__
-#define __javax_swing_text_DefaultEditorKit$EndAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$EndAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$EndAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$EndAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$EndAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$EndLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$EndLineAction.h
deleted file mode 100644
index 907656700f0..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$EndLineAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$EndLineAction__
-#define __javax_swing_text_DefaultEditorKit$EndLineAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$EndLineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$EndLineAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$EndLineAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$EndLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$EndWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$EndWordAction.h
deleted file mode 100644
index 252a77ab14a..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$EndWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$EndWordAction__
-#define __javax_swing_text_DefaultEditorKit$EndWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$EndWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$EndWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$EndWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$EndWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$ForwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$ForwardAction.h
deleted file mode 100644
index 3c3c7cfd18c..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$ForwardAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$ForwardAction__
-#define __javax_swing_text_DefaultEditorKit$ForwardAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$ForwardAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$ForwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$ForwardAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$ForwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$InsertBreakAction.h b/libjava/javax/swing/text/DefaultEditorKit$InsertBreakAction.h
deleted file mode 100644
index 173b4b18d79..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$InsertBreakAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$InsertBreakAction__
-#define __javax_swing_text_DefaultEditorKit$InsertBreakAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$InsertBreakAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$InsertBreakAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$InsertBreakAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$InsertBreakAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$InsertContentAction.h b/libjava/javax/swing/text/DefaultEditorKit$InsertContentAction.h
deleted file mode 100644
index 98d77fa17fd..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$InsertContentAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$InsertContentAction__
-#define __javax_swing_text_DefaultEditorKit$InsertContentAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$InsertContentAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$InsertContentAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$InsertContentAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$InsertContentAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$InsertTabAction.h b/libjava/javax/swing/text/DefaultEditorKit$InsertTabAction.h
deleted file mode 100644
index 6201db686f6..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$InsertTabAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$InsertTabAction__
-#define __javax_swing_text_DefaultEditorKit$InsertTabAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$InsertTabAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$InsertTabAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$InsertTabAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$InsertTabAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$NextWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$NextWordAction.h
deleted file mode 100644
index eedad5f0dbf..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$NextWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$NextWordAction__
-#define __javax_swing_text_DefaultEditorKit$NextWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$NextWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$NextWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$NextWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$NextWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$PasteAction.h b/libjava/javax/swing/text/DefaultEditorKit$PasteAction.h
deleted file mode 100644
index 2a0764c7a9f..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$PasteAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$PasteAction__
-#define __javax_swing_text_DefaultEditorKit$PasteAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$PasteAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$PasteAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  DefaultEditorKit$PasteAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$PasteAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$PreviousWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$PreviousWordAction.h
deleted file mode 100644
index 6d7f529cd53..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$PreviousWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$PreviousWordAction__
-#define __javax_swing_text_DefaultEditorKit$PreviousWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$PreviousWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$PreviousWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$PreviousWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$PreviousWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectAllAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectAllAction.h
deleted file mode 100644
index 7286cd079ce..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectAllAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectAllAction__
-#define __javax_swing_text_DefaultEditorKit$SelectAllAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectAllAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectAllAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectAllAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectAllAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectLineAction.h
deleted file mode 100644
index 390f7db2823..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectLineAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectLineAction__
-#define __javax_swing_text_DefaultEditorKit$SelectLineAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectLineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectLineAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectLineAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectWordAction.h
deleted file mode 100644
index bc33182b611..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectWordAction__
-#define __javax_swing_text_DefaultEditorKit$SelectWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.h
deleted file mode 100644
index 3417cebb222..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionBackwardAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionBackwardAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionBackwardAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$SelectionBackwardAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionBackwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionBackwardAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionBackwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginAction.h
deleted file mode 100644
index e0f68eb2e40..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionBeginAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionBeginAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionBeginAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionBeginAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionBeginAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionBeginAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.h
deleted file mode 100644
index d8b57669c8e..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginLineAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionBeginLineAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionBeginLineAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionBeginLineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionBeginLineAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionBeginLineAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionBeginLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.h
deleted file mode 100644
index fa85b345129..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionBeginWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionBeginWordAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionBeginWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionBeginWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionBeginWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionBeginWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionBeginWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionDownAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionDownAction.h
deleted file mode 100644
index 5e005df8bfb..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionDownAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionDownAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionDownAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$VerticalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$SelectionDownAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionDownAction : public ::javax::swing::text::TextAction$VerticalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionDownAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionDownAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndAction.h
deleted file mode 100644
index b1b03cdbb3d..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionEndAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionEndAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionEndAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionEndAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionEndAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionEndAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.h
deleted file mode 100644
index 2ff14cb78d7..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndLineAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionEndLineAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionEndLineAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionEndLineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionEndLineAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionEndLineAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionEndLineAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.h
deleted file mode 100644
index 5bb3b47c2fa..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionEndWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionEndWordAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionEndWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionEndWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionEndWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionEndWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionEndWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionForwardAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionForwardAction.h
deleted file mode 100644
index 8447af6a3d7..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionForwardAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionForwardAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionForwardAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$HorizontalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$SelectionForwardAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionForwardAction : public ::javax::swing::text::TextAction$HorizontalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionForwardAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionForwardAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.h
deleted file mode 100644
index 1647d7c4277..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionNextWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionNextWordAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionNextWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionNextWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionNextWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionNextWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionNextWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.h
deleted file mode 100644
index 5257dafe636..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionPreviousWordAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionPreviousWordAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionPreviousWordAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultEditorKit$SelectionPreviousWordAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionPreviousWordAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionPreviousWordAction();
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionPreviousWordAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$SelectionUpAction.h b/libjava/javax/swing/text/DefaultEditorKit$SelectionUpAction.h
deleted file mode 100644
index 9d5b3f41ca1..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$SelectionUpAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$SelectionUpAction__
-#define __javax_swing_text_DefaultEditorKit$SelectionUpAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$VerticalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$SelectionUpAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$SelectionUpAction : public ::javax::swing::text::TextAction$VerticalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$SelectionUpAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$SelectionUpAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit$UpAction.h b/libjava/javax/swing/text/DefaultEditorKit$UpAction.h
deleted file mode 100644
index e2cc3eaa7e9..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit$UpAction.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit$UpAction__
-#define __javax_swing_text_DefaultEditorKit$UpAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction$VerticalMovementAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit$UpAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit$UpAction : public ::javax::swing::text::TextAction$VerticalMovementAction
-{
-
-public: // actually package-private
-  DefaultEditorKit$UpAction();
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit$UpAction__
diff --git a/libjava/javax/swing/text/DefaultEditorKit.h b/libjava/javax/swing/text/DefaultEditorKit.h
deleted file mode 100644
index 281960937e9..00000000000
--- a/libjava/javax/swing/text/DefaultEditorKit.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultEditorKit__
-#define __javax_swing_text_DefaultEditorKit__
-
-#pragma interface
-
-#include <javax/swing/text/EditorKit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace text
-      {
-          class Caret;
-          class DefaultEditorKit;
-          class Document;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultEditorKit : public ::javax::swing::text::EditorKit
-{
-
-public:
-  DefaultEditorKit();
-  virtual ::javax::swing::text::Caret * createCaret();
-  virtual ::javax::swing::text::Document * createDefaultDocument();
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual ::java::lang::String * getContentType();
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual void read(::java::io::InputStream *, ::javax::swing::text::Document *, jint);
-  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint);
-  virtual void write(::java::io::OutputStream *, ::javax::swing::text::Document *, jint, jint);
-  virtual void write(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint);
-private:
-  static const jlong serialVersionUID = 9017245433028523428LL;
-public:
-  static ::java::lang::String * backwardAction;
-  static ::java::lang::String * beepAction;
-  static ::java::lang::String * beginAction;
-  static ::java::lang::String * beginLineAction;
-  static ::java::lang::String * beginParagraphAction;
-  static ::java::lang::String * beginWordAction;
-  static ::java::lang::String * copyAction;
-  static ::java::lang::String * cutAction;
-  static ::java::lang::String * defaultKeyTypedAction;
-  static ::java::lang::String * deleteNextCharAction;
-  static ::java::lang::String * deletePrevCharAction;
-  static ::java::lang::String * downAction;
-  static ::java::lang::String * endAction;
-  static ::java::lang::String * endLineAction;
-  static ::java::lang::String * EndOfLineStringProperty;
-  static ::java::lang::String * endParagraphAction;
-  static ::java::lang::String * endWordAction;
-  static ::java::lang::String * forwardAction;
-  static ::java::lang::String * insertBreakAction;
-  static ::java::lang::String * insertContentAction;
-  static ::java::lang::String * insertTabAction;
-  static ::java::lang::String * nextWordAction;
-  static ::java::lang::String * pageDownAction;
-  static ::java::lang::String * pageUpAction;
-  static ::java::lang::String * pasteAction;
-  static ::java::lang::String * previousWordAction;
-  static ::java::lang::String * readOnlyAction;
-  static ::java::lang::String * selectAllAction;
-  static ::java::lang::String * selectionBackwardAction;
-  static ::java::lang::String * selectionBeginAction;
-  static ::java::lang::String * selectionBeginLineAction;
-  static ::java::lang::String * selectionBeginParagraphAction;
-  static ::java::lang::String * selectionBeginWordAction;
-  static ::java::lang::String * selectionDownAction;
-  static ::java::lang::String * selectionEndAction;
-  static ::java::lang::String * selectionEndLineAction;
-  static ::java::lang::String * selectionEndParagraphAction;
-  static ::java::lang::String * selectionEndWordAction;
-  static ::java::lang::String * selectionForwardAction;
-  static ::java::lang::String * selectionNextWordAction;
-  static ::java::lang::String * selectionPreviousWordAction;
-  static ::java::lang::String * selectionUpAction;
-  static ::java::lang::String * selectLineAction;
-  static ::java::lang::String * selectParagraphAction;
-  static ::java::lang::String * selectWordAction;
-  static ::java::lang::String * upAction;
-  static ::java::lang::String * writableAction;
-private:
-  static JArray< ::javax::swing::Action * > * defaultActions;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultEditorKit__
diff --git a/libjava/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.h b/libjava/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.h
deleted file mode 100644
index 090ade49349..00000000000
--- a/libjava/javax/swing/text/DefaultFormatter$FormatterDocumentFilter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultFormatter$FormatterDocumentFilter__
-#define __javax_swing_text_DefaultFormatter$FormatterDocumentFilter__
-
-#pragma interface
-
-#include <javax/swing/text/DocumentFilter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class DefaultFormatter;
-          class DefaultFormatter$FormatterDocumentFilter;
-          class DocumentFilter$FilterBypass;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultFormatter$FormatterDocumentFilter : public ::javax::swing::text::DocumentFilter
-{
-
-  DefaultFormatter$FormatterDocumentFilter(::javax::swing::text::DefaultFormatter *);
-public:
-  virtual void remove(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint);
-  virtual void insertString(::javax::swing::text::DocumentFilter$FilterBypass *, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-  virtual void replace(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-private:
-  void commitIfAllowed();
-  void checkValidInput();
-public: // actually package-private
-  DefaultFormatter$FormatterDocumentFilter(::javax::swing::text::DefaultFormatter *, ::javax::swing::text::DefaultFormatter$FormatterDocumentFilter *);
-  ::javax::swing::text::DefaultFormatter * __attribute__((aligned(__alignof__( ::javax::swing::text::DocumentFilter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultFormatter$FormatterDocumentFilter__
diff --git a/libjava/javax/swing/text/DefaultFormatter.h b/libjava/javax/swing/text/DefaultFormatter.h
deleted file mode 100644
index 858a1efcac8..00000000000
--- a/libjava/javax/swing/text/DefaultFormatter.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultFormatter__
-#define __javax_swing_text_DefaultFormatter__
-
-#pragma interface
-
-#include <javax/swing/JFormattedTextField$AbstractFormatter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFormattedTextField;
-      namespace text
-      {
-          class DefaultFormatter;
-          class DocumentFilter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultFormatter : public ::javax::swing::JFormattedTextField$AbstractFormatter
-{
-
-public:
-  DefaultFormatter();
-  virtual void install(::javax::swing::JFormattedTextField *);
-  virtual jboolean getCommitsOnValidEdit();
-  virtual void setCommitsOnValidEdit(jboolean);
-  virtual jboolean getOverwriteMode();
-  virtual void setOverwriteMode(jboolean);
-  virtual jboolean getAllowsInvalid();
-  virtual void setAllowsInvalid(jboolean);
-  virtual ::java::lang::Class * getValueClass();
-  virtual void setValueClass(::java::lang::Class *);
-  virtual ::java::lang::Object * stringToValue(::java::lang::String *);
-  virtual ::java::lang::String * valueToString(::java::lang::Object *);
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual ::javax::swing::text::DocumentFilter * getDocumentFilter();
-public: // actually package-private
-  static ::javax::swing::JFormattedTextField * access$0(::javax::swing::text::DefaultFormatter *);
-private:
-  static const jlong serialVersionUID = -355018354457785329LL;
-public: // actually package-private
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JFormattedTextField$AbstractFormatter)))) commitsOnValidEdit;
-  jboolean overwriteMode;
-  jboolean allowsInvalid;
-  ::java::lang::Class * valueClass;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultFormatter__
diff --git a/libjava/javax/swing/text/DefaultFormatterFactory.h b/libjava/javax/swing/text/DefaultFormatterFactory.h
deleted file mode 100644
index 8e39926a666..00000000000
--- a/libjava/javax/swing/text/DefaultFormatterFactory.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultFormatterFactory__
-#define __javax_swing_text_DefaultFormatterFactory__
-
-#pragma interface
-
-#include <javax/swing/JFormattedTextField$AbstractFormatterFactory.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFormattedTextField;
-        class JFormattedTextField$AbstractFormatter;
-      namespace text
-      {
-          class DefaultFormatterFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultFormatterFactory : public ::javax::swing::JFormattedTextField$AbstractFormatterFactory
-{
-
-public:
-  DefaultFormatterFactory();
-  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *);
-  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *);
-  DefaultFormatterFactory(::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *, ::javax::swing::JFormattedTextField$AbstractFormatter *);
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getDefaultFormatter();
-  virtual void setDefaultFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getDisplayFormatter();
-  virtual void setDisplayFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getEditFormatter();
-  virtual void setEditFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getNullFormatter();
-  virtual void setNullFormatter(::javax::swing::JFormattedTextField$AbstractFormatter *);
-  virtual ::javax::swing::JFormattedTextField$AbstractFormatter * getFormatter(::javax::swing::JFormattedTextField *);
-public: // actually package-private
-  ::javax::swing::JFormattedTextField$AbstractFormatter * __attribute__((aligned(__alignof__( ::javax::swing::JFormattedTextField$AbstractFormatterFactory)))) defaultFormatter;
-  ::javax::swing::JFormattedTextField$AbstractFormatter * editFormatter;
-  ::javax::swing::JFormattedTextField$AbstractFormatter * displayFormatter;
-  ::javax::swing::JFormattedTextField$AbstractFormatter * nullFormatter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultFormatterFactory__
diff --git a/libjava/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.h b/libjava/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.h
deleted file mode 100644
index 0baecc9c081..00000000000
--- a/libjava/javax/swing/text/DefaultHighlighter$DefaultHighlightPainter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultHighlighter$DefaultHighlightPainter__
-#define __javax_swing_text_DefaultHighlighter$DefaultHighlightPainter__
-
-#pragma interface
-
-#include <javax/swing/text/LayeredHighlighter$LayerPainter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultHighlighter$DefaultHighlightPainter;
-          class JTextComponent;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultHighlighter$DefaultHighlightPainter : public ::javax::swing::text::LayeredHighlighter$LayerPainter
-{
-
-public:
-  DefaultHighlighter$DefaultHighlightPainter(::java::awt::Color *);
-  virtual ::java::awt::Color * getColor();
-  virtual void paint(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *);
-  virtual ::java::awt::Shape * paintLayer(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *);
-private:
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::LayeredHighlighter$LayerPainter)))) color;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultHighlighter$DefaultHighlightPainter__
diff --git a/libjava/javax/swing/text/DefaultHighlighter$HighlightEntry.h b/libjava/javax/swing/text/DefaultHighlighter$HighlightEntry.h
deleted file mode 100644
index 439d60491b2..00000000000
--- a/libjava/javax/swing/text/DefaultHighlighter$HighlightEntry.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultHighlighter$HighlightEntry__
-#define __javax_swing_text_DefaultHighlighter$HighlightEntry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultHighlighter;
-          class DefaultHighlighter$HighlightEntry;
-          class Highlighter$HighlightPainter;
-          class Position;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultHighlighter$HighlightEntry : public ::java::lang::Object
-{
-
-public:
-  DefaultHighlighter$HighlightEntry(::javax::swing::text::DefaultHighlighter *, ::javax::swing::text::Position *, ::javax::swing::text::Position *, ::javax::swing::text::Highlighter$HighlightPainter *);
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-  virtual ::javax::swing::text::Highlighter$HighlightPainter * getPainter();
-public: // actually package-private
-  ::javax::swing::text::Position * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p0;
-  ::javax::swing::text::Position * p1;
-  ::javax::swing::text::Highlighter$HighlightPainter * painter;
-  ::javax::swing::text::DefaultHighlighter * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultHighlighter$HighlightEntry__
diff --git a/libjava/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.h b/libjava/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.h
deleted file mode 100644
index 15220e242ab..00000000000
--- a/libjava/javax/swing/text/DefaultHighlighter$LayerHighlightEntry.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultHighlighter$LayerHighlightEntry__
-#define __javax_swing_text_DefaultHighlighter$LayerHighlightEntry__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultHighlighter$HighlightEntry.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultHighlighter;
-          class DefaultHighlighter$LayerHighlightEntry;
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-          class Position;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultHighlighter$LayerHighlightEntry : public ::javax::swing::text::DefaultHighlighter$HighlightEntry
-{
-
-public: // actually package-private
-  DefaultHighlighter$LayerHighlightEntry(::javax::swing::text::DefaultHighlighter *, ::javax::swing::text::Position *, ::javax::swing::text::Position *, ::javax::swing::text::Highlighter$HighlightPainter *);
-  virtual void paintLayeredHighlight(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *);
-  ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultHighlighter$HighlightEntry)))) paintRect;
-  ::javax::swing::text::DefaultHighlighter * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultHighlighter$LayerHighlightEntry__
diff --git a/libjava/javax/swing/text/DefaultHighlighter.h b/libjava/javax/swing/text/DefaultHighlighter.h
deleted file mode 100644
index a237a131280..00000000000
--- a/libjava/javax/swing/text/DefaultHighlighter.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultHighlighter__
-#define __javax_swing_text_DefaultHighlighter__
-
-#pragma interface
-
-#include <javax/swing/text/LayeredHighlighter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultHighlighter;
-          class Highlighter$Highlight;
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-          class LayeredHighlighter$LayerPainter;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultHighlighter : public ::javax::swing::text::LayeredHighlighter
-{
-
-public:
-  DefaultHighlighter();
-  virtual jboolean getDrawsLayeredHighlights();
-  virtual void setDrawsLayeredHighlights(jboolean);
-private:
-  void checkPositions(jint, jint);
-public:
-  virtual void install(::javax::swing::text::JTextComponent *);
-  virtual void deinstall(::javax::swing::text::JTextComponent *);
-  virtual ::java::lang::Object * addHighlight(jint, jint, ::javax::swing::text::Highlighter$HighlightPainter *);
-  virtual void removeHighlight(::java::lang::Object *);
-  virtual void removeAllHighlights();
-  virtual JArray< ::javax::swing::text::Highlighter$Highlight * > * getHighlights();
-  virtual void changeHighlight(::java::lang::Object *, jint, jint);
-  virtual void paintLayeredHighlights(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *);
-  virtual void paint(::java::awt::Graphics *);
-  static ::javax::swing::text::LayeredHighlighter$LayerPainter * DefaultPainter;
-private:
-  ::javax::swing::text::JTextComponent * __attribute__((aligned(__alignof__( ::javax::swing::text::LayeredHighlighter)))) textComponent;
-  ::java::util::ArrayList * highlights;
-  jboolean drawsLayeredHighlights;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultHighlighter__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.h b/libjava/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.h
deleted file mode 100644
index ebaf8caa869..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$AttributeUndoableEdit.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$AttributeUndoableEdit__
-#define __javax_swing_text_DefaultStyledDocument$AttributeUndoableEdit__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class DefaultStyledDocument$AttributeUndoableEdit;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$AttributeUndoableEdit : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  DefaultStyledDocument$AttributeUndoableEdit(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jboolean);
-  virtual void undo();
-  virtual void redo();
-public: // actually protected
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) copy;
-  ::javax::swing::text::AttributeSet * newAttributes;
-  jboolean isReplacing;
-  ::javax::swing::text::Element * element;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$AttributeUndoableEdit__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$Edit.h b/libjava/javax/swing/text/DefaultStyledDocument$Edit.h
deleted file mode 100644
index 7d63ab29ef0..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$Edit.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$Edit__
-#define __javax_swing_text_DefaultStyledDocument$Edit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$Edit;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$Edit : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::javax::swing::text::Element * > * getRemovedElements();
-  virtual JArray< ::javax::swing::text::Element * > * getAddedElements();
-private:
-  jboolean contains(::java::util::Vector *, ::javax::swing::text::Element *);
-public:
-  virtual void addRemovedElement(::javax::swing::text::Element *);
-  virtual void addRemovedElements(JArray< ::javax::swing::text::Element * > *);
-  virtual void addAddedElement(::javax::swing::text::Element *);
-  virtual void addAddedElements(JArray< ::javax::swing::text::Element * > *);
-  DefaultStyledDocument$Edit(::javax::swing::text::DefaultStyledDocument *, ::javax::swing::text::Element *, jint, JArray< ::javax::swing::text::Element * > *, JArray< ::javax::swing::text::Element * > *);
-public: // actually package-private
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) e;
-  jint index;
-  ::java::util::Vector * removed;
-  ::java::util::Vector * added;
-  ::javax::swing::text::DefaultStyledDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$Edit__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.h b/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.h
deleted file mode 100644
index 628569976a2..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer$Edit.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$ElementBuffer$Edit__
-#define __javax_swing_text_DefaultStyledDocument$ElementBuffer$Edit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultStyledDocument$ElementBuffer;
-          class DefaultStyledDocument$ElementBuffer$Edit;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$ElementBuffer$Edit : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultStyledDocument$ElementBuffer$Edit(::javax::swing::text::DefaultStyledDocument$ElementBuffer *, ::javax::swing::text::Element *, jint);
-  DefaultStyledDocument$ElementBuffer$Edit(::javax::swing::text::DefaultStyledDocument$ElementBuffer *, ::javax::swing::text::Element *, jint, jboolean);
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) e;
-  jint index;
-  ::java::util::ArrayList * removed;
-  ::java::util::ArrayList * added;
-  jboolean isFracture;
-  ::javax::swing::text::DefaultStyledDocument$ElementBuffer * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$ElementBuffer$Edit__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer.h b/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer.h
deleted file mode 100644
index 17151db0e8b..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$ElementBuffer.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$ElementBuffer__
-#define __javax_swing_text_DefaultStyledDocument$ElementBuffer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$DefaultDocumentEvent;
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$ElementBuffer;
-          class DefaultStyledDocument$ElementBuffer$Edit;
-          class DefaultStyledDocument$ElementSpec;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$ElementBuffer : public ::java::lang::Object
-{
-
-public:
-  DefaultStyledDocument$ElementBuffer(::javax::swing::text::DefaultStyledDocument *, ::javax::swing::text::Element *);
-  virtual ::javax::swing::text::Element * getRootElement();
-  virtual void remove(jint, jint, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public: // actually protected
-  virtual void removeUpdate();
-private:
-  jboolean removeElements(::javax::swing::text::Element *, jint, jint);
-public: // actually package-private
-  virtual void create(jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-private:
-  jboolean canJoin(::javax::swing::text::Element *, ::javax::swing::text::Element *);
-  ::javax::swing::text::Element * join(::javax::swing::text::Element *, ::javax::swing::text::Element *, ::javax::swing::text::Element *, jint, jint);
-public: // actually protected
-  virtual void changeUpdate();
-public:
-  virtual void change(jint, jint, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-  virtual ::javax::swing::text::Element * clone(::javax::swing::text::Element *, ::javax::swing::text::Element *);
-private:
-  ::javax::swing::text::Element * cloneAsNecessary(::javax::swing::text::Element *, ::javax::swing::text::Element *, jint, jint);
-public:
-  virtual void insert(jint, jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *, ::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-private:
-  void prepareEdit(jint, jint);
-  void finishEdit(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public: // actually protected
-  virtual void insertUpdate(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-private:
-  void pop();
-  void insertElement(::javax::swing::text::DefaultStyledDocument$ElementSpec *);
-  void insertFirstContentTag(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-  void insertContentTag(::javax::swing::text::DefaultStyledDocument$ElementSpec *, ::javax::swing::text::DefaultStyledDocument$ElementBuffer$Edit *);
-  void createFracture(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-  void fracture(jint);
-  void recreate(jint, jint);
-  ::javax::swing::text::Element * recreateFracturedElement(::javax::swing::text::Element *, ::javax::swing::text::Element *);
-  jboolean split(jint, jint);
-  static const jlong serialVersionUID = 1688745877691146623LL;
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) root;
-  jint offset;
-  jint endOffset;
-  jint length;
-  jint pos;
-  ::javax::swing::text::Element * fracturedParent;
-  ::javax::swing::text::Element * fracturedChild;
-  jboolean createdFracture;
-  ::java::util::Stack * elementStack;
-  JArray< ::javax::swing::text::DefaultStyledDocument$ElementBuffer$Edit * > * insertPath;
-  jboolean recreateLeafs;
-  ::java::util::ArrayList * edits;
-  jboolean offsetLastIndex;
-  jboolean offsetLastIndexReplace;
-public: // actually package-private
-  ::javax::swing::text::DefaultStyledDocument * this$0;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$ElementBuffer__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$ElementSpec.h b/libjava/javax/swing/text/DefaultStyledDocument$ElementSpec.h
deleted file mode 100644
index 7c2433411b6..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$ElementSpec.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$ElementSpec__
-#define __javax_swing_text_DefaultStyledDocument$ElementSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class DefaultStyledDocument$ElementSpec;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$ElementSpec : public ::java::lang::Object
-{
-
-public:
-  DefaultStyledDocument$ElementSpec(::javax::swing::text::AttributeSet *, jshort);
-  DefaultStyledDocument$ElementSpec(::javax::swing::text::AttributeSet *, jshort, jint);
-  DefaultStyledDocument$ElementSpec(::javax::swing::text::AttributeSet *, jshort, JArray< jchar > *, jint, jint);
-  virtual void setType(jshort);
-  virtual jshort getType();
-  virtual void setDirection(jshort);
-  virtual jshort getDirection();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual JArray< jchar > * getArray();
-  virtual jint getOffset();
-  virtual jint getLength();
-  virtual ::java::lang::String * toString();
-  static const jshort StartTagType = 1;
-  static const jshort EndTagType = 2;
-  static const jshort ContentType = 3;
-  static const jshort JoinPreviousDirection = 4;
-  static const jshort JoinNextDirection = 5;
-  static const jshort OriginateDirection = 6;
-  static const jshort JoinFractureDirection = 7;
-public: // actually package-private
-  jshort __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  jshort direction;
-  jint offset;
-  jint length;
-  JArray< jchar > * content;
-  ::javax::swing::text::AttributeSet * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$ElementSpec__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$SectionElement.h b/libjava/javax/swing/text/DefaultStyledDocument$SectionElement.h
deleted file mode 100644
index 969238dc39d..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$SectionElement.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$SectionElement__
-#define __javax_swing_text_DefaultStyledDocument$SectionElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$BranchElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$SectionElement;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$SectionElement : public ::javax::swing::text::AbstractDocument$BranchElement
-{
-
-public:
-  DefaultStyledDocument$SectionElement(::javax::swing::text::DefaultStyledDocument *);
-  virtual ::java::lang::String * getName();
-public: // actually package-private
-  ::javax::swing::text::DefaultStyledDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$BranchElement)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$SectionElement__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$StyleChangeListener.h b/libjava/javax/swing/text/DefaultStyledDocument$StyleChangeListener.h
deleted file mode 100644
index e3095acf5b6..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$StyleChangeListener.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$StyleChangeListener__
-#define __javax_swing_text_DefaultStyledDocument$StyleChangeListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace text
-      {
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$StyleChangeListener;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$StyleChangeListener : public ::java::lang::Object
-{
-
-  DefaultStyledDocument$StyleChangeListener(::javax::swing::text::DefaultStyledDocument *);
-public:
-  virtual void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  DefaultStyledDocument$StyleChangeListener(::javax::swing::text::DefaultStyledDocument *, ::javax::swing::text::DefaultStyledDocument$StyleChangeListener *);
-  ::javax::swing::text::DefaultStyledDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$StyleChangeListener__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument.h b/libjava/javax/swing/text/DefaultStyledDocument.h
deleted file mode 100644
index 8db689f6926..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument__
-#define __javax_swing_text_DefaultStyledDocument__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$AbstractElement;
-          class AbstractDocument$Content;
-          class AbstractDocument$DefaultDocumentEvent;
-          class AttributeSet;
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$ElementBuffer;
-          class DefaultStyledDocument$ElementSpec;
-          class DefaultStyledDocument$StyleChangeListener;
-          class Element;
-          class Style;
-          class StyleContext;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument : public ::javax::swing::text::AbstractDocument
-{
-
-public:
-  DefaultStyledDocument();
-  DefaultStyledDocument(::javax::swing::text::StyleContext *);
-  DefaultStyledDocument(::javax::swing::text::AbstractDocument$Content *, ::javax::swing::text::StyleContext *);
-  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *);
-public: // actually protected
-  virtual ::javax::swing::text::AbstractDocument$AbstractElement * createDefaultRoot();
-public:
-  virtual ::javax::swing::text::Element * getCharacterElement(jint);
-  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::Element * getDefaultRootElement();
-  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *);
-  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::Style * getLogicalStyle(jint);
-  virtual ::javax::swing::text::Element * getParagraphElement(jint);
-  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *);
-  virtual void removeStyle(::java::lang::String *);
-  virtual void setCharacterAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean);
-  virtual void setLogicalStyle(jint, ::javax::swing::text::Style *);
-  virtual void setParagraphAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean);
-public: // actually protected
-  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
-private:
-  jshort insertAfterNewline(::javax::swing::text::Element *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, ::java::util::ArrayList *, jint, jint);
-public: // actually package-private
-  virtual jshort handleInsertAfterNewline(::java::util::Vector *, jint, jint, ::javax::swing::text::Element *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-public: // actually protected
-  virtual void removeUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public:
-  virtual ::java::util::Enumeration * getStyleNames();
-public: // actually protected
-  virtual void styleChanged(::javax::swing::text::Style *);
-  virtual void insert(jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-  virtual void create(JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-private:
-  static const jlong serialVersionUID = 940485415728614849LL;
-public:
-  static const jint BUFFER_SIZE_DEFAULT = 4096;
-public: // actually protected
-  ::javax::swing::text::DefaultStyledDocument$ElementBuffer * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument)))) buffer;
-private:
-  ::javax::swing::text::DefaultStyledDocument$StyleChangeListener * styleChangeListener;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument__
diff --git a/libjava/javax/swing/text/DefaultTextUI.h b/libjava/javax/swing/text/DefaultTextUI.h
deleted file mode 100644
index 5c211d3040f..00000000000
--- a/libjava/javax/swing/text/DefaultTextUI.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultTextUI__
-#define __javax_swing_text_DefaultTextUI__
-
-#pragma interface
-
-#include <javax/swing/plaf/basic/BasicTextUI.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultTextUI;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultTextUI : public ::javax::swing::plaf::basic::BasicTextUI
-{
-
-public:
-  DefaultTextUI();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultTextUI__
diff --git a/libjava/javax/swing/text/Document.h b/libjava/javax/swing/text/Document.h
deleted file mode 100644
index d68e3e77d89..00000000000
--- a/libjava/javax/swing/text/Document.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Document__
-#define __javax_swing_text_Document__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentListener;
-          class UndoableEditListener;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class Element;
-          class Position;
-          class Segment;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Document : public ::java::lang::Object
-{
-
-public:
-  virtual void addDocumentListener(::javax::swing::event::DocumentListener *) = 0;
-  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
-  virtual ::javax::swing::text::Position * createPosition(jint) = 0;
-  virtual ::javax::swing::text::Element * getDefaultRootElement() = 0;
-  virtual ::javax::swing::text::Position * getEndPosition() = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::Object *) = 0;
-  virtual JArray< ::javax::swing::text::Element * > * getRootElements() = 0;
-  virtual ::javax::swing::text::Position * getStartPosition() = 0;
-  virtual ::java::lang::String * getText(jint, jint) = 0;
-  virtual void getText(jint, jint, ::javax::swing::text::Segment *) = 0;
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
-  virtual void putProperty(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void remove(jint, jint) = 0;
-  virtual void removeDocumentListener(::javax::swing::event::DocumentListener *) = 0;
-  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
-  virtual void render(::java::lang::Runnable *) = 0;
-  static ::java::lang::String * StreamDescriptionProperty;
-  static ::java::lang::String * TitleProperty;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Document__
diff --git a/libjava/javax/swing/text/DocumentFilter$FilterBypass.h b/libjava/javax/swing/text/DocumentFilter$FilterBypass.h
deleted file mode 100644
index 4b5c3589d33..00000000000
--- a/libjava/javax/swing/text/DocumentFilter$FilterBypass.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DocumentFilter$FilterBypass__
-#define __javax_swing_text_DocumentFilter$FilterBypass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class DocumentFilter$FilterBypass;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DocumentFilter$FilterBypass : public ::java::lang::Object
-{
-
-public:
-  DocumentFilter$FilterBypass();
-  virtual ::javax::swing::text::Document * getDocument() = 0;
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
-  virtual void remove(jint, jint) = 0;
-  virtual void replace(jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DocumentFilter$FilterBypass__
diff --git a/libjava/javax/swing/text/DocumentFilter.h b/libjava/javax/swing/text/DocumentFilter.h
deleted file mode 100644
index 106478aff12..00000000000
--- a/libjava/javax/swing/text/DocumentFilter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DocumentFilter__
-#define __javax_swing_text_DocumentFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class DocumentFilter;
-          class DocumentFilter$FilterBypass;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DocumentFilter : public ::java::lang::Object
-{
-
-public:
-  DocumentFilter();
-  virtual void insertString(::javax::swing::text::DocumentFilter$FilterBypass *, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-  virtual void remove(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint);
-  virtual void replace(::javax::swing::text::DocumentFilter$FilterBypass *, jint, jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DocumentFilter__
diff --git a/libjava/javax/swing/text/EditorKit.h b/libjava/javax/swing/text/EditorKit.h
deleted file mode 100644
index eaeef504294..00000000000
--- a/libjava/javax/swing/text/EditorKit.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_EditorKit__
-#define __javax_swing_text_EditorKit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class JEditorPane;
-      namespace text
-      {
-          class Caret;
-          class Document;
-          class EditorKit;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::EditorKit : public ::java::lang::Object
-{
-
-public:
-  EditorKit();
-  virtual ::java::lang::Object * clone();
-  virtual void deinstall(::javax::swing::JEditorPane *);
-  virtual void install(::javax::swing::JEditorPane *);
-  virtual ::javax::swing::text::Caret * createCaret() = 0;
-  virtual ::javax::swing::text::Document * createDefaultDocument() = 0;
-  virtual JArray< ::javax::swing::Action * > * getActions() = 0;
-  virtual ::java::lang::String * getContentType() = 0;
-  virtual ::javax::swing::text::ViewFactory * getViewFactory() = 0;
-  virtual void read(::java::io::InputStream *, ::javax::swing::text::Document *, jint) = 0;
-  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint) = 0;
-  virtual void write(::java::io::OutputStream *, ::javax::swing::text::Document *, jint, jint) = 0;
-  virtual void write(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint) = 0;
-private:
-  static const jlong serialVersionUID = -5044124649345887822LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_EditorKit__
diff --git a/libjava/javax/swing/text/Element.h b/libjava/javax/swing/text/Element.h
deleted file mode 100644
index 6166044c0ec..00000000000
--- a/libjava/javax/swing/text/Element.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Element__
-#define __javax_swing_text_Element__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Element : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::text::AttributeSet * getAttributes() = 0;
-  virtual ::javax::swing::text::Document * getDocument() = 0;
-  virtual ::javax::swing::text::Element * getElement(jint) = 0;
-  virtual jint getElementCount() = 0;
-  virtual jint getElementIndex(jint) = 0;
-  virtual jint getEndOffset() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::swing::text::Element * getParentElement() = 0;
-  virtual jint getStartOffset() = 0;
-  virtual jboolean isLeaf() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Element__
diff --git a/libjava/javax/swing/text/ElementIterator$ElementRef.h b/libjava/javax/swing/text/ElementIterator$ElementRef.h
deleted file mode 100644
index dd2c984c44d..00000000000
--- a/libjava/javax/swing/text/ElementIterator$ElementRef.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ElementIterator$ElementRef__
-#define __javax_swing_text_ElementIterator$ElementRef__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class ElementIterator;
-          class ElementIterator$ElementRef;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ElementIterator$ElementRef : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ElementIterator$ElementRef(::javax::swing::text::ElementIterator *, ::javax::swing::text::Element *);
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) element;
-  jint index;
-  ::javax::swing::text::ElementIterator * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ElementIterator$ElementRef__
diff --git a/libjava/javax/swing/text/ElementIterator.h b/libjava/javax/swing/text/ElementIterator.h
deleted file mode 100644
index 1d963602109..00000000000
--- a/libjava/javax/swing/text/ElementIterator.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ElementIterator__
-#define __javax_swing_text_ElementIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Document;
-          class Element;
-          class ElementIterator;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ElementIterator : public ::java::lang::Object
-{
-
-public:
-  ElementIterator(::javax::swing::text::Document *);
-  ElementIterator(::javax::swing::text::Element *);
-  virtual ::java::lang::Object * clone();
-  virtual ::javax::swing::text::Element * current();
-  virtual jint depth();
-  virtual ::javax::swing::text::Element * first();
-  virtual ::javax::swing::text::Element * next();
-  virtual ::javax::swing::text::Element * previous();
-private:
-  ::javax::swing::text::Element * deepestLeaf(::javax::swing::text::Element *);
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) root;
-  ::java::util::Stack * stack;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ElementIterator__
diff --git a/libjava/javax/swing/text/EmptyAttributeSet$1.h b/libjava/javax/swing/text/EmptyAttributeSet$1.h
deleted file mode 100644
index c4a2173de62..00000000000
--- a/libjava/javax/swing/text/EmptyAttributeSet$1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_EmptyAttributeSet$1__
-#define __javax_swing_text_EmptyAttributeSet$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class EmptyAttributeSet;
-          class EmptyAttributeSet$1;
-      }
-    }
-  }
-}
-
-class javax::swing::text::EmptyAttributeSet$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  EmptyAttributeSet$1(::javax::swing::text::EmptyAttributeSet *);
-public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::javax::swing::text::EmptyAttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_EmptyAttributeSet$1__
diff --git a/libjava/javax/swing/text/EmptyAttributeSet.h b/libjava/javax/swing/text/EmptyAttributeSet.h
deleted file mode 100644
index e0f19294400..00000000000
--- a/libjava/javax/swing/text/EmptyAttributeSet.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_EmptyAttributeSet__
-#define __javax_swing_text_EmptyAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class EmptyAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::EmptyAttributeSet : public ::java::lang::Object
-{
-
-public: // actually package-private
-  EmptyAttributeSet();
-public:
-  jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-  jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  ::javax::swing::text::AttributeSet * copyAttributes();
-  ::java::lang::Object * getAttribute(::java::lang::Object *);
-  jint getAttributeCount();
-  ::java::util::Enumeration * getAttributeNames();
-  ::javax::swing::text::AttributeSet * getResolveParent();
-  jboolean isDefined(::java::lang::Object *);
-  jboolean isEqual(::javax::swing::text::AttributeSet *);
-  jboolean equals(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_EmptyAttributeSet__
diff --git a/libjava/javax/swing/text/FieldView$1.h b/libjava/javax/swing/text/FieldView$1.h
deleted file mode 100644
index 8c0ad8e4bfc..00000000000
--- a/libjava/javax/swing/text/FieldView$1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_FieldView$1__
-#define __javax_swing_text_FieldView$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace text
-      {
-          class FieldView;
-          class FieldView$1;
-      }
-    }
-  }
-}
-
-class javax::swing::text::FieldView$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  FieldView$1(::javax::swing::text::FieldView *);
-public:
-  void stateChanged(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::text::FieldView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_FieldView$1__
diff --git a/libjava/javax/swing/text/FieldView.h b/libjava/javax/swing/text/FieldView.h
deleted file mode 100644
index 54cf4fb8272..00000000000
--- a/libjava/javax/swing/text/FieldView.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_FieldView__
-#define __javax_swing_text_FieldView__
-
-#pragma interface
-
-#include <javax/swing/text/PlainView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class FontMetrics;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class BoundedRangeModel;
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class FieldView;
-          class Position$Bias;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::FieldView : public ::javax::swing::text::PlainView
-{
-
-public:
-  FieldView(::javax::swing::text::Element *);
-private:
-  void checkContainer();
-  void updateVisibility();
-public: // actually protected
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-  virtual ::java::awt::Shape * adjustAllocation(::java::awt::Shape *);
-public:
-  virtual jfloat getPreferredSpan(jint);
-private:
-  jfloat calculateHorizontalSpan();
-public:
-  virtual jint getResizeWeight(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually package-private
-  ::javax::swing::BoundedRangeModel * __attribute__((aligned(__alignof__( ::javax::swing::text::PlainView)))) horizontalVisibility;
-  jfloat cachedSpan;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_FieldView__
diff --git a/libjava/javax/swing/text/FlowView$FlowStrategy.h b/libjava/javax/swing/text/FlowView$FlowStrategy.h
deleted file mode 100644
index c9d567d2f1b..00000000000
--- a/libjava/javax/swing/text/FlowView$FlowStrategy.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_FlowView$FlowStrategy__
-#define __javax_swing_text_FlowView$FlowStrategy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class FlowView;
-          class FlowView$FlowStrategy;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::FlowView$FlowStrategy : public ::java::lang::Object
-{
-
-public:
-  FlowView$FlowStrategy();
-  virtual void insertUpdate(::javax::swing::text::FlowView *, ::javax::swing::event::DocumentEvent *, ::java::awt::Rectangle *);
-  virtual void removeUpdate(::javax::swing::text::FlowView *, ::javax::swing::event::DocumentEvent *, ::java::awt::Rectangle *);
-  virtual void changedUpdate(::javax::swing::text::FlowView *, ::javax::swing::event::DocumentEvent *, ::java::awt::Rectangle *);
-public: // actually protected
-  virtual ::javax::swing::text::View * getLogicalView(::javax::swing::text::FlowView *);
-public:
-  virtual void layout(::javax::swing::text::FlowView *);
-public: // actually protected
-  virtual jint layoutRow(::javax::swing::text::FlowView *, jint, jint);
-  virtual ::javax::swing::text::View * createView(::javax::swing::text::FlowView *, jint, jint, jint);
-  virtual void adjustRow(::javax::swing::text::FlowView *, jint, jint, jint);
-private:
-  jboolean contains(::javax::swing::text::View *, ::javax::swing::text::View *);
-  void reparent(::javax::swing::text::View *, ::javax::swing::text::View *);
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_FlowView$FlowStrategy__
diff --git a/libjava/javax/swing/text/FlowView$LogicalView.h b/libjava/javax/swing/text/FlowView$LogicalView.h
deleted file mode 100644
index 271b4ef4a8e..00000000000
--- a/libjava/javax/swing/text/FlowView$LogicalView.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_FlowView$LogicalView__
-#define __javax_swing_text_FlowView$LogicalView__
-
-#pragma interface
-
-#include <javax/swing/text/CompositeView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class FlowView;
-          class FlowView$LogicalView;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::FlowView$LogicalView : public ::javax::swing::text::CompositeView
-{
-
-public: // actually package-private
-  FlowView$LogicalView(::javax::swing::text::FlowView *, ::javax::swing::text::Element *);
-public:
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-public: // actually protected
-  virtual void childAllocation(jint, ::java::awt::Rectangle *);
-  virtual ::javax::swing::text::View * getViewAtPoint(jint, jint, ::java::awt::Rectangle *);
-  virtual jboolean isAfter(jint, jint, ::java::awt::Rectangle *);
-  virtual jboolean isBefore(jint, jint, ::java::awt::Rectangle *);
-public:
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-public: // actually protected
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual void forwardUpdateToView(::javax::swing::text::View *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual jint getViewIndexAtPosition(jint);
-public: // actually package-private
-  ::javax::swing::text::FlowView * __attribute__((aligned(__alignof__( ::javax::swing::text::CompositeView)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_FlowView$LogicalView__
diff --git a/libjava/javax/swing/text/FlowView.h b/libjava/javax/swing/text/FlowView.h
deleted file mode 100644
index 76535791569..00000000000
--- a/libjava/javax/swing/text/FlowView.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_FlowView__
-#define __javax_swing_text_FlowView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class FlowView;
-          class FlowView$FlowStrategy;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::FlowView : public ::javax::swing::text::BoxView
-{
-
-public:
-  FlowView(::javax::swing::text::Element *, jint);
-  virtual jint getFlowAxis();
-  virtual jint getFlowSpan(jint);
-  virtual jint getFlowStart(jint);
-public: // actually protected
-  virtual ::javax::swing::text::View * createRow() = 0;
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual void layout(jint, jint);
-public:
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually protected
-  virtual jint getViewIndexAtPosition(jint);
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-public: // actually package-private
-  static ::javax::swing::text::FlowView$FlowStrategy * sharedStrategy;
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) layoutSpan;
-  ::javax::swing::text::View * layoutPool;
-  ::javax::swing::text::FlowView$FlowStrategy * strategy;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_FlowView__
diff --git a/libjava/javax/swing/text/GapContent$GapContentPosition.h b/libjava/javax/swing/text/GapContent$GapContentPosition.h
deleted file mode 100644
index a1d7afa6667..00000000000
--- a/libjava/javax/swing/text/GapContent$GapContentPosition.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent$GapContentPosition__
-#define __javax_swing_text_GapContent$GapContentPosition__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$GapContentPosition;
-          class GapContent$Mark;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent$GapContentPosition : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GapContent$GapContentPosition(::javax::swing::text::GapContent *);
-public:
-  virtual jint getOffset();
-public: // actually package-private
-  ::javax::swing::text::GapContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
-  ::javax::swing::text::GapContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent$GapContentPosition__
diff --git a/libjava/javax/swing/text/GapContent$InsertUndo.h b/libjava/javax/swing/text/GapContent$InsertUndo.h
deleted file mode 100644
index f36085d3cb8..00000000000
--- a/libjava/javax/swing/text/GapContent$InsertUndo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent$InsertUndo__
-#define __javax_swing_text_GapContent$InsertUndo__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$InsertUndo;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent$InsertUndo : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  GapContent$InsertUndo(::javax::swing::text::GapContent *, jint, jint);
-  virtual void undo();
-  virtual void redo();
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) where;
-  jint length;
-public: // actually package-private
-  ::java::lang::String * text;
-private:
-  ::java::util::Vector * positions;
-public: // actually package-private
-  ::javax::swing::text::GapContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent$InsertUndo__
diff --git a/libjava/javax/swing/text/GapContent$Mark.h b/libjava/javax/swing/text/GapContent$Mark.h
deleted file mode 100644
index 35671023314..00000000000
--- a/libjava/javax/swing/text/GapContent$Mark.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent$Mark__
-#define __javax_swing_text_GapContent$Mark__
-
-#pragma interface
-
-#include <java/lang/ref/WeakReference.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$GapContentPosition;
-          class GapContent$Mark;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent$Mark : public ::java::lang::ref::WeakReference
-{
-
-public: // actually package-private
-  GapContent$Mark(::javax::swing::text::GapContent *, jint);
-  GapContent$Mark(::javax::swing::text::GapContent *, jint, ::javax::swing::text::GapContent$GapContentPosition *, ::java::lang::ref::ReferenceQueue *);
-  virtual jint getOffset();
-  virtual ::javax::swing::text::GapContent$GapContentPosition * getPosition();
-  jint __attribute__((aligned(__alignof__( ::java::lang::ref::WeakReference)))) mark;
-  ::javax::swing::text::GapContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent$Mark__
diff --git a/libjava/javax/swing/text/GapContent$UndoPosRef.h b/libjava/javax/swing/text/GapContent$UndoPosRef.h
deleted file mode 100644
index bd0629ac8ca..00000000000
--- a/libjava/javax/swing/text/GapContent$UndoPosRef.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent$UndoPosRef__
-#define __javax_swing_text_GapContent$UndoPosRef__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$Mark;
-          class GapContent$UndoPosRef;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent$UndoPosRef : public ::java::lang::Object
-{
-
-public: // actually package-private
-  GapContent$UndoPosRef(::javax::swing::text::GapContent *, ::javax::swing::text::GapContent$Mark *);
-  virtual void reset();
-private:
-  ::javax::swing::text::GapContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
-  jint undoOffset;
-public: // actually package-private
-  ::javax::swing::text::GapContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent$UndoPosRef__
diff --git a/libjava/javax/swing/text/GapContent$UndoRemove.h b/libjava/javax/swing/text/GapContent$UndoRemove.h
deleted file mode 100644
index f5f8d6ae423..00000000000
--- a/libjava/javax/swing/text/GapContent$UndoRemove.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent$UndoRemove__
-#define __javax_swing_text_GapContent$UndoRemove__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$UndoRemove;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent$UndoRemove : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  GapContent$UndoRemove(::javax::swing::text::GapContent *, jint, ::java::lang::String *);
-  virtual void undo();
-  virtual void redo();
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) where;
-public: // actually package-private
-  ::java::lang::String * text;
-private:
-  ::java::util::Vector * positions;
-public: // actually package-private
-  ::javax::swing::text::GapContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent$UndoRemove__
diff --git a/libjava/javax/swing/text/GapContent.h b/libjava/javax/swing/text/GapContent.h
deleted file mode 100644
index 44a26ef5385..00000000000
--- a/libjava/javax/swing/text/GapContent.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GapContent__
-#define __javax_swing_text_GapContent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GapContent;
-          class GapContent$Mark;
-          class Position;
-          class Segment;
-      }
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GapContent : public ::java::lang::Object
-{
-
-public:
-  GapContent();
-  GapContent(jint);
-public: // actually protected
-  virtual ::java::lang::Object * allocateArray(jint);
-  virtual jint getArrayLength();
-public:
-  virtual jint length();
-  virtual ::javax::swing::undo::UndoableEdit * insertString(jint, ::java::lang::String *);
-  virtual ::javax::swing::undo::UndoableEdit * remove(jint, jint);
-  virtual ::java::lang::String * getString(jint, jint);
-  virtual void getChars(jint, jint, ::javax::swing::text::Segment *);
-  virtual ::javax::swing::text::Position * createPosition(jint);
-public: // actually protected
-  virtual void shiftEnd(jint);
-  virtual void shiftGap(jint);
-  virtual void shiftGapStartDown(jint);
-  virtual void shiftGapEndUp(jint);
-  virtual ::java::lang::Object * getArray();
-  virtual void replace(jint, jint, ::java::lang::Object *, jint);
-private:
-  void removeImpl(jint, jint);
-  jint addImpl(jint, jint);
-public: // actually protected
-  virtual jint getGapStart();
-  virtual jint getGapEnd();
-  virtual ::java::util::Vector * getPositionsInRange(::java::util::Vector *, jint, jint);
-  virtual void resetMarksAtZero();
-  virtual void updateUndoPositions(::java::util::Vector *, jint, jint);
-private:
-  void dump();
-  void dumpMarks();
-public: // actually package-private
-  virtual jint search(::javax::swing::text::GapContent$Mark *);
-private:
-  jint searchFirst(jint);
-  jint compare(::javax::swing::text::GapContent$Mark *, ::javax::swing::text::GapContent$Mark *);
-  void garbageCollect();
-  static const jlong serialVersionUID = -6226052713477823730LL;
-public: // actually package-private
-  static const jint DEFAULT_BUFSIZE = 10;
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  jint gapStart;
-  jint gapEnd;
-  ::java::util::ArrayList * marks;
-private:
-  jint garbageMarks;
-  ::javax::swing::text::GapContent$Mark * searchMark;
-public: // actually package-private
-  ::java::lang::ref::ReferenceQueue * queueOfDeath;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GapContent__
diff --git a/libjava/javax/swing/text/GlyphView$DefaultGlyphPainter.h b/libjava/javax/swing/text/GlyphView$DefaultGlyphPainter.h
deleted file mode 100644
index 7a9c8a6b708..00000000000
--- a/libjava/javax/swing/text/GlyphView$DefaultGlyphPainter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GlyphView$DefaultGlyphPainter__
-#define __javax_swing_text_GlyphView$DefaultGlyphPainter__
-
-#pragma interface
-
-#include <javax/swing/text/GlyphView$GlyphPainter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class FontMetrics;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GlyphView;
-          class GlyphView$DefaultGlyphPainter;
-          class Position$Bias;
-          class TabExpander;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GlyphView$DefaultGlyphPainter : public ::javax::swing::text::GlyphView$GlyphPainter
-{
-
-public: // actually package-private
-  GlyphView$DefaultGlyphPainter();
-public:
-  virtual jfloat getHeight(::javax::swing::text::GlyphView *);
-  virtual void paint(::javax::swing::text::GlyphView *, ::java::awt::Graphics *, ::java::awt::Shape *, jint, jint);
-  virtual ::java::awt::Shape * modelToView(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
-  virtual jfloat getSpan(::javax::swing::text::GlyphView *, jint, jint, ::javax::swing::text::TabExpander *, jfloat);
-  virtual jfloat getAscent(::javax::swing::text::GlyphView *);
-  virtual jfloat getDescent(::javax::swing::text::GlyphView *);
-  virtual jint getBoundedPosition(::javax::swing::text::GlyphView *, jint, jfloat, jfloat);
-  virtual jint viewToModel(::javax::swing::text::GlyphView *, jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-private:
-  void updateFontMetrics(::javax::swing::text::GlyphView *);
-public: // actually package-private
-  ::java::awt::FontMetrics * __attribute__((aligned(__alignof__( ::javax::swing::text::GlyphView$GlyphPainter)))) fontMetrics;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GlyphView$DefaultGlyphPainter__
diff --git a/libjava/javax/swing/text/GlyphView$GlyphPainter.h b/libjava/javax/swing/text/GlyphView$GlyphPainter.h
deleted file mode 100644
index ada0b57bfa5..00000000000
--- a/libjava/javax/swing/text/GlyphView$GlyphPainter.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GlyphView$GlyphPainter__
-#define __javax_swing_text_GlyphView$GlyphPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GlyphView;
-          class GlyphView$GlyphPainter;
-          class Position$Bias;
-          class TabExpander;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GlyphView$GlyphPainter : public ::java::lang::Object
-{
-
-public:
-  GlyphView$GlyphPainter();
-  virtual jfloat getAscent(::javax::swing::text::GlyphView *) = 0;
-  virtual jfloat getDescent(::javax::swing::text::GlyphView *) = 0;
-  virtual jfloat getHeight(::javax::swing::text::GlyphView *) = 0;
-  virtual jint getBoundedPosition(::javax::swing::text::GlyphView *, jint, jfloat, jfloat) = 0;
-  virtual void paint(::javax::swing::text::GlyphView *, ::java::awt::Graphics *, ::java::awt::Shape *, jint, jint) = 0;
-  virtual ::java::awt::Shape * modelToView(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *) = 0;
-  virtual jint viewToModel(::javax::swing::text::GlyphView *, jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
-  virtual jfloat getSpan(::javax::swing::text::GlyphView *, jint, jint, ::javax::swing::text::TabExpander *, jfloat) = 0;
-  virtual jint getNextVisualPositionFrom(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::javax::swing::text::GlyphView$GlyphPainter * getPainter(::javax::swing::text::GlyphView *, jint, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GlyphView$GlyphPainter__
diff --git a/libjava/javax/swing/text/GlyphView$J2DGlyphPainter.h b/libjava/javax/swing/text/GlyphView$J2DGlyphPainter.h
deleted file mode 100644
index a93512ae58f..00000000000
--- a/libjava/javax/swing/text/GlyphView$J2DGlyphPainter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GlyphView$J2DGlyphPainter__
-#define __javax_swing_text_GlyphView$J2DGlyphPainter__
-
-#pragma interface
-
-#include <javax/swing/text/GlyphView$GlyphPainter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Font;
-        class Graphics;
-        class Shape;
-      namespace font
-      {
-          class FontRenderContext;
-          class TextLayout;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class GlyphView;
-          class GlyphView$GlyphPainter;
-          class GlyphView$J2DGlyphPainter;
-          class Position$Bias;
-          class TabExpander;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GlyphView$J2DGlyphPainter : public ::javax::swing::text::GlyphView$GlyphPainter
-{
-
-public: // actually package-private
-  GlyphView$J2DGlyphPainter(::java::lang::String *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *);
-public:
-  virtual ::javax::swing::text::GlyphView$GlyphPainter * getPainter(::javax::swing::text::GlyphView *, jint, jint);
-  virtual jfloat getAscent(::javax::swing::text::GlyphView *);
-  virtual jint getBoundedPosition(::javax::swing::text::GlyphView *, jint, jfloat, jfloat);
-  virtual jfloat getDescent(::javax::swing::text::GlyphView *);
-  virtual jfloat getHeight(::javax::swing::text::GlyphView *);
-  virtual jfloat getSpan(::javax::swing::text::GlyphView *, jint, jint, ::javax::swing::text::TabExpander *, jfloat);
-  virtual ::java::awt::Shape * modelToView(::javax::swing::text::GlyphView *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
-  virtual void paint(::javax::swing::text::GlyphView *, ::java::awt::Graphics *, ::java::awt::Shape *, jint, jint);
-  virtual jint viewToModel(::javax::swing::text::GlyphView *, jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually package-private
-  ::java::awt::font::TextLayout * __attribute__((aligned(__alignof__( ::javax::swing::text::GlyphView$GlyphPainter)))) textLayout;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GlyphView$J2DGlyphPainter__
diff --git a/libjava/javax/swing/text/GlyphView.h b/libjava/javax/swing/text/GlyphView.h
deleted file mode 100644
index e63c5077e77..00000000000
--- a/libjava/javax/swing/text/GlyphView.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_GlyphView__
-#define __javax_swing_text_GlyphView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class GlyphView;
-          class GlyphView$GlyphPainter;
-          class Position$Bias;
-          class Segment;
-          class TabExpander;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::GlyphView : public ::javax::swing::text::View
-{
-
-public:
-  GlyphView(::javax::swing::text::Element *);
-  virtual ::javax::swing::text::GlyphView$GlyphPainter * getGlyphPainter();
-  virtual void setGlyphPainter(::javax::swing::text::GlyphView$GlyphPainter *);
-public: // actually protected
-  virtual void checkPainter();
-public:
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::javax::swing::text::TabExpander * getTabExpander();
-  virtual jfloat getTabbedSpan(jfloat, ::javax::swing::text::TabExpander *);
-  virtual jfloat getPartialSpan(jint, jint);
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-  virtual ::javax::swing::text::Segment * getText(jint, jint);
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::awt::Color * getBackground();
-  virtual jboolean isStrikeThrough();
-  virtual jboolean isSubscript();
-  virtual jboolean isSuperscript();
-  virtual jboolean isUnderline();
-public: // actually protected
-  virtual ::java::lang::Object * clone();
-public:
-  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
-  virtual jint getBreakWeight(jint, jfloat, jfloat);
-private:
-  jint getBreakLocation(jint, jint);
-public:
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual ::javax::swing::text::View * createFragment(jint, jint);
-  virtual jfloat getAlignment(jint);
-  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually package-private
-  ::javax::swing::text::GlyphView$GlyphPainter * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) glyphPainter;
-private:
-  jint offset;
-  jint length;
-  jfloat tabX;
-  ::javax::swing::text::TabExpander * tabExpander;
-  ::javax::swing::text::Segment * cached;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_GlyphView__
diff --git a/libjava/javax/swing/text/Highlighter$Highlight.h b/libjava/javax/swing/text/Highlighter$Highlight.h
deleted file mode 100644
index 92ae0f430ef..00000000000
--- a/libjava/javax/swing/text/Highlighter$Highlight.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Highlighter$Highlight__
-#define __javax_swing_text_Highlighter$Highlight__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Highlighter$Highlight;
-          class Highlighter$HighlightPainter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Highlighter$Highlight : public ::java::lang::Object
-{
-
-public:
-  virtual jint getEndOffset() = 0;
-  virtual jint getStartOffset() = 0;
-  virtual ::javax::swing::text::Highlighter$HighlightPainter * getPainter() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Highlighter$Highlight__
diff --git a/libjava/javax/swing/text/Highlighter$HighlightPainter.h b/libjava/javax/swing/text/Highlighter$HighlightPainter.h
deleted file mode 100644
index 8a0987579bf..00000000000
--- a/libjava/javax/swing/text/Highlighter$HighlightPainter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Highlighter$HighlightPainter__
-#define __javax_swing_text_Highlighter$HighlightPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Highlighter$HighlightPainter : public ::java::lang::Object
-{
-
-public:
-  virtual void paint(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Highlighter$HighlightPainter__
diff --git a/libjava/javax/swing/text/Highlighter.h b/libjava/javax/swing/text/Highlighter.h
deleted file mode 100644
index 2f947d226d2..00000000000
--- a/libjava/javax/swing/text/Highlighter.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Highlighter__
-#define __javax_swing_text_Highlighter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Highlighter;
-          class Highlighter$Highlight;
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Highlighter : public ::java::lang::Object
-{
-
-public:
-  virtual void install(::javax::swing::text::JTextComponent *) = 0;
-  virtual void deinstall(::javax::swing::text::JTextComponent *) = 0;
-  virtual ::java::lang::Object * addHighlight(jint, jint, ::javax::swing::text::Highlighter$HighlightPainter *) = 0;
-  virtual void removeAllHighlights() = 0;
-  virtual void removeHighlight(::java::lang::Object *) = 0;
-  virtual void changeHighlight(::java::lang::Object *, jint, jint) = 0;
-  virtual JArray< ::javax::swing::text::Highlighter$Highlight * > * getHighlights() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Highlighter__
diff --git a/libjava/javax/swing/text/IconView.h b/libjava/javax/swing/text/IconView.h
deleted file mode 100644
index cc47c48a248..00000000000
--- a/libjava/javax/swing/text/IconView.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_IconView__
-#define __javax_swing_text_IconView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class IconView;
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::IconView : public ::javax::swing::text::View
-{
-
-public:
-  IconView(::javax::swing::text::Element *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual jfloat getAlignment(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_IconView__
diff --git a/libjava/javax/swing/text/InternationalFormatter.h b/libjava/javax/swing/text/InternationalFormatter.h
deleted file mode 100644
index 48f4726d6c5..00000000000
--- a/libjava/javax/swing/text/InternationalFormatter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_InternationalFormatter__
-#define __javax_swing_text_InternationalFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultFormatter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class Format;
-        class Format$Field;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class JFormattedTextField;
-      namespace text
-      {
-          class InternationalFormatter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::InternationalFormatter : public ::javax::swing::text::DefaultFormatter
-{
-
-public:
-  InternationalFormatter();
-  InternationalFormatter(::java::text::Format *);
-  virtual void setFormat(::java::text::Format *);
-  virtual ::java::text::Format * getFormat();
-  virtual void setMinimum(::java::lang::Comparable *);
-  virtual ::java::lang::Comparable * getMinimum();
-  virtual void setMaximum(::java::lang::Comparable *);
-  virtual ::java::lang::Comparable * getMaximum();
-  virtual void install(::javax::swing::JFormattedTextField *);
-  virtual ::java::lang::String * valueToString(::java::lang::Object *);
-  virtual ::java::lang::Object * stringToValue(::java::lang::String *);
-  virtual JArray< ::java::text::Format$Field * > * getFields(jint);
-public: // actually protected
-  virtual JArray< ::javax::swing::Action * > * getActions();
-private:
-  static const jlong serialVersionUID = 2436068675711756856LL;
-public: // actually package-private
-  ::java::text::Format * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultFormatter)))) format;
-  ::java::lang::Comparable * minimum;
-  ::java::lang::Comparable * maximum;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_InternationalFormatter__
diff --git a/libjava/javax/swing/text/JTextComponent$AccessibleJTextComponent.h b/libjava/javax/swing/text/JTextComponent$AccessibleJTextComponent.h
deleted file mode 100644
index ea8552a664a..00000000000
--- a/libjava/javax/swing/text/JTextComponent$AccessibleJTextComponent.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$AccessibleJTextComponent__
-#define __javax_swing_text_JTextComponent$AccessibleJTextComponent__
-
-#pragma interface
-
-#include <javax/swing/JComponent$AccessibleJComponent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Point;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleEditableText;
-        class AccessibleRole;
-        class AccessibleStateSet;
-        class AccessibleText;
-    }
-    namespace swing
-    {
-      namespace event
-      {
-          class CaretEvent;
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class JTextComponent;
-          class JTextComponent$AccessibleJTextComponent;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$AccessibleJTextComponent : public ::javax::swing::JComponent$AccessibleJComponent
-{
-
-public:
-  JTextComponent$AccessibleJTextComponent(::javax::swing::text::JTextComponent *);
-  virtual jint getCaretPosition();
-  virtual ::java::lang::String * getSelectedText();
-  virtual jint getSelectionStart();
-  virtual jint getSelectionEnd();
-  virtual void caretUpdate(::javax::swing::event::CaretEvent *);
-  virtual ::javax::accessibility::AccessibleStateSet * getAccessibleStateSet();
-  virtual ::javax::accessibility::AccessibleRole * getAccessibleRole();
-  virtual ::javax::accessibility::AccessibleEditableText * getAccessibleEditableText();
-  virtual ::javax::accessibility::AccessibleText * getAccessibleText();
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
-  virtual jint getIndexAtPoint(::java::awt::Point *);
-  virtual ::java::awt::Rectangle * getCharacterBounds(jint);
-  virtual jint getCharCount();
-  virtual ::javax::swing::text::AttributeSet * getCharacterAttribute(jint);
-  virtual ::java::lang::String * getAtIndex(jint, jint);
-  virtual ::java::lang::String * getAfterIndex(jint, jint);
-  virtual ::java::lang::String * getBeforeIndex(jint, jint);
-private:
-  ::java::lang::String * getAtIndexImpl(jint, jint, jint);
-public:
-  virtual jint getAccessibleActionCount();
-  virtual ::java::lang::String * getAccessibleActionDescription(jint);
-  virtual jboolean doAccessibleAction(jint);
-  virtual void setTextContents(::java::lang::String *);
-  virtual void insertTextAtIndex(jint, ::java::lang::String *);
-  virtual ::java::lang::String * getTextRange(jint, jint);
-  virtual void delete$(jint, jint);
-  virtual void cut(jint, jint);
-  virtual void paste(jint);
-  virtual void replaceText(jint, jint, ::java::lang::String *);
-  virtual void selectText(jint, jint);
-  virtual void setAttributes(jint, jint, ::javax::swing::text::AttributeSet *);
-private:
-  static const jlong serialVersionUID = 7664188944091413696LL;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::JComponent$AccessibleJComponent)))) caretDot;
-public: // actually package-private
-  ::javax::swing::text::JTextComponent * this$0;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$AccessibleJTextComponent__
diff --git a/libjava/javax/swing/text/JTextComponent$DefaultKeymap.h b/libjava/javax/swing/text/JTextComponent$DefaultKeymap.h
deleted file mode 100644
index 0e61fb476b7..00000000000
--- a/libjava/javax/swing/text/JTextComponent$DefaultKeymap.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$DefaultKeymap__
-#define __javax_swing_text_JTextComponent$DefaultKeymap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class KeyStroke;
-      namespace text
-      {
-          class JTextComponent$DefaultKeymap;
-          class Keymap;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$DefaultKeymap : public ::java::lang::Object
-{
-
-public:
-  JTextComponent$DefaultKeymap(::java::lang::String *);
-  virtual void addActionForKeyStroke(::javax::swing::KeyStroke *, ::javax::swing::Action *);
-  virtual ::javax::swing::Action * getAction(::javax::swing::KeyStroke *);
-  virtual JArray< ::javax::swing::Action * > * getBoundActions();
-  virtual JArray< ::javax::swing::KeyStroke * > * getBoundKeyStrokes();
-  virtual ::javax::swing::Action * getDefaultAction();
-  virtual JArray< ::javax::swing::KeyStroke * > * getKeyStrokesForAction(::javax::swing::Action *);
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::text::Keymap * getResolveParent();
-  virtual jboolean isLocallyDefined(::javax::swing::KeyStroke *);
-  virtual void removeBindings();
-  virtual void removeKeyStrokeBinding(::javax::swing::KeyStroke *);
-  virtual void setDefaultAction(::javax::swing::Action *);
-  virtual void setResolveParent(::javax::swing::text::Keymap *);
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  ::javax::swing::text::Keymap * parent;
-  ::java::util::Hashtable * map;
-  ::javax::swing::Action * defaultAction;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$DefaultKeymap__
diff --git a/libjava/javax/swing/text/JTextComponent$DefaultTransferHandler.h b/libjava/javax/swing/text/JTextComponent$DefaultTransferHandler.h
deleted file mode 100644
index bdd3c56a82b..00000000000
--- a/libjava/javax/swing/text/JTextComponent$DefaultTransferHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$DefaultTransferHandler__
-#define __javax_swing_text_JTextComponent$DefaultTransferHandler__
-
-#pragma interface
-
-#include <javax/swing/TransferHandler.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace datatransfer
-      {
-          class Clipboard;
-          class DataFlavor;
-          class Transferable;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JComponent;
-      namespace text
-      {
-          class JTextComponent;
-          class JTextComponent$DefaultTransferHandler;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$DefaultTransferHandler : public ::javax::swing::TransferHandler
-{
-
-public: // actually package-private
-  JTextComponent$DefaultTransferHandler(::javax::swing::text::JTextComponent *);
-public:
-  virtual jboolean canImport(::javax::swing::JComponent *, JArray< ::java::awt::datatransfer::DataFlavor * > *);
-  virtual void exportToClipboard(::javax::swing::JComponent *, ::java::awt::datatransfer::Clipboard *, jint);
-  virtual jint getSourceActions();
-  virtual jboolean importData(::javax::swing::JComponent *, ::java::awt::datatransfer::Transferable *);
-public: // actually package-private
-  ::javax::swing::text::JTextComponent * __attribute__((aligned(__alignof__( ::javax::swing::TransferHandler)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$DefaultTransferHandler__
diff --git a/libjava/javax/swing/text/JTextComponent$KeyBinding.h b/libjava/javax/swing/text/JTextComponent$KeyBinding.h
deleted file mode 100644
index e3565c96fed..00000000000
--- a/libjava/javax/swing/text/JTextComponent$KeyBinding.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$KeyBinding__
-#define __javax_swing_text_JTextComponent$KeyBinding__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class KeyStroke;
-      namespace text
-      {
-          class JTextComponent$KeyBinding;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$KeyBinding : public ::java::lang::Object
-{
-
-public:
-  JTextComponent$KeyBinding(::javax::swing::KeyStroke *, ::java::lang::String *);
-  ::javax::swing::KeyStroke * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
-  ::java::lang::String * actionName;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$KeyBinding__
diff --git a/libjava/javax/swing/text/JTextComponent$KeymapActionMap.h b/libjava/javax/swing/text/JTextComponent$KeymapActionMap.h
deleted file mode 100644
index 9496d66b3d0..00000000000
--- a/libjava/javax/swing/text/JTextComponent$KeymapActionMap.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$KeymapActionMap__
-#define __javax_swing_text_JTextComponent$KeymapActionMap__
-
-#pragma interface
-
-#include <javax/swing/ActionMap.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace text
-      {
-          class JTextComponent;
-          class JTextComponent$KeymapActionMap;
-          class Keymap;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$KeymapActionMap : public ::javax::swing::ActionMap
-{
-
-public:
-  JTextComponent$KeymapActionMap(::javax::swing::text::JTextComponent *, ::javax::swing::text::Keymap *);
-  virtual ::javax::swing::Action * get(::java::lang::Object *);
-  virtual jint size();
-  virtual JArray< ::java::lang::Object * > * keys();
-  virtual JArray< ::java::lang::Object * > * allKeys();
-public: // actually package-private
-  ::javax::swing::text::Keymap * __attribute__((aligned(__alignof__( ::javax::swing::ActionMap)))) map;
-  ::javax::swing::text::JTextComponent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$KeymapActionMap__
diff --git a/libjava/javax/swing/text/JTextComponent$KeymapWrapper.h b/libjava/javax/swing/text/JTextComponent$KeymapWrapper.h
deleted file mode 100644
index 07e02f3ffe1..00000000000
--- a/libjava/javax/swing/text/JTextComponent$KeymapWrapper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent$KeymapWrapper__
-#define __javax_swing_text_JTextComponent$KeymapWrapper__
-
-#pragma interface
-
-#include <javax/swing/InputMap.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class KeyStroke;
-      namespace text
-      {
-          class JTextComponent;
-          class JTextComponent$KeymapWrapper;
-          class Keymap;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent$KeymapWrapper : public ::javax::swing::InputMap
-{
-
-public:
-  JTextComponent$KeymapWrapper(::javax::swing::text::JTextComponent *, ::javax::swing::text::Keymap *);
-  virtual jint size();
-  virtual ::java::lang::Object * get(::javax::swing::KeyStroke *);
-  virtual JArray< ::javax::swing::KeyStroke * > * keys();
-  virtual JArray< ::javax::swing::KeyStroke * > * allKeys();
-public: // actually package-private
-  ::javax::swing::text::Keymap * __attribute__((aligned(__alignof__( ::javax::swing::InputMap)))) map;
-  ::javax::swing::text::JTextComponent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent$KeymapWrapper__
diff --git a/libjava/javax/swing/text/JTextComponent.h b/libjava/javax/swing/text/JTextComponent.h
deleted file mode 100644
index cbaec01315a..00000000000
--- a/libjava/javax/swing/text/JTextComponent.h
+++ /dev/null
@@ -1,173 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_JTextComponent__
-#define __javax_swing_text_JTextComponent__
-
-#pragma interface
-
-#include <javax/swing/JComponent.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Dimension;
-        class Insets;
-        class Point;
-        class Rectangle;
-      namespace event
-      {
-          class InputMethodListener;
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-      namespace event
-      {
-          class CaretEvent;
-          class CaretListener;
-      }
-      namespace plaf
-      {
-          class TextUI;
-      }
-      namespace text
-      {
-          class Caret;
-          class Document;
-          class Highlighter;
-          class JTextComponent;
-          class JTextComponent$DefaultTransferHandler;
-          class JTextComponent$KeyBinding;
-          class Keymap;
-          class NavigationFilter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::JTextComponent : public ::javax::swing::JComponent
-{
-
-public:
-  static ::javax::swing::text::Keymap * getKeymap(::java::lang::String *);
-  static ::javax::swing::text::Keymap * removeKeymap(::java::lang::String *);
-  static ::javax::swing::text::Keymap * addKeymap(::java::lang::String *, ::javax::swing::text::Keymap *);
-  virtual ::javax::swing::text::Keymap * getKeymap();
-  virtual void setKeymap(::javax::swing::text::Keymap *);
-  static void loadKeymap(::javax::swing::text::Keymap *, JArray< ::javax::swing::text::JTextComponent$KeyBinding * > *, JArray< ::javax::swing::Action * > *);
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  JTextComponent();
-  virtual void setDocument(::javax::swing::text::Document *);
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual void setMargin(::java::awt::Insets *);
-  virtual ::java::awt::Insets * getMargin();
-  virtual void setText(::java::lang::String *);
-  virtual ::java::lang::String * getText();
-  virtual ::java::lang::String * getText(jint, jint);
-  virtual ::java::lang::String * getSelectedText();
-  virtual ::java::lang::String * getUIClassID();
-public: // actually protected
-  virtual ::java::lang::String * paramString();
-public:
-  virtual ::javax::swing::plaf::TextUI * getUI();
-  virtual void setUI(::javax::swing::plaf::TextUI *);
-  virtual void updateUI();
-  virtual ::java::awt::Dimension * getPreferredScrollableViewportSize();
-  virtual jint getScrollableUnitIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jint getScrollableBlockIncrement(::java::awt::Rectangle *, jint, jint);
-  virtual jboolean isEditable();
-  virtual void setEditable(jboolean);
-  virtual ::javax::swing::text::Caret * getCaret();
-  virtual void setCaret(::javax::swing::text::Caret *);
-  virtual ::java::awt::Color * getCaretColor();
-  virtual void setCaretColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getDisabledTextColor();
-  virtual void setDisabledTextColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getSelectedTextColor();
-  virtual void setSelectedTextColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getSelectionColor();
-  virtual void setSelectionColor(::java::awt::Color *);
-  virtual jint getCaretPosition();
-  virtual void setCaretPosition(jint);
-  virtual void moveCaretPosition(jint);
-  virtual ::javax::swing::text::Highlighter * getHighlighter();
-  virtual void setHighlighter(::javax::swing::text::Highlighter *);
-  virtual jint getSelectionStart();
-  virtual void setSelectionStart(jint);
-  virtual jint getSelectionEnd();
-  virtual void setSelectionEnd(jint);
-  virtual void select(jint, jint);
-  virtual void selectAll();
-  virtual void replaceSelection(::java::lang::String *);
-  virtual jboolean getScrollableTracksViewportHeight();
-  virtual jboolean getScrollableTracksViewportWidth();
-  virtual void addCaretListener(::javax::swing::event::CaretListener *);
-  virtual void removeCaretListener(::javax::swing::event::CaretListener *);
-  virtual JArray< ::javax::swing::event::CaretListener * > * getCaretListeners();
-public: // actually protected
-  virtual void fireCaretUpdate(::javax::swing::event::CaretEvent *);
-public:
-  virtual void addInputMethodListener(::java::awt::event::InputMethodListener *);
-  virtual void removeInputMethodListener(::java::awt::event::InputMethodListener *);
-  virtual JArray< ::java::awt::event::InputMethodListener * > * getInputMethodListeners();
-  virtual ::java::awt::Rectangle * modelToView(jint);
-  virtual jboolean getDragEnabled();
-  virtual void setDragEnabled(jboolean);
-  virtual jint viewToModel(::java::awt::Point *);
-  virtual void copy();
-  virtual void cut();
-  virtual void paste();
-private:
-  void doTransferAction(::java::lang::String *, ::javax::swing::Action *);
-public:
-  virtual void setFocusAccelerator(jchar);
-  virtual jchar getFocusAccelerator();
-  virtual ::javax::swing::text::NavigationFilter * getNavigationFilter();
-  virtual void setNavigationFilter(::javax::swing::text::NavigationFilter *);
-  virtual void read(::java::io::Reader *, ::java::lang::Object *);
-  virtual void write(::java::io::Writer *);
-  virtual ::java::lang::String * getToolTipText(::java::awt::event::MouseEvent *);
-private:
-  static const jlong serialVersionUID = -8796518220218978795LL;
-public:
-  static ::java::lang::String * DEFAULT_KEYMAP;
-  static ::java::lang::String * FOCUS_ACCELERATOR_KEY;
-private:
-  static ::javax::swing::text::JTextComponent$DefaultTransferHandler * defaultTransferHandler;
-  static ::java::util::Hashtable * keymaps;
-  ::javax::swing::text::Keymap * __attribute__((aligned(__alignof__( ::javax::swing::JComponent)))) keymap;
-  jchar focusAccelerator;
-  ::javax::swing::text::NavigationFilter * navigationFilter;
-public: // actually package-private
-  ::javax::swing::text::Document * doc;
-  ::javax::swing::text::Caret * caret;
-  jboolean editable;
-private:
-  ::javax::swing::text::Highlighter * highlighter;
-  ::java::awt::Color * caretColor;
-  ::java::awt::Color * disabledTextColor;
-  ::java::awt::Color * selectedTextColor;
-  ::java::awt::Color * selectionColor;
-  ::java::awt::Insets * margin;
-  jboolean dragEnabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_JTextComponent__
diff --git a/libjava/javax/swing/text/Keymap.h b/libjava/javax/swing/text/Keymap.h
deleted file mode 100644
index 6ec0a9816bf..00000000000
--- a/libjava/javax/swing/text/Keymap.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Keymap__
-#define __javax_swing_text_Keymap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class KeyStroke;
-      namespace text
-      {
-          class Keymap;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Keymap : public ::java::lang::Object
-{
-
-public:
-  virtual void addActionForKeyStroke(::javax::swing::KeyStroke *, ::javax::swing::Action *) = 0;
-  virtual ::javax::swing::Action * getAction(::javax::swing::KeyStroke *) = 0;
-  virtual JArray< ::javax::swing::Action * > * getBoundActions() = 0;
-  virtual JArray< ::javax::swing::KeyStroke * > * getBoundKeyStrokes() = 0;
-  virtual ::javax::swing::Action * getDefaultAction() = 0;
-  virtual JArray< ::javax::swing::KeyStroke * > * getKeyStrokesForAction(::javax::swing::Action *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::javax::swing::text::Keymap * getResolveParent() = 0;
-  virtual jboolean isLocallyDefined(::javax::swing::KeyStroke *) = 0;
-  virtual void removeBindings() = 0;
-  virtual void removeKeyStrokeBinding(::javax::swing::KeyStroke *) = 0;
-  virtual void setDefaultAction(::javax::swing::Action *) = 0;
-  virtual void setResolveParent(::javax::swing::text::Keymap *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Keymap__
diff --git a/libjava/javax/swing/text/LabelView.h b/libjava/javax/swing/text/LabelView.h
deleted file mode 100644
index 0d616b22883..00000000000
--- a/libjava/javax/swing/text/LabelView.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_LabelView__
-#define __javax_swing_text_LabelView__
-
-#pragma interface
-
-#include <javax/swing/text/GlyphView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class LabelView;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::LabelView : public ::javax::swing::text::GlyphView
-{
-
-public:
-  LabelView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-public:
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual ::java::awt::Color * getBackground();
-public: // actually protected
-  virtual void setBackground(::java::awt::Color *);
-public:
-  virtual ::java::awt::Color * getForeground();
-  virtual ::java::awt::Font * getFont();
-public: // actually protected
-  virtual ::java::awt::FontMetrics * getFontMetrics();
-public:
-  virtual jboolean isUnderline();
-public: // actually protected
-  virtual void setUnderline(jboolean);
-public:
-  virtual jboolean isSubscript();
-public: // actually protected
-  virtual void setSubscript(jboolean);
-public:
-  virtual jboolean isSuperscript();
-public: // actually protected
-  virtual void setSuperscript(jboolean);
-public:
-  virtual jboolean isStrikeThrough();
-public: // actually protected
-  virtual void setStrikeThrough(jboolean);
-public: // actually package-private
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::GlyphView)))) background;
-  ::java::awt::Color * foreground;
-  ::java::awt::Font * font;
-  jboolean strikeThrough;
-  jboolean underline;
-  jboolean subscript;
-  jboolean superscript;
-private:
-  jboolean valid;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_LabelView__
diff --git a/libjava/javax/swing/text/LayeredHighlighter$LayerPainter.h b/libjava/javax/swing/text/LayeredHighlighter$LayerPainter.h
deleted file mode 100644
index 306061f2bbd..00000000000
--- a/libjava/javax/swing/text/LayeredHighlighter$LayerPainter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_LayeredHighlighter$LayerPainter__
-#define __javax_swing_text_LayeredHighlighter$LayerPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class JTextComponent;
-          class LayeredHighlighter$LayerPainter;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::LayeredHighlighter$LayerPainter : public ::java::lang::Object
-{
-
-public:
-  LayeredHighlighter$LayerPainter();
-  virtual ::java::awt::Shape * paintLayer(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *) = 0;
-  virtual void paint(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_LayeredHighlighter$LayerPainter__
diff --git a/libjava/javax/swing/text/LayeredHighlighter.h b/libjava/javax/swing/text/LayeredHighlighter.h
deleted file mode 100644
index 504680a41e4..00000000000
--- a/libjava/javax/swing/text/LayeredHighlighter.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_LayeredHighlighter__
-#define __javax_swing_text_LayeredHighlighter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Highlighter$Highlight;
-          class Highlighter$HighlightPainter;
-          class JTextComponent;
-          class LayeredHighlighter;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::LayeredHighlighter : public ::java::lang::Object
-{
-
-public:
-  LayeredHighlighter();
-  virtual void paintLayeredHighlights(::java::awt::Graphics *, jint, jint, ::java::awt::Shape *, ::javax::swing::text::JTextComponent *, ::javax::swing::text::View *) = 0;
-  virtual void install(::javax::swing::text::JTextComponent *) = 0;
-  virtual void deinstall(::javax::swing::text::JTextComponent *) = 0;
-  virtual ::java::lang::Object * addHighlight(jint, jint, ::javax::swing::text::Highlighter$HighlightPainter *) = 0;
-  virtual void removeAllHighlights() = 0;
-  virtual void removeHighlight(::java::lang::Object *) = 0;
-  virtual void changeHighlight(::java::lang::Object *, jint, jint) = 0;
-  virtual JArray< ::javax::swing::text::Highlighter$Highlight * > * getHighlights() = 0;
-  virtual void paint(::java::awt::Graphics *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_LayeredHighlighter__
diff --git a/libjava/javax/swing/text/LayoutQueue.h b/libjava/javax/swing/text/LayoutQueue.h
deleted file mode 100644
index 0dcc8a7977c..00000000000
--- a/libjava/javax/swing/text/LayoutQueue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_LayoutQueue__
-#define __javax_swing_text_LayoutQueue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class LayoutQueue;
-      }
-    }
-  }
-}
-
-class javax::swing::text::LayoutQueue : public ::java::lang::Object
-{
-
-public:
-  LayoutQueue();
-  virtual void addTask(::java::lang::Runnable *);
-public: // actually protected
-  virtual ::java::lang::Runnable * waitForWork();
-public:
-  static ::javax::swing::text::LayoutQueue * getDefaultQueue();
-  static void setDefaultQueue(::javax::swing::text::LayoutQueue *);
-private:
-  static ::javax::swing::text::LayoutQueue * defaultQueue;
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) list;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_LayoutQueue__
diff --git a/libjava/javax/swing/text/MaskFormatter.h b/libjava/javax/swing/text/MaskFormatter.h
deleted file mode 100644
index d8651afc956..00000000000
--- a/libjava/javax/swing/text/MaskFormatter.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_MaskFormatter__
-#define __javax_swing_text_MaskFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultFormatter.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JFormattedTextField;
-      namespace text
-      {
-          class MaskFormatter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::MaskFormatter : public ::javax::swing::text::DefaultFormatter
-{
-
-public:
-  MaskFormatter();
-  MaskFormatter(::java::lang::String *);
-  virtual ::java::lang::String * getMask();
-  virtual ::java::lang::String * getInvalidCharacters();
-  virtual void setInvalidCharacters(::java::lang::String *);
-  virtual ::java::lang::String * getValidCharacters();
-  virtual void setValidCharacters(::java::lang::String *);
-  virtual ::java::lang::String * getPlaceholder();
-  virtual void setPlaceholder(::java::lang::String *);
-  virtual jchar getPlaceholderCharacter();
-  virtual void setPlaceholderCharacter(jchar);
-  virtual jboolean getValueContainsLiteralCharacters();
-  virtual void setValueContainsLiteralCharacters(jboolean);
-  virtual void setMask(::java::lang::String *);
-  virtual void install(::javax::swing::JFormattedTextField *);
-  virtual ::java::lang::Object * stringToValue(::java::lang::String *);
-private:
-  ::java::lang::String * convertStringToValue(::java::lang::String *);
-public:
-  virtual ::java::lang::String * valueToString(::java::lang::Object *);
-private:
-  ::java::lang::String * convertValueToString(::java::lang::String *);
-  static const jchar NUM_CHAR = 35;
-  static const jchar ESCAPE_CHAR = 39;
-  static const jchar UPPERCASE_CHAR = 85;
-  static const jchar LOWERCASE_CHAR = 76;
-  static const jchar ALPHANUM_CHAR = 65;
-  static const jchar LETTER_CHAR = 63;
-  static const jchar ANYTHING_CHAR = 42;
-  static const jchar HEX_CHAR = 72;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultFormatter)))) mask;
-  ::java::lang::String * invalidChars;
-  ::java::lang::String * validChars;
-  ::java::lang::String * placeHolder;
-  jchar placeHolderChar;
-  jboolean valueContainsLiteralCharacters;
-  static ::java::lang::String * hexString;
-public: // actually package-private
-  jint maskLength;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_MaskFormatter__
diff --git a/libjava/javax/swing/text/MutableAttributeSet.h b/libjava/javax/swing/text/MutableAttributeSet.h
deleted file mode 100644
index d98305585f3..00000000000
--- a/libjava/javax/swing/text/MutableAttributeSet.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_MutableAttributeSet__
-#define __javax_swing_text_MutableAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class MutableAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::MutableAttributeSet : public ::java::lang::Object
-{
-
-public:
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void addAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual void removeAttribute(::java::lang::Object *) = 0;
-  virtual void removeAttributes(::java::util::Enumeration *) = 0;
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *) = 0;
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * copyAttributes() = 0;
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *) = 0;
-  virtual jint getAttributeCount() = 0;
-  virtual ::java::util::Enumeration * getAttributeNames() = 0;
-  virtual ::javax::swing::text::AttributeSet * getResolveParent() = 0;
-  virtual jboolean isDefined(::java::lang::Object *) = 0;
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_MutableAttributeSet__
diff --git a/libjava/javax/swing/text/NavigationFilter$FilterBypass.h b/libjava/javax/swing/text/NavigationFilter$FilterBypass.h
deleted file mode 100644
index 5c771e222ac..00000000000
--- a/libjava/javax/swing/text/NavigationFilter$FilterBypass.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_NavigationFilter$FilterBypass__
-#define __javax_swing_text_NavigationFilter$FilterBypass__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class NavigationFilter$FilterBypass;
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::NavigationFilter$FilterBypass : public ::java::lang::Object
-{
-
-public:
-  NavigationFilter$FilterBypass();
-  virtual ::javax::swing::text::Caret * getCaret() = 0;
-  virtual void moveDot(jint, ::javax::swing::text::Position$Bias *) = 0;
-  virtual void setDot(jint, ::javax::swing::text::Position$Bias *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_NavigationFilter$FilterBypass__
diff --git a/libjava/javax/swing/text/NavigationFilter.h b/libjava/javax/swing/text/NavigationFilter.h
deleted file mode 100644
index 533b6e50d1a..00000000000
--- a/libjava/javax/swing/text/NavigationFilter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_NavigationFilter__
-#define __javax_swing_text_NavigationFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class JTextComponent;
-          class NavigationFilter;
-          class NavigationFilter$FilterBypass;
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::NavigationFilter : public ::java::lang::Object
-{
-
-public:
-  NavigationFilter();
-  virtual void moveDot(::javax::swing::text::NavigationFilter$FilterBypass *, jint, ::javax::swing::text::Position$Bias *);
-  virtual void setDot(::javax::swing::text::NavigationFilter$FilterBypass *, jint, ::javax::swing::text::Position$Bias *);
-  virtual jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, ::javax::swing::text::Position$Bias *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_NavigationFilter__
diff --git a/libjava/javax/swing/text/NumberFormatter.h b/libjava/javax/swing/text/NumberFormatter.h
deleted file mode 100644
index fe952fe468b..00000000000
--- a/libjava/javax/swing/text/NumberFormatter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_NumberFormatter__
-#define __javax_swing_text_NumberFormatter__
-
-#pragma interface
-
-#include <javax/swing/text/InternationalFormatter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace text
-    {
-        class Format;
-        class NumberFormat;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class NumberFormatter;
-      }
-    }
-  }
-}
-
-class javax::swing::text::NumberFormatter : public ::javax::swing::text::InternationalFormatter
-{
-
-public:
-  NumberFormatter();
-  NumberFormatter(::java::text::NumberFormat *);
-  virtual void setFormat(::java::text::Format *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_NumberFormatter__
diff --git a/libjava/javax/swing/text/ParagraphView$Row.h b/libjava/javax/swing/text/ParagraphView$Row.h
deleted file mode 100644
index 36a372a7098..00000000000
--- a/libjava/javax/swing/text/ParagraphView$Row.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ParagraphView$Row__
-#define __javax_swing_text_ParagraphView$Row__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace text
-      {
-          class Element;
-          class ParagraphView;
-          class ParagraphView$Row;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ParagraphView$Row : public ::javax::swing::text::BoxView
-{
-
-public: // actually package-private
-  ParagraphView$Row(::javax::swing::text::ParagraphView *, ::javax::swing::text::Element *);
-public:
-  virtual jshort getLeftInset();
-  virtual jfloat getAlignment(jint);
-public: // actually protected
-  virtual jint getViewIndexAtPosition(jint);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-public:
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-public: // actually package-private
-  ::javax::swing::text::ParagraphView * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ParagraphView$Row__
diff --git a/libjava/javax/swing/text/ParagraphView.h b/libjava/javax/swing/text/ParagraphView.h
deleted file mode 100644
index fc86f73989a..00000000000
--- a/libjava/javax/swing/text/ParagraphView.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ParagraphView__
-#define __javax_swing_text_ParagraphView__
-
-#pragma interface
-
-#include <javax/swing/text/FlowView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class ParagraphView;
-          class ParagraphView$Row;
-          class Position$Bias;
-          class TabSet;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ParagraphView : public ::javax::swing::text::FlowView
-{
-
-public:
-  ParagraphView(::javax::swing::text::Element *);
-  virtual jfloat nextTabStop(jfloat, jint);
-public: // actually protected
-  virtual ::javax::swing::text::View * createRow();
-public:
-  virtual jfloat getAlignment(jint);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-  virtual void setFirstLineIndent(jfloat);
-  virtual void setJustification(jint);
-  virtual void setLineSpacing(jfloat);
-  virtual ::javax::swing::text::View * getLayoutView(jint);
-  virtual jint getLayoutViewCount();
-  virtual ::javax::swing::text::TabSet * getTabSet();
-  virtual jint findOffsetToCharactersInString(JArray< jchar > *, jint);
-  virtual jint getClosestPositionTo(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *, jint, jint);
-  virtual jfloat getPartialSize(jint, jint);
-  virtual jfloat getTabBase();
-  virtual void adjustRow(::javax::swing::text::ParagraphView$Row *, jint, jint);
-public:
-  virtual ::javax::swing::text::View * breakView(jint, jfloat, ::java::awt::Shape *);
-  virtual jint getBreakWeight(jint, jfloat);
-public: // actually package-private
-  static jint access$0(::javax::swing::text::ParagraphView *);
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::FlowView)))) firstLineIndent;
-private:
-  jint justification;
-  jfloat lineSpacing;
-  ::javax::swing::text::TabSet * tabSet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ParagraphView__
diff --git a/libjava/javax/swing/text/PasswordView.h b/libjava/javax/swing/text/PasswordView.h
deleted file mode 100644
index ba6d3ff4762..00000000000
--- a/libjava/javax/swing/text/PasswordView.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_PasswordView__
-#define __javax_swing_text_PasswordView__
-
-#pragma interface
-
-#include <javax/swing/text/FieldView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class PasswordView;
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::PasswordView : public ::javax::swing::text::FieldView
-{
-
-public:
-  PasswordView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual jint drawEchoCharacter(::java::awt::Graphics *, jint, jint, jchar);
-private:
-  jchar getEchoChar();
-public: // actually protected
-  virtual jint drawSelectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual jint drawUnselectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-public:
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-private:
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::javax::swing::text::FieldView)))) oneCharBuffer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_PasswordView__
diff --git a/libjava/javax/swing/text/PlainDocument.h b/libjava/javax/swing/text/PlainDocument.h
deleted file mode 100644
index d3dc0dca6e2..00000000000
--- a/libjava/javax/swing/text/PlainDocument.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_PlainDocument__
-#define __javax_swing_text_PlainDocument__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$AbstractElement;
-          class AbstractDocument$Content;
-          class AbstractDocument$DefaultDocumentEvent;
-          class AttributeSet;
-          class Element;
-          class PlainDocument;
-      }
-    }
-  }
-}
-
-class javax::swing::text::PlainDocument : public ::javax::swing::text::AbstractDocument
-{
-
-public:
-  PlainDocument();
-  PlainDocument(::javax::swing::text::AbstractDocument$Content *);
-private:
-  void reindex();
-public: // actually protected
-  virtual ::javax::swing::text::AbstractDocument$AbstractElement * createDefaultRoot();
-  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
-  virtual void removeUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *);
-public:
-  virtual ::javax::swing::text::Element * getDefaultRootElement();
-  virtual ::javax::swing::text::Element * getParagraphElement(jint);
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *);
-private:
-  static const jlong serialVersionUID = 4758290289196893664LL;
-public:
-  static ::java::lang::String * lineLimitAttribute;
-  static ::java::lang::String * tabSizeAttribute;
-private:
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument)))) rootElement;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_PlainDocument__
diff --git a/libjava/javax/swing/text/PlainView.h b/libjava/javax/swing/text/PlainView.h
deleted file mode 100644
index e6091b0fc1c..00000000000
--- a/libjava/javax/swing/text/PlainView.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_PlainView__
-#define __javax_swing_text_PlainView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Font;
-        class FontMetrics;
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class PlainView;
-          class Position$Bias;
-          class Segment;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::PlainView : public ::javax::swing::text::View
-{
-
-public:
-  PlainView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual void updateMetrics();
-  virtual ::java::awt::Rectangle * lineToRect(::java::awt::Shape *, jint);
-public:
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-public: // actually protected
-  virtual void drawLine(jint, ::java::awt::Graphics *, jint, jint);
-  virtual jint drawSelectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual jint drawUnselectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-public:
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-public: // actually protected
-  virtual jint getTabSize();
-public:
-  virtual jfloat nextTabStop(jfloat, jint);
-public: // actually package-private
-  virtual jfloat determineMaxLineLength();
-public:
-  virtual jfloat getPreferredSpan(jint);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually protected
-  virtual void updateDamage(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public:
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually protected
-  virtual void damageLineRange(jint, jint, ::java::awt::Shape *, ::java::awt::Component *);
-  virtual ::javax::swing::text::Segment * getLineBuffer();
-private:
-  void findLongestLine(jint, jint);
-  jint getLineLength(jint);
-public: // actually package-private
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) selectedColor;
-  ::java::awt::Color * unselectedColor;
-  ::java::awt::Color * disabledColor;
-  jint selectionStart;
-  jint selectionEnd;
-  ::java::awt::Font * font;
-  jfloat maxLineLength;
-  ::javax::swing::text::Element * longestLine;
-public: // actually protected
-  ::java::awt::FontMetrics * metrics;
-private:
-  ::javax::swing::text::Segment * lineBuffer;
-  jint tabBase;
-  jint tabSize;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_PlainView__
diff --git a/libjava/javax/swing/text/Position$Bias.h b/libjava/javax/swing/text/Position$Bias.h
deleted file mode 100644
index 0ae5a3570a1..00000000000
--- a/libjava/javax/swing/text/Position$Bias.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Position$Bias__
-#define __javax_swing_text_Position$Bias__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Position$Bias;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Position$Bias : public ::java::lang::Object
-{
-
-  Position$Bias(::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-  static ::javax::swing::text::Position$Bias * Backward;
-  static ::javax::swing::text::Position$Bias * Forward;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_Position$Bias__
diff --git a/libjava/javax/swing/text/Position.h b/libjava/javax/swing/text/Position.h
deleted file mode 100644
index 1561b25fc1c..00000000000
--- a/libjava/javax/swing/text/Position.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Position__
-#define __javax_swing_text_Position__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Position;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Position : public ::java::lang::Object
-{
-
-public:
-  virtual jint getOffset() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Position__
diff --git a/libjava/javax/swing/text/Segment.h b/libjava/javax/swing/text/Segment.h
deleted file mode 100644
index f9d5d5a6e42..00000000000
--- a/libjava/javax/swing/text/Segment.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Segment__
-#define __javax_swing_text_Segment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Segment;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Segment : public ::java::lang::Object
-{
-
-public:
-  Segment();
-  Segment(JArray< jchar > *, jint, jint);
-  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 ::java::lang::String * toString();
-  virtual void setPartialReturn(jboolean);
-  virtual jboolean isPartialReturn();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) partialReturn;
-  jint current__;
-public:
-  JArray< jchar > * array;
-  jint count;
-  jint offset;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_Segment__
diff --git a/libjava/javax/swing/text/SimpleAttributeSet.h b/libjava/javax/swing/text/SimpleAttributeSet.h
deleted file mode 100644
index 0ea91af02f7..00000000000
--- a/libjava/javax/swing/text/SimpleAttributeSet.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_SimpleAttributeSet__
-#define __javax_swing_text_SimpleAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class SimpleAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::SimpleAttributeSet : public ::java::lang::Object
-{
-
-public:
-  SimpleAttributeSet();
-  SimpleAttributeSet(::javax::swing::text::AttributeSet *);
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual void addAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-public: // actually package-private
-  virtual jboolean containsAttributeLocally(::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * copyAttributes();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual jint getAttributeCount();
-  virtual ::java::util::Enumeration * getAttributeNames();
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual jint hashCode();
-  virtual jboolean isDefined(::java::lang::Object *);
-  virtual jboolean isEmpty();
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
-  virtual void removeAttribute(::java::lang::Object *);
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void removeAttributes(::java::util::Enumeration *);
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 8267656273837665219LL;
-public:
-  static ::javax::swing::text::AttributeSet * EMPTY;
-public: // actually package-private
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tab;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_SimpleAttributeSet__
diff --git a/libjava/javax/swing/text/StringContent$InsertUndo.h b/libjava/javax/swing/text/StringContent$InsertUndo.h
deleted file mode 100644
index 49415c169d0..00000000000
--- a/libjava/javax/swing/text/StringContent$InsertUndo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent$InsertUndo__
-#define __javax_swing_text_StringContent$InsertUndo__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StringContent;
-          class StringContent$InsertUndo;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent$InsertUndo : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  StringContent$InsertUndo(::javax::swing::text::StringContent *, jint, jint);
-  virtual void undo();
-  virtual void redo();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) start;
-  jint length;
-  ::java::lang::String * redoContent;
-  ::java::util::Vector * positions;
-public: // actually package-private
-  ::javax::swing::text::StringContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent$InsertUndo__
diff --git a/libjava/javax/swing/text/StringContent$Mark.h b/libjava/javax/swing/text/StringContent$Mark.h
deleted file mode 100644
index 22d3f9f0257..00000000000
--- a/libjava/javax/swing/text/StringContent$Mark.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent$Mark__
-#define __javax_swing_text_StringContent$Mark__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StringContent;
-          class StringContent$Mark;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent$Mark : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StringContent$Mark(::javax::swing::text::StringContent *, jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
-  jint refCount;
-  ::javax::swing::text::StringContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent$Mark__
diff --git a/libjava/javax/swing/text/StringContent$RemoveUndo.h b/libjava/javax/swing/text/StringContent$RemoveUndo.h
deleted file mode 100644
index 6c79aa06ba6..00000000000
--- a/libjava/javax/swing/text/StringContent$RemoveUndo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent$RemoveUndo__
-#define __javax_swing_text_StringContent$RemoveUndo__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StringContent;
-          class StringContent$RemoveUndo;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent$RemoveUndo : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  StringContent$RemoveUndo(::javax::swing::text::StringContent *, jint, ::java::lang::String *);
-  virtual void undo();
-  virtual void redo();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) start;
-  jint len;
-  ::java::lang::String * undoString;
-public: // actually package-private
-  ::java::util::Vector * positions;
-  ::javax::swing::text::StringContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent$RemoveUndo__
diff --git a/libjava/javax/swing/text/StringContent$StickyPosition.h b/libjava/javax/swing/text/StringContent$StickyPosition.h
deleted file mode 100644
index 434bf590a7f..00000000000
--- a/libjava/javax/swing/text/StringContent$StickyPosition.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent$StickyPosition__
-#define __javax_swing_text_StringContent$StickyPosition__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StringContent;
-          class StringContent$Mark;
-          class StringContent$StickyPosition;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent$StickyPosition : public ::java::lang::Object
-{
-
-public:
-  StringContent$StickyPosition(::javax::swing::text::StringContent *, jint);
-  virtual jint getOffset();
-public: // actually package-private
-  ::javax::swing::text::StringContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
-  ::javax::swing::text::StringContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent$StickyPosition__
diff --git a/libjava/javax/swing/text/StringContent$UndoPosRef.h b/libjava/javax/swing/text/StringContent$UndoPosRef.h
deleted file mode 100644
index 82f8d2f660e..00000000000
--- a/libjava/javax/swing/text/StringContent$UndoPosRef.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent$UndoPosRef__
-#define __javax_swing_text_StringContent$UndoPosRef__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StringContent;
-          class StringContent$Mark;
-          class StringContent$UndoPosRef;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent$UndoPosRef : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StringContent$UndoPosRef(::javax::swing::text::StringContent *, ::javax::swing::text::StringContent$Mark *);
-  virtual void reset();
-private:
-  ::javax::swing::text::StringContent$Mark * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mark;
-  jint undoOffset;
-public: // actually package-private
-  ::javax::swing::text::StringContent * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent$UndoPosRef__
diff --git a/libjava/javax/swing/text/StringContent.h b/libjava/javax/swing/text/StringContent.h
deleted file mode 100644
index ca51a43d7e3..00000000000
--- a/libjava/javax/swing/text/StringContent.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StringContent__
-#define __javax_swing_text_StringContent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Position;
-          class Segment;
-          class StringContent;
-      }
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StringContent : public ::java::lang::Object
-{
-
-public:
-  StringContent();
-  StringContent(jint);
-public: // actually protected
-  ::java::util::Vector * getPositionsInRange(::java::util::Vector *, jint, jint);
-public:
-  ::javax::swing::text::Position * createPosition(jint);
-  jint length();
-  ::javax::swing::undo::UndoableEdit * insertString(jint, ::java::lang::String *);
-  ::javax::swing::undo::UndoableEdit * remove(jint, jint);
-private:
-  void replace(jint, jint, JArray< jchar > *);
-public:
-  ::java::lang::String * getString(jint, jint);
-  void getChars(jint, jint, ::javax::swing::text::Segment *);
-public: // actually protected
-  void updateUndoPositions(::java::util::Vector *);
-public: // actually package-private
-  void checkLocation(jint, jint);
-  void garbageCollect();
-private:
-  static const jlong serialVersionUID = 4755994433709540381LL;
-public: // actually package-private
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) content;
-private:
-  jint count;
-public: // actually package-private
-  ::java::util::Vector * marks;
-private:
-  static JArray< jchar > * EMPTY;
-public: // actually package-private
-  ::java::lang::ref::ReferenceQueue * queueOfDeath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StringContent__
diff --git a/libjava/javax/swing/text/Style.h b/libjava/javax/swing/text/Style.h
deleted file mode 100644
index ceb4aff7167..00000000000
--- a/libjava/javax/swing/text/Style.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Style__
-#define __javax_swing_text_Style__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Style;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Style : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *) = 0;
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void addAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual void removeAttribute(::java::lang::Object *) = 0;
-  virtual void removeAttributes(::java::util::Enumeration *) = 0;
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *) = 0;
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::javax::swing::text::AttributeSet * copyAttributes() = 0;
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *) = 0;
-  virtual jint getAttributeCount() = 0;
-  virtual ::java::util::Enumeration * getAttributeNames() = 0;
-  virtual ::javax::swing::text::AttributeSet * getResolveParent() = 0;
-  virtual jboolean isDefined(::java::lang::Object *) = 0;
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_Style__
diff --git a/libjava/javax/swing/text/StyleConstants$CharacterConstants.h b/libjava/javax/swing/text/StyleConstants$CharacterConstants.h
deleted file mode 100644
index c9c84da1886..00000000000
--- a/libjava/javax/swing/text/StyleConstants$CharacterConstants.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleConstants$CharacterConstants__
-#define __javax_swing_text_StyleConstants$CharacterConstants__
-
-#pragma interface
-
-#include <javax/swing/text/StyleConstants.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleConstants$CharacterConstants;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleConstants$CharacterConstants : public ::javax::swing::text::StyleConstants
-{
-
-  StyleConstants$CharacterConstants(::java::lang::String *);
-public:
-  static ::java::lang::Object * Background;
-  static ::java::lang::Object * BidiLevel;
-  static ::java::lang::Object * Bold;
-  static ::java::lang::Object * ComponentAttribute;
-  static ::java::lang::Object * Family;
-  static ::java::lang::Object * Size;
-  static ::java::lang::Object * Foreground;
-  static ::java::lang::Object * IconAttribute;
-  static ::java::lang::Object * Italic;
-  static ::java::lang::Object * StrikeThrough;
-  static ::java::lang::Object * Subscript;
-  static ::java::lang::Object * Superscript;
-  static ::java::lang::Object * Underline;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleConstants$CharacterConstants__
diff --git a/libjava/javax/swing/text/StyleConstants$ColorConstants.h b/libjava/javax/swing/text/StyleConstants$ColorConstants.h
deleted file mode 100644
index 31f2e67fa38..00000000000
--- a/libjava/javax/swing/text/StyleConstants$ColorConstants.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleConstants$ColorConstants__
-#define __javax_swing_text_StyleConstants$ColorConstants__
-
-#pragma interface
-
-#include <javax/swing/text/StyleConstants.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleConstants$ColorConstants;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleConstants$ColorConstants : public ::javax::swing::text::StyleConstants
-{
-
-  StyleConstants$ColorConstants(::java::lang::String *);
-public:
-  static ::java::lang::Object * Foreground;
-  static ::java::lang::Object * Background;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleConstants$ColorConstants__
diff --git a/libjava/javax/swing/text/StyleConstants$FontConstants.h b/libjava/javax/swing/text/StyleConstants$FontConstants.h
deleted file mode 100644
index f2ae13ca6da..00000000000
--- a/libjava/javax/swing/text/StyleConstants$FontConstants.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleConstants$FontConstants__
-#define __javax_swing_text_StyleConstants$FontConstants__
-
-#pragma interface
-
-#include <javax/swing/text/StyleConstants.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleConstants$FontConstants;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleConstants$FontConstants : public ::javax::swing::text::StyleConstants
-{
-
-  StyleConstants$FontConstants(::java::lang::String *);
-public:
-  static ::java::lang::Object * Bold;
-  static ::java::lang::Object * Family;
-  static ::java::lang::Object * Italic;
-  static ::java::lang::Object * Size;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleConstants$FontConstants__
diff --git a/libjava/javax/swing/text/StyleConstants$ParagraphConstants.h b/libjava/javax/swing/text/StyleConstants$ParagraphConstants.h
deleted file mode 100644
index 41381f8ba59..00000000000
--- a/libjava/javax/swing/text/StyleConstants$ParagraphConstants.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleConstants$ParagraphConstants__
-#define __javax_swing_text_StyleConstants$ParagraphConstants__
-
-#pragma interface
-
-#include <javax/swing/text/StyleConstants.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleConstants$ParagraphConstants;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleConstants$ParagraphConstants : public ::javax::swing::text::StyleConstants
-{
-
-  StyleConstants$ParagraphConstants(::java::lang::String *);
-public:
-  static ::java::lang::Object * Alignment;
-  static ::java::lang::Object * FirstLineIndent;
-  static ::java::lang::Object * LeftIndent;
-  static ::java::lang::Object * LineSpacing;
-  static ::java::lang::Object * Orientation;
-  static ::java::lang::Object * RightIndent;
-  static ::java::lang::Object * SpaceAbove;
-  static ::java::lang::Object * SpaceBelow;
-  static ::java::lang::Object * TabSet;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleConstants$ParagraphConstants__
diff --git a/libjava/javax/swing/text/StyleConstants.h b/libjava/javax/swing/text/StyleConstants.h
deleted file mode 100644
index 1640d415dc9..00000000000
--- a/libjava/javax/swing/text/StyleConstants.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleConstants__
-#define __javax_swing_text_StyleConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace text
-      {
-          class AttributeSet;
-          class MutableAttributeSet;
-          class StyleConstants;
-          class TabSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleConstants : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleConstants(::java::lang::String *);
-public:
-  virtual ::java::lang::String * toString();
-  static jint getAlignment(::javax::swing::text::AttributeSet *);
-  static ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
-  static jint getBidiLevel(::javax::swing::text::AttributeSet *);
-  static ::java::awt::Component * getComponent(::javax::swing::text::AttributeSet *);
-  static jfloat getFirstLineIndent(::javax::swing::text::AttributeSet *);
-  static ::java::lang::String * getFontFamily(::javax::swing::text::AttributeSet *);
-  static jint getFontSize(::javax::swing::text::AttributeSet *);
-  static ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
-  static ::javax::swing::Icon * getIcon(::javax::swing::text::AttributeSet *);
-  static jfloat getLeftIndent(::javax::swing::text::AttributeSet *);
-  static jfloat getLineSpacing(::javax::swing::text::AttributeSet *);
-  static jfloat getRightIndent(::javax::swing::text::AttributeSet *);
-  static jfloat getSpaceAbove(::javax::swing::text::AttributeSet *);
-  static jfloat getSpaceBelow(::javax::swing::text::AttributeSet *);
-  static ::javax::swing::text::TabSet * getTabSet(::javax::swing::text::AttributeSet *);
-  static jboolean isBold(::javax::swing::text::AttributeSet *);
-  static jboolean isItalic(::javax::swing::text::AttributeSet *);
-  static jboolean isStrikeThrough(::javax::swing::text::AttributeSet *);
-  static jboolean isSubscript(::javax::swing::text::AttributeSet *);
-  static jboolean isSuperscript(::javax::swing::text::AttributeSet *);
-  static jboolean isUnderline(::javax::swing::text::AttributeSet *);
-  static void setAlignment(::javax::swing::text::MutableAttributeSet *, jint);
-  static void setBackground(::javax::swing::text::MutableAttributeSet *, ::java::awt::Color *);
-  static void setBidiLevel(::javax::swing::text::MutableAttributeSet *, jint);
-  static void setBold(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static void setComponent(::javax::swing::text::MutableAttributeSet *, ::java::awt::Component *);
-  static void setFirstLineIndent(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setFontFamily(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
-  static void setFontSize(::javax::swing::text::MutableAttributeSet *, jint);
-  static void setForeground(::javax::swing::text::MutableAttributeSet *, ::java::awt::Color *);
-  static void setIcon(::javax::swing::text::MutableAttributeSet *, ::javax::swing::Icon *);
-  static void setItalic(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static void setLeftIndent(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setLineSpacing(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setRightIndent(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setSpaceAbove(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setSpaceBelow(::javax::swing::text::MutableAttributeSet *, jfloat);
-  static void setStrikeThrough(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static void setSubscript(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static void setSuperscript(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static void setTabSet(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::TabSet *);
-  static void setUnderline(::javax::swing::text::MutableAttributeSet *, jboolean);
-  static const jint ALIGN_LEFT = 0;
-  static const jint ALIGN_CENTER = 1;
-  static const jint ALIGN_RIGHT = 2;
-  static const jint ALIGN_JUSTIFIED = 3;
-  static ::java::lang::Object * Background;
-  static ::java::lang::Object * BidiLevel;
-  static ::java::lang::Object * Bold;
-  static ::java::lang::Object * ComponentAttribute;
-  static ::java::lang::Object * Family;
-  static ::java::lang::Object * FontFamily;
-  static ::java::lang::Object * FontSize;
-  static ::java::lang::Object * Foreground;
-  static ::java::lang::Object * IconAttribute;
-  static ::java::lang::Object * Italic;
-  static ::java::lang::Object * Size;
-  static ::java::lang::Object * StrikeThrough;
-  static ::java::lang::Object * Subscript;
-  static ::java::lang::Object * Superscript;
-  static ::java::lang::Object * Underline;
-  static ::java::lang::Object * Alignment;
-  static ::java::lang::Object * FirstLineIndent;
-  static ::java::lang::Object * LeftIndent;
-  static ::java::lang::Object * LineSpacing;
-  static ::java::lang::Object * Orientation;
-  static ::java::lang::Object * RightIndent;
-  static ::java::lang::Object * SpaceAbove;
-  static ::java::lang::Object * SpaceBelow;
-  static ::java::lang::Object * TabSet;
-  static ::java::lang::String * ComponentElementName;
-  static ::java::lang::String * IconElementName;
-  static ::java::lang::Object * ComposedTextAttribute;
-  static ::java::lang::Object * ModelAttribute;
-  static ::java::lang::Object * NameAttribute;
-  static ::java::lang::Object * ResolveAttribute;
-public: // actually package-private
-  static ::java::util::ArrayList * keys;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyname;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleConstants__
diff --git a/libjava/javax/swing/text/StyleContext$1.h b/libjava/javax/swing/text/StyleContext$1.h
deleted file mode 100644
index cfbe80ec226..00000000000
--- a/libjava/javax/swing/text/StyleContext$1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleContext$1__
-#define __javax_swing_text_StyleContext$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleContext$1;
-          class StyleContext$SmallAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleContext$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleContext$1(::javax::swing::text::StyleContext$SmallAttributeSet *);
-public:
-  jboolean hasMoreElements();
-  ::java::lang::Object * nextElement();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
-  ::javax::swing::text::StyleContext$SmallAttributeSet * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleContext$1__
diff --git a/libjava/javax/swing/text/StyleContext$NamedStyle.h b/libjava/javax/swing/text/StyleContext$NamedStyle.h
deleted file mode 100644
index 6976975a7f0..00000000000
--- a/libjava/javax/swing/text/StyleContext$NamedStyle.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleContext$NamedStyle__
-#define __javax_swing_text_StyleContext$NamedStyle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-          class ChangeListener;
-          class EventListenerList;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Style;
-          class StyleContext;
-          class StyleContext$NamedStyle;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleContext$NamedStyle : public ::java::lang::Object
-{
-
-public:
-  StyleContext$NamedStyle(::javax::swing::text::StyleContext *);
-  StyleContext$NamedStyle(::javax::swing::text::StyleContext *, ::javax::swing::text::Style *);
-  StyleContext$NamedStyle(::javax::swing::text::StyleContext *, ::java::lang::String *, ::javax::swing::text::Style *);
-  virtual ::java::lang::String * getName();
-  virtual void setName(::java::lang::String *);
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-public: // actually protected
-  virtual void fireStateChanged();
-public:
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual void addAttributes(::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 jboolean isDefined(::java::lang::Object *);
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
-  virtual void removeAttribute(::java::lang::Object *);
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void removeAttributes(::java::util::Enumeration *);
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
-  virtual ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-  static const jlong serialVersionUID = -6690628971806226374LL;
-public: // actually protected
-  ::javax::swing::event::ChangeEvent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeEvent;
-  ::javax::swing::event::EventListenerList * listenerList;
-private:
-  ::javax::swing::text::AttributeSet * attributes;
-public: // actually package-private
-  ::javax::swing::text::StyleContext * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleContext$NamedStyle__
diff --git a/libjava/javax/swing/text/StyleContext$SimpleFontSpec.h b/libjava/javax/swing/text/StyleContext$SimpleFontSpec.h
deleted file mode 100644
index a901647afde..00000000000
--- a/libjava/javax/swing/text/StyleContext$SimpleFontSpec.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleContext$SimpleFontSpec__
-#define __javax_swing_text_StyleContext$SimpleFontSpec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyleContext$SimpleFontSpec;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleContext$SimpleFontSpec : public ::java::lang::Object
-{
-
-public:
-  StyleContext$SimpleFontSpec(::java::lang::String *, jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) family;
-  jint style;
-  jint size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleContext$SimpleFontSpec__
diff --git a/libjava/javax/swing/text/StyleContext$SmallAttributeSet.h b/libjava/javax/swing/text/StyleContext$SmallAttributeSet.h
deleted file mode 100644
index c4f969c1f0e..00000000000
--- a/libjava/javax/swing/text/StyleContext$SmallAttributeSet.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleContext$SmallAttributeSet__
-#define __javax_swing_text_StyleContext$SmallAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class StyleContext;
-          class StyleContext$SmallAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleContext$SmallAttributeSet : public ::java::lang::Object
-{
-
-public:
-  StyleContext$SmallAttributeSet(::javax::swing::text::StyleContext *, ::javax::swing::text::AttributeSet *);
-  StyleContext$SmallAttributeSet(::javax::swing::text::StyleContext *, JArray< ::java::lang::Object * > *);
-  virtual ::java::lang::Object * clone();
-  virtual jboolean containsAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual jboolean containsAttributes(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * copyAttributes();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual jint getAttributeCount();
-  virtual ::java::util::Enumeration * getAttributeNames();
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual jint hashCode();
-  virtual jboolean isDefined(::java::lang::Object *);
-  virtual jboolean isEqual(::javax::swing::text::AttributeSet *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attrs;
-private:
-  ::javax::swing::text::AttributeSet * resolveParent;
-public: // actually package-private
-  ::javax::swing::text::StyleContext * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleContext$SmallAttributeSet__
diff --git a/libjava/javax/swing/text/StyleContext.h b/libjava/javax/swing/text/StyleContext.h
deleted file mode 100644
index c8f91994ee8..00000000000
--- a/libjava/javax/swing/text/StyleContext.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyleContext__
-#define __javax_swing_text_StyleContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-        class FontMetrics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class MutableAttributeSet;
-          class Style;
-          class StyleContext;
-          class StyleContext$NamedStyle;
-          class StyleContext$SmallAttributeSet;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyleContext : public ::java::lang::Object
-{
-
-public:
-  StyleContext();
-public: // actually protected
-  virtual ::javax::swing::text::StyleContext$SmallAttributeSet * createSmallAttributeSet(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::MutableAttributeSet * createLargeAttributeSet(::javax::swing::text::AttributeSet *);
-public:
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual JArray< ::javax::swing::event::ChangeListener * > * getChangeListeners();
-  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *);
-  virtual void removeStyle(::java::lang::String *);
-  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *);
-  virtual ::java::util::Enumeration * getStyleNames();
-private:
-  void readObject(::java::io::ObjectInputStream *);
-  void writeObject(::java::io::ObjectOutputStream *);
-public:
-  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *);
-  virtual ::java::awt::Font * getFont(::java::lang::String *, jint, jint);
-  virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
-  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
-  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
-public: // actually protected
-  virtual jint getCompressionThreshold();
-public:
-  static ::javax::swing::text::StyleContext * getDefaultStyleContext();
-  virtual ::javax::swing::text::AttributeSet * addAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * addAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * getEmptySet();
-  virtual void reclaim(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * removeAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::java::util::Enumeration *);
-  static ::java::lang::Object * getStaticAttribute(::java::lang::Object *);
-  static ::java::lang::Object * getStaticAttributeKey(::java::lang::Object *);
-  static void readAttributeSet(::java::io::ObjectInputStream *, ::javax::swing::text::MutableAttributeSet *);
-  static void writeAttributeSet(::java::io::ObjectOutputStream *, ::javax::swing::text::AttributeSet *);
-  virtual void readAttributes(::java::io::ObjectInputStream *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void writeAttributes(::java::io::ObjectOutputStream *, ::javax::swing::text::AttributeSet *);
-  static void registerStaticAttributeKey(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::swing::text::AttributeSet * searchImmutableSet();
-  void cleanupPool();
-  ::javax::swing::text::MutableAttributeSet * getMutableAttributeSet(::javax::swing::text::AttributeSet *);
-  static const jlong serialVersionUID = 8042858831190784241LL;
-public:
-  static ::java::lang::String * DEFAULT_STYLE;
-public: // actually package-private
-  static ::java::util::Hashtable * sharedAttributeSets;
-  static ::java::util::Hashtable * sharedFonts;
-  static ::javax::swing::text::StyleContext * defaultStyleContext;
-  static const jint compressionThreshold = 9;
-private:
-  static ::java::util::Hashtable * writeAttributeKeys;
-  static ::java::util::Hashtable * readAttributeKeys;
-  ::javax::swing::text::StyleContext$NamedStyle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) styles;
-  ::javax::swing::text::MutableAttributeSet * search;
-  ::java::util::Map * attributeSetPool;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyleContext__
diff --git a/libjava/javax/swing/text/StyledDocument.h b/libjava/javax/swing/text/StyledDocument.h
deleted file mode 100644
index 2eb580ec2be..00000000000
--- a/libjava/javax/swing/text/StyledDocument.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledDocument__
-#define __javax_swing_text_StyledDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentListener;
-          class UndoableEditListener;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class Position;
-          class Segment;
-          class Style;
-          class StyledDocument;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledDocument : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::text::Style * addStyle(::java::lang::String *, ::javax::swing::text::Style *) = 0;
-  virtual void removeStyle(::java::lang::String *) = 0;
-  virtual ::javax::swing::text::Style * getStyle(::java::lang::String *) = 0;
-  virtual void setCharacterAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean) = 0;
-  virtual void setParagraphAttributes(jint, jint, ::javax::swing::text::AttributeSet *, jboolean) = 0;
-  virtual ::javax::swing::text::Style * getLogicalStyle(jint) = 0;
-  virtual void setLogicalStyle(jint, ::javax::swing::text::Style *) = 0;
-  virtual ::javax::swing::text::Element * getParagraphElement(jint) = 0;
-  virtual ::javax::swing::text::Element * getCharacterElement(jint) = 0;
-  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *) = 0;
-  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *) = 0;
-  virtual void addDocumentListener(::javax::swing::event::DocumentListener *) = 0;
-  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
-  virtual ::javax::swing::text::Position * createPosition(jint) = 0;
-  virtual ::javax::swing::text::Element * getDefaultRootElement() = 0;
-  virtual ::javax::swing::text::Position * getEndPosition() = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::Object *) = 0;
-  virtual JArray< ::javax::swing::text::Element * > * getRootElements() = 0;
-  virtual ::javax::swing::text::Position * getStartPosition() = 0;
-  virtual ::java::lang::String * getText(jint, jint) = 0;
-  virtual void getText(jint, jint, ::javax::swing::text::Segment *) = 0;
-  virtual void insertString(jint, ::java::lang::String *, ::javax::swing::text::AttributeSet *) = 0;
-  virtual void putProperty(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void remove(jint, jint) = 0;
-  virtual void removeDocumentListener(::javax::swing::event::DocumentListener *) = 0;
-  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *) = 0;
-  virtual void render(::java::lang::Runnable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_StyledDocument__
diff --git a/libjava/javax/swing/text/StyledEditorKit$AlignmentAction.h b/libjava/javax/swing/text/StyledEditorKit$AlignmentAction.h
deleted file mode 100644
index 5056840d48f..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$AlignmentAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$AlignmentAction__
-#define __javax_swing_text_StyledEditorKit$AlignmentAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$AlignmentAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$AlignmentAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$AlignmentAction(::java::lang::String *, jint);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) a;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$AlignmentAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$BoldAction.h b/libjava/javax/swing/text/StyledEditorKit$BoldAction.h
deleted file mode 100644
index 53f1d4ce794..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$BoldAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$BoldAction__
-#define __javax_swing_text_StyledEditorKit$BoldAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$BoldAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$BoldAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$BoldAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$BoldAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$CaretTracker.h b/libjava/javax/swing/text/StyledEditorKit$CaretTracker.h
deleted file mode 100644
index bda26b61b6a..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$CaretTracker.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$CaretTracker__
-#define __javax_swing_text_StyledEditorKit$CaretTracker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class CaretEvent;
-      }
-      namespace text
-      {
-          class StyledEditorKit;
-          class StyledEditorKit$CaretTracker;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$CaretTracker : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyledEditorKit$CaretTracker(::javax::swing::text::StyledEditorKit *);
-public:
-  virtual void caretUpdate(::javax::swing::event::CaretEvent *);
-public: // actually package-private
-  ::javax::swing::text::StyledEditorKit * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$CaretTracker__
diff --git a/libjava/javax/swing/text/StyledEditorKit$FontFamilyAction.h b/libjava/javax/swing/text/StyledEditorKit$FontFamilyAction.h
deleted file mode 100644
index 55ba1378478..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$FontFamilyAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$FontFamilyAction__
-#define __javax_swing_text_StyledEditorKit$FontFamilyAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$FontFamilyAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$FontFamilyAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$FontFamilyAction(::java::lang::String *, ::java::lang::String *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) family;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$FontFamilyAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$FontSizeAction.h b/libjava/javax/swing/text/StyledEditorKit$FontSizeAction.h
deleted file mode 100644
index 16d6cf3c854..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$FontSizeAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$FontSizeAction__
-#define __javax_swing_text_StyledEditorKit$FontSizeAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$FontSizeAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$FontSizeAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$FontSizeAction(::java::lang::String *, jint);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) size;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$FontSizeAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$ForegroundAction.h b/libjava/javax/swing/text/StyledEditorKit$ForegroundAction.h
deleted file mode 100644
index 7b71ef5705e..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$ForegroundAction.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$ForegroundAction__
-#define __javax_swing_text_StyledEditorKit$ForegroundAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$ForegroundAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$ForegroundAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$ForegroundAction(::java::lang::String *, ::java::awt::Color *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit$StyledTextAction)))) fg;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$ForegroundAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$ItalicAction.h b/libjava/javax/swing/text/StyledEditorKit$ItalicAction.h
deleted file mode 100644
index af60f01d3c6..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$ItalicAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$ItalicAction__
-#define __javax_swing_text_StyledEditorKit$ItalicAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$ItalicAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$ItalicAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$ItalicAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$ItalicAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$StyledTextAction.h b/libjava/javax/swing/text/StyledEditorKit$StyledTextAction.h
deleted file mode 100644
index c85bc8c8926..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$StyledTextAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$StyledTextAction__
-#define __javax_swing_text_StyledEditorKit$StyledTextAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace text
-      {
-          class AttributeSet;
-          class StyledDocument;
-          class StyledEditorKit;
-          class StyledEditorKit$StyledTextAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$StyledTextAction : public ::javax::swing::text::TextAction
-{
-
-public:
-  StyledEditorKit$StyledTextAction(::java::lang::String *);
-public: // actually protected
-  virtual ::javax::swing::JEditorPane * getEditor(::java::awt::event::ActionEvent *);
-  virtual void setCharacterAttributes(::javax::swing::JEditorPane *, ::javax::swing::text::AttributeSet *, jboolean);
-  virtual ::javax::swing::text::StyledDocument * getStyledDocument(::javax::swing::JEditorPane *);
-  virtual ::javax::swing::text::StyledEditorKit * getStyledEditorKit(::javax::swing::JEditorPane *);
-  virtual void setParagraphAttributes(::javax::swing::JEditorPane *, ::javax::swing::text::AttributeSet *, jboolean);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$StyledTextAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit$StyledViewFactory.h b/libjava/javax/swing/text/StyledEditorKit$StyledViewFactory.h
deleted file mode 100644
index 0e5ad47a9d0..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$StyledViewFactory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$StyledViewFactory__
-#define __javax_swing_text_StyledEditorKit$StyledViewFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class StyledEditorKit$StyledViewFactory;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$StyledViewFactory : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyledEditorKit$StyledViewFactory();
-public:
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$StyledViewFactory__
diff --git a/libjava/javax/swing/text/StyledEditorKit$UnderlineAction.h b/libjava/javax/swing/text/StyledEditorKit$UnderlineAction.h
deleted file mode 100644
index 4df2fa6d1c1..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit$UnderlineAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit$UnderlineAction__
-#define __javax_swing_text_StyledEditorKit$UnderlineAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class StyledEditorKit$UnderlineAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit$UnderlineAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  StyledEditorKit$UnderlineAction();
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit$UnderlineAction__
diff --git a/libjava/javax/swing/text/StyledEditorKit.h b/libjava/javax/swing/text/StyledEditorKit.h
deleted file mode 100644
index e5ce1b4b4fa..00000000000
--- a/libjava/javax/swing/text/StyledEditorKit.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_StyledEditorKit__
-#define __javax_swing_text_StyledEditorKit__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultEditorKit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-        class JEditorPane;
-      namespace text
-      {
-          class Document;
-          class Element;
-          class MutableAttributeSet;
-          class StyledEditorKit;
-          class StyledEditorKit$CaretTracker;
-          class StyledEditorKit$StyledViewFactory;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::StyledEditorKit : public ::javax::swing::text::DefaultEditorKit
-{
-
-public:
-  StyledEditorKit();
-  virtual ::java::lang::Object * clone();
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual ::javax::swing::text::MutableAttributeSet * getInputAttributes();
-  virtual ::javax::swing::text::Element * getCharacterAttributeRun();
-  virtual ::javax::swing::text::Document * createDefaultDocument();
-  virtual void install(::javax::swing::JEditorPane *);
-  virtual void deinstall(::javax::swing::JEditorPane *);
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-public: // actually protected
-  virtual void createInputAttributes(::javax::swing::text::Element *, ::javax::swing::text::MutableAttributeSet *);
-private:
-  static const jlong serialVersionUID = 7002391892985555948LL;
-public: // actually package-private
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultEditorKit)))) currentRun;
-  ::javax::swing::text::MutableAttributeSet * inputAttributes;
-  ::javax::swing::text::StyledEditorKit$CaretTracker * caretTracker;
-  ::javax::swing::text::StyledEditorKit$StyledViewFactory * viewFactory;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_StyledEditorKit__
diff --git a/libjava/javax/swing/text/TabExpander.h b/libjava/javax/swing/text/TabExpander.h
deleted file mode 100644
index 8983223a436..00000000000
--- a/libjava/javax/swing/text/TabExpander.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TabExpander__
-#define __javax_swing_text_TabExpander__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class TabExpander;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TabExpander : public ::java::lang::Object
-{
-
-public:
-  virtual jfloat nextTabStop(jfloat, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_TabExpander__
diff --git a/libjava/javax/swing/text/TabSet.h b/libjava/javax/swing/text/TabSet.h
deleted file mode 100644
index 943a115099e..00000000000
--- a/libjava/javax/swing/text/TabSet.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TabSet__
-#define __javax_swing_text_TabSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class TabSet;
-          class TabStop;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TabSet : public ::java::lang::Object
-{
-
-public:
-  TabSet(JArray< ::javax::swing::text::TabStop * > *);
-  virtual ::javax::swing::text::TabStop * getTab(jint);
-  virtual ::javax::swing::text::TabStop * getTabAfter(jfloat);
-  virtual jint getTabCount();
-  virtual jint getTabIndex(::javax::swing::text::TabStop *);
-  virtual jint getTabIndexAfter(jfloat);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = 2367703481999080593LL;
-public: // actually package-private
-  JArray< ::javax::swing::text::TabStop * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) tabs;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TabSet__
diff --git a/libjava/javax/swing/text/TabStop.h b/libjava/javax/swing/text/TabStop.h
deleted file mode 100644
index cc8fb1232ff..00000000000
--- a/libjava/javax/swing/text/TabStop.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TabStop__
-#define __javax_swing_text_TabStop__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class TabStop;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TabStop : public ::java::lang::Object
-{
-
-public:
-  TabStop(jfloat);
-  TabStop(jfloat, jint, jint);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint getAlignment();
-  virtual jint getLeader();
-  virtual jfloat getPosition();
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -5381995917363605058LL;
-public:
-  static const jint ALIGN_LEFT = 0;
-  static const jint ALIGN_RIGHT = 1;
-  static const jint ALIGN_CENTER = 2;
-  static const jint ALIGN_DECIMAL = 4;
-  static const jint ALIGN_BAR = 5;
-  static const jint LEAD_NONE = 0;
-  static const jint LEAD_DOTS = 1;
-  static const jint LEAD_HYPHENS = 2;
-  static const jint LEAD_UNDERLINE = 3;
-  static const jint LEAD_THICKLINE = 4;
-  static const jint LEAD_EQUALS = 5;
-public: // actually package-private
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) pos;
-  jint align;
-  jint leader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TabStop__
diff --git a/libjava/javax/swing/text/TabableView.h b/libjava/javax/swing/text/TabableView.h
deleted file mode 100644
index b9e9a7a86f0..00000000000
--- a/libjava/javax/swing/text/TabableView.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TabableView__
-#define __javax_swing_text_TabableView__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class TabExpander;
-          class TabableView;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TabableView : public ::java::lang::Object
-{
-
-public:
-  virtual jfloat getPartialSpan(jint, jint) = 0;
-  virtual jfloat getTabbedSpan(jfloat, ::javax::swing::text::TabExpander *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_TabableView__
diff --git a/libjava/javax/swing/text/TableView$TableCell.h b/libjava/javax/swing/text/TableView$TableCell.h
deleted file mode 100644
index 44efc2f6c9b..00000000000
--- a/libjava/javax/swing/text/TableView$TableCell.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TableView$TableCell__
-#define __javax_swing_text_TableView$TableCell__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class TableView;
-          class TableView$TableCell;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TableView$TableCell : public ::javax::swing::text::BoxView
-{
-
-public:
-  TableView$TableCell(::javax::swing::text::TableView *, ::javax::swing::text::Element *);
-  virtual jint getColumnCount();
-  virtual jint getRowCount();
-  virtual void setGridLocation(jint, jint);
-  virtual jint getGridRow();
-  virtual jint getGridColumn();
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) row;
-  jint column;
-public: // actually package-private
-  ::javax::swing::text::TableView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TableView$TableCell__
diff --git a/libjava/javax/swing/text/TableView$TableRow.h b/libjava/javax/swing/text/TableView$TableRow.h
deleted file mode 100644
index 0cb23241da4..00000000000
--- a/libjava/javax/swing/text/TableView$TableRow.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TableView$TableRow__
-#define __javax_swing_text_TableView$TableRow__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class TableView;
-          class TableView$TableRow;
-          class View;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TableView$TableRow : public ::javax::swing::text::BoxView
-{
-
-public:
-  TableView$TableRow(::javax::swing::text::TableView *, ::javax::swing::text::Element *);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-public: // actually protected
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-public:
-  virtual jint getResizeWeight(jint);
-public: // actually protected
-  virtual ::javax::swing::text::View * getViewAtPosition(jint, ::java::awt::Rectangle *);
-public: // actually package-private
-  ::javax::swing::text::TableView * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) this$0;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TableView$TableRow__
diff --git a/libjava/javax/swing/text/TableView.h b/libjava/javax/swing/text/TableView.h
deleted file mode 100644
index 7bf5f836976..00000000000
--- a/libjava/javax/swing/text/TableView.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TableView__
-#define __javax_swing_text_TableView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class Element;
-          class TableView;
-          class TableView$TableCell;
-          class TableView$TableRow;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TableView : public ::javax::swing::text::BoxView
-{
-
-public:
-  TableView(::javax::swing::text::Element *);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-public: // actually protected
-  virtual ::javax::swing::text::TableView$TableRow * createTableRow(::javax::swing::text::Element *);
-  virtual ::javax::swing::text::TableView$TableCell * createTableCell(::javax::swing::text::Element *);
-  virtual void forwardUpdate(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void layoutColumns(jint, JArray< jint > *, JArray< jint > *, JArray< ::javax::swing::SizeRequirements * > *);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual ::javax::swing::text::View * getViewAtPosition(jint, ::java::awt::Rectangle *);
-private:
-  void updateColumnRequirements();
-public: // actually package-private
-  JArray< jint > * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) columnOffsets;
-  JArray< jint > * columnSpans;
-  JArray< ::javax::swing::SizeRequirements * > * columnRequirements;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TableView__
diff --git a/libjava/javax/swing/text/TextAction$HorizontalMovementAction.h b/libjava/javax/swing/text/TextAction$HorizontalMovementAction.h
deleted file mode 100644
index 93bf43700bb..00000000000
--- a/libjava/javax/swing/text/TextAction$HorizontalMovementAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TextAction$HorizontalMovementAction__
-#define __javax_swing_text_TextAction$HorizontalMovementAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class TextAction$HorizontalMovementAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TextAction$HorizontalMovementAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  TextAction$HorizontalMovementAction(::java::lang::String *, jint);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint) = 0;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::TextAction)))) dir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TextAction$HorizontalMovementAction__
diff --git a/libjava/javax/swing/text/TextAction$VerticalMovementAction.h b/libjava/javax/swing/text/TextAction$VerticalMovementAction.h
deleted file mode 100644
index b25ec52ce8a..00000000000
--- a/libjava/javax/swing/text/TextAction$VerticalMovementAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TextAction$VerticalMovementAction__
-#define __javax_swing_text_TextAction$VerticalMovementAction__
-
-#pragma interface
-
-#include <javax/swing/text/TextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Caret;
-          class TextAction$VerticalMovementAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TextAction$VerticalMovementAction : public ::javax::swing::text::TextAction
-{
-
-public: // actually package-private
-  TextAction$VerticalMovementAction(::java::lang::String *, jint);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  virtual void actionPerformedImpl(::javax::swing::text::Caret *, jint) = 0;
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::TextAction)))) dir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TextAction$VerticalMovementAction__
diff --git a/libjava/javax/swing/text/TextAction.h b/libjava/javax/swing/text/TextAction.h
deleted file mode 100644
index cfb9c1c9819..00000000000
--- a/libjava/javax/swing/text/TextAction.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_TextAction__
-#define __javax_swing_text_TextAction__
-
-#pragma interface
-
-#include <javax/swing/AbstractAction.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Action;
-      namespace text
-      {
-          class JTextComponent;
-          class TextAction;
-      }
-    }
-  }
-}
-
-class javax::swing::text::TextAction : public ::javax::swing::AbstractAction
-{
-
-public:
-  TextAction(::java::lang::String *);
-public: // actually protected
-  virtual ::javax::swing::text::JTextComponent * getTextComponent(::java::awt::event::ActionEvent *);
-public:
-  static JArray< ::javax::swing::Action * > * augmentList(JArray< ::javax::swing::Action * > *, JArray< ::javax::swing::Action * > *);
-public: // actually protected
-  virtual ::javax::swing::text::JTextComponent * getFocusedComponent();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_TextAction__
diff --git a/libjava/javax/swing/text/Utilities.h b/libjava/javax/swing/text/Utilities.h
deleted file mode 100644
index ec04c43fe38..00000000000
--- a/libjava/javax/swing/text/Utilities.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_Utilities__
-#define __javax_swing_text_Utilities__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class FontMetrics;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class JTextComponent;
-          class Segment;
-          class TabExpander;
-          class Utilities;
-      }
-    }
-  }
-}
-
-class javax::swing::text::Utilities : public ::java::lang::Object
-{
-
-public:
-  Utilities();
-  static jint drawTabbedText(::javax::swing::text::Segment *, jint, jint, ::java::awt::Graphics *, ::javax::swing::text::TabExpander *, jint);
-  static jint getTabbedTextWidth(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, ::javax::swing::text::TabExpander *, jint);
-  static jint getTabbedTextOffset(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, jint, ::javax::swing::text::TabExpander *, jint, jboolean);
-  static jint getTabbedTextOffset(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, jint, ::javax::swing::text::TabExpander *, jint);
-  static jint getNextWord(::javax::swing::text::JTextComponent *, jint);
-  static jint getPreviousWord(::javax::swing::text::JTextComponent *, jint);
-  static jint getWordStart(::javax::swing::text::JTextComponent *, jint);
-  static jint getWordEnd(::javax::swing::text::JTextComponent *, jint);
-  static jint getRowEnd(::javax::swing::text::JTextComponent *, jint);
-  static jint getRowStart(::javax::swing::text::JTextComponent *, jint);
-  static jint getBreakLocation(::javax::swing::text::Segment *, ::java::awt::FontMetrics *, jint, jint, ::javax::swing::text::TabExpander *, jint);
-  static ::javax::swing::text::Element * getParagraphElement(::javax::swing::text::JTextComponent *, jint);
-  static jint getPositionAbove(::javax::swing::text::JTextComponent *, jint, jint);
-  static jint getPositionBelow(::javax::swing::text::JTextComponent *, jint, jint);
-public: // actually package-private
-  static jint getNextVisualPositionFrom(::javax::swing::text::JTextComponent *, jint, jint);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_Utilities__
diff --git a/libjava/javax/swing/text/View.h b/libjava/javax/swing/text/View.h
deleted file mode 100644
index f9d97e5731f..00000000000
--- a/libjava/javax/swing/text/View.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_View__
-#define __javax_swing_text_View__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Container;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Document;
-          class Element;
-          class Position$Bias;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::View : public ::java::lang::Object
-{
-
-public:
-  View(::javax::swing::text::Element *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *) = 0;
-  virtual void setParent(::javax::swing::text::View *);
-  virtual ::javax::swing::text::View * getParent();
-  virtual ::java::awt::Container * getContainer();
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual ::javax::swing::text::Element * getElement();
-  virtual jfloat getPreferredSpan(jint) = 0;
-  virtual jint getResizeWeight(jint);
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual void setSize(jfloat, jfloat);
-  virtual jfloat getAlignment(jint);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual jboolean isVisible();
-  virtual jint getViewCount();
-  virtual ::javax::swing::text::View * getView(jint);
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-  virtual void insert(jint, ::javax::swing::text::View *);
-  virtual void append(::javax::swing::text::View *);
-  virtual void removeAll();
-  virtual void remove(jint);
-  virtual ::javax::swing::text::View * createFragment(jint, jint);
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-  virtual ::java::awt::Shape * getChildAllocation(jint, ::java::awt::Shape *);
-  virtual jint getViewIndex(jfloat, jfloat, ::java::awt::Shape *);
-  virtual ::java::lang::String * getToolTipText(jfloat, jfloat, ::java::awt::Shape *);
-  virtual ::java::awt::Graphics * getGraphics();
-  virtual void preferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-  virtual jint getBreakWeight(jint, jfloat, jfloat);
-  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
-  virtual jint getViewIndex(jint, ::javax::swing::text::Position$Bias *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually protected
-  virtual jboolean updateChildren(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::javax::swing::text::ViewFactory *);
-  virtual void forwardUpdate(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void forwardUpdateToView(::javax::swing::text::View *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void updateLayout(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::java::awt::Shape *);
-public:
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *) = 0;
-  virtual ::java::awt::Shape * modelToView(jint, ::javax::swing::text::Position$Bias *, jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *) = 0;
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *);
-public: // actually protected
-  virtual void dump();
-public: // actually package-private
-  virtual void dump(jint);
-public:
-  virtual jint getNextVisualPositionFrom(jint, ::javax::swing::text::Position$Bias *, ::java::awt::Shape *, jint, JArray< ::javax::swing::text::Position$Bias * > *);
-  static const jint BadBreakWeight = 0;
-  static const jint ExcellentBreakWeight = 2000;
-  static const jint ForcedBreakWeight = 3000;
-  static const jint GoodBreakWeight = 1000;
-  static const jint X_AXIS = 0;
-  static const jint Y_AXIS = 1;
-private:
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elt;
-  ::javax::swing::text::View * parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_View__
diff --git a/libjava/javax/swing/text/ViewFactory.h b/libjava/javax/swing/text/ViewFactory.h
deleted file mode 100644
index a65181ab288..00000000000
--- a/libjava/javax/swing/text/ViewFactory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ViewFactory__
-#define __javax_swing_text_ViewFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class View;
-          class ViewFactory;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ViewFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_ViewFactory__
diff --git a/libjava/javax/swing/text/WrappedPlainView$WrappedLine.h b/libjava/javax/swing/text/WrappedPlainView$WrappedLine.h
deleted file mode 100644
index c96da223418..00000000000
--- a/libjava/javax/swing/text/WrappedPlainView$WrappedLine.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_WrappedPlainView$WrappedLine__
-#define __javax_swing_text_WrappedPlainView$WrappedLine__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class Position$Bias;
-          class ViewFactory;
-          class WrappedPlainView;
-          class WrappedPlainView$WrappedLine;
-      }
-    }
-  }
-}
-
-class javax::swing::text::WrappedPlainView$WrappedLine : public ::javax::swing::text::View
-{
-
-public:
-  WrappedPlainView$WrappedLine(::javax::swing::text::WrappedPlainView *, ::javax::swing::text::Element *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-private:
-  jint determineNumLines();
-public:
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-public: // actually package-private
-  virtual void updateDamage(::java::awt::Rectangle *);
-public:
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) numLines;
-  ::javax::swing::text::WrappedPlainView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_WrappedPlainView$WrappedLine__
diff --git a/libjava/javax/swing/text/WrappedPlainView$WrappedLineCreator.h b/libjava/javax/swing/text/WrappedPlainView$WrappedLineCreator.h
deleted file mode 100644
index eb249a0c0c6..00000000000
--- a/libjava/javax/swing/text/WrappedPlainView$WrappedLineCreator.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_WrappedPlainView$WrappedLineCreator__
-#define __javax_swing_text_WrappedPlainView$WrappedLineCreator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class View;
-          class WrappedPlainView;
-          class WrappedPlainView$WrappedLineCreator;
-      }
-    }
-  }
-}
-
-class javax::swing::text::WrappedPlainView$WrappedLineCreator : public ::java::lang::Object
-{
-
-public: // actually package-private
-  WrappedPlainView$WrappedLineCreator(::javax::swing::text::WrappedPlainView *);
-public:
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-public: // actually package-private
-  ::javax::swing::text::WrappedPlainView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_WrappedPlainView$WrappedLineCreator__
diff --git a/libjava/javax/swing/text/WrappedPlainView.h b/libjava/javax/swing/text/WrappedPlainView.h
deleted file mode 100644
index 1082073cc34..00000000000
--- a/libjava/javax/swing/text/WrappedPlainView.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_WrappedPlainView__
-#define __javax_swing_text_WrappedPlainView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class FontMetrics;
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class Element;
-          class Segment;
-          class ViewFactory;
-          class WrappedPlainView;
-      }
-    }
-  }
-}
-
-class javax::swing::text::WrappedPlainView : public ::javax::swing::text::BoxView
-{
-
-public:
-  WrappedPlainView(::javax::swing::text::Element *);
-  WrappedPlainView(::javax::swing::text::Element *, jboolean);
-public: // actually protected
-  virtual ::javax::swing::text::Segment * getLineBuffer();
-public:
-  virtual jfloat nextTabStop(jfloat, jint);
-public: // actually protected
-  virtual jint getTabSize();
-  virtual void drawLine(jint, jint, ::java::awt::Graphics *, jint, jint);
-  virtual jint drawSelectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual jint drawUnselectedText(::java::awt::Graphics *, jint, jint, jint, jint);
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual jint calculateBreakPosition(jint, jint);
-public: // actually package-private
-  virtual void updateMetrics();
-public:
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getMaximumSpan(jint);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-private:
-  void updateChildren(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual void setSize(jfloat, jfloat);
-public: // actually package-private
-  ::java::awt::Color * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) selectedColor;
-  ::java::awt::Color * unselectedColor;
-  ::java::awt::Color * disabledColor;
-  ::java::awt::FontMetrics * metrics;
-  jboolean wordWrap;
-  ::javax::swing::text::ViewFactory * viewFactory;
-  jint selectionStart;
-  jint selectionEnd;
-  jint lineHeight;
-private:
-  jint tabBase;
-  jint tabSize;
-  ::javax::swing::text::Segment * lineBuffer;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_WrappedPlainView__
diff --git a/libjava/javax/swing/text/ZoneView$Zone.h b/libjava/javax/swing/text/ZoneView$Zone.h
deleted file mode 100644
index 86a5bc87c12..00000000000
--- a/libjava/javax/swing/text/ZoneView$Zone.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ZoneView$Zone__
-#define __javax_swing_text_ZoneView$Zone__
-
-#pragma interface
-
-#include <javax/swing/text/AsyncBoxView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class Position;
-          class ZoneView$Zone;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ZoneView$Zone : public ::javax::swing::text::AsyncBoxView
-{
-
-public: // actually package-private
-  ZoneView$Zone(::javax::swing::text::Element *, ::javax::swing::text::Position *, ::javax::swing::text::Position *, jint);
-public:
-  virtual jint getStartOffset();
-  virtual jint getEndOffset();
-private:
-  ::javax::swing::text::Position * __attribute__((aligned(__alignof__( ::javax::swing::text::AsyncBoxView)))) p0;
-  ::javax::swing::text::Position * p1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ZoneView$Zone__
diff --git a/libjava/javax/swing/text/ZoneView.h b/libjava/javax/swing/text/ZoneView.h
deleted file mode 100644
index 324d90c0a33..00000000000
--- a/libjava/javax/swing/text/ZoneView.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_ZoneView__
-#define __javax_swing_text_ZoneView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-          class DocumentEvent$ElementChange;
-      }
-      namespace text
-      {
-          class Element;
-          class View;
-          class ViewFactory;
-          class ZoneView;
-      }
-    }
-  }
-}
-
-class javax::swing::text::ZoneView : public ::javax::swing::text::BoxView
-{
-
-public:
-  ZoneView(::javax::swing::text::Element *, jint);
-  virtual void setMaximumZoneSize(jint);
-  virtual jint getMaximumZoneSize();
-  virtual void setMaxZonesLoaded(jint);
-  virtual jint getMaxZonesLoaded();
-public: // actually protected
-  virtual void zoneWasLoaded(::javax::swing::text::View *);
-  virtual void unloadZone(::javax::swing::text::View *);
-  virtual jboolean isZoneLoaded(::javax::swing::text::View *);
-  virtual ::javax::swing::text::View * createZone(jint, jint);
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual jint getViewIndexAtPosition(jint);
-public:
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-public: // actually protected
-  virtual jboolean updateChildren(::javax::swing::event::DocumentEvent$ElementChange *, ::javax::swing::event::DocumentEvent *, ::javax::swing::text::ViewFactory *);
-private:
-  void unloadOldestZones();
-  void checkZoneAt(jint);
-  void splitZone(jint, jint, jint);
-  jint getPreferredZoneEnd(jint);
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) maximumZoneSize;
-  jint maxZonesLoaded;
-  ::java::util::LinkedList * loadedZones;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_ZoneView__
diff --git a/libjava/javax/swing/text/html/BRView.h b/libjava/javax/swing/text/html/BRView.h
deleted file mode 100644
index aee03f09e05..00000000000
--- a/libjava/javax/swing/text/html/BRView.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_BRView__
-#define __javax_swing_text_html_BRView__
-
-#pragma interface
-
-#include <javax/swing/text/html/InlineView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class BRView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::BRView : public ::javax::swing::text::html::InlineView
-{
-
-public:
-  BRView(::javax::swing::text::Element *);
-  virtual jint getBreakWeight(jint, jfloat, jfloat);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_BRView__
diff --git a/libjava/javax/swing/text/html/BlockView$PositionInfo.h b/libjava/javax/swing/text/html/BlockView$PositionInfo.h
deleted file mode 100644
index 1e19b610fd4..00000000000
--- a/libjava/javax/swing/text/html/BlockView$PositionInfo.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_BlockView$PositionInfo__
-#define __javax_swing_text_html_BlockView$PositionInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class BlockView$PositionInfo;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::BlockView$PositionInfo : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BlockView$PositionInfo(jint, ::gnu::javax::swing::text::html::css::Length *, ::gnu::javax::swing::text::html::css::Length *, ::gnu::javax::swing::text::html::css::Length *, ::gnu::javax::swing::text::html::css::Length *);
-  static const jint STATIC = 0;
-  static const jint RELATIVE = 1;
-  static const jint ABSOLUTE = 2;
-  static const jint FIXED = 3;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::gnu::javax::swing::text::html::css::Length * left;
-  ::gnu::javax::swing::text::html::css::Length * right;
-  ::gnu::javax::swing::text::html::css::Length * top;
-  ::gnu::javax::swing::text::html::css::Length * bottom;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_BlockView$PositionInfo__
diff --git a/libjava/javax/swing/text/html/BlockView.h b/libjava/javax/swing/text/html/BlockView.h
deleted file mode 100644
index b8608f5c001..00000000000
--- a/libjava/javax/swing/text/html/BlockView.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_BlockView__
-#define __javax_swing_text_html_BlockView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class View;
-          class ViewFactory;
-        namespace html
-        {
-            class BlockView;
-            class StyleSheet;
-            class StyleSheet$BoxPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::BlockView : public ::javax::swing::text::BoxView
-{
-
-public:
-  BlockView(::javax::swing::text::Element *, jint);
-  virtual void setParent(::javax::swing::text::View *);
-public: // actually protected
-  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-private:
-  jboolean setCSSSpan(::javax::swing::SizeRequirements *, jint);
-  void constrainSize(jint, ::javax::swing::SizeRequirements *, ::javax::swing::SizeRequirements *);
-public: // actually protected
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-private:
-  void positionView(jint, jint, jint, JArray< jint > *, JArray< jint > *);
-public:
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual jint getResizeWeight(jint);
-  virtual jfloat getAlignment(jint);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getMaximumSpan(jint);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-public:
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-private:
-  void fetchLayoutInfo(::javax::swing::text::View *);
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) attributes;
-public: // actually package-private
-  ::javax::swing::text::html::StyleSheet$BoxPainter * painter;
-private:
-  JArray< ::gnu::javax::swing::text::html::css::Length * > * cssSpans;
-  ::java::util::HashMap * positionInfo;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_BlockView__
diff --git a/libjava/javax/swing/text/html/CSS$Attribute.h b/libjava/javax/swing/text/html/CSS$Attribute.h
deleted file mode 100644
index 44c82500b25..00000000000
--- a/libjava/javax/swing/text/html/CSS$Attribute.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_CSS$Attribute__
-#define __javax_swing_text_html_CSS$Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class CSS$Attribute;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::CSS$Attribute : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CSS$Attribute(::java::lang::String *, jboolean, ::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-  jboolean isInherited();
-  ::java::lang::String * getDefaultValue();
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND;
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_ATTACHMENT;
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_IMAGE;
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_POSITION;
-  static ::javax::swing::text::html::CSS$Attribute * BACKGROUND_REPEAT;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM_WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT_WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT_WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP_WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * CLEAR;
-  static ::javax::swing::text::html::CSS$Attribute * COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * DISPLAY;
-  static ::javax::swing::text::html::CSS$Attribute * FLOAT;
-  static ::javax::swing::text::html::CSS$Attribute * FONT;
-  static ::javax::swing::text::html::CSS$Attribute * FONT_FAMILY;
-  static ::javax::swing::text::html::CSS$Attribute * FONT_SIZE;
-  static ::javax::swing::text::html::CSS$Attribute * FONT_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * FONT_VARIANT;
-  static ::javax::swing::text::html::CSS$Attribute * FONT_WEIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * HEIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * LETTER_SPACING;
-  static ::javax::swing::text::html::CSS$Attribute * LINE_HEIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE_IMAGE;
-  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE_POSITION;
-  static ::javax::swing::text::html::CSS$Attribute * LIST_STYLE_TYPE;
-  static ::javax::swing::text::html::CSS$Attribute * MARGIN;
-  static ::javax::swing::text::html::CSS$Attribute * MARGIN_BOTTOM;
-  static ::javax::swing::text::html::CSS$Attribute * MARGIN_LEFT;
-  static ::javax::swing::text::html::CSS$Attribute * MARGIN_RIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * MARGIN_TOP;
-  static ::javax::swing::text::html::CSS$Attribute * PADDING;
-  static ::javax::swing::text::html::CSS$Attribute * PADDING_BOTTOM;
-  static ::javax::swing::text::html::CSS$Attribute * PADDING_LEFT;
-  static ::javax::swing::text::html::CSS$Attribute * PADDING_RIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * PADDING_TOP;
-  static ::javax::swing::text::html::CSS$Attribute * TEXT_ALIGN;
-  static ::javax::swing::text::html::CSS$Attribute * TEXT_DECORATION;
-  static ::javax::swing::text::html::CSS$Attribute * TEXT_INDENT;
-  static ::javax::swing::text::html::CSS$Attribute * TEXT_TRANSFORM;
-  static ::javax::swing::text::html::CSS$Attribute * VERTICAL_ALIGN;
-  static ::javax::swing::text::html::CSS$Attribute * WHITE_SPACE;
-  static ::javax::swing::text::html::CSS$Attribute * WIDTH;
-  static ::javax::swing::text::html::CSS$Attribute * WORD_SPACING;
-public: // actually package-private
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT_STYLE;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_TOP_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_BOTTOM_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_LEFT_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_RIGHT_COLOR;
-  static ::javax::swing::text::html::CSS$Attribute * BORDER_SPACING;
-  static ::javax::swing::text::html::CSS$Attribute * POSITION;
-  static ::javax::swing::text::html::CSS$Attribute * LEFT;
-  static ::javax::swing::text::html::CSS$Attribute * RIGHT;
-  static ::javax::swing::text::html::CSS$Attribute * TOP;
-  static ::javax::swing::text::html::CSS$Attribute * BOTTOM;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attStr;
-  jboolean isInherited__;
-  ::java::lang::String * defaultValue;
-  static ::java::util::HashMap * attributeMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_CSS$Attribute__
diff --git a/libjava/javax/swing/text/html/CSS.h b/libjava/javax/swing/text/html/CSS.h
deleted file mode 100644
index 1f3922db0bb..00000000000
--- a/libjava/javax/swing/text/html/CSS.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_CSS__
-#define __javax_swing_text_html_CSS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class CSS;
-            class CSS$Attribute;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::CSS : public ::java::lang::Object
-{
-
-public:
-  CSS();
-  static JArray< ::javax::swing::text::html::CSS$Attribute * > * getAllAttributeKeys();
-  static ::javax::swing::text::html::CSS$Attribute * getAttribute(::java::lang::String *);
-public: // actually package-private
-  static ::java::lang::Object * getValue(::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
-  static void addInternal(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
-private:
-  static void parseBackgroundShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
-  static void parsePaddingShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
-  static void parseMarginShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *);
-  static void parseBorderShorthand(::javax::swing::text::MutableAttributeSet *, ::java::lang::String *, ::javax::swing::text::html::CSS$Attribute *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_CSS__
diff --git a/libjava/javax/swing/text/html/CSSBorder.h b/libjava/javax/swing/text/html/CSSBorder.h
deleted file mode 100644
index aa836ff65e1..00000000000
--- a/libjava/javax/swing/text/html/CSSBorder.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_CSSBorder__
-#define __javax_swing_text_html_CSSBorder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Graphics;
-        class Insets;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class CSS$Attribute;
-            class CSSBorder;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::CSSBorder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CSSBorder(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::StyleSheet *);
-private:
-  jint getBorderStyle(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::CSS$Attribute *);
-  ::java::awt::Color * getBorderColor(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::CSS$Attribute *);
-  jint getBorderWidth(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::javax::swing::text::html::StyleSheet *);
-public:
-  virtual ::java::awt::Insets * getBorderInsets(::java::awt::Component *);
-  virtual jboolean isBorderOpaque();
-  virtual void paintBorder(::java::awt::Component *, ::java::awt::Graphics *, jint, jint, jint, jint);
-private:
-  void paintBorderLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintDottedLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintDashedLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintSolidLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintDoubleLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintGrooveLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintRidgeLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintOutsetLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  void paintInsetLine(::java::awt::Graphics *, jint, jint, jint, jint, jint, ::java::awt::Color *, jboolean);
-  static const jint STYLE_NOT_SET = -1;
-  static const jint STYLE_NONE = 0;
-  static const jint STYLE_HIDDEN = 1;
-  static const jint STYLE_DOTTED = 2;
-  static const jint STYLE_DASHED = 3;
-  static const jint STYLE_SOLID = 4;
-  static const jint STYLE_DOUBLE = 5;
-  static const jint STYLE_GROOVE = 6;
-  static const jint STYLE_RIDGE = 7;
-  static const jint STYLE_INSET = 8;
-  static const jint STYLE_OUTSET = 9;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
-  jint right;
-  jint top;
-  jint bottom;
-  jint leftStyle;
-  jint rightStyle;
-  jint topStyle;
-  ::java::awt::Color * topColor;
-  ::java::awt::Color * bottomColor;
-  ::java::awt::Color * leftColor;
-  ::java::awt::Color * rightColor;
-  jint bottomStyle;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_CSSBorder__
diff --git a/libjava/javax/swing/text/html/CSSParser$CSSParserCallback.h b/libjava/javax/swing/text/html/CSSParser$CSSParserCallback.h
deleted file mode 100644
index a2bb6622879..00000000000
--- a/libjava/javax/swing/text/html/CSSParser$CSSParserCallback.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_CSSParser$CSSParserCallback__
-#define __javax_swing_text_html_CSSParser$CSSParserCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class CSSParser$CSSParserCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::CSSParser$CSSParserCallback : public ::java::lang::Object
-{
-
-public:
-  virtual void handleImport(::java::lang::String *) = 0;
-  virtual void startRule() = 0;
-  virtual void endRule() = 0;
-  virtual void handleSelector(::java::lang::String *) = 0;
-  virtual void handleProperty(::java::lang::String *) = 0;
-  virtual void handleValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_html_CSSParser$CSSParserCallback__
diff --git a/libjava/javax/swing/text/html/CSSParser.h b/libjava/javax/swing/text/html/CSSParser.h
deleted file mode 100644
index ce8aee5acfe..00000000000
--- a/libjava/javax/swing/text/html/CSSParser.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_CSSParser__
-#define __javax_swing_text_html_CSSParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class CSSParser;
-            class CSSParser$CSSParserCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::CSSParser : public ::java::lang::Object
-{
-
-public: // actually package-private
-  CSSParser();
-private:
-  void append(jchar);
-  jint nextToken(jchar);
-  jint readChar();
-public: // actually package-private
-  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::CSSParser$CSSParserCallback *, jboolean);
-private:
-  jint readWS();
-  jboolean getNextStatement();
-  void parseAtRule();
-  void parseRuleSet();
-  jboolean parseSelectors();
-  void parseDeclarationBlock();
-  jint parseDeclaration();
-  jint parseIdentifiers(jchar, jboolean);
-  void parseTillClosed(jint);
-  jboolean getIdentifier(jchar);
-  void readTill(jchar);
-  void readComment();
-  void startBlock(jint);
-  void endBlock(jint);
-  jboolean inBlock();
-  void pushChar(jint);
-  static const jint IDENTIFIER = 1;
-  static const jint BRACKET_OPEN = 2;
-  static const jint BRACKET_CLOSE = 3;
-  static const jint BRACE_OPEN = 4;
-  static const jint BRACE_CLOSE = 5;
-  static const jint PAREN_OPEN = 6;
-  static const jint PAREN_CLOSE = 7;
-  static const jint END = -1;
-  static JArray< jchar > * charMapping;
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) didPushChar;
-  jint pushedChar;
-  ::java::lang::StringBuffer * unitBuffer;
-  JArray< jint > * unitStack;
-  jint stackCount;
-  ::java::io::Reader * reader;
-  jboolean encounteredRuleSet;
-  ::javax::swing::text::html::CSSParser$CSSParserCallback * callback;
-  JArray< jchar > * tokenBuffer;
-  jint tokenBufferLength;
-  jboolean readWS__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_CSSParser__
diff --git a/libjava/javax/swing/text/html/FormSubmitEvent$MethodType.h b/libjava/javax/swing/text/html/FormSubmitEvent$MethodType.h
deleted file mode 100644
index 99fbed04d3e..00000000000
--- a/libjava/javax/swing/text/html/FormSubmitEvent$MethodType.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormSubmitEvent$MethodType__
-#define __javax_swing_text_html_FormSubmitEvent$MethodType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class FormSubmitEvent$MethodType;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormSubmitEvent$MethodType : public ::java::lang::Object
-{
-
-  FormSubmitEvent$MethodType();
-public:
-  static ::javax::swing::text::html::FormSubmitEvent$MethodType * POST;
-  static ::javax::swing::text::html::FormSubmitEvent$MethodType * GET;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormSubmitEvent$MethodType__
diff --git a/libjava/javax/swing/text/html/FormSubmitEvent.h b/libjava/javax/swing/text/html/FormSubmitEvent.h
deleted file mode 100644
index 7908376d167..00000000000
--- a/libjava/javax/swing/text/html/FormSubmitEvent.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormSubmitEvent__
-#define __javax_swing_text_html_FormSubmitEvent__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLFrameHyperlinkEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class HyperlinkEvent$EventType;
-      }
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class FormSubmitEvent;
-            class FormSubmitEvent$MethodType;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormSubmitEvent : public ::javax::swing::text::html::HTMLFrameHyperlinkEvent
-{
-
-public: // actually package-private
-  FormSubmitEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::javax::swing::text::Element *, ::java::lang::String *, ::javax::swing::text::html::FormSubmitEvent$MethodType *, ::java::lang::String *);
-public:
-  virtual ::java::lang::String * getData();
-  virtual ::javax::swing::text::html::FormSubmitEvent$MethodType * getMethod();
-private:
-  ::javax::swing::text::html::FormSubmitEvent$MethodType * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLFrameHyperlinkEvent)))) method;
-  ::java::lang::String * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormSubmitEvent__
diff --git a/libjava/javax/swing/text/html/FormView$1.h b/libjava/javax/swing/text/html/FormView$1.h
deleted file mode 100644
index 0bdec66cfcd..00000000000
--- a/libjava/javax/swing/text/html/FormView$1.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormView$1__
-#define __javax_swing_text_html_FormView$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace text
-      {
-        namespace html
-        {
-            class FormView$1;
-            class FormView$SubmitThread;
-            class HTMLDocument;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormView$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  FormView$1(::javax::swing::text::html::FormView$SubmitThread *, ::javax::swing::text::html::HTMLDocument *, ::javax::swing::JEditorPane *, ::java::lang::String *, ::java::net::URL *, ::java::lang::String *, ::java::net::URL *);
-public:
-  void run();
-public: // actually package-private
-  ::javax::swing::text::html::FormView$SubmitThread * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-private:
-  ::javax::swing::text::html::HTMLDocument * val$doc;
-  ::javax::swing::JEditorPane * val$editor;
-  ::java::lang::String * val$method;
-  ::java::net::URL * val$actionURL;
-  ::java::lang::String * val$target;
-  ::java::net::URL * val$url;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormView$1__
diff --git a/libjava/javax/swing/text/html/FormView$MouseEventListener.h b/libjava/javax/swing/text/html/FormView$MouseEventListener.h
deleted file mode 100644
index d602e6449f3..00000000000
--- a/libjava/javax/swing/text/html/FormView$MouseEventListener.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormView$MouseEventListener__
-#define __javax_swing_text_html_FormView$MouseEventListener__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class FormView;
-            class FormView$MouseEventListener;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormView$MouseEventListener : public ::java::awt::event::MouseAdapter
-{
-
-public: // actually protected
-  FormView$MouseEventListener(::javax::swing::text::html::FormView *);
-public:
-  virtual void mouseReleased(::java::awt::event::MouseEvent *);
-public: // actually package-private
-  ::javax::swing::text::html::FormView * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormView$MouseEventListener__
diff --git a/libjava/javax/swing/text/html/FormView$SubmitThread.h b/libjava/javax/swing/text/html/FormView$SubmitThread.h
deleted file mode 100644
index 69a01bbe77c..00000000000
--- a/libjava/javax/swing/text/html/FormView$SubmitThread.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormView$SubmitThread__
-#define __javax_swing_text_html_FormView$SubmitThread__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLConnection;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class FormSubmitEvent;
-            class FormView;
-            class FormView$SubmitThread;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormView$SubmitThread : public ::java::lang::Thread
-{
-
-public: // actually package-private
-  FormView$SubmitThread(::javax::swing::text::html::FormView *, ::java::lang::String *);
-public:
-  virtual void run();
-private:
-  ::java::lang::String * getMethod();
-  ::java::net::URL * getActionURL();
-  ::java::lang::String * getTarget();
-  void postData(::java::net::URLConnection *, ::java::lang::String *);
-  ::javax::swing::text::AttributeSet * getFormAttributes();
-public: // actually package-private
-  virtual ::javax::swing::text::html::FormSubmitEvent * createSubmitEvent(::java::lang::String *, ::java::net::URL *, ::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) data;
-public: // actually package-private
-  ::javax::swing::text::html::FormView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormView$SubmitThread__
diff --git a/libjava/javax/swing/text/html/FormView.h b/libjava/javax/swing/text/html/FormView.h
deleted file mode 100644
index fff2e630988..00000000000
--- a/libjava/javax/swing/text/html/FormView.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FormView__
-#define __javax_swing_text_html_FormView__
-
-#pragma interface
-
-#include <javax/swing/text/ComponentView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Point;
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-        namespace html
-        {
-            class FormView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FormView : public ::javax::swing::text::ComponentView
-{
-
-public:
-  FormView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::java::awt::Component * createComponent();
-public:
-  virtual jfloat getMaximumSpan(jint);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  virtual void submitData(::java::lang::String *);
-  virtual void imageSubmit(::java::lang::String *);
-public: // actually package-private
-  virtual ::java::lang::String * getImageData(::java::awt::Point *);
-  virtual ::javax::swing::text::Element * getFormElement();
-private:
-  ::java::lang::String * getFormData();
-  void getElementFormData(::javax::swing::text::Element *, ::java::lang::StringBuilder *);
-  void getSelectData(::javax::swing::text::AttributeSet *, ::java::lang::StringBuilder *);
-  ::java::lang::String * getTextAreaData(::javax::swing::text::AttributeSet *);
-  ::java::lang::String * getInputFormData(::javax::swing::text::AttributeSet *);
-  void addData(::java::lang::StringBuilder *, ::java::lang::String *, ::java::lang::String *);
-  void resetForm();
-public:
-  static ::java::lang::String * SUBMIT;
-  static ::java::lang::String * RESET;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::text::ComponentView)))) maxIsPreferred;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FormView__
diff --git a/libjava/javax/swing/text/html/FrameSetView$FrameSetRow.h b/libjava/javax/swing/text/html/FrameSetView$FrameSetRow.h
deleted file mode 100644
index ae59240acf9..00000000000
--- a/libjava/javax/swing/text/html/FrameSetView$FrameSetRow.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FrameSetView$FrameSetRow__
-#define __javax_swing_text_html_FrameSetView$FrameSetRow__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class ViewFactory;
-        namespace html
-        {
-            class FrameSetView;
-            class FrameSetView$FrameSetRow;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FrameSetView$FrameSetRow : public ::javax::swing::text::BoxView
-{
-
-public: // actually package-private
-  FrameSetView$FrameSetRow(::javax::swing::text::html::FrameSetView *, ::javax::swing::text::Element *, jint);
-public: // actually protected
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) row;
-public: // actually package-private
-  ::javax::swing::text::html::FrameSetView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FrameSetView$FrameSetRow__
diff --git a/libjava/javax/swing/text/html/FrameSetView.h b/libjava/javax/swing/text/html/FrameSetView.h
deleted file mode 100644
index a31abb1ca11..00000000000
--- a/libjava/javax/swing/text/html/FrameSetView.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FrameSetView__
-#define __javax_swing_text_html_FrameSetView__
-
-#pragma interface
-
-#include <javax/swing/text/BoxView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class ViewFactory;
-        namespace html
-        {
-            class FrameSetView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FrameSetView : public ::javax::swing::text::BoxView
-{
-
-public: // actually package-private
-  FrameSetView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual void loadChildren(::javax::swing::text::ViewFactory *);
-private:
-  void parseRowsCols();
-  void parseLayout(::java::lang::String *, jint);
-public: // actually protected
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-public: // actually package-private
-  virtual void layoutViews(jint, jint, JArray< jint > *, JArray< jint > *, jint, JArray< jint > *, JArray< jint > *, JArray< jint > *);
-  JArray< JArray< jint > * > * __attribute__((aligned(__alignof__( ::javax::swing::text::BoxView)))) absolute;
-  JArray< JArray< jint > * > * relative;
-  JArray< JArray< jint > * > * percent;
-  JArray< jint > * numViews;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FrameSetView__
diff --git a/libjava/javax/swing/text/html/FrameView.h b/libjava/javax/swing/text/html/FrameView.h
deleted file mode 100644
index e1856e327de..00000000000
--- a/libjava/javax/swing/text/html/FrameView.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_FrameView__
-#define __javax_swing_text_html_FrameView__
-
-#pragma interface
-
-#include <javax/swing/text/ComponentView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace event
-      {
-          class HyperlinkEvent;
-      }
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class FrameView;
-            class HTMLFrameHyperlinkEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::FrameView : public ::javax::swing::text::ComponentView
-{
-
-public: // actually package-private
-  FrameView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::java::awt::Component * createComponent();
-public:
-  virtual void hyperlinkUpdate(::javax::swing::event::HyperlinkEvent *);
-private:
-  void handleHyperlinkEvent(::javax::swing::event::HyperlinkEvent *, ::javax::swing::JEditorPane *, ::java::lang::String *);
-  void handleFormSubmitEvent(::javax::swing::text::html::HTMLFrameHyperlinkEvent *, ::javax::swing::JEditorPane *, ::java::lang::String *);
-  ::javax::swing::JEditorPane * getTopEditorPane();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_FrameView__
diff --git a/libjava/javax/swing/text/html/HRuleView$Beginning.h b/libjava/javax/swing/text/html/HRuleView$Beginning.h
deleted file mode 100644
index a1c6e1dc808..00000000000
--- a/libjava/javax/swing/text/html/HRuleView$Beginning.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HRuleView$Beginning__
-#define __javax_swing_text_html_HRuleView$Beginning__
-
-#pragma interface
-
-#include <javax/swing/text/html/NullView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class HRuleView;
-            class HRuleView$Beginning;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HRuleView$Beginning : public ::javax::swing::text::html::NullView
-{
-
-public:
-  virtual jint getEndOffset();
-  virtual jint getStartOffset();
-  HRuleView$Beginning(::javax::swing::text::html::HRuleView *, ::javax::swing::text::Element *, jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::html::NullView)))) breakOffset;
-  ::javax::swing::text::html::HRuleView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HRuleView$Beginning__
diff --git a/libjava/javax/swing/text/html/HRuleView.h b/libjava/javax/swing/text/html/HRuleView.h
deleted file mode 100644
index f028b51ae0b..00000000000
--- a/libjava/javax/swing/text/html/HRuleView.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HRuleView__
-#define __javax_swing_text_html_HRuleView__
-
-#pragma interface
-
-#include <javax/swing/text/html/InlineView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class View;
-        namespace html
-        {
-            class HRuleView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HRuleView : public ::javax::swing::text::html::InlineView
-{
-
-public:
-  HRuleView(::javax::swing::text::Element *);
-  virtual jint getBreakWeight(jint, jfloat, jfloat);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getPreferredSpan(jint);
-public: // actually package-private
-  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::html::InlineView)))) nullView;
-  static jint HEIGHT;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HRuleView__
diff --git a/libjava/javax/swing/text/html/HTML$Attribute.h b/libjava/javax/swing/text/html/HTML$Attribute.h
deleted file mode 100644
index 47868d02dbc..00000000000
--- a/libjava/javax/swing/text/html/HTML$Attribute.h
+++ /dev/null
@@ -1,130 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTML$Attribute__
-#define __javax_swing_text_html_HTML$Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$Attribute;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTML$Attribute : public ::java::lang::Object
-{
-
-  HTML$Attribute(::java::lang::String *);
-public:
-  ::java::lang::String * toString();
-public: // actually package-private
-  static JArray< ::javax::swing::text::html::HTML$Attribute * > * getAllAttributes();
-public:
-  static ::javax::swing::text::html::HTML$Attribute * ACTION;
-  static ::javax::swing::text::html::HTML$Attribute * ALIGN;
-  static ::javax::swing::text::html::HTML$Attribute * ALINK;
-  static ::javax::swing::text::html::HTML$Attribute * ALT;
-  static ::javax::swing::text::html::HTML$Attribute * ARCHIVE;
-  static ::javax::swing::text::html::HTML$Attribute * BACKGROUND;
-  static ::javax::swing::text::html::HTML$Attribute * BGCOLOR;
-  static ::javax::swing::text::html::HTML$Attribute * BORDER;
-  static ::javax::swing::text::html::HTML$Attribute * CELLPADDING;
-  static ::javax::swing::text::html::HTML$Attribute * CELLSPACING;
-  static ::javax::swing::text::html::HTML$Attribute * CHECKED;
-  static ::javax::swing::text::html::HTML$Attribute * CLASS;
-  static ::javax::swing::text::html::HTML$Attribute * CLASSID;
-  static ::javax::swing::text::html::HTML$Attribute * CLEAR;
-  static ::javax::swing::text::html::HTML$Attribute * CODE;
-  static ::javax::swing::text::html::HTML$Attribute * CODEBASE;
-  static ::javax::swing::text::html::HTML$Attribute * CODETYPE;
-  static ::javax::swing::text::html::HTML$Attribute * COLOR;
-  static ::javax::swing::text::html::HTML$Attribute * COLS;
-  static ::javax::swing::text::html::HTML$Attribute * COLSPAN;
-  static ::javax::swing::text::html::HTML$Attribute * COMMENT;
-  static ::javax::swing::text::html::HTML$Attribute * COMPACT;
-  static ::javax::swing::text::html::HTML$Attribute * CONTENT;
-  static ::javax::swing::text::html::HTML$Attribute * COORDS;
-  static ::javax::swing::text::html::HTML$Attribute * DATA;
-  static ::javax::swing::text::html::HTML$Attribute * DECLARE;
-  static ::javax::swing::text::html::HTML$Attribute * DIR;
-  static ::javax::swing::text::html::HTML$Attribute * DUMMY;
-  static ::javax::swing::text::html::HTML$Attribute * ENCTYPE;
-  static ::javax::swing::text::html::HTML$Attribute * ENDTAG;
-  static ::javax::swing::text::html::HTML$Attribute * FACE;
-  static ::javax::swing::text::html::HTML$Attribute * FRAMEBORDER;
-  static ::javax::swing::text::html::HTML$Attribute * HALIGN;
-  static ::javax::swing::text::html::HTML$Attribute * HEIGHT;
-  static ::javax::swing::text::html::HTML$Attribute * HREF;
-  static ::javax::swing::text::html::HTML$Attribute * HSPACE;
-  static ::javax::swing::text::html::HTML$Attribute * HTTPEQUIV;
-  static ::javax::swing::text::html::HTML$Attribute * ID;
-  static ::javax::swing::text::html::HTML$Attribute * ISMAP;
-  static ::javax::swing::text::html::HTML$Attribute * LANG;
-  static ::javax::swing::text::html::HTML$Attribute * LANGUAGE;
-  static ::javax::swing::text::html::HTML$Attribute * LINK;
-  static ::javax::swing::text::html::HTML$Attribute * LOWSRC;
-  static ::javax::swing::text::html::HTML$Attribute * MARGINHEIGHT;
-  static ::javax::swing::text::html::HTML$Attribute * MARGINWIDTH;
-  static ::javax::swing::text::html::HTML$Attribute * MAXLENGTH;
-public: // actually package-private
-  static ::javax::swing::text::html::HTML$Attribute * MEDIA;
-public:
-  static ::javax::swing::text::html::HTML$Attribute * METHOD;
-  static ::javax::swing::text::html::HTML$Attribute * MULTIPLE;
-  static ::javax::swing::text::html::HTML$Attribute * N;
-  static ::javax::swing::text::html::HTML$Attribute * NAME;
-  static ::javax::swing::text::html::HTML$Attribute * NOHREF;
-  static ::javax::swing::text::html::HTML$Attribute * NORESIZE;
-  static ::javax::swing::text::html::HTML$Attribute * NOSHADE;
-  static ::javax::swing::text::html::HTML$Attribute * NOWRAP;
-  static ::javax::swing::text::html::HTML$Attribute * PROMPT;
-  static ::javax::swing::text::html::HTML$Attribute * REL;
-  static ::javax::swing::text::html::HTML$Attribute * REV;
-  static ::javax::swing::text::html::HTML$Attribute * ROWS;
-  static ::javax::swing::text::html::HTML$Attribute * ROWSPAN;
-  static ::javax::swing::text::html::HTML$Attribute * SCROLLING;
-  static ::javax::swing::text::html::HTML$Attribute * SELECTED;
-  static ::javax::swing::text::html::HTML$Attribute * SHAPE;
-  static ::javax::swing::text::html::HTML$Attribute * SHAPES;
-  static ::javax::swing::text::html::HTML$Attribute * SIZE;
-  static ::javax::swing::text::html::HTML$Attribute * SRC;
-  static ::javax::swing::text::html::HTML$Attribute * STANDBY;
-  static ::javax::swing::text::html::HTML$Attribute * START;
-  static ::javax::swing::text::html::HTML$Attribute * STYLE;
-  static ::javax::swing::text::html::HTML$Attribute * TARGET;
-  static ::javax::swing::text::html::HTML$Attribute * TEXT;
-  static ::javax::swing::text::html::HTML$Attribute * TITLE;
-  static ::javax::swing::text::html::HTML$Attribute * TYPE;
-  static ::javax::swing::text::html::HTML$Attribute * USEMAP;
-  static ::javax::swing::text::html::HTML$Attribute * VALIGN;
-  static ::javax::swing::text::html::HTML$Attribute * VALUE;
-  static ::javax::swing::text::html::HTML$Attribute * VALUETYPE;
-  static ::javax::swing::text::html::HTML$Attribute * VERSION;
-  static ::javax::swing::text::html::HTML$Attribute * VLINK;
-  static ::javax::swing::text::html::HTML$Attribute * VSPACE;
-  static ::javax::swing::text::html::HTML$Attribute * WIDTH;
-public: // actually package-private
-  static ::javax::swing::text::html::HTML$Attribute * PSEUDO_CLASS;
-  static ::javax::swing::text::html::HTML$Attribute * DYNAMIC_CLASS;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTML$Attribute__
diff --git a/libjava/javax/swing/text/html/HTML$Tag.h b/libjava/javax/swing/text/html/HTML$Tag.h
deleted file mode 100644
index 2dd2dcebac7..00000000000
--- a/libjava/javax/swing/text/html/HTML$Tag.h
+++ /dev/null
@@ -1,139 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTML$Tag__
-#define __javax_swing_text_html_HTML$Tag__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$Tag;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTML$Tag : public ::java::lang::Object
-{
-
-public:
-  HTML$Tag();
-public: // actually protected
-  HTML$Tag(::java::lang::String *);
-  HTML$Tag(::java::lang::String *, jboolean, jboolean);
-public: // actually package-private
-  HTML$Tag(::java::lang::String *, jint);
-public:
-  virtual jboolean isBlock();
-  virtual jboolean isPreformatted();
-  virtual jboolean breaksFlow();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static JArray< ::javax::swing::text::html::HTML$Tag * > * getAllTags();
-  virtual jboolean isSyntetic();
-private:
-  static void unexpected(::java::lang::Exception *);
-public:
-  static ::javax::swing::text::html::HTML$Tag * A;
-  static ::javax::swing::text::html::HTML$Tag * ADDRESS;
-  static ::javax::swing::text::html::HTML$Tag * APPLET;
-  static ::javax::swing::text::html::HTML$Tag * AREA;
-  static ::javax::swing::text::html::HTML$Tag * B;
-  static ::javax::swing::text::html::HTML$Tag * BASE;
-  static ::javax::swing::text::html::HTML$Tag * BASEFONT;
-  static ::javax::swing::text::html::HTML$Tag * BIG;
-  static ::javax::swing::text::html::HTML$Tag * BLOCKQUOTE;
-  static ::javax::swing::text::html::HTML$Tag * BODY;
-  static ::javax::swing::text::html::HTML$Tag * BR;
-  static ::javax::swing::text::html::HTML$Tag * CAPTION;
-  static ::javax::swing::text::html::HTML$Tag * CENTER;
-  static ::javax::swing::text::html::HTML$Tag * CITE;
-  static ::javax::swing::text::html::HTML$Tag * CODE;
-  static ::javax::swing::text::html::HTML$Tag * DD;
-  static ::javax::swing::text::html::HTML$Tag * DFN;
-  static ::javax::swing::text::html::HTML$Tag * DIR;
-  static ::javax::swing::text::html::HTML$Tag * DIV;
-  static ::javax::swing::text::html::HTML$Tag * DL;
-  static ::javax::swing::text::html::HTML$Tag * DT;
-  static ::javax::swing::text::html::HTML$Tag * EM;
-  static ::javax::swing::text::html::HTML$Tag * FONT;
-  static ::javax::swing::text::html::HTML$Tag * FORM;
-  static ::javax::swing::text::html::HTML$Tag * FRAME;
-  static ::javax::swing::text::html::HTML$Tag * FRAMESET;
-  static ::javax::swing::text::html::HTML$Tag * H1;
-  static ::javax::swing::text::html::HTML$Tag * H2;
-  static ::javax::swing::text::html::HTML$Tag * H3;
-  static ::javax::swing::text::html::HTML$Tag * H4;
-  static ::javax::swing::text::html::HTML$Tag * H5;
-  static ::javax::swing::text::html::HTML$Tag * H6;
-  static ::javax::swing::text::html::HTML$Tag * HEAD;
-  static ::javax::swing::text::html::HTML$Tag * HR;
-  static ::javax::swing::text::html::HTML$Tag * HTML;
-  static ::javax::swing::text::html::HTML$Tag * I;
-  static ::javax::swing::text::html::HTML$Tag * IMG;
-  static ::javax::swing::text::html::HTML$Tag * INPUT;
-  static ::javax::swing::text::html::HTML$Tag * ISINDEX;
-  static ::javax::swing::text::html::HTML$Tag * KBD;
-  static ::javax::swing::text::html::HTML$Tag * LI;
-  static ::javax::swing::text::html::HTML$Tag * LINK;
-  static ::javax::swing::text::html::HTML$Tag * MAP;
-  static ::javax::swing::text::html::HTML$Tag * MENU;
-  static ::javax::swing::text::html::HTML$Tag * META;
-public: // actually package-private
-  static ::javax::swing::text::html::HTML$Tag * NOBR;
-public:
-  static ::javax::swing::text::html::HTML$Tag * NOFRAMES;
-  static ::javax::swing::text::html::HTML$Tag * OBJECT;
-  static ::javax::swing::text::html::HTML$Tag * OL;
-  static ::javax::swing::text::html::HTML$Tag * OPTION;
-  static ::javax::swing::text::html::HTML$Tag * P;
-  static ::javax::swing::text::html::HTML$Tag * PARAM;
-  static ::javax::swing::text::html::HTML$Tag * PRE;
-  static ::javax::swing::text::html::HTML$Tag * S;
-  static ::javax::swing::text::html::HTML$Tag * SAMP;
-  static ::javax::swing::text::html::HTML$Tag * SCRIPT;
-  static ::javax::swing::text::html::HTML$Tag * SELECT;
-  static ::javax::swing::text::html::HTML$Tag * SMALL;
-  static ::javax::swing::text::html::HTML$Tag * SPAN;
-  static ::javax::swing::text::html::HTML$Tag * STRIKE;
-  static ::javax::swing::text::html::HTML$Tag * STRONG;
-  static ::javax::swing::text::html::HTML$Tag * STYLE;
-  static ::javax::swing::text::html::HTML$Tag * SUB;
-  static ::javax::swing::text::html::HTML$Tag * SUP;
-  static ::javax::swing::text::html::HTML$Tag * TABLE;
-  static ::javax::swing::text::html::HTML$Tag * TD;
-  static ::javax::swing::text::html::HTML$Tag * TEXTAREA;
-  static ::javax::swing::text::html::HTML$Tag * TH;
-  static ::javax::swing::text::html::HTML$Tag * TITLE;
-  static ::javax::swing::text::html::HTML$Tag * TR;
-  static ::javax::swing::text::html::HTML$Tag * TT;
-  static ::javax::swing::text::html::HTML$Tag * U;
-  static ::javax::swing::text::html::HTML$Tag * UL;
-  static ::javax::swing::text::html::HTML$Tag * VAR;
-private:
-  static const jint TOTAL_SYNTHETIC_TAGS = 3;
-public:
-  static ::javax::swing::text::html::HTML$Tag * COMMENT;
-  static ::javax::swing::text::html::HTML$Tag * CONTENT;
-  static ::javax::swing::text::html::HTML$Tag * IMPLIED;
-public: // actually package-private
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  jint flags;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTML$Tag__
diff --git a/libjava/javax/swing/text/html/HTML$UnknownTag.h b/libjava/javax/swing/text/html/HTML$UnknownTag.h
deleted file mode 100644
index e499c01ccae..00000000000
--- a/libjava/javax/swing/text/html/HTML$UnknownTag.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTML$UnknownTag__
-#define __javax_swing_text_html_HTML$UnknownTag__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTML$Tag.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$UnknownTag;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTML$UnknownTag : public ::javax::swing::text::html::HTML$Tag
-{
-
-public:
-  HTML$UnknownTag(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1534369342247250625LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTML$UnknownTag__
diff --git a/libjava/javax/swing/text/html/HTML.h b/libjava/javax/swing/text/html/HTML.h
deleted file mode 100644
index 84dd640edc8..00000000000
--- a/libjava/javax/swing/text/html/HTML.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTML__
-#define __javax_swing_text_html_HTML__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class HTML;
-            class HTML$Attribute;
-            class HTML$Tag;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTML : public ::java::lang::Object
-{
-
-public:
-  HTML();
-  static JArray< ::javax::swing::text::html::HTML$Attribute * > * getAllAttributeKeys();
-  static JArray< ::javax::swing::text::html::HTML$Tag * > * getAllTags();
-  static ::javax::swing::text::html::HTML$Attribute * getAttributeKey(::java::lang::String *);
-  static jint getIntegerAttributeValue(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::HTML$Attribute *, jint);
-  static ::javax::swing::text::html::HTML$Tag * getTag(::java::lang::String *);
-  static ::java::lang::String * NULL_ATTRIBUTE_VALUE;
-public: // actually package-private
-  static const jint BREAKS = 1;
-  static const jint BLOCK = 2;
-  static const jint PREFORMATTED = 4;
-  static const jint SYNTHETIC = 8;
-private:
-  static ::java::util::Map * tagMap;
-  static ::java::util::Map * attrMap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTML__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$1.h b/libjava/javax/swing/text/html/HTMLDocument$1.h
deleted file mode 100644
index ff1f7b0a46f..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$1__
-#define __javax_swing_text_html_HTMLDocument$1__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLDocument$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$1 : public ::javax::swing::text::html::HTMLDocument$HTMLReader
-{
-
-public: // actually package-private
-  HTMLDocument$1(::javax::swing::text::html::HTMLDocument *, jint, jint, jint, ::javax::swing::text::html::HTML$Tag *);
-public:
-  void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$1__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$BlockElement.h b/libjava/javax/swing/text/html/HTMLDocument$BlockElement.h
deleted file mode 100644
index efcaa223b47..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$BlockElement.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$BlockElement__
-#define __javax_swing_text_html_HTMLDocument$BlockElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$BranchElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-        namespace html
-        {
-            class HTMLDocument;
-            class HTMLDocument$BlockElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$BlockElement : public ::javax::swing::text::AbstractDocument$BranchElement
-{
-
-public:
-  HTMLDocument$BlockElement(::javax::swing::text::html::HTMLDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-  virtual ::java::lang::String * getName();
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$BranchElement)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$BlockElement__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.h
deleted file mode 100644
index 0a6bd0daa03..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$AreaAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$AreaAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$AreaAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$AreaAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$AreaAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$AreaAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$AreaAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.h
deleted file mode 100644
index 61e8e538555..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BaseAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$BaseAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$BaseAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$BaseAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$BaseAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$BaseAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$BaseAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h
deleted file mode 100644
index 52c202de24e..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$BlockAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$BlockAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$BlockAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public:
-  HTMLDocument$HTMLReader$BlockAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$BlockAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.h
deleted file mode 100644
index b8ae46357d4..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$CharacterAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$CharacterAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$CharacterAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$CharacterAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$CharacterAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public:
-  HTMLDocument$HTMLReader$CharacterAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$CharacterAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.h
deleted file mode 100644
index a58531a128a..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ConvertAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$ConvertAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$ConvertAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$ConvertAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$ConvertAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$ConvertAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$ConvertAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.h
deleted file mode 100644
index 263088b5aca..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormAction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$FormAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$FormAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$FormAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$FormAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$SpecialAction
-{
-
-public:
-  HTMLDocument$HTMLReader$FormAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-private:
-  void setModel(::java::lang::String *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$SpecialAction)))) this$1;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$FormAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.h
deleted file mode 100644
index e2e93a12b0b..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$FormTagAction.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$FormTagAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$FormTagAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$FormTagAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$FormTagAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$FormTagAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$FormTagAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.h
deleted file mode 100644
index c150be73ab8..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HeadAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$HeadAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$HeadAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$HeadAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$HeadAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$HeadAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$HeadAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h
deleted file mode 100644
index a7399eac4e9..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$HiddenAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$HiddenAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$HiddenAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$HiddenAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public:
-  HTMLDocument$HTMLReader$HiddenAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$HiddenAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.h
deleted file mode 100644
index 3457ed56cfc..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$IsindexAction.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$IsindexAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$IsindexAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$IsindexAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$IsindexAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public:
-  HTMLDocument$HTMLReader$IsindexAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$IsindexAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.h
deleted file mode 100644
index 2d73af7507d..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$LinkAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$LinkAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$LinkAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$HiddenAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$LinkAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$LinkAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$HiddenAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$LinkAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$HiddenAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$LinkAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.h
deleted file mode 100644
index 1b42e2f38e7..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MapAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$MapAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$MapAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$MapAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$MapAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$MapAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$MapAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.h
deleted file mode 100644
index a00b9fa2284..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$MetaAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$MetaAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$MetaAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$MetaAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$MetaAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$MetaAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$MetaAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.h
deleted file mode 100644
index 8c816a79ebf..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$ParagraphAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$ParagraphAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$ParagraphAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$ParagraphAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$ParagraphAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
-{
-
-public:
-  HTMLDocument$HTMLReader$ParagraphAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$ParagraphAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.h
deleted file mode 100644
index 1f5e38fd450..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$PreAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$PreAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$PreAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$BlockAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$PreAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$PreAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction
-{
-
-public:
-  HTMLDocument$HTMLReader$PreAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$BlockAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$PreAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h
deleted file mode 100644
index c1005e6fbf8..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$SpecialAction.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$SpecialAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$SpecialAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$SpecialAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$SpecialAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public:
-  HTMLDocument$HTMLReader$SpecialAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$SpecialAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.h
deleted file mode 100644
index 36feb57a007..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$StyleAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$StyleAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$StyleAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$StyleAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$StyleAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$StyleAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$StyleAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h
deleted file mode 100644
index 10550400bfa..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$TagAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$TagAction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$TagAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$TagAction : public ::java::lang::Object
-{
-
-public:
-  HTMLDocument$HTMLReader$TagAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$TagAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.h
deleted file mode 100644
index 4b7a8fe6912..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader$TitleAction.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader$TitleAction__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader$TitleAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$HTMLReader$TagAction.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$TitleAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader$TitleAction : public ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction
-{
-
-public: // actually package-private
-  HTMLDocument$HTMLReader$TitleAction(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-public:
-  virtual void start(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-  virtual void end(::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument$HTMLReader * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction)))) this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader$TitleAction__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader.h b/libjava/javax/swing/text/html/HTMLDocument$HTMLReader.h
deleted file mode 100644
index 57c250f6bbb..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$HTMLReader.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$HTMLReader__
-#define __javax_swing_text_html_HTMLDocument$HTMLReader__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLEditorKit$ParserCallback.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLDocument$HTMLReader;
-            class HTMLDocument$HTMLReader$TagAction;
-            class Option;
-            class ResetablePlainDocument;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$HTMLReader : public ::javax::swing::text::html::HTMLEditorKit$ParserCallback
-{
-
-public:
-  HTMLDocument$HTMLReader(::javax::swing::text::html::HTMLDocument *, jint);
-  HTMLDocument$HTMLReader(::javax::swing::text::html::HTMLDocument *, jint, jint, jint, ::javax::swing::text::html::HTML$Tag *);
-public: // actually package-private
-  virtual void initTags();
-public: // actually protected
-  virtual void pushCharacterStyle();
-  virtual void popCharacterStyle();
-  virtual void registerTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTMLDocument$HTMLReader$TagAction *);
-public:
-  virtual void flush();
-private:
-  void flushImpl();
-public:
-  virtual void handleText(JArray< jchar > *, jint);
-private:
-  jboolean shouldInsert();
-public:
-  virtual void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  virtual void handleComment(JArray< jchar > *, jint);
-  virtual void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
-  virtual void handleSimpleTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  virtual void handleEndOfLineString(::java::lang::String *);
-public: // actually protected
-  virtual void textAreaContent(JArray< jchar > *);
-  virtual void preContent(JArray< jchar > *);
-  virtual void blockOpen(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-private:
-  jboolean inParagraph();
-  jboolean inImpliedParagraph();
-public: // actually protected
-  virtual void blockClose(::javax::swing::text::html::HTML$Tag *);
-  virtual void addContent(JArray< jchar > *, jint, jint);
-  virtual void addContent(JArray< jchar > *, jint, jint, jboolean);
-  virtual void addSpecialElement(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *);
-public: // actually package-private
-  static ::javax::swing::text::html::HTMLDocument * access$0(::javax::swing::text::html::HTMLDocument$HTMLReader *);
-private:
-  static const jint MAX_THRESHOLD = 10000;
-  static const jint GROW_THRESHOLD = 5;
-public: // actually protected
-  ::javax::swing::text::MutableAttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLEditorKit$ParserCallback)))) charAttr;
-  ::java::util::Vector * parseBuffer;
-private:
-  ::java::util::Stack * parseStack;
-public: // actually package-private
-  ::java::util::Stack * charAttrStack;
-  ::java::util::HashMap * tagToAction;
-  jboolean endHTMLEncountered;
-  jint popDepth;
-  jint pushDepth;
-  jint offset;
-  ::javax::swing::text::html::HTML$Tag * insertTag;
-  jboolean insertTagEncountered;
-  jboolean debug;
-  jboolean inPreTag;
-  jboolean inStyleTag;
-  jboolean inTextArea;
-  ::java::util::ArrayList * styles;
-  ::javax::swing::text::html::ResetablePlainDocument * textAreaDocument;
-  ::java::lang::Object * selectModel;
-  ::javax::swing::text::html::Option * option;
-  jint numOptions;
-  ::java::util::HashMap * buttonGroups;
-private:
-  jint threshold;
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument * this$0;
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$HTMLReader__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$Iterator.h b/libjava/javax/swing/text/html/HTMLDocument$Iterator.h
deleted file mode 100644
index 3b42157ef10..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$Iterator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$Iterator__
-#define __javax_swing_text_html_HTMLDocument$Iterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument$Iterator;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$Iterator : public ::java::lang::Object
-{
-
-public:
-  HTMLDocument$Iterator();
-  virtual ::javax::swing::text::AttributeSet * getAttributes() = 0;
-  virtual jint getEndOffset() = 0;
-  virtual jint getStartOffset() = 0;
-  virtual void next() = 0;
-  virtual jboolean isValid() = 0;
-  virtual ::javax::swing::text::html::HTML$Tag * getTag() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$Iterator__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$LeafIterator.h b/libjava/javax/swing/text/html/HTMLDocument$LeafIterator.h
deleted file mode 100644
index d449c79833b..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$LeafIterator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$LeafIterator__
-#define __javax_swing_text_html_HTMLDocument$LeafIterator__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLDocument$Iterator.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class ElementIterator;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLDocument$LeafIterator;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$LeafIterator : public ::javax::swing::text::html::HTMLDocument$Iterator
-{
-
-public:
-  HTMLDocument$LeafIterator(::javax::swing::text::html::HTMLDocument *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTMLDocument *);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual jint getEndOffset();
-  virtual jint getStartOffset();
-  virtual void next();
-  virtual jboolean isValid();
-  virtual ::javax::swing::text::html::HTML$Tag * getTag();
-public: // actually package-private
-  ::javax::swing::text::html::HTML$Tag * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLDocument$Iterator)))) tag;
-  ::javax::swing::text::html::HTMLDocument * doc;
-  ::javax::swing::text::ElementIterator * it;
-  ::javax::swing::text::html::HTMLDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$LeafIterator__
diff --git a/libjava/javax/swing/text/html/HTMLDocument$RunElement.h b/libjava/javax/swing/text/html/HTMLDocument$RunElement.h
deleted file mode 100644
index f0c65d99c2d..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument$RunElement.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument$RunElement__
-#define __javax_swing_text_html_HTMLDocument$RunElement__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractDocument$LeafElement.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-        namespace html
-        {
-            class HTMLDocument;
-            class HTMLDocument$RunElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument$RunElement : public ::javax::swing::text::AbstractDocument$LeafElement
-{
-
-public:
-  HTMLDocument$RunElement(::javax::swing::text::html::HTMLDocument *, ::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-public: // actually package-private
-  ::javax::swing::text::html::HTMLDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractDocument$LeafElement)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument$RunElement__
diff --git a/libjava/javax/swing/text/html/HTMLDocument.h b/libjava/javax/swing/text/html/HTMLDocument.h
deleted file mode 100644
index 014f818af3a..00000000000
--- a/libjava/javax/swing/text/html/HTMLDocument.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLDocument__
-#define __javax_swing_text_html_HTMLDocument__
-
-#pragma interface
-
-#include <javax/swing/text/DefaultStyledDocument.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument$AbstractElement;
-          class AbstractDocument$AttributeContext;
-          class AbstractDocument$Content;
-          class AbstractDocument$DefaultDocumentEvent;
-          class AttributeSet;
-          class DefaultStyledDocument$ElementSpec;
-          class Element;
-        namespace html
-        {
-            class HTML$Attribute;
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLDocument$Iterator;
-            class HTMLEditorKit$Parser;
-            class HTMLEditorKit$ParserCallback;
-            class HTMLFrameHyperlinkEvent;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLDocument : public ::javax::swing::text::DefaultStyledDocument
-{
-
-public:
-  HTMLDocument();
-  HTMLDocument(::javax::swing::text::html::StyleSheet *);
-  HTMLDocument(::javax::swing::text::AbstractDocument$Content *, ::javax::swing::text::html::StyleSheet *);
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-public: // actually protected
-  virtual ::javax::swing::text::AbstractDocument$AbstractElement * createDefaultRoot();
-  virtual ::javax::swing::text::Element * createLeafElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *, jint, jint);
-  virtual ::javax::swing::text::Element * createBranchElement(::javax::swing::text::Element *, ::javax::swing::text::AttributeSet *);
-public:
-  virtual ::javax::swing::text::html::HTMLEditorKit$Parser * getParser();
-  virtual void setParser(::javax::swing::text::html::HTMLEditorKit$Parser *);
-  virtual void setTokenThreshold(jint);
-  virtual jint getTokenThreshold();
-  virtual ::java::net::URL * getBase();
-  virtual void setBase(::java::net::URL *);
-  virtual jboolean getPreservesUnknownTags();
-  virtual void setPreservesUnknownTags(jboolean);
-  virtual void processHTMLFrameHyperlinkEvent(::javax::swing::text::html::HTMLFrameHyperlinkEvent *);
-private:
-  ::javax::swing::text::Element * findFrame(::java::lang::String *);
-  void updateFrame(::javax::swing::text::Element *, ::java::net::URL *);
-  void updateFrameSet(::javax::swing::text::Element *, ::java::net::URL *);
-public:
-  virtual ::javax::swing::text::html::HTMLDocument$Iterator * getIterator(::javax::swing::text::html::HTML$Tag *);
-  virtual ::javax::swing::text::html::HTMLEditorKit$ParserCallback * getReader(jint);
-  virtual ::javax::swing::text::html::HTMLEditorKit$ParserCallback * getReader(jint, jint, jint, ::javax::swing::text::html::HTML$Tag *);
-  virtual ::javax::swing::text::html::HTMLEditorKit$ParserCallback * getInsertingReader(jint, jint, jint, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::Element *);
-  virtual ::javax::swing::text::Element * getElement(::javax::swing::text::Element *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::text::Element * getElement(::java::lang::String *);
-  virtual void setInnerHTML(::javax::swing::text::Element *, ::java::lang::String *);
-  virtual void setOuterHTML(::javax::swing::text::Element *, ::java::lang::String *);
-  virtual void insertBeforeStart(::javax::swing::text::Element *, ::java::lang::String *);
-  virtual void insertBeforeEnd(::javax::swing::text::Element *, ::java::lang::String *);
-  virtual void insertAfterEnd(::javax::swing::text::Element *, ::java::lang::String *);
-  virtual void insertAfterStart(::javax::swing::text::Element *, ::java::lang::String *);
-public: // actually protected
-  virtual void insertUpdate(::javax::swing::text::AbstractDocument$DefaultDocumentEvent *, ::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  virtual jboolean isFrameDocument();
-  virtual void setFrameDocument(jboolean);
-  virtual ::java::lang::String * getBaseTarget();
-  virtual void updateSpecialClass(::javax::swing::text::Element *, ::javax::swing::text::html::HTML$Attribute *, ::java::lang::String *);
-  static void access$0(::javax::swing::text::html::HTMLDocument *, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-  static void access$1(::javax::swing::text::html::HTMLDocument *, jint, JArray< ::javax::swing::text::DefaultStyledDocument$ElementSpec * > *);
-  static ::javax::swing::text::AbstractDocument$AttributeContext * access$2(::javax::swing::text::html::HTMLDocument *);
-public:
-  static ::java::lang::String * AdditionalComments;
-public: // actually package-private
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::javax::swing::text::DefaultStyledDocument)))) baseURL;
-  jboolean preservesUnknownTags;
-  jint tokenThreshold;
-  ::javax::swing::text::html::HTMLEditorKit$Parser * parser;
-private:
-  jboolean frameDocument;
-public: // actually package-private
-  ::java::lang::String * baseTarget;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLDocument__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$HTMLFactory.h b/libjava/javax/swing/text/html/HTMLEditorKit$HTMLFactory.h
deleted file mode 100644
index 8780e781a67..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$HTMLFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$HTMLFactory__
-#define __javax_swing_text_html_HTMLEditorKit$HTMLFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class View;
-        namespace html
-        {
-            class HTMLEditorKit$HTMLFactory;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$HTMLFactory : public ::java::lang::Object
-{
-
-public:
-  HTMLEditorKit$HTMLFactory();
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$HTMLFactory__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h b/libjava/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h
deleted file mode 100644
index 05cf7f3e5f5..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$HTMLTextAction__
-#define __javax_swing_text_html_HTMLEditorKit$HTMLTextAction__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit$StyledTextAction.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLEditorKit;
-            class HTMLEditorKit$HTMLTextAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$HTMLTextAction : public ::javax::swing::text::StyledEditorKit$StyledTextAction
-{
-
-public:
-  HTMLEditorKit$HTMLTextAction(::java::lang::String *);
-public: // actually protected
-  virtual ::javax::swing::text::html::HTMLDocument * getHTMLDocument(::javax::swing::JEditorPane *);
-  virtual ::javax::swing::text::html::HTMLEditorKit * getHTMLEditorKit(::javax::swing::JEditorPane *);
-  virtual JArray< ::javax::swing::text::Element * > * getElementsAt(::javax::swing::text::html::HTMLDocument *, jint);
-private:
-  JArray< ::javax::swing::text::Element * > * getElementsAt(::javax::swing::text::Element *, jint, jint);
-public: // actually protected
-  virtual jint elementCountToTag(::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::html::HTML$Tag *);
-  virtual ::javax::swing::text::Element * findElementMatchingTag(::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::html::HTML$Tag *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$HTMLTextAction__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.h b/libjava/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.h
deleted file mode 100644
index 187c7a8ee76..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$InsertHTMLTextAction.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$InsertHTMLTextAction__
-#define __javax_swing_text_html_HTMLEditorKit$InsertHTMLTextAction__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLEditorKit$HTMLTextAction.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLEditorKit$InsertHTMLTextAction;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$InsertHTMLTextAction : public ::javax::swing::text::html::HTMLEditorKit$HTMLTextAction
-{
-
-public:
-  HTMLEditorKit$InsertHTMLTextAction(::java::lang::String *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
-  HTMLEditorKit$InsertHTMLTextAction(::java::lang::String *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
-public: // actually protected
-  virtual void insertHTML(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::java::lang::String *, jint, jint, ::javax::swing::text::html::HTML$Tag *);
-  virtual void insertAtBoundary(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::Element *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
-  virtual void insertAtBoundry(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::Element *, ::java::lang::String *, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
-public:
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-private:
-  jboolean tryInsert(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, ::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::html::HTML$Tag *);
-  void adjustSelection(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, jint, jint);
-public: // actually protected
-  ::javax::swing::text::html::HTML$Tag * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLEditorKit$HTMLTextAction)))) addTag;
-  ::javax::swing::text::html::HTML$Tag * alternateAddTag;
-  ::javax::swing::text::html::HTML$Tag * alternateParentTag;
-  ::java::lang::String * html;
-  ::javax::swing::text::html::HTML$Tag * parentTag;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$InsertHTMLTextAction__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$LinkController.h b/libjava/javax/swing/text/html/HTMLEditorKit$LinkController.h
deleted file mode 100644
index 629cc679e6d..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$LinkController.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$LinkController__
-#define __javax_swing_text_html_HTMLEditorKit$LinkController__
-
-#pragma interface
-
-#include <java/awt/event/MouseAdapter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class MouseEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JEditorPane;
-      namespace event
-      {
-          class HyperlinkEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-        namespace html
-        {
-            class HTMLDocument;
-            class HTMLEditorKit$LinkController;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$LinkController : public ::java::awt::event::MouseAdapter
-{
-
-public:
-  HTMLEditorKit$LinkController();
-  virtual void mouseClicked(::java::awt::event::MouseEvent *);
-  virtual void mouseDragged(::java::awt::event::MouseEvent *);
-  virtual void mouseMoved(::java::awt::event::MouseEvent *);
-public: // actually protected
-  virtual void activateLink(jint, ::javax::swing::JEditorPane *);
-private:
-  void activateLink(jint, ::javax::swing::JEditorPane *, jint, jint);
-  ::javax::swing::event::HyperlinkEvent * createHyperlinkEvent(::javax::swing::JEditorPane *, ::javax::swing::text::html::HTMLDocument *, ::java::lang::String *, ::javax::swing::text::AttributeSet *, ::javax::swing::text::Element *);
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) lastAnchorElement;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$LinkController__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$Parser.h b/libjava/javax/swing/text/html/HTMLEditorKit$Parser.h
deleted file mode 100644
index 8727c6ca646..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$Parser.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$Parser__
-#define __javax_swing_text_html_HTMLEditorKit$Parser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTMLEditorKit$Parser;
-            class HTMLEditorKit$ParserCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$Parser : public ::java::lang::Object
-{
-
-public:
-  HTMLEditorKit$Parser();
-  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::HTMLEditorKit$ParserCallback *, jboolean) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$Parser__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit$ParserCallback.h b/libjava/javax/swing/text/html/HTMLEditorKit$ParserCallback.h
deleted file mode 100644
index 83dffff9405..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit$ParserCallback.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit$ParserCallback__
-#define __javax_swing_text_html_HTMLEditorKit$ParserCallback__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class MutableAttributeSet;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLEditorKit$ParserCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit$ParserCallback : public ::java::lang::Object
-{
-
-public:
-  HTMLEditorKit$ParserCallback();
-  virtual void flush();
-  virtual void handleComment(JArray< jchar > *, jint);
-  virtual void handleEndOfLineString(::java::lang::String *);
-  virtual void handleEndTag(::javax::swing::text::html::HTML$Tag *, jint);
-  virtual void handleError(::java::lang::String *, jint);
-  virtual void handleSimpleTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  virtual void handleStartTag(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::MutableAttributeSet *, jint);
-  virtual void handleText(JArray< jchar > *, jint);
-  static ::java::lang::Object * IMPLIED;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit$ParserCallback__
diff --git a/libjava/javax/swing/text/html/HTMLEditorKit.h b/libjava/javax/swing/text/html/HTMLEditorKit.h
deleted file mode 100644
index 4c3bc412c39..00000000000
--- a/libjava/javax/swing/text/html/HTMLEditorKit.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLEditorKit__
-#define __javax_swing_text_html_HTMLEditorKit__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Cursor;
-    }
-  }
-  namespace javax
-  {
-    namespace accessibility
-    {
-        class AccessibleContext;
-    }
-    namespace swing
-    {
-        class Action;
-        class JEditorPane;
-      namespace text
-      {
-          class Document;
-          class Element;
-          class MutableAttributeSet;
-          class ViewFactory;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLEditorKit;
-            class HTMLEditorKit$HTMLFactory;
-            class HTMLEditorKit$LinkController;
-            class HTMLEditorKit$Parser;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLEditorKit : public ::javax::swing::text::StyledEditorKit
-{
-
-public:
-  HTMLEditorKit();
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual ::javax::swing::text::Document * createDefaultDocument();
-public: // actually protected
-  virtual ::javax::swing::text::html::HTMLEditorKit$Parser * getParser();
-public:
-  virtual void insertHTML(::javax::swing::text::html::HTMLDocument *, jint, ::java::lang::String *, jint, jint, ::javax::swing::text::html::HTML$Tag *);
-  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint);
-  virtual void write(::java::io::Writer *, ::javax::swing::text::Document *, jint, jint);
-  virtual ::java::lang::String * getContentType();
-  virtual ::java::lang::Object * clone();
-public: // actually protected
-  virtual void createInputAttributes(::javax::swing::text::Element *, ::javax::swing::text::MutableAttributeSet *);
-public:
-  virtual void install(::javax::swing::JEditorPane *);
-  virtual void deinstall(::javax::swing::JEditorPane *);
-  virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
-  virtual JArray< ::javax::swing::Action * > * getActions();
-  virtual ::java::awt::Cursor * getDefaultCursor();
-  virtual ::java::awt::Cursor * getLinkCursor();
-  virtual void setLinkCursor(::java::awt::Cursor *);
-  virtual void setDefaultCursor(::java::awt::Cursor *);
-  virtual ::javax::swing::text::MutableAttributeSet * getInputAttributes();
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-  virtual void setStyleSheet(::javax::swing::text::html::StyleSheet *);
-  virtual jboolean isAutoFormSubmission();
-  virtual void setAutoFormSubmission(jboolean);
-private:
-  static const jlong serialVersionUID = 8751997116710384592LL;
-public:
-  static ::java::lang::String * DEFAULT_CSS;
-  static ::java::lang::String * BOLD_ACTION;
-  static ::java::lang::String * ITALIC_ACTION;
-  static ::java::lang::String * COLOR_ACTION;
-  static ::java::lang::String * FONT_CHANGE_BIGGER;
-  static ::java::lang::String * FONT_CHANGE_SMALLER;
-  static ::java::lang::String * IMG_ALIGN_BOTTOM;
-  static ::java::lang::String * IMG_ALIGN_MIDDLE;
-  static ::java::lang::String * IMG_ALIGN_TOP;
-  static ::java::lang::String * IMG_BORDER;
-  static ::java::lang::String * LOGICAL_STYLE_ACTION;
-  static ::java::lang::String * PARA_INDENT_LEFT;
-  static ::java::lang::String * PARA_INDENT_RIGHT;
-private:
-  static JArray< ::javax::swing::Action * > * defaultActions;
-  ::javax::swing::text::html::StyleSheet * __attribute__((aligned(__alignof__( ::javax::swing::text::StyledEditorKit)))) styleSheet;
-public: // actually package-private
-  ::javax::swing::text::html::HTMLEditorKit$HTMLFactory * viewFactory;
-  ::java::awt::Cursor * linkCursor;
-  ::java::awt::Cursor * defaultCursor;
-  ::javax::swing::text::html::HTMLEditorKit$Parser * parser;
-private:
-  ::javax::swing::text::html::HTMLEditorKit$LinkController * linkController;
-public: // actually package-private
-  ::java::lang::String * contentType;
-  ::javax::swing::text::MutableAttributeSet * inputAttributes;
-  ::javax::swing::JEditorPane * editorPane;
-private:
-  jboolean autoFormSubmission;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLEditorKit__
diff --git a/libjava/javax/swing/text/html/HTMLFrameHyperlinkEvent.h b/libjava/javax/swing/text/html/HTMLFrameHyperlinkEvent.h
deleted file mode 100644
index 140395092ac..00000000000
--- a/libjava/javax/swing/text/html/HTMLFrameHyperlinkEvent.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLFrameHyperlinkEvent__
-#define __javax_swing_text_html_HTMLFrameHyperlinkEvent__
-
-#pragma interface
-
-#include <javax/swing/event/HyperlinkEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class HyperlinkEvent$EventType;
-      }
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class HTMLFrameHyperlinkEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLFrameHyperlinkEvent : public ::javax::swing::event::HyperlinkEvent
-{
-
-public:
-  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::javax::swing::text::Element *, ::java::lang::String *);
-  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *);
-  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *, ::javax::swing::text::Element *, ::java::lang::String *);
-  HTMLFrameHyperlinkEvent(::java::lang::Object *, ::javax::swing::event::HyperlinkEvent$EventType *, ::java::net::URL *, ::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * getTarget();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::event::HyperlinkEvent)))) target_frame;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLFrameHyperlinkEvent__
diff --git a/libjava/javax/swing/text/html/HTMLWriter.h b/libjava/javax/swing/text/html/HTMLWriter.h
deleted file mode 100644
index 321b58d1020..00000000000
--- a/libjava/javax/swing/text/html/HTMLWriter.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_HTMLWriter__
-#define __javax_swing_text_html_HTMLWriter__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractWriter.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-        namespace html
-        {
-            class HTML$Tag;
-            class HTMLDocument;
-            class HTMLWriter;
-            class Option;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::HTMLWriter : public ::javax::swing::text::AbstractWriter
-{
-
-public:
-  HTMLWriter(::java::io::Writer *, ::javax::swing::text::html::HTMLDocument *);
-  HTMLWriter(::java::io::Writer *, ::javax::swing::text::html::HTMLDocument *, jint, jint);
-  virtual void write();
-public: // actually protected
-  virtual void writeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void emptyTag(::javax::swing::text::Element *);
-  virtual jboolean isBlockTag(::javax::swing::text::AttributeSet *);
-  virtual void startTag(::javax::swing::text::Element *);
-  virtual void textAreaContent(::javax::swing::text::AttributeSet *);
-  virtual void text(::javax::swing::text::Element *);
-  virtual void selectContent(::javax::swing::text::AttributeSet *);
-  virtual void writeOption(::javax::swing::text::html::Option *);
-  virtual void endTag(::javax::swing::text::Element *);
-  virtual void comment(::javax::swing::text::Element *);
-  virtual jboolean synthesizedElement(::javax::swing::text::Element *);
-  virtual jboolean matchNameAttribute(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::HTML$Tag *);
-  virtual void writeEmbeddedTags(::javax::swing::text::AttributeSet *);
-  virtual void closeOutUnwantedEmbeddedTags(::javax::swing::text::AttributeSet *);
-  virtual void writeLineSeparator();
-  virtual void output(JArray< jchar > *, jint, jint);
-private:
-  void traverse(::javax::swing::text::Element *);
-  void traverseHtmlFragment(::javax::swing::text::Element *);
-  void writeRaw(::java::lang::String *);
-  void writeContent(::java::lang::String *);
-  void writeAllAttributes(::javax::swing::text::AttributeSet *);
-  jboolean hasHtmlEntity(::java::lang::String *);
-  jboolean isCharHtmlEntity(jchar);
-  ::java::lang::String * escapeCharHtmlEntity(jchar);
-  ::java::io::Writer * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) outWriter;
-  ::javax::swing::text::html::HTMLDocument * htmlDoc;
-  ::java::util::HashSet * openEmbededTagHashSet;
-  ::java::lang::String * new_line_str;
-  JArray< jchar > * html_entity_char_arr;
-  JArray< ::java::lang::String * > * html_entity_escape_str_arr;
-  jint doc_pos;
-  jint doc_len;
-  jint doc_offset_remaining;
-  jint doc_len_remaining;
-  ::java::util::HashSet * htmlFragmentParentHashSet;
-  ::javax::swing::text::Element * startElem;
-  ::javax::swing::text::Element * endElem;
-  jboolean fg_pass_start_elem;
-  jboolean fg_pass_end_elem;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_HTMLWriter__
diff --git a/libjava/javax/swing/text/html/ImageView$1.h b/libjava/javax/swing/text/html/ImageView$1.h
deleted file mode 100644
index 23140f92f91..00000000000
--- a/libjava/javax/swing/text/html/ImageView$1.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ImageView$1__
-#define __javax_swing_text_html_ImageView$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class View;
-        namespace html
-        {
-            class ImageView;
-            class ImageView$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ImageView$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ImageView$1(::javax::swing::text::html::ImageView *, ::javax::swing::text::View *, jboolean, jboolean);
-public:
-  void run();
-public: // actually package-private
-  ::javax::swing::text::html::ImageView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::javax::swing::text::View * val$v;
-  jboolean val$width;
-  jboolean val$height;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ImageView$1__
diff --git a/libjava/javax/swing/text/html/ImageView$Observer.h b/libjava/javax/swing/text/html/ImageView$Observer.h
deleted file mode 100644
index be4b8dbf9dc..00000000000
--- a/libjava/javax/swing/text/html/ImageView$Observer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ImageView$Observer__
-#define __javax_swing_text_html_ImageView$Observer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Image;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class ImageView;
-            class ImageView$Observer;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ImageView$Observer : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ImageView$Observer(::javax::swing::text::html::ImageView *);
-public:
-  virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint);
-public: // actually package-private
-  ::javax::swing::text::html::ImageView * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ImageView$Observer__
diff --git a/libjava/javax/swing/text/html/ImageView.h b/libjava/javax/swing/text/html/ImageView.h
deleted file mode 100644
index 91b96bc012b..00000000000
--- a/libjava/javax/swing/text/html/ImageView.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ImageView__
-#define __javax_swing_text_html_ImageView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Image;
-        class Shape;
-      namespace image
-      {
-          class ImageObserver;
-      }
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class Position$Bias;
-          class View;
-        namespace html
-        {
-            class ImageView;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ImageView : public ::javax::swing::text::View
-{
-
-public:
-  ImageView(::javax::swing::text::Element *);
-private:
-  void reloadImage();
-public:
-  virtual jfloat getAlignment(jint);
-  virtual ::java::lang::String * getAltText();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual ::java::awt::Image * getImage();
-  virtual ::java::net::URL * getImageURL();
-  virtual ::javax::swing::Icon * getLoadingImageIcon();
-  virtual jboolean getLoadsSynchronously();
-  virtual ::javax::swing::Icon * getNoImageIcon();
-  virtual jfloat getPreferredSpan(jint);
-public: // actually protected
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-public:
-  virtual ::java::lang::String * getToolTipText(jfloat, jfloat, ::java::awt::Shape *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual void setLoadsSynchronously(jboolean);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-public:
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual void setSize(jfloat, jfloat);
-private:
-  void updateState();
-  void loadImage();
-  void updateSize();
-public: // actually package-private
-  virtual void safePreferenceChanged(::javax::swing::text::View *, jboolean, jboolean);
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::text::View)))) loadOnDemand;
-  ::java::awt::Image * image;
-  jbyte imageState;
-private:
-  jboolean reloadImage__;
-  jboolean reloadProperties;
-  jboolean haveWidth;
-  jboolean haveHeight;
-  jboolean loading;
-  jint width;
-  jint height;
-  ::java::awt::image::ImageObserver * observer;
-public: // actually package-private
-  JArray< ::gnu::javax::swing::text::html::css::Length * > * spans;
-private:
-  ::javax::swing::text::AttributeSet * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ImageView__
diff --git a/libjava/javax/swing/text/html/InlineView.h b/libjava/javax/swing/text/html/InlineView.h
deleted file mode 100644
index 0d552dd7e8d..00000000000
--- a/libjava/javax/swing/text/html/InlineView.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_InlineView__
-#define __javax_swing_text_html_InlineView__
-
-#pragma interface
-
-#include <javax/swing/text/LabelView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class View;
-          class ViewFactory;
-        namespace html
-        {
-            class InlineView;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::InlineView : public ::javax::swing::text::LabelView
-{
-
-public:
-  InlineView(::javax::swing::text::Element *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual jint getBreakWeight(jint, jfloat, jfloat);
-  virtual ::javax::swing::text::View * breakView(jint, jint, jfloat, jfloat);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-public:
-  virtual jfloat getMinimumSpan(jint);
-private:
-  jfloat getLongestWord();
-  jfloat calculateLongestWord();
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::LabelView)))) attributes;
-  jfloat longestWord;
-  jboolean nowrap;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_InlineView__
diff --git a/libjava/javax/swing/text/html/ListView.h b/libjava/javax/swing/text/html/ListView.h
deleted file mode 100644
index 7e179a90c69..00000000000
--- a/libjava/javax/swing/text/html/ListView.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ListView__
-#define __javax_swing_text_html_ListView__
-
-#pragma interface
-
-#include <javax/swing/text/html/BlockView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class ListView;
-            class StyleSheet$ListPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ListView : public ::javax::swing::text::html::BlockView
-{
-
-public:
-  ListView(::javax::swing::text::Element *);
-  virtual jfloat getAlignment(jint);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-public: // actually protected
-  virtual void paintChild(::java::awt::Graphics *, ::java::awt::Rectangle *, jint);
-  virtual void setPropertiesFromAttributes();
-private:
-  ::javax::swing::text::html::StyleSheet$ListPainter * __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) painter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ListView__
diff --git a/libjava/javax/swing/text/html/MinimalHTMLWriter.h b/libjava/javax/swing/text/html/MinimalHTMLWriter.h
deleted file mode 100644
index c46afec29b5..00000000000
--- a/libjava/javax/swing/text/html/MinimalHTMLWriter.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_MinimalHTMLWriter__
-#define __javax_swing_text_html_MinimalHTMLWriter__
-
-#pragma interface
-
-#include <javax/swing/text/AbstractWriter.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class Style;
-          class StyledDocument;
-        namespace html
-        {
-            class MinimalHTMLWriter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::MinimalHTMLWriter : public ::javax::swing::text::AbstractWriter
-{
-
-public:
-  MinimalHTMLWriter(::java::io::Writer *, ::javax::swing::text::StyledDocument *);
-  MinimalHTMLWriter(::java::io::Writer *, ::javax::swing::text::StyledDocument *, jint, jint);
-public: // actually protected
-  virtual void startFontTag(::java::lang::String *);
-  virtual jboolean inFontTag();
-  virtual void endFontTag();
-public:
-  virtual void write();
-public: // actually protected
-  virtual void writeStartTag(::java::lang::String *);
-  virtual void writeEndTag(::java::lang::String *);
-  virtual void writeHeader();
-  virtual void writeStartParagraph(::javax::swing::text::Element *);
-  virtual void writeEndParagraph();
-  virtual void writeBody();
-  virtual void text(::javax::swing::text::Element *);
-  virtual void writeHTMLTags(::javax::swing::text::AttributeSet *);
-  virtual jboolean isText(::javax::swing::text::Element *);
-  virtual void writeContent(::javax::swing::text::Element *, jboolean);
-  virtual void writeLeaf(::javax::swing::text::Element *);
-  virtual void writeNonHTMLAttributes(::javax::swing::text::AttributeSet *);
-  virtual void writeStyles();
-  virtual void writeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void writeComponent(::javax::swing::text::Element *);
-  virtual void writeImage(::javax::swing::text::Element *);
-private:
-  ::java::lang::String * getAttribute(::java::lang::String *, ::java::lang::Object *);
-  ::java::lang::String * getColor(::java::awt::Color *);
-  void endOpenTags();
-  void writeStyle(::javax::swing::text::Style *);
-  jboolean hasText(::javax::swing::text::Element *);
-  ::javax::swing::text::StyledDocument * __attribute__((aligned(__alignof__( ::javax::swing::text::AbstractWriter)))) doc;
-  ::java::util::Stack * tagStack;
-  jboolean inFontTag__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_MinimalHTMLWriter__
diff --git a/libjava/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.h b/libjava/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.h
deleted file mode 100644
index 5705c57ad50..00000000000
--- a/libjava/javax/swing/text/html/MultiAttributeSet$MultiNameEnumeration.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_MultiAttributeSet$MultiNameEnumeration__
-#define __javax_swing_text_html_MultiAttributeSet$MultiNameEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class MultiAttributeSet;
-            class MultiAttributeSet$MultiNameEnumeration;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::MultiAttributeSet$MultiNameEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MultiAttributeSet$MultiNameEnumeration(::javax::swing::text::html::MultiAttributeSet *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) index;
-  ::java::util::Enumeration * current;
-public: // actually package-private
-  ::javax::swing::text::html::MultiAttributeSet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_MultiAttributeSet$MultiNameEnumeration__
diff --git a/libjava/javax/swing/text/html/MultiAttributeSet.h b/libjava/javax/swing/text/html/MultiAttributeSet.h
deleted file mode 100644
index f189e7c5528..00000000000
--- a/libjava/javax/swing/text/html/MultiAttributeSet.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_MultiAttributeSet__
-#define __javax_swing_text_html_MultiAttributeSet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class MultiAttributeSet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::MultiAttributeSet : public ::java::lang::Object
-{
-
-public: // actually package-private
-  MultiAttributeSet();
-  MultiAttributeSet(JArray< ::javax::swing::text::AttributeSet * > *);
-  virtual void init(JArray< ::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
-  JArray< ::javax::swing::text::AttributeSet * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) multi;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_MultiAttributeSet__
diff --git a/libjava/javax/swing/text/html/MultiStyle.h b/libjava/javax/swing/text/html/MultiStyle.h
deleted file mode 100644
index f330d5f6e47..00000000000
--- a/libjava/javax/swing/text/html/MultiStyle.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_MultiStyle__
-#define __javax_swing_text_html_MultiStyle__
-
-#pragma interface
-
-#include <javax/swing/text/html/MultiAttributeSet.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class SimpleAttributeSet;
-        namespace html
-        {
-            class MultiStyle;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::MultiStyle : public ::javax::swing::text::html::MultiAttributeSet
-{
-
-public:
-  MultiStyle(::java::lang::String *, JArray< ::javax::swing::text::AttributeSet * > *);
-  virtual ::java::lang::String * getName();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void addAttribute(::java::lang::Object *, ::java::lang::Object *);
-  virtual void addAttributes(::javax::swing::text::AttributeSet *);
-  virtual void removeAttribute(::java::lang::Object *);
-  virtual void removeAttributes(::java::util::Enumeration *);
-  virtual void removeAttributes(::javax::swing::text::AttributeSet *);
-  virtual void setResolveParent(::javax::swing::text::AttributeSet *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::html::MultiAttributeSet)))) name;
-  ::javax::swing::text::SimpleAttributeSet * attributes;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_MultiStyle__
diff --git a/libjava/javax/swing/text/html/NullView.h b/libjava/javax/swing/text/html/NullView.h
deleted file mode 100644
index 2947ee72769..00000000000
--- a/libjava/javax/swing/text/html/NullView.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_NullView__
-#define __javax_swing_text_html_NullView__
-
-#pragma interface
-
-#include <javax/swing/text/View.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-          class Position$Bias;
-        namespace html
-        {
-            class NullView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::NullView : public ::javax::swing::text::View
-{
-
-public:
-  NullView(::javax::swing::text::Element *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual ::java::awt::Shape * modelToView(jint, ::java::awt::Shape *, ::javax::swing::text::Position$Bias *);
-  virtual jint viewToModel(jfloat, jfloat, ::java::awt::Shape *, JArray< ::javax::swing::text::Position$Bias * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_NullView__
diff --git a/libjava/javax/swing/text/html/ObjectView.h b/libjava/javax/swing/text/html/ObjectView.h
deleted file mode 100644
index 666b671aa0d..00000000000
--- a/libjava/javax/swing/text/html/ObjectView.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ObjectView__
-#define __javax_swing_text_html_ObjectView__
-
-#pragma interface
-
-#include <javax/swing/text/ComponentView.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class ObjectView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ObjectView : public ::javax::swing::text::ComponentView
-{
-
-public:
-  ObjectView(::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::java::awt::Component * createComponent();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ObjectView__
diff --git a/libjava/javax/swing/text/html/Option.h b/libjava/javax/swing/text/html/Option.h
deleted file mode 100644
index 062c069e9bb..00000000000
--- a/libjava/javax/swing/text/html/Option.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_Option__
-#define __javax_swing_text_html_Option__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-        namespace html
-        {
-            class Option;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::Option : public ::java::lang::Object
-{
-
-public:
-  Option(::javax::swing::text::AttributeSet *);
-  virtual void setLabel(::java::lang::String *);
-  virtual ::java::lang::String * getLabel();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  virtual void setSelection(jboolean);
-public:
-  virtual jboolean isSelected();
-  virtual ::java::lang::String * getValue();
-private:
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
-  ::java::lang::String * label;
-  jboolean selected;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_Option__
diff --git a/libjava/javax/swing/text/html/ParagraphView.h b/libjava/javax/swing/text/html/ParagraphView.h
deleted file mode 100644
index 6e166ad877d..00000000000
--- a/libjava/javax/swing/text/html/ParagraphView.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ParagraphView__
-#define __javax_swing_text_html_ParagraphView__
-
-#pragma interface
-
-#include <javax/swing/text/ParagraphView.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class View;
-        namespace html
-        {
-            class ParagraphView;
-            class StyleSheet;
-            class StyleSheet$BoxPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ParagraphView : public ::javax::swing::text::ParagraphView
-{
-
-public:
-  ParagraphView(::javax::swing::text::Element *);
-  virtual void setParent(::javax::swing::text::View *);
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-private:
-  jboolean setCSSSpan(::javax::swing::SizeRequirements *, jint);
-public:
-  virtual jboolean isVisible();
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-  virtual jfloat getPreferredSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getMaximumSpan(jint);
-private:
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::ParagraphView)))) attributes;
-  ::javax::swing::text::html::StyleSheet$BoxPainter * painter;
-  ::gnu::javax::swing::text::html::css::Length * cssWidth;
-  ::gnu::javax::swing::text::html::css::Length * cssHeight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ParagraphView__
diff --git a/libjava/javax/swing/text/html/ResetableModel.h b/libjava/javax/swing/text/html/ResetableModel.h
deleted file mode 100644
index f07a0ed9aa2..00000000000
--- a/libjava/javax/swing/text/html/ResetableModel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ResetableModel__
-#define __javax_swing_text_html_ResetableModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class ResetableModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ResetableModel : public ::java::lang::Object
-{
-
-public:
-  virtual void reset() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_html_ResetableModel__
diff --git a/libjava/javax/swing/text/html/ResetablePlainDocument.h b/libjava/javax/swing/text/html/ResetablePlainDocument.h
deleted file mode 100644
index 31283e50bfb..00000000000
--- a/libjava/javax/swing/text/html/ResetablePlainDocument.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ResetablePlainDocument__
-#define __javax_swing_text_html_ResetablePlainDocument__
-
-#pragma interface
-
-#include <javax/swing/text/PlainDocument.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class ResetablePlainDocument;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ResetablePlainDocument : public ::javax::swing::text::PlainDocument
-{
-
-public: // actually package-private
-  ResetablePlainDocument();
-  virtual void setInitialText(::java::lang::String *);
-public:
-  virtual void reset();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::PlainDocument)))) initial;
-public: // actually package-private
-  static jboolean $assertionsDisabled;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ResetablePlainDocument__
diff --git a/libjava/javax/swing/text/html/ResetableToggleButtonModel.h b/libjava/javax/swing/text/html/ResetableToggleButtonModel.h
deleted file mode 100644
index 13295225b78..00000000000
--- a/libjava/javax/swing/text/html/ResetableToggleButtonModel.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ResetableToggleButtonModel__
-#define __javax_swing_text_html_ResetableToggleButtonModel__
-
-#pragma interface
-
-#include <javax/swing/JToggleButton$ToggleButtonModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class ResetableToggleButtonModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ResetableToggleButtonModel : public ::javax::swing::JToggleButton$ToggleButtonModel
-{
-
-public: // actually package-private
-  ResetableToggleButtonModel();
-public:
-  virtual void setInitial(jboolean);
-  virtual void reset();
-private:
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JToggleButton$ToggleButtonModel)))) initial;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ResetableToggleButtonModel__
diff --git a/libjava/javax/swing/text/html/SelectComboBoxModel.h b/libjava/javax/swing/text/html/SelectComboBoxModel.h
deleted file mode 100644
index e9ae5c6fe0f..00000000000
--- a/libjava/javax/swing/text/html/SelectComboBoxModel.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_SelectComboBoxModel__
-#define __javax_swing_text_html_SelectComboBoxModel__
-
-#pragma interface
-
-#include <javax/swing/DefaultComboBoxModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class Option;
-            class SelectComboBoxModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::SelectComboBoxModel : public ::javax::swing::DefaultComboBoxModel
-{
-
-public: // actually package-private
-  SelectComboBoxModel();
-  virtual void setInitialSelection(::javax::swing::text::html::Option *);
-  virtual ::javax::swing::text::html::Option * getInitialSelection();
-public:
-  virtual void reset();
-private:
-  ::javax::swing::text::html::Option * __attribute__((aligned(__alignof__( ::javax::swing::DefaultComboBoxModel)))) initial;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_SelectComboBoxModel__
diff --git a/libjava/javax/swing/text/html/SelectListModel.h b/libjava/javax/swing/text/html/SelectListModel.h
deleted file mode 100644
index 85ce6c3d429..00000000000
--- a/libjava/javax/swing/text/html/SelectListModel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_SelectListModel__
-#define __javax_swing_text_html_SelectListModel__
-
-#pragma interface
-
-#include <javax/swing/DefaultListModel.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListSelectionModel;
-        class ListSelectionModel;
-      namespace text
-      {
-        namespace html
-        {
-            class SelectListModel;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::SelectListModel : public ::javax::swing::DefaultListModel
-{
-
-public: // actually package-private
-  SelectListModel();
-  virtual void addInitialSelection(jint);
-public:
-  virtual void reset();
-public: // actually package-private
-  virtual ::javax::swing::ListSelectionModel * getSelectionModel();
-private:
-  ::javax::swing::DefaultListSelectionModel * __attribute__((aligned(__alignof__( ::javax::swing::DefaultListModel)))) selectionModel;
-  ::java::util::BitSet * initialSelection;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_SelectListModel__
diff --git a/libjava/javax/swing/text/html/StyleSheet$BoxPainter.h b/libjava/javax/swing/text/html/StyleSheet$BoxPainter.h
deleted file mode 100644
index 739686890a9..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$BoxPainter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$BoxPainter__
-#define __javax_swing_text_html_StyleSheet$BoxPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class View;
-        namespace html
-        {
-            class StyleSheet;
-            class StyleSheet$BoxPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$BoxPainter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleSheet$BoxPainter(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::StyleSheet *);
-public:
-  virtual jfloat getInset(jint, ::javax::swing::text::View *);
-  virtual void paint(::java::awt::Graphics *, jfloat, jfloat, jfloat, jfloat, ::javax::swing::text::View *);
-private:
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) leftInset;
-  jfloat rightInset;
-  jfloat topInset;
-  jfloat bottomInset;
-  ::javax::swing::border::Border * border;
-  jfloat leftPadding;
-  jfloat rightPadding;
-  jfloat topPadding;
-  jfloat bottomPadding;
-  ::java::awt::Color * background;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$BoxPainter__
diff --git a/libjava/javax/swing/text/html/StyleSheet$CSSStyle.h b/libjava/javax/swing/text/html/StyleSheet$CSSStyle.h
deleted file mode 100644
index 51353b86cf1..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$CSSStyle.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$CSSStyle__
-#define __javax_swing_text_html_StyleSheet$CSSStyle__
-
-#pragma interface
-
-#include <javax/swing/text/SimpleAttributeSet.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Selector;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeListener;
-      }
-      namespace text
-      {
-        namespace html
-        {
-            class StyleSheet;
-            class StyleSheet$CSSStyle;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$CSSStyle : public ::javax::swing::text::SimpleAttributeSet
-{
-
-public: // actually package-private
-  StyleSheet$CSSStyle(::javax::swing::text::html::StyleSheet *, jint, ::gnu::javax::swing::text::html::css::Selector *);
-public:
-  virtual ::java::lang::String * getName();
-  virtual void addChangeListener(::javax::swing::event::ChangeListener *);
-  virtual void removeChangeListener(::javax::swing::event::ChangeListener *);
-  virtual jint compareTo(::java::lang::Object *);
-public: // actually package-private
-  static const jint PREC_UA = 0;
-  static const jint PREC_NORM = 100000;
-  static const jint PREC_AUTHOR_NORMAL = 200000;
-  static const jint PREC_AUTHOR_IMPORTANT = 300000;
-  static const jint PREC_USER_IMPORTANT = 400000;
-private:
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::SimpleAttributeSet)))) precedence;
-public: // actually package-private
-  ::gnu::javax::swing::text::html::css::Selector * selector;
-  ::javax::swing::text::html::StyleSheet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$CSSStyle__
diff --git a/libjava/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.h b/libjava/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.h
deleted file mode 100644
index 43c5813788c..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$CSSStyleSheetParserCallback.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$CSSStyleSheetParserCallback__
-#define __javax_swing_text_html_StyleSheet$CSSStyleSheetParserCallback__
-
-#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;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class StyleSheet;
-            class StyleSheet$CSSStyle;
-            class StyleSheet$CSSStyleSheetParserCallback;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$CSSStyleSheetParserCallback : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleSheet$CSSStyleSheetParserCallback(::javax::swing::text::html::StyleSheet *, jint);
-public:
-  virtual void startStatement(JArray< ::gnu::javax::swing::text::html::css::Selector * > *);
-  virtual void endStatement();
-  virtual void declaration(::java::lang::String *, ::java::lang::String *);
-private:
-  JArray< ::javax::swing::text::html::StyleSheet$CSSStyle * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) styles;
-  jint precedence;
-public: // actually package-private
-  ::javax::swing::text::html::StyleSheet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$CSSStyleSheetParserCallback__
diff --git a/libjava/javax/swing/text/html/StyleSheet$CssParser.h b/libjava/javax/swing/text/html/StyleSheet$CssParser.h
deleted file mode 100644
index 5d2fded39da..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$CssParser.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$CssParser__
-#define __javax_swing_text_html_StyleSheet$CssParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class MutableAttributeSet;
-        namespace html
-        {
-            class CSSParser;
-            class StyleSheet;
-            class StyleSheet$CssParser;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$CssParser : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleSheet$CssParser(::javax::swing::text::html::StyleSheet *);
-public:
-  virtual ::javax::swing::text::AttributeSet * parseDeclaration(::java::lang::String *);
-  virtual ::javax::swing::text::AttributeSet * parseDeclaration(::java::io::Reader *);
-  virtual void parse(::java::net::URL *, ::java::io::Reader *, jboolean, jboolean);
-  virtual void handleImport(::java::lang::String *);
-  virtual void handleSelector(::java::lang::String *);
-  virtual void startRule();
-  virtual void handleProperty(::java::lang::String *);
-  virtual void handleValue(::java::lang::String *);
-  virtual void endRule();
-private:
-  void addSelector();
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) selectors;
-  ::java::util::Vector * selectorTokens;
-  ::java::lang::String * propertyName;
-  ::javax::swing::text::MutableAttributeSet * declaration;
-  jboolean parsingDeclaration;
-  jboolean isLink;
-  ::java::net::URL * base;
-  ::javax::swing::text::html::CSSParser * parser;
-  ::javax::swing::text::html::StyleSheet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$CssParser__
diff --git a/libjava/javax/swing/text/html/StyleSheet$ListPainter.h b/libjava/javax/swing/text/html/StyleSheet$ListPainter.h
deleted file mode 100644
index d910fc0d3e6..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$ListPainter.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$ListPainter__
-#define __javax_swing_text_html_StyleSheet$ListPainter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class View;
-        namespace html
-        {
-            class StyleSheet;
-            class StyleSheet$ListPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$ListPainter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleSheet$ListPainter(::javax::swing::text::AttributeSet *, ::javax::swing::text::html::StyleSheet *);
-public:
-  virtual void paint(::java::awt::Graphics *, jfloat, jfloat, jfloat, jfloat, ::javax::swing::text::View *, jint);
-private:
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
-  ::javax::swing::text::html::StyleSheet * styleSheet;
-  ::java::lang::String * type;
-  ::java::awt::Rectangle * tmpRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$ListPainter__
diff --git a/libjava/javax/swing/text/html/StyleSheet.h b/libjava/javax/swing/text/html/StyleSheet.h
deleted file mode 100644
index 3c9bbffdb19..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet__
-#define __javax_swing_text_html_StyleSheet__
-
-#pragma interface
-
-#include <javax/swing/text/StyleContext.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Font;
-    }
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class MutableAttributeSet;
-          class Style;
-          class StyleContext$SmallAttributeSet;
-          class View;
-        namespace html
-        {
-            class CSS$Attribute;
-            class HTML$Tag;
-            class StyleSheet;
-            class StyleSheet$BoxPainter;
-            class StyleSheet$ListPainter;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet : public ::javax::swing::text::StyleContext
-{
-
-public:
-  StyleSheet();
-  virtual ::javax::swing::text::Style * getRule(::javax::swing::text::html::HTML$Tag *, ::javax::swing::text::Element *);
-private:
-  ::javax::swing::text::Style * getResolvedStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *);
-  ::javax::swing::text::Style * resolveStyle(::java::lang::String *, ::java::util::List *, ::javax::swing::text::html::HTML$Tag *);
-  ::javax::swing::text::Style * resolveStyle(::java::lang::String *, JArray< ::java::lang::String * > *, JArray< ::java::util::Map * > *);
-public:
-  virtual ::javax::swing::text::Style * getRule(::java::lang::String *);
-  virtual void addRule(::java::lang::String *);
-  virtual ::javax::swing::text::AttributeSet * getDeclaration(::java::lang::String *);
-  virtual void loadRules(::java::io::Reader *, ::java::net::URL *);
-  virtual ::javax::swing::text::AttributeSet * getViewAttributes(::javax::swing::text::View *);
-  virtual void removeStyle(::java::lang::String *);
-  virtual void addStyleSheet(::javax::swing::text::html::StyleSheet *);
-  virtual void removeStyleSheet(::javax::swing::text::html::StyleSheet *);
-  virtual JArray< ::javax::swing::text::html::StyleSheet * > * getStyleSheets();
-  virtual void importStyleSheet(::java::net::URL *);
-  virtual void setBase(::java::net::URL *);
-  virtual ::java::net::URL * getBase();
-  virtual void addCSSAttribute(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
-  virtual jboolean addCSSAttributeFromHTML(::javax::swing::text::MutableAttributeSet *, ::javax::swing::text::html::CSS$Attribute *, ::java::lang::String *);
-  virtual ::javax::swing::text::AttributeSet * translateHTMLToCSS(::javax::swing::text::AttributeSet *);
-private:
-  ::javax::swing::text::AttributeSet * translateBorder(::javax::swing::text::AttributeSet *, ::java::lang::Object *);
-public:
-  virtual ::javax::swing::text::AttributeSet * addAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * addAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * removeAttribute(::javax::swing::text::AttributeSet *, ::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::AttributeSet * removeAttributes(::javax::swing::text::AttributeSet *, ::java::util::Enumeration *);
-public: // actually protected
-  virtual ::javax::swing::text::StyleContext$SmallAttributeSet * createSmallAttributeSet(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::MutableAttributeSet * createLargeAttributeSet(::javax::swing::text::AttributeSet *);
-public:
-  virtual ::java::awt::Font * getFont(::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  virtual jfloat getEMBase(::javax::swing::text::AttributeSet *);
-  virtual jfloat getEXBase(::javax::swing::text::AttributeSet *);
-private:
-  jint getFontSize(::javax::swing::text::AttributeSet *);
-public:
-  virtual ::java::awt::Color * getForeground(::javax::swing::text::AttributeSet *);
-  virtual ::java::awt::Color * getBackground(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::html::StyleSheet$BoxPainter * getBoxPainter(::javax::swing::text::AttributeSet *);
-  virtual ::javax::swing::text::html::StyleSheet$ListPainter * getListPainter(::javax::swing::text::AttributeSet *);
-  virtual void setBaseFontSize(jint);
-  virtual void setBaseFontSize(::java::lang::String *);
-  static jint getIndexOfSize(jfloat);
-  virtual jfloat getPointSize(jint);
-  virtual jfloat getPointSize(::java::lang::String *);
-  virtual ::java::awt::Color * stringToColor(::java::lang::String *);
-private:
-  ::java::util::Map * attributeSetToMap(::javax::swing::text::AttributeSet *);
-public: // actually package-private
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::javax::swing::text::StyleContext)))) base;
-  jint baseFontSize;
-private:
-  ::java::util::ArrayList * linked;
-public: // actually package-private
-  ::java::util::ArrayList * css;
-private:
-  ::java::util::HashMap * resolvedStyles;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet__
diff --git a/libjava/javax/swing/text/html/TableView$CellView.h b/libjava/javax/swing/text/html/TableView$CellView.h
deleted file mode 100644
index c878fa60a00..00000000000
--- a/libjava/javax/swing/text/html/TableView$CellView.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_TableView$CellView__
-#define __javax_swing_text_html_TableView$CellView__
-
-#pragma interface
-
-#include <javax/swing/text/html/BlockView.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace text
-      {
-          class Element;
-        namespace html
-        {
-            class TableView;
-            class TableView$CellView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::TableView$CellView : public ::javax::swing::text::html::BlockView
-{
-
-public: // actually package-private
-  TableView$CellView(::javax::swing::text::html::TableView *, ::javax::swing::text::Element *);
-public: // actually protected
-  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void setPropertiesFromAttributes();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) colSpan;
-  jint rowSpan;
-  ::javax::swing::text::html::TableView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_TableView$CellView__
diff --git a/libjava/javax/swing/text/html/TableView$RowView.h b/libjava/javax/swing/text/html/TableView$RowView.h
deleted file mode 100644
index f031898c1c1..00000000000
--- a/libjava/javax/swing/text/html/TableView$RowView.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_TableView$RowView__
-#define __javax_swing_text_html_TableView$RowView__
-
-#pragma interface
-
-#include <javax/swing/text/html/BlockView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace text
-      {
-          class Element;
-          class View;
-        namespace html
-        {
-            class TableView;
-            class TableView$RowView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::TableView$RowView : public ::javax::swing::text::html::BlockView
-{
-
-public: // actually package-private
-  TableView$RowView(::javax::swing::text::html::TableView *, ::javax::swing::text::Element *);
-public:
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-  virtual jfloat getMaximumSpan(jint);
-  virtual jfloat getMinimumSpan(jint);
-  virtual jfloat getPreferredSpan(jint);
-public: // actually protected
-  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-public: // actually package-private
-  JArray< jboolean > * __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) overlap;
-  jint rowIndex;
-  ::javax::swing::text::html::TableView * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_TableView$RowView__
diff --git a/libjava/javax/swing/text/html/TableView.h b/libjava/javax/swing/text/html/TableView.h
deleted file mode 100644
index b271a4e48ac..00000000000
--- a/libjava/javax/swing/text/html/TableView.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_TableView__
-#define __javax_swing_text_html_TableView__
-
-#pragma interface
-
-#include <javax/swing/text/html/BlockView.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace javax
-    {
-      namespace swing
-      {
-        namespace text
-        {
-          namespace html
-          {
-            namespace css
-            {
-                class Length;
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace awt
-    {
-        class Graphics;
-        class Rectangle;
-        class Shape;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class SizeRequirements;
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace text
-      {
-          class AttributeSet;
-          class Element;
-          class View;
-          class ViewFactory;
-        namespace html
-        {
-            class StyleSheet;
-            class TableView;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::TableView : public ::javax::swing::text::html::BlockView
-{
-
-public:
-  TableView(::javax::swing::text::Element *);
-  virtual ::javax::swing::text::View * create(::javax::swing::text::Element *);
-  virtual ::javax::swing::text::ViewFactory * getViewFactory();
-  virtual ::javax::swing::text::AttributeSet * getAttributes();
-public: // actually protected
-  virtual ::javax::swing::text::html::StyleSheet * getStyleSheet();
-  virtual ::javax::swing::SizeRequirements * calculateMinorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void layoutMinorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-private:
-  void calculateColumnRequirements();
-  void layoutColumns(jint);
-public: // actually package-private
-  virtual void updateGrid();
-public:
-  virtual jfloat getMaximumSpan(jint);
-  virtual void setParent(::javax::swing::text::View *);
-public: // actually protected
-  virtual void setPropertiesFromAttributes();
-  virtual ::javax::swing::SizeRequirements * calculateMajorAxisRequirements(jint, ::javax::swing::SizeRequirements *);
-  virtual void layoutMajorAxis(jint, jint, JArray< jint > *, JArray< jint > *);
-public:
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *, ::java::awt::Shape *, ::javax::swing::text::ViewFactory *);
-  virtual void replace(jint, jint, JArray< ::javax::swing::text::View * > *);
-  virtual void paint(::java::awt::Graphics *, ::java::awt::Shape *);
-public: // actually package-private
-  static jint access$0(::javax::swing::text::html::TableView *, jint, jint);
-private:
-  ::javax::swing::text::AttributeSet * __attribute__((aligned(__alignof__( ::javax::swing::text::html::BlockView)))) attributes;
-public: // actually package-private
-  JArray< ::javax::swing::SizeRequirements * > * columnRequirements;
-  ::javax::swing::SizeRequirements * totalColumnRequirements;
-  JArray< jint > * columnOffsets;
-  JArray< jint > * columnSpans;
-  JArray< ::gnu::javax::swing::text::html::css::Length * > * columnWidths;
-  jint numColumns;
-private:
-  ::gnu::javax::swing::text::html::css::Length * width;
-public: // actually package-private
-  jboolean gridValid;
-  jint cellSpacing;
-private:
-  ::java::awt::Rectangle * tmpRect;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_TableView__
diff --git a/libjava/javax/swing/text/html/ViewAttributeSet.h b/libjava/javax/swing/text/html/ViewAttributeSet.h
deleted file mode 100644
index be6ecdcba2a..00000000000
--- a/libjava/javax/swing/text/html/ViewAttributeSet.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_ViewAttributeSet__
-#define __javax_swing_text_html_ViewAttributeSet__
-
-#pragma interface
-
-#include <javax/swing/text/html/MultiAttributeSet.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class View;
-        namespace html
-        {
-            class StyleSheet;
-            class ViewAttributeSet;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::ViewAttributeSet : public ::javax::swing::text::html::MultiAttributeSet
-{
-
-public: // actually package-private
-  ViewAttributeSet(::javax::swing::text::View *, ::javax::swing::text::html::StyleSheet *);
-public:
-  virtual ::java::lang::Object * getAttribute(::java::lang::Object *);
-  virtual ::javax::swing::text::AttributeSet * getResolveParent();
-private:
-  ::javax::swing::text::View * __attribute__((aligned(__alignof__( ::javax::swing::text::html::MultiAttributeSet)))) view;
-  ::javax::swing::text::html::StyleSheet * styleSheet;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_ViewAttributeSet__
diff --git a/libjava/javax/swing/text/html/parser/AttributeList$1.h b/libjava/javax/swing/text/html/parser/AttributeList$1.h
deleted file mode 100644
index 7c1937b48f7..00000000000
--- a/libjava/javax/swing/text/html/parser/AttributeList$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_AttributeList$1__
-#define __javax_swing_text_html_parser_AttributeList$1__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class AttributeList$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::AttributeList$1 : public ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper
-{
-
-public: // actually package-private
-  AttributeList$1();
-public: // actually protected
-  void create();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_AttributeList$1__
diff --git a/libjava/javax/swing/text/html/parser/AttributeList.h b/libjava/javax/swing/text/html/parser/AttributeList.h
deleted file mode 100644
index b7fb6475f2e..00000000000
--- a/libjava/javax/swing/text/html/parser/AttributeList.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_AttributeList__
-#define __javax_swing_text_html_parser_AttributeList__
-
-#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;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class AttributeList;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::AttributeList : public ::java::lang::Object
-{
-
-public:
-  AttributeList(::java::lang::String *);
-  AttributeList(::java::lang::String *, jint, jint, ::java::lang::String *, ::java::util::Vector *, ::javax::swing::text::html::parser::AttributeList *);
-  jint getModifier();
-  ::java::lang::String * getName();
-  ::javax::swing::text::html::parser::AttributeList * getNext();
-  jint getType();
-  ::java::lang::String * getValue();
-  ::java::util::Enumeration * getValues();
-  static jint name2type(::java::lang::String *);
-  ::java::lang::String * toString();
-  static ::java::lang::String * type2name(jint);
-private:
-  static ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper * mapper;
-  static const jlong serialVersionUID = -1361214058742015233LL;
-public:
-  ::javax::swing::text::html::parser::AttributeList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
-  ::java::lang::String * name;
-  ::java::lang::String * value;
-  ::java::util::Vector * values;
-  jint modifier;
-  jint type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_AttributeList__
diff --git a/libjava/javax/swing/text/html/parser/ContentModel.h b/libjava/javax/swing/text/html/parser/ContentModel.h
deleted file mode 100644
index 45f3b20b2c6..00000000000
--- a/libjava/javax/swing/text/html/parser/ContentModel.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_ContentModel__
-#define __javax_swing_text_html_parser_ContentModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class ContentModel;
-              class Element;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::ContentModel : public ::java::lang::Object
-{
-
-public:
-  ContentModel();
-  ContentModel(::javax::swing::text::html::parser::Element *);
-  ContentModel(jint, ::javax::swing::text::html::parser::ContentModel *);
-  ContentModel(jint, ::java::lang::Object *, ::javax::swing::text::html::parser::ContentModel *);
-  void getElements(::java::util::Vector *);
-  jboolean empty();
-  ::javax::swing::text::html::parser::Element * first();
-  jboolean first(::java::lang::Object *);
-  ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -1130825523866321257LL;
-public:
-  ::javax::swing::text::html::parser::ContentModel * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
-  ::java::lang::Object * content;
-  jint type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_ContentModel__
diff --git a/libjava/javax/swing/text/html/parser/DTD.h b/libjava/javax/swing/text/html/parser/DTD.h
deleted file mode 100644
index f9933273e07..00000000000
--- a/libjava/javax/swing/text/html/parser/DTD.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_DTD__
-#define __javax_swing_text_html_parser_DTD__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class AttributeList;
-              class ContentModel;
-              class DTD;
-              class Element;
-              class Entity;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::DTD : public ::java::lang::Object
-{
-
-public: // actually protected
-  DTD(::java::lang::String *);
-public:
-  static ::javax::swing::text::html::parser::DTD * getDTD(::java::lang::String *);
-  virtual ::javax::swing::text::html::parser::Element * getElement(::java::lang::String *);
-  virtual ::javax::swing::text::html::parser::Element * getElement(jint);
-  virtual ::javax::swing::text::html::parser::Entity * getEntity(jint);
-  virtual ::javax::swing::text::html::parser::Entity * getEntity(::java::lang::String *);
-  virtual ::java::lang::String * getName();
-  virtual ::javax::swing::text::html::parser::Entity * defEntity(::java::lang::String *, jint, jint);
-  virtual void defineAttributes(::java::lang::String *, ::javax::swing::text::html::parser::AttributeList *);
-  virtual ::javax::swing::text::html::parser::Element * defineElement(::java::lang::String *, jint, jboolean, jboolean, ::javax::swing::text::html::parser::ContentModel *, ::java::util::BitSet *, ::java::util::BitSet *, ::javax::swing::text::html::parser::AttributeList *);
-  virtual ::javax::swing::text::html::parser::Entity * defineEntity(::java::lang::String *, jint, JArray< jchar > *);
-  static void putDTDHash(::java::lang::String *, ::javax::swing::text::html::parser::DTD *);
-  virtual void read(::java::io::DataInputStream *);
-  virtual ::java::lang::String * toString();
-public: // actually protected
-  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 ::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::Entity * defEntity(::java::lang::String *, jint, ::java::lang::String *);
-private:
-  void assignField(::javax::swing::text::html::parser::Element *);
-  ::java::util::BitSet * bitSet(JArray< ::java::lang::String * > *);
-  ::javax::swing::text::html::parser::Element * newElement(::java::lang::String *);
-  ::javax::swing::text::html::parser::Entity * newEntity(::java::lang::String *, jint);
-  void unexpected(::java::lang::Exception *);
-public:
-  static const jint FILE_VERSION = 1;
-public: // actually package-private
-  static ::java::util::Hashtable * dtdHash;
-public:
-  ::javax::swing::text::html::parser::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) applet;
-  ::javax::swing::text::html::parser::Element * base;
-  ::javax::swing::text::html::parser::Element * body;
-  ::javax::swing::text::html::parser::Element * head;
-  ::javax::swing::text::html::parser::Element * html;
-  ::javax::swing::text::html::parser::Element * isindex;
-  ::javax::swing::text::html::parser::Element * meta;
-  ::javax::swing::text::html::parser::Element * p;
-  ::javax::swing::text::html::parser::Element * param;
-  ::javax::swing::text::html::parser::Element * pcdata;
-  ::javax::swing::text::html::parser::Element * title;
-  ::java::util::Hashtable * elementHash;
-  ::java::util::Hashtable * entityHash;
-  ::java::lang::String * name;
-  ::java::util::Vector * elements;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_DTD__
diff --git a/libjava/javax/swing/text/html/parser/DTDConstants.h b/libjava/javax/swing/text/html/parser/DTDConstants.h
deleted file mode 100644
index 7fe66c6de36..00000000000
--- a/libjava/javax/swing/text/html/parser/DTDConstants.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_DTDConstants__
-#define __javax_swing_text_html_parser_DTDConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTDConstants;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::DTDConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint CDATA = 1;
-  static const jint EMPTY = 17;
-  static const jint ID = 4;
-  static const jint IDREF = 5;
-  static const jint IDREFS = 6;
-  static const jint NAME = 7;
-  static const jint NAMES = 8;
-  static const jint NMTOKEN = 9;
-  static const jint NMTOKENS = 10;
-  static const jint NOTATION = 11;
-  static const jint NUMBER = 12;
-  static const jint NUMBERS = 13;
-  static const jint NUTOKEN = 14;
-  static const jint NUTOKENS = 15;
-  static const jint PUBLIC = 10;
-  static const jint SYSTEM = 17;
-  static const jint PARAMETER = 262144;
-  static const jint GENERAL = 65536;
-  static const jint REQUIRED = 2;
-  static const jint FIXED = 1;
-  static const jint IMPLIED = 5;
-  static const jint CURRENT = 3;
-  static const jint CONREF = 4;
-  static const jint STARTTAG = 13;
-  static const jint ENDTAG = 14;
-  static const jint ANY = 19;
-  static const jint DEFAULT = 131072;
-  static const jint ENTITIES = 3;
-  static const jint ENTITY = 2;
-  static const jint MD = 16;
-  static const jint MODEL = 18;
-  static const jint MS = 15;
-  static const jint PI = 12;
-  static const jint RCDATA = 16;
-  static const jint SDATA = 11;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_text_html_parser_DTDConstants__
diff --git a/libjava/javax/swing/text/html/parser/DocumentParser$gnuParser.h b/libjava/javax/swing/text/html/parser/DocumentParser$gnuParser.h
deleted file mode 100644
index cba941dcfe7..00000000000
--- a/libjava/javax/swing/text/html/parser/DocumentParser$gnuParser.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_DocumentParser$gnuParser__
-#define __javax_swing_text_html_parser_DocumentParser$gnuParser__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/Parser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class DocumentParser;
-              class DocumentParser$gnuParser;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::DocumentParser$gnuParser : public ::gnu::javax::swing::text::html::parser::support::Parser
-{
-
-  DocumentParser$gnuParser(::javax::swing::text::html::parser::DocumentParser *, ::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();
-  DocumentParser$gnuParser(::javax::swing::text::html::parser::DocumentParser *, ::javax::swing::text::html::parser::DTD *, ::javax::swing::text::html::parser::DocumentParser$gnuParser *);
-  ::javax::swing::text::html::parser::DocumentParser * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_DocumentParser$gnuParser__
diff --git a/libjava/javax/swing/text/html/parser/DocumentParser.h b/libjava/javax/swing/text/html/parser/DocumentParser.h
deleted file mode 100644
index d07191d19e5..00000000000
--- a/libjava/javax/swing/text/html/parser/DocumentParser.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_DocumentParser__
-#define __javax_swing_text_html_parser_DocumentParser__
-
-#pragma interface
-
-#include <javax/swing/text/html/parser/Parser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTMLEditorKit$ParserCallback;
-          namespace parser
-          {
-              class DTD;
-              class DocumentParser;
-              class DocumentParser$gnuParser;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::DocumentParser : public ::javax::swing::text::html::parser::Parser
-{
-
-public:
-  DocumentParser(::javax::swing::text::html::parser::DTD *);
-  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::HTMLEditorKit$ParserCallback *, jboolean);
-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
-  ::javax::swing::text::html::parser::DocumentParser * __attribute__((aligned(__alignof__( ::javax::swing::text::html::parser::Parser)))) parser;
-  ::javax::swing::text::html::HTMLEditorKit$ParserCallback * callBack;
-  ::javax::swing::text::html::parser::DocumentParser$gnuParser * gnu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_DocumentParser__
diff --git a/libjava/javax/swing/text/html/parser/Element$1.h b/libjava/javax/swing/text/html/parser/Element$1.h
deleted file mode 100644
index 2afab6c234c..00000000000
--- a/libjava/javax/swing/text/html/parser/Element$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Element$1__
-#define __javax_swing_text_html_parser_Element$1__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class Element$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Element$1 : public ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper
-{
-
-public: // actually package-private
-  Element$1();
-public: // actually protected
-  void create();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Element$1__
diff --git a/libjava/javax/swing/text/html/parser/Element.h b/libjava/javax/swing/text/html/parser/Element.h
deleted file mode 100644
index 08bc75c7a19..00000000000
--- a/libjava/javax/swing/text/html/parser/Element.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Element__
-#define __javax_swing_text_html_parser_Element__
-
-#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;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class AttributeList;
-              class ContentModel;
-              class Element;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Element : public ::java::lang::Object
-{
-
-public: // actually package-private
-  Element();
-public:
-  static jint name2type(::java::lang::String *);
-  ::javax::swing::text::html::parser::AttributeList * getAttribute(::java::lang::String *);
-  ::javax::swing::text::html::parser::AttributeList * getAttributeByValue(::java::lang::String *);
-  ::javax::swing::text::html::parser::AttributeList * getAttributes();
-  ::javax::swing::text::html::parser::ContentModel * getContent();
-  jboolean isEmpty();
-  jint getIndex();
-  ::java::lang::String * getName();
-  jint getType();
-  jboolean omitEnd();
-  jboolean omitStart();
-  ::java::lang::String * toString();
-public: // actually package-private
-  static ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper * mapper;
-private:
-  static const jlong serialVersionUID = -6717939384601675586LL;
-public:
-  ::javax::swing::text::html::parser::AttributeList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) atts;
-  ::java::util::BitSet * exclusions;
-  ::java::util::BitSet * inclusions;
-  ::javax::swing::text::html::parser::ContentModel * content;
-  ::java::lang::Object * data;
-  ::java::lang::String * name;
-  jboolean oEnd;
-  jboolean oStart;
-  jint index;
-  jint type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Element__
diff --git a/libjava/javax/swing/text/html/parser/Entity$1.h b/libjava/javax/swing/text/html/parser/Entity$1.h
deleted file mode 100644
index 5be3083b43f..00000000000
--- a/libjava/javax/swing/text/html/parser/Entity$1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Entity$1__
-#define __javax_swing_text_html_parser_Entity$1__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/gnuStringIntMapper.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class Entity$1;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Entity$1 : public ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper
-{
-
-public: // actually package-private
-  Entity$1();
-public: // actually protected
-  void create();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Entity$1__
diff --git a/libjava/javax/swing/text/html/parser/Entity.h b/libjava/javax/swing/text/html/parser/Entity.h
deleted file mode 100644
index 2c82e3167c4..00000000000
--- a/libjava/javax/swing/text/html/parser/Entity.h
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Entity__
-#define __javax_swing_text_html_parser_Entity__
-
-#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 gnuStringIntMapper;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class Entity;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Entity : public ::java::lang::Object
-{
-
-public:
-  Entity(::java::lang::String *, jint, JArray< jchar > *);
-  static jint name2type(::java::lang::String *);
-  JArray< jchar > * getData();
-  jboolean isGeneral();
-  ::java::lang::String * getName();
-  jboolean isParameter();
-  ::java::lang::String * getString();
-  jint getType();
-public: // actually package-private
-  static ::gnu::javax::swing::text::html::parser::support::gnuStringIntMapper * mapper;
-public:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
-  JArray< jchar > * data;
-  jint type;
-private:
-  ::java::lang::String * sdata;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Entity__
diff --git a/libjava/javax/swing/text/html/parser/Parser$1.h b/libjava/javax/swing/text/html/parser/Parser$1.h
deleted file mode 100644
index 98f30521735..00000000000
--- a/libjava/javax/swing/text/html/parser/Parser$1.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Parser$1__
-#define __javax_swing_text_html_parser_Parser$1__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/Parser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class Element;
-              class Parser;
-              class Parser$1;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Parser$1 : public ::gnu::javax::swing::text::html::parser::support::Parser
-{
-
-public: // actually package-private
-  Parser$1(::javax::swing::text::html::parser::Parser *, ::javax::swing::text::html::parser::DTD *, ::javax::swing::text::html::parser::Parser *);
-public: // actually protected
-  void handleComment(JArray< jchar > *);
-  void handleEOFInComment();
-  void handleEmptyTag(::javax::swing::text::html::parser::TagElement *);
-  void handleStartTag(::javax::swing::text::html::parser::TagElement *);
-  void handleEndTag(::javax::swing::text::html::parser::TagElement *);
-  void handleError(jint, ::java::lang::String *);
-  void handleText(JArray< jchar > *);
-  void handleTitle(JArray< jchar > *);
-  void markFirstTime(::javax::swing::text::html::parser::Element *);
-  void startTag(::javax::swing::text::html::parser::TagElement *);
-  void endTag(jboolean);
-  ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *);
-  ::javax::swing::text::html::parser::TagElement * makeTag(::javax::swing::text::html::parser::Element *, jboolean);
-public: // actually package-private
-  ::javax::swing::text::html::parser::Parser * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
-private:
-  ::javax::swing::text::html::parser::Parser * val$j;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Parser$1__
diff --git a/libjava/javax/swing/text/html/parser/Parser.h b/libjava/javax/swing/text/html/parser/Parser.h
deleted file mode 100644
index 5f8e0dbab4b..00000000000
--- a/libjava/javax/swing/text/html/parser/Parser.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_Parser__
-#define __javax_swing_text_html_parser_Parser__
-
-#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 Parser;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class SimpleAttributeSet;
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class Element;
-              class Parser;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::Parser : public ::java::lang::Object
-{
-
-public:
-  Parser(::javax::swing::text::html::parser::DTD *);
-  virtual void parse(::java::io::Reader *);
-  virtual ::java::lang::String * parseDTDMarkup();
-public: // actually protected
-  virtual jboolean parseMarkupDeclarations(::java::lang::StringBuffer *);
-  virtual ::javax::swing::text::SimpleAttributeSet * getAttributes();
-  virtual jint getCurrentLine();
-  virtual jint getCurrentPos();
-  virtual void endTag(jboolean);
-  virtual void error(::java::lang::String *);
-  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 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 void startTag(::javax::swing::text::html::parser::TagElement *);
-  ::javax::swing::text::html::parser::DTD * __attribute__((aligned(__alignof__( ::java::lang::Object)))) dtd;
-  jboolean strict;
-public: // actually package-private
-  ::gnu::javax::swing::text::html::parser::support::Parser * gnu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_Parser__
diff --git a/libjava/javax/swing/text/html/parser/ParserDelegator$gnuParser.h b/libjava/javax/swing/text/html/parser/ParserDelegator$gnuParser.h
deleted file mode 100644
index fec9d39c1f2..00000000000
--- a/libjava/javax/swing/text/html/parser/ParserDelegator$gnuParser.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_ParserDelegator$gnuParser__
-#define __javax_swing_text_html_parser_ParserDelegator$gnuParser__
-
-#pragma interface
-
-#include <gnu/javax/swing/text/html/parser/support/Parser.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-          namespace parser
-          {
-              class DTD;
-              class ParserDelegator;
-              class ParserDelegator$gnuParser;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::ParserDelegator$gnuParser : public ::gnu::javax::swing::text::html::parser::support::Parser
-{
-
-  ParserDelegator$gnuParser(::javax::swing::text::html::parser::ParserDelegator *, ::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();
-  ParserDelegator$gnuParser(::javax::swing::text::html::parser::ParserDelegator *, ::javax::swing::text::html::parser::DTD *, ::javax::swing::text::html::parser::ParserDelegator$gnuParser *);
-private:
-  static const jlong serialVersionUID = 1LL;
-public: // actually package-private
-  ::javax::swing::text::html::parser::ParserDelegator * __attribute__((aligned(__alignof__( ::gnu::javax::swing::text::html::parser::support::Parser)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_ParserDelegator$gnuParser__
diff --git a/libjava/javax/swing/text/html/parser/ParserDelegator.h b/libjava/javax/swing/text/html/parser/ParserDelegator.h
deleted file mode 100644
index b2c35297b15..00000000000
--- a/libjava/javax/swing/text/html/parser/ParserDelegator.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_ParserDelegator__
-#define __javax_swing_text_html_parser_ParserDelegator__
-
-#pragma interface
-
-#include <javax/swing/text/html/HTMLEditorKit$Parser.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTMLEditorKit$ParserCallback;
-          namespace parser
-          {
-              class DTD;
-              class ParserDelegator;
-              class ParserDelegator$gnuParser;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::ParserDelegator : public ::javax::swing::text::html::HTMLEditorKit$Parser
-{
-
-public:
-  ParserDelegator();
-  virtual void parse(::java::io::Reader *, ::javax::swing::text::html::HTMLEditorKit$ParserCallback *, jboolean);
-public: // actually protected
-  static void setDefaultDTD();
-  static ::javax::swing::text::html::parser::DTD * createDTD(::javax::swing::text::html::parser::DTD *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -1276686502624777206LL;
-  static ::javax::swing::text::html::parser::DTD * dtd;
-public: // actually package-private
-  ::javax::swing::text::html::HTMLEditorKit$ParserCallback * __attribute__((aligned(__alignof__( ::javax::swing::text::html::HTMLEditorKit$Parser)))) callBack;
-  ::javax::swing::text::html::parser::ParserDelegator$gnuParser * gnu;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_ParserDelegator__
diff --git a/libjava/javax/swing/text/html/parser/TagElement.h b/libjava/javax/swing/text/html/parser/TagElement.h
deleted file mode 100644
index b29cad472b5..00000000000
--- a/libjava/javax/swing/text/html/parser/TagElement.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_parser_TagElement__
-#define __javax_swing_text_html_parser_TagElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace html
-        {
-            class HTML$Tag;
-          namespace parser
-          {
-              class Element;
-              class TagElement;
-          }
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::parser::TagElement : public ::java::lang::Object
-{
-
-public:
-  TagElement(::javax::swing::text::html::parser::Element *);
-  TagElement(::javax::swing::text::html::parser::Element *, jboolean);
-  virtual ::javax::swing::text::html::parser::Element * getElement();
-  virtual ::javax::swing::text::html::HTML$Tag * getHTMLTag();
-  virtual jboolean isPreformatted();
-  virtual jboolean breaksFlow();
-  virtual jboolean fictional();
-  virtual ::java::lang::String * toString();
-private:
-  ::javax::swing::text::html::parser::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) element;
-  ::javax::swing::text::html::HTML$Tag * tag;
-  jboolean fictional__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_parser_TagElement__
diff --git a/libjava/javax/swing/text/rtf/ControlWordToken.h b/libjava/javax/swing/text/rtf/ControlWordToken.h
deleted file mode 100644
index aa6a352a4a7..00000000000
--- a/libjava/javax/swing/text/rtf/ControlWordToken.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_ControlWordToken__
-#define __javax_swing_text_rtf_ControlWordToken__
-
-#pragma interface
-
-#include <javax/swing/text/rtf/Token.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace rtf
-        {
-            class ControlWordToken;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::ControlWordToken : public ::javax::swing::text::rtf::Token
-{
-
-public:
-  ControlWordToken(::java::lang::String *);
-  ControlWordToken(::java::lang::String *, jint);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::rtf::Token)))) name;
-  jint param;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_ControlWordToken__
diff --git a/libjava/javax/swing/text/rtf/RTFEditorKit.h b/libjava/javax/swing/text/rtf/RTFEditorKit.h
deleted file mode 100644
index 789bec142ad..00000000000
--- a/libjava/javax/swing/text/rtf/RTFEditorKit.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_RTFEditorKit__
-#define __javax_swing_text_rtf_RTFEditorKit__
-
-#pragma interface
-
-#include <javax/swing/text/StyledEditorKit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Document;
-        namespace rtf
-        {
-            class RTFEditorKit;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::RTFEditorKit : public ::javax::swing::text::StyledEditorKit
-{
-
-public:
-  RTFEditorKit();
-  virtual ::java::lang::String * getContentType();
-  virtual void read(::java::io::InputStream *, ::javax::swing::text::Document *, jint);
-  virtual void read(::java::io::Reader *, ::javax::swing::text::Document *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_RTFEditorKit__
diff --git a/libjava/javax/swing/text/rtf/RTFParseException.h b/libjava/javax/swing/text/rtf/RTFParseException.h
deleted file mode 100644
index 4c5e2b81ad2..00000000000
--- a/libjava/javax/swing/text/rtf/RTFParseException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_RTFParseException__
-#define __javax_swing_text_rtf_RTFParseException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace rtf
-        {
-            class RTFParseException;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::RTFParseException : public ::java::lang::RuntimeException
-{
-
-public:
-  RTFParseException();
-  RTFParseException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_RTFParseException__
diff --git a/libjava/javax/swing/text/rtf/RTFParser.h b/libjava/javax/swing/text/rtf/RTFParser.h
deleted file mode 100644
index 5de9f592080..00000000000
--- a/libjava/javax/swing/text/rtf/RTFParser.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_RTFParser__
-#define __javax_swing_text_rtf_RTFParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class Document;
-        namespace rtf
-        {
-            class RTFParser;
-            class RTFScanner;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::RTFParser : public ::java::lang::Object
-{
-
-  RTFParser(::javax::swing::text::Document *, jint);
-public:
-  RTFParser(::java::io::InputStream *, ::javax::swing::text::Document *, jint);
-  RTFParser(::java::io::Reader *, ::javax::swing::text::Document *, jint);
-  virtual ::javax::swing::text::Document * getDocument();
-  virtual void parse();
-private:
-  void parseFile();
-  void parseHeader();
-  void parseDocument();
-  ::javax::swing::text::rtf::RTFScanner * __attribute__((aligned(__alignof__( ::java::lang::Object)))) scanner;
-  ::javax::swing::text::Document * doc;
-  jint pos;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_RTFParser__
diff --git a/libjava/javax/swing/text/rtf/RTFScanner.h b/libjava/javax/swing/text/rtf/RTFScanner.h
deleted file mode 100644
index ebfd9108aa6..00000000000
--- a/libjava/javax/swing/text/rtf/RTFScanner.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_RTFScanner__
-#define __javax_swing_text_rtf_RTFScanner__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace rtf
-        {
-            class RTFScanner;
-            class Token;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::RTFScanner : public ::java::lang::Object
-{
-
-  RTFScanner();
-public:
-  RTFScanner(::java::io::InputStream *);
-  RTFScanner(::java::io::Reader *);
-private:
-  ::javax::swing::text::rtf::Token * readTokenImpl();
-public: // actually package-private
-  virtual ::javax::swing::text::rtf::Token * peekToken();
-  virtual ::javax::swing::text::rtf::Token * readToken();
-private:
-  ::javax::swing::text::rtf::Token * readControlWord();
-  ::javax::swing::text::rtf::Token * readText();
-  ::java::io::Reader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
-  ::java::lang::StringBuffer * buffer;
-  ::javax::swing::text::rtf::Token * lastToken;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_RTFScanner__
diff --git a/libjava/javax/swing/text/rtf/TextToken.h b/libjava/javax/swing/text/rtf/TextToken.h
deleted file mode 100644
index 189d22994be..00000000000
--- a/libjava/javax/swing/text/rtf/TextToken.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_TextToken__
-#define __javax_swing_text_rtf_TextToken__
-
-#pragma interface
-
-#include <javax/swing/text/rtf/Token.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace rtf
-        {
-            class TextToken;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::TextToken : public ::javax::swing::text::rtf::Token
-{
-
-public:
-  TextToken(::java::lang::String *);
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::swing::text::rtf::Token)))) text;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_TextToken__
diff --git a/libjava/javax/swing/text/rtf/Token.h b/libjava/javax/swing/text/rtf/Token.h
deleted file mode 100644
index bd32666bff0..00000000000
--- a/libjava/javax/swing/text/rtf/Token.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_rtf_Token__
-#define __javax_swing_text_rtf_Token__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-        namespace rtf
-        {
-            class Token;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::rtf::Token : public ::java::lang::Object
-{
-
-public:
-  Token(jint);
-  static const jint EOF = -1;
-  static const jint LCURLY = 1;
-  static const jint RCURLY = 2;
-  static const jint CONTROL_WORD = 3;
-  static const jint TEXT = 4;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_rtf_Token__
diff --git a/libjava/javax/swing/tree/AbstractLayoutCache$NodeDimensions.h b/libjava/javax/swing/tree/AbstractLayoutCache$NodeDimensions.h
deleted file mode 100644
index 88eca9e7bf0..00000000000
--- a/libjava/javax/swing/tree/AbstractLayoutCache$NodeDimensions.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_AbstractLayoutCache$NodeDimensions__
-#define __javax_swing_tree_AbstractLayoutCache$NodeDimensions__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class AbstractLayoutCache$NodeDimensions;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::AbstractLayoutCache$NodeDimensions : public ::java::lang::Object
-{
-
-public:
-  AbstractLayoutCache$NodeDimensions();
-  virtual ::java::awt::Rectangle * getNodeDimensions(::java::lang::Object *, jint, jint, jboolean, ::java::awt::Rectangle *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_AbstractLayoutCache$NodeDimensions__
diff --git a/libjava/javax/swing/tree/AbstractLayoutCache.h b/libjava/javax/swing/tree/AbstractLayoutCache.h
deleted file mode 100644
index d51c8e852d2..00000000000
--- a/libjava/javax/swing/tree/AbstractLayoutCache.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_AbstractLayoutCache__
-#define __javax_swing_tree_AbstractLayoutCache__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-      namespace tree
-      {
-          class AbstractLayoutCache;
-          class AbstractLayoutCache$NodeDimensions;
-          class TreeModel;
-          class TreePath;
-          class TreeSelectionModel;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::AbstractLayoutCache : public ::java::lang::Object
-{
-
-public:
-  AbstractLayoutCache();
-  virtual void setNodeDimensions(::javax::swing::tree::AbstractLayoutCache$NodeDimensions *);
-  virtual ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * getNodeDimensions();
-public: // actually protected
-  virtual ::java::awt::Rectangle * getNodeDimensions(::java::lang::Object *, jint, jint, jboolean, ::java::awt::Rectangle *);
-public:
-  virtual void setModel(::javax::swing::tree::TreeModel *);
-  virtual ::javax::swing::tree::TreeModel * getModel();
-  virtual void setRootVisible(jboolean);
-  virtual jboolean isRootVisible();
-  virtual void setRowHeight(jint);
-  virtual jint getRowHeight();
-  virtual void setSelectionModel(::javax::swing::tree::TreeSelectionModel *);
-  virtual ::javax::swing::tree::TreeSelectionModel * getSelectionModel();
-  virtual jint getPreferredHeight();
-  virtual jint getPreferredWidth(::java::awt::Rectangle *);
-  virtual jboolean isExpanded(::javax::swing::tree::TreePath *) = 0;
-  virtual ::java::awt::Rectangle * getBounds(::javax::swing::tree::TreePath *, ::java::awt::Rectangle *) = 0;
-  virtual ::javax::swing::tree::TreePath * getPathForRow(jint) = 0;
-  virtual jint getRowForPath(::javax::swing::tree::TreePath *) = 0;
-  virtual ::javax::swing::tree::TreePath * getPathClosestTo(jint, jint) = 0;
-  virtual ::java::util::Enumeration * getVisiblePathsFrom(::javax::swing::tree::TreePath *) = 0;
-  virtual jint getVisibleChildCount(::javax::swing::tree::TreePath *) = 0;
-  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean) = 0;
-  virtual jboolean getExpandedState(::javax::swing::tree::TreePath *) = 0;
-  virtual jint getRowCount() = 0;
-  virtual void invalidateSizes() = 0;
-  virtual void invalidatePathBounds(::javax::swing::tree::TreePath *) = 0;
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *) = 0;
-  virtual JArray< jint > * getRowsForPaths(JArray< ::javax::swing::tree::TreePath * > *);
-public: // actually protected
-  virtual jboolean isFixedRowHeight();
-  ::javax::swing::tree::AbstractLayoutCache$NodeDimensions * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nodeDimensions;
-  ::javax::swing::tree::TreeModel * treeModel;
-  ::javax::swing::tree::TreeSelectionModel * treeSelectionModel;
-  jboolean rootVisible;
-  jint rowHeight;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_AbstractLayoutCache__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
deleted file mode 100644
index 50c7118f8dd..00000000000
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultMutableTreeNode$BreadthFirstEnumeration__
-#define __javax_swing_tree_DefaultMutableTreeNode$BreadthFirstEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultMutableTreeNode$BreadthFirstEnumeration;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultMutableTreeNode$BreadthFirstEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultMutableTreeNode$BreadthFirstEnumeration(::javax::swing::tree::TreeNode *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultMutableTreeNode$BreadthFirstEnumeration__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
deleted file mode 100644
index 629c2943bbc..00000000000
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultMutableTreeNode$PostorderEnumeration__
-#define __javax_swing_tree_DefaultMutableTreeNode$PostorderEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultMutableTreeNode$PostorderEnumeration;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultMutableTreeNode$PostorderEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultMutableTreeNode$PostorderEnumeration(::javax::swing::tree::TreeNode *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-private:
-  ::java::lang::Object * traverse(::java::util::Enumeration *);
-public: // actually package-private
-  ::java::util::Stack * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nodes;
-  ::java::util::Stack * childrenEnums;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultMutableTreeNode$PostorderEnumeration__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
deleted file mode 100644
index 53e87c3e295..00000000000
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultMutableTreeNode$PreorderEnumeration__
-#define __javax_swing_tree_DefaultMutableTreeNode$PreorderEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultMutableTreeNode$PreorderEnumeration;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultMutableTreeNode$PreorderEnumeration : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultMutableTreeNode$PreorderEnumeration(::javax::swing::tree::TreeNode *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-private:
-  ::javax::swing::tree::TreeNode * traverse(::java::util::Enumeration *);
-public: // actually package-private
-  ::javax::swing::tree::TreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
-  ::java::util::Stack * childrenEnums;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultMutableTreeNode$PreorderEnumeration__
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode.h b/libjava/javax/swing/tree/DefaultMutableTreeNode.h
deleted file mode 100644
index b5a46532375..00000000000
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultMutableTreeNode__
-#define __javax_swing_tree_DefaultMutableTreeNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultMutableTreeNode;
-          class MutableTreeNode;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultMutableTreeNode : public ::java::lang::Object
-{
-
-public:
-  DefaultMutableTreeNode();
-  DefaultMutableTreeNode(::java::lang::Object *);
-  DefaultMutableTreeNode(::java::lang::Object *, jboolean);
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-  virtual void add(::javax::swing::tree::MutableTreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getParent();
-  virtual void remove(jint);
-  virtual void remove(::javax::swing::tree::MutableTreeNode *);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  virtual void insert(::javax::swing::tree::MutableTreeNode *, jint);
-  virtual JArray< ::javax::swing::tree::TreeNode * > * getPath();
-  virtual ::java::util::Enumeration * children();
-  virtual void setParent(::javax::swing::tree::MutableTreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getChildAt(jint);
-  virtual jint getChildCount();
-  virtual jint getIndex(::javax::swing::tree::TreeNode *);
-  virtual void setAllowsChildren(jboolean);
-  virtual jboolean getAllowsChildren();
-  virtual void setUserObject(::java::lang::Object *);
-  virtual ::java::lang::Object * getUserObject();
-  virtual void removeFromParent();
-  virtual void removeAllChildren();
-  virtual jboolean isNodeAncestor(::javax::swing::tree::TreeNode *);
-  virtual jboolean isNodeDescendant(::javax::swing::tree::DefaultMutableTreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getSharedAncestor(::javax::swing::tree::DefaultMutableTreeNode *);
-  virtual jboolean isNodeRelated(::javax::swing::tree::DefaultMutableTreeNode *);
-  virtual jint getDepth();
-  virtual jint getLevel();
-public: // actually protected
-  virtual JArray< ::javax::swing::tree::TreeNode * > * getPathToRoot(::javax::swing::tree::TreeNode *, jint);
-public:
-  virtual JArray< ::java::lang::Object * > * getUserObjectPath();
-  virtual ::javax::swing::tree::TreeNode * getRoot();
-  virtual jboolean isRoot();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getNextNode();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getPreviousNode();
-  virtual ::java::util::Enumeration * preorderEnumeration();
-  virtual ::java::util::Enumeration * postorderEnumeration();
-  virtual ::java::util::Enumeration * breadthFirstEnumeration();
-  virtual ::java::util::Enumeration * depthFirstEnumeration();
-  virtual ::java::util::Enumeration * pathFromAncestorEnumeration(::javax::swing::tree::TreeNode *);
-  virtual jboolean isNodeChild(::javax::swing::tree::TreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getFirstChild();
-  virtual ::javax::swing::tree::TreeNode * getLastChild();
-  virtual ::javax::swing::tree::TreeNode * getChildAfter(::javax::swing::tree::TreeNode *);
-  virtual ::javax::swing::tree::TreeNode * getChildBefore(::javax::swing::tree::TreeNode *);
-  virtual jboolean isNodeSibling(::javax::swing::tree::TreeNode *);
-  virtual jint getSiblingCount();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getNextSibling();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getPreviousSibling();
-  virtual jboolean isLeaf();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getFirstLeaf();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getLastLeaf();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getNextLeaf();
-  virtual ::javax::swing::tree::DefaultMutableTreeNode * getPreviousLeaf();
-  virtual jint getLeafCount();
-private:
-  static const jlong serialVersionUID = -4298474751201349152LL;
-public:
-  static ::java::util::Enumeration * EMPTY_ENUMERATION;
-public: // actually protected
-  ::javax::swing::tree::MutableTreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
-  ::java::util::Vector * children__;
-  ::java::lang::Object * userObject;
-  jboolean allowsChildren;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultMutableTreeNode__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.h b/libjava/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.h
deleted file mode 100644
index a09a8dcbe42..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor$DefaultTextField.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeCellEditor$DefaultTextField__
-#define __javax_swing_tree_DefaultTreeCellEditor$DefaultTextField__
-
-#pragma interface
-
-#include <javax/swing/JTextField.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Font;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace border
-      {
-          class Border;
-      }
-      namespace tree
-      {
-          class DefaultTreeCellEditor;
-          class DefaultTreeCellEditor$DefaultTextField;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeCellEditor$DefaultTextField : public ::javax::swing::JTextField
-{
-
-public:
-  DefaultTreeCellEditor$DefaultTextField(::javax::swing::tree::DefaultTreeCellEditor *, ::javax::swing::border::Border *);
-  virtual ::java::awt::Font * getFont();
-  virtual ::javax::swing::border::Border * getBorder();
-  virtual ::java::awt::Dimension * getPreferredSize();
-public: // actually package-private
-  static const jlong serialVersionUID = -6629304544265300143LL;
-public: // actually protected
-  ::javax::swing::border::Border * __attribute__((aligned(__alignof__( ::javax::swing::JTextField)))) border;
-public: // actually package-private
-  ::javax::swing::tree::DefaultTreeCellEditor * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeCellEditor$DefaultTextField__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.h b/libjava/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.h
deleted file mode 100644
index 554543398b5..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor$EditorContainer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeCellEditor$EditorContainer__
-#define __javax_swing_tree_DefaultTreeCellEditor$EditorContainer__
-
-#pragma interface
-
-#include <java/awt/Container.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Dimension;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultTreeCellEditor;
-          class DefaultTreeCellEditor$EditorContainer;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeCellEditor$EditorContainer : public ::java::awt::Container
-{
-
-public:
-  DefaultTreeCellEditor$EditorContainer(::javax::swing::tree::DefaultTreeCellEditor *);
-  virtual void EditorContainer();
-  virtual void paint(::java::awt::Graphics *);
-  virtual void doLayout();
-  virtual ::java::awt::Dimension * getPreferredSize();
-public: // actually package-private
-  static const jlong serialVersionUID = 6470339600449699810LL;
-  ::javax::swing::tree::DefaultTreeCellEditor * __attribute__((aligned(__alignof__( ::java::awt::Container)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeCellEditor$EditorContainer__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor$RealEditorListener.h b/libjava/javax/swing/tree/DefaultTreeCellEditor$RealEditorListener.h
deleted file mode 100644
index cc889e4cd16..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor$RealEditorListener.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeCellEditor$RealEditorListener__
-#define __javax_swing_tree_DefaultTreeCellEditor$RealEditorListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class ChangeEvent;
-      }
-      namespace tree
-      {
-          class DefaultTreeCellEditor;
-          class DefaultTreeCellEditor$RealEditorListener;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeCellEditor$RealEditorListener : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultTreeCellEditor$RealEditorListener(::javax::swing::tree::DefaultTreeCellEditor *);
-public:
-  virtual void editingCanceled(::javax::swing::event::ChangeEvent *);
-  virtual void editingStopped(::javax::swing::event::ChangeEvent *);
-public: // actually package-private
-  ::javax::swing::tree::DefaultTreeCellEditor * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeCellEditor$RealEditorListener__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor.h b/libjava/javax/swing/tree/DefaultTreeCellEditor.h
deleted file mode 100644
index 759439c189f..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeCellEditor__
-#define __javax_swing_tree_DefaultTreeCellEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Container;
-        class Font;
-      namespace event
-      {
-          class ActionEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JTree;
-        class Timer;
-      namespace event
-      {
-          class CellEditorListener;
-          class EventListenerList;
-          class TreeSelectionEvent;
-      }
-      namespace tree
-      {
-          class DefaultTreeCellEditor;
-          class DefaultTreeCellRenderer;
-          class TreeCellEditor;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeCellEditor : public ::java::lang::Object
-{
-
-public:
-  DefaultTreeCellEditor(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *);
-  DefaultTreeCellEditor(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *, ::javax::swing::tree::TreeCellEditor *);
-private:
-  void configureEditingComponent(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *, ::javax::swing::tree::TreeCellEditor *);
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  virtual void setBorderSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getBorderSelectionColor();
-  virtual void setFont(::java::awt::Font *);
-  virtual ::java::awt::Font * getFont();
-  virtual ::java::awt::Component * getTreeCellEditorComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint);
-  virtual ::java::lang::Object * getCellEditorValue();
-  virtual jboolean isCellEditable(::java::util::EventObject *);
-  virtual jboolean shouldSelectCell(::java::util::EventObject *);
-  virtual jboolean stopCellEditing();
-  virtual void cancelCellEditing();
-private:
-  void finish();
-public:
-  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *);
-  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *);
-  virtual JArray< ::javax::swing::event::CellEditorListener * > * getCellEditorListeners();
-  virtual void valueChanged(::javax::swing::event::TreeSelectionEvent *);
-  virtual void actionPerformed(::java::awt::event::ActionEvent *);
-public: // actually protected
-  virtual void setTree(::javax::swing::JTree *);
-  virtual jboolean shouldStartEditingTimer(::java::util::EventObject *);
-  virtual void startEditingTimer();
-  virtual jboolean canEditImmediately(::java::util::EventObject *);
-  virtual jboolean inHitRegion(jint, jint);
-  virtual void determineOffset(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint);
-  virtual void prepareForEditing();
-  virtual ::java::awt::Container * createContainer();
-  virtual ::javax::swing::tree::TreeCellEditor * createTreeCellEditor();
-private:
-  ::javax::swing::event::EventListenerList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) listenerList;
-public: // actually protected
-  ::javax::swing::tree::TreeCellEditor * realEditor;
-  ::javax::swing::tree::DefaultTreeCellRenderer * renderer;
-  ::java::awt::Container * editingContainer;
-  ::java::awt::Component * editingComponent;
-  jboolean canEdit;
-  jint offset;
-  ::javax::swing::JTree * tree;
-  ::javax::swing::tree::TreePath * lastPath;
-  ::javax::swing::Timer * timer;
-  jint lastRow;
-  ::java::awt::Color * borderSelectionColor;
-  ::javax::swing::Icon * editingIcon;
-  ::java::awt::Font * font;
-private:
-  ::javax::swing::tree::TreePath * tPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeCellEditor__
diff --git a/libjava/javax/swing/tree/DefaultTreeCellRenderer.h b/libjava/javax/swing/tree/DefaultTreeCellRenderer.h
deleted file mode 100644
index 5677bad3670..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeCellRenderer.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeCellRenderer__
-#define __javax_swing_tree_DefaultTreeCellRenderer__
-
-#pragma interface
-
-#include <javax/swing/JLabel.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Color;
-        class Component;
-        class Dimension;
-        class Font;
-        class Graphics;
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class Icon;
-        class JTree;
-      namespace tree
-      {
-          class DefaultTreeCellRenderer;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeCellRenderer : public ::javax::swing::JLabel
-{
-
-public:
-  DefaultTreeCellRenderer();
-  virtual ::javax::swing::Icon * getDefaultOpenIcon();
-  virtual ::javax::swing::Icon * getDefaultClosedIcon();
-  virtual ::javax::swing::Icon * getDefaultLeafIcon();
-  virtual void setOpenIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getOpenIcon();
-  virtual void setClosedIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getClosedIcon();
-  virtual void setLeafIcon(::javax::swing::Icon *);
-  virtual ::javax::swing::Icon * getLeafIcon();
-  virtual void setTextSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getTextSelectionColor();
-  virtual void setTextNonSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getTextNonSelectionColor();
-  virtual void setBackgroundSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackgroundSelectionColor();
-  virtual void setBackgroundNonSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getBackgroundNonSelectionColor();
-  virtual void setBorderSelectionColor(::java::awt::Color *);
-  virtual ::java::awt::Color * getBorderSelectionColor();
-  virtual void setFont(::java::awt::Font *);
-  virtual void setBackground(::java::awt::Color *);
-  virtual ::java::awt::Component * getTreeCellRendererComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint, jboolean);
-  virtual ::java::awt::Font * getFont();
-  virtual void paint(::java::awt::Graphics *);
-private:
-  void paintFocus(::java::awt::Graphics *, jint, jint, jint, jint);
-  jint getXOffset();
-public:
-  virtual ::java::awt::Dimension * getPreferredSize();
-  virtual void validate();
-  virtual void revalidate();
-  virtual void repaint(jlong, jint, jint, jint, jint);
-  virtual void repaint(::java::awt::Rectangle *);
-public: // actually protected
-  virtual void firePropertyChange(::java::lang::String *, ::java::lang::Object *, ::java::lang::Object *);
-public:
-  virtual void firePropertyChange(::java::lang::String *, jbyte, jbyte);
-  virtual void firePropertyChange(::java::lang::String *, jchar, jchar);
-  virtual void firePropertyChange(::java::lang::String *, jshort, jshort);
-  virtual void firePropertyChange(::java::lang::String *, jint, jint);
-  virtual void firePropertyChange(::java::lang::String *, jlong, jlong);
-  virtual void firePropertyChange(::java::lang::String *, jfloat, jfloat);
-  virtual void firePropertyChange(::java::lang::String *, jdouble, jdouble);
-  virtual void firePropertyChange(::java::lang::String *, jboolean, jboolean);
-public: // actually protected
-  jboolean __attribute__((aligned(__alignof__( ::javax::swing::JLabel)))) selected;
-  jboolean hasFocus;
-private:
-  jboolean drawsFocusBorderAroundIcon;
-public: // actually protected
-  ::javax::swing::Icon * closedIcon;
-  ::javax::swing::Icon * leafIcon;
-  ::javax::swing::Icon * openIcon;
-  ::java::awt::Color * textSelectionColor;
-  ::java::awt::Color * textNonSelectionColor;
-  ::java::awt::Color * backgroundSelectionColor;
-  ::java::awt::Color * backgroundNonSelectionColor;
-  ::java::awt::Color * borderSelectionColor;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeCellRenderer__
diff --git a/libjava/javax/swing/tree/DefaultTreeModel.h b/libjava/javax/swing/tree/DefaultTreeModel.h
deleted file mode 100644
index 18deb18fa67..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeModel.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeModel__
-#define __javax_swing_tree_DefaultTreeModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class EventListenerList;
-          class TreeModelListener;
-      }
-      namespace tree
-      {
-          class DefaultTreeModel;
-          class MutableTreeNode;
-          class TreeNode;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeModel : public ::java::lang::Object
-{
-
-public:
-  DefaultTreeModel(::javax::swing::tree::TreeNode *);
-  DefaultTreeModel(::javax::swing::tree::TreeNode *, jboolean);
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  virtual jboolean asksAllowsChildren();
-  virtual void setAsksAllowsChildren(jboolean);
-  virtual void setRoot(::javax::swing::tree::TreeNode *);
-  virtual ::java::lang::Object * getRoot();
-  virtual jint getIndexOfChild(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getChild(::java::lang::Object *, jint);
-  virtual jint getChildCount(::java::lang::Object *);
-  virtual jboolean isLeaf(::java::lang::Object *);
-  virtual void reload();
-  virtual void reload(::javax::swing::tree::TreeNode *);
-  virtual void valueForPathChanged(::javax::swing::tree::TreePath *, ::java::lang::Object *);
-  virtual void insertNodeInto(::javax::swing::tree::MutableTreeNode *, ::javax::swing::tree::MutableTreeNode *, jint);
-  virtual void removeNodeFromParent(::javax::swing::tree::MutableTreeNode *);
-  virtual void nodeChanged(::javax::swing::tree::TreeNode *);
-  virtual void nodesWereInserted(::javax::swing::tree::TreeNode *, JArray< jint > *);
-  virtual void nodesWereRemoved(::javax::swing::tree::TreeNode *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  virtual void nodesChanged(::javax::swing::tree::TreeNode *, JArray< jint > *);
-  virtual void nodeStructureChanged(::javax::swing::tree::TreeNode *);
-  virtual JArray< ::javax::swing::tree::TreeNode * > * getPathToRoot(::javax::swing::tree::TreeNode *);
-public: // actually protected
-  virtual JArray< ::javax::swing::tree::TreeNode * > * getPathToRoot(::javax::swing::tree::TreeNode *, jint);
-public:
-  virtual void addTreeModelListener(::javax::swing::event::TreeModelListener *);
-  virtual void removeTreeModelListener(::javax::swing::event::TreeModelListener *);
-  virtual JArray< ::javax::swing::event::TreeModelListener * > * getTreeModelListeners();
-public: // actually protected
-  virtual void fireTreeNodesChanged(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  virtual void fireTreeNodesInserted(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  virtual void fireTreeNodesRemoved(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-  virtual void fireTreeStructureChanged(::java::lang::Object *, JArray< ::java::lang::Object * > *, JArray< jint > *, JArray< ::java::lang::Object * > *);
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-public: // actually package-private
-  static const jlong serialVersionUID = -2621068368932566998LL;
-public: // actually protected
-  ::javax::swing::tree::TreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) root;
-  ::javax::swing::event::EventListenerList * listenerList;
-  jboolean asksAllowsChildren__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeModel__
diff --git a/libjava/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.h b/libjava/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.h
deleted file mode 100644
index c9544bb4645..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeSelectionModel$PathPlaceHolder.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeSelectionModel$PathPlaceHolder__
-#define __javax_swing_tree_DefaultTreeSelectionModel$PathPlaceHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class DefaultTreeSelectionModel$PathPlaceHolder;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeSelectionModel$PathPlaceHolder : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DefaultTreeSelectionModel$PathPlaceHolder(::javax::swing::tree::TreePath *, jboolean);
-  ::javax::swing::tree::TreePath * __attribute__((aligned(__alignof__( ::java::lang::Object)))) path;
-  jboolean isNew;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeSelectionModel$PathPlaceHolder__
diff --git a/libjava/javax/swing/tree/DefaultTreeSelectionModel.h b/libjava/javax/swing/tree/DefaultTreeSelectionModel.h
deleted file mode 100644
index 07a358d1531..00000000000
--- a/libjava/javax/swing/tree/DefaultTreeSelectionModel.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_DefaultTreeSelectionModel__
-#define __javax_swing_tree_DefaultTreeSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class DefaultListSelectionModel;
-      namespace event
-      {
-          class EventListenerList;
-          class SwingPropertyChangeSupport;
-          class TreeSelectionEvent;
-          class TreeSelectionListener;
-      }
-      namespace tree
-      {
-          class DefaultTreeSelectionModel;
-          class RowMapper;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::DefaultTreeSelectionModel : public ::java::lang::Object
-{
-
-public:
-  DefaultTreeSelectionModel();
-  virtual ::java::lang::Object * clone();
-  virtual ::java::lang::String * toString();
-private:
-  void writeObject(::java::io::ObjectOutputStream *);
-  void readObject(::java::io::ObjectInputStream *);
-public:
-  virtual void setRowMapper(::javax::swing::tree::RowMapper *);
-  virtual ::javax::swing::tree::RowMapper * getRowMapper();
-  virtual void setSelectionMode(jint);
-  virtual jint getSelectionMode();
-  virtual void setSelectionPath(::javax::swing::tree::TreePath *);
-public: // actually package-private
-  virtual jint getRow(::javax::swing::tree::TreePath *);
-public:
-  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void addSelectionPath(::javax::swing::tree::TreePath *);
-  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void removeSelectionPath(::javax::swing::tree::TreePath *);
-  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual ::javax::swing::tree::TreePath * getSelectionPath();
-  virtual JArray< ::javax::swing::tree::TreePath * > * getSelectionPaths();
-  virtual jint getSelectionCount();
-  virtual jboolean isPathSelected(::javax::swing::tree::TreePath *);
-  virtual jboolean isSelectionEmpty();
-  virtual void clearSelection();
-  virtual void addTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
-  virtual void removeTreeSelectionListener(::javax::swing::event::TreeSelectionListener *);
-  virtual JArray< ::javax::swing::event::TreeSelectionListener * > * getTreeSelectionListeners();
-public: // actually protected
-  virtual void fireValueChanged(::javax::swing::event::TreeSelectionEvent *);
-public:
-  virtual JArray< ::java::util::EventListener * > * getListeners(::java::lang::Class *);
-  virtual JArray< jint > * getSelectionRows();
-  virtual jint getMinSelectionRow();
-  virtual jint getMaxSelectionRow();
-  virtual jboolean isRowSelected(jint);
-  virtual void resetRowSelection();
-  virtual jint getLeadSelectionRow();
-  virtual ::javax::swing::tree::TreePath * getLeadSelectionPath();
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *);
-  virtual JArray< ::java::beans::PropertyChangeListener * > * getPropertyChangeListeners();
-public: // actually protected
-  virtual void insureRowContinuity();
-  virtual jboolean arePathsContiguous(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual jboolean canPathsBeAdded(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual jboolean canPathsBeRemoved(JArray< ::javax::swing::tree::TreePath * > *);
-  virtual void notifyPathChange(::java::util::Vector *, ::javax::swing::tree::TreePath *);
-  virtual void updateLeadIndex();
-  virtual void insureUniqueness();
-public: // actually package-private
-  static const jlong serialVersionUID = 3288129636638950196LL;
-public:
-  static ::java::lang::String * SELECTION_MODE_PROPERTY;
-public: // actually protected
-  ::javax::swing::event::SwingPropertyChangeSupport * __attribute__((aligned(__alignof__( ::java::lang::Object)))) changeSupport;
-  JArray< ::javax::swing::tree::TreePath * > * selection;
-  ::javax::swing::event::EventListenerList * listenerList;
-  ::javax::swing::tree::RowMapper * rowMapper;
-  ::javax::swing::DefaultListSelectionModel * listSelectionModel;
-  jint selectionMode;
-  ::javax::swing::tree::TreePath * leadPath;
-  jint leadIndex;
-  jint leadRow;
-private:
-  ::java::util::HashSet * selectedPaths;
-  ::java::util::HashSet * tmpPaths;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_DefaultTreeSelectionModel__
diff --git a/libjava/javax/swing/tree/ExpandVetoException.h b/libjava/javax/swing/tree/ExpandVetoException.h
deleted file mode 100644
index 174bcb8974d..00000000000
--- a/libjava/javax/swing/tree/ExpandVetoException.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_ExpandVetoException__
-#define __javax_swing_tree_ExpandVetoException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeExpansionEvent;
-      }
-      namespace tree
-      {
-          class ExpandVetoException;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::ExpandVetoException : public ::java::lang::Exception
-{
-
-public:
-  ExpandVetoException(::javax::swing::event::TreeExpansionEvent *);
-  ExpandVetoException(::javax::swing::event::TreeExpansionEvent *, ::java::lang::String *);
-public: // actually protected
-  ::javax::swing::event::TreeExpansionEvent * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) event;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_ExpandVetoException__
diff --git a/libjava/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.h b/libjava/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.h
deleted file mode 100644
index 7d128e39621..00000000000
--- a/libjava/javax/swing/tree/FixedHeightLayoutCache$NodeRecord.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_FixedHeightLayoutCache$NodeRecord__
-#define __javax_swing_tree_FixedHeightLayoutCache$NodeRecord__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class FixedHeightLayoutCache;
-          class FixedHeightLayoutCache$NodeRecord;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::FixedHeightLayoutCache$NodeRecord : public ::java::lang::Object
-{
-
-public: // actually package-private
-  FixedHeightLayoutCache$NodeRecord(::javax::swing::tree::FixedHeightLayoutCache *, jint, jint, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::tree::TreePath * getPath();
-  virtual ::java::awt::Rectangle * getBounds();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) row;
-  jint depth;
-  ::java::lang::Object * parent;
-  ::java::lang::Object * node;
-  jboolean isExpanded;
-  ::java::awt::Rectangle * bounds;
-private:
-  ::javax::swing::tree::TreePath * path;
-public: // actually package-private
-  ::javax::swing::tree::FixedHeightLayoutCache * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_FixedHeightLayoutCache$NodeRecord__
diff --git a/libjava/javax/swing/tree/FixedHeightLayoutCache.h b/libjava/javax/swing/tree/FixedHeightLayoutCache.h
deleted file mode 100644
index 863ccd9f06c..00000000000
--- a/libjava/javax/swing/tree/FixedHeightLayoutCache.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_FixedHeightLayoutCache__
-#define __javax_swing_tree_FixedHeightLayoutCache__
-
-#pragma interface
-
-#include <javax/swing/tree/VariableHeightLayoutCache.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-      namespace tree
-      {
-          class FixedHeightLayoutCache;
-          class TreeModel;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::FixedHeightLayoutCache : public ::javax::swing::tree::VariableHeightLayoutCache
-{
-
-public:
-  FixedHeightLayoutCache();
-  virtual jint getRowCount();
-private:
-  void update();
-  void countRows(::java::lang::Object *, ::java::lang::Object *, jint);
-public:
-  virtual void invalidatePathBounds(::javax::swing::tree::TreePath *);
-  virtual void invalidateSizes();
-  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean);
-  virtual jboolean isExpanded(::javax::swing::tree::TreePath *);
-  virtual ::java::awt::Rectangle * getBounds(::javax::swing::tree::TreePath *, ::java::awt::Rectangle *);
-  virtual ::javax::swing::tree::TreePath * getPathForRow(jint);
-  virtual jint getRowForPath(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPathClosestTo(jint, jint);
-public: // actually package-private
-  virtual jint distance(::java::awt::Rectangle *, jint, jint);
-public:
-  virtual jint getVisibleChildCount(::javax::swing::tree::TreePath *);
-  virtual ::java::util::Enumeration * getVisiblePathsFrom(::javax::swing::tree::TreePath *);
-  virtual jboolean getExpandedState(::javax::swing::tree::TreePath *);
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void setModel(::javax::swing::tree::TreeModel *);
-  virtual void setRootVisible(jboolean);
-  virtual jint getPreferredHeight();
-  virtual jint getPreferredWidth(::java::awt::Rectangle *);
-public: // actually protected
-  virtual jboolean isFixedRowHeight();
-public: // actually package-private
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::javax::swing::tree::VariableHeightLayoutCache)))) expanded;
-  ::java::util::Hashtable * nodes;
-  ::java::util::Hashtable * row2node;
-  jboolean dirty;
-  jint totalHeight;
-  jint maximalWidth;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_FixedHeightLayoutCache__
diff --git a/libjava/javax/swing/tree/MutableTreeNode.h b/libjava/javax/swing/tree/MutableTreeNode.h
deleted file mode 100644
index 221f6750dc5..00000000000
--- a/libjava/javax/swing/tree/MutableTreeNode.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_MutableTreeNode__
-#define __javax_swing_tree_MutableTreeNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class MutableTreeNode;
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::MutableTreeNode : public ::java::lang::Object
-{
-
-public:
-  virtual void insert(::javax::swing::tree::MutableTreeNode *, jint) = 0;
-  virtual void remove(jint) = 0;
-  virtual void remove(::javax::swing::tree::MutableTreeNode *) = 0;
-  virtual void setUserObject(::java::lang::Object *) = 0;
-  virtual void removeFromParent() = 0;
-  virtual void setParent(::javax::swing::tree::MutableTreeNode *) = 0;
-  virtual ::javax::swing::tree::TreeNode * getParent() = 0;
-  virtual jint getIndex(::javax::swing::tree::TreeNode *) = 0;
-  virtual ::javax::swing::tree::TreeNode * getChildAt(jint) = 0;
-  virtual jint getChildCount() = 0;
-  virtual jboolean getAllowsChildren() = 0;
-  virtual jboolean isLeaf() = 0;
-  virtual ::java::util::Enumeration * children() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_MutableTreeNode__
diff --git a/libjava/javax/swing/tree/RowMapper.h b/libjava/javax/swing/tree/RowMapper.h
deleted file mode 100644
index d7310d3fcfb..00000000000
--- a/libjava/javax/swing/tree/RowMapper.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_RowMapper__
-#define __javax_swing_tree_RowMapper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class RowMapper;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::RowMapper : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jint > * getRowsForPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_RowMapper__
diff --git a/libjava/javax/swing/tree/TreeCellEditor.h b/libjava/javax/swing/tree/TreeCellEditor.h
deleted file mode 100644
index 0b18ec605ba..00000000000
--- a/libjava/javax/swing/tree/TreeCellEditor.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreeCellEditor__
-#define __javax_swing_tree_TreeCellEditor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree;
-      namespace event
-      {
-          class CellEditorListener;
-      }
-      namespace tree
-      {
-          class TreeCellEditor;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreeCellEditor : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getTreeCellEditorComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint) = 0;
-  virtual ::java::lang::Object * getCellEditorValue() = 0;
-  virtual jboolean isCellEditable(::java::util::EventObject *) = 0;
-  virtual jboolean shouldSelectCell(::java::util::EventObject *) = 0;
-  virtual jboolean stopCellEditing() = 0;
-  virtual void cancelCellEditing() = 0;
-  virtual void addCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  virtual void removeCellEditorListener(::javax::swing::event::CellEditorListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_TreeCellEditor__
diff --git a/libjava/javax/swing/tree/TreeCellRenderer.h b/libjava/javax/swing/tree/TreeCellRenderer.h
deleted file mode 100644
index 2043386d14d..00000000000
--- a/libjava/javax/swing/tree/TreeCellRenderer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreeCellRenderer__
-#define __javax_swing_tree_TreeCellRenderer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-        class JTree;
-      namespace tree
-      {
-          class TreeCellRenderer;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreeCellRenderer : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::awt::Component * getTreeCellRendererComponent(::javax::swing::JTree *, ::java::lang::Object *, jboolean, jboolean, jboolean, jint, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_TreeCellRenderer__
diff --git a/libjava/javax/swing/tree/TreeModel.h b/libjava/javax/swing/tree/TreeModel.h
deleted file mode 100644
index 981d53fb5ab..00000000000
--- a/libjava/javax/swing/tree/TreeModel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreeModel__
-#define __javax_swing_tree_TreeModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelListener;
-      }
-      namespace tree
-      {
-          class TreeModel;
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreeModel : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getRoot() = 0;
-  virtual ::java::lang::Object * getChild(::java::lang::Object *, jint) = 0;
-  virtual jint getChildCount(::java::lang::Object *) = 0;
-  virtual jboolean isLeaf(::java::lang::Object *) = 0;
-  virtual void valueForPathChanged(::javax::swing::tree::TreePath *, ::java::lang::Object *) = 0;
-  virtual jint getIndexOfChild(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual void addTreeModelListener(::javax::swing::event::TreeModelListener *) = 0;
-  virtual void removeTreeModelListener(::javax::swing::event::TreeModelListener *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_TreeModel__
diff --git a/libjava/javax/swing/tree/TreeNode.h b/libjava/javax/swing/tree/TreeNode.h
deleted file mode 100644
index 3307c09c68a..00000000000
--- a/libjava/javax/swing/tree/TreeNode.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreeNode__
-#define __javax_swing_tree_TreeNode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class TreeNode;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreeNode : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::swing::tree::TreeNode * getParent() = 0;
-  virtual jint getIndex(::javax::swing::tree::TreeNode *) = 0;
-  virtual ::javax::swing::tree::TreeNode * getChildAt(jint) = 0;
-  virtual jint getChildCount() = 0;
-  virtual jboolean getAllowsChildren() = 0;
-  virtual jboolean isLeaf() = 0;
-  virtual ::java::util::Enumeration * children() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_TreeNode__
diff --git a/libjava/javax/swing/tree/TreePath.h b/libjava/javax/swing/tree/TreePath.h
deleted file mode 100644
index 9c99e2720ea..00000000000
--- a/libjava/javax/swing/tree/TreePath.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreePath__
-#define __javax_swing_tree_TreePath__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class TreePath;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreePath : public ::java::lang::Object
-{
-
-public:
-  TreePath(JArray< ::java::lang::Object * > *);
-  TreePath(::java::lang::Object *);
-public: // actually protected
-  TreePath(::javax::swing::tree::TreePath *, ::java::lang::Object *);
-  TreePath(JArray< ::java::lang::Object * > *, jint);
-  TreePath();
-public:
-  virtual jint hashCode();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual JArray< ::java::lang::Object * > * getPath();
-  virtual ::java::lang::Object * getLastPathComponent();
-  virtual jint getPathCount();
-  virtual ::java::lang::Object * getPathComponent(jint);
-  virtual jboolean isDescendant(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * pathByAddingChild(::java::lang::Object *);
-  virtual ::javax::swing::tree::TreePath * getParentPath();
-public: // actually package-private
-  static const jlong serialVersionUID = 4380036194768077479LL;
-private:
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) path;
-  ::javax::swing::tree::TreePath * parentPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_TreePath__
diff --git a/libjava/javax/swing/tree/TreeSelectionModel.h b/libjava/javax/swing/tree/TreeSelectionModel.h
deleted file mode 100644
index 3c0194d1808..00000000000
--- a/libjava/javax/swing/tree/TreeSelectionModel.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_TreeSelectionModel__
-#define __javax_swing_tree_TreeSelectionModel__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeListener;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeSelectionListener;
-      }
-      namespace tree
-      {
-          class RowMapper;
-          class TreePath;
-          class TreeSelectionModel;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::TreeSelectionModel : public ::java::lang::Object
-{
-
-public:
-  virtual void setSelectionMode(jint) = 0;
-  virtual jint getSelectionMode() = 0;
-  virtual void setSelectionPath(::javax::swing::tree::TreePath *) = 0;
-  virtual void setSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
-  virtual void addSelectionPath(::javax::swing::tree::TreePath *) = 0;
-  virtual void addSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
-  virtual void removeSelectionPath(::javax::swing::tree::TreePath *) = 0;
-  virtual void removeSelectionPaths(JArray< ::javax::swing::tree::TreePath * > *) = 0;
-  virtual ::javax::swing::tree::TreePath * getSelectionPath() = 0;
-  virtual JArray< ::javax::swing::tree::TreePath * > * getSelectionPaths() = 0;
-  virtual jint getSelectionCount() = 0;
-  virtual jboolean isPathSelected(::javax::swing::tree::TreePath *) = 0;
-  virtual jboolean isSelectionEmpty() = 0;
-  virtual void clearSelection() = 0;
-  virtual void setRowMapper(::javax::swing::tree::RowMapper *) = 0;
-  virtual ::javax::swing::tree::RowMapper * getRowMapper() = 0;
-  virtual JArray< jint > * getSelectionRows() = 0;
-  virtual jint getMinSelectionRow() = 0;
-  virtual jint getMaxSelectionRow() = 0;
-  virtual jboolean isRowSelected(jint) = 0;
-  virtual void resetRowSelection() = 0;
-  virtual jint getLeadSelectionRow() = 0;
-  virtual ::javax::swing::tree::TreePath * getLeadSelectionPath() = 0;
-  virtual void addPropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual void removePropertyChangeListener(::java::beans::PropertyChangeListener *) = 0;
-  virtual void addTreeSelectionListener(::javax::swing::event::TreeSelectionListener *) = 0;
-  virtual void removeTreeSelectionListener(::javax::swing::event::TreeSelectionListener *) = 0;
-  static const jint SINGLE_TREE_SELECTION = 1;
-  static const jint CONTIGUOUS_TREE_SELECTION = 2;
-  static const jint DISCONTIGUOUS_TREE_SELECTION = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_tree_TreeSelectionModel__
diff --git a/libjava/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.h b/libjava/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.h
deleted file mode 100644
index 1555726c9ef..00000000000
--- a/libjava/javax/swing/tree/VariableHeightLayoutCache$NodeRecord.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_VariableHeightLayoutCache$NodeRecord__
-#define __javax_swing_tree_VariableHeightLayoutCache$NodeRecord__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace tree
-      {
-          class TreePath;
-          class VariableHeightLayoutCache;
-          class VariableHeightLayoutCache$NodeRecord;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::VariableHeightLayoutCache$NodeRecord : public ::java::lang::Object
-{
-
-public: // actually package-private
-  VariableHeightLayoutCache$NodeRecord(::javax::swing::tree::VariableHeightLayoutCache *, jint, jint, ::java::lang::Object *, ::java::lang::Object *);
-  virtual ::javax::swing::tree::TreePath * getPath();
-  virtual ::java::awt::Rectangle * getBounds();
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) row;
-  jint depth;
-  ::java::lang::Object * parent;
-  ::java::lang::Object * node;
-  jboolean isExpanded;
-  ::java::awt::Rectangle * bounds;
-private:
-  ::javax::swing::tree::TreePath * path;
-public: // actually package-private
-  ::javax::swing::tree::VariableHeightLayoutCache * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_VariableHeightLayoutCache$NodeRecord__
diff --git a/libjava/javax/swing/tree/VariableHeightLayoutCache.h b/libjava/javax/swing/tree/VariableHeightLayoutCache.h
deleted file mode 100644
index 81a85bad41f..00000000000
--- a/libjava/javax/swing/tree/VariableHeightLayoutCache.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_tree_VariableHeightLayoutCache__
-#define __javax_swing_tree_VariableHeightLayoutCache__
-
-#pragma interface
-
-#include <javax/swing/tree/AbstractLayoutCache.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Rectangle;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class TreeModelEvent;
-      }
-      namespace tree
-      {
-          class AbstractLayoutCache$NodeDimensions;
-          class TreeModel;
-          class TreePath;
-          class VariableHeightLayoutCache;
-      }
-    }
-  }
-}
-
-class javax::swing::tree::VariableHeightLayoutCache : public ::javax::swing::tree::AbstractLayoutCache
-{
-
-public:
-  VariableHeightLayoutCache();
-  virtual jint getRowCount();
-private:
-  void update();
-  jint countRows(::java::lang::Object *, ::java::lang::Object *, jint, jint);
-public:
-  virtual void invalidatePathBounds(::javax::swing::tree::TreePath *);
-  virtual void invalidateSizes();
-  virtual void setExpandedState(::javax::swing::tree::TreePath *, jboolean);
-  virtual jboolean isExpanded(::javax::swing::tree::TreePath *);
-  virtual ::java::awt::Rectangle * getBounds(::javax::swing::tree::TreePath *, ::java::awt::Rectangle *);
-  virtual ::javax::swing::tree::TreePath * getPathForRow(jint);
-  virtual jint getRowForPath(::javax::swing::tree::TreePath *);
-  virtual ::javax::swing::tree::TreePath * getPathClosestTo(jint, jint);
-public: // actually package-private
-  virtual jint distance(::java::awt::Rectangle *, jint, jint);
-public:
-  virtual jint getVisibleChildCount(::javax::swing::tree::TreePath *);
-  virtual ::java::util::Enumeration * getVisiblePathsFrom(::javax::swing::tree::TreePath *);
-  virtual jboolean getExpandedState(::javax::swing::tree::TreePath *);
-  virtual void treeNodesChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesInserted(::javax::swing::event::TreeModelEvent *);
-  virtual void treeNodesRemoved(::javax::swing::event::TreeModelEvent *);
-  virtual void treeStructureChanged(::javax::swing::event::TreeModelEvent *);
-  virtual void setModel(::javax::swing::tree::TreeModel *);
-  virtual void setRootVisible(jboolean);
-  virtual jint getPreferredHeight();
-  virtual jint getPreferredWidth(::java::awt::Rectangle *);
-  virtual void setNodeDimensions(::javax::swing::tree::AbstractLayoutCache$NodeDimensions *);
-  virtual void setRowHeight(jint);
-private:
-  static ::java::awt::Rectangle * RECT_CACHE;
-public: // actually package-private
-  ::java::util::Set * __attribute__((aligned(__alignof__( ::javax::swing::tree::AbstractLayoutCache)))) expanded;
-  ::java::util::Hashtable * nodes;
-  ::java::util::ArrayList * row2node;
-  jboolean dirty;
-  jint totalHeight;
-  jint maximalWidth;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_tree_VariableHeightLayoutCache__
diff --git a/libjava/javax/swing/undo/AbstractUndoableEdit.h b/libjava/javax/swing/undo/AbstractUndoableEdit.h
deleted file mode 100644
index e800a690fe4..00000000000
--- a/libjava/javax/swing/undo/AbstractUndoableEdit.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_AbstractUndoableEdit__
-#define __javax_swing_undo_AbstractUndoableEdit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class AbstractUndoableEdit;
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::AbstractUndoableEdit : public ::java::lang::Object
-{
-
-public:
-  AbstractUndoableEdit();
-  virtual void undo();
-  virtual jboolean canUndo();
-  virtual void redo();
-  virtual jboolean canRedo();
-  virtual void die();
-  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
-  virtual jboolean replaceEdit(::javax::swing::undo::UndoableEdit *);
-  virtual jboolean isSignificant();
-  virtual ::java::lang::String * getPresentationName();
-  virtual ::java::lang::String * getUndoPresentationName();
-  virtual ::java::lang::String * getRedoPresentationName();
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  static const jlong serialVersionUID = 580150227676302096LL;
-public: // actually protected
-  static ::java::lang::String * UndoName;
-  static ::java::lang::String * RedoName;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) hasBeenDone;
-  jboolean alive;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_AbstractUndoableEdit__
diff --git a/libjava/javax/swing/undo/CannotRedoException.h b/libjava/javax/swing/undo/CannotRedoException.h
deleted file mode 100644
index 5d20d8d7a4c..00000000000
--- a/libjava/javax/swing/undo/CannotRedoException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_CannotRedoException__
-#define __javax_swing_undo_CannotRedoException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class CannotRedoException;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::CannotRedoException : public ::java::lang::RuntimeException
-{
-
-public:
-  CannotRedoException();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_CannotRedoException__
diff --git a/libjava/javax/swing/undo/CannotUndoException.h b/libjava/javax/swing/undo/CannotUndoException.h
deleted file mode 100644
index d7a3cb2c2e8..00000000000
--- a/libjava/javax/swing/undo/CannotUndoException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_CannotUndoException__
-#define __javax_swing_undo_CannotUndoException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class CannotUndoException;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::CannotUndoException : public ::java::lang::RuntimeException
-{
-
-public:
-  CannotUndoException();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_CannotUndoException__
diff --git a/libjava/javax/swing/undo/CompoundEdit.h b/libjava/javax/swing/undo/CompoundEdit.h
deleted file mode 100644
index 9c890538421..00000000000
--- a/libjava/javax/swing/undo/CompoundEdit.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_CompoundEdit__
-#define __javax_swing_undo_CompoundEdit__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class CompoundEdit;
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::CompoundEdit : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  CompoundEdit();
-  virtual void undo();
-  virtual void redo();
-public: // actually protected
-  virtual ::javax::swing::undo::UndoableEdit * lastEdit();
-public:
-  virtual void die();
-  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
-  virtual void end();
-  virtual jboolean canUndo();
-  virtual jboolean canRedo();
-  virtual jboolean isInProgress();
-  virtual jboolean isSignificant();
-  virtual ::java::lang::String * getPresentationName();
-  virtual ::java::lang::String * getUndoPresentationName();
-  virtual ::java::lang::String * getRedoPresentationName();
-  virtual ::java::lang::String * toString();
-private:
-  static const jlong serialVersionUID = -6512679249930119683LL;
-public: // actually protected
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) edits;
-private:
-  jboolean inProgress;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_CompoundEdit__
diff --git a/libjava/javax/swing/undo/StateEdit.h b/libjava/javax/swing/undo/StateEdit.h
deleted file mode 100644
index 80c91588e4c..00000000000
--- a/libjava/javax/swing/undo/StateEdit.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_StateEdit__
-#define __javax_swing_undo_StateEdit__
-
-#pragma interface
-
-#include <javax/swing/undo/AbstractUndoableEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class StateEdit;
-          class StateEditable;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::StateEdit : public ::javax::swing::undo::AbstractUndoableEdit
-{
-
-public:
-  StateEdit(::javax::swing::undo::StateEditable *);
-  StateEdit(::javax::swing::undo::StateEditable *, ::java::lang::String *);
-public: // actually protected
-  virtual void init(::javax::swing::undo::StateEditable *, ::java::lang::String *);
-public:
-  virtual void end();
-  virtual void undo();
-  virtual void redo();
-  virtual ::java::lang::String * getPresentationName();
-public: // actually protected
-  virtual void removeRedundantState();
-  static ::java::lang::String * RCSID;
-  ::javax::swing::undo::StateEditable * __attribute__((aligned(__alignof__( ::javax::swing::undo::AbstractUndoableEdit)))) object;
-  ::java::util::Hashtable * preState;
-  ::java::util::Hashtable * postState;
-  ::java::lang::String * undoRedoName;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_StateEdit__
diff --git a/libjava/javax/swing/undo/StateEditable.h b/libjava/javax/swing/undo/StateEditable.h
deleted file mode 100644
index 0f1343ab8d0..00000000000
--- a/libjava/javax/swing/undo/StateEditable.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_StateEditable__
-#define __javax_swing_undo_StateEditable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class StateEditable;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::StateEditable : public ::java::lang::Object
-{
-
-public:
-  virtual void restoreState(::java::util::Hashtable *) = 0;
-  virtual void storeState(::java::util::Hashtable *) = 0;
-  static ::java::lang::String * RCSID;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_undo_StateEditable__
diff --git a/libjava/javax/swing/undo/UndoManager.h b/libjava/javax/swing/undo/UndoManager.h
deleted file mode 100644
index 9189c1c0bcf..00000000000
--- a/libjava/javax/swing/undo/UndoManager.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_UndoManager__
-#define __javax_swing_undo_UndoManager__
-
-#pragma interface
-
-#include <javax/swing/undo/CompoundEdit.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class UndoableEditEvent;
-      }
-      namespace undo
-      {
-          class UndoManager;
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::UndoManager : public ::javax::swing::undo::CompoundEdit
-{
-
-public:
-  UndoManager();
-  virtual ::java::lang::String * toString();
-  virtual void end();
-  virtual jint getLimit();
-  virtual void setLimit(jint);
-  virtual void discardAllEdits();
-public: // actually protected
-  virtual void trimForLimit();
-  virtual void trimEdits(jint, jint);
-  virtual ::javax::swing::undo::UndoableEdit * editToBeUndone();
-  virtual ::javax::swing::undo::UndoableEdit * editToBeRedone();
-  virtual void undoTo(::javax::swing::undo::UndoableEdit *);
-  virtual void redoTo(::javax::swing::undo::UndoableEdit *);
-public:
-  virtual void undoOrRedo();
-  virtual jboolean canUndoOrRedo();
-  virtual void undo();
-  virtual jboolean canUndo();
-  virtual void redo();
-  virtual jboolean canRedo();
-  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *);
-  virtual ::java::lang::String * getUndoOrRedoPresentationName();
-  virtual ::java::lang::String * getUndoPresentationName();
-  virtual ::java::lang::String * getRedoPresentationName();
-  virtual void undoableEditHappened(::javax::swing::event::UndoableEditEvent *);
-public: // actually package-private
-  static const jlong serialVersionUID = -2077529998244066750LL;
-  jint __attribute__((aligned(__alignof__( ::javax::swing::undo::CompoundEdit)))) indexOfNextAdd;
-  jint limit;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_UndoManager__
diff --git a/libjava/javax/swing/undo/UndoableEdit.h b/libjava/javax/swing/undo/UndoableEdit.h
deleted file mode 100644
index 59b73543dc8..00000000000
--- a/libjava/javax/swing/undo/UndoableEdit.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_UndoableEdit__
-#define __javax_swing_undo_UndoableEdit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace undo
-      {
-          class UndoableEdit;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::UndoableEdit : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean addEdit(::javax::swing::undo::UndoableEdit *) = 0;
-  virtual jboolean canRedo() = 0;
-  virtual jboolean canUndo() = 0;
-  virtual void die() = 0;
-  virtual ::java::lang::String * getPresentationName() = 0;
-  virtual ::java::lang::String * getRedoPresentationName() = 0;
-  virtual ::java::lang::String * getUndoPresentationName() = 0;
-  virtual jboolean isSignificant() = 0;
-  virtual void redo() = 0;
-  virtual jboolean replaceEdit(::javax::swing::undo::UndoableEdit *) = 0;
-  virtual void undo() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_swing_undo_UndoableEdit__
diff --git a/libjava/javax/swing/undo/UndoableEditSupport.h b/libjava/javax/swing/undo/UndoableEditSupport.h
deleted file mode 100644
index 3bfbe30b755..00000000000
--- a/libjava/javax/swing/undo/UndoableEditSupport.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_undo_UndoableEditSupport__
-#define __javax_swing_undo_UndoableEditSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class UndoableEditListener;
-      }
-      namespace undo
-      {
-          class CompoundEdit;
-          class UndoableEdit;
-          class UndoableEditSupport;
-      }
-    }
-  }
-}
-
-class javax::swing::undo::UndoableEditSupport : public ::java::lang::Object
-{
-
-public:
-  UndoableEditSupport();
-  UndoableEditSupport(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-  virtual void addUndoableEditListener(::javax::swing::event::UndoableEditListener *);
-  virtual void removeUndoableEditListener(::javax::swing::event::UndoableEditListener *);
-  virtual JArray< ::javax::swing::event::UndoableEditListener * > * getUndoableEditListeners();
-public: // actually protected
-  virtual void _postEdit(::javax::swing::undo::UndoableEdit *);
-public:
-  virtual void postEdit(::javax::swing::undo::UndoableEdit *);
-  virtual jint getUpdateLevel();
-  virtual void beginUpdate();
-public: // actually protected
-  virtual ::javax::swing::undo::CompoundEdit * createCompoundEdit();
-public:
-  virtual void endUpdate();
-public: // actually protected
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) updateLevel;
-  ::javax::swing::undo::CompoundEdit * compoundEdit;
-  ::java::util::Vector * listeners;
-  ::java::lang::Object * realSource;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_undo_UndoableEditSupport__
diff --git a/libjava/javax/transaction/HeuristicCommitException.h b/libjava/javax/transaction/HeuristicCommitException.h
deleted file mode 100644
index f73ec07291e..00000000000
--- a/libjava/javax/transaction/HeuristicCommitException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_HeuristicCommitException__
-#define __javax_transaction_HeuristicCommitException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class HeuristicCommitException;
-    }
-  }
-}
-
-class javax::transaction::HeuristicCommitException : public ::java::lang::Exception
-{
-
-public:
-  HeuristicCommitException();
-  HeuristicCommitException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_HeuristicCommitException__
diff --git a/libjava/javax/transaction/HeuristicMixedException.h b/libjava/javax/transaction/HeuristicMixedException.h
deleted file mode 100644
index 22128f20072..00000000000
--- a/libjava/javax/transaction/HeuristicMixedException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_HeuristicMixedException__
-#define __javax_transaction_HeuristicMixedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class HeuristicMixedException;
-    }
-  }
-}
-
-class javax::transaction::HeuristicMixedException : public ::java::lang::Exception
-{
-
-public:
-  HeuristicMixedException();
-  HeuristicMixedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_HeuristicMixedException__
diff --git a/libjava/javax/transaction/HeuristicRollbackException.h b/libjava/javax/transaction/HeuristicRollbackException.h
deleted file mode 100644
index c738e94e801..00000000000
--- a/libjava/javax/transaction/HeuristicRollbackException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_HeuristicRollbackException__
-#define __javax_transaction_HeuristicRollbackException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class HeuristicRollbackException;
-    }
-  }
-}
-
-class javax::transaction::HeuristicRollbackException : public ::java::lang::Exception
-{
-
-public:
-  HeuristicRollbackException();
-  HeuristicRollbackException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_HeuristicRollbackException__
diff --git a/libjava/javax/transaction/InvalidTransactionException.h b/libjava/javax/transaction/InvalidTransactionException.h
deleted file mode 100644
index 16850035410..00000000000
--- a/libjava/javax/transaction/InvalidTransactionException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_InvalidTransactionException__
-#define __javax_transaction_InvalidTransactionException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class InvalidTransactionException;
-    }
-  }
-}
-
-class javax::transaction::InvalidTransactionException : public ::java::rmi::RemoteException
-{
-
-public:
-  InvalidTransactionException();
-  InvalidTransactionException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_InvalidTransactionException__
diff --git a/libjava/javax/transaction/NotSupportedException.h b/libjava/javax/transaction/NotSupportedException.h
deleted file mode 100644
index 3737e6d46e2..00000000000
--- a/libjava/javax/transaction/NotSupportedException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_NotSupportedException__
-#define __javax_transaction_NotSupportedException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class NotSupportedException;
-    }
-  }
-}
-
-class javax::transaction::NotSupportedException : public ::java::lang::Exception
-{
-
-public:
-  NotSupportedException();
-  NotSupportedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_NotSupportedException__
diff --git a/libjava/javax/transaction/RollbackException.h b/libjava/javax/transaction/RollbackException.h
deleted file mode 100644
index 396e6785cff..00000000000
--- a/libjava/javax/transaction/RollbackException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_RollbackException__
-#define __javax_transaction_RollbackException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class RollbackException;
-    }
-  }
-}
-
-class javax::transaction::RollbackException : public ::java::lang::Exception
-{
-
-public:
-  RollbackException();
-  RollbackException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_RollbackException__
diff --git a/libjava/javax/transaction/Status.h b/libjava/javax/transaction/Status.h
deleted file mode 100644
index 4fd94ac3806..00000000000
--- a/libjava/javax/transaction/Status.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_Status__
-#define __javax_transaction_Status__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class Status;
-    }
-  }
-}
-
-class javax::transaction::Status : public ::java::lang::Object
-{
-
-public:
-  static const jint STATUS_ACTIVE = 0;
-  static const jint STATUS_MARKED_ROLLBACK = 1;
-  static const jint STATUS_PREPARED = 2;
-  static const jint STATUS_COMMITTED = 3;
-  static const jint STATUS_ROLLEDBACK = 4;
-  static const jint STATUS_UNKNOWN = 5;
-  static const jint STATUS_NO_TRANSACTION = 6;
-  static const jint STATUS_PREPARING = 7;
-  static const jint STATUS_COMMITTING = 8;
-  static const jint STATUS_ROLLING_BACK = 9;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_Status__
diff --git a/libjava/javax/transaction/Synchronization.h b/libjava/javax/transaction/Synchronization.h
deleted file mode 100644
index a1572249a56..00000000000
--- a/libjava/javax/transaction/Synchronization.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_Synchronization__
-#define __javax_transaction_Synchronization__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class Synchronization;
-    }
-  }
-}
-
-class javax::transaction::Synchronization : public ::java::lang::Object
-{
-
-public:
-  virtual void beforeCompletion() = 0;
-  virtual void afterCompletion(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_Synchronization__
diff --git a/libjava/javax/transaction/SystemException.h b/libjava/javax/transaction/SystemException.h
deleted file mode 100644
index 039cc50e0ee..00000000000
--- a/libjava/javax/transaction/SystemException.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_SystemException__
-#define __javax_transaction_SystemException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class SystemException;
-    }
-  }
-}
-
-class javax::transaction::SystemException : public ::java::lang::Exception
-{
-
-public:
-  SystemException();
-  SystemException(::java::lang::String *);
-  SystemException(jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) errorCode;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_SystemException__
diff --git a/libjava/javax/transaction/Transaction.h b/libjava/javax/transaction/Transaction.h
deleted file mode 100644
index 7edbc9dc706..00000000000
--- a/libjava/javax/transaction/Transaction.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_Transaction__
-#define __javax_transaction_Transaction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class Synchronization;
-        class Transaction;
-      namespace xa
-      {
-          class XAResource;
-      }
-    }
-  }
-}
-
-class javax::transaction::Transaction : public ::java::lang::Object
-{
-
-public:
-  virtual void commit() = 0;
-  virtual jboolean delistResource(::javax::transaction::xa::XAResource *, jint) = 0;
-  virtual jboolean enlistResource(::javax::transaction::xa::XAResource *) = 0;
-  virtual jint getStatus() = 0;
-  virtual void registerSynchronization(::javax::transaction::Synchronization *) = 0;
-  virtual void rollback() = 0;
-  virtual void setRollbackOnly() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_Transaction__
diff --git a/libjava/javax/transaction/TransactionManager.h b/libjava/javax/transaction/TransactionManager.h
deleted file mode 100644
index bb5df958b85..00000000000
--- a/libjava/javax/transaction/TransactionManager.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_TransactionManager__
-#define __javax_transaction_TransactionManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class Transaction;
-        class TransactionManager;
-    }
-  }
-}
-
-class javax::transaction::TransactionManager : public ::java::lang::Object
-{
-
-public:
-  virtual void begin() = 0;
-  virtual void commit() = 0;
-  virtual jint getStatus() = 0;
-  virtual ::javax::transaction::Transaction * getTransaction() = 0;
-  virtual void resume(::javax::transaction::Transaction *) = 0;
-  virtual void rollback() = 0;
-  virtual void setRollbackOnly() = 0;
-  virtual void setTransactionTimeout(jint) = 0;
-  virtual ::javax::transaction::Transaction * suspend() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_TransactionManager__
diff --git a/libjava/javax/transaction/TransactionRequiredException.h b/libjava/javax/transaction/TransactionRequiredException.h
deleted file mode 100644
index 4b6aad1de59..00000000000
--- a/libjava/javax/transaction/TransactionRequiredException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_TransactionRequiredException__
-#define __javax_transaction_TransactionRequiredException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class TransactionRequiredException;
-    }
-  }
-}
-
-class javax::transaction::TransactionRequiredException : public ::java::rmi::RemoteException
-{
-
-public:
-  TransactionRequiredException();
-  TransactionRequiredException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_TransactionRequiredException__
diff --git a/libjava/javax/transaction/TransactionRolledbackException.h b/libjava/javax/transaction/TransactionRolledbackException.h
deleted file mode 100644
index 1a13227e292..00000000000
--- a/libjava/javax/transaction/TransactionRolledbackException.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_TransactionRolledbackException__
-#define __javax_transaction_TransactionRolledbackException__
-
-#pragma interface
-
-#include <java/rmi/RemoteException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class TransactionRolledbackException;
-    }
-  }
-}
-
-class javax::transaction::TransactionRolledbackException : public ::java::rmi::RemoteException
-{
-
-public:
-  TransactionRolledbackException();
-  TransactionRolledbackException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_TransactionRolledbackException__
diff --git a/libjava/javax/transaction/UserTransaction.h b/libjava/javax/transaction/UserTransaction.h
deleted file mode 100644
index f1c4e7def9a..00000000000
--- a/libjava/javax/transaction/UserTransaction.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_UserTransaction__
-#define __javax_transaction_UserTransaction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-        class UserTransaction;
-    }
-  }
-}
-
-class javax::transaction::UserTransaction : public ::java::lang::Object
-{
-
-public:
-  virtual void begin() = 0;
-  virtual void commit() = 0;
-  virtual void rollback() = 0;
-  virtual void setRollbackOnly() = 0;
-  virtual jint getStatus() = 0;
-  virtual void setTransactionTimeout(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_UserTransaction__
diff --git a/libjava/javax/transaction/xa/XAException.h b/libjava/javax/transaction/xa/XAException.h
deleted file mode 100644
index b6f590b5593..00000000000
--- a/libjava/javax/transaction/xa/XAException.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_xa_XAException__
-#define __javax_transaction_xa_XAException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-      namespace xa
-      {
-          class XAException;
-      }
-    }
-  }
-}
-
-class javax::transaction::xa::XAException : public ::java::lang::Exception
-{
-
-public:
-  XAException();
-  XAException(::java::lang::String *);
-  XAException(jint);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) errorCode;
-  static const jint XA_RBBASE = 100;
-  static const jint XA_RBROLLBACK = 100;
-  static const jint XA_RBCOMMFAIL = 101;
-  static const jint XA_RBDEADLOCK = 102;
-  static const jint XA_RBINTEGRITY = 103;
-  static const jint XA_RBOTHER = 104;
-  static const jint XA_RBPROTO = 105;
-  static const jint XA_RBTIMEOUT = 106;
-  static const jint XA_RBTRANSIENT = 107;
-  static const jint XA_RBEND = 107;
-  static const jint XA_NOMIGRATE = 9;
-  static const jint XA_HEURHAZ = 8;
-  static const jint XA_HEURCOM = 7;
-  static const jint XA_HEURRB = 6;
-  static const jint XA_HEURMIX = 5;
-  static const jint XA_RETRY = 4;
-  static const jint XA_RDONLY = 3;
-  static const jint XAER_ASYNC = -2;
-  static const jint XAER_RMERR = -3;
-  static const jint XAER_NOTA = -4;
-  static const jint XAER_INVAL = -5;
-  static const jint XAER_PROTO = -6;
-  static const jint XAER_RMFAIL = -7;
-  static const jint XAER_DUPID = -8;
-  static const jint XAER_OUTSIDE = -9;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_transaction_xa_XAException__
diff --git a/libjava/javax/transaction/xa/XAResource.h b/libjava/javax/transaction/xa/XAResource.h
deleted file mode 100644
index 2a5442dd945..00000000000
--- a/libjava/javax/transaction/xa/XAResource.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_xa_XAResource__
-#define __javax_transaction_xa_XAResource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-      namespace xa
-      {
-          class XAResource;
-          class Xid;
-      }
-    }
-  }
-}
-
-class javax::transaction::xa::XAResource : public ::java::lang::Object
-{
-
-public:
-  virtual void commit(::javax::transaction::xa::Xid *, jboolean) = 0;
-  virtual void end(::javax::transaction::xa::Xid *, jint) = 0;
-  virtual void forget(::javax::transaction::xa::Xid *) = 0;
-  virtual jint getTransactionTimeout() = 0;
-  virtual jboolean isSameRM(::javax::transaction::xa::XAResource *) = 0;
-  virtual jint prepare(::javax::transaction::xa::Xid *) = 0;
-  virtual JArray< ::javax::transaction::xa::Xid * > * recover(jint) = 0;
-  virtual void rollback(::javax::transaction::xa::Xid *) = 0;
-  virtual jboolean setTransactionTimeout(jint) = 0;
-  virtual void start(::javax::transaction::xa::Xid *, jint) = 0;
-  static const jint TMENDRSCAN = 8388608;
-  static const jint TMFAIL = 536870912;
-  static const jint TMJOIN = 2097152;
-  static const jint TMNOFLAGS = 0;
-  static const jint TMONEPHASE = 1073741824;
-  static const jint TMRESUME = 134217728;
-  static const jint TMSTARTRSCAN = 16777216;
-  static const jint TMSUCCESS = 67108864;
-  static const jint TMSUSPEND = 33554432;
-  static const jint XA_RDONLY = 3;
-  static const jint XA_OK = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_xa_XAResource__
diff --git a/libjava/javax/transaction/xa/Xid.h b/libjava/javax/transaction/xa/Xid.h
deleted file mode 100644
index 7a4b3000107..00000000000
--- a/libjava/javax/transaction/xa/Xid.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_transaction_xa_Xid__
-#define __javax_transaction_xa_Xid__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace transaction
-    {
-      namespace xa
-      {
-          class Xid;
-      }
-    }
-  }
-}
-
-class javax::transaction::xa::Xid : public ::java::lang::Object
-{
-
-public:
-  virtual jint getFormatId() = 0;
-  virtual JArray< jbyte > * getGlobalTransactionId() = 0;
-  virtual JArray< jbyte > * getBranchQualifier() = 0;
-  static const jint MAXGTRIDSIZE = 64;
-  static const jint MAXBQUALSIZE = 64;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_transaction_xa_Xid__
diff --git a/libjava/javax/xml/XMLConstants.h b/libjava/javax/xml/XMLConstants.h
deleted file mode 100644
index 16f6f1cea80..00000000000
--- a/libjava/javax/xml/XMLConstants.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_XMLConstants__
-#define __javax_xml_XMLConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-        class XMLConstants;
-    }
-  }
-}
-
-class javax::xml::XMLConstants : public ::java::lang::Object
-{
-
-  XMLConstants();
-public:
-  static ::java::lang::String * NULL_NS_URI;
-  static ::java::lang::String * DEFAULT_NS_PREFIX;
-  static ::java::lang::String * XML_NS_URI;
-  static ::java::lang::String * XML_NS_PREFIX;
-  static ::java::lang::String * XMLNS_ATTRIBUTE_NS_URI;
-  static ::java::lang::String * XMLNS_ATTRIBUTE;
-  static ::java::lang::String * W3C_XML_SCHEMA_NS_URI;
-  static ::java::lang::String * W3C_XML_SCHEMA_INSTANCE_NS_URI;
-  static ::java::lang::String * W3C_XPATH_DATATYPE_NS_URI;
-  static ::java::lang::String * XML_DTD_NS_URI;
-  static ::java::lang::String * RELAXNG_NS_URI;
-  static ::java::lang::String * FEATURE_SECURE_PROCESSING;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_XMLConstants__
diff --git a/libjava/javax/xml/datatype/DatatypeConfigurationException.h b/libjava/javax/xml/datatype/DatatypeConfigurationException.h
deleted file mode 100644
index d2623a09d94..00000000000
--- a/libjava/javax/xml/datatype/DatatypeConfigurationException.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_DatatypeConfigurationException__
-#define __javax_xml_datatype_DatatypeConfigurationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class DatatypeConfigurationException;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::DatatypeConfigurationException : public ::java::lang::Exception
-{
-
-public:
-  DatatypeConfigurationException();
-  DatatypeConfigurationException(::java::lang::String *);
-  DatatypeConfigurationException(::java::lang::String *, ::java::lang::Throwable *);
-  DatatypeConfigurationException(::java::lang::Throwable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_DatatypeConfigurationException__
diff --git a/libjava/javax/xml/datatype/DatatypeConstants$Field.h b/libjava/javax/xml/datatype/DatatypeConstants$Field.h
deleted file mode 100644
index c30ee7a5149..00000000000
--- a/libjava/javax/xml/datatype/DatatypeConstants$Field.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_DatatypeConstants$Field__
-#define __javax_xml_datatype_DatatypeConstants$Field__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class DatatypeConstants$Field;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::DatatypeConstants$Field : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DatatypeConstants$Field(jint, ::java::lang::String *);
-public:
-  jint getId();
-  ::java::lang::String * toString();
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_DatatypeConstants$Field__
diff --git a/libjava/javax/xml/datatype/DatatypeConstants.h b/libjava/javax/xml/datatype/DatatypeConstants.h
deleted file mode 100644
index 721cb1b8589..00000000000
--- a/libjava/javax/xml/datatype/DatatypeConstants.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_DatatypeConstants__
-#define __javax_xml_datatype_DatatypeConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class DatatypeConstants;
-          class DatatypeConstants$Field;
-      }
-      namespace namespace
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::DatatypeConstants : public ::java::lang::Object
-{
-
-  DatatypeConstants();
-public:
-  static const jint JANUARY = 1;
-  static const jint FEBRUARY = 2;
-  static const jint MARCH = 3;
-  static const jint APRIL = 4;
-  static const jint MAY = 5;
-  static const jint JUNE = 6;
-  static const jint JULY = 7;
-  static const jint AUGUST = 8;
-  static const jint SEPTEMBER = 9;
-  static const jint OCTOBER = 10;
-  static const jint NOVEMBER = 11;
-  static const jint DECEMBER = 12;
-  static const jint LESSER = -1;
-  static const jint EQUAL = 0;
-  static const jint GREATER = 1;
-  static const jint INDETERMINATE = 2;
-  static const jint FIELD_UNDEFINED = -2147483647 - 1;
-  static ::javax::xml::datatype::DatatypeConstants$Field * YEARS;
-  static ::javax::xml::datatype::DatatypeConstants$Field * MONTHS;
-  static ::javax::xml::datatype::DatatypeConstants$Field * DAYS;
-  static ::javax::xml::datatype::DatatypeConstants$Field * HOURS;
-  static ::javax::xml::datatype::DatatypeConstants$Field * MINUTES;
-  static ::javax::xml::datatype::DatatypeConstants$Field * SECONDS;
-  static ::javax::xml::namespace::QName * DATETIME;
-  static ::javax::xml::namespace::QName * TIME;
-  static ::javax::xml::namespace::QName * DATE;
-  static ::javax::xml::namespace::QName * GYEARMONTH;
-  static ::javax::xml::namespace::QName * GMONTHDAY;
-  static ::javax::xml::namespace::QName * GYEAR;
-  static ::javax::xml::namespace::QName * GMONTH;
-  static ::javax::xml::namespace::QName * GDAY;
-  static ::javax::xml::namespace::QName * DURATION;
-  static ::javax::xml::namespace::QName * DURATION_DAYTIME;
-  static ::javax::xml::namespace::QName * DURATION_YEARMONTH;
-  static const jint MAX_TIMEZONE_OFFSET = -840;
-  static const jint MIN_TIMEZONE_OFFSET = 840;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_DatatypeConstants__
diff --git a/libjava/javax/xml/datatype/DatatypeFactory.h b/libjava/javax/xml/datatype/DatatypeFactory.h
deleted file mode 100644
index dabb74fe420..00000000000
--- a/libjava/javax/xml/datatype/DatatypeFactory.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_DatatypeFactory__
-#define __javax_xml_datatype_DatatypeFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class DatatypeFactory;
-          class Duration;
-          class XMLGregorianCalendar;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::DatatypeFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  DatatypeFactory();
-public:
-  static ::javax::xml::datatype::DatatypeFactory * newInstance();
-  virtual ::javax::xml::datatype::Duration * newDuration(::java::lang::String *) = 0;
-  virtual ::javax::xml::datatype::Duration * newDuration(jlong) = 0;
-  virtual ::javax::xml::datatype::Duration * newDuration(jboolean, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigDecimal *) = 0;
-  virtual ::javax::xml::datatype::Duration * newDuration(jboolean, jint, jint, jint, jint, jint, jint);
-  virtual ::javax::xml::datatype::Duration * newDurationDayTime(::java::lang::String *);
-  virtual ::javax::xml::datatype::Duration * newDurationDayTime(jlong);
-  virtual ::javax::xml::datatype::Duration * newDurationDayTime(jboolean, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::javax::xml::datatype::Duration * newDurationDayTime(jboolean, jint, jint, jint, jint);
-  virtual ::javax::xml::datatype::Duration * newDurationYearMonth(::java::lang::String *);
-  virtual ::javax::xml::datatype::Duration * newDurationYearMonth(jlong);
-  virtual ::javax::xml::datatype::Duration * newDurationYearMonth(jboolean, ::java::math::BigInteger *, ::java::math::BigInteger *);
-  virtual ::javax::xml::datatype::Duration * newDurationYearMonth(jboolean, jint, jint);
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendar() = 0;
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendar(::java::lang::String *) = 0;
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendar(::java::util::GregorianCalendar *) = 0;
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendar(::java::math::BigInteger *, jint, jint, jint, jint, jint, ::java::math::BigDecimal *, jint) = 0;
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendar(jint, jint, jint, jint, jint, jint, jint, jint);
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendarDate(jint, jint, jint, jint);
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendarTime(jint, jint, jint, jint);
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendarTime(jint, jint, jint, ::java::math::BigDecimal *, jint);
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * newXMLGregorianCalendarTime(jint, jint, jint, jint, jint);
-  static ::java::lang::String * DATATYPEFACTORY_PROPERTY;
-  static ::java::lang::String * DATATYPEFACTORY_IMPLEMENTATION_CLASS;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_DatatypeFactory__
diff --git a/libjava/javax/xml/datatype/Duration.h b/libjava/javax/xml/datatype/Duration.h
deleted file mode 100644
index 719abd088b8..00000000000
--- a/libjava/javax/xml/datatype/Duration.h
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_Duration__
-#define __javax_xml_datatype_Duration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class DatatypeConstants$Field;
-          class Duration;
-      }
-      namespace namespace
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::Duration : public ::java::lang::Object
-{
-
-public:
-  Duration();
-  virtual ::javax::xml::namespace::QName * getXMLSchemaType();
-  virtual jint getSign() = 0;
-  virtual jint getYears();
-  virtual jint getMonths();
-  virtual jint getDays();
-  virtual jint getHours();
-  virtual jint getMinutes();
-  virtual jint getSeconds();
-  virtual jlong getTimeInMillis(::java::util::Calendar *);
-  virtual jlong getTimeInMillis(::java::util::Date *);
-  virtual ::java::lang::Number * getField(::javax::xml::datatype::DatatypeConstants$Field *) = 0;
-  virtual jboolean isSet(::javax::xml::datatype::DatatypeConstants$Field *) = 0;
-  virtual ::javax::xml::datatype::Duration * add(::javax::xml::datatype::Duration *) = 0;
-  virtual void addTo(::java::util::Calendar *) = 0;
-  virtual void addTo(::java::util::Date *);
-  virtual ::javax::xml::datatype::Duration * subtract(::javax::xml::datatype::Duration *);
-  virtual ::javax::xml::datatype::Duration * multiply(jint);
-  virtual ::javax::xml::datatype::Duration * multiply(::java::math::BigDecimal *) = 0;
-  virtual ::javax::xml::datatype::Duration * negate() = 0;
-  virtual ::javax::xml::datatype::Duration * normalizeWith(::java::util::Calendar *) = 0;
-  virtual jint compare(::javax::xml::datatype::Duration *) = 0;
-  virtual jboolean isLongerThan(::javax::xml::datatype::Duration *);
-  virtual jboolean isShorterThan(::javax::xml::datatype::Duration *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode() = 0;
-  virtual ::java::lang::String * toString();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_Duration__
diff --git a/libjava/javax/xml/datatype/XMLGregorianCalendar.h b/libjava/javax/xml/datatype/XMLGregorianCalendar.h
deleted file mode 100644
index 6e9c92bf24b..00000000000
--- a/libjava/javax/xml/datatype/XMLGregorianCalendar.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_datatype_XMLGregorianCalendar__
-#define __javax_xml_datatype_XMLGregorianCalendar__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-        class BigInteger;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace datatype
-      {
-          class Duration;
-          class XMLGregorianCalendar;
-      }
-      namespace namespace
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class javax::xml::datatype::XMLGregorianCalendar : public ::java::lang::Object
-{
-
-public:
-  XMLGregorianCalendar();
-  virtual void clear() = 0;
-  virtual void reset() = 0;
-  virtual void setYear(::java::math::BigInteger *) = 0;
-  virtual void setYear(jint) = 0;
-  virtual void setMonth(jint) = 0;
-  virtual void setDay(jint) = 0;
-  virtual void setTimezone(jint) = 0;
-  virtual void setTime(jint, jint, jint);
-  virtual void setHour(jint) = 0;
-  virtual void setMinute(jint) = 0;
-  virtual void setSecond(jint) = 0;
-  virtual void setMillisecond(jint) = 0;
-  virtual void setFractionalSecond(::java::math::BigDecimal *) = 0;
-  virtual void setTime(jint, jint, jint, ::java::math::BigDecimal *);
-  virtual void setTime(jint, jint, jint, jint);
-  virtual ::java::math::BigInteger * getEon() = 0;
-  virtual jint getYear() = 0;
-  virtual ::java::math::BigInteger * getEonAndYear() = 0;
-  virtual jint getMonth() = 0;
-  virtual jint getDay() = 0;
-  virtual jint getTimezone() = 0;
-  virtual jint getHour() = 0;
-  virtual jint getMinute() = 0;
-  virtual jint getSecond() = 0;
-  virtual jint getMillisecond();
-  virtual ::java::math::BigDecimal * getFractionalSecond() = 0;
-  virtual jint compare(::javax::xml::datatype::XMLGregorianCalendar *) = 0;
-  virtual ::javax::xml::datatype::XMLGregorianCalendar * normalize() = 0;
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toXMLFormat() = 0;
-  virtual ::javax::xml::namespace::QName * getXMLSchemaType() = 0;
-  virtual ::java::lang::String * toString();
-  virtual jboolean isValid() = 0;
-  virtual void add(::javax::xml::datatype::Duration *) = 0;
-  virtual ::java::util::GregorianCalendar * toGregorianCalendar() = 0;
-  virtual ::java::util::GregorianCalendar * toGregorianCalendar(::java::util::TimeZone *, ::java::util::Locale *, ::javax::xml::datatype::XMLGregorianCalendar *) = 0;
-  virtual ::java::util::TimeZone * getTimeZone(jint) = 0;
-  virtual ::java::lang::Object * clone() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_datatype_XMLGregorianCalendar__
diff --git a/libjava/javax/xml/namespace/NamespaceContext.h b/libjava/javax/xml/namespace/NamespaceContext.h
deleted file mode 100644
index 4db8a067eab..00000000000
--- a/libjava/javax/xml/namespace/NamespaceContext.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_namespace_NamespaceContext__
-#define __javax_xml_namespace_NamespaceContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class NamespaceContext;
-      }
-    }
-  }
-}
-
-class javax::xml::namespace::NamespaceContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0;
-  virtual ::java::util::Iterator * getPrefixes(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_namespace_NamespaceContext__
diff --git a/libjava/javax/xml/namespace/QName.h b/libjava/javax/xml/namespace/QName.h
deleted file mode 100644
index b299f64fe01..00000000000
--- a/libjava/javax/xml/namespace/QName.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_namespace_QName__
-#define __javax_xml_namespace_QName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-    }
-  }
-}
-
-class javax::xml::namespace::QName : public ::java::lang::Object
-{
-
-public:
-  QName(::java::lang::String *, ::java::lang::String *);
-  QName(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  QName(::java::lang::String *);
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual ::java::lang::String * getLocalPart();
-  virtual ::java::lang::String * getPrefix();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-  virtual ::java::lang::String * toString();
-  static ::javax::xml::namespace::QName * valueOf(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4418622981026545151LL;
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceURI;
-  ::java::lang::String * localPart;
-  ::java::lang::String * prefix;
-  ::java::lang::String * qName;
-public: // actually package-private
-  jint hashCode__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_namespace_QName__
diff --git a/libjava/javax/xml/parsers/DocumentBuilder.h b/libjava/javax/xml/parsers/DocumentBuilder.h
deleted file mode 100644
index ea420ec9d5c..00000000000
--- a/libjava/javax/xml/parsers/DocumentBuilder.h
+++ /dev/null
@@ -1,71 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_DocumentBuilder__
-#define __javax_xml_parsers_DocumentBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class DocumentBuilder;
-      }
-      namespace validation
-      {
-          class Schema;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class Document;
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::DocumentBuilder : public ::java::lang::Object
-{
-
-public: // actually protected
-  DocumentBuilder();
-public:
-  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(::java::io::File *);
-  virtual ::org::w3c::dom::Document * parse(::org::xml::sax::InputSource *) = 0;
-  virtual jboolean isNamespaceAware() = 0;
-  virtual jboolean isValidating() = 0;
-  virtual void setEntityResolver(::org::xml::sax::EntityResolver *) = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual ::org::w3c::dom::Document * newDocument() = 0;
-  virtual ::org::w3c::dom::DOMImplementation * getDOMImplementation() = 0;
-  virtual void reset();
-  virtual ::javax::xml::validation::Schema * getSchema();
-  virtual jboolean isXIncludeAware();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_DocumentBuilder__
diff --git a/libjava/javax/xml/parsers/DocumentBuilderFactory.h b/libjava/javax/xml/parsers/DocumentBuilderFactory.h
deleted file mode 100644
index 3e0e7d454d0..00000000000
--- a/libjava/javax/xml/parsers/DocumentBuilderFactory.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_DocumentBuilderFactory__
-#define __javax_xml_parsers_DocumentBuilderFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class DocumentBuilder;
-          class DocumentBuilderFactory;
-      }
-      namespace validation
-      {
-          class Schema;
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::DocumentBuilderFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  DocumentBuilderFactory();
-public:
-  static ::javax::xml::parsers::DocumentBuilderFactory * newInstance();
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual ::javax::xml::parsers::DocumentBuilder * newDocumentBuilder() = 0;
-  virtual void setNamespaceAware(jboolean);
-  virtual void setValidating(jboolean);
-  virtual void setIgnoringElementContentWhitespace(jboolean);
-  virtual void setExpandEntityReferences(jboolean);
-  virtual void setIgnoringComments(jboolean);
-  virtual void setCoalescing(jboolean);
-  virtual jboolean isNamespaceAware();
-  virtual jboolean isValidating();
-  virtual jboolean isIgnoringElementContentWhitespace();
-  virtual jboolean isExpandEntityReferences();
-  virtual jboolean isIgnoringComments();
-  virtual jboolean isCoalescing();
-  virtual void setAttribute(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *) = 0;
-  virtual ::javax::xml::validation::Schema * getSchema();
-  virtual void setSchema(::javax::xml::validation::Schema *);
-  virtual jboolean isXIncludeAware();
-  virtual void setXIncludeAware(jboolean);
-  virtual void setFeature(::java::lang::String *, jboolean) = 0;
-  virtual jboolean getFeature(::java::lang::String *) = 0;
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceAware;
-  jboolean validating;
-  jboolean ignoringElementContentWhitespace;
-  jboolean expandEntityReferences;
-  jboolean ignoringComments;
-  jboolean coalescing;
-  ::javax::xml::validation::Schema * schema;
-  jboolean xIncludeAware;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_DocumentBuilderFactory__
diff --git a/libjava/javax/xml/parsers/FactoryConfigurationError.h b/libjava/javax/xml/parsers/FactoryConfigurationError.h
deleted file mode 100644
index cf01101794b..00000000000
--- a/libjava/javax/xml/parsers/FactoryConfigurationError.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_FactoryConfigurationError__
-#define __javax_xml_parsers_FactoryConfigurationError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class FactoryConfigurationError;
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::FactoryConfigurationError : public ::java::lang::Error
-{
-
-public:
-  FactoryConfigurationError();
-  FactoryConfigurationError(::java::lang::String *);
-  FactoryConfigurationError(::java::lang::Exception *);
-  FactoryConfigurationError(::java::lang::Exception *, ::java::lang::String *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Exception * getException();
-private:
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::lang::Error)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_FactoryConfigurationError__
diff --git a/libjava/javax/xml/parsers/ParserConfigurationException.h b/libjava/javax/xml/parsers/ParserConfigurationException.h
deleted file mode 100644
index 26bc1e8dee8..00000000000
--- a/libjava/javax/xml/parsers/ParserConfigurationException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_ParserConfigurationException__
-#define __javax_xml_parsers_ParserConfigurationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class ParserConfigurationException;
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::ParserConfigurationException : public ::java::lang::Exception
-{
-
-public:
-  ParserConfigurationException();
-  ParserConfigurationException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_ParserConfigurationException__
diff --git a/libjava/javax/xml/parsers/SAXParser.h b/libjava/javax/xml/parsers/SAXParser.h
deleted file mode 100644
index b24df528734..00000000000
--- a/libjava/javax/xml/parsers/SAXParser.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_SAXParser__
-#define __javax_xml_parsers_SAXParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class SAXParser;
-      }
-      namespace validation
-      {
-          class Schema;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class HandlerBase;
-          class InputSource;
-          class Parser;
-          class XMLReader;
-        namespace helpers
-        {
-            class DefaultHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::SAXParser : public ::java::lang::Object
-{
-
-public: // actually protected
-  SAXParser();
-public:
-  virtual void parse(::java::io::InputStream *, ::org::xml::sax::HandlerBase *);
-  virtual void parse(::java::io::InputStream *, ::org::xml::sax::HandlerBase *, ::java::lang::String *);
-  virtual void parse(::java::io::InputStream *, ::org::xml::sax::helpers::DefaultHandler *);
-  virtual void parse(::java::io::InputStream *, ::org::xml::sax::helpers::DefaultHandler *, ::java::lang::String *);
-  virtual void parse(::java::lang::String *, ::org::xml::sax::HandlerBase *);
-  virtual void parse(::java::lang::String *, ::org::xml::sax::helpers::DefaultHandler *);
-  virtual void parse(::java::io::File *, ::org::xml::sax::HandlerBase *);
-  virtual void parse(::java::io::File *, ::org::xml::sax::helpers::DefaultHandler *);
-  virtual void parse(::org::xml::sax::InputSource *, ::org::xml::sax::HandlerBase *);
-  virtual void parse(::org::xml::sax::InputSource *, ::org::xml::sax::helpers::DefaultHandler *);
-  virtual ::org::xml::sax::Parser * getParser() = 0;
-  virtual ::org::xml::sax::XMLReader * getXMLReader() = 0;
-  virtual jboolean isNamespaceAware() = 0;
-  virtual jboolean isValidating() = 0;
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual void reset();
-  virtual ::javax::xml::validation::Schema * getSchema();
-  virtual jboolean isXIncludeAware();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_SAXParser__
diff --git a/libjava/javax/xml/parsers/SAXParserFactory.h b/libjava/javax/xml/parsers/SAXParserFactory.h
deleted file mode 100644
index 42a8740b587..00000000000
--- a/libjava/javax/xml/parsers/SAXParserFactory.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_parsers_SAXParserFactory__
-#define __javax_xml_parsers_SAXParserFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace parsers
-      {
-          class SAXParser;
-          class SAXParserFactory;
-      }
-      namespace validation
-      {
-          class Schema;
-      }
-    }
-  }
-}
-
-class javax::xml::parsers::SAXParserFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  SAXParserFactory();
-public:
-  static ::javax::xml::parsers::SAXParserFactory * newInstance();
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual ::javax::xml::parsers::SAXParser * newSAXParser() = 0;
-  virtual void setNamespaceAware(jboolean);
-  virtual void setValidating(jboolean);
-  virtual jboolean isNamespaceAware();
-  virtual jboolean isValidating();
-  virtual void setFeature(::java::lang::String *, jboolean) = 0;
-  virtual jboolean getFeature(::java::lang::String *) = 0;
-  virtual ::javax::xml::validation::Schema * getSchema();
-  virtual void setSchema(::javax::xml::validation::Schema *);
-  virtual jboolean isXIncludeAware();
-  virtual void setXIncludeAware(jboolean);
-private:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) validating;
-  jboolean namespaceAware;
-  ::javax::xml::validation::Schema * schema;
-  jboolean xIncludeAware;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_parsers_SAXParserFactory__
diff --git a/libjava/javax/xml/stream/EventFilter.h b/libjava/javax/xml/stream/EventFilter.h
deleted file mode 100644
index 92cdd248063..00000000000
--- a/libjava/javax/xml/stream/EventFilter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_EventFilter__
-#define __javax_xml_stream_EventFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class EventFilter;
-        namespace events
-        {
-            class XMLEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::EventFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean accept(::javax::xml::stream::events::XMLEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_EventFilter__
diff --git a/libjava/javax/xml/stream/FactoryConfigurationError.h b/libjava/javax/xml/stream/FactoryConfigurationError.h
deleted file mode 100644
index 78ecdf6a06e..00000000000
--- a/libjava/javax/xml/stream/FactoryConfigurationError.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_FactoryConfigurationError__
-#define __javax_xml_stream_FactoryConfigurationError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class FactoryConfigurationError;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::FactoryConfigurationError : public ::java::lang::Error
-{
-
-public:
-  FactoryConfigurationError();
-  FactoryConfigurationError(::java::lang::Exception *);
-  FactoryConfigurationError(::java::lang::Exception *, ::java::lang::String *);
-  FactoryConfigurationError(::java::lang::String *, ::java::lang::Exception *);
-  FactoryConfigurationError(::java::lang::String *);
-  virtual ::java::lang::Exception * getException();
-  virtual ::java::lang::String * getMessage();
-private:
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::lang::Error)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_FactoryConfigurationError__
diff --git a/libjava/javax/xml/stream/Location.h b/libjava/javax/xml/stream/Location.h
deleted file mode 100644
index c997a80118d..00000000000
--- a/libjava/javax/xml/stream/Location.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_Location__
-#define __javax_xml_stream_Location__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::Location : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLineNumber() = 0;
-  virtual jint getColumnNumber() = 0;
-  virtual jint getCharacterOffset() = 0;
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_Location__
diff --git a/libjava/javax/xml/stream/StreamFilter.h b/libjava/javax/xml/stream/StreamFilter.h
deleted file mode 100644
index 82daf6ad5fc..00000000000
--- a/libjava/javax/xml/stream/StreamFilter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_StreamFilter__
-#define __javax_xml_stream_StreamFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class StreamFilter;
-          class XMLStreamReader;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::StreamFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean accept(::javax::xml::stream::XMLStreamReader *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_StreamFilter__
diff --git a/libjava/javax/xml/stream/XMLEventFactory.h b/libjava/javax/xml/stream/XMLEventFactory.h
deleted file mode 100644
index 8c8e4fe29c6..00000000000
--- a/libjava/javax/xml/stream/XMLEventFactory.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLEventFactory__
-#define __javax_xml_stream_XMLEventFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-          class XMLEventFactory;
-        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 javax::xml::stream::XMLEventFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLEventFactory();
-public:
-  static ::javax::xml::stream::XMLEventFactory * newInstance();
-public: // actually package-private
-  static ::javax::xml::stream::XMLEventFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *);
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual void setLocation(::javax::xml::stream::Location *) = 0;
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace::QName *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace::QName *, ::java::util::Iterator *, ::java::util::Iterator *) = 0;
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *) = 0;
-  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 *) = 0;
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace::QName *, ::java::util::Iterator *) = 0;
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *) = 0;
-  virtual ::javax::xml::stream::events::Characters * createCharacters(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Characters * createCData(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Characters * createSpace(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Characters * createIgnorableSpace(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument() = 0;
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::StartDocument * createStartDocument(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::EndDocument * createEndDocument() = 0;
-  virtual ::javax::xml::stream::events::EntityReference * createEntityReference(::java::lang::String *, ::javax::xml::stream::events::EntityDeclaration *) = 0;
-  virtual ::javax::xml::stream::events::Comment * createComment(::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::ProcessingInstruction * createProcessingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::DTD * createDTD(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_XMLEventFactory__
diff --git a/libjava/javax/xml/stream/XMLEventReader.h b/libjava/javax/xml/stream/XMLEventReader.h
deleted file mode 100644
index e4ef90a6a9b..00000000000
--- a/libjava/javax/xml/stream/XMLEventReader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLEventReader__
-#define __javax_xml_stream_XMLEventReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventReader;
-        namespace events
-        {
-            class XMLEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLEventReader : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::stream::events::XMLEvent * nextEvent() = 0;
-  virtual jboolean hasNext() = 0;
-  virtual ::javax::xml::stream::events::XMLEvent * peek() = 0;
-  virtual ::java::lang::String * getElementText() = 0;
-  virtual ::javax::xml::stream::events::XMLEvent * nextTag() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::Object * next() = 0;
-  virtual void remove() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLEventReader__
diff --git a/libjava/javax/xml/stream/XMLEventWriter.h b/libjava/javax/xml/stream/XMLEventWriter.h
deleted file mode 100644
index 7762e629b4b..00000000000
--- a/libjava/javax/xml/stream/XMLEventWriter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLEventWriter__
-#define __javax_xml_stream_XMLEventWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class NamespaceContext;
-      }
-      namespace stream
-      {
-          class XMLEventReader;
-          class XMLEventWriter;
-        namespace events
-        {
-            class XMLEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLEventWriter : public ::java::lang::Object
-{
-
-public:
-  virtual void flush() = 0;
-  virtual void close() = 0;
-  virtual void add(::javax::xml::stream::events::XMLEvent *) = 0;
-  virtual void add(::javax::xml::stream::XMLEventReader *) = 0;
-  virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0;
-  virtual void setPrefix(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setDefaultNamespace(::java::lang::String *) = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLEventWriter__
diff --git a/libjava/javax/xml/stream/XMLInputFactory.h b/libjava/javax/xml/stream/XMLInputFactory.h
deleted file mode 100644
index 13239f143cc..00000000000
--- a/libjava/javax/xml/stream/XMLInputFactory.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLInputFactory__
-#define __javax_xml_stream_XMLInputFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class EventFilter;
-          class StreamFilter;
-          class XMLEventReader;
-          class XMLInputFactory;
-          class XMLReporter;
-          class XMLResolver;
-          class XMLStreamReader;
-        namespace util
-        {
-            class XMLEventAllocator;
-        }
-      }
-      namespace transform
-      {
-          class Source;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLInputFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLInputFactory();
-public:
-  static ::javax::xml::stream::XMLInputFactory * newInstance();
-  static ::javax::xml::stream::XMLInputFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *);
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::io::Reader *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::javax::xml::transform::Source *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::io::InputStream *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::io::InputStream *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::lang::String *, ::java::io::InputStream *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createXMLStreamReader(::java::lang::String *, ::java::io::Reader *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::io::Reader *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::lang::String *, ::java::io::Reader *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::javax::xml::stream::XMLStreamReader *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::javax::xml::transform::Source *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::io::InputStream *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::io::InputStream *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createXMLEventReader(::java::lang::String *, ::java::io::InputStream *) = 0;
-  virtual ::javax::xml::stream::XMLStreamReader * createFilteredReader(::javax::xml::stream::XMLStreamReader *, ::javax::xml::stream::StreamFilter *) = 0;
-  virtual ::javax::xml::stream::XMLEventReader * createFilteredReader(::javax::xml::stream::XMLEventReader *, ::javax::xml::stream::EventFilter *) = 0;
-  virtual ::javax::xml::stream::XMLResolver * getXMLResolver() = 0;
-  virtual void setXMLResolver(::javax::xml::stream::XMLResolver *) = 0;
-  virtual ::javax::xml::stream::XMLReporter * getXMLReporter() = 0;
-  virtual void setXMLReporter(::javax::xml::stream::XMLReporter *) = 0;
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual jboolean isPropertySupported(::java::lang::String *) = 0;
-  virtual void setEventAllocator(::javax::xml::stream::util::XMLEventAllocator *) = 0;
-  virtual ::javax::xml::stream::util::XMLEventAllocator * getEventAllocator() = 0;
-  static ::java::lang::String * IS_NAMESPACE_AWARE;
-  static ::java::lang::String * IS_VALIDATING;
-  static ::java::lang::String * IS_COALESCING;
-  static ::java::lang::String * IS_REPLACING_ENTITY_REFERENCES;
-  static ::java::lang::String * IS_SUPPORTING_EXTERNAL_ENTITIES;
-  static ::java::lang::String * SUPPORT_DTD;
-  static ::java::lang::String * REPORTER;
-  static ::java::lang::String * RESOLVER;
-  static ::java::lang::String * ALLOCATOR;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_XMLInputFactory__
diff --git a/libjava/javax/xml/stream/XMLOutputFactory.h b/libjava/javax/xml/stream/XMLOutputFactory.h
deleted file mode 100644
index 362fac935f4..00000000000
--- a/libjava/javax/xml/stream/XMLOutputFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLOutputFactory__
-#define __javax_xml_stream_XMLOutputFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventWriter;
-          class XMLInputFactory;
-          class XMLOutputFactory;
-          class XMLStreamWriter;
-      }
-      namespace transform
-      {
-          class Result;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLOutputFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  XMLOutputFactory();
-public:
-  static ::javax::xml::stream::XMLOutputFactory * newInstance();
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  static ::javax::xml::stream::XMLInputFactory * newInstance(::java::lang::String *, ::java::lang::ClassLoader *);
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::Writer *) = 0;
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::OutputStream *) = 0;
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::java::io::OutputStream *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::XMLStreamWriter * createXMLStreamWriter(::javax::xml::transform::Result *) = 0;
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::javax::xml::transform::Result *) = 0;
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::java::io::OutputStream *) = 0;
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::java::io::OutputStream *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::XMLEventWriter * createXMLEventWriter(::java::io::Writer *) = 0;
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual jboolean isPropertySupported(::java::lang::String *) = 0;
-  static ::java::lang::String * IS_REPAIRING_NAMESPACES;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_XMLOutputFactory__
diff --git a/libjava/javax/xml/stream/XMLReporter.h b/libjava/javax/xml/stream/XMLReporter.h
deleted file mode 100644
index 4416f840873..00000000000
--- a/libjava/javax/xml/stream/XMLReporter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLReporter__
-#define __javax_xml_stream_XMLReporter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-          class XMLReporter;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLReporter : public ::java::lang::Object
-{
-
-public:
-  virtual void report(::java::lang::String *, ::java::lang::String *, ::java::lang::Object *, ::javax::xml::stream::Location *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLReporter__
diff --git a/libjava/javax/xml/stream/XMLResolver.h b/libjava/javax/xml/stream/XMLResolver.h
deleted file mode 100644
index 254dc2ca2a8..00000000000
--- a/libjava/javax/xml/stream/XMLResolver.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLResolver__
-#define __javax_xml_stream_XMLResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * resolveEntity(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLResolver__
diff --git a/libjava/javax/xml/stream/XMLStreamConstants.h b/libjava/javax/xml/stream/XMLStreamConstants.h
deleted file mode 100644
index d042a7cd0ee..00000000000
--- a/libjava/javax/xml/stream/XMLStreamConstants.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLStreamConstants__
-#define __javax_xml_stream_XMLStreamConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLStreamConstants;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLStreamConstants : public ::java::lang::Object
-{
-
-public:
-  static const jint START_ELEMENT = 1;
-  static const jint END_ELEMENT = 2;
-  static const jint PROCESSING_INSTRUCTION = 3;
-  static const jint CHARACTERS = 4;
-  static const jint COMMENT = 5;
-  static const jint SPACE = 6;
-  static const jint START_DOCUMENT = 7;
-  static const jint END_DOCUMENT = 8;
-  static const jint ENTITY_REFERENCE = 9;
-  static const jint ATTRIBUTE = 10;
-  static const jint DTD = 11;
-  static const jint CDATA = 12;
-  static const jint NAMESPACE = 13;
-  static const jint NOTATION_DECLARATION = 14;
-  static const jint ENTITY_DECLARATION = 15;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLStreamConstants__
diff --git a/libjava/javax/xml/stream/XMLStreamException.h b/libjava/javax/xml/stream/XMLStreamException.h
deleted file mode 100644
index 71acc39c0b4..00000000000
--- a/libjava/javax/xml/stream/XMLStreamException.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLStreamException__
-#define __javax_xml_stream_XMLStreamException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class Location;
-          class XMLStreamException;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLStreamException : public ::java::lang::Exception
-{
-
-public:
-  XMLStreamException();
-  XMLStreamException(::java::lang::String *);
-  XMLStreamException(::java::lang::Throwable *);
-  XMLStreamException(::java::lang::String *, ::java::lang::Throwable *);
-  XMLStreamException(::java::lang::String *, ::javax::xml::stream::Location *, ::java::lang::Throwable *);
-  XMLStreamException(::java::lang::String *, ::javax::xml::stream::Location *);
-  virtual ::java::lang::Throwable * getNestedException();
-  virtual ::javax::xml::stream::Location * getLocation();
-public: // actually protected
-  ::javax::xml::stream::Location * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) location;
-  ::java::lang::Throwable * nested;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_XMLStreamException__
diff --git a/libjava/javax/xml/stream/XMLStreamReader.h b/libjava/javax/xml/stream/XMLStreamReader.h
deleted file mode 100644
index b0632932093..00000000000
--- a/libjava/javax/xml/stream/XMLStreamReader.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLStreamReader__
-#define __javax_xml_stream_XMLStreamReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-          class XMLStreamReader;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLStreamReader : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual jint next() = 0;
-  virtual void require(jint, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getElementText() = 0;
-  virtual jint nextTag() = 0;
-  virtual jboolean hasNext() = 0;
-  virtual void close() = 0;
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isWhiteSpace() = 0;
-  virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jint getAttributeCount() = 0;
-  virtual ::javax::xml::namespace::QName * getAttributeName(jint) = 0;
-  virtual ::java::lang::String * getAttributeNamespace(jint) = 0;
-  virtual ::java::lang::String * getAttributeLocalName(jint) = 0;
-  virtual ::java::lang::String * getAttributePrefix(jint) = 0;
-  virtual ::java::lang::String * getAttributeType(jint) = 0;
-  virtual ::java::lang::String * getAttributeValue(jint) = 0;
-  virtual jboolean isAttributeSpecified(jint) = 0;
-  virtual jint getNamespaceCount() = 0;
-  virtual ::java::lang::String * getNamespacePrefix(jint) = 0;
-  virtual ::java::lang::String * getNamespaceURI(jint) = 0;
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::java::lang::String * getText() = 0;
-  virtual JArray< jchar > * getTextCharacters() = 0;
-  virtual jint getTextCharacters(jint, JArray< jchar > *, jint, jint) = 0;
-  virtual jint getTextStart() = 0;
-  virtual jint getTextLength() = 0;
-  virtual ::java::lang::String * getEncoding() = 0;
-  virtual jboolean hasText() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual ::javax::xml::namespace::QName * getName() = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasName() = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual ::java::lang::String * getVersion() = 0;
-  virtual jboolean isStandalone() = 0;
-  virtual jboolean standaloneSet() = 0;
-  virtual ::java::lang::String * getCharacterEncodingScheme() = 0;
-  virtual ::java::lang::String * getPITarget() = 0;
-  virtual ::java::lang::String * getPIData() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLStreamReader__
diff --git a/libjava/javax/xml/stream/XMLStreamWriter.h b/libjava/javax/xml/stream/XMLStreamWriter.h
deleted file mode 100644
index 74230ca7c82..00000000000
--- a/libjava/javax/xml/stream/XMLStreamWriter.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_XMLStreamWriter__
-#define __javax_xml_stream_XMLStreamWriter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class NamespaceContext;
-      }
-      namespace stream
-      {
-          class XMLStreamWriter;
-      }
-    }
-  }
-}
-
-class javax::xml::stream::XMLStreamWriter : public ::java::lang::Object
-{
-
-public:
-  virtual void writeStartElement(::java::lang::String *) = 0;
-  virtual void writeStartElement(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeEmptyElement(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeEmptyElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeEmptyElement(::java::lang::String *) = 0;
-  virtual void writeEndElement() = 0;
-  virtual void writeEndDocument() = 0;
-  virtual void close() = 0;
-  virtual void flush() = 0;
-  virtual void writeAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeNamespace(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeDefaultNamespace(::java::lang::String *) = 0;
-  virtual void writeComment(::java::lang::String *) = 0;
-  virtual void writeProcessingInstruction(::java::lang::String *) = 0;
-  virtual void writeProcessingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeCData(::java::lang::String *) = 0;
-  virtual void writeDTD(::java::lang::String *) = 0;
-  virtual void writeEntityRef(::java::lang::String *) = 0;
-  virtual void writeStartDocument() = 0;
-  virtual void writeStartDocument(::java::lang::String *) = 0;
-  virtual void writeStartDocument(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void writeCharacters(::java::lang::String *) = 0;
-  virtual void writeCharacters(JArray< jchar > *, jint, jint) = 0;
-  virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0;
-  virtual void setPrefix(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setDefaultNamespace(::java::lang::String *) = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_XMLStreamWriter__
diff --git a/libjava/javax/xml/stream/events/Attribute.h b/libjava/javax/xml/stream/events/Attribute.h
deleted file mode 100644
index 7362510c072..00000000000
--- a/libjava/javax/xml/stream/events/Attribute.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_Attribute__
-#define __javax_xml_stream_events_Attribute__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Attribute;
-            class Characters;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::Attribute : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::namespace::QName * getName() = 0;
-  virtual ::java::lang::String * getValue() = 0;
-  virtual ::javax::xml::namespace::QName * getDTDType() = 0;
-  virtual jboolean isSpecified() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_Attribute__
diff --git a/libjava/javax/xml/stream/events/Characters.h b/libjava/javax/xml/stream/events/Characters.h
deleted file mode 100644
index f1511881f0e..00000000000
--- a/libjava/javax/xml/stream/events/Characters.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_Characters__
-#define __javax_xml_stream_events_Characters__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::Characters : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getData() = 0;
-  virtual jboolean isWhiteSpace() = 0;
-  virtual jboolean isCData() = 0;
-  virtual jboolean isIgnorableWhiteSpace() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_Characters__
diff --git a/libjava/javax/xml/stream/events/Comment.h b/libjava/javax/xml/stream/events/Comment.h
deleted file mode 100644
index 1f945ea19fc..00000000000
--- a/libjava/javax/xml/stream/events/Comment.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_Comment__
-#define __javax_xml_stream_events_Comment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class Comment;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::Comment : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getText() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_Comment__
diff --git a/libjava/javax/xml/stream/events/DTD.h b/libjava/javax/xml/stream/events/DTD.h
deleted file mode 100644
index daaa23fa124..00000000000
--- a/libjava/javax/xml/stream/events/DTD.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_DTD__
-#define __javax_xml_stream_events_DTD__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class DTD;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::DTD : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getDocumentTypeDeclaration() = 0;
-  virtual ::java::lang::Object * getProcessedDTD() = 0;
-  virtual ::java::util::List * getNotations() = 0;
-  virtual ::java::util::List * getEntities() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_DTD__
diff --git a/libjava/javax/xml/stream/events/EndDocument.h b/libjava/javax/xml/stream/events/EndDocument.h
deleted file mode 100644
index 984585490bd..00000000000
--- a/libjava/javax/xml/stream/events/EndDocument.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_EndDocument__
-#define __javax_xml_stream_events_EndDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndDocument;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::EndDocument : public ::java::lang::Object
-{
-
-public:
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_EndDocument__
diff --git a/libjava/javax/xml/stream/events/EndElement.h b/libjava/javax/xml/stream/events/EndElement.h
deleted file mode 100644
index 86825d6e463..00000000000
--- a/libjava/javax/xml/stream/events/EndElement.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_EndElement__
-#define __javax_xml_stream_events_EndElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::EndElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::namespace::QName * getName() = 0;
-  virtual ::java::util::Iterator * getNamespaces() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_EndElement__
diff --git a/libjava/javax/xml/stream/events/EntityDeclaration.h b/libjava/javax/xml/stream/events/EntityDeclaration.h
deleted file mode 100644
index 98eda7a3ea5..00000000000
--- a/libjava/javax/xml/stream/events/EntityDeclaration.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_EntityDeclaration__
-#define __javax_xml_stream_events_EntityDeclaration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class EntityDeclaration;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::EntityDeclaration : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::java::lang::String * getNotationName() = 0;
-  virtual ::java::lang::String * getReplacementText() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_EntityDeclaration__
diff --git a/libjava/javax/xml/stream/events/EntityReference.h b/libjava/javax/xml/stream/events/EntityReference.h
deleted file mode 100644
index ba95d54584b..00000000000
--- a/libjava/javax/xml/stream/events/EntityReference.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_EntityReference__
-#define __javax_xml_stream_events_EntityReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class EntityDeclaration;
-            class EntityReference;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::EntityReference : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::stream::events::EntityDeclaration * getDeclaration() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_EntityReference__
diff --git a/libjava/javax/xml/stream/events/Namespace.h b/libjava/javax/xml/stream/events/Namespace.h
deleted file mode 100644
index 5690c2305dc..00000000000
--- a/libjava/javax/xml/stream/events/Namespace.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_Namespace__
-#define __javax_xml_stream_events_Namespace__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class Namespace;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::Namespace : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual jboolean isDefaultNamespaceDeclaration() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_Namespace__
diff --git a/libjava/javax/xml/stream/events/NotationDeclaration.h b/libjava/javax/xml/stream/events/NotationDeclaration.h
deleted file mode 100644
index e5c6ba0183a..00000000000
--- a/libjava/javax/xml/stream/events/NotationDeclaration.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_NotationDeclaration__
-#define __javax_xml_stream_events_NotationDeclaration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class NotationDeclaration;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::NotationDeclaration : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_NotationDeclaration__
diff --git a/libjava/javax/xml/stream/events/ProcessingInstruction.h b/libjava/javax/xml/stream/events/ProcessingInstruction.h
deleted file mode 100644
index 3a5f9944fa6..00000000000
--- a/libjava/javax/xml/stream/events/ProcessingInstruction.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_ProcessingInstruction__
-#define __javax_xml_stream_events_ProcessingInstruction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class ProcessingInstruction;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::ProcessingInstruction : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getTarget() = 0;
-  virtual ::java::lang::String * getData() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_ProcessingInstruction__
diff --git a/libjava/javax/xml/stream/events/StartDocument.h b/libjava/javax/xml/stream/events/StartDocument.h
deleted file mode 100644
index 2658939a791..00000000000
--- a/libjava/javax/xml/stream/events/StartDocument.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_StartDocument__
-#define __javax_xml_stream_events_StartDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class StartDocument;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::StartDocument : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual ::java::lang::String * getCharacterEncodingScheme() = 0;
-  virtual jboolean encodingSet() = 0;
-  virtual jboolean isStandalone() = 0;
-  virtual jboolean standaloneSet() = 0;
-  virtual ::java::lang::String * getVersion() = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_StartDocument__
diff --git a/libjava/javax/xml/stream/events/StartElement.h b/libjava/javax/xml/stream/events/StartElement.h
deleted file mode 100644
index 0695267421d..00000000000
--- a/libjava/javax/xml/stream/events/StartElement.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_StartElement__
-#define __javax_xml_stream_events_StartElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Attribute;
-            class Characters;
-            class EndElement;
-            class StartElement;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::StartElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::namespace::QName * getName() = 0;
-  virtual ::java::util::Iterator * getAttributes() = 0;
-  virtual ::java::util::Iterator * getNamespaces() = 0;
-  virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace::QName *) = 0;
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *) = 0;
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_StartElement__
diff --git a/libjava/javax/xml/stream/events/XMLEvent.h b/libjava/javax/xml/stream/events/XMLEvent.h
deleted file mode 100644
index 54d775d41e0..00000000000
--- a/libjava/javax/xml/stream/events/XMLEvent.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_events_XMLEvent__
-#define __javax_xml_stream_events_XMLEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-        namespace events
-        {
-            class Characters;
-            class EndElement;
-            class StartElement;
-            class XMLEvent;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::events::XMLEvent : public ::java::lang::Object
-{
-
-public:
-  virtual jint getEventType() = 0;
-  virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual jboolean isStartElement() = 0;
-  virtual jboolean isAttribute() = 0;
-  virtual jboolean isNamespace() = 0;
-  virtual jboolean isEndElement() = 0;
-  virtual jboolean isEntityReference() = 0;
-  virtual jboolean isProcessingInstruction() = 0;
-  virtual jboolean isCharacters() = 0;
-  virtual jboolean isStartDocument() = 0;
-  virtual jboolean isEndDocument() = 0;
-  virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
-  virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
-  virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
-  virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_events_XMLEvent__
diff --git a/libjava/javax/xml/stream/util/EventReaderDelegate.h b/libjava/javax/xml/stream/util/EventReaderDelegate.h
deleted file mode 100644
index fc1bb75bbfa..00000000000
--- a/libjava/javax/xml/stream/util/EventReaderDelegate.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_util_EventReaderDelegate__
-#define __javax_xml_stream_util_EventReaderDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLEventReader;
-        namespace events
-        {
-            class XMLEvent;
-        }
-        namespace util
-        {
-            class EventReaderDelegate;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::util::EventReaderDelegate : public ::java::lang::Object
-{
-
-public:
-  EventReaderDelegate();
-  EventReaderDelegate(::javax::xml::stream::XMLEventReader *);
-  virtual void setParent(::javax::xml::stream::XMLEventReader *);
-  virtual ::javax::xml::stream::XMLEventReader * getParent();
-  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();
-private:
-  ::javax::xml::stream::XMLEventReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_util_EventReaderDelegate__
diff --git a/libjava/javax/xml/stream/util/ReaderDelegate.h b/libjava/javax/xml/stream/util/ReaderDelegate.h
deleted file mode 100644
index 4235d0dcd14..00000000000
--- a/libjava/javax/xml/stream/util/ReaderDelegate.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_util_ReaderDelegate__
-#define __javax_xml_stream_util_ReaderDelegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace stream
-      {
-          class Location;
-          class XMLStreamReader;
-        namespace util
-        {
-            class ReaderDelegate;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::util::ReaderDelegate : public ::java::lang::Object
-{
-
-public:
-  ReaderDelegate();
-  ReaderDelegate(::javax::xml::stream::XMLStreamReader *);
-  virtual void setParent(::javax::xml::stream::XMLStreamReader *);
-  virtual ::javax::xml::stream::XMLStreamReader * getParent();
-  virtual jint next();
-  virtual jint nextTag();
-  virtual ::java::lang::String * getElementText();
-  virtual void require(jint, ::java::lang::String *, ::java::lang::String *);
-  virtual jboolean hasNext();
-  virtual void close();
-  virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext();
-  virtual jboolean isStartElement();
-  virtual jboolean isEndElement();
-  virtual jboolean isCharacters();
-  virtual jboolean isWhiteSpace();
-  virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *);
-  virtual jint getAttributeCount();
-  virtual ::javax::xml::namespace::QName * getAttributeName(jint);
-  virtual ::java::lang::String * getAttributePrefix(jint);
-  virtual ::java::lang::String * getAttributeNamespace(jint);
-  virtual ::java::lang::String * getAttributeLocalName(jint);
-  virtual ::java::lang::String * getAttributeType(jint);
-  virtual ::java::lang::String * getAttributeValue(jint);
-  virtual jboolean isAttributeSpecified(jint);
-  virtual jint getNamespaceCount();
-  virtual ::java::lang::String * getNamespacePrefix(jint);
-  virtual ::java::lang::String * getNamespaceURI(jint);
-  virtual jint getEventType();
-  virtual ::java::lang::String * getText();
-  virtual jint getTextCharacters(jint, JArray< jchar > *, jint, jint);
-  virtual JArray< jchar > * getTextCharacters();
-  virtual jint getTextStart();
-  virtual jint getTextLength();
-  virtual ::java::lang::String * getEncoding();
-  virtual jboolean hasText();
-  virtual ::javax::xml::stream::Location * getLocation();
-  virtual ::javax::xml::namespace::QName * getName();
-  virtual ::java::lang::String * getLocalName();
-  virtual jboolean hasName();
-  virtual ::java::lang::String * getNamespaceURI();
-  virtual ::java::lang::String * getPrefix();
-  virtual ::java::lang::String * getVersion();
-  virtual jboolean isStandalone();
-  virtual jboolean standaloneSet();
-  virtual ::java::lang::String * getCharacterEncodingScheme();
-  virtual ::java::lang::String * getPITarget();
-  virtual ::java::lang::String * getPIData();
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-private:
-  ::javax::xml::stream::XMLStreamReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_stream_util_ReaderDelegate__
diff --git a/libjava/javax/xml/stream/util/XMLEventAllocator.h b/libjava/javax/xml/stream/util/XMLEventAllocator.h
deleted file mode 100644
index ac872525c28..00000000000
--- a/libjava/javax/xml/stream/util/XMLEventAllocator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_util_XMLEventAllocator__
-#define __javax_xml_stream_util_XMLEventAllocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-          class XMLStreamReader;
-        namespace events
-        {
-            class XMLEvent;
-        }
-        namespace util
-        {
-            class XMLEventAllocator;
-            class XMLEventConsumer;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::util::XMLEventAllocator : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::stream::util::XMLEventAllocator * newInstance() = 0;
-  virtual ::javax::xml::stream::events::XMLEvent * allocate(::javax::xml::stream::XMLStreamReader *) = 0;
-  virtual void allocate(::javax::xml::stream::XMLStreamReader *, ::javax::xml::stream::util::XMLEventConsumer *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_util_XMLEventAllocator__
diff --git a/libjava/javax/xml/stream/util/XMLEventConsumer.h b/libjava/javax/xml/stream/util/XMLEventConsumer.h
deleted file mode 100644
index 7fb1fcf31e4..00000000000
--- a/libjava/javax/xml/stream/util/XMLEventConsumer.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_stream_util_XMLEventConsumer__
-#define __javax_xml_stream_util_XMLEventConsumer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace stream
-      {
-        namespace events
-        {
-            class XMLEvent;
-        }
-        namespace util
-        {
-            class XMLEventConsumer;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::stream::util::XMLEventConsumer : public ::java::lang::Object
-{
-
-public:
-  virtual void add(::javax::xml::stream::events::XMLEvent *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_stream_util_XMLEventConsumer__
diff --git a/libjava/javax/xml/transform/ErrorListener.h b/libjava/javax/xml/transform/ErrorListener.h
deleted file mode 100644
index ec91067cca6..00000000000
--- a/libjava/javax/xml/transform/ErrorListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_ErrorListener__
-#define __javax_xml_transform_ErrorListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class TransformerException;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::ErrorListener : public ::java::lang::Object
-{
-
-public:
-  virtual void warning(::javax::xml::transform::TransformerException *) = 0;
-  virtual void error(::javax::xml::transform::TransformerException *) = 0;
-  virtual void fatalError(::javax::xml::transform::TransformerException *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_ErrorListener__
diff --git a/libjava/javax/xml/transform/OutputKeys.h b/libjava/javax/xml/transform/OutputKeys.h
deleted file mode 100644
index d53a11f30cb..00000000000
--- a/libjava/javax/xml/transform/OutputKeys.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_OutputKeys__
-#define __javax_xml_transform_OutputKeys__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class OutputKeys;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::OutputKeys : public ::java::lang::Object
-{
-
-  OutputKeys();
-public:
-  static ::java::lang::String * METHOD;
-  static ::java::lang::String * VERSION;
-  static ::java::lang::String * ENCODING;
-  static ::java::lang::String * OMIT_XML_DECLARATION;
-  static ::java::lang::String * STANDALONE;
-  static ::java::lang::String * DOCTYPE_PUBLIC;
-  static ::java::lang::String * DOCTYPE_SYSTEM;
-  static ::java::lang::String * CDATA_SECTION_ELEMENTS;
-  static ::java::lang::String * INDENT;
-  static ::java::lang::String * MEDIA_TYPE;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_OutputKeys__
diff --git a/libjava/javax/xml/transform/Result.h b/libjava/javax/xml/transform/Result.h
deleted file mode 100644
index eb4fe02bd9e..00000000000
--- a/libjava/javax/xml/transform/Result.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_Result__
-#define __javax_xml_transform_Result__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::Result : public ::java::lang::Object
-{
-
-public:
-  virtual void setSystemId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  static ::java::lang::String * PI_DISABLE_OUTPUT_ESCAPING;
-  static ::java::lang::String * PI_ENABLE_OUTPUT_ESCAPING;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_Result__
diff --git a/libjava/javax/xml/transform/Source.h b/libjava/javax/xml/transform/Source.h
deleted file mode 100644
index 72e2c4f45a6..00000000000
--- a/libjava/javax/xml/transform/Source.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_Source__
-#define __javax_xml_transform_Source__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::Source : public ::java::lang::Object
-{
-
-public:
-  virtual void setSystemId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_Source__
diff --git a/libjava/javax/xml/transform/SourceLocator.h b/libjava/javax/xml/transform/SourceLocator.h
deleted file mode 100644
index 3084b8ad345..00000000000
--- a/libjava/javax/xml/transform/SourceLocator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_SourceLocator__
-#define __javax_xml_transform_SourceLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SourceLocator;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::SourceLocator : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual jint getLineNumber() = 0;
-  virtual jint getColumnNumber() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_SourceLocator__
diff --git a/libjava/javax/xml/transform/Templates.h b/libjava/javax/xml/transform/Templates.h
deleted file mode 100644
index 33bb8b55810..00000000000
--- a/libjava/javax/xml/transform/Templates.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_Templates__
-#define __javax_xml_transform_Templates__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Templates;
-          class Transformer;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::Templates : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::transform::Transformer * newTransformer() = 0;
-  virtual ::java::util::Properties * getOutputProperties() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_Templates__
diff --git a/libjava/javax/xml/transform/Transformer.h b/libjava/javax/xml/transform/Transformer.h
deleted file mode 100644
index cd489803fe2..00000000000
--- a/libjava/javax/xml/transform/Transformer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_Transformer__
-#define __javax_xml_transform_Transformer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class Result;
-          class Source;
-          class Transformer;
-          class URIResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::Transformer : public ::java::lang::Object
-{
-
-public: // actually protected
-  Transformer();
-public:
-  virtual void transform(::javax::xml::transform::Source *, ::javax::xml::transform::Result *) = 0;
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getParameter(::java::lang::String *) = 0;
-  virtual void clearParameters() = 0;
-  virtual void setURIResolver(::javax::xml::transform::URIResolver *) = 0;
-  virtual ::javax::xml::transform::URIResolver * getURIResolver() = 0;
-  virtual void setOutputProperties(::java::util::Properties *) = 0;
-  virtual ::java::util::Properties * getOutputProperties() = 0;
-  virtual void setOutputProperty(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getOutputProperty(::java::lang::String *) = 0;
-  virtual void setErrorListener(::javax::xml::transform::ErrorListener *) = 0;
-  virtual ::javax::xml::transform::ErrorListener * getErrorListener() = 0;
-  virtual void reset();
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_Transformer__
diff --git a/libjava/javax/xml/transform/TransformerConfigurationException.h b/libjava/javax/xml/transform/TransformerConfigurationException.h
deleted file mode 100644
index d2a7d27ac22..00000000000
--- a/libjava/javax/xml/transform/TransformerConfigurationException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_TransformerConfigurationException__
-#define __javax_xml_transform_TransformerConfigurationException__
-
-#pragma interface
-
-#include <javax/xml/transform/TransformerException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SourceLocator;
-          class TransformerConfigurationException;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::TransformerConfigurationException : public ::javax::xml::transform::TransformerException
-{
-
-public:
-  TransformerConfigurationException();
-  TransformerConfigurationException(::java::lang::String *);
-  TransformerConfigurationException(::java::lang::Throwable *);
-  TransformerConfigurationException(::java::lang::String *, ::java::lang::Throwable *);
-  TransformerConfigurationException(::java::lang::String *, ::javax::xml::transform::SourceLocator *);
-  TransformerConfigurationException(::java::lang::String *, ::javax::xml::transform::SourceLocator *, ::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 1285547467942875745LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_TransformerConfigurationException__
diff --git a/libjava/javax/xml/transform/TransformerException.h b/libjava/javax/xml/transform/TransformerException.h
deleted file mode 100644
index 92158ce0338..00000000000
--- a/libjava/javax/xml/transform/TransformerException.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_TransformerException__
-#define __javax_xml_transform_TransformerException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class SourceLocator;
-          class TransformerException;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::TransformerException : public ::java::lang::Exception
-{
-
-public:
-  TransformerException(::java::lang::String *);
-  TransformerException(::java::lang::Throwable *);
-  TransformerException(::java::lang::String *, ::java::lang::Throwable *);
-  TransformerException(::java::lang::String *, ::javax::xml::transform::SourceLocator *);
-  TransformerException(::java::lang::String *, ::javax::xml::transform::SourceLocator *, ::java::lang::Throwable *);
-  virtual ::javax::xml::transform::SourceLocator * getLocator();
-  virtual void setLocator(::javax::xml::transform::SourceLocator *);
-  virtual ::java::lang::Throwable * getException();
-  virtual ::java::lang::Throwable * getCause();
-  virtual ::java::lang::Throwable * initCause(::java::lang::Throwable *);
-  virtual ::java::lang::String * getMessageAndLocation();
-  virtual ::java::lang::String * getLocationAsString();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = 975798773772956428LL;
-  ::javax::xml::transform::SourceLocator * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) locator;
-  ::java::lang::Throwable * containedException;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_TransformerException__
diff --git a/libjava/javax/xml/transform/TransformerFactory.h b/libjava/javax/xml/transform/TransformerFactory.h
deleted file mode 100644
index f16f1e784c4..00000000000
--- a/libjava/javax/xml/transform/TransformerFactory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_TransformerFactory__
-#define __javax_xml_transform_TransformerFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class ErrorListener;
-          class Source;
-          class Templates;
-          class Transformer;
-          class TransformerFactory;
-          class URIResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::TransformerFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  TransformerFactory();
-public:
-  static ::javax::xml::transform::TransformerFactory * newInstance();
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual ::javax::xml::transform::Transformer * newTransformer(::javax::xml::transform::Source *) = 0;
-  virtual ::javax::xml::transform::Transformer * newTransformer() = 0;
-  virtual ::javax::xml::transform::Templates * newTemplates(::javax::xml::transform::Source *) = 0;
-  virtual ::javax::xml::transform::Source * getAssociatedStylesheet(::javax::xml::transform::Source *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setURIResolver(::javax::xml::transform::URIResolver *) = 0;
-  virtual ::javax::xml::transform::URIResolver * getURIResolver() = 0;
-  virtual void setFeature(::java::lang::String *, jboolean) = 0;
-  virtual jboolean getFeature(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getAttribute(::java::lang::String *) = 0;
-  virtual void setErrorListener(::javax::xml::transform::ErrorListener *) = 0;
-  virtual ::javax::xml::transform::ErrorListener * getErrorListener() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_TransformerFactory__
diff --git a/libjava/javax/xml/transform/TransformerFactoryConfigurationError.h b/libjava/javax/xml/transform/TransformerFactoryConfigurationError.h
deleted file mode 100644
index d6edcff775f..00000000000
--- a/libjava/javax/xml/transform/TransformerFactoryConfigurationError.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_TransformerFactoryConfigurationError__
-#define __javax_xml_transform_TransformerFactoryConfigurationError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class TransformerFactoryConfigurationError;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::TransformerFactoryConfigurationError : public ::java::lang::Error
-{
-
-public:
-  TransformerFactoryConfigurationError();
-  TransformerFactoryConfigurationError(::java::lang::String *);
-  TransformerFactoryConfigurationError(::java::lang::Exception *);
-  TransformerFactoryConfigurationError(::java::lang::Exception *, ::java::lang::String *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Exception * getException();
-private:
-  static const jlong serialVersionUID = -6527718720676281516LL;
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::lang::Error)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_TransformerFactoryConfigurationError__
diff --git a/libjava/javax/xml/transform/URIResolver.h b/libjava/javax/xml/transform/URIResolver.h
deleted file mode 100644
index 5f64c81f891..00000000000
--- a/libjava/javax/xml/transform/URIResolver.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_URIResolver__
-#define __javax_xml_transform_URIResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-          class URIResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::URIResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::transform::Source * resolve(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_URIResolver__
diff --git a/libjava/javax/xml/transform/dom/DOMLocator.h b/libjava/javax/xml/transform/dom/DOMLocator.h
deleted file mode 100644
index 7bb475203bf..00000000000
--- a/libjava/javax/xml/transform/dom/DOMLocator.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_dom_DOMLocator__
-#define __javax_xml_transform_dom_DOMLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace dom
-        {
-            class DOMLocator;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::dom::DOMLocator : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Node * getOriginatingNode() = 0;
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual jint getLineNumber() = 0;
-  virtual jint getColumnNumber() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_dom_DOMLocator__
diff --git a/libjava/javax/xml/transform/dom/DOMResult.h b/libjava/javax/xml/transform/dom/DOMResult.h
deleted file mode 100644
index 84e91a5cd03..00000000000
--- a/libjava/javax/xml/transform/dom/DOMResult.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_dom_DOMResult__
-#define __javax_xml_transform_dom_DOMResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace dom
-        {
-            class DOMResult;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::dom::DOMResult : public ::java::lang::Object
-{
-
-public:
-  DOMResult();
-  DOMResult(::org::w3c::dom::Node *);
-  DOMResult(::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
-  DOMResult(::org::w3c::dom::Node *, ::java::lang::String *);
-  DOMResult(::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *);
-  virtual void setNode(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * getNode();
-  virtual void setNextSibling(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * getNextSibling();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  static ::java::lang::String * FEATURE;
-private:
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node;
-  ::org::w3c::dom::Node * nextSibling;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_dom_DOMResult__
diff --git a/libjava/javax/xml/transform/dom/DOMSource.h b/libjava/javax/xml/transform/dom/DOMSource.h
deleted file mode 100644
index 3c8d935705b..00000000000
--- a/libjava/javax/xml/transform/dom/DOMSource.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_dom_DOMSource__
-#define __javax_xml_transform_dom_DOMSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace dom
-        {
-            class DOMSource;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::dom::DOMSource : public ::java::lang::Object
-{
-
-public:
-  DOMSource();
-  DOMSource(::org::w3c::dom::Node *);
-  DOMSource(::org::w3c::dom::Node *, ::java::lang::String *);
-  virtual void setNode(::org::w3c::dom::Node *);
-  virtual ::org::w3c::dom::Node * getNode();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  static ::java::lang::String * FEATURE;
-private:
-  ::org::w3c::dom::Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_dom_DOMSource__
diff --git a/libjava/javax/xml/transform/sax/SAXResult.h b/libjava/javax/xml/transform/sax/SAXResult.h
deleted file mode 100644
index b3e04b65dae..00000000000
--- a/libjava/javax/xml/transform/sax/SAXResult.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_sax_SAXResult__
-#define __javax_xml_transform_sax_SAXResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace sax
-        {
-            class SAXResult;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-        namespace ext
-        {
-            class LexicalHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::transform::sax::SAXResult : public ::java::lang::Object
-{
-
-public:
-  SAXResult();
-  SAXResult(::org::xml::sax::ContentHandler *);
-  virtual void setHandler(::org::xml::sax::ContentHandler *);
-  virtual ::org::xml::sax::ContentHandler * getHandler();
-  virtual void setLexicalHandler(::org::xml::sax::ext::LexicalHandler *);
-  virtual ::org::xml::sax::ext::LexicalHandler * getLexicalHandler();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  static ::java::lang::String * FEATURE;
-private:
-  ::org::xml::sax::ContentHandler * __attribute__((aligned(__alignof__( ::java::lang::Object)))) handler;
-  ::org::xml::sax::ext::LexicalHandler * lexicalHandler;
-  ::java::lang::String * systemId;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_sax_SAXResult__
diff --git a/libjava/javax/xml/transform/sax/SAXSource.h b/libjava/javax/xml/transform/sax/SAXSource.h
deleted file mode 100644
index 8c06ad8ec32..00000000000
--- a/libjava/javax/xml/transform/sax/SAXSource.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_sax_SAXSource__
-#define __javax_xml_transform_sax_SAXSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-        namespace sax
-        {
-            class SAXSource;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-          class XMLReader;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::sax::SAXSource : public ::java::lang::Object
-{
-
-public:
-  SAXSource();
-  SAXSource(::org::xml::sax::XMLReader *, ::org::xml::sax::InputSource *);
-  SAXSource(::org::xml::sax::InputSource *);
-  virtual void setXMLReader(::org::xml::sax::XMLReader *);
-  virtual ::org::xml::sax::XMLReader * getXMLReader();
-  virtual void setInputSource(::org::xml::sax::InputSource *);
-  virtual ::org::xml::sax::InputSource * getInputSource();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  static ::org::xml::sax::InputSource * sourceToInputSource(::javax::xml::transform::Source *);
-  static ::java::lang::String * FEATURE;
-private:
-  ::org::xml::sax::XMLReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) xmlReader;
-  ::org::xml::sax::InputSource * inputSource;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_sax_SAXSource__
diff --git a/libjava/javax/xml/transform/sax/SAXTransformerFactory.h b/libjava/javax/xml/transform/sax/SAXTransformerFactory.h
deleted file mode 100644
index 7d26f5533a1..00000000000
--- a/libjava/javax/xml/transform/sax/SAXTransformerFactory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_sax_SAXTransformerFactory__
-#define __javax_xml_transform_sax_SAXTransformerFactory__
-
-#pragma interface
-
-#include <javax/xml/transform/TransformerFactory.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-          class Templates;
-        namespace sax
-        {
-            class SAXTransformerFactory;
-            class TemplatesHandler;
-            class TransformerHandler;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class XMLFilter;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::sax::SAXTransformerFactory : public ::javax::xml::transform::TransformerFactory
-{
-
-public: // actually protected
-  SAXTransformerFactory();
-public:
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler(::javax::xml::transform::Source *) = 0;
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler(::javax::xml::transform::Templates *) = 0;
-  virtual ::javax::xml::transform::sax::TransformerHandler * newTransformerHandler() = 0;
-  virtual ::javax::xml::transform::sax::TemplatesHandler * newTemplatesHandler() = 0;
-  virtual ::org::xml::sax::XMLFilter * newXMLFilter(::javax::xml::transform::Source *) = 0;
-  virtual ::org::xml::sax::XMLFilter * newXMLFilter(::javax::xml::transform::Templates *) = 0;
-  static ::java::lang::String * FEATURE;
-  static ::java::lang::String * FEATURE_XMLFILTER;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_sax_SAXTransformerFactory__
diff --git a/libjava/javax/xml/transform/sax/TemplatesHandler.h b/libjava/javax/xml/transform/sax/TemplatesHandler.h
deleted file mode 100644
index 63f6834c18d..00000000000
--- a/libjava/javax/xml/transform/sax/TemplatesHandler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_sax_TemplatesHandler__
-#define __javax_xml_transform_sax_TemplatesHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Templates;
-        namespace sax
-        {
-            class TemplatesHandler;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class Locator;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::sax::TemplatesHandler : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::transform::Templates * getTemplates() = 0;
-  virtual void setSystemId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual void setDocumentLocator(::org::xml::sax::Locator *) = 0;
-  virtual void startDocument() = 0;
-  virtual void endDocument() = 0;
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void endPrefixMapping(::java::lang::String *) = 0;
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *) = 0;
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void characters(JArray< jchar > *, jint, jint) = 0;
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint) = 0;
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void skippedEntity(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_sax_TemplatesHandler__
diff --git a/libjava/javax/xml/transform/sax/TransformerHandler.h b/libjava/javax/xml/transform/sax/TransformerHandler.h
deleted file mode 100644
index f6cbdc3094f..00000000000
--- a/libjava/javax/xml/transform/sax/TransformerHandler.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_sax_TransformerHandler__
-#define __javax_xml_transform_sax_TransformerHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-          class Transformer;
-        namespace sax
-        {
-            class TransformerHandler;
-        }
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class Locator;
-      }
-    }
-  }
-}
-
-class javax::xml::transform::sax::TransformerHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void setResult(::javax::xml::transform::Result *) = 0;
-  virtual void setSystemId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual ::javax::xml::transform::Transformer * getTransformer() = 0;
-  virtual void setDocumentLocator(::org::xml::sax::Locator *) = 0;
-  virtual void startDocument() = 0;
-  virtual void endDocument() = 0;
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void endPrefixMapping(::java::lang::String *) = 0;
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *) = 0;
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void characters(JArray< jchar > *, jint, jint) = 0;
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint) = 0;
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void skippedEntity(::java::lang::String *) = 0;
-  virtual void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void endDTD() = 0;
-  virtual void startEntity(::java::lang::String *) = 0;
-  virtual void endEntity(::java::lang::String *) = 0;
-  virtual void startCDATA() = 0;
-  virtual void endCDATA() = 0;
-  virtual void comment(JArray< jchar > *, jint, jint) = 0;
-  virtual void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_transform_sax_TransformerHandler__
diff --git a/libjava/javax/xml/transform/stream/StreamResult.h b/libjava/javax/xml/transform/stream/StreamResult.h
deleted file mode 100644
index dd9d09648f0..00000000000
--- a/libjava/javax/xml/transform/stream/StreamResult.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_stream_StreamResult__
-#define __javax_xml_transform_stream_StreamResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace stream
-        {
-            class StreamResult;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::transform::stream::StreamResult : public ::java::lang::Object
-{
-
-public:
-  StreamResult();
-  StreamResult(::java::io::OutputStream *);
-  StreamResult(::java::io::Writer *);
-  StreamResult(::java::lang::String *);
-  StreamResult(::java::io::File *);
-  virtual void setOutputStream(::java::io::OutputStream *);
-  virtual ::java::io::OutputStream * getOutputStream();
-  virtual void setWriter(::java::io::Writer *);
-  virtual ::java::io::Writer * getWriter();
-  virtual void setSystemId(::java::lang::String *);
-  virtual void setSystemId(::java::io::File *);
-  virtual ::java::lang::String * getSystemId();
-  static ::java::lang::String * FEATURE;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) systemId;
-  ::java::io::OutputStream * outputStream;
-  ::java::io::Writer * writer;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_stream_StreamResult__
diff --git a/libjava/javax/xml/transform/stream/StreamSource.h b/libjava/javax/xml/transform/stream/StreamSource.h
deleted file mode 100644
index 685a94a06b0..00000000000
--- a/libjava/javax/xml/transform/stream/StreamSource.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_transform_stream_StreamSource__
-#define __javax_xml_transform_stream_StreamSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-        namespace stream
-        {
-            class StreamSource;
-        }
-      }
-    }
-  }
-}
-
-class javax::xml::transform::stream::StreamSource : public ::java::lang::Object
-{
-
-public:
-  StreamSource();
-  StreamSource(::java::io::InputStream *);
-  StreamSource(::java::io::InputStream *, ::java::lang::String *);
-  StreamSource(::java::io::Reader *);
-  StreamSource(::java::io::Reader *, ::java::lang::String *);
-  StreamSource(::java::lang::String *);
-  StreamSource(::java::io::File *);
-  virtual void setInputStream(::java::io::InputStream *);
-  virtual ::java::io::InputStream * getInputStream();
-  virtual void setReader(::java::io::Reader *);
-  virtual ::java::io::Reader * getReader();
-  virtual void setPublicId(::java::lang::String *);
-  virtual ::java::lang::String * getPublicId();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  virtual void setSystemId(::java::io::File *);
-  static ::java::lang::String * FEATURE;
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) publicId;
-  ::java::lang::String * systemId;
-  ::java::io::InputStream * inputStream;
-  ::java::io::Reader * reader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_transform_stream_StreamSource__
diff --git a/libjava/javax/xml/validation/Schema.h b/libjava/javax/xml/validation/Schema.h
deleted file mode 100644
index 482a216d26b..00000000000
--- a/libjava/javax/xml/validation/Schema.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_Schema__
-#define __javax_xml_validation_Schema__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class Schema;
-          class Validator;
-          class ValidatorHandler;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::Schema : public ::java::lang::Object
-{
-
-public: // actually protected
-  Schema();
-public:
-  virtual ::javax::xml::validation::Validator * newValidator() = 0;
-  virtual ::javax::xml::validation::ValidatorHandler * newValidatorHandler() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_Schema__
diff --git a/libjava/javax/xml/validation/SchemaFactory.h b/libjava/javax/xml/validation/SchemaFactory.h
deleted file mode 100644
index 758e376843d..00000000000
--- a/libjava/javax/xml/validation/SchemaFactory.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_SchemaFactory__
-#define __javax_xml_validation_SchemaFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Source;
-      }
-      namespace validation
-      {
-          class Schema;
-          class SchemaFactory;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::SchemaFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  SchemaFactory();
-public:
-  static ::javax::xml::validation::SchemaFactory * newInstance(::java::lang::String *);
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, ::java::lang::String *, jint);
-public:
-  virtual jboolean isSchemaLanguageSupported(::java::lang::String *) = 0;
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler() = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver() = 0;
-  virtual void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *) = 0;
-  virtual ::javax::xml::validation::Schema * newSchema(::javax::xml::transform::Source *);
-  virtual ::javax::xml::validation::Schema * newSchema(::java::io::File *);
-  virtual ::javax::xml::validation::Schema * newSchema(::java::net::URL *);
-  virtual ::javax::xml::validation::Schema * newSchema(JArray< ::javax::xml::transform::Source * > *) = 0;
-  virtual ::javax::xml::validation::Schema * newSchema() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_SchemaFactory__
diff --git a/libjava/javax/xml/validation/SchemaFactoryLoader.h b/libjava/javax/xml/validation/SchemaFactoryLoader.h
deleted file mode 100644
index 0593c5474dd..00000000000
--- a/libjava/javax/xml/validation/SchemaFactoryLoader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_SchemaFactoryLoader__
-#define __javax_xml_validation_SchemaFactoryLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class SchemaFactory;
-          class SchemaFactoryLoader;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::SchemaFactoryLoader : public ::java::lang::Object
-{
-
-public: // actually protected
-  SchemaFactoryLoader();
-public:
-  virtual ::javax::xml::validation::SchemaFactory * newFactory(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_SchemaFactoryLoader__
diff --git a/libjava/javax/xml/validation/TypeInfoProvider.h b/libjava/javax/xml/validation/TypeInfoProvider.h
deleted file mode 100644
index 0a363268808..00000000000
--- a/libjava/javax/xml/validation/TypeInfoProvider.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_TypeInfoProvider__
-#define __javax_xml_validation_TypeInfoProvider__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class TypeInfoProvider;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class TypeInfo;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::TypeInfoProvider : public ::java::lang::Object
-{
-
-public: // actually protected
-  TypeInfoProvider();
-public:
-  virtual ::org::w3c::dom::TypeInfo * getElementTypeInfo() = 0;
-  virtual ::org::w3c::dom::TypeInfo * getAttributeTypeInfo(jint) = 0;
-  virtual jboolean isIdAttribute(jint) = 0;
-  virtual jboolean isSpecified(jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_TypeInfoProvider__
diff --git a/libjava/javax/xml/validation/Validator.h b/libjava/javax/xml/validation/Validator.h
deleted file mode 100644
index 98dcf2862f2..00000000000
--- a/libjava/javax/xml/validation/Validator.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_Validator__
-#define __javax_xml_validation_Validator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace transform
-      {
-          class Result;
-          class Source;
-      }
-      namespace validation
-      {
-          class Validator;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::Validator : public ::java::lang::Object
-{
-
-public: // actually protected
-  Validator();
-public:
-  virtual void reset() = 0;
-  virtual void validate(::javax::xml::transform::Source *);
-  virtual void validate(::javax::xml::transform::Source *, ::javax::xml::transform::Result *) = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler() = 0;
-  virtual void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *) = 0;
-  virtual ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver() = 0;
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_Validator__
diff --git a/libjava/javax/xml/validation/ValidatorHandler.h b/libjava/javax/xml/validation/ValidatorHandler.h
deleted file mode 100644
index a5f9e2f010c..00000000000
--- a/libjava/javax/xml/validation/ValidatorHandler.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_validation_ValidatorHandler__
-#define __javax_xml_validation_ValidatorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace validation
-      {
-          class TypeInfoProvider;
-          class ValidatorHandler;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSResourceResolver;
-        }
-      }
-    }
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class ContentHandler;
-          class ErrorHandler;
-          class Locator;
-      }
-    }
-  }
-}
-
-class javax::xml::validation::ValidatorHandler : public ::java::lang::Object
-{
-
-public: // actually protected
-  ValidatorHandler();
-public:
-  virtual void setContentHandler(::org::xml::sax::ContentHandler *) = 0;
-  virtual ::org::xml::sax::ContentHandler * getContentHandler() = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler() = 0;
-  virtual void setResourceResolver(::org::w3c::dom::ls::LSResourceResolver *) = 0;
-  virtual ::org::w3c::dom::ls::LSResourceResolver * getResourceResolver() = 0;
-  virtual ::javax::xml::validation::TypeInfoProvider * getTypeInfoProvider() = 0;
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual void setDocumentLocator(::org::xml::sax::Locator *) = 0;
-  virtual void startDocument() = 0;
-  virtual void endDocument() = 0;
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void endPrefixMapping(::java::lang::String *) = 0;
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *) = 0;
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void characters(JArray< jchar > *, jint, jint) = 0;
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint) = 0;
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void skippedEntity(::java::lang::String *) = 0;
-public: // actually package-private
-  static ::java::lang::String * NS_FEATURE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_validation_ValidatorHandler__
diff --git a/libjava/javax/xml/xpath/XPath.h b/libjava/javax/xml/xpath/XPath.h
deleted file mode 100644
index 0a67abb8129..00000000000
--- a/libjava/javax/xml/xpath/XPath.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPath__
-#define __javax_xml_xpath_XPath__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class NamespaceContext;
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPath;
-          class XPathExpression;
-          class XPathFunctionResolver;
-          class XPathVariableResolver;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPath : public ::java::lang::Object
-{
-
-public:
-  virtual void reset() = 0;
-  virtual void setXPathVariableResolver(::javax::xml::xpath::XPathVariableResolver *) = 0;
-  virtual ::javax::xml::xpath::XPathVariableResolver * getXPathVariableResolver() = 0;
-  virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *) = 0;
-  virtual ::javax::xml::xpath::XPathFunctionResolver * getXPathFunctionResolver() = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
-  virtual ::javax::xml::xpath::XPathExpression * compile(::java::lang::String *) = 0;
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace::QName *) = 0;
-  virtual ::java::lang::String * evaluate(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace::QName *) = 0;
-  virtual ::java::lang::String * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_xpath_XPath__
diff --git a/libjava/javax/xml/xpath/XPathConstants.h b/libjava/javax/xml/xpath/XPathConstants.h
deleted file mode 100644
index 0b15648e34e..00000000000
--- a/libjava/javax/xml/xpath/XPathConstants.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathConstants__
-#define __javax_xml_xpath_XPathConstants__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathConstants;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathConstants : public ::java::lang::Object
-{
-
-  XPathConstants();
-public:
-  static ::javax::xml::namespace::QName * NUMBER;
-  static ::javax::xml::namespace::QName * STRING;
-  static ::javax::xml::namespace::QName * BOOLEAN;
-  static ::javax::xml::namespace::QName * NODESET;
-  static ::javax::xml::namespace::QName * NODE;
-  static ::java::lang::String * DOM_OBJECT_MODEL;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathConstants__
diff --git a/libjava/javax/xml/xpath/XPathException.h b/libjava/javax/xml/xpath/XPathException.h
deleted file mode 100644
index a495a94233e..00000000000
--- a/libjava/javax/xml/xpath/XPathException.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathException__
-#define __javax_xml_xpath_XPathException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathException;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathException : public ::java::lang::Exception
-{
-
-public:
-  XPathException(::java::lang::String *);
-  XPathException(::java::lang::Throwable *);
-  virtual ::java::lang::Throwable * getCause();
-  virtual void printStackTrace();
-  virtual void printStackTrace(::java::io::PrintStream *);
-  virtual void printStackTrace(::java::io::PrintWriter *);
-private:
-  static const jlong serialVersionUID = -1837080260374986980LL;
-public: // actually package-private
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) cause;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathException__
diff --git a/libjava/javax/xml/xpath/XPathExpression.h b/libjava/javax/xml/xpath/XPathExpression.h
deleted file mode 100644
index 6a9a0e3e5a2..00000000000
--- a/libjava/javax/xml/xpath/XPathExpression.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathExpression__
-#define __javax_xml_xpath_XPathExpression__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathExpression;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathExpression : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace::QName *) = 0;
-  virtual ::java::lang::String * evaluate(::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace::QName *) = 0;
-  virtual ::java::lang::String * evaluate(::org::xml::sax::InputSource *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_xpath_XPathExpression__
diff --git a/libjava/javax/xml/xpath/XPathExpressionException.h b/libjava/javax/xml/xpath/XPathExpressionException.h
deleted file mode 100644
index e619bbd62b6..00000000000
--- a/libjava/javax/xml/xpath/XPathExpressionException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathExpressionException__
-#define __javax_xml_xpath_XPathExpressionException__
-
-#pragma interface
-
-#include <javax/xml/xpath/XPathException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathExpressionException;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathExpressionException : public ::javax::xml::xpath::XPathException
-{
-
-public:
-  XPathExpressionException(::java::lang::String *);
-  XPathExpressionException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -1837080260374986980LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathExpressionException__
diff --git a/libjava/javax/xml/xpath/XPathFactory.h b/libjava/javax/xml/xpath/XPathFactory.h
deleted file mode 100644
index f4b9ac68554..00000000000
--- a/libjava/javax/xml/xpath/XPathFactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathFactory__
-#define __javax_xml_xpath_XPathFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPath;
-          class XPathFactory;
-          class XPathFunctionResolver;
-          class XPathVariableResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathFactory : public ::java::lang::Object
-{
-
-public: // actually protected
-  XPathFactory();
-public:
-  static ::javax::xml::xpath::XPathFactory * newInstance();
-  static ::javax::xml::xpath::XPathFactory * newInstance(::java::lang::String *);
-private:
-  static ::java::lang::String * getFactoryClassName(::java::lang::ClassLoader *, jint);
-public:
-  virtual jboolean isObjectModelSupported(::java::lang::String *) = 0;
-  virtual void setFeature(::java::lang::String *, jboolean) = 0;
-  virtual jboolean getFeature(::java::lang::String *) = 0;
-  virtual void setXPathVariableResolver(::javax::xml::xpath::XPathVariableResolver *) = 0;
-  virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *) = 0;
-  virtual ::javax::xml::xpath::XPath * newXPath() = 0;
-  static ::java::lang::String * DEFAULT_PROPERTY_NAME;
-  static ::java::lang::String * DEFAULT_OBJECT_MODEL_URI;
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathFactory__
diff --git a/libjava/javax/xml/xpath/XPathFactoryConfigurationException.h b/libjava/javax/xml/xpath/XPathFactoryConfigurationException.h
deleted file mode 100644
index 35ee44255f1..00000000000
--- a/libjava/javax/xml/xpath/XPathFactoryConfigurationException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathFactoryConfigurationException__
-#define __javax_xml_xpath_XPathFactoryConfigurationException__
-
-#pragma interface
-
-#include <javax/xml/xpath/XPathException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathFactoryConfigurationException;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathFactoryConfigurationException : public ::javax::xml::xpath::XPathException
-{
-
-public:
-  XPathFactoryConfigurationException(::java::lang::String *);
-  XPathFactoryConfigurationException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -1837080260374986980LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathFactoryConfigurationException__
diff --git a/libjava/javax/xml/xpath/XPathFunction.h b/libjava/javax/xml/xpath/XPathFunction.h
deleted file mode 100644
index adc76361280..00000000000
--- a/libjava/javax/xml/xpath/XPathFunction.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathFunction__
-#define __javax_xml_xpath_XPathFunction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathFunction;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathFunction : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * evaluate(::java::util::List *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_xpath_XPathFunction__
diff --git a/libjava/javax/xml/xpath/XPathFunctionException.h b/libjava/javax/xml/xpath/XPathFunctionException.h
deleted file mode 100644
index 690332a2efd..00000000000
--- a/libjava/javax/xml/xpath/XPathFunctionException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathFunctionException__
-#define __javax_xml_xpath_XPathFunctionException__
-
-#pragma interface
-
-#include <javax/xml/xpath/XPathExpressionException.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace xpath
-      {
-          class XPathFunctionException;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathFunctionException : public ::javax::xml::xpath::XPathExpressionException
-{
-
-public:
-  XPathFunctionException(::java::lang::String *);
-  XPathFunctionException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = -1837080260374986980LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_xml_xpath_XPathFunctionException__
diff --git a/libjava/javax/xml/xpath/XPathFunctionResolver.h b/libjava/javax/xml/xpath/XPathFunctionResolver.h
deleted file mode 100644
index b526d01a035..00000000000
--- a/libjava/javax/xml/xpath/XPathFunctionResolver.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathFunctionResolver__
-#define __javax_xml_xpath_XPathFunctionResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathFunction;
-          class XPathFunctionResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathFunctionResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace::QName *, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_xpath_XPathFunctionResolver__
diff --git a/libjava/javax/xml/xpath/XPathVariableResolver.h b/libjava/javax/xml/xpath/XPathVariableResolver.h
deleted file mode 100644
index d308cac5948..00000000000
--- a/libjava/javax/xml/xpath/XPathVariableResolver.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_xml_xpath_XPathVariableResolver__
-#define __javax_xml_xpath_XPathVariableResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace xml
-    {
-      namespace namespace
-      {
-          class QName;
-      }
-      namespace xpath
-      {
-          class XPathVariableResolver;
-      }
-    }
-  }
-}
-
-class javax::xml::xpath::XPathVariableResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace::QName *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __javax_xml_xpath_XPathVariableResolver__
diff --git a/libjava/org/ietf/jgss/ChannelBinding.h b/libjava/org/ietf/jgss/ChannelBinding.h
deleted file mode 100644
index a83c6f29653..00000000000
--- a/libjava/org/ietf/jgss/ChannelBinding.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_ietf_jgss_ChannelBinding__
-#define __org_ietf_jgss_ChannelBinding__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class InetAddress;
-    }
-  }
-  namespace org
-  {
-    namespace ietf
-    {
-      namespace jgss
-      {
-          class ChannelBinding;
-      }
-    }
-  }
-}
-
-class org::ietf::jgss::ChannelBinding : public ::java::lang::Object
-{
-
-public:
-  ChannelBinding(::java::net::InetAddress *, ::java::net::InetAddress *, JArray< jbyte > *);
-  ChannelBinding(JArray< jbyte > *);
-  virtual ::java::net::InetAddress * getInitiatorAddress();
-  virtual ::java::net::InetAddress * getAcceptorAddress();
-  virtual JArray< jbyte > * getApplicationData();
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) appData;
-  ::java::net::InetAddress * initAddr;
-  ::java::net::InetAddress * acceptAddr;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_ietf_jgss_ChannelBinding__
diff --git a/libjava/org/ietf/jgss/GSSContext.h b/libjava/org/ietf/jgss/GSSContext.h
deleted file mode 100644
index 04b322c2d03..00000000000
--- a/libjava/org/ietf/jgss/GSSContext.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_ietf_jgss_GSSContext__
-#define __org_ietf_jgss_GSSContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace ietf
-    {
-      namespace jgss
-      {
-          class ChannelBinding;
-          class GSSContext;
-          class GSSCredential;
-          class GSSName;
-          class MessageProp;
-          class Oid;
-      }
-    }
-  }
-}
-
-class org::ietf::jgss::GSSContext : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * initSecContext(JArray< jbyte > *, jint, jint) = 0;
-  virtual jint initSecContext(::java::io::InputStream *, ::java::io::OutputStream *) = 0;
-  virtual JArray< jbyte > * acceptSecContext(JArray< jbyte > *, jint, jint) = 0;
-  virtual void acceptSecContext(::java::io::InputStream *, ::java::io::OutputStream *) = 0;
-  virtual jboolean isEstablished() = 0;
-  virtual void dispose() = 0;
-  virtual jint getWrapSizeLimit(jint, jboolean, jint) = 0;
-  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint, ::org::ietf::jgss::MessageProp *) = 0;
-  virtual void wrap(::java::io::InputStream *, ::java::io::OutputStream *, ::org::ietf::jgss::MessageProp *) = 0;
-  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint, ::org::ietf::jgss::MessageProp *) = 0;
-  virtual void unwrap(::java::io::InputStream *, ::java::io::OutputStream *, ::org::ietf::jgss::MessageProp *) = 0;
-  virtual JArray< jbyte > * getMIC(JArray< jbyte > *, jint, jint, ::org::ietf::jgss::MessageProp *) = 0;
-  virtual void getMIC(::java::io::InputStream *, ::java::io::OutputStream *, ::org::ietf::jgss::MessageProp *) = 0;
-  virtual void verifyMIC(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint, jint, ::org::ietf::jgss::MessageProp *) = 0;
-  virtual void verifyMIC(::java::io::InputStream *, ::java::io::InputStream *, ::org::ietf::jgss::MessageProp *) = 0;
-  virtual JArray< jbyte > * export$() = 0;
-  virtual void requestMutualAuth(jboolean) = 0;
-  virtual void requestReplayDet(jboolean) = 0;
-  virtual void requestSequenceDet(jboolean) = 0;
-  virtual void requestCredDeleg(jboolean) = 0;
-  virtual void requestAnonymity(jboolean) = 0;
-  virtual void requestConf(jboolean) = 0;
-  virtual void requestInteg(jboolean) = 0;
-  virtual void requestLifetime(jint) = 0;
-  virtual void setChannelBinding(::org::ietf::jgss::ChannelBinding *) = 0;
-  virtual jboolean getCredDelegState() = 0;
-  virtual jboolean getMutualAuthState() = 0;
-  virtual jboolean getReplayDetState() = 0;
-  virtual jboolean getSequenceDetState() = 0;
-  virtual jboolean getAnonymityState() = 0;
-  virtual jboolean isTransferable() = 0;
-  virtual jboolean isProtReady() = 0;
-  virtual jboolean getConfState() = 0;
-  virtual jboolean getIntegState() = 0;
-  virtual jint getLifetime() = 0;
-  virtual ::org::ietf::jgss::GSSName * getSrcName() = 0;
-  virtual ::org::ietf::jgss::GSSName * getTargName() = 0;
-  virtual ::org::ietf::jgss::Oid * getMech() = 0;
-  virtual ::org::ietf::jgss::GSSCredential * getDelegCred() = 0;
-  virtual jboolean isInitiator() = 0;
-  static const jint DEFAULT_LIFETIME = 0;
-  static const jint INDEFINITE_LIFETIME = 2147483647;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_ietf_jgss_GSSContext__
diff --git a/libjava/org/ietf/jgss/GSSCredential.h b/libjava/org/ietf/jgss/GSSCredential.h
deleted file mode 100644
index 57560c474ea..00000000000
--- a/libjava/org/ietf/jgss/GSSCredential.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_ietf_jgss_GSSCredential__
-#define __org_ietf_jgss_GSSCredential__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace ietf
-    {
-      namespace jgss
-      {
-          class GSSCredential;
-          class GSSName;
-          class Oid;
-      }
-    }
-  }
-}
-
-class org::ietf::jgss::GSSCredential : public ::java::lang::Object
-{
-
-public:
-  virtual void dispose() = 0;
-  virtual ::org::ietf::jgss::GSSName * getName() = 0;
-  virtual ::org::ietf::jgss::GSSName * getName(::org::ietf::jgss::Oid *) = 0;
-  virtual jint getRemainingLifetime() = 0;
-  virtual jint getRemainingInitLifetime(::org::ietf::jgss::Oid *) = 0;
-  virtual jint getRemainingAcceptLifetime(::org::ietf::jgss::Oid *) = 0;
-  virtual jint getUsage() = 0;
-  virtual jint getUsage(::org::ietf::jgss::Oid *) = 0;
-  virtual JArray< ::org::ietf::jgss::Oid * > * getMechs() = 0;
-  virtual void add(::org::ietf::jgss::GSSName *, jint, jint, ::org::ietf::jgss::Oid *, jint) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  static const jint INITIATE_AND_ACCEPT = 0;
-  static const jint INITIATE_ONLY = 1;
-  static const jint ACCEPT_ONLY = 2;
-  static const jint DEFAULT_LIFETIME = 0;
-  static const jint INDEFINITE_LIFETIME = 2147483647;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_ietf_jgss_GSSCredential__
diff --git a/libjava/org/ietf/jgss/GSSException.h b/libjava/org/ietf/jgss/GSSException.h
deleted file mode 100644
index b703521dede..00000000000
--- a/libjava/org/ietf/jgss/GSSException.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_ietf_jgss_GSSException__
-#define __org_ietf_jgss_GSSException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace ietf
-    {
-      namespace jgss
-      {
-          class GSSException;
-      }
-    }
-  }
-}
-
-class org::ietf::jgss::GSSException : public ::java::lang::Exception
-{
-
-public:
-  GSSException(jint);
-  GSSException(jint, jint, ::java::lang::String *);
-  virtual jint getMajor();
-  virtual jint getMinor();
-  virtual ::java::lang::String * getMajorString();
-  virtual ::java::lang::String * getMinorString();
-  virtual void setMinor(jint, ::java::lang::String *);
-  virtual ::java::lang::String * toString();
-  virtual ::java::lang::String * getMessage();
-private:
-  ::java::lang::String * getMsg(::java::lang::String *, ::java::lang::String *);
-  static const jlong serialVersionUID = -2706218945227726672LL;
-public:
-  static const jint BAD_BINDINGS = 1;
-  static const jint BAD_MECH = 2;
-  static const jint BAD_NAME = 3;
-  static const jint BAD_NAMETYPE = 4;
-  static const jint BAD_STATUS = 5;
-  static const jint BAD_MIC = 6;
-  static const jint CONTEXT_EXPIRED = 7;
-  static const jint CREDENTIALS_EXPIRED = 8;
-  static const jint DEFECTIVE_CREDENTIAL = 9;
-  static const jint DEFECTIVE_TOKEN = 10;
-  static const jint FAILURE = 11;
-  static const jint NO_CONTEXT = 12;
-  static const jint NO_CRED = 13;
-  static const jint BAD_QOP = 14;
-  static const jint UNAUTHORIZED = 15;
-  static const jint UNAVAILABLE = 16;
-  static const jint DUPLICATE_ELEMENT = 17;
-  static const jint NAME_NOT_MN = 18;
-  static const jint DUPLICATE_TOKEN = 19;
-  static const jint OLD_TOKEN = 20;
-  static const jint UNSEQ_TOKEN = 21;
-  static const jint GAP_TOKEN = 22;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) major;
-  jint minor;
-  ::java::lang::String * minorString;
-  ::java::util::ResourceBundle * messages;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_ietf_jgss_GSSException__
diff --git a/libjava/org/ietf/jgss/GSSManager.h b/libjava/org/ietf/jgss/GSSManager.h
deleted file mode 100644
index c33a2bc5a4c..00000000000
--- a/libjava/org/ietf/jgss/GSSManager.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_ietf_jgss_GSSManager__
-#define __org_ietf_jgss_GSSManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace security
-    {
-        class Provider;
-    }
-  }
-  namespace org
-  {
-    namespace ietf
-    {
-      namespace jgss
-      {
-          class GSSContext;
-          class GSSCredential;
-          class GSSManager;
-          class GSSName;
-          class Oid;
-      }
-    }
-  }
-}
-
-class org::ietf::jgss::GSSManager : public ::java::lang::Object
-{
-
-public:
-  GSSManager();
-  static ::org::ietf::jgss::GSSManager * getInstance();
-  virtual void addProviderAtEnd(::java::security::Provider *, ::org::ietf::jgss::Oid *) = 0;
-  virtual void addProviderAtFront(::java::security::Provider *, ::org::ietf::jgss::Oid *) = 0;
-  virtual ::org::ietf::jgss::GSSContext * createContext(JArray< jbyte > *) = 0;
-  virtual ::org::ietf::jgss::GSSContext * createContext(::org::ietf::jgss::GSSCredential *) = 0;
-  virtual ::org::ietf::jgss::GSSContext * createContext(::org::ietf::jgss::GSSName *, ::org::ietf::jgss::Oid *, ::org::ietf::jgss::GSSCredential *, jint) = 0;
-  virtual ::org::ietf::jgss::GSSCredential * createCredential(jint) = 0;
-  virtual ::org::ietf::jgss::GSSCredential * createCredential(::org::ietf::jgss::GSSName *, jint, ::org::ietf::jgss::Oid *, jint) = 0;
-  virtual ::org::ietf::jgss::GSSCredential * createCredential(::org::ietf::jgss::GSSName *, jint, JArray< ::org::ietf::jgss::Oid * > *, jint) = 0;
-  virtual ::org::ietf::jgss::GSSName * createName(JArray< jbyte > *, ::org::ietf::jgss::Oid *) = 0;
-  virtual ::org::ietf::jgss::GSSName * createName(JArray< jbyte > *, ::org::ietf::jgss::Oid *, ::org::ietf::jgss::Oid *) = 0;
-  virtual ::org::ietf::jgss::GSSName * createName(::java::lang::String *, ::org::ietf::jgss::Oid *) = 0;
-  virtual ::org::ietf::jgss::GSSName * createName(::java::lang::String *, ::org::ietf::jgss::Oid *, ::org::ietf::jgss::Oid *) = 0;
-  virtual JArray< ::org::ietf::jgss::Oid * > * getMechs() = 0;
-  virtual JArray< ::org::ietf::jgss::Oid * > * getMechsForName(::org::ietf::jgss::Oid *) = 0;
-  virtual JArray< ::org::ietf::jgss::Oid * > * getNamesForMech(::org::ietf::jgss::Oid *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_ietf_jgss_GSSManager__
diff --git a/libjava/org/ietf/jgss/GSSName.h b/libjava/org/ietf/jgss/GSSName.h
deleted file mode 100644
index 28db6a46eff..00000000000
--- a/libjava/org/ietf/jgss/GSSName.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_ietf_jgss_GSSName__
-#define __org_ietf_jgss_GSSName__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace ietf
-    {
-      namespace jgss
-      {
-          class GSSName;
-          class Oid;
-      }
-    }
-  }
-}
-
-class org::ietf::jgss::GSSName : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean equals(::org::ietf::jgss::GSSName *) = 0;
-  virtual jboolean equals(::java::lang::Object *) = 0;
-  virtual jint hashCode() = 0;
-  virtual ::org::ietf::jgss::GSSName * canonicalize(::org::ietf::jgss::Oid *) = 0;
-  virtual JArray< jbyte > * export$() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual ::org::ietf::jgss::Oid * getStringNameType() = 0;
-  virtual jboolean isAnonymous() = 0;
-  virtual jboolean isMN() = 0;
-  static ::org::ietf::jgss::Oid * NT_ANONYMOUS;
-  static ::org::ietf::jgss::Oid * NT_EXPORT_NAME;
-  static ::org::ietf::jgss::Oid * NT_HOSTBASED_SERVICE;
-  static ::org::ietf::jgss::Oid * NT_MACHINE_UID_NAME;
-  static ::org::ietf::jgss::Oid * NT_STRING_UID_NAME;
-  static ::org::ietf::jgss::Oid * NT_USER_NAME;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_ietf_jgss_GSSName__
diff --git a/libjava/org/ietf/jgss/MessageProp.h b/libjava/org/ietf/jgss/MessageProp.h
deleted file mode 100644
index 6cf36238351..00000000000
--- a/libjava/org/ietf/jgss/MessageProp.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_ietf_jgss_MessageProp__
-#define __org_ietf_jgss_MessageProp__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace ietf
-    {
-      namespace jgss
-      {
-          class MessageProp;
-      }
-    }
-  }
-}
-
-class org::ietf::jgss::MessageProp : public ::java::lang::Object
-{
-
-public:
-  MessageProp(jboolean);
-  MessageProp(jint, jboolean);
-  virtual jint getQOP();
-  virtual jboolean getPrivacy();
-  virtual jint getMinorStatus();
-  virtual ::java::lang::String * getMinorString();
-  virtual void setQOP(jint);
-  virtual void setPrivacy(jboolean);
-  virtual jboolean isDuplicateToken();
-  virtual jboolean isOldToken();
-  virtual jboolean isUnseqToken();
-  virtual jboolean isGapToken();
-  virtual void setSupplementaryStates(jboolean, jboolean, jboolean, jboolean, jint, ::java::lang::String *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) qopVal;
-  jboolean privState;
-  jboolean duplicate;
-  jboolean old;
-  jboolean unseq;
-  jboolean gap;
-  jint minorStatus;
-  ::java::lang::String * minorString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_ietf_jgss_MessageProp__
diff --git a/libjava/org/ietf/jgss/Oid.h b/libjava/org/ietf/jgss/Oid.h
deleted file mode 100644
index 6c8c0cc275b..00000000000
--- a/libjava/org/ietf/jgss/Oid.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_ietf_jgss_Oid__
-#define __org_ietf_jgss_Oid__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace ietf
-    {
-      namespace jgss
-      {
-          class Oid;
-      }
-    }
-  }
-}
-
-class org::ietf::jgss::Oid : public ::java::lang::Object
-{
-
-public:
-  Oid(::java::lang::String *);
-  Oid(::java::io::InputStream *);
-  Oid(JArray< jbyte > *);
-public: // actually package-private
-  Oid(JArray< jint > *);
-public:
-  virtual ::java::lang::String * toString();
-  virtual JArray< jbyte > * getDER();
-  virtual jboolean containedIn(JArray< ::org::ietf::jgss::Oid * > *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual jint hashCode();
-private:
-  static void encodeSubId(::java::io::OutputStream *, jint);
-  static const jint OBJECT_IDENTIFIER = 6;
-  static const jint RELATIVE_OID = 13;
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) components;
-  JArray< jbyte > * derOid;
-  ::java::lang::String * strOid;
-  jboolean relative;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_ietf_jgss_Oid__
diff --git a/libjava/org/omg/CORBA/ACTIVITY_COMPLETED.h b/libjava/org/omg/CORBA/ACTIVITY_COMPLETED.h
deleted file mode 100644
index bddfa39d56e..00000000000
--- a/libjava/org/omg/CORBA/ACTIVITY_COMPLETED.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ACTIVITY_COMPLETED__
-#define __org_omg_CORBA_ACTIVITY_COMPLETED__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ACTIVITY_COMPLETED;
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ACTIVITY_COMPLETED : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  ACTIVITY_COMPLETED(::java::lang::String *);
-  ACTIVITY_COMPLETED();
-  ACTIVITY_COMPLETED(jint, ::org::omg::CORBA::CompletionStatus *);
-  ACTIVITY_COMPLETED(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 463786710302308798LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ACTIVITY_COMPLETED__
diff --git a/libjava/org/omg/CORBA/ACTIVITY_REQUIRED.h b/libjava/org/omg/CORBA/ACTIVITY_REQUIRED.h
deleted file mode 100644
index aea3081293d..00000000000
--- a/libjava/org/omg/CORBA/ACTIVITY_REQUIRED.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ACTIVITY_REQUIRED__
-#define __org_omg_CORBA_ACTIVITY_REQUIRED__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ACTIVITY_REQUIRED;
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ACTIVITY_REQUIRED : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  ACTIVITY_REQUIRED(::java::lang::String *);
-  ACTIVITY_REQUIRED();
-  ACTIVITY_REQUIRED(jint, ::org::omg::CORBA::CompletionStatus *);
-  ACTIVITY_REQUIRED(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -5684213471781455027LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ACTIVITY_REQUIRED__
diff --git a/libjava/org/omg/CORBA/ARG_IN.h b/libjava/org/omg/CORBA/ARG_IN.h
deleted file mode 100644
index 55d913b0db9..00000000000
--- a/libjava/org/omg/CORBA/ARG_IN.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ARG_IN__
-#define __org_omg_CORBA_ARG_IN__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ARG_IN;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ARG_IN : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_ARG_IN__
diff --git a/libjava/org/omg/CORBA/ARG_INOUT.h b/libjava/org/omg/CORBA/ARG_INOUT.h
deleted file mode 100644
index 31b2b664a26..00000000000
--- a/libjava/org/omg/CORBA/ARG_INOUT.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ARG_INOUT__
-#define __org_omg_CORBA_ARG_INOUT__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ARG_INOUT;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ARG_INOUT : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_ARG_INOUT__
diff --git a/libjava/org/omg/CORBA/ARG_OUT.h b/libjava/org/omg/CORBA/ARG_OUT.h
deleted file mode 100644
index aeaa6723370..00000000000
--- a/libjava/org/omg/CORBA/ARG_OUT.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ARG_OUT__
-#define __org_omg_CORBA_ARG_OUT__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ARG_OUT;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ARG_OUT : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_ARG_OUT__
diff --git a/libjava/org/omg/CORBA/Any.h b/libjava/org/omg/CORBA/Any.h
deleted file mode 100644
index 5abdbc0c12b..00000000000
--- a/libjava/org/omg/CORBA/Any.h
+++ /dev/null
@@ -1,103 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_Any__
-#define __org_omg_CORBA_Any__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class Principal;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class Streamable;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::Any : public ::java::lang::Object
-{
-
-public:
-  Any();
-  virtual ::org::omg::CORBA::portable::InputStream * create_input_stream() = 0;
-  virtual ::org::omg::CORBA::portable::OutputStream * create_output_stream() = 0;
-  virtual jboolean equal(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Object * extract_Object() = 0;
-  virtual ::org::omg::CORBA::Principal * extract_Principal();
-  virtual ::org::omg::CORBA::portable::Streamable * extract_Streamable();
-  virtual ::org::omg::CORBA::TypeCode * extract_TypeCode() = 0;
-  virtual ::java::io::Serializable * extract_Value() = 0;
-  virtual ::org::omg::CORBA::Any * extract_any() = 0;
-  virtual jboolean extract_boolean() = 0;
-  virtual jchar extract_char() = 0;
-  virtual jdouble extract_double() = 0;
-  virtual ::java::math::BigDecimal * extract_fixed();
-  virtual jfloat extract_float() = 0;
-  virtual jint extract_long() = 0;
-  virtual jlong extract_longlong() = 0;
-  virtual jbyte extract_octet() = 0;
-  virtual jshort extract_short() = 0;
-  virtual ::java::lang::String * extract_string() = 0;
-  virtual jint extract_ulong() = 0;
-  virtual jlong extract_ulonglong() = 0;
-  virtual jshort extract_ushort() = 0;
-  virtual jchar extract_wchar() = 0;
-  virtual ::java::lang::String * extract_wstring() = 0;
-  virtual void insert_Object(::org::omg::CORBA::Object *, ::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_Object(::org::omg::CORBA::Object *) = 0;
-  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 *) = 0;
-  virtual void insert_Value(::java::io::Serializable *, ::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_Value(::java::io::Serializable *) = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_fixed(::java::math::BigDecimal *, ::org::omg::CORBA::TypeCode *);
-  virtual void insert_fixed(::java::math::BigDecimal *);
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual void read_value(::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::TypeCode *) = 0;
-  virtual void type(::org::omg::CORBA::TypeCode *) = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void write_value(::org::omg::CORBA::portable::OutputStream *) = 0;
-private:
-  static const jlong serialVersionUID = 1217179597823814463LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_Any__
diff --git a/libjava/org/omg/CORBA/AnyHolder.h b/libjava/org/omg/CORBA/AnyHolder.h
deleted file mode 100644
index 9c5dacad5c6..00000000000
--- a/libjava/org/omg/CORBA/AnyHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_AnyHolder__
-#define __org_omg_CORBA_AnyHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class AnyHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::AnyHolder : public ::java::lang::Object
-{
-
-public:
-  AnyHolder();
-  AnyHolder(::org::omg::CORBA::Any *);
-  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_any;
-public:
-  ::org::omg::CORBA::Any * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_AnyHolder__
diff --git a/libjava/org/omg/CORBA/AnySeqHelper.h b/libjava/org/omg/CORBA/AnySeqHelper.h
deleted file mode 100644
index 4f77210f820..00000000000
--- a/libjava/org/omg/CORBA/AnySeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_AnySeqHelper__
-#define __org_omg_CORBA_AnySeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class AnySeqHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::AnySeqHelper : public ::java::lang::Object
-{
-
-public:
-  AnySeqHelper();
-  static JArray< ::org::omg::CORBA::Any * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::CORBA::Any * > *);
-  static JArray< ::org::omg::CORBA::Any * > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::CORBA::Any * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_AnySeqHelper__
diff --git a/libjava/org/omg/CORBA/AnySeqHolder.h b/libjava/org/omg/CORBA/AnySeqHolder.h
deleted file mode 100644
index 90702c285af..00000000000
--- a/libjava/org/omg/CORBA/AnySeqHolder.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_AnySeqHolder__
-#define __org_omg_CORBA_AnySeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class AnySeqHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::AnySeqHolder : public ::java::lang::Object
-{
-
-public:
-  AnySeqHolder();
-  AnySeqHolder(JArray< ::org::omg::CORBA::Any * > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< ::org::omg::CORBA::Any * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_AnySeqHolder__
diff --git a/libjava/org/omg/CORBA/BAD_CONTEXT.h b/libjava/org/omg/CORBA/BAD_CONTEXT.h
deleted file mode 100644
index f582be59dc8..00000000000
--- a/libjava/org/omg/CORBA/BAD_CONTEXT.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BAD_CONTEXT__
-#define __org_omg_CORBA_BAD_CONTEXT__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BAD_CONTEXT;
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BAD_CONTEXT : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  BAD_CONTEXT(::java::lang::String *);
-  BAD_CONTEXT();
-  BAD_CONTEXT(jint, ::org::omg::CORBA::CompletionStatus *);
-  BAD_CONTEXT(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -5025677944847478264LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_BAD_CONTEXT__
diff --git a/libjava/org/omg/CORBA/BAD_INV_ORDER.h b/libjava/org/omg/CORBA/BAD_INV_ORDER.h
deleted file mode 100644
index 8adb8015974..00000000000
--- a/libjava/org/omg/CORBA/BAD_INV_ORDER.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BAD_INV_ORDER__
-#define __org_omg_CORBA_BAD_INV_ORDER__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BAD_INV_ORDER;
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BAD_INV_ORDER : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  BAD_INV_ORDER(::java::lang::String *);
-  BAD_INV_ORDER();
-  BAD_INV_ORDER(jint, ::org::omg::CORBA::CompletionStatus *);
-  BAD_INV_ORDER(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 7273325995832240406LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_BAD_INV_ORDER__
diff --git a/libjava/org/omg/CORBA/BAD_OPERATION.h b/libjava/org/omg/CORBA/BAD_OPERATION.h
deleted file mode 100644
index 16b0214610b..00000000000
--- a/libjava/org/omg/CORBA/BAD_OPERATION.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BAD_OPERATION__
-#define __org_omg_CORBA_BAD_OPERATION__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BAD_OPERATION;
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BAD_OPERATION : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  BAD_OPERATION(::java::lang::String *);
-  BAD_OPERATION();
-  BAD_OPERATION(jint, ::org::omg::CORBA::CompletionStatus *);
-  BAD_OPERATION(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 1654621651720499682LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_BAD_OPERATION__
diff --git a/libjava/org/omg/CORBA/BAD_PARAM.h b/libjava/org/omg/CORBA/BAD_PARAM.h
deleted file mode 100644
index 8be70c2f0a9..00000000000
--- a/libjava/org/omg/CORBA/BAD_PARAM.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BAD_PARAM__
-#define __org_omg_CORBA_BAD_PARAM__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BAD_PARAM;
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BAD_PARAM : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  BAD_PARAM(::java::lang::String *);
-  BAD_PARAM();
-  BAD_PARAM(jint, ::org::omg::CORBA::CompletionStatus *);
-  BAD_PARAM(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 1917109334939470379LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_BAD_PARAM__
diff --git a/libjava/org/omg/CORBA/BAD_POLICY.h b/libjava/org/omg/CORBA/BAD_POLICY.h
deleted file mode 100644
index 400b7a8a3ce..00000000000
--- a/libjava/org/omg/CORBA/BAD_POLICY.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BAD_POLICY__
-#define __org_omg_CORBA_BAD_POLICY__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BAD_POLICY;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BAD_POLICY : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_BAD_POLICY__
diff --git a/libjava/org/omg/CORBA/BAD_POLICY_TYPE.h b/libjava/org/omg/CORBA/BAD_POLICY_TYPE.h
deleted file mode 100644
index 4234fcb278a..00000000000
--- a/libjava/org/omg/CORBA/BAD_POLICY_TYPE.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BAD_POLICY_TYPE__
-#define __org_omg_CORBA_BAD_POLICY_TYPE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BAD_POLICY_TYPE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BAD_POLICY_TYPE : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_BAD_POLICY_TYPE__
diff --git a/libjava/org/omg/CORBA/BAD_POLICY_VALUE.h b/libjava/org/omg/CORBA/BAD_POLICY_VALUE.h
deleted file mode 100644
index d41efcdc512..00000000000
--- a/libjava/org/omg/CORBA/BAD_POLICY_VALUE.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BAD_POLICY_VALUE__
-#define __org_omg_CORBA_BAD_POLICY_VALUE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BAD_POLICY_VALUE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BAD_POLICY_VALUE : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_BAD_POLICY_VALUE__
diff --git a/libjava/org/omg/CORBA/BAD_QOS.h b/libjava/org/omg/CORBA/BAD_QOS.h
deleted file mode 100644
index 44e354f9543..00000000000
--- a/libjava/org/omg/CORBA/BAD_QOS.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BAD_QOS__
-#define __org_omg_CORBA_BAD_QOS__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BAD_QOS;
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BAD_QOS : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  BAD_QOS(::java::lang::String *);
-  BAD_QOS();
-  BAD_QOS(jint, ::org::omg::CORBA::CompletionStatus *);
-  BAD_QOS(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 4746597571263117454LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_BAD_QOS__
diff --git a/libjava/org/omg/CORBA/BAD_TYPECODE.h b/libjava/org/omg/CORBA/BAD_TYPECODE.h
deleted file mode 100644
index 36e6bd814e0..00000000000
--- a/libjava/org/omg/CORBA/BAD_TYPECODE.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BAD_TYPECODE__
-#define __org_omg_CORBA_BAD_TYPECODE__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BAD_TYPECODE;
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BAD_TYPECODE : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  BAD_TYPECODE(::java::lang::String *);
-  BAD_TYPECODE();
-  BAD_TYPECODE(jint, ::org::omg::CORBA::CompletionStatus *);
-  BAD_TYPECODE(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 6193364410915696901LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_BAD_TYPECODE__
diff --git a/libjava/org/omg/CORBA/BooleanHolder.h b/libjava/org/omg/CORBA/BooleanHolder.h
deleted file mode 100644
index 3dc9cbe85db..00000000000
--- a/libjava/org/omg/CORBA/BooleanHolder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BooleanHolder__
-#define __org_omg_CORBA_BooleanHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BooleanHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BooleanHolder : public ::java::lang::Object
-{
-
-public:
-  BooleanHolder();
-  BooleanHolder(jboolean);
-  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_boolean;
-public:
-  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_BooleanHolder__
diff --git a/libjava/org/omg/CORBA/BooleanSeqHelper.h b/libjava/org/omg/CORBA/BooleanSeqHelper.h
deleted file mode 100644
index 1cb155934b7..00000000000
--- a/libjava/org/omg/CORBA/BooleanSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BooleanSeqHelper__
-#define __org_omg_CORBA_BooleanSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class BooleanSeqHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BooleanSeqHelper : public ::java::lang::Object
-{
-
-public:
-  BooleanSeqHelper();
-  static JArray< jboolean > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jboolean > *);
-  static JArray< jboolean > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jboolean > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_BooleanSeqHelper__
diff --git a/libjava/org/omg/CORBA/BooleanSeqHolder.h b/libjava/org/omg/CORBA/BooleanSeqHolder.h
deleted file mode 100644
index 54b15ab2b3f..00000000000
--- a/libjava/org/omg/CORBA/BooleanSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_BooleanSeqHolder__
-#define __org_omg_CORBA_BooleanSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class BooleanSeqHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::BooleanSeqHolder : public ::java::lang::Object
-{
-
-public:
-  BooleanSeqHolder();
-  BooleanSeqHolder(JArray< jboolean > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jboolean > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_BooleanSeqHolder__
diff --git a/libjava/org/omg/CORBA/Bounds.h b/libjava/org/omg/CORBA/Bounds.h
deleted file mode 100644
index 1a7ff407ecf..00000000000
--- a/libjava/org/omg/CORBA/Bounds.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_Bounds__
-#define __org_omg_CORBA_Bounds__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Bounds;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::Bounds : public ::org::omg::CORBA::UserException
-{
-
-public:
-  Bounds();
-  Bounds(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_Bounds__
diff --git a/libjava/org/omg/CORBA/ByteHolder.h b/libjava/org/omg/CORBA/ByteHolder.h
deleted file mode 100644
index ca90136beef..00000000000
--- a/libjava/org/omg/CORBA/ByteHolder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ByteHolder__
-#define __org_omg_CORBA_ByteHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ByteHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ByteHolder : public ::java::lang::Object
-{
-
-public:
-  ByteHolder();
-  ByteHolder(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 // __org_omg_CORBA_ByteHolder__
diff --git a/libjava/org/omg/CORBA/CODESET_INCOMPATIBLE.h b/libjava/org/omg/CORBA/CODESET_INCOMPATIBLE.h
deleted file mode 100644
index 9131a8b6b33..00000000000
--- a/libjava/org/omg/CORBA/CODESET_INCOMPATIBLE.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CODESET_INCOMPATIBLE__
-#define __org_omg_CORBA_CODESET_INCOMPATIBLE__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CODESET_INCOMPATIBLE;
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CODESET_INCOMPATIBLE : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  CODESET_INCOMPATIBLE(::java::lang::String *);
-  CODESET_INCOMPATIBLE();
-  CODESET_INCOMPATIBLE(jint, ::org::omg::CORBA::CompletionStatus *);
-  CODESET_INCOMPATIBLE(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -8784048396454171789LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_CODESET_INCOMPATIBLE__
diff --git a/libjava/org/omg/CORBA/COMM_FAILURE.h b/libjava/org/omg/CORBA/COMM_FAILURE.h
deleted file mode 100644
index 1ceb10d5ad4..00000000000
--- a/libjava/org/omg/CORBA/COMM_FAILURE.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_COMM_FAILURE__
-#define __org_omg_CORBA_COMM_FAILURE__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class COMM_FAILURE;
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::COMM_FAILURE : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  COMM_FAILURE(::java::lang::String *);
-  COMM_FAILURE();
-  COMM_FAILURE(jint, ::org::omg::CORBA::CompletionStatus *);
-  COMM_FAILURE(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 294856734784364267LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_COMM_FAILURE__
diff --git a/libjava/org/omg/CORBA/CTX_RESTRICT_SCOPE.h b/libjava/org/omg/CORBA/CTX_RESTRICT_SCOPE.h
deleted file mode 100644
index 1d58dc24801..00000000000
--- a/libjava/org/omg/CORBA/CTX_RESTRICT_SCOPE.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CTX_RESTRICT_SCOPE__
-#define __org_omg_CORBA_CTX_RESTRICT_SCOPE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CTX_RESTRICT_SCOPE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CTX_RESTRICT_SCOPE : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 15;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_CTX_RESTRICT_SCOPE__
diff --git a/libjava/org/omg/CORBA/CharHolder.h b/libjava/org/omg/CORBA/CharHolder.h
deleted file mode 100644
index 78a1e7e8fbf..00000000000
--- a/libjava/org/omg/CORBA/CharHolder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CharHolder__
-#define __org_omg_CORBA_CharHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CharHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CharHolder : public ::java::lang::Object
-{
-
-public:
-  CharHolder();
-  CharHolder(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 // __org_omg_CORBA_CharHolder__
diff --git a/libjava/org/omg/CORBA/CharSeqHelper.h b/libjava/org/omg/CORBA/CharSeqHelper.h
deleted file mode 100644
index b6e4bb67f3e..00000000000
--- a/libjava/org/omg/CORBA/CharSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CharSeqHelper__
-#define __org_omg_CORBA_CharSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class CharSeqHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CharSeqHelper : public ::java::lang::Object
-{
-
-public:
-  CharSeqHelper();
-  static JArray< jchar > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jchar > *);
-  static JArray< jchar > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jchar > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_CharSeqHelper__
diff --git a/libjava/org/omg/CORBA/CharSeqHolder.h b/libjava/org/omg/CORBA/CharSeqHolder.h
deleted file mode 100644
index b0dbd15ed57..00000000000
--- a/libjava/org/omg/CORBA/CharSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CharSeqHolder__
-#define __org_omg_CORBA_CharSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CharSeqHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CharSeqHolder : public ::java::lang::Object
-{
-
-public:
-  CharSeqHolder();
-  CharSeqHolder(JArray< jchar > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_CharSeqHolder__
diff --git a/libjava/org/omg/CORBA/CompletionStatus.h b/libjava/org/omg/CORBA/CompletionStatus.h
deleted file mode 100644
index f76b1a8e554..00000000000
--- a/libjava/org/omg/CORBA/CompletionStatus.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CompletionStatus__
-#define __org_omg_CORBA_CompletionStatus__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CompletionStatus : public ::java::lang::Object
-{
-
-  CompletionStatus(jint);
-public:
-  static ::org::omg::CORBA::CompletionStatus * from_int(jint);
-  ::java::lang::String * toString();
-  jint value();
-private:
-  static const jlong serialVersionUID = -9047319660881406859LL;
-public:
-  static const jint _COMPLETED_YES = 0;
-  static const jint _COMPLETED_NO = 1;
-  static const jint _COMPLETED_MAYBE = 2;
-  static ::org::omg::CORBA::CompletionStatus * COMPLETED_YES;
-  static ::org::omg::CORBA::CompletionStatus * COMPLETED_NO;
-  static ::org::omg::CORBA::CompletionStatus * COMPLETED_MAYBE;
-private:
-  static JArray< ::org::omg::CORBA::CompletionStatus * > * states;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_CompletionStatus__
diff --git a/libjava/org/omg/CORBA/CompletionStatusHelper.h b/libjava/org/omg/CORBA/CompletionStatusHelper.h
deleted file mode 100644
index 8255f067dda..00000000000
--- a/libjava/org/omg/CORBA/CompletionStatusHelper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CompletionStatusHelper__
-#define __org_omg_CORBA_CompletionStatusHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class CompletionStatus;
-          class CompletionStatusHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CompletionStatusHelper : public ::java::lang::Object
-{
-
-public:
-  CompletionStatusHelper();
-  static ::org::omg::CORBA::CompletionStatus * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::CompletionStatus *);
-  static ::org::omg::CORBA::CompletionStatus * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::CompletionStatus *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_CompletionStatusHelper__
diff --git a/libjava/org/omg/CORBA/Context.h b/libjava/org/omg/CORBA/Context.h
deleted file mode 100644
index d0ec3044c08..00000000000
--- a/libjava/org/omg/CORBA/Context.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_Context__
-#define __org_omg_CORBA_Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class NVList;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::Context : public ::java::lang::Object
-{
-
-public:
-  Context();
-  virtual ::java::lang::String * context_name() = 0;
-  virtual ::org::omg::CORBA::Context * create_child(::java::lang::String *) = 0;
-  virtual void delete_values(::java::lang::String *) = 0;
-  virtual ::org::omg::CORBA::NVList * get_values(::java::lang::String *, jint, ::java::lang::String *) = 0;
-  virtual ::org::omg::CORBA::Context * parent() = 0;
-  virtual void set_one_value(::java::lang::String *, ::org::omg::CORBA::Any *) = 0;
-  virtual void set_values(::org::omg::CORBA::NVList *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_Context__
diff --git a/libjava/org/omg/CORBA/ContextList.h b/libjava/org/omg/CORBA/ContextList.h
deleted file mode 100644
index 4b6c3e11028..00000000000
--- a/libjava/org/omg/CORBA/ContextList.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ContextList__
-#define __org_omg_CORBA_ContextList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ContextList;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ContextList : public ::java::lang::Object
-{
-
-public:
-  ContextList();
-  virtual void add(::java::lang::String *) = 0;
-  virtual jint count() = 0;
-  virtual ::java::lang::String * item(jint) = 0;
-  virtual void remove(jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ContextList__
diff --git a/libjava/org/omg/CORBA/Current.h b/libjava/org/omg/CORBA/Current.h
deleted file mode 100644
index 75fde138615..00000000000
--- a/libjava/org/omg/CORBA/Current.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_Current__
-#define __org_omg_CORBA_Current__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Context;
-          class ContextList;
-          class Current;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::Current : public ::java::lang::Object
-{
-
-public:
-  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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_Current__
diff --git a/libjava/org/omg/CORBA/CurrentHelper$_CurrentStub.h b/libjava/org/omg/CORBA/CurrentHelper$_CurrentStub.h
deleted file mode 100644
index bcfc438d474..00000000000
--- a/libjava/org/omg/CORBA/CurrentHelper$_CurrentStub.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CurrentHelper$_CurrentStub__
-#define __org_omg_CORBA_CurrentHelper$_CurrentStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CurrentHelper$_CurrentStub;
-        namespace portable
-        {
-            class Delegate;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CurrentHelper$_CurrentStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  CurrentHelper$_CurrentStub(::org::omg::CORBA::portable::Delegate *);
-  virtual JArray< ::java::lang::String * > * _ids();
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_CurrentHelper$_CurrentStub__
diff --git a/libjava/org/omg/CORBA/CurrentHelper.h b/libjava/org/omg/CORBA/CurrentHelper.h
deleted file mode 100644
index c698b0ee18a..00000000000
--- a/libjava/org/omg/CORBA/CurrentHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CurrentHelper__
-#define __org_omg_CORBA_CurrentHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Current;
-          class CurrentHelper;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CurrentHelper : public ::java::lang::Object
-{
-
-public:
-  CurrentHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::Current *);
-  static ::org::omg::CORBA::Current * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::Current * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::Current * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::Current *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_CurrentHelper__
diff --git a/libjava/org/omg/CORBA/CurrentHolder.h b/libjava/org/omg/CORBA/CurrentHolder.h
deleted file mode 100644
index 56f4c54532c..00000000000
--- a/libjava/org/omg/CORBA/CurrentHolder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CurrentHolder__
-#define __org_omg_CORBA_CurrentHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Current;
-          class CurrentHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CurrentHolder : public ::java::lang::Object
-{
-
-public:
-  CurrentHolder();
-  CurrentHolder(::org::omg::CORBA::Current *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::CORBA::Current * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_CurrentHolder__
diff --git a/libjava/org/omg/CORBA/CurrentOperations.h b/libjava/org/omg/CORBA/CurrentOperations.h
deleted file mode 100644
index 52931e26fa3..00000000000
--- a/libjava/org/omg/CORBA/CurrentOperations.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CurrentOperations__
-#define __org_omg_CORBA_CurrentOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CurrentOperations;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CurrentOperations : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_CurrentOperations__
diff --git a/libjava/org/omg/CORBA/CustomMarshal.h b/libjava/org/omg/CORBA/CustomMarshal.h
deleted file mode 100644
index a703b3fa4eb..00000000000
--- a/libjava/org/omg/CORBA/CustomMarshal.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CustomMarshal__
-#define __org_omg_CORBA_CustomMarshal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CustomMarshal;
-          class DataInputStream;
-          class DataOutputStream;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CustomMarshal : public ::java::lang::Object
-{
-
-public:
-  virtual void marshal(::org::omg::CORBA::DataOutputStream *) = 0;
-  virtual void unmarshal(::org::omg::CORBA::DataInputStream *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_CustomMarshal__
diff --git a/libjava/org/omg/CORBA/CustomValue.h b/libjava/org/omg/CORBA/CustomValue.h
deleted file mode 100644
index 8c3d485caaa..00000000000
--- a/libjava/org/omg/CORBA/CustomValue.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_CustomValue__
-#define __org_omg_CORBA_CustomValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CustomValue;
-          class DataInputStream;
-          class DataOutputStream;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::CustomValue : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::String * > * _truncatable_ids() = 0;
-  virtual void marshal(::org::omg::CORBA::DataOutputStream *) = 0;
-  virtual void unmarshal(::org::omg::CORBA::DataInputStream *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_CustomValue__
diff --git a/libjava/org/omg/CORBA/DATA_CONVERSION.h b/libjava/org/omg/CORBA/DATA_CONVERSION.h
deleted file mode 100644
index 2bcad19b96c..00000000000
--- a/libjava/org/omg/CORBA/DATA_CONVERSION.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DATA_CONVERSION__
-#define __org_omg_CORBA_DATA_CONVERSION__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class DATA_CONVERSION;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DATA_CONVERSION : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  DATA_CONVERSION(::java::lang::String *);
-  DATA_CONVERSION();
-  DATA_CONVERSION(jint, ::org::omg::CORBA::CompletionStatus *);
-  DATA_CONVERSION(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 1874869932271600956LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DATA_CONVERSION__
diff --git a/libjava/org/omg/CORBA/DataInputStream.h b/libjava/org/omg/CORBA/DataInputStream.h
deleted file mode 100644
index e62a9b57bd8..00000000000
--- a/libjava/org/omg/CORBA/DataInputStream.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DataInputStream__
-#define __org_omg_CORBA_DataInputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class AnySeqHolder;
-          class BooleanSeqHolder;
-          class CharSeqHolder;
-          class DataInputStream;
-          class DoubleSeqHolder;
-          class FloatSeqHolder;
-          class LongLongSeqHolder;
-          class LongSeqHolder;
-          class Object;
-          class OctetSeqHolder;
-          class ShortSeqHolder;
-          class TypeCode;
-          class ULongLongSeqHolder;
-          class ULongSeqHolder;
-          class UShortSeqHolder;
-          class WCharSeqHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DataInputStream : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Any * read_any() = 0;
-  virtual jboolean read_boolean() = 0;
-  virtual jchar read_char() = 0;
-  virtual jchar read_wchar() = 0;
-  virtual jbyte read_octet() = 0;
-  virtual jshort read_short() = 0;
-  virtual jshort read_ushort() = 0;
-  virtual jint read_long() = 0;
-  virtual jint read_ulong() = 0;
-  virtual jlong read_longlong() = 0;
-  virtual jlong read_ulonglong() = 0;
-  virtual jfloat read_float() = 0;
-  virtual jdouble read_double() = 0;
-  virtual ::java::lang::String * read_string() = 0;
-  virtual ::java::lang::String * read_wstring() = 0;
-  virtual ::org::omg::CORBA::Object * read_Object() = 0;
-  virtual ::java::lang::Object * read_Abstract() = 0;
-  virtual ::java::io::Serializable * read_Value() = 0;
-  virtual ::org::omg::CORBA::TypeCode * read_TypeCode() = 0;
-  virtual void read_any_array(::org::omg::CORBA::AnySeqHolder *, jint, jint) = 0;
-  virtual void read_boolean_array(::org::omg::CORBA::BooleanSeqHolder *, jint, jint) = 0;
-  virtual void read_char_array(::org::omg::CORBA::CharSeqHolder *, jint, jint) = 0;
-  virtual void read_wchar_array(::org::omg::CORBA::WCharSeqHolder *, jint, jint) = 0;
-  virtual void read_octet_array(::org::omg::CORBA::OctetSeqHolder *, jint, jint) = 0;
-  virtual void read_short_array(::org::omg::CORBA::ShortSeqHolder *, jint, jint) = 0;
-  virtual void read_ushort_array(::org::omg::CORBA::UShortSeqHolder *, jint, jint) = 0;
-  virtual void read_long_array(::org::omg::CORBA::LongSeqHolder *, jint, jint) = 0;
-  virtual void read_ulong_array(::org::omg::CORBA::ULongSeqHolder *, jint, jint) = 0;
-  virtual void read_ulonglong_array(::org::omg::CORBA::ULongLongSeqHolder *, jint, jint) = 0;
-  virtual void read_longlong_array(::org::omg::CORBA::LongLongSeqHolder *, jint, jint) = 0;
-  virtual void read_float_array(::org::omg::CORBA::FloatSeqHolder *, jint, jint) = 0;
-  virtual void read_double_array(::org::omg::CORBA::DoubleSeqHolder *, jint, jint) = 0;
-  virtual JArray< ::java::lang::String * > * _truncatable_ids() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DataInputStream__
diff --git a/libjava/org/omg/CORBA/DataOutputStream.h b/libjava/org/omg/CORBA/DataOutputStream.h
deleted file mode 100644
index 27022f33c7c..00000000000
--- a/libjava/org/omg/CORBA/DataOutputStream.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DataOutputStream__
-#define __org_omg_CORBA_DataOutputStream__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class DataOutputStream;
-          class Object;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DataOutputStream : public ::java::lang::Object
-{
-
-public:
-  virtual void write_any(::org::omg::CORBA::Any *) = 0;
-  virtual void write_boolean(jboolean) = 0;
-  virtual void write_char(jchar) = 0;
-  virtual void write_wchar(jchar) = 0;
-  virtual void write_octet(jbyte) = 0;
-  virtual void write_short(jshort) = 0;
-  virtual void write_ushort(jshort) = 0;
-  virtual void write_long(jint) = 0;
-  virtual void write_ulong(jint) = 0;
-  virtual void write_longlong(jlong) = 0;
-  virtual void write_ulonglong(jlong) = 0;
-  virtual void write_float(jfloat) = 0;
-  virtual void write_double(jdouble) = 0;
-  virtual void write_string(::java::lang::String *) = 0;
-  virtual void write_wstring(::java::lang::String *) = 0;
-  virtual void write_Object(::org::omg::CORBA::Object *) = 0;
-  virtual void write_Abstract(::java::lang::Object *) = 0;
-  virtual void write_Value(::java::io::Serializable *) = 0;
-  virtual void write_TypeCode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void write_any_array(JArray< ::org::omg::CORBA::Any * > *, jint, jint) = 0;
-  virtual void write_boolean_array(JArray< jboolean > *, jint, jint) = 0;
-  virtual void write_char_array(JArray< jchar > *, jint, jint) = 0;
-  virtual void write_wchar_array(JArray< jchar > *, jint, jint) = 0;
-  virtual void write_octet_array(JArray< jbyte > *, jint, jint) = 0;
-  virtual void write_short_array(JArray< jshort > *, jint, jint) = 0;
-  virtual void write_ushort_array(JArray< jshort > *, jint, jint) = 0;
-  virtual void write_long_array(JArray< jint > *, jint, jint) = 0;
-  virtual void write_ulong_array(JArray< jint > *, jint, jint) = 0;
-  virtual void write_ulonglong_array(JArray< jlong > *, jint, jint) = 0;
-  virtual void write_longlong_array(JArray< jlong > *, jint, jint) = 0;
-  virtual void write_float_array(JArray< jfloat > *, jint, jint) = 0;
-  virtual void write_double_array(JArray< jdouble > *, jint, jint) = 0;
-  virtual JArray< ::java::lang::String * > * _truncatable_ids() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DataOutputStream__
diff --git a/libjava/org/omg/CORBA/DefinitionKind.h b/libjava/org/omg/CORBA/DefinitionKind.h
deleted file mode 100644
index ca511531656..00000000000
--- a/libjava/org/omg/CORBA/DefinitionKind.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DefinitionKind__
-#define __org_omg_CORBA_DefinitionKind__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class DefinitionKind;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DefinitionKind : public ::java::lang::Object
-{
-
-public: // actually protected
-  DefinitionKind(jint);
-public:
-  virtual jint value();
-  static ::org::omg::CORBA::DefinitionKind * from_int(jint);
-private:
-  static void fill_table();
-  static const jlong serialVersionUID = -8601167576704143376LL;
-public:
-  static const jint _dk_none = 0;
-  static const jint _dk_all = 1;
-  static const jint _dk_Attribute = 2;
-  static const jint _dk_Constant = 3;
-  static const jint _dk_Exception = 4;
-  static const jint _dk_Interface = 5;
-  static const jint _dk_Module = 6;
-  static const jint _dk_Operation = 7;
-  static const jint _dk_Typedef = 8;
-  static const jint _dk_Alias = 9;
-  static const jint _dk_Struct = 10;
-  static const jint _dk_Union = 11;
-  static const jint _dk_Enum = 12;
-  static const jint _dk_Primitive = 13;
-  static const jint _dk_String = 14;
-  static const jint _dk_Sequence = 15;
-  static const jint _dk_Array = 16;
-  static const jint _dk_Repository = 17;
-  static const jint _dk_Wstring = 18;
-  static const jint _dk_Fixed = 19;
-  static const jint _dk_Value = 20;
-  static const jint _dk_ValueBox = 21;
-  static const jint _dk_ValueMember = 22;
-  static const jint _dk_Native = 23;
-  static const jint _dk_AbstractInterface = 24;
-  static ::org::omg::CORBA::DefinitionKind * dk_none;
-  static ::org::omg::CORBA::DefinitionKind * dk_all;
-  static ::org::omg::CORBA::DefinitionKind * dk_Attribute;
-  static ::org::omg::CORBA::DefinitionKind * dk_Constant;
-  static ::org::omg::CORBA::DefinitionKind * dk_Exception;
-  static ::org::omg::CORBA::DefinitionKind * dk_Interface;
-  static ::org::omg::CORBA::DefinitionKind * dk_Module;
-  static ::org::omg::CORBA::DefinitionKind * dk_Operation;
-  static ::org::omg::CORBA::DefinitionKind * dk_Typedef;
-  static ::org::omg::CORBA::DefinitionKind * dk_Alias;
-  static ::org::omg::CORBA::DefinitionKind * dk_Struct;
-  static ::org::omg::CORBA::DefinitionKind * dk_Union;
-  static ::org::omg::CORBA::DefinitionKind * dk_Enum;
-  static ::org::omg::CORBA::DefinitionKind * dk_Primitive;
-  static ::org::omg::CORBA::DefinitionKind * dk_String;
-  static ::org::omg::CORBA::DefinitionKind * dk_Sequence;
-  static ::org::omg::CORBA::DefinitionKind * dk_Array;
-  static ::org::omg::CORBA::DefinitionKind * dk_Repository;
-  static ::org::omg::CORBA::DefinitionKind * dk_Wstring;
-  static ::org::omg::CORBA::DefinitionKind * dk_Fixed;
-  static ::org::omg::CORBA::DefinitionKind * dk_Value;
-  static ::org::omg::CORBA::DefinitionKind * dk_ValueBox;
-  static ::org::omg::CORBA::DefinitionKind * dk_ValueMember;
-  static ::org::omg::CORBA::DefinitionKind * dk_Native;
-  static ::org::omg::CORBA::DefinitionKind * dk_AbstractInterface;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) kind;
-  static JArray< ::org::omg::CORBA::DefinitionKind * > * table;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DefinitionKind__
diff --git a/libjava/org/omg/CORBA/DefinitionKindHelper.h b/libjava/org/omg/CORBA/DefinitionKindHelper.h
deleted file mode 100644
index 8fdb6014b11..00000000000
--- a/libjava/org/omg/CORBA/DefinitionKindHelper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DefinitionKindHelper__
-#define __org_omg_CORBA_DefinitionKindHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class DefinitionKind;
-          class DefinitionKindHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DefinitionKindHelper : public ::java::lang::Object
-{
-
-public:
-  DefinitionKindHelper();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::DefinitionKind *);
-  static ::org::omg::CORBA::DefinitionKind * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::DefinitionKind * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::DefinitionKind *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DefinitionKindHelper__
diff --git a/libjava/org/omg/CORBA/DomainManager.h b/libjava/org/omg/CORBA/DomainManager.h
deleted file mode 100644
index 15d5e84348c..00000000000
--- a/libjava/org/omg/CORBA/DomainManager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DomainManager__
-#define __org_omg_CORBA_DomainManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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 org::omg::CORBA::DomainManager : public ::java::lang::Object
-{
-
-public:
-  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 * get_domain_policy(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DomainManager__
diff --git a/libjava/org/omg/CORBA/DomainManagerOperations.h b/libjava/org/omg/CORBA/DomainManagerOperations.h
deleted file mode 100644
index a75c1456823..00000000000
--- a/libjava/org/omg/CORBA/DomainManagerOperations.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DomainManagerOperations__
-#define __org_omg_CORBA_DomainManagerOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class DomainManagerOperations;
-          class Policy;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DomainManagerOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Policy * get_domain_policy(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DomainManagerOperations__
diff --git a/libjava/org/omg/CORBA/DoubleHolder.h b/libjava/org/omg/CORBA/DoubleHolder.h
deleted file mode 100644
index 8702c14bf9f..00000000000
--- a/libjava/org/omg/CORBA/DoubleHolder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DoubleHolder__
-#define __org_omg_CORBA_DoubleHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class DoubleHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DoubleHolder : public ::java::lang::Object
-{
-
-public:
-  DoubleHolder();
-  DoubleHolder(jdouble);
-  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_double;
-public:
-  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DoubleHolder__
diff --git a/libjava/org/omg/CORBA/DoubleSeqHelper.h b/libjava/org/omg/CORBA/DoubleSeqHelper.h
deleted file mode 100644
index 9a6aa080e89..00000000000
--- a/libjava/org/omg/CORBA/DoubleSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DoubleSeqHelper__
-#define __org_omg_CORBA_DoubleSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class DoubleSeqHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DoubleSeqHelper : public ::java::lang::Object
-{
-
-public:
-  DoubleSeqHelper();
-  static JArray< jdouble > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jdouble > *);
-  static JArray< jdouble > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jdouble > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DoubleSeqHelper__
diff --git a/libjava/org/omg/CORBA/DoubleSeqHolder.h b/libjava/org/omg/CORBA/DoubleSeqHolder.h
deleted file mode 100644
index ec2bc43eb26..00000000000
--- a/libjava/org/omg/CORBA/DoubleSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DoubleSeqHolder__
-#define __org_omg_CORBA_DoubleSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class DoubleSeqHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DoubleSeqHolder : public ::java::lang::Object
-{
-
-public:
-  DoubleSeqHolder();
-  DoubleSeqHolder(JArray< jdouble > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jdouble > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DoubleSeqHolder__
diff --git a/libjava/org/omg/CORBA/DynAny.h b/libjava/org/omg/CORBA/DynAny.h
deleted file mode 100644
index 2707f4b1cd3..00000000000
--- a/libjava/org/omg/CORBA/DynAny.h
+++ /dev/null
@@ -1,104 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynAny__
-#define __org_omg_CORBA_DynAny__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class DynAny;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynAny : public ::java::lang::Object
-{
-
-public:
-  virtual void assign(::org::omg::CORBA::DynAny *) = 0;
-  virtual ::org::omg::CORBA::DynAny * copy() = 0;
-  virtual ::org::omg::CORBA::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DynAny__
diff --git a/libjava/org/omg/CORBA/DynAnyPackage/Invalid.h b/libjava/org/omg/CORBA/DynAnyPackage/Invalid.h
deleted file mode 100644
index 1b12748c89f..00000000000
--- a/libjava/org/omg/CORBA/DynAnyPackage/Invalid.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynAnyPackage_Invalid__
-#define __org_omg_CORBA_DynAnyPackage_Invalid__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace DynAnyPackage
-        {
-            class Invalid;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynAnyPackage::Invalid : public ::org::omg::CORBA::UserException
-{
-
-public:
-  Invalid();
-  Invalid(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -8258194490767575588LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DynAnyPackage_Invalid__
diff --git a/libjava/org/omg/CORBA/DynAnyPackage/InvalidSeq.h b/libjava/org/omg/CORBA/DynAnyPackage/InvalidSeq.h
deleted file mode 100644
index c14980542fb..00000000000
--- a/libjava/org/omg/CORBA/DynAnyPackage/InvalidSeq.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynAnyPackage_InvalidSeq__
-#define __org_omg_CORBA_DynAnyPackage_InvalidSeq__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace DynAnyPackage
-        {
-            class InvalidSeq;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynAnyPackage::InvalidSeq : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InvalidSeq();
-  InvalidSeq(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5678460771857763522LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DynAnyPackage_InvalidSeq__
diff --git a/libjava/org/omg/CORBA/DynAnyPackage/InvalidValue.h b/libjava/org/omg/CORBA/DynAnyPackage/InvalidValue.h
deleted file mode 100644
index f33cf445ef2..00000000000
--- a/libjava/org/omg/CORBA/DynAnyPackage/InvalidValue.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynAnyPackage_InvalidValue__
-#define __org_omg_CORBA_DynAnyPackage_InvalidValue__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace DynAnyPackage
-        {
-            class InvalidValue;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynAnyPackage::InvalidValue : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InvalidValue();
-  InvalidValue(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4741963043279146697LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DynAnyPackage_InvalidValue__
diff --git a/libjava/org/omg/CORBA/DynAnyPackage/TypeMismatch.h b/libjava/org/omg/CORBA/DynAnyPackage/TypeMismatch.h
deleted file mode 100644
index 3ec8508745c..00000000000
--- a/libjava/org/omg/CORBA/DynAnyPackage/TypeMismatch.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynAnyPackage_TypeMismatch__
-#define __org_omg_CORBA_DynAnyPackage_TypeMismatch__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace DynAnyPackage
-        {
-            class TypeMismatch;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynAnyPackage::TypeMismatch : public ::org::omg::CORBA::UserException
-{
-
-public:
-  TypeMismatch();
-  TypeMismatch(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2763424591181102501LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DynAnyPackage_TypeMismatch__
diff --git a/libjava/org/omg/CORBA/DynArray.h b/libjava/org/omg/CORBA/DynArray.h
deleted file mode 100644
index d1df9cb3ff9..00000000000
--- a/libjava/org/omg/CORBA/DynArray.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynArray__
-#define __org_omg_CORBA_DynArray__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class DynAny;
-          class DynArray;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynArray : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::org::omg::CORBA::Any * > * get_elements() = 0;
-  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *) = 0;
-  virtual void assign(::org::omg::CORBA::DynAny *) = 0;
-  virtual ::org::omg::CORBA::DynAny * copy() = 0;
-  virtual ::org::omg::CORBA::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DynArray__
diff --git a/libjava/org/omg/CORBA/DynEnum.h b/libjava/org/omg/CORBA/DynEnum.h
deleted file mode 100644
index 675b2ef5f69..00000000000
--- a/libjava/org/omg/CORBA/DynEnum.h
+++ /dev/null
@@ -1,109 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynEnum__
-#define __org_omg_CORBA_DynEnum__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class DynAny;
-          class DynEnum;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynEnum : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * value_as_string() = 0;
-  virtual void value_as_string(::java::lang::String *) = 0;
-  virtual void value_as_ulong(jint) = 0;
-  virtual jint value_as_ulong() = 0;
-  virtual void assign(::org::omg::CORBA::DynAny *) = 0;
-  virtual ::org::omg::CORBA::DynAny * copy() = 0;
-  virtual ::org::omg::CORBA::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DynEnum__
diff --git a/libjava/org/omg/CORBA/DynFixed.h b/libjava/org/omg/CORBA/DynFixed.h
deleted file mode 100644
index 562e864abf5..00000000000
--- a/libjava/org/omg/CORBA/DynFixed.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynFixed__
-#define __org_omg_CORBA_DynFixed__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class DynAny;
-          class DynFixed;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynFixed : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * get_value() = 0;
-  virtual void set_value(JArray< jbyte > *) = 0;
-  virtual void assign(::org::omg::CORBA::DynAny *) = 0;
-  virtual ::org::omg::CORBA::DynAny * copy() = 0;
-  virtual ::org::omg::CORBA::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DynFixed__
diff --git a/libjava/org/omg/CORBA/DynSequence.h b/libjava/org/omg/CORBA/DynSequence.h
deleted file mode 100644
index 3a4e213ccee..00000000000
--- a/libjava/org/omg/CORBA/DynSequence.h
+++ /dev/null
@@ -1,109 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynSequence__
-#define __org_omg_CORBA_DynSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class DynAny;
-          class DynSequence;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynSequence : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::org::omg::CORBA::Any * > * get_elements() = 0;
-  virtual jint length() = 0;
-  virtual void length(jint) = 0;
-  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *) = 0;
-  virtual void assign(::org::omg::CORBA::DynAny *) = 0;
-  virtual ::org::omg::CORBA::DynAny * copy() = 0;
-  virtual ::org::omg::CORBA::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DynSequence__
diff --git a/libjava/org/omg/CORBA/DynStruct.h b/libjava/org/omg/CORBA/DynStruct.h
deleted file mode 100644
index 8efb8f57a74..00000000000
--- a/libjava/org/omg/CORBA/DynStruct.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynStruct__
-#define __org_omg_CORBA_DynStruct__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class DynAny;
-          class DynStruct;
-          class ExceptionList;
-          class NVList;
-          class NameValuePair;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TCKind;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynStruct : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::TCKind * current_member_kind() = 0;
-  virtual ::java::lang::String * current_member_name() = 0;
-  virtual JArray< ::org::omg::CORBA::NameValuePair * > * get_members() = 0;
-  virtual void set_members(JArray< ::org::omg::CORBA::NameValuePair * > *) = 0;
-  virtual void assign(::org::omg::CORBA::DynAny *) = 0;
-  virtual ::org::omg::CORBA::DynAny * copy() = 0;
-  virtual ::org::omg::CORBA::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DynStruct__
diff --git a/libjava/org/omg/CORBA/DynUnion.h b/libjava/org/omg/CORBA/DynUnion.h
deleted file mode 100644
index aab7859c225..00000000000
--- a/libjava/org/omg/CORBA/DynUnion.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynUnion__
-#define __org_omg_CORBA_DynUnion__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class DynAny;
-          class DynUnion;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TCKind;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynUnion : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::DynAny * discriminator() = 0;
-  virtual ::org::omg::CORBA::TCKind * discriminator_kind() = 0;
-  virtual ::org::omg::CORBA::DynAny * member() = 0;
-  virtual ::org::omg::CORBA::TCKind * member_kind() = 0;
-  virtual ::java::lang::String * member_name() = 0;
-  virtual void member_name(::java::lang::String *) = 0;
-  virtual jboolean set_as_default() = 0;
-  virtual void set_as_default(jboolean) = 0;
-  virtual void assign(::org::omg::CORBA::DynAny *) = 0;
-  virtual ::org::omg::CORBA::DynAny * copy() = 0;
-  virtual ::org::omg::CORBA::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DynUnion__
diff --git a/libjava/org/omg/CORBA/DynValue.h b/libjava/org/omg/CORBA/DynValue.h
deleted file mode 100644
index 5efccc5afaf..00000000000
--- a/libjava/org/omg/CORBA/DynValue.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynValue__
-#define __org_omg_CORBA_DynValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class DynAny;
-          class DynValue;
-          class ExceptionList;
-          class NVList;
-          class NameValuePair;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TCKind;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynValue : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::TCKind * current_member_kind() = 0;
-  virtual ::java::lang::String * current_member_name() = 0;
-  virtual JArray< ::org::omg::CORBA::NameValuePair * > * get_members() = 0;
-  virtual void set_members(JArray< ::org::omg::CORBA::NameValuePair * > *) = 0;
-  virtual void assign(::org::omg::CORBA::DynAny *) = 0;
-  virtual ::org::omg::CORBA::DynAny * copy() = 0;
-  virtual ::org::omg::CORBA::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_DynValue__
diff --git a/libjava/org/omg/CORBA/DynamicImplementation.h b/libjava/org/omg/CORBA/DynamicImplementation.h
deleted file mode 100644
index 9cf77584e3a..00000000000
--- a/libjava/org/omg/CORBA/DynamicImplementation.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_DynamicImplementation__
-#define __org_omg_CORBA_DynamicImplementation__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class DynamicImplementation;
-          class ServerRequest;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::DynamicImplementation : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  DynamicImplementation();
-  virtual void invoke(::org::omg::CORBA::ServerRequest *);
-  virtual JArray< ::java::lang::String * > * _ids();
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_DynamicImplementation__
diff --git a/libjava/org/omg/CORBA/Environment.h b/libjava/org/omg/CORBA/Environment.h
deleted file mode 100644
index 07fb343a6ae..00000000000
--- a/libjava/org/omg/CORBA/Environment.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_Environment__
-#define __org_omg_CORBA_Environment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Environment;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::Environment : public ::java::lang::Object
-{
-
-public:
-  Environment();
-  virtual void clear() = 0;
-  virtual ::java::lang::Exception * exception() = 0;
-  virtual void exception(::java::lang::Exception *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_Environment__
diff --git a/libjava/org/omg/CORBA/ExceptionList.h b/libjava/org/omg/CORBA/ExceptionList.h
deleted file mode 100644
index acb5eb953c7..00000000000
--- a/libjava/org/omg/CORBA/ExceptionList.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ExceptionList__
-#define __org_omg_CORBA_ExceptionList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ExceptionList;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ExceptionList : public ::java::lang::Object
-{
-
-public:
-  ExceptionList();
-  virtual void add(::org::omg::CORBA::TypeCode *) = 0;
-  virtual jint count() = 0;
-  virtual ::org::omg::CORBA::TypeCode * item(jint) = 0;
-  virtual void remove(jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ExceptionList__
diff --git a/libjava/org/omg/CORBA/FREE_MEM.h b/libjava/org/omg/CORBA/FREE_MEM.h
deleted file mode 100644
index c3b29b9d21e..00000000000
--- a/libjava/org/omg/CORBA/FREE_MEM.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_FREE_MEM__
-#define __org_omg_CORBA_FREE_MEM__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class FREE_MEM;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::FREE_MEM : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  FREE_MEM(::java::lang::String *);
-  FREE_MEM();
-  FREE_MEM(jint, ::org::omg::CORBA::CompletionStatus *);
-  FREE_MEM(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -1333559476995791982LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_FREE_MEM__
diff --git a/libjava/org/omg/CORBA/FieldNameHelper.h b/libjava/org/omg/CORBA/FieldNameHelper.h
deleted file mode 100644
index a5ef219f43d..00000000000
--- a/libjava/org/omg/CORBA/FieldNameHelper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_FieldNameHelper__
-#define __org_omg_CORBA_FieldNameHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class FieldNameHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::FieldNameHelper : public ::java::lang::Object
-{
-
-public:
-  FieldNameHelper();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_FieldNameHelper__
diff --git a/libjava/org/omg/CORBA/FixedHolder.h b/libjava/org/omg/CORBA/FixedHolder.h
deleted file mode 100644
index 53bfe0a24d6..00000000000
--- a/libjava/org/omg/CORBA/FixedHolder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_FixedHolder__
-#define __org_omg_CORBA_FixedHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class FixedHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::FixedHolder : public ::java::lang::Object
-{
-
-public:
-  FixedHolder();
-  FixedHolder(::java::math::BigDecimal *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::java::math::BigDecimal * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_FixedHolder__
diff --git a/libjava/org/omg/CORBA/FloatHolder.h b/libjava/org/omg/CORBA/FloatHolder.h
deleted file mode 100644
index fba02c579aa..00000000000
--- a/libjava/org/omg/CORBA/FloatHolder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_FloatHolder__
-#define __org_omg_CORBA_FloatHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class FloatHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::FloatHolder : public ::java::lang::Object
-{
-
-public:
-  FloatHolder();
-  FloatHolder(jfloat);
-  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_float;
-public:
-  jfloat __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_FloatHolder__
diff --git a/libjava/org/omg/CORBA/FloatSeqHelper.h b/libjava/org/omg/CORBA/FloatSeqHelper.h
deleted file mode 100644
index 87b84cc8df0..00000000000
--- a/libjava/org/omg/CORBA/FloatSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_FloatSeqHelper__
-#define __org_omg_CORBA_FloatSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class FloatSeqHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::FloatSeqHelper : public ::java::lang::Object
-{
-
-public:
-  FloatSeqHelper();
-  static JArray< jfloat > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jfloat > *);
-  static JArray< jfloat > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jfloat > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_FloatSeqHelper__
diff --git a/libjava/org/omg/CORBA/FloatSeqHolder.h b/libjava/org/omg/CORBA/FloatSeqHolder.h
deleted file mode 100644
index e138c917948..00000000000
--- a/libjava/org/omg/CORBA/FloatSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_FloatSeqHolder__
-#define __org_omg_CORBA_FloatSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class FloatSeqHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::FloatSeqHolder : public ::java::lang::Object
-{
-
-public:
-  FloatSeqHolder();
-  FloatSeqHolder(JArray< jfloat > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jfloat > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_FloatSeqHolder__
diff --git a/libjava/org/omg/CORBA/IDLType.h b/libjava/org/omg/CORBA/IDLType.h
deleted file mode 100644
index 8dab0acf383..00000000000
--- a/libjava/org/omg/CORBA/IDLType.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_IDLType__
-#define __org_omg_CORBA_IDLType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Context;
-          class ContextList;
-          class DefinitionKind;
-          class DomainManager;
-          class ExceptionList;
-          class IDLType;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::IDLType : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual ::org::omg::CORBA::DefinitionKind * def_kind() = 0;
-  virtual void destroy() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_IDLType__
diff --git a/libjava/org/omg/CORBA/IDLTypeHelper.h b/libjava/org/omg/CORBA/IDLTypeHelper.h
deleted file mode 100644
index 43540f2820b..00000000000
--- a/libjava/org/omg/CORBA/IDLTypeHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_IDLTypeHelper__
-#define __org_omg_CORBA_IDLTypeHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class IDLType;
-          class IDLTypeHelper;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::IDLTypeHelper : public ::java::lang::Object
-{
-
-public:
-  IDLTypeHelper();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::IDLType *);
-  static ::org::omg::CORBA::IDLType * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::IDLType * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::IDLType *);
-  static ::org::omg::CORBA::IDLType * narrow(::org::omg::CORBA::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_IDLTypeHelper__
diff --git a/libjava/org/omg/CORBA/IDLTypeOperations.h b/libjava/org/omg/CORBA/IDLTypeOperations.h
deleted file mode 100644
index 1f03591b7ac..00000000000
--- a/libjava/org/omg/CORBA/IDLTypeOperations.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_IDLTypeOperations__
-#define __org_omg_CORBA_IDLTypeOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class DefinitionKind;
-          class IDLTypeOperations;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::IDLTypeOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual ::org::omg::CORBA::DefinitionKind * def_kind() = 0;
-  virtual void destroy() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_IDLTypeOperations__
diff --git a/libjava/org/omg/CORBA/IMP_LIMIT.h b/libjava/org/omg/CORBA/IMP_LIMIT.h
deleted file mode 100644
index 25247634ead..00000000000
--- a/libjava/org/omg/CORBA/IMP_LIMIT.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_IMP_LIMIT__
-#define __org_omg_CORBA_IMP_LIMIT__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class IMP_LIMIT;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::IMP_LIMIT : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  IMP_LIMIT(::java::lang::String *);
-  IMP_LIMIT();
-  IMP_LIMIT(jint, ::org::omg::CORBA::CompletionStatus *);
-  IMP_LIMIT(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -8086463494577448422LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_IMP_LIMIT__
diff --git a/libjava/org/omg/CORBA/INITIALIZE.h b/libjava/org/omg/CORBA/INITIALIZE.h
deleted file mode 100644
index 6c0a1d01bb4..00000000000
--- a/libjava/org/omg/CORBA/INITIALIZE.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_INITIALIZE__
-#define __org_omg_CORBA_INITIALIZE__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class INITIALIZE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::INITIALIZE : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  INITIALIZE(::java::lang::String *);
-  INITIALIZE();
-  INITIALIZE(jint, ::org::omg::CORBA::CompletionStatus *);
-  INITIALIZE(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -3753094599663690309LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_INITIALIZE__
diff --git a/libjava/org/omg/CORBA/INTERNAL.h b/libjava/org/omg/CORBA/INTERNAL.h
deleted file mode 100644
index c006324f966..00000000000
--- a/libjava/org/omg/CORBA/INTERNAL.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_INTERNAL__
-#define __org_omg_CORBA_INTERNAL__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class INTERNAL;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::INTERNAL : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  INTERNAL(::java::lang::String *);
-  INTERNAL();
-  INTERNAL(jint, ::org::omg::CORBA::CompletionStatus *);
-  INTERNAL(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 3771336866139357605LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_INTERNAL__
diff --git a/libjava/org/omg/CORBA/INTF_REPOS.h b/libjava/org/omg/CORBA/INTF_REPOS.h
deleted file mode 100644
index bdc34cd627a..00000000000
--- a/libjava/org/omg/CORBA/INTF_REPOS.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_INTF_REPOS__
-#define __org_omg_CORBA_INTF_REPOS__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class INTF_REPOS;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::INTF_REPOS : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  INTF_REPOS(::java::lang::String *);
-  INTF_REPOS();
-  INTF_REPOS(jint, ::org::omg::CORBA::CompletionStatus *);
-  INTF_REPOS(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 722572694720671863LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_INTF_REPOS__
diff --git a/libjava/org/omg/CORBA/INVALID_ACTIVITY.h b/libjava/org/omg/CORBA/INVALID_ACTIVITY.h
deleted file mode 100644
index 025a111d62d..00000000000
--- a/libjava/org/omg/CORBA/INVALID_ACTIVITY.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_INVALID_ACTIVITY__
-#define __org_omg_CORBA_INVALID_ACTIVITY__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class INVALID_ACTIVITY;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::INVALID_ACTIVITY : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  INVALID_ACTIVITY(::java::lang::String *);
-  INVALID_ACTIVITY();
-  INVALID_ACTIVITY(jint, ::org::omg::CORBA::CompletionStatus *);
-  INVALID_ACTIVITY(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 7907846629733712546LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_INVALID_ACTIVITY__
diff --git a/libjava/org/omg/CORBA/INVALID_TRANSACTION.h b/libjava/org/omg/CORBA/INVALID_TRANSACTION.h
deleted file mode 100644
index 6f4dbd95d61..00000000000
--- a/libjava/org/omg/CORBA/INVALID_TRANSACTION.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_INVALID_TRANSACTION__
-#define __org_omg_CORBA_INVALID_TRANSACTION__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class INVALID_TRANSACTION;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::INVALID_TRANSACTION : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  INVALID_TRANSACTION(::java::lang::String *);
-  INVALID_TRANSACTION();
-  INVALID_TRANSACTION(jint, ::org::omg::CORBA::CompletionStatus *);
-  INVALID_TRANSACTION(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -4265126403821571697LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_INVALID_TRANSACTION__
diff --git a/libjava/org/omg/CORBA/INV_FLAG.h b/libjava/org/omg/CORBA/INV_FLAG.h
deleted file mode 100644
index 2d8edbd9647..00000000000
--- a/libjava/org/omg/CORBA/INV_FLAG.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_INV_FLAG__
-#define __org_omg_CORBA_INV_FLAG__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class INV_FLAG;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::INV_FLAG : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  INV_FLAG(::java::lang::String *);
-  INV_FLAG();
-  INV_FLAG(jint, ::org::omg::CORBA::CompletionStatus *);
-  INV_FLAG(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -4863924749863817671LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_INV_FLAG__
diff --git a/libjava/org/omg/CORBA/INV_IDENT.h b/libjava/org/omg/CORBA/INV_IDENT.h
deleted file mode 100644
index 94c03dad127..00000000000
--- a/libjava/org/omg/CORBA/INV_IDENT.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_INV_IDENT__
-#define __org_omg_CORBA_INV_IDENT__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class INV_IDENT;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::INV_IDENT : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  INV_IDENT(::java::lang::String *);
-  INV_IDENT();
-  INV_IDENT(jint, ::org::omg::CORBA::CompletionStatus *);
-  INV_IDENT(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 4399295047946553530LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_INV_IDENT__
diff --git a/libjava/org/omg/CORBA/INV_OBJREF.h b/libjava/org/omg/CORBA/INV_OBJREF.h
deleted file mode 100644
index 069d9e06808..00000000000
--- a/libjava/org/omg/CORBA/INV_OBJREF.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_INV_OBJREF__
-#define __org_omg_CORBA_INV_OBJREF__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class INV_OBJREF;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::INV_OBJREF : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  INV_OBJREF(::java::lang::String *);
-  INV_OBJREF();
-  INV_OBJREF(jint, ::org::omg::CORBA::CompletionStatus *);
-  INV_OBJREF(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -7238811948257685034LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_INV_OBJREF__
diff --git a/libjava/org/omg/CORBA/INV_POLICY.h b/libjava/org/omg/CORBA/INV_POLICY.h
deleted file mode 100644
index de455608fd0..00000000000
--- a/libjava/org/omg/CORBA/INV_POLICY.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_INV_POLICY__
-#define __org_omg_CORBA_INV_POLICY__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class INV_POLICY;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::INV_POLICY : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  INV_POLICY(::java::lang::String *);
-  INV_POLICY();
-  INV_POLICY(jint, ::org::omg::CORBA::CompletionStatus *);
-  INV_POLICY(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -7823113107689030975LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_INV_POLICY__
diff --git a/libjava/org/omg/CORBA/IRObject.h b/libjava/org/omg/CORBA/IRObject.h
deleted file mode 100644
index 8f1102ebcc8..00000000000
--- a/libjava/org/omg/CORBA/IRObject.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_IRObject__
-#define __org_omg_CORBA_IRObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Context;
-          class ContextList;
-          class DefinitionKind;
-          class DomainManager;
-          class ExceptionList;
-          class IRObject;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::IRObject : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::DefinitionKind * def_kind() = 0;
-  virtual void destroy() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_IRObject__
diff --git a/libjava/org/omg/CORBA/IRObjectOperations.h b/libjava/org/omg/CORBA/IRObjectOperations.h
deleted file mode 100644
index d2e4f4cbe3f..00000000000
--- a/libjava/org/omg/CORBA/IRObjectOperations.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_IRObjectOperations__
-#define __org_omg_CORBA_IRObjectOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class DefinitionKind;
-          class IRObjectOperations;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::IRObjectOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::DefinitionKind * def_kind() = 0;
-  virtual void destroy() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_IRObjectOperations__
diff --git a/libjava/org/omg/CORBA/IdentifierHelper.h b/libjava/org/omg/CORBA/IdentifierHelper.h
deleted file mode 100644
index 5495b844a78..00000000000
--- a/libjava/org/omg/CORBA/IdentifierHelper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_IdentifierHelper__
-#define __org_omg_CORBA_IdentifierHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class IdentifierHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::IdentifierHelper : public ::java::lang::Object
-{
-
-public:
-  IdentifierHelper();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_IdentifierHelper__
diff --git a/libjava/org/omg/CORBA/IntHolder.h b/libjava/org/omg/CORBA/IntHolder.h
deleted file mode 100644
index fc85869dec6..00000000000
--- a/libjava/org/omg/CORBA/IntHolder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_IntHolder__
-#define __org_omg_CORBA_IntHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class IntHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::IntHolder : public ::java::lang::Object
-{
-
-public:
-  IntHolder();
-  IntHolder(jint);
-  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_long;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_IntHolder__
diff --git a/libjava/org/omg/CORBA/LocalObject.h b/libjava/org/omg/CORBA/LocalObject.h
deleted file mode 100644
index 27666d4f18c..00000000000
--- a/libjava/org/omg/CORBA/LocalObject.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_LocalObject__
-#define __org_omg_CORBA_LocalObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class LocalObject;
-          class NVList;
-          class NamedValue;
-          class ORB;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ServantObject;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::LocalObject : public ::java::lang::Object
-{
-
-public:
-  LocalObject();
-  virtual ::org::omg::CORBA::Request * _create_request(::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::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();
-  virtual JArray< ::org::omg::CORBA::DomainManager * > * _get_domain_managers();
-  virtual ::org::omg::CORBA::Object * _get_interface_def();
-  virtual ::org::omg::CORBA::Object * _get_interface();
-  virtual ::org::omg::CORBA::Policy * _get_policy(jint);
-  virtual jint _hash(jint);
-  virtual jboolean _is_a(::java::lang::String *);
-  virtual jboolean _is_equivalent(::org::omg::CORBA::Object *);
-  virtual jboolean _non_existent();
-  virtual void _release();
-  virtual ::org::omg::CORBA::Request * _request(::java::lang::String *);
-  virtual ::org::omg::CORBA::Object * _set_policy_override(JArray< ::org::omg::CORBA::Policy * > *, ::org::omg::CORBA::SetOverrideType *);
-  virtual ::org::omg::CORBA::portable::ServantObject * _servant_preinvoke(::java::lang::String *, ::java::lang::Class *);
-  virtual void _servant_postinvoke(::org::omg::CORBA::portable::ServantObject *);
-  virtual ::org::omg::CORBA::portable::InputStream * _invoke(::org::omg::CORBA::portable::OutputStream *);
-  virtual jboolean _is_local();
-  virtual ::org::omg::CORBA::ORB * _orb();
-  virtual void _releaseReply(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::portable::OutputStream * _request(::java::lang::String *, jboolean);
-  virtual jboolean validate_connection();
-private:
-  static ::java::lang::String * INAPPROPRIATE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_LocalObject__
diff --git a/libjava/org/omg/CORBA/LongHolder.h b/libjava/org/omg/CORBA/LongHolder.h
deleted file mode 100644
index 6fd5311b06c..00000000000
--- a/libjava/org/omg/CORBA/LongHolder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_LongHolder__
-#define __org_omg_CORBA_LongHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class LongHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::LongHolder : public ::java::lang::Object
-{
-
-public:
-  LongHolder();
-  LongHolder(jlong);
-  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_longlong;
-public:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_LongHolder__
diff --git a/libjava/org/omg/CORBA/LongLongSeqHelper.h b/libjava/org/omg/CORBA/LongLongSeqHelper.h
deleted file mode 100644
index 5430e67fbaa..00000000000
--- a/libjava/org/omg/CORBA/LongLongSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_LongLongSeqHelper__
-#define __org_omg_CORBA_LongLongSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class LongLongSeqHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::LongLongSeqHelper : public ::java::lang::Object
-{
-
-public:
-  LongLongSeqHelper();
-  static JArray< jlong > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jlong > *);
-  static JArray< jlong > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jlong > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_LongLongSeqHelper__
diff --git a/libjava/org/omg/CORBA/LongLongSeqHolder.h b/libjava/org/omg/CORBA/LongLongSeqHolder.h
deleted file mode 100644
index d0ba6ca2edf..00000000000
--- a/libjava/org/omg/CORBA/LongLongSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_LongLongSeqHolder__
-#define __org_omg_CORBA_LongLongSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class LongLongSeqHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::LongLongSeqHolder : public ::java::lang::Object
-{
-
-public:
-  LongLongSeqHolder();
-  LongLongSeqHolder(JArray< jlong > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jlong > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_LongLongSeqHolder__
diff --git a/libjava/org/omg/CORBA/LongSeqHelper.h b/libjava/org/omg/CORBA/LongSeqHelper.h
deleted file mode 100644
index 63dbf9d022b..00000000000
--- a/libjava/org/omg/CORBA/LongSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_LongSeqHelper__
-#define __org_omg_CORBA_LongSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class LongSeqHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::LongSeqHelper : public ::java::lang::Object
-{
-
-public:
-  LongSeqHelper();
-  static JArray< jint > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jint > *);
-  static JArray< jint > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jint > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_LongSeqHelper__
diff --git a/libjava/org/omg/CORBA/LongSeqHolder.h b/libjava/org/omg/CORBA/LongSeqHolder.h
deleted file mode 100644
index 92dc019db28..00000000000
--- a/libjava/org/omg/CORBA/LongSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_LongSeqHolder__
-#define __org_omg_CORBA_LongSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class LongSeqHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::LongSeqHolder : public ::java::lang::Object
-{
-
-public:
-  LongSeqHolder();
-  LongSeqHolder(JArray< jint > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) typecode;
-public:
-  JArray< jint > * value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_LongSeqHolder__
diff --git a/libjava/org/omg/CORBA/MARSHAL.h b/libjava/org/omg/CORBA/MARSHAL.h
deleted file mode 100644
index 75516cbbb66..00000000000
--- a/libjava/org/omg/CORBA/MARSHAL.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_MARSHAL__
-#define __org_omg_CORBA_MARSHAL__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class MARSHAL;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::MARSHAL : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  MARSHAL(::java::lang::String *);
-  MARSHAL();
-  MARSHAL(jint, ::org::omg::CORBA::CompletionStatus *);
-  MARSHAL(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 7416408250336395546LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_MARSHAL__
diff --git a/libjava/org/omg/CORBA/NO_IMPLEMENT.h b/libjava/org/omg/CORBA/NO_IMPLEMENT.h
deleted file mode 100644
index c4a0273c647..00000000000
--- a/libjava/org/omg/CORBA/NO_IMPLEMENT.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_NO_IMPLEMENT__
-#define __org_omg_CORBA_NO_IMPLEMENT__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class NO_IMPLEMENT;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::NO_IMPLEMENT : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  NO_IMPLEMENT(::java::lang::String *);
-  NO_IMPLEMENT();
-  NO_IMPLEMENT(jint, ::org::omg::CORBA::CompletionStatus *);
-  NO_IMPLEMENT(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 3519190655657192112LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_NO_IMPLEMENT__
diff --git a/libjava/org/omg/CORBA/NO_MEMORY.h b/libjava/org/omg/CORBA/NO_MEMORY.h
deleted file mode 100644
index ce8f3f00d7b..00000000000
--- a/libjava/org/omg/CORBA/NO_MEMORY.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_NO_MEMORY__
-#define __org_omg_CORBA_NO_MEMORY__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class NO_MEMORY;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::NO_MEMORY : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  NO_MEMORY(::java::lang::String *);
-  NO_MEMORY();
-  NO_MEMORY(jint, ::org::omg::CORBA::CompletionStatus *);
-  NO_MEMORY(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -4591569617929689285LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_NO_MEMORY__
diff --git a/libjava/org/omg/CORBA/NO_PERMISSION.h b/libjava/org/omg/CORBA/NO_PERMISSION.h
deleted file mode 100644
index 1f2bea8a336..00000000000
--- a/libjava/org/omg/CORBA/NO_PERMISSION.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_NO_PERMISSION__
-#define __org_omg_CORBA_NO_PERMISSION__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class NO_PERMISSION;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::NO_PERMISSION : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  NO_PERMISSION(::java::lang::String *);
-  NO_PERMISSION();
-  NO_PERMISSION(jint, ::org::omg::CORBA::CompletionStatus *);
-  NO_PERMISSION(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -1533969523582458479LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_NO_PERMISSION__
diff --git a/libjava/org/omg/CORBA/NO_RESOURCES.h b/libjava/org/omg/CORBA/NO_RESOURCES.h
deleted file mode 100644
index 92daec581dc..00000000000
--- a/libjava/org/omg/CORBA/NO_RESOURCES.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_NO_RESOURCES__
-#define __org_omg_CORBA_NO_RESOURCES__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class NO_RESOURCES;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::NO_RESOURCES : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  NO_RESOURCES(::java::lang::String *);
-  NO_RESOURCES();
-  NO_RESOURCES(jint, ::org::omg::CORBA::CompletionStatus *);
-  NO_RESOURCES(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 8129246118235803597LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_NO_RESOURCES__
diff --git a/libjava/org/omg/CORBA/NO_RESPONSE.h b/libjava/org/omg/CORBA/NO_RESPONSE.h
deleted file mode 100644
index eef00cc123c..00000000000
--- a/libjava/org/omg/CORBA/NO_RESPONSE.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_NO_RESPONSE__
-#define __org_omg_CORBA_NO_RESPONSE__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class NO_RESPONSE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::NO_RESPONSE : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  NO_RESPONSE(::java::lang::String *);
-  NO_RESPONSE();
-  NO_RESPONSE(jint, ::org::omg::CORBA::CompletionStatus *);
-  NO_RESPONSE(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 1971973765161647047LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_NO_RESPONSE__
diff --git a/libjava/org/omg/CORBA/NVList.h b/libjava/org/omg/CORBA/NVList.h
deleted file mode 100644
index ec886d8192c..00000000000
--- a/libjava/org/omg/CORBA/NVList.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_NVList__
-#define __org_omg_CORBA_NVList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class NVList;
-          class NamedValue;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::NVList : public ::java::lang::Object
-{
-
-public:
-  NVList();
-  virtual ::org::omg::CORBA::NamedValue * add(jint) = 0;
-  virtual ::org::omg::CORBA::NamedValue * add_item(::java::lang::String *, jint) = 0;
-  virtual ::org::omg::CORBA::NamedValue * add_value(::java::lang::String *, ::org::omg::CORBA::Any *, jint) = 0;
-  virtual jint count() = 0;
-  virtual ::org::omg::CORBA::NamedValue * item(jint) = 0;
-  virtual void remove(jint) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_NVList__
diff --git a/libjava/org/omg/CORBA/NameValuePair.h b/libjava/org/omg/CORBA/NameValuePair.h
deleted file mode 100644
index b2f1034e8ce..00000000000
--- a/libjava/org/omg/CORBA/NameValuePair.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_NameValuePair__
-#define __org_omg_CORBA_NameValuePair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::NameValuePair : public ::java::lang::Object
-{
-
-public:
-  NameValuePair();
-  NameValuePair(::java::lang::String *, ::org::omg::CORBA::Any *);
-  ::org::omg::CORBA::Any * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  static const jlong serialVersionUID = 7000741877654946223LL;
-public:
-  ::java::lang::String * id;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_NameValuePair__
diff --git a/libjava/org/omg/CORBA/NameValuePairHelper.h b/libjava/org/omg/CORBA/NameValuePairHelper.h
deleted file mode 100644
index 12b688eb57f..00000000000
--- a/libjava/org/omg/CORBA/NameValuePairHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_NameValuePairHelper__
-#define __org_omg_CORBA_NameValuePairHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class NameValuePair;
-          class NameValuePairHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::NameValuePairHelper : public ::java::lang::Object
-{
-
-public:
-  NameValuePairHelper();
-  static ::org::omg::CORBA::NameValuePair * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::NameValuePair *);
-  static ::org::omg::CORBA::NameValuePair * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::NameValuePair *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_NameValuePairHelper__
diff --git a/libjava/org/omg/CORBA/NamedValue.h b/libjava/org/omg/CORBA/NamedValue.h
deleted file mode 100644
index f3debeb410b..00000000000
--- a/libjava/org/omg/CORBA/NamedValue.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_NamedValue__
-#define __org_omg_CORBA_NamedValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class NamedValue;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::NamedValue : public ::java::lang::Object
-{
-
-public:
-  NamedValue();
-  virtual jint flags() = 0;
-  virtual ::java::lang::String * name() = 0;
-  virtual ::org::omg::CORBA::Any * value() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_NamedValue__
diff --git a/libjava/org/omg/CORBA/OBJECT_NOT_EXIST.h b/libjava/org/omg/CORBA/OBJECT_NOT_EXIST.h
deleted file mode 100644
index 34c170a0d27..00000000000
--- a/libjava/org/omg/CORBA/OBJECT_NOT_EXIST.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_OBJECT_NOT_EXIST__
-#define __org_omg_CORBA_OBJECT_NOT_EXIST__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class OBJECT_NOT_EXIST;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::OBJECT_NOT_EXIST : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  OBJECT_NOT_EXIST(::java::lang::String *);
-  OBJECT_NOT_EXIST();
-  OBJECT_NOT_EXIST(jint, ::org::omg::CORBA::CompletionStatus *);
-  OBJECT_NOT_EXIST(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 7226958015420512389LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_OBJECT_NOT_EXIST__
diff --git a/libjava/org/omg/CORBA/OBJ_ADAPTER.h b/libjava/org/omg/CORBA/OBJ_ADAPTER.h
deleted file mode 100644
index 81888d8ac08..00000000000
--- a/libjava/org/omg/CORBA/OBJ_ADAPTER.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_OBJ_ADAPTER__
-#define __org_omg_CORBA_OBJ_ADAPTER__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class OBJ_ADAPTER;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::OBJ_ADAPTER : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  OBJ_ADAPTER(::java::lang::String *);
-  OBJ_ADAPTER();
-  OBJ_ADAPTER(jint, ::org::omg::CORBA::CompletionStatus *);
-  OBJ_ADAPTER(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -1516541344234786928LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_OBJ_ADAPTER__
diff --git a/libjava/org/omg/CORBA/OMGVMCID.h b/libjava/org/omg/CORBA/OMGVMCID.h
deleted file mode 100644
index 1ee33c5d225..00000000000
--- a/libjava/org/omg/CORBA/OMGVMCID.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_OMGVMCID__
-#define __org_omg_CORBA_OMGVMCID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class OMGVMCID;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::OMGVMCID : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 1330446336;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_OMGVMCID__
diff --git a/libjava/org/omg/CORBA/ORB.h b/libjava/org/omg/CORBA/ORB.h
deleted file mode 100644
index f1489339278..00000000000
--- a/libjava/org/omg/CORBA/ORB.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ORB__
-#define __org_omg_CORBA_ORB__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace applet
-    {
-        class Applet;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class Current;
-          class DynAny;
-          class DynArray;
-          class DynEnum;
-          class DynSequence;
-          class DynStruct;
-          class DynUnion;
-          class Environment;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class ORB;
-          class Object;
-          class Policy;
-          class Request;
-          class ServiceInformationHolder;
-          class StructMember;
-          class TCKind;
-          class TypeCode;
-          class UnionMember;
-          class ValueMember;
-        namespace portable
-        {
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ORB : public ::java::lang::Object
-{
-
-public:
-  ORB();
-  virtual void connect(::org::omg::CORBA::Object *);
-  virtual void disconnect(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::TypeCode * create_recursive_sequence_tc(jint, jint) = 0;
-  virtual ::org::omg::CORBA::TypeCode * create_alias_tc(::java::lang::String *, ::java::lang::String *, ::org::omg::CORBA::TypeCode *) = 0;
-  virtual ::org::omg::CORBA::Any * create_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * create_array_tc(jint, ::org::omg::CORBA::TypeCode *) = 0;
-  virtual ::org::omg::CORBA::ContextList * create_context_list() = 0;
-  virtual ::org::omg::CORBA::DynAny * create_basic_dyn_any(::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::DynAny * create_dyn_any(::org::omg::CORBA::Any *);
-  virtual ::org::omg::CORBA::DynArray * create_dyn_array(::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::DynEnum * create_dyn_enum(::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::DynSequence * create_dyn_sequence(::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::DynStruct * create_dyn_struct(::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::DynUnion * create_dyn_union(::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::TypeCode * create_enum_tc(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *) = 0;
-  virtual ::org::omg::CORBA::Environment * create_environment() = 0;
-  virtual ::org::omg::CORBA::ExceptionList * create_exception_list() = 0;
-  virtual ::org::omg::CORBA::TypeCode * create_exception_tc(::java::lang::String *, ::java::lang::String *, JArray< ::org::omg::CORBA::StructMember * > *) = 0;
-  virtual ::org::omg::CORBA::TypeCode * create_fixed_tc(jshort, jshort);
-  virtual ::org::omg::CORBA::TypeCode * create_interface_tc(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::omg::CORBA::NVList * create_list(jint) = 0;
-  virtual ::org::omg::CORBA::NamedValue * create_named_value(::java::lang::String *, ::org::omg::CORBA::Any *, jint) = 0;
-  virtual void send_multiple_requests_oneway(JArray< ::org::omg::CORBA::Request * > *) = 0;
-  virtual void send_multiple_requests_deferred(JArray< ::org::omg::CORBA::Request * > *) = 0;
-  virtual jboolean poll_next_response() = 0;
-  virtual ::org::omg::CORBA::Request * get_next_response() = 0;
-  virtual ::org::omg::CORBA::portable::OutputStream * create_output_stream() = 0;
-  virtual ::org::omg::CORBA::NVList * create_operation_list(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::Policy * create_policy(jint, ::org::omg::CORBA::Any *);
-  virtual ::org::omg::CORBA::TypeCode * create_sequence_tc(jint, ::org::omg::CORBA::TypeCode *) = 0;
-  virtual ::org::omg::CORBA::TypeCode * create_string_tc(jint) = 0;
-  virtual ::org::omg::CORBA::TypeCode * create_struct_tc(::java::lang::String *, ::java::lang::String *, JArray< ::org::omg::CORBA::StructMember * > *) = 0;
-  virtual ::org::omg::CORBA::TypeCode * create_union_tc(::java::lang::String *, ::java::lang::String *, ::org::omg::CORBA::TypeCode *, JArray< ::org::omg::CORBA::UnionMember * > *) = 0;
-  virtual ::org::omg::CORBA::TypeCode * create_wstring_tc(jint) = 0;
-  virtual ::org::omg::CORBA::TypeCode * create_abstract_interface_tc(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::omg::CORBA::TypeCode * create_native_tc(::java::lang::String *, ::java::lang::String *);
-  virtual ::org::omg::CORBA::TypeCode * create_recursive_tc(::java::lang::String *);
-  virtual ::org::omg::CORBA::TypeCode * create_value_box_tc(::java::lang::String *, ::java::lang::String *, ::org::omg::CORBA::TypeCode *);
-  virtual ::org::omg::CORBA::TypeCode * create_value_tc(::java::lang::String *, ::java::lang::String *, jshort, ::org::omg::CORBA::TypeCode *, JArray< ::org::omg::CORBA::ValueMember * > *);
-  virtual ::org::omg::CORBA::Current * get_current();
-  virtual jboolean get_service_information(jshort, ::org::omg::CORBA::ServiceInformationHolder *);
-  virtual ::org::omg::CORBA::Context * get_default_context() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_primitive_tc(::org::omg::CORBA::TCKind *) = 0;
-  static ::org::omg::CORBA::ORB * init();
-  static ::org::omg::CORBA::ORB * init(::java::applet::Applet *, ::java::util::Properties *);
-  static ::org::omg::CORBA::ORB * init(JArray< ::java::lang::String * > *, ::java::util::Properties *);
-  virtual JArray< ::java::lang::String * > * list_initial_services() = 0;
-  virtual ::org::omg::CORBA::Object * resolve_initial_references(::java::lang::String *) = 0;
-  virtual ::java::lang::String * object_to_string(::org::omg::CORBA::Object *) = 0;
-  virtual void perform_work();
-  virtual jboolean work_pending();
-  virtual ::org::omg::CORBA::Object * string_to_object(::java::lang::String *) = 0;
-  virtual void run();
-  virtual void shutdown(jboolean);
-  virtual void destroy();
-public: // actually protected
-  virtual void set_parameters(JArray< ::java::lang::String * > *, ::java::util::Properties *) = 0;
-  virtual void set_parameters(::java::applet::Applet *, ::java::util::Properties *) = 0;
-private:
-  static ::java::lang::String * getCumulatedProperty(::java::util::Properties *, ::java::lang::String *);
-  static ::java::lang::String * checkFile(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  static ::org::omg::CORBA::ORB * createORB(::java::util::Properties *, ::java::lang::String *);
-  static void noORB(::java::lang::String *, ::java::lang::Throwable *);
-  static ::java::lang::String * FUNCTIONAL_ORB;
-  static ::java::lang::String * RESTRICTED_ORB;
-  static ::java::lang::String * LISTENER_PORT;
-  static ::java::lang::String * DEFAULT_FUNCTIONAL_ORB;
-  static ::java::lang::String * DEFAULT_FOCUSED_ORB;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ORB__
diff --git a/libjava/org/omg/CORBA/ORBPackage/InconsistentTypeCode.h b/libjava/org/omg/CORBA/ORBPackage/InconsistentTypeCode.h
deleted file mode 100644
index a3689a98148..00000000000
--- a/libjava/org/omg/CORBA/ORBPackage/InconsistentTypeCode.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ORBPackage_InconsistentTypeCode__
-#define __org_omg_CORBA_ORBPackage_InconsistentTypeCode__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace ORBPackage
-        {
-            class InconsistentTypeCode;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ORBPackage::InconsistentTypeCode : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InconsistentTypeCode();
-  InconsistentTypeCode(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4393472660722667060LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ORBPackage_InconsistentTypeCode__
diff --git a/libjava/org/omg/CORBA/ORBPackage/InvalidName.h b/libjava/org/omg/CORBA/ORBPackage/InvalidName.h
deleted file mode 100644
index 2565926650a..00000000000
--- a/libjava/org/omg/CORBA/ORBPackage/InvalidName.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ORBPackage_InvalidName__
-#define __org_omg_CORBA_ORBPackage_InvalidName__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace ORBPackage
-        {
-            class InvalidName;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ORBPackage::InvalidName : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InvalidName();
-  InvalidName(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6635923991559230168LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ORBPackage_InvalidName__
diff --git a/libjava/org/omg/CORBA/Object.h b/libjava/org/omg/CORBA/Object.h
deleted file mode 100644
index 10bde6e2a79..00000000000
--- a/libjava/org/omg/CORBA/Object.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_Object__
-#define __org_omg_CORBA_Object__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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 org::omg::CORBA::Object : public ::java::lang::Object
-{
-
-public:
-  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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_Object__
diff --git a/libjava/org/omg/CORBA/ObjectHelper.h b/libjava/org/omg/CORBA/ObjectHelper.h
deleted file mode 100644
index 05a80299817..00000000000
--- a/libjava/org/omg/CORBA/ObjectHelper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ObjectHelper__
-#define __org_omg_CORBA_ObjectHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class ObjectHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ObjectHelper : public ::java::lang::Object
-{
-
-public:
-  ObjectHelper();
-  static ::org::omg::CORBA::Object * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::Object * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ObjectHelper__
diff --git a/libjava/org/omg/CORBA/ObjectHolder.h b/libjava/org/omg/CORBA/ObjectHolder.h
deleted file mode 100644
index 47093d004c8..00000000000
--- a/libjava/org/omg/CORBA/ObjectHolder.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ObjectHolder__
-#define __org_omg_CORBA_ObjectHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class RecordTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-          class ObjectHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ObjectHolder : public ::java::lang::Object
-{
-
-public:
-  ObjectHolder();
-  ObjectHolder(::org::omg::CORBA::Object *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-private:
-  static ::gnu::CORBA::typecodes::RecordTypeCode * t_object;
-public:
-  ::org::omg::CORBA::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ObjectHolder__
diff --git a/libjava/org/omg/CORBA/OctetSeqHelper.h b/libjava/org/omg/CORBA/OctetSeqHelper.h
deleted file mode 100644
index 6a2bd46118f..00000000000
--- a/libjava/org/omg/CORBA/OctetSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_OctetSeqHelper__
-#define __org_omg_CORBA_OctetSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class OctetSeqHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::OctetSeqHelper : public ::java::lang::Object
-{
-
-public:
-  OctetSeqHelper();
-  static JArray< jbyte > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jbyte > *);
-  static JArray< jbyte > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_OctetSeqHelper__
diff --git a/libjava/org/omg/CORBA/OctetSeqHolder.h b/libjava/org/omg/CORBA/OctetSeqHolder.h
deleted file mode 100644
index 4f053fe7258..00000000000
--- a/libjava/org/omg/CORBA/OctetSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_OctetSeqHolder__
-#define __org_omg_CORBA_OctetSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class OctetSeqHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::OctetSeqHolder : public ::java::lang::Object
-{
-
-public:
-  OctetSeqHolder();
-  OctetSeqHolder(JArray< jbyte > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_OctetSeqHolder__
diff --git a/libjava/org/omg/CORBA/PERSIST_STORE.h b/libjava/org/omg/CORBA/PERSIST_STORE.h
deleted file mode 100644
index 0b21ec953d1..00000000000
--- a/libjava/org/omg/CORBA/PERSIST_STORE.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PERSIST_STORE__
-#define __org_omg_CORBA_PERSIST_STORE__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class PERSIST_STORE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PERSIST_STORE : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  PERSIST_STORE(::java::lang::String *);
-  PERSIST_STORE();
-  PERSIST_STORE(jint, ::org::omg::CORBA::CompletionStatus *);
-  PERSIST_STORE(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -6835478548864681965LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PERSIST_STORE__
diff --git a/libjava/org/omg/CORBA/PRIVATE_MEMBER.h b/libjava/org/omg/CORBA/PRIVATE_MEMBER.h
deleted file mode 100644
index 047f012e035..00000000000
--- a/libjava/org/omg/CORBA/PRIVATE_MEMBER.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PRIVATE_MEMBER__
-#define __org_omg_CORBA_PRIVATE_MEMBER__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class PRIVATE_MEMBER;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PRIVATE_MEMBER : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_PRIVATE_MEMBER__
diff --git a/libjava/org/omg/CORBA/PUBLIC_MEMBER.h b/libjava/org/omg/CORBA/PUBLIC_MEMBER.h
deleted file mode 100644
index a549730f7cb..00000000000
--- a/libjava/org/omg/CORBA/PUBLIC_MEMBER.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PUBLIC_MEMBER__
-#define __org_omg_CORBA_PUBLIC_MEMBER__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class PUBLIC_MEMBER;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PUBLIC_MEMBER : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_PUBLIC_MEMBER__
diff --git a/libjava/org/omg/CORBA/ParameterMode.h b/libjava/org/omg/CORBA/ParameterMode.h
deleted file mode 100644
index 92457814d6d..00000000000
--- a/libjava/org/omg/CORBA/ParameterMode.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ParameterMode__
-#define __org_omg_CORBA_ParameterMode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ParameterMode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ParameterMode : public ::java::lang::Object
-{
-
-public: // actually protected
-  ParameterMode(jint);
-public:
-  virtual jint value();
-  static ::org::omg::CORBA::ParameterMode * from_int(jint);
-private:
-  static const jlong serialVersionUID = 1521598391932998229LL;
-public:
-  static const jint _PARAM_IN = 0;
-  static const jint _PARAM_OUT = 1;
-  static const jint _PARAM_INOUT = 2;
-  static ::org::omg::CORBA::ParameterMode * PARAM_IN;
-  static ::org::omg::CORBA::ParameterMode * PARAM_OUT;
-  static ::org::omg::CORBA::ParameterMode * PARAM_INOUT;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value__;
-  static JArray< ::org::omg::CORBA::ParameterMode * > * table;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ParameterMode__
diff --git a/libjava/org/omg/CORBA/ParameterModeHelper.h b/libjava/org/omg/CORBA/ParameterModeHelper.h
deleted file mode 100644
index 74d723b1bae..00000000000
--- a/libjava/org/omg/CORBA/ParameterModeHelper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ParameterModeHelper__
-#define __org_omg_CORBA_ParameterModeHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ParameterMode;
-          class ParameterModeHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ParameterModeHelper : public ::java::lang::Object
-{
-
-public:
-  ParameterModeHelper();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::ParameterMode *);
-  static ::org::omg::CORBA::ParameterMode * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::ParameterMode * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::ParameterMode *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ParameterModeHelper__
diff --git a/libjava/org/omg/CORBA/ParameterModeHolder.h b/libjava/org/omg/CORBA/ParameterModeHolder.h
deleted file mode 100644
index 5d8186f1ccb..00000000000
--- a/libjava/org/omg/CORBA/ParameterModeHolder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ParameterModeHolder__
-#define __org_omg_CORBA_ParameterModeHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ParameterMode;
-          class ParameterModeHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ParameterModeHolder : public ::java::lang::Object
-{
-
-public:
-  ParameterModeHolder();
-  ParameterModeHolder(::org::omg::CORBA::ParameterMode *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::ParameterMode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ParameterModeHolder__
diff --git a/libjava/org/omg/CORBA/Policy.h b/libjava/org/omg/CORBA/Policy.h
deleted file mode 100644
index 49f2b44fb5b..00000000000
--- a/libjava/org/omg/CORBA/Policy.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_Policy__
-#define __org_omg_CORBA_Policy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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 org::omg::CORBA::Policy : public ::java::lang::Object
-{
-
-public:
-  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 // __org_omg_CORBA_Policy__
diff --git a/libjava/org/omg/CORBA/PolicyError.h b/libjava/org/omg/CORBA/PolicyError.h
deleted file mode 100644
index 1948a84813f..00000000000
--- a/libjava/org/omg/CORBA/PolicyError.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PolicyError__
-#define __org_omg_CORBA_PolicyError__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class PolicyError;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PolicyError : public ::org::omg::CORBA::UserException
-{
-
-public:
-  PolicyError();
-  PolicyError(jshort);
-  PolicyError(::java::lang::String *, jshort);
-  jshort __attribute__((aligned(__alignof__( ::org::omg::CORBA::UserException)))) reason;
-private:
-  static const jlong serialVersionUID = -9196809779974700103LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PolicyError__
diff --git a/libjava/org/omg/CORBA/PolicyErrorCodeHelper.h b/libjava/org/omg/CORBA/PolicyErrorCodeHelper.h
deleted file mode 100644
index 817d39dd7e8..00000000000
--- a/libjava/org/omg/CORBA/PolicyErrorCodeHelper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PolicyErrorCodeHelper__
-#define __org_omg_CORBA_PolicyErrorCodeHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class PolicyErrorCodeHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PolicyErrorCodeHelper : public ::java::lang::Object
-{
-
-public:
-  PolicyErrorCodeHelper();
-  static jshort extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, jshort);
-  static jshort read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, jshort);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PolicyErrorCodeHelper__
diff --git a/libjava/org/omg/CORBA/PolicyErrorHelper.h b/libjava/org/omg/CORBA/PolicyErrorHelper.h
deleted file mode 100644
index dadfb37646e..00000000000
--- a/libjava/org/omg/CORBA/PolicyErrorHelper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PolicyErrorHelper__
-#define __org_omg_CORBA_PolicyErrorHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class PolicyError;
-          class PolicyErrorHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PolicyErrorHelper : public ::java::lang::Object
-{
-
-public:
-  PolicyErrorHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::PolicyError *);
-  static ::org::omg::CORBA::PolicyError * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::PolicyError * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::PolicyError *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PolicyErrorHelper__
diff --git a/libjava/org/omg/CORBA/PolicyErrorHolder.h b/libjava/org/omg/CORBA/PolicyErrorHolder.h
deleted file mode 100644
index 14823502727..00000000000
--- a/libjava/org/omg/CORBA/PolicyErrorHolder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PolicyErrorHolder__
-#define __org_omg_CORBA_PolicyErrorHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class PolicyError;
-          class PolicyErrorHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PolicyErrorHolder : public ::java::lang::Object
-{
-
-public:
-  PolicyErrorHolder();
-  PolicyErrorHolder(::org::omg::CORBA::PolicyError *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::CORBA::PolicyError * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PolicyErrorHolder__
diff --git a/libjava/org/omg/CORBA/PolicyHelper.h b/libjava/org/omg/CORBA/PolicyHelper.h
deleted file mode 100644
index 440e575966d..00000000000
--- a/libjava/org/omg/CORBA/PolicyHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PolicyHelper__
-#define __org_omg_CORBA_PolicyHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class Policy;
-          class PolicyHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PolicyHelper : public ::java::lang::Object
-{
-
-public:
-  PolicyHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::Policy *);
-  static ::org::omg::CORBA::Policy * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::Policy * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::Policy * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::Policy *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PolicyHelper__
diff --git a/libjava/org/omg/CORBA/PolicyHolder.h b/libjava/org/omg/CORBA/PolicyHolder.h
deleted file mode 100644
index 3e9f6cfdd59..00000000000
--- a/libjava/org/omg/CORBA/PolicyHolder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PolicyHolder__
-#define __org_omg_CORBA_PolicyHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-          class PolicyHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PolicyHolder : public ::java::lang::Object
-{
-
-public:
-  PolicyHolder();
-  PolicyHolder(::org::omg::CORBA::Policy *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::CORBA::Policy * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PolicyHolder__
diff --git a/libjava/org/omg/CORBA/PolicyListHelper.h b/libjava/org/omg/CORBA/PolicyListHelper.h
deleted file mode 100644
index a18369e9cd0..00000000000
--- a/libjava/org/omg/CORBA/PolicyListHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PolicyListHelper__
-#define __org_omg_CORBA_PolicyListHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Policy;
-          class PolicyListHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PolicyListHelper : public ::java::lang::Object
-{
-
-public:
-  PolicyListHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::CORBA::Policy * > *);
-  static JArray< ::org::omg::CORBA::Policy * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static JArray< ::org::omg::CORBA::Policy * > * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::CORBA::Policy * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PolicyListHelper__
diff --git a/libjava/org/omg/CORBA/PolicyListHolder.h b/libjava/org/omg/CORBA/PolicyListHolder.h
deleted file mode 100644
index 375ced89b56..00000000000
--- a/libjava/org/omg/CORBA/PolicyListHolder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PolicyListHolder__
-#define __org_omg_CORBA_PolicyListHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-          class PolicyListHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PolicyListHolder : public ::java::lang::Object
-{
-
-public:
-  PolicyListHolder();
-  PolicyListHolder(JArray< ::org::omg::CORBA::Policy * > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  JArray< ::org::omg::CORBA::Policy * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PolicyListHolder__
diff --git a/libjava/org/omg/CORBA/PolicyOperations.h b/libjava/org/omg/CORBA/PolicyOperations.h
deleted file mode 100644
index b27bc9cf9c4..00000000000
--- a/libjava/org/omg/CORBA/PolicyOperations.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PolicyOperations__
-#define __org_omg_CORBA_PolicyOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-          class PolicyOperations;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PolicyOperations : public ::java::lang::Object
-{
-
-public:
-  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 // __org_omg_CORBA_PolicyOperations__
diff --git a/libjava/org/omg/CORBA/PolicyTypeHelper.h b/libjava/org/omg/CORBA/PolicyTypeHelper.h
deleted file mode 100644
index 25868513ccc..00000000000
--- a/libjava/org/omg/CORBA/PolicyTypeHelper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PolicyTypeHelper__
-#define __org_omg_CORBA_PolicyTypeHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class PolicyTypeHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PolicyTypeHelper : public ::java::lang::Object
-{
-
-public:
-  PolicyTypeHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, jint);
-  static jint extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static jint read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PolicyTypeHelper__
diff --git a/libjava/org/omg/CORBA/Principal.h b/libjava/org/omg/CORBA/Principal.h
deleted file mode 100644
index 52c71503d92..00000000000
--- a/libjava/org/omg/CORBA/Principal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_Principal__
-#define __org_omg_CORBA_Principal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Principal;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::Principal : public ::java::lang::Object
-{
-
-public:
-  Principal();
-  virtual JArray< jbyte > * name();
-  virtual void name(JArray< jbyte > *);
-private:
-  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) m_name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_Principal__
diff --git a/libjava/org/omg/CORBA/PrincipalHolder.h b/libjava/org/omg/CORBA/PrincipalHolder.h
deleted file mode 100644
index 5919dae464e..00000000000
--- a/libjava/org/omg/CORBA/PrincipalHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_PrincipalHolder__
-#define __org_omg_CORBA_PrincipalHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Principal;
-          class PrincipalHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::PrincipalHolder : public ::java::lang::Object
-{
-
-public:
-  PrincipalHolder();
-  PrincipalHolder(::org::omg::CORBA::Principal *);
-  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_any;
-public:
-  ::org::omg::CORBA::Principal * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_PrincipalHolder__
diff --git a/libjava/org/omg/CORBA/REBIND.h b/libjava/org/omg/CORBA/REBIND.h
deleted file mode 100644
index 43606046ba2..00000000000
--- a/libjava/org/omg/CORBA/REBIND.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_REBIND__
-#define __org_omg_CORBA_REBIND__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class REBIND;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::REBIND : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  REBIND(::java::lang::String *);
-  REBIND();
-  REBIND(jint, ::org::omg::CORBA::CompletionStatus *);
-  REBIND(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 823920851143467547LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_REBIND__
diff --git a/libjava/org/omg/CORBA/RepositoryIdHelper.h b/libjava/org/omg/CORBA/RepositoryIdHelper.h
deleted file mode 100644
index 1d351e6d656..00000000000
--- a/libjava/org/omg/CORBA/RepositoryIdHelper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_RepositoryIdHelper__
-#define __org_omg_CORBA_RepositoryIdHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class RepositoryIdHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::RepositoryIdHelper : public ::java::lang::Object
-{
-
-public:
-  RepositoryIdHelper();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_RepositoryIdHelper__
diff --git a/libjava/org/omg/CORBA/Request.h b/libjava/org/omg/CORBA/Request.h
deleted file mode 100644
index b1d9b420c51..00000000000
--- a/libjava/org/omg/CORBA/Request.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_Request__
-#define __org_omg_CORBA_Request__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class Environment;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Request;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::Request : public ::java::lang::Object
-{
-
-public:
-  Request();
-  virtual ::org::omg::CORBA::Any * add_in_arg() = 0;
-  virtual ::org::omg::CORBA::Any * add_inout_arg() = 0;
-  virtual ::org::omg::CORBA::Any * add_named_in_arg(::java::lang::String *) = 0;
-  virtual ::org::omg::CORBA::Any * add_named_inout_arg(::java::lang::String *) = 0;
-  virtual ::org::omg::CORBA::Any * add_named_out_arg(::java::lang::String *) = 0;
-  virtual ::org::omg::CORBA::Any * add_out_arg() = 0;
-  virtual ::org::omg::CORBA::NVList * arguments() = 0;
-  virtual ::org::omg::CORBA::ContextList * contexts() = 0;
-  virtual ::org::omg::CORBA::Context * ctx() = 0;
-  virtual void ctx(::org::omg::CORBA::Context *) = 0;
-  virtual ::org::omg::CORBA::Environment * env() = 0;
-  virtual ::org::omg::CORBA::ExceptionList * exceptions() = 0;
-  virtual void get_response() = 0;
-  virtual void invoke() = 0;
-  virtual ::java::lang::String * operation() = 0;
-  virtual jboolean poll_response() = 0;
-  virtual ::org::omg::CORBA::NamedValue * result() = 0;
-  virtual ::org::omg::CORBA::Any * return_value() = 0;
-  virtual void send_deferred() = 0;
-  virtual void send_oneway() = 0;
-  virtual void set_return_type(::org::omg::CORBA::TypeCode *) = 0;
-  virtual ::org::omg::CORBA::Object * target() = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_Request__
diff --git a/libjava/org/omg/CORBA/ServerRequest.h b/libjava/org/omg/CORBA/ServerRequest.h
deleted file mode 100644
index f027f0ade27..00000000000
--- a/libjava/org/omg/CORBA/ServerRequest.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ServerRequest__
-#define __org_omg_CORBA_ServerRequest__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class NVList;
-          class ServerRequest;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ServerRequest : public ::java::lang::Object
-{
-
-public:
-  ServerRequest();
-  virtual ::org::omg::CORBA::Context * ctx() = 0;
-  virtual ::java::lang::String * operation();
-  virtual void arguments(::org::omg::CORBA::NVList *);
-  virtual void set_result(::org::omg::CORBA::Any *);
-  virtual void set_exception(::org::omg::CORBA::Any *);
-  virtual void result(::org::omg::CORBA::Any *);
-  virtual void except(::org::omg::CORBA::Any *);
-  virtual void params(::org::omg::CORBA::NVList *);
-  virtual ::java::lang::String * op_name();
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ServerRequest__
diff --git a/libjava/org/omg/CORBA/ServiceDetail.h b/libjava/org/omg/CORBA/ServiceDetail.h
deleted file mode 100644
index c0f4627ac88..00000000000
--- a/libjava/org/omg/CORBA/ServiceDetail.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ServiceDetail__
-#define __org_omg_CORBA_ServiceDetail__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ServiceDetail;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ServiceDetail : public ::java::lang::Object
-{
-
-public:
-  ServiceDetail();
-  ServiceDetail(jint, JArray< jbyte > *);
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) service_detail_type;
-  JArray< jbyte > * service_detail;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ServiceDetail__
diff --git a/libjava/org/omg/CORBA/ServiceDetailHelper.h b/libjava/org/omg/CORBA/ServiceDetailHelper.h
deleted file mode 100644
index 700a0d5d880..00000000000
--- a/libjava/org/omg/CORBA/ServiceDetailHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ServiceDetailHelper__
-#define __org_omg_CORBA_ServiceDetailHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ServiceDetail;
-          class ServiceDetailHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ServiceDetailHelper : public ::java::lang::Object
-{
-
-public:
-  ServiceDetailHelper();
-  static ::org::omg::CORBA::ServiceDetail * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::ServiceDetail *);
-  static ::org::omg::CORBA::ServiceDetail * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::ServiceDetail *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ServiceDetailHelper__
diff --git a/libjava/org/omg/CORBA/ServiceInformation.h b/libjava/org/omg/CORBA/ServiceInformation.h
deleted file mode 100644
index d8832c3d0d6..00000000000
--- a/libjava/org/omg/CORBA/ServiceInformation.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ServiceInformation__
-#define __org_omg_CORBA_ServiceInformation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ServiceDetail;
-          class ServiceInformation;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ServiceInformation : public ::java::lang::Object
-{
-
-public:
-  ServiceInformation();
-  ServiceInformation(JArray< jint > *, JArray< ::org::omg::CORBA::ServiceDetail * > *);
-  JArray< ::org::omg::CORBA::ServiceDetail * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) service_details;
-  JArray< jint > * service_options;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ServiceInformation__
diff --git a/libjava/org/omg/CORBA/ServiceInformationHelper.h b/libjava/org/omg/CORBA/ServiceInformationHelper.h
deleted file mode 100644
index 7e97cfd2423..00000000000
--- a/libjava/org/omg/CORBA/ServiceInformationHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ServiceInformationHelper__
-#define __org_omg_CORBA_ServiceInformationHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ServiceInformation;
-          class ServiceInformationHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ServiceInformationHelper : public ::java::lang::Object
-{
-
-public:
-  ServiceInformationHelper();
-  static ::org::omg::CORBA::ServiceInformation * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::ServiceInformation *);
-  static ::org::omg::CORBA::ServiceInformation * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::ServiceInformation *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ServiceInformationHelper__
diff --git a/libjava/org/omg/CORBA/ServiceInformationHolder.h b/libjava/org/omg/CORBA/ServiceInformationHolder.h
deleted file mode 100644
index d6261deb288..00000000000
--- a/libjava/org/omg/CORBA/ServiceInformationHolder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ServiceInformationHolder__
-#define __org_omg_CORBA_ServiceInformationHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ServiceInformation;
-          class ServiceInformationHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ServiceInformationHolder : public ::java::lang::Object
-{
-
-public:
-  ServiceInformationHolder();
-  ServiceInformationHolder(::org::omg::CORBA::ServiceInformation *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::ServiceInformation * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ServiceInformationHolder__
diff --git a/libjava/org/omg/CORBA/SetOverrideType.h b/libjava/org/omg/CORBA/SetOverrideType.h
deleted file mode 100644
index e0db0f9a754..00000000000
--- a/libjava/org/omg/CORBA/SetOverrideType.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_SetOverrideType__
-#define __org_omg_CORBA_SetOverrideType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class SetOverrideType;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::SetOverrideType : public ::java::lang::Object
-{
-
-public: // actually protected
-  SetOverrideType(jint);
-public:
-  static ::org::omg::CORBA::SetOverrideType * from_int(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = -2761857189425106972LL;
-public:
-  static const jint _ADD_OVERRIDE = 1;
-  static const jint _SET_OVERRIDE = 0;
-  static ::org::omg::CORBA::SetOverrideType * ADD_OVERRIDE;
-  static ::org::omg::CORBA::SetOverrideType * SET_OVERRIDE;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_SetOverrideType__
diff --git a/libjava/org/omg/CORBA/SetOverrideTypeHelper.h b/libjava/org/omg/CORBA/SetOverrideTypeHelper.h
deleted file mode 100644
index e1904491758..00000000000
--- a/libjava/org/omg/CORBA/SetOverrideTypeHelper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_SetOverrideTypeHelper__
-#define __org_omg_CORBA_SetOverrideTypeHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class SetOverrideType;
-          class SetOverrideTypeHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::SetOverrideTypeHelper : public ::java::lang::Object
-{
-
-public:
-  SetOverrideTypeHelper();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::SetOverrideType *);
-  static ::org::omg::CORBA::SetOverrideType * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::SetOverrideType * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::SetOverrideType *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_SetOverrideTypeHelper__
diff --git a/libjava/org/omg/CORBA/ShortHolder.h b/libjava/org/omg/CORBA/ShortHolder.h
deleted file mode 100644
index 2a7a4db4260..00000000000
--- a/libjava/org/omg/CORBA/ShortHolder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ShortHolder__
-#define __org_omg_CORBA_ShortHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ShortHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ShortHolder : public ::java::lang::Object
-{
-
-public:
-  ShortHolder();
-  ShortHolder(jshort);
-  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_short;
-public:
-  jshort __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ShortHolder__
diff --git a/libjava/org/omg/CORBA/ShortSeqHelper.h b/libjava/org/omg/CORBA/ShortSeqHelper.h
deleted file mode 100644
index 88be02fa0a1..00000000000
--- a/libjava/org/omg/CORBA/ShortSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ShortSeqHelper__
-#define __org_omg_CORBA_ShortSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ShortSeqHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ShortSeqHelper : public ::java::lang::Object
-{
-
-public:
-  ShortSeqHelper();
-  static JArray< jshort > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jshort > *);
-  static JArray< jshort > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jshort > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ShortSeqHelper__
diff --git a/libjava/org/omg/CORBA/ShortSeqHolder.h b/libjava/org/omg/CORBA/ShortSeqHolder.h
deleted file mode 100644
index 5df6e65ad80..00000000000
--- a/libjava/org/omg/CORBA/ShortSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ShortSeqHolder__
-#define __org_omg_CORBA_ShortSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ShortSeqHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ShortSeqHolder : public ::java::lang::Object
-{
-
-public:
-  ShortSeqHolder();
-  ShortSeqHolder(JArray< jshort > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ShortSeqHolder__
diff --git a/libjava/org/omg/CORBA/StringHolder.h b/libjava/org/omg/CORBA/StringHolder.h
deleted file mode 100644
index dd16baf906d..00000000000
--- a/libjava/org/omg/CORBA/StringHolder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_StringHolder__
-#define __org_omg_CORBA_StringHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class StringTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class StringHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::StringHolder : public ::java::lang::Object
-{
-
-public:
-  StringHolder();
-  StringHolder(::java::lang::String *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  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 // __org_omg_CORBA_StringHolder__
diff --git a/libjava/org/omg/CORBA/StringSeqHelper.h b/libjava/org/omg/CORBA/StringSeqHelper.h
deleted file mode 100644
index b248abc4e86..00000000000
--- a/libjava/org/omg/CORBA/StringSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_StringSeqHelper__
-#define __org_omg_CORBA_StringSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class StringSeqHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::StringSeqHelper : public ::java::lang::Object
-{
-
-public:
-  StringSeqHelper();
-  static JArray< ::java::lang::String * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::java::lang::String * > *);
-  static JArray< ::java::lang::String * > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::java::lang::String * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_StringSeqHelper__
diff --git a/libjava/org/omg/CORBA/StringSeqHolder.h b/libjava/org/omg/CORBA/StringSeqHolder.h
deleted file mode 100644
index fc30bc33063..00000000000
--- a/libjava/org/omg/CORBA/StringSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_StringSeqHolder__
-#define __org_omg_CORBA_StringSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class StringSeqHolder;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::StringSeqHolder : public ::java::lang::Object
-{
-
-public:
-  StringSeqHolder();
-  StringSeqHolder(JArray< ::java::lang::String * > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_StringSeqHolder__
diff --git a/libjava/org/omg/CORBA/StringValueHelper.h b/libjava/org/omg/CORBA/StringValueHelper.h
deleted file mode 100644
index 20845caf5b7..00000000000
--- a/libjava/org/omg/CORBA/StringValueHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_StringValueHelper__
-#define __org_omg_CORBA_StringValueHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class StringValueHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::StringValueHelper : public ::java::lang::Object
-{
-
-public:
-  StringValueHelper();
-  virtual ::java::lang::String * get_id();
-  static ::java::lang::String * id();
-  virtual ::java::io::Serializable * read_value(::org::omg::CORBA::portable::InputStream *);
-  virtual void write_value(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-private:
-  static ::java::lang::String * id__;
-  static ::org::omg::CORBA::TypeCode * tString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_StringValueHelper__
diff --git a/libjava/org/omg/CORBA/StructMember.h b/libjava/org/omg/CORBA/StructMember.h
deleted file mode 100644
index fdd95862b36..00000000000
--- a/libjava/org/omg/CORBA/StructMember.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_StructMember__
-#define __org_omg_CORBA_StructMember__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class IDLType;
-          class StructMember;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::StructMember : public ::java::lang::Object
-{
-
-public:
-  StructMember();
-  StructMember(::java::lang::String *, ::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::IDLType *);
-private:
-  static const jlong serialVersionUID = 2762280796480753206LL;
-public:
-  ::org::omg::CORBA::IDLType * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type_def;
-  ::java::lang::String * name;
-  ::org::omg::CORBA::TypeCode * type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_StructMember__
diff --git a/libjava/org/omg/CORBA/StructMemberHelper.h b/libjava/org/omg/CORBA/StructMemberHelper.h
deleted file mode 100644
index 96417f401bc..00000000000
--- a/libjava/org/omg/CORBA/StructMemberHelper.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_StructMemberHelper__
-#define __org_omg_CORBA_StructMemberHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class StructMember;
-          class StructMemberHelper;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::StructMemberHelper : public ::java::lang::Object
-{
-
-public:
-  StructMemberHelper();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::StructMember *);
-  static ::org::omg::CORBA::StructMember * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::StructMember * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::StructMember *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-  static jboolean active;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_StructMemberHelper__
diff --git a/libjava/org/omg/CORBA/SystemException.h b/libjava/org/omg/CORBA/SystemException.h
deleted file mode 100644
index 4c7c43fffdf..00000000000
--- a/libjava/org/omg/CORBA/SystemException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_SystemException__
-#define __org_omg_CORBA_SystemException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class SystemException;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::SystemException : public ::java::lang::RuntimeException
-{
-
-public: // actually protected
-  SystemException(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -8486391734674855519LL;
-public:
-  ::org::omg::CORBA::CompletionStatus * __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) completed;
-  jint minor;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_SystemException__
diff --git a/libjava/org/omg/CORBA/TCKind.h b/libjava/org/omg/CORBA/TCKind.h
deleted file mode 100644
index d62ef2ce2c2..00000000000
--- a/libjava/org/omg/CORBA/TCKind.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TCKind__
-#define __org_omg_CORBA_TCKind__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TCKind;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TCKind : public ::java::lang::Object
-{
-
-public: // actually protected
-  TCKind(jint);
-public:
-  virtual jint value();
-  static ::org::omg::CORBA::TCKind * from_int(jint);
-  static const jint _tk_null = 0;
-  static const jint _tk_void = 1;
-  static const jint _tk_short = 2;
-  static const jint _tk_long = 3;
-  static const jint _tk_ushort = 4;
-  static const jint _tk_ulong = 5;
-  static const jint _tk_float = 6;
-  static const jint _tk_double = 7;
-  static const jint _tk_boolean = 8;
-  static const jint _tk_char = 9;
-  static const jint _tk_octet = 10;
-  static const jint _tk_any = 11;
-  static const jint _tk_TypeCode = 12;
-  static const jint _tk_Principal = 13;
-  static const jint _tk_objref = 14;
-  static const jint _tk_struct = 15;
-  static const jint _tk_union = 16;
-  static const jint _tk_enum = 17;
-  static const jint _tk_string = 18;
-  static const jint _tk_sequence = 19;
-  static const jint _tk_array = 20;
-  static const jint _tk_alias = 21;
-  static const jint _tk_except = 22;
-  static const jint _tk_longlong = 23;
-  static const jint _tk_ulonglong = 24;
-  static const jint _tk_longdouble = 25;
-  static const jint _tk_wchar = 26;
-  static const jint _tk_wstring = 27;
-  static const jint _tk_fixed = 28;
-  static const jint _tk_value = 29;
-  static const jint _tk_value_box = 30;
-  static const jint _tk_native = 31;
-  static const jint _tk_abstract_interface = 32;
-  static ::org::omg::CORBA::TCKind * tk_null;
-  static ::org::omg::CORBA::TCKind * tk_void;
-  static ::org::omg::CORBA::TCKind * tk_short;
-  static ::org::omg::CORBA::TCKind * tk_long;
-  static ::org::omg::CORBA::TCKind * tk_ushort;
-  static ::org::omg::CORBA::TCKind * tk_ulong;
-  static ::org::omg::CORBA::TCKind * tk_float;
-  static ::org::omg::CORBA::TCKind * tk_double;
-  static ::org::omg::CORBA::TCKind * tk_boolean;
-  static ::org::omg::CORBA::TCKind * tk_char;
-  static ::org::omg::CORBA::TCKind * tk_octet;
-  static ::org::omg::CORBA::TCKind * tk_any;
-  static ::org::omg::CORBA::TCKind * tk_TypeCode;
-  static ::org::omg::CORBA::TCKind * tk_Principal;
-  static ::org::omg::CORBA::TCKind * tk_objref;
-  static ::org::omg::CORBA::TCKind * tk_struct;
-  static ::org::omg::CORBA::TCKind * tk_union;
-  static ::org::omg::CORBA::TCKind * tk_enum;
-  static ::org::omg::CORBA::TCKind * tk_string;
-  static ::org::omg::CORBA::TCKind * tk_sequence;
-  static ::org::omg::CORBA::TCKind * tk_array;
-  static ::org::omg::CORBA::TCKind * tk_alias;
-  static ::org::omg::CORBA::TCKind * tk_except;
-  static ::org::omg::CORBA::TCKind * tk_longlong;
-  static ::org::omg::CORBA::TCKind * tk_ulonglong;
-  static ::org::omg::CORBA::TCKind * tk_longdouble;
-  static ::org::omg::CORBA::TCKind * tk_wchar;
-  static ::org::omg::CORBA::TCKind * tk_wstring;
-  static ::org::omg::CORBA::TCKind * tk_fixed;
-  static ::org::omg::CORBA::TCKind * tk_value;
-  static ::org::omg::CORBA::TCKind * tk_value_box;
-  static ::org::omg::CORBA::TCKind * tk_native;
-  static ::org::omg::CORBA::TCKind * tk_abstract_interface;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-  static JArray< ::org::omg::CORBA::TCKind * > * tk;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TCKind__
diff --git a/libjava/org/omg/CORBA/TIMEOUT.h b/libjava/org/omg/CORBA/TIMEOUT.h
deleted file mode 100644
index 7ce1fb5976b..00000000000
--- a/libjava/org/omg/CORBA/TIMEOUT.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TIMEOUT__
-#define __org_omg_CORBA_TIMEOUT__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class TIMEOUT;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TIMEOUT : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  TIMEOUT(::java::lang::String *);
-  TIMEOUT();
-  TIMEOUT(jint, ::org::omg::CORBA::CompletionStatus *);
-  TIMEOUT(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 4674850648191359518LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TIMEOUT__
diff --git a/libjava/org/omg/CORBA/TRANSACTION_MODE.h b/libjava/org/omg/CORBA/TRANSACTION_MODE.h
deleted file mode 100644
index 5744d7e4521..00000000000
--- a/libjava/org/omg/CORBA/TRANSACTION_MODE.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TRANSACTION_MODE__
-#define __org_omg_CORBA_TRANSACTION_MODE__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class TRANSACTION_MODE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TRANSACTION_MODE : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  TRANSACTION_MODE(::java::lang::String *);
-  TRANSACTION_MODE();
-  TRANSACTION_MODE(jint, ::org::omg::CORBA::CompletionStatus *);
-  TRANSACTION_MODE(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 681236728492128745LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TRANSACTION_MODE__
diff --git a/libjava/org/omg/CORBA/TRANSACTION_REQUIRED.h b/libjava/org/omg/CORBA/TRANSACTION_REQUIRED.h
deleted file mode 100644
index ccf7cd134d2..00000000000
--- a/libjava/org/omg/CORBA/TRANSACTION_REQUIRED.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TRANSACTION_REQUIRED__
-#define __org_omg_CORBA_TRANSACTION_REQUIRED__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class TRANSACTION_REQUIRED;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TRANSACTION_REQUIRED : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  TRANSACTION_REQUIRED(::java::lang::String *);
-  TRANSACTION_REQUIRED();
-  TRANSACTION_REQUIRED(jint, ::org::omg::CORBA::CompletionStatus *);
-  TRANSACTION_REQUIRED(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -1900254548742148576LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TRANSACTION_REQUIRED__
diff --git a/libjava/org/omg/CORBA/TRANSACTION_ROLLEDBACK.h b/libjava/org/omg/CORBA/TRANSACTION_ROLLEDBACK.h
deleted file mode 100644
index 722cfe07f75..00000000000
--- a/libjava/org/omg/CORBA/TRANSACTION_ROLLEDBACK.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TRANSACTION_ROLLEDBACK__
-#define __org_omg_CORBA_TRANSACTION_ROLLEDBACK__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class TRANSACTION_ROLLEDBACK;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TRANSACTION_ROLLEDBACK : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  TRANSACTION_ROLLEDBACK(::java::lang::String *);
-  TRANSACTION_ROLLEDBACK();
-  TRANSACTION_ROLLEDBACK(jint, ::org::omg::CORBA::CompletionStatus *);
-  TRANSACTION_ROLLEDBACK(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -343903462439281571LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TRANSACTION_ROLLEDBACK__
diff --git a/libjava/org/omg/CORBA/TRANSACTION_UNAVAILABLE.h b/libjava/org/omg/CORBA/TRANSACTION_UNAVAILABLE.h
deleted file mode 100644
index 9516c7629bd..00000000000
--- a/libjava/org/omg/CORBA/TRANSACTION_UNAVAILABLE.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TRANSACTION_UNAVAILABLE__
-#define __org_omg_CORBA_TRANSACTION_UNAVAILABLE__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class TRANSACTION_UNAVAILABLE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TRANSACTION_UNAVAILABLE : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  TRANSACTION_UNAVAILABLE(::java::lang::String *);
-  TRANSACTION_UNAVAILABLE();
-  TRANSACTION_UNAVAILABLE(jint, ::org::omg::CORBA::CompletionStatus *);
-  TRANSACTION_UNAVAILABLE(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 6340246200933309385LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TRANSACTION_UNAVAILABLE__
diff --git a/libjava/org/omg/CORBA/TRANSIENT.h b/libjava/org/omg/CORBA/TRANSIENT.h
deleted file mode 100644
index 904b54dcd52..00000000000
--- a/libjava/org/omg/CORBA/TRANSIENT.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TRANSIENT__
-#define __org_omg_CORBA_TRANSIENT__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class TRANSIENT;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TRANSIENT : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  TRANSIENT(::java::lang::String *);
-  TRANSIENT();
-  TRANSIENT(jint, ::org::omg::CORBA::CompletionStatus *);
-  TRANSIENT(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = 8168539547719791425LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TRANSIENT__
diff --git a/libjava/org/omg/CORBA/TypeCode.h b/libjava/org/omg/CORBA/TypeCode.h
deleted file mode 100644
index 706dc288517..00000000000
--- a/libjava/org/omg/CORBA/TypeCode.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TypeCode__
-#define __org_omg_CORBA_TypeCode__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TCKind;
-          class TypeCode;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TypeCode : public ::java::lang::Object
-{
-
-public:
-  TypeCode();
-  virtual ::org::omg::CORBA::TypeCode * concrete_base_type() = 0;
-  virtual ::org::omg::CORBA::TypeCode * content_type() = 0;
-  virtual jint default_index() = 0;
-  virtual ::org::omg::CORBA::TypeCode * discriminator_type() = 0;
-  virtual jboolean equal(::org::omg::CORBA::TypeCode *) = 0;
-  virtual jboolean equivalent(::org::omg::CORBA::TypeCode *) = 0;
-  virtual jshort fixed_digits() = 0;
-  virtual jshort fixed_scale() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_compact_typecode() = 0;
-  virtual ::java::lang::String * id() = 0;
-  virtual ::org::omg::CORBA::TCKind * kind() = 0;
-  virtual jint length() = 0;
-  virtual jint member_count() = 0;
-  virtual ::org::omg::CORBA::Any * member_label(jint) = 0;
-  virtual ::java::lang::String * member_name(jint) = 0;
-  virtual ::org::omg::CORBA::TypeCode * member_type(jint) = 0;
-  virtual jshort member_visibility(jint) = 0;
-  virtual ::java::lang::String * name() = 0;
-  virtual jshort type_modifier() = 0;
-private:
-  static const jlong serialVersionUID = -6521025782489515676LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TypeCode__
diff --git a/libjava/org/omg/CORBA/TypeCodeHolder.h b/libjava/org/omg/CORBA/TypeCodeHolder.h
deleted file mode 100644
index 84dd9c138b4..00000000000
--- a/libjava/org/omg/CORBA/TypeCodeHolder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TypeCodeHolder__
-#define __org_omg_CORBA_TypeCodeHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-          class TypeCodeHolder;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TypeCodeHolder : public ::java::lang::Object
-{
-
-public:
-  TypeCodeHolder();
-  TypeCodeHolder(::org::omg::CORBA::TypeCode *);
-  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_TypeCode;
-public:
-  ::org::omg::CORBA::TypeCode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TypeCodeHolder__
diff --git a/libjava/org/omg/CORBA/TypeCodePackage/BadKind.h b/libjava/org/omg/CORBA/TypeCodePackage/BadKind.h
deleted file mode 100644
index 475f3d18ae6..00000000000
--- a/libjava/org/omg/CORBA/TypeCodePackage/BadKind.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TypeCodePackage_BadKind__
-#define __org_omg_CORBA_TypeCodePackage_BadKind__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace TypeCodePackage
-        {
-            class BadKind;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TypeCodePackage::BadKind : public ::org::omg::CORBA::UserException
-{
-
-public:
-  BadKind();
-  BadKind(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1030443154456771956LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TypeCodePackage_BadKind__
diff --git a/libjava/org/omg/CORBA/TypeCodePackage/Bounds.h b/libjava/org/omg/CORBA/TypeCodePackage/Bounds.h
deleted file mode 100644
index a91546c3621..00000000000
--- a/libjava/org/omg/CORBA/TypeCodePackage/Bounds.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_TypeCodePackage_Bounds__
-#define __org_omg_CORBA_TypeCodePackage_Bounds__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace TypeCodePackage
-        {
-            class Bounds;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::TypeCodePackage::Bounds : public ::org::omg::CORBA::UserException
-{
-
-public:
-  Bounds();
-  Bounds(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5418177951071152101LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_TypeCodePackage_Bounds__
diff --git a/libjava/org/omg/CORBA/ULongLongSeqHelper.h b/libjava/org/omg/CORBA/ULongLongSeqHelper.h
deleted file mode 100644
index 2f4f6c9795d..00000000000
--- a/libjava/org/omg/CORBA/ULongLongSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ULongLongSeqHelper__
-#define __org_omg_CORBA_ULongLongSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class ULongLongSeqHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ULongLongSeqHelper : public ::java::lang::Object
-{
-
-public:
-  ULongLongSeqHelper();
-  static JArray< jlong > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jlong > *);
-  static JArray< jlong > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jlong > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ULongLongSeqHelper__
diff --git a/libjava/org/omg/CORBA/ULongLongSeqHolder.h b/libjava/org/omg/CORBA/ULongLongSeqHolder.h
deleted file mode 100644
index a6b2ca6de17..00000000000
--- a/libjava/org/omg/CORBA/ULongLongSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ULongLongSeqHolder__
-#define __org_omg_CORBA_ULongLongSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-          class ULongLongSeqHolder;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ULongLongSeqHolder : public ::java::lang::Object
-{
-
-public:
-  ULongLongSeqHolder();
-  ULongLongSeqHolder(JArray< jlong > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jlong > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ULongLongSeqHolder__
diff --git a/libjava/org/omg/CORBA/ULongSeqHelper.h b/libjava/org/omg/CORBA/ULongSeqHelper.h
deleted file mode 100644
index 1877dda15f7..00000000000
--- a/libjava/org/omg/CORBA/ULongSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ULongSeqHelper__
-#define __org_omg_CORBA_ULongSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class ULongSeqHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ULongSeqHelper : public ::java::lang::Object
-{
-
-public:
-  ULongSeqHelper();
-  static JArray< jint > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jint > *);
-  static JArray< jint > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jint > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ULongSeqHelper__
diff --git a/libjava/org/omg/CORBA/ULongSeqHolder.h b/libjava/org/omg/CORBA/ULongSeqHolder.h
deleted file mode 100644
index d4261d6fef8..00000000000
--- a/libjava/org/omg/CORBA/ULongSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ULongSeqHolder__
-#define __org_omg_CORBA_ULongSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-          class ULongSeqHolder;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ULongSeqHolder : public ::java::lang::Object
-{
-
-public:
-  ULongSeqHolder();
-  ULongSeqHolder(JArray< jint > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ULongSeqHolder__
diff --git a/libjava/org/omg/CORBA/UNKNOWN.h b/libjava/org/omg/CORBA/UNKNOWN.h
deleted file mode 100644
index 4ad7faf48a0..00000000000
--- a/libjava/org/omg/CORBA/UNKNOWN.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UNKNOWN__
-#define __org_omg_CORBA_UNKNOWN__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class CompletionStatus;
-          class UNKNOWN;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UNKNOWN : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  UNKNOWN(::java::lang::String *);
-  UNKNOWN();
-  UNKNOWN(jint, ::org::omg::CORBA::CompletionStatus *);
-  UNKNOWN(::java::lang::String *, jint, ::org::omg::CORBA::CompletionStatus *);
-private:
-  static const jlong serialVersionUID = -3556426185741898205LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_UNKNOWN__
diff --git a/libjava/org/omg/CORBA/UNSUPPORTED_POLICY.h b/libjava/org/omg/CORBA/UNSUPPORTED_POLICY.h
deleted file mode 100644
index cf74a837420..00000000000
--- a/libjava/org/omg/CORBA/UNSUPPORTED_POLICY.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UNSUPPORTED_POLICY__
-#define __org_omg_CORBA_UNSUPPORTED_POLICY__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class UNSUPPORTED_POLICY;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UNSUPPORTED_POLICY : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_UNSUPPORTED_POLICY__
diff --git a/libjava/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.h b/libjava/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.h
deleted file mode 100644
index a10a8ba8985..00000000000
--- a/libjava/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UNSUPPORTED_POLICY_VALUE__
-#define __org_omg_CORBA_UNSUPPORTED_POLICY_VALUE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class UNSUPPORTED_POLICY_VALUE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UNSUPPORTED_POLICY_VALUE : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_UNSUPPORTED_POLICY_VALUE__
diff --git a/libjava/org/omg/CORBA/UShortSeqHelper.h b/libjava/org/omg/CORBA/UShortSeqHelper.h
deleted file mode 100644
index 77974befb39..00000000000
--- a/libjava/org/omg/CORBA/UShortSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UShortSeqHelper__
-#define __org_omg_CORBA_UShortSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class UShortSeqHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UShortSeqHelper : public ::java::lang::Object
-{
-
-public:
-  UShortSeqHelper();
-  static JArray< jshort > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jshort > *);
-  static JArray< jshort > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jshort > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_UShortSeqHelper__
diff --git a/libjava/org/omg/CORBA/UShortSeqHolder.h b/libjava/org/omg/CORBA/UShortSeqHolder.h
deleted file mode 100644
index 08afb5e7f3a..00000000000
--- a/libjava/org/omg/CORBA/UShortSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UShortSeqHolder__
-#define __org_omg_CORBA_UShortSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-          class UShortSeqHolder;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UShortSeqHolder : public ::java::lang::Object
-{
-
-public:
-  UShortSeqHolder();
-  UShortSeqHolder(JArray< jshort > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jshort > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_UShortSeqHolder__
diff --git a/libjava/org/omg/CORBA/UnionMember.h b/libjava/org/omg/CORBA/UnionMember.h
deleted file mode 100644
index e71806c9a88..00000000000
--- a/libjava/org/omg/CORBA/UnionMember.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UnionMember__
-#define __org_omg_CORBA_UnionMember__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class IDLType;
-          class TypeCode;
-          class UnionMember;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UnionMember : public ::java::lang::Object
-{
-
-public:
-  UnionMember();
-  UnionMember(::java::lang::String *, ::org::omg::CORBA::Any *, ::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::IDLType *);
-private:
-  static const jlong serialVersionUID = 5506049694216071974LL;
-public:
-  ::org::omg::CORBA::Any * __attribute__((aligned(__alignof__( ::java::lang::Object)))) label;
-  ::org::omg::CORBA::IDLType * type_def;
-  ::java::lang::String * name;
-  ::org::omg::CORBA::TypeCode * type;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_UnionMember__
diff --git a/libjava/org/omg/CORBA/UnionMemberHelper.h b/libjava/org/omg/CORBA/UnionMemberHelper.h
deleted file mode 100644
index 1c1e663a07a..00000000000
--- a/libjava/org/omg/CORBA/UnionMemberHelper.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UnionMemberHelper__
-#define __org_omg_CORBA_UnionMemberHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class UnionMember;
-          class UnionMemberHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UnionMemberHelper : public ::java::lang::Object
-{
-
-public:
-  UnionMemberHelper();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::UnionMember *);
-  static ::org::omg::CORBA::UnionMember * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::UnionMember * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::UnionMember *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-  static jboolean active;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_UnionMemberHelper__
diff --git a/libjava/org/omg/CORBA/UnknownUserException.h b/libjava/org/omg/CORBA/UnknownUserException.h
deleted file mode 100644
index 05713851d76..00000000000
--- a/libjava/org/omg/CORBA/UnknownUserException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UnknownUserException__
-#define __org_omg_CORBA_UnknownUserException__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class UnknownUserException;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UnknownUserException : public ::org::omg::CORBA::UserException
-{
-
-public:
-  UnknownUserException();
-  UnknownUserException(::org::omg::CORBA::Any *);
-  ::org::omg::CORBA::Any * __attribute__((aligned(__alignof__( ::org::omg::CORBA::UserException)))) except;
-private:
-  static const jlong serialVersionUID = 3106202258203879281LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_UnknownUserException__
diff --git a/libjava/org/omg/CORBA/UnknownUserExceptionHelper.h b/libjava/org/omg/CORBA/UnknownUserExceptionHelper.h
deleted file mode 100644
index f0f99543c59..00000000000
--- a/libjava/org/omg/CORBA/UnknownUserExceptionHelper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UnknownUserExceptionHelper__
-#define __org_omg_CORBA_UnknownUserExceptionHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class UnknownUserException;
-          class UnknownUserExceptionHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UnknownUserExceptionHelper : public ::java::lang::Object
-{
-
-public:
-  UnknownUserExceptionHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::UnknownUserException *);
-  static ::org::omg::CORBA::UnknownUserException * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::UnknownUserException * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::UnknownUserException *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_UnknownUserExceptionHelper__
diff --git a/libjava/org/omg/CORBA/UnknownUserExceptionHolder.h b/libjava/org/omg/CORBA/UnknownUserExceptionHolder.h
deleted file mode 100644
index 431ddb2549a..00000000000
--- a/libjava/org/omg/CORBA/UnknownUserExceptionHolder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UnknownUserExceptionHolder__
-#define __org_omg_CORBA_UnknownUserExceptionHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-          class UnknownUserException;
-          class UnknownUserExceptionHolder;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UnknownUserExceptionHolder : public ::java::lang::Object
-{
-
-public:
-  UnknownUserExceptionHolder();
-  UnknownUserExceptionHolder(::org::omg::CORBA::UnknownUserException *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::CORBA::UnknownUserException * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_UnknownUserExceptionHolder__
diff --git a/libjava/org/omg/CORBA/UserException.h b/libjava/org/omg/CORBA/UserException.h
deleted file mode 100644
index 5569783b8a5..00000000000
--- a/libjava/org/omg/CORBA/UserException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_UserException__
-#define __org_omg_CORBA_UserException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class UserException;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::UserException : public ::java::lang::Exception
-{
-
-public: // actually protected
-  UserException();
-  UserException(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -6594940734566091244LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_UserException__
diff --git a/libjava/org/omg/CORBA/VM_ABSTRACT.h b/libjava/org/omg/CORBA/VM_ABSTRACT.h
deleted file mode 100644
index efc9b7a7d97..00000000000
--- a/libjava/org/omg/CORBA/VM_ABSTRACT.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_VM_ABSTRACT__
-#define __org_omg_CORBA_VM_ABSTRACT__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class VM_ABSTRACT;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::VM_ABSTRACT : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_VM_ABSTRACT__
diff --git a/libjava/org/omg/CORBA/VM_CUSTOM.h b/libjava/org/omg/CORBA/VM_CUSTOM.h
deleted file mode 100644
index 2bb7c670bac..00000000000
--- a/libjava/org/omg/CORBA/VM_CUSTOM.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_VM_CUSTOM__
-#define __org_omg_CORBA_VM_CUSTOM__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class VM_CUSTOM;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::VM_CUSTOM : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_VM_CUSTOM__
diff --git a/libjava/org/omg/CORBA/VM_NONE.h b/libjava/org/omg/CORBA/VM_NONE.h
deleted file mode 100644
index 69882f7d790..00000000000
--- a/libjava/org/omg/CORBA/VM_NONE.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_VM_NONE__
-#define __org_omg_CORBA_VM_NONE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class VM_NONE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::VM_NONE : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_VM_NONE__
diff --git a/libjava/org/omg/CORBA/VM_TRUNCATABLE.h b/libjava/org/omg/CORBA/VM_TRUNCATABLE.h
deleted file mode 100644
index ded12b83945..00000000000
--- a/libjava/org/omg/CORBA/VM_TRUNCATABLE.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_VM_TRUNCATABLE__
-#define __org_omg_CORBA_VM_TRUNCATABLE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class VM_TRUNCATABLE;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::VM_TRUNCATABLE : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_VM_TRUNCATABLE__
diff --git a/libjava/org/omg/CORBA/ValueBaseHelper.h b/libjava/org/omg/CORBA/ValueBaseHelper.h
deleted file mode 100644
index b2fc750f889..00000000000
--- a/libjava/org/omg/CORBA/ValueBaseHelper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ValueBaseHelper__
-#define __org_omg_CORBA_ValueBaseHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class ValueBaseHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ValueBaseHelper : public ::java::lang::Object
-{
-
-public:
-  ValueBaseHelper();
-  static ::java::io::Serializable * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::java::io::Serializable *);
-  static ::java::io::Serializable * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ValueBaseHelper__
diff --git a/libjava/org/omg/CORBA/ValueBaseHolder.h b/libjava/org/omg/CORBA/ValueBaseHolder.h
deleted file mode 100644
index 98d0ef98506..00000000000
--- a/libjava/org/omg/CORBA/ValueBaseHolder.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ValueBaseHolder__
-#define __org_omg_CORBA_ValueBaseHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-          class ValueBaseHolder;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ValueBaseHolder : public ::java::lang::Object
-{
-
-public:
-  ValueBaseHolder();
-  ValueBaseHolder(::java::io::Serializable *);
-  virtual void _read(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::TypeCode * _type();
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::java::io::Serializable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ValueBaseHolder__
diff --git a/libjava/org/omg/CORBA/ValueMember.h b/libjava/org/omg/CORBA/ValueMember.h
deleted file mode 100644
index c9f38ba381d..00000000000
--- a/libjava/org/omg/CORBA/ValueMember.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ValueMember__
-#define __org_omg_CORBA_ValueMember__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class IDLType;
-          class TypeCode;
-          class ValueMember;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ValueMember : public ::java::lang::Object
-{
-
-public:
-  ValueMember();
-  ValueMember(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::IDLType *, jshort);
-private:
-  static const jlong serialVersionUID = -2507594168537449114LL;
-public:
-  ::org::omg::CORBA::IDLType * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type_def;
-  ::java::lang::String * defined_in;
-  ::java::lang::String * id;
-  ::java::lang::String * name;
-  ::java::lang::String * version;
-  ::org::omg::CORBA::TypeCode * type;
-  jshort access;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ValueMember__
diff --git a/libjava/org/omg/CORBA/ValueMemberHelper.h b/libjava/org/omg/CORBA/ValueMemberHelper.h
deleted file mode 100644
index 78a33f872f2..00000000000
--- a/libjava/org/omg/CORBA/ValueMemberHelper.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_ValueMemberHelper__
-#define __org_omg_CORBA_ValueMemberHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class ValueMember;
-          class ValueMemberHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::ValueMemberHelper : public ::java::lang::Object
-{
-
-public:
-  ValueMemberHelper();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::ValueMember *);
-  static ::org::omg::CORBA::ValueMember * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::ValueMember * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::ValueMember *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-  static jboolean active;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_ValueMemberHelper__
diff --git a/libjava/org/omg/CORBA/VersionSpecHelper.h b/libjava/org/omg/CORBA/VersionSpecHelper.h
deleted file mode 100644
index a537e9b2ecf..00000000000
--- a/libjava/org/omg/CORBA/VersionSpecHelper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_VersionSpecHelper__
-#define __org_omg_CORBA_VersionSpecHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class VersionSpecHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::VersionSpecHelper : public ::java::lang::Object
-{
-
-public:
-  VersionSpecHelper();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_VersionSpecHelper__
diff --git a/libjava/org/omg/CORBA/VisibilityHelper.h b/libjava/org/omg/CORBA/VisibilityHelper.h
deleted file mode 100644
index c090bfa9892..00000000000
--- a/libjava/org/omg/CORBA/VisibilityHelper.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_VisibilityHelper__
-#define __org_omg_CORBA_VisibilityHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class VisibilityHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::VisibilityHelper : public ::java::lang::Object
-{
-
-public:
-  VisibilityHelper();
-  static void insert(::org::omg::CORBA::Any *, jshort);
-  static jshort extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static jshort read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, jshort);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_VisibilityHelper__
diff --git a/libjava/org/omg/CORBA/WCharSeqHelper.h b/libjava/org/omg/CORBA/WCharSeqHelper.h
deleted file mode 100644
index dadd61cafc9..00000000000
--- a/libjava/org/omg/CORBA/WCharSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_WCharSeqHelper__
-#define __org_omg_CORBA_WCharSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class WCharSeqHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::WCharSeqHelper : public ::java::lang::Object
-{
-
-public:
-  WCharSeqHelper();
-  static JArray< jchar > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< jchar > *);
-  static JArray< jchar > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jchar > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_WCharSeqHelper__
diff --git a/libjava/org/omg/CORBA/WCharSeqHolder.h b/libjava/org/omg/CORBA/WCharSeqHolder.h
deleted file mode 100644
index 4c15eb8173a..00000000000
--- a/libjava/org/omg/CORBA/WCharSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_WCharSeqHolder__
-#define __org_omg_CORBA_WCharSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-          class WCharSeqHolder;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::WCharSeqHolder : public ::java::lang::Object
-{
-
-public:
-  WCharSeqHolder();
-  WCharSeqHolder(JArray< jchar > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< jchar > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_WCharSeqHolder__
diff --git a/libjava/org/omg/CORBA/WStringSeqHelper.h b/libjava/org/omg/CORBA/WStringSeqHelper.h
deleted file mode 100644
index bdbd286065c..00000000000
--- a/libjava/org/omg/CORBA/WStringSeqHelper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_WStringSeqHelper__
-#define __org_omg_CORBA_WStringSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class WStringSeqHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::WStringSeqHelper : public ::java::lang::Object
-{
-
-public:
-  WStringSeqHelper();
-  static JArray< ::java::lang::String * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::java::lang::String * > *);
-  static JArray< ::java::lang::String * > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::java::lang::String * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_WStringSeqHelper__
diff --git a/libjava/org/omg/CORBA/WStringSeqHolder.h b/libjava/org/omg/CORBA/WStringSeqHolder.h
deleted file mode 100644
index eff79afac80..00000000000
--- a/libjava/org/omg/CORBA/WStringSeqHolder.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_WStringSeqHolder__
-#define __org_omg_CORBA_WStringSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace typecodes
-      {
-          class ArrayTypeCode;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-          class WStringSeqHolder;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::WStringSeqHolder : public ::java::lang::Object
-{
-
-public:
-  WStringSeqHolder();
-  WStringSeqHolder(JArray< ::java::lang::String * > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-private:
-  ::gnu::CORBA::typecodes::ArrayTypeCode * typecode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_WStringSeqHolder__
diff --git a/libjava/org/omg/CORBA/WStringValueHelper.h b/libjava/org/omg/CORBA/WStringValueHelper.h
deleted file mode 100644
index 53a55b5ea8d..00000000000
--- a/libjava/org/omg/CORBA/WStringValueHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_WStringValueHelper__
-#define __org_omg_CORBA_WStringValueHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class WStringValueHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::WStringValueHelper : public ::java::lang::Object
-{
-
-public:
-  WStringValueHelper();
-  virtual ::java::lang::String * get_id();
-  static ::java::lang::String * id();
-  virtual ::java::io::Serializable * read_value(::org::omg::CORBA::portable::InputStream *);
-  virtual void write_value(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-private:
-  static ::java::lang::String * id__;
-  static ::org::omg::CORBA::TypeCode * twString;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_WStringValueHelper__
diff --git a/libjava/org/omg/CORBA/WrongTransaction.h b/libjava/org/omg/CORBA/WrongTransaction.h
deleted file mode 100644
index 3ff439ebe69..00000000000
--- a/libjava/org/omg/CORBA/WrongTransaction.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_WrongTransaction__
-#define __org_omg_CORBA_WrongTransaction__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class WrongTransaction;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::WrongTransaction : public ::org::omg::CORBA::UserException
-{
-
-public:
-  WrongTransaction();
-  WrongTransaction(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_WrongTransaction__
diff --git a/libjava/org/omg/CORBA/WrongTransactionHelper.h b/libjava/org/omg/CORBA/WrongTransactionHelper.h
deleted file mode 100644
index 8686fbbe68d..00000000000
--- a/libjava/org/omg/CORBA/WrongTransactionHelper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_WrongTransactionHelper__
-#define __org_omg_CORBA_WrongTransactionHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-          class WrongTransaction;
-          class WrongTransactionHelper;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::WrongTransactionHelper : public ::java::lang::Object
-{
-
-public:
-  WrongTransactionHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CORBA::WrongTransaction *);
-  static ::org::omg::CORBA::WrongTransaction * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::WrongTransaction * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CORBA::WrongTransaction *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_WrongTransactionHelper__
diff --git a/libjava/org/omg/CORBA/WrongTransactionHolder.h b/libjava/org/omg/CORBA/WrongTransactionHolder.h
deleted file mode 100644
index b9455e81c19..00000000000
--- a/libjava/org/omg/CORBA/WrongTransactionHolder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_WrongTransactionHolder__
-#define __org_omg_CORBA_WrongTransactionHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-          class WrongTransaction;
-          class WrongTransactionHolder;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::WrongTransactionHolder : public ::java::lang::Object
-{
-
-public:
-  WrongTransactionHolder();
-  WrongTransactionHolder(::org::omg::CORBA::WrongTransaction *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::CORBA::WrongTransaction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_WrongTransactionHolder__
diff --git a/libjava/org/omg/CORBA/_IDLTypeStub.h b/libjava/org/omg/CORBA/_IDLTypeStub.h
deleted file mode 100644
index 2ab780e3b37..00000000000
--- a/libjava/org/omg/CORBA/_IDLTypeStub.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA__IDLTypeStub__
-#define __org_omg_CORBA__IDLTypeStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class DefinitionKind;
-          class TypeCode;
-          class _IDLTypeStub;
-        namespace portable
-        {
-            class Delegate;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::_IDLTypeStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _IDLTypeStub();
-  _IDLTypeStub(::org::omg::CORBA::portable::Delegate *);
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual ::org::omg::CORBA::DefinitionKind * def_kind();
-  virtual void destroy();
-  virtual JArray< ::java::lang::String * > * _ids();
-private:
-  static const jlong serialVersionUID = 9150293942452453626LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA__IDLTypeStub__
diff --git a/libjava/org/omg/CORBA/_PolicyStub.h b/libjava/org/omg/CORBA/_PolicyStub.h
deleted file mode 100644
index c7c79e9ab7e..00000000000
--- a/libjava/org/omg/CORBA/_PolicyStub.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA__PolicyStub__
-#define __org_omg_CORBA__PolicyStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-          class _PolicyStub;
-        namespace portable
-        {
-            class Delegate;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::_PolicyStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _PolicyStub();
-  _PolicyStub(::org::omg::CORBA::portable::Delegate *);
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual void destroy();
-  virtual ::org::omg::CORBA::Policy * copy();
-  virtual jint policy_type();
-private:
-  static const jlong serialVersionUID = 2453656196708903849LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA__PolicyStub__
diff --git a/libjava/org/omg/CORBA/portable/ApplicationException.h b/libjava/org/omg/CORBA/portable/ApplicationException.h
deleted file mode 100644
index e7dad897637..00000000000
--- a/libjava/org/omg/CORBA/portable/ApplicationException.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_ApplicationException__
-#define __org_omg_CORBA_portable_ApplicationException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class ApplicationException;
-            class InputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::ApplicationException : public ::java::lang::Exception
-{
-
-public:
-  ApplicationException(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *);
-  virtual ::java::lang::String * getId();
-  virtual ::org::omg::CORBA::portable::InputStream * getInputStream();
-private:
-  static const jlong serialVersionUID = -2088103024111528125LL;
-  ::org::omg::CORBA::portable::InputStream * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) m_input;
-  ::java::lang::String * m_id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_portable_ApplicationException__
diff --git a/libjava/org/omg/CORBA/portable/BoxedValueHelper.h b/libjava/org/omg/CORBA/portable/BoxedValueHelper.h
deleted file mode 100644
index 958ad2161af..00000000000
--- a/libjava/org/omg/CORBA/portable/BoxedValueHelper.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_BoxedValueHelper__
-#define __org_omg_CORBA_portable_BoxedValueHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class BoxedValueHelper;
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::BoxedValueHelper : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * get_id() = 0;
-  virtual ::java::io::Serializable * read_value(::org::omg::CORBA::portable::InputStream *) = 0;
-  virtual void write_value(::org::omg::CORBA::portable::OutputStream *, ::java::io::Serializable *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_portable_BoxedValueHelper__
diff --git a/libjava/org/omg/CORBA/portable/CustomValue.h b/libjava/org/omg/CORBA/portable/CustomValue.h
deleted file mode 100644
index 051e5462d84..00000000000
--- a/libjava/org/omg/CORBA/portable/CustomValue.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_CustomValue__
-#define __org_omg_CORBA_portable_CustomValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class DataInputStream;
-          class DataOutputStream;
-        namespace portable
-        {
-            class CustomValue;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::CustomValue : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::String * > * _truncatable_ids() = 0;
-  virtual void marshal(::org::omg::CORBA::DataOutputStream *) = 0;
-  virtual void unmarshal(::org::omg::CORBA::DataInputStream *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_portable_CustomValue__
diff --git a/libjava/org/omg/CORBA/portable/Delegate.h b/libjava/org/omg/CORBA/portable/Delegate.h
deleted file mode 100644
index 233160f9879..00000000000
--- a/libjava/org/omg/CORBA/portable/Delegate.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_Delegate__
-#define __org_omg_CORBA_portable_Delegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class ORB;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-        namespace portable
-        {
-            class Delegate;
-            class InputStream;
-            class OutputStream;
-            class ServantObject;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::Delegate : public ::java::lang::Object
-{
-
-public:
-  Delegate();
-  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 *) = 0;
-  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 *) = 0;
-  virtual ::org::omg::CORBA::Object * duplicate(::org::omg::CORBA::Object *) = 0;
-  virtual JArray< ::org::omg::CORBA::DomainManager * > * get_domain_managers(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::Object * get_interface_def(::org::omg::CORBA::Object *) = 0;
-  virtual ::org::omg::CORBA::Policy * get_policy(::org::omg::CORBA::Object *, jint);
-  virtual jint hash(::org::omg::CORBA::Object *, jint) = 0;
-  virtual jboolean is_a(::org::omg::CORBA::Object *, ::java::lang::String *) = 0;
-  virtual jboolean is_equivalent(::org::omg::CORBA::Object *, ::org::omg::CORBA::Object *) = 0;
-  virtual jboolean is_local(::org::omg::CORBA::Object *);
-  virtual jboolean non_existent(::org::omg::CORBA::Object *) = 0;
-  virtual jboolean equals(::org::omg::CORBA::Object *, ::java::lang::Object *);
-  virtual jint hashCode(::org::omg::CORBA::Object *);
-  virtual ::org::omg::CORBA::portable::InputStream * invoke(::org::omg::CORBA::Object *, ::org::omg::CORBA::portable::OutputStream *);
-  virtual ::org::omg::CORBA::ORB * orb(::org::omg::CORBA::Object *);
-  virtual void release(::org::omg::CORBA::Object *) = 0;
-  virtual void releaseReply(::org::omg::CORBA::Object *, ::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::Request * request(::org::omg::CORBA::Object *, ::java::lang::String *) = 0;
-  virtual ::org::omg::CORBA::portable::OutputStream * request(::org::omg::CORBA::Object *, ::java::lang::String *, jboolean);
-  virtual void servant_postinvoke(::org::omg::CORBA::Object *, ::org::omg::CORBA::portable::ServantObject *);
-  virtual ::org::omg::CORBA::portable::ServantObject * servant_preinvoke(::org::omg::CORBA::Object *, ::java::lang::String *, ::java::lang::Class *);
-  virtual ::org::omg::CORBA::Object * set_policy_override(::org::omg::CORBA::Object *, JArray< ::org::omg::CORBA::Policy * > *, ::org::omg::CORBA::SetOverrideType *);
-  virtual ::java::lang::String * toString(::org::omg::CORBA::Object *);
-private:
-  static ::java::lang::String * WHY;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_portable_Delegate__
diff --git a/libjava/org/omg/CORBA/portable/IDLEntity.h b/libjava/org/omg/CORBA/portable/IDLEntity.h
deleted file mode 100644
index 2688c48ba2f..00000000000
--- a/libjava/org/omg/CORBA/portable/IDLEntity.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_IDLEntity__
-#define __org_omg_CORBA_portable_IDLEntity__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class IDLEntity;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::IDLEntity : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_portable_IDLEntity__
diff --git a/libjava/org/omg/CORBA/portable/IndirectionException.h b/libjava/org/omg/CORBA/portable/IndirectionException.h
deleted file mode 100644
index 00da4529dc7..00000000000
--- a/libjava/org/omg/CORBA/portable/IndirectionException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_IndirectionException__
-#define __org_omg_CORBA_portable_IndirectionException__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class IndirectionException;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::IndirectionException : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  IndirectionException(jint);
-private:
-  static const jlong serialVersionUID = -1923858944380721643LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::org::omg::CORBA::SystemException)))) offset;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_portable_IndirectionException__
diff --git a/libjava/org/omg/CORBA/portable/InputStream.h b/libjava/org/omg/CORBA/portable/InputStream.h
deleted file mode 100644
index f60f539ee25..00000000000
--- a/libjava/org/omg/CORBA/portable/InputStream.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_InputStream__
-#define __org_omg_CORBA_portable_InputStream__
-
-#pragma interface
-
-#include <java/io/InputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ORB;
-          class Object;
-          class Principal;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::InputStream : public ::java::io::InputStream
-{
-
-public:
-  InputStream();
-  virtual ::org::omg::CORBA::ORB * orb();
-  virtual ::org::omg::CORBA::Context * read_Context();
-  virtual ::org::omg::CORBA::Object * read_Object() = 0;
-  virtual jchar read_char() = 0;
-  virtual jdouble read_double() = 0;
-  virtual jfloat read_float() = 0;
-  virtual void read_float_array(JArray< jfloat > *, jint, jint) = 0;
-  virtual jint read_long() = 0;
-  virtual jlong read_longlong() = 0;
-  virtual void read_longlong_array(JArray< jlong > *, jint, jint) = 0;
-  virtual jbyte read_octet() = 0;
-  virtual void read_octet_array(JArray< jbyte > *, jint, jint) = 0;
-  virtual jshort read_short() = 0;
-  virtual void read_short_array(JArray< jshort > *, jint, jint) = 0;
-  virtual jint read_ulong() = 0;
-  virtual void read_ulong_array(JArray< jint > *, jint, jint) = 0;
-  virtual jint read();
-  virtual ::org::omg::CORBA::TypeCode * read_TypeCode() = 0;
-  virtual jboolean read_boolean() = 0;
-  virtual void read_boolean_array(JArray< jboolean > *, jint, jint) = 0;
-  virtual void read_char_array(JArray< jchar > *, jint, jint) = 0;
-  virtual void read_double_array(JArray< jdouble > *, jint, jint) = 0;
-  virtual void read_long_array(JArray< jint > *, jint, jint) = 0;
-  virtual ::java::lang::String * read_string() = 0;
-  virtual jlong read_ulonglong() = 0;
-  virtual void read_ulonglong_array(JArray< jlong > *, jint, jint) = 0;
-  virtual jshort read_ushort() = 0;
-  virtual void read_ushort_array(JArray< jshort > *, jint, jint) = 0;
-  virtual ::org::omg::CORBA::Object * read_Object(::java::lang::Class *);
-  virtual ::org::omg::CORBA::Any * read_any() = 0;
-  virtual ::java::math::BigDecimal * read_fixed();
-  virtual jchar read_wchar() = 0;
-  virtual void read_wchar_array(JArray< jchar > *, jint, jint) = 0;
-  virtual ::java::lang::String * read_wstring() = 0;
-  virtual ::org::omg::CORBA::Principal * read_Principal();
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_portable_InputStream__
diff --git a/libjava/org/omg/CORBA/portable/InvokeHandler.h b/libjava/org/omg/CORBA/portable/InvokeHandler.h
deleted file mode 100644
index 0b6cbf2139b..00000000000
--- a/libjava/org/omg/CORBA/portable/InvokeHandler.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_InvokeHandler__
-#define __org_omg_CORBA_portable_InvokeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class InputStream;
-            class InvokeHandler;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::InvokeHandler : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::portable::OutputStream * _invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_portable_InvokeHandler__
diff --git a/libjava/org/omg/CORBA/portable/ObjectImpl.h b/libjava/org/omg/CORBA/portable/ObjectImpl.h
deleted file mode 100644
index c0e9e6ed301..00000000000
--- a/libjava/org/omg/CORBA/portable/ObjectImpl.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_ObjectImpl__
-#define __org_omg_CORBA_portable_ObjectImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class ORB;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-        namespace portable
-        {
-            class Delegate;
-            class InputStream;
-            class ObjectImpl;
-            class OutputStream;
-            class ServantObject;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::ObjectImpl : public ::java::lang::Object
-{
-
-public:
-  ObjectImpl();
-  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 *);
-  virtual ::org::omg::CORBA::Request * _create_request(::org::omg::CORBA::Context *, ::java::lang::String *, ::org::omg::CORBA::NVList *, ::org::omg::CORBA::NamedValue *);
-  virtual ::org::omg::CORBA::Object * _duplicate();
-  virtual ::org::omg::CORBA::portable::Delegate * _get_delegate();
-  virtual JArray< ::org::omg::CORBA::DomainManager * > * _get_domain_managers();
-  virtual ::org::omg::CORBA::Object * _get_interface_def();
-  virtual ::org::omg::CORBA::Policy * _get_policy(jint);
-  virtual JArray< ::java::lang::String * > * _ids() = 0;
-  virtual jint _hash(jint);
-  virtual ::org::omg::CORBA::portable::InputStream * _invoke(::org::omg::CORBA::portable::OutputStream *);
-  virtual jboolean _is_a(::java::lang::String *);
-  virtual jboolean _is_equivalent(::org::omg::CORBA::Object *);
-  virtual jboolean _is_local();
-  virtual jboolean _non_existent();
-  virtual ::org::omg::CORBA::ORB * _orb();
-  virtual void _release();
-  virtual void _releaseReply(::org::omg::CORBA::portable::InputStream *);
-  virtual ::org::omg::CORBA::Request * _request(::java::lang::String *);
-  virtual ::org::omg::CORBA::portable::OutputStream * _request(::java::lang::String *, jboolean);
-  virtual void _servant_postinvoke(::org::omg::CORBA::portable::ServantObject *);
-  virtual ::org::omg::CORBA::portable::ServantObject * _servant_preinvoke(::java::lang::String *, ::java::lang::Class *);
-  virtual void _set_delegate(::org::omg::CORBA::portable::Delegate *);
-  virtual ::org::omg::CORBA::Object * _set_policy_override(JArray< ::org::omg::CORBA::Policy * > *, ::org::omg::CORBA::SetOverrideType *);
-  virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::lang::String * toString();
-public: // actually package-private
-  ::org::omg::CORBA::portable::Delegate * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_portable_ObjectImpl__
diff --git a/libjava/org/omg/CORBA/portable/OutputStream.h b/libjava/org/omg/CORBA/portable/OutputStream.h
deleted file mode 100644
index d1e22c646c4..00000000000
--- a/libjava/org/omg/CORBA/portable/OutputStream.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_OutputStream__
-#define __org_omg_CORBA_portable_OutputStream__
-
-#pragma interface
-
-#include <java/io/OutputStream.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace math
-    {
-        class BigDecimal;
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class ORB;
-          class Object;
-          class Principal;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::OutputStream : public ::java::io::OutputStream
-{
-
-public:
-  OutputStream();
-  virtual ::org::omg::CORBA::portable::InputStream * create_input_stream() = 0;
-  virtual ::org::omg::CORBA::ORB * orb();
-  virtual void write(jint);
-  virtual void write_Context(::org::omg::CORBA::Context *, ::org::omg::CORBA::ContextList *);
-  virtual void write_Object(::org::omg::CORBA::Object *) = 0;
-  virtual void write_Principal(::org::omg::CORBA::Principal *);
-  virtual void write_TypeCode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void write_any(::org::omg::CORBA::Any *) = 0;
-  virtual void write_boolean(jboolean) = 0;
-  virtual void write_boolean_array(JArray< jboolean > *, jint, jint) = 0;
-  virtual void write_char(jchar) = 0;
-  virtual void write_char_array(JArray< jchar > *, jint, jint) = 0;
-  virtual void write_double(jdouble) = 0;
-  virtual void write_double_array(JArray< jdouble > *, jint, jint) = 0;
-  virtual void write_fixed(::java::math::BigDecimal *);
-  virtual void write_float(jfloat) = 0;
-  virtual void write_float_array(JArray< jfloat > *, jint, jint) = 0;
-  virtual void write_long(jint) = 0;
-  virtual void write_long_array(JArray< jint > *, jint, jint) = 0;
-  virtual void write_longlong(jlong) = 0;
-  virtual void write_longlong_array(JArray< jlong > *, jint, jint) = 0;
-  virtual void write_octet(jbyte) = 0;
-  virtual void write_octet_array(JArray< jbyte > *, jint, jint) = 0;
-  virtual void write_short(jshort) = 0;
-  virtual void write_short_array(JArray< jshort > *, jint, jint) = 0;
-  virtual void write_string(::java::lang::String *) = 0;
-  virtual void write_ulong(jint) = 0;
-  virtual void write_ulong_array(JArray< jint > *, jint, jint) = 0;
-  virtual void write_ulonglong(jlong) = 0;
-  virtual void write_ulonglong_array(JArray< jlong > *, jint, jint) = 0;
-  virtual void write_ushort(jshort) = 0;
-  virtual void write_ushort_array(JArray< jshort > *, jint, jint) = 0;
-  virtual void write_wchar(jchar) = 0;
-  virtual void write_wchar_array(JArray< jchar > *, jint, jint) = 0;
-  virtual void write_wstring(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_portable_OutputStream__
diff --git a/libjava/org/omg/CORBA/portable/RemarshalException.h b/libjava/org/omg/CORBA/portable/RemarshalException.h
deleted file mode 100644
index ed9ea87092f..00000000000
--- a/libjava/org/omg/CORBA/portable/RemarshalException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_RemarshalException__
-#define __org_omg_CORBA_portable_RemarshalException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class RemarshalException;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::RemarshalException : public ::java::lang::Exception
-{
-
-public:
-  RemarshalException();
-private:
-  static const jlong serialVersionUID = -7025491253080954918LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_portable_RemarshalException__
diff --git a/libjava/org/omg/CORBA/portable/ResponseHandler.h b/libjava/org/omg/CORBA/portable/ResponseHandler.h
deleted file mode 100644
index f5f88224151..00000000000
--- a/libjava/org/omg/CORBA/portable/ResponseHandler.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_ResponseHandler__
-#define __org_omg_CORBA_portable_ResponseHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::ResponseHandler : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::portable::OutputStream * createExceptionReply() = 0;
-  virtual ::org::omg::CORBA::portable::OutputStream * createReply() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_portable_ResponseHandler__
diff --git a/libjava/org/omg/CORBA/portable/ServantObject.h b/libjava/org/omg/CORBA/portable/ServantObject.h
deleted file mode 100644
index d15cc9bd98d..00000000000
--- a/libjava/org/omg/CORBA/portable/ServantObject.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_ServantObject__
-#define __org_omg_CORBA_portable_ServantObject__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class ServantObject;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::ServantObject : public ::java::lang::Object
-{
-
-public:
-  ServantObject();
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) servant;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_portable_ServantObject__
diff --git a/libjava/org/omg/CORBA/portable/Streamable.h b/libjava/org/omg/CORBA/portable/Streamable.h
deleted file mode 100644
index 3d1d69612f9..00000000000
--- a/libjava/org/omg/CORBA/portable/Streamable.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_Streamable__
-#define __org_omg_CORBA_portable_Streamable__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class Streamable;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::Streamable : public ::java::lang::Object
-{
-
-public:
-  virtual void _read(::org::omg::CORBA::portable::InputStream *) = 0;
-  virtual ::org::omg::CORBA::TypeCode * _type() = 0;
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_portable_Streamable__
diff --git a/libjava/org/omg/CORBA/portable/StreamableValue.h b/libjava/org/omg/CORBA/portable/StreamableValue.h
deleted file mode 100644
index db13bc3d98a..00000000000
--- a/libjava/org/omg/CORBA/portable/StreamableValue.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_StreamableValue__
-#define __org_omg_CORBA_portable_StreamableValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class StreamableValue;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::StreamableValue : public ::java::lang::Object
-{
-
-public:
-  virtual void _read(::org::omg::CORBA::portable::InputStream *) = 0;
-  virtual ::org::omg::CORBA::TypeCode * _type() = 0;
-  virtual void _write(::org::omg::CORBA::portable::OutputStream *) = 0;
-  virtual JArray< ::java::lang::String * > * _truncatable_ids() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_portable_StreamableValue__
diff --git a/libjava/org/omg/CORBA/portable/UnknownException.h b/libjava/org/omg/CORBA/portable/UnknownException.h
deleted file mode 100644
index 9ae84106edc..00000000000
--- a/libjava/org/omg/CORBA/portable/UnknownException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_UnknownException__
-#define __org_omg_CORBA_portable_UnknownException__
-
-#pragma interface
-
-#include <org/omg/CORBA/SystemException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class UnknownException;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::UnknownException : public ::org::omg::CORBA::SystemException
-{
-
-public:
-  UnknownException(::java::lang::Throwable *);
-private:
-  static const jlong serialVersionUID = 1725238280802233450LL;
-public:
-  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::org::omg::CORBA::SystemException)))) originalEx;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_portable_UnknownException__
diff --git a/libjava/org/omg/CORBA/portable/ValueBase.h b/libjava/org/omg/CORBA/portable/ValueBase.h
deleted file mode 100644
index 4c5669f852b..00000000000
--- a/libjava/org/omg/CORBA/portable/ValueBase.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_ValueBase__
-#define __org_omg_CORBA_portable_ValueBase__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class ValueBase;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::ValueBase : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::String * > * _truncatable_ids() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_portable_ValueBase__
diff --git a/libjava/org/omg/CORBA/portable/ValueFactory.h b/libjava/org/omg/CORBA/portable/ValueFactory.h
deleted file mode 100644
index 5946803d1b4..00000000000
--- a/libjava/org/omg/CORBA/portable/ValueFactory.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_portable_ValueFactory__
-#define __org_omg_CORBA_portable_ValueFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class ValueFactory;
-        }
-      }
-      namespace CORBA_2_3
-      {
-        namespace portable
-        {
-            class InputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA::portable::ValueFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::io::Serializable * read_value(::org::omg::CORBA_2_3::portable::InputStream *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CORBA_portable_ValueFactory__
diff --git a/libjava/org/omg/CORBA_2_3/ORB.h b/libjava/org/omg/CORBA_2_3/ORB.h
deleted file mode 100644
index 78a8a0d9457..00000000000
--- a/libjava/org/omg/CORBA_2_3/ORB.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_2_3_ORB__
-#define __org_omg_CORBA_2_3_ORB__
-
-#pragma interface
-
-#include <org/omg/CORBA/ORB.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-        namespace portable
-        {
-            class ValueFactory;
-        }
-      }
-      namespace CORBA_2_3
-      {
-          class ORB;
-      }
-    }
-  }
-}
-
-class org::omg::CORBA_2_3::ORB : public ::org::omg::CORBA::ORB
-{
-
-public:
-  ORB();
-  virtual ::org::omg::CORBA::Object * get_value_def(::java::lang::String *);
-  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 set_delegate(::java::lang::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_2_3_ORB__
diff --git a/libjava/org/omg/CORBA_2_3/portable/Delegate.h b/libjava/org/omg/CORBA_2_3/portable/Delegate.h
deleted file mode 100644
index 0a8ea15755f..00000000000
--- a/libjava/org/omg/CORBA_2_3/portable/Delegate.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_2_3_portable_Delegate__
-#define __org_omg_CORBA_2_3_portable_Delegate__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/Delegate.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace CORBA_2_3
-      {
-        namespace portable
-        {
-            class Delegate;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA_2_3::portable::Delegate : public ::org::omg::CORBA::portable::Delegate
-{
-
-public:
-  Delegate();
-  virtual ::java::lang::String * get_codebase(::org::omg::CORBA::Object *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_2_3_portable_Delegate__
diff --git a/libjava/org/omg/CORBA_2_3/portable/InputStream.h b/libjava/org/omg/CORBA_2_3/portable/InputStream.h
deleted file mode 100644
index d10f12a210b..00000000000
--- a/libjava/org/omg/CORBA_2_3/portable/InputStream.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_2_3_portable_InputStream__
-#define __org_omg_CORBA_2_3_portable_InputStream__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/InputStream.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class BoxedValueHelper;
-        }
-      }
-      namespace CORBA_2_3
-      {
-        namespace portable
-        {
-            class InputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA_2_3::portable::InputStream : public ::org::omg::CORBA::portable::InputStream
-{
-
-public:
-  InputStream();
-  virtual ::java::lang::Object * read_abstract_interface();
-  virtual ::java::lang::Object * read_abstract_interface(::java::lang::Class *);
-  virtual ::java::io::Serializable * read_value();
-  virtual ::java::io::Serializable * read_value(::java::lang::Class *);
-  virtual ::java::io::Serializable * read_value(::java::io::Serializable *);
-  virtual ::java::io::Serializable * read_value(::java::lang::String *);
-  virtual ::java::io::Serializable * read_value(::org::omg::CORBA::portable::BoxedValueHelper *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_2_3_portable_InputStream__
diff --git a/libjava/org/omg/CORBA_2_3/portable/ObjectImpl.h b/libjava/org/omg/CORBA_2_3/portable/ObjectImpl.h
deleted file mode 100644
index 2f625a9628d..00000000000
--- a/libjava/org/omg/CORBA_2_3/portable/ObjectImpl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_2_3_portable_ObjectImpl__
-#define __org_omg_CORBA_2_3_portable_ObjectImpl__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA_2_3
-      {
-        namespace portable
-        {
-            class ObjectImpl;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA_2_3::portable::ObjectImpl : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  ObjectImpl();
-  virtual ::java::lang::String * _get_codebase();
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_2_3_portable_ObjectImpl__
diff --git a/libjava/org/omg/CORBA_2_3/portable/OutputStream.h b/libjava/org/omg/CORBA_2_3/portable/OutputStream.h
deleted file mode 100644
index cc7bf78f1a0..00000000000
--- a/libjava/org/omg/CORBA_2_3/portable/OutputStream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CORBA_2_3_portable_OutputStream__
-#define __org_omg_CORBA_2_3_portable_OutputStream__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/OutputStream.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class BoxedValueHelper;
-        }
-      }
-      namespace CORBA_2_3
-      {
-        namespace portable
-        {
-            class OutputStream;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CORBA_2_3::portable::OutputStream : public ::org::omg::CORBA::portable::OutputStream
-{
-
-public:
-  OutputStream();
-  virtual void write_abstract_interface(::java::lang::Object *);
-  virtual void write_value(::java::io::Serializable *);
-  virtual void write_value(::java::io::Serializable *, ::org::omg::CORBA::portable::BoxedValueHelper *);
-  virtual void write_value(::java::io::Serializable *, ::java::lang::Class *);
-  virtual void write_value(::java::io::Serializable *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CORBA_2_3_portable_OutputStream__
diff --git a/libjava/org/omg/CosNaming/Binding.h b/libjava/org/omg/CosNaming/Binding.h
deleted file mode 100644
index 90151236e65..00000000000
--- a/libjava/org/omg/CosNaming/Binding.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_Binding__
-#define __org_omg_CosNaming_Binding__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class Binding;
-          class BindingType;
-          class NameComponent;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::Binding : public ::java::lang::Object
-{
-
-public:
-  Binding();
-  Binding(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::BindingType *);
-  ::org::omg::CosNaming::BindingType * __attribute__((aligned(__alignof__( ::java::lang::Object)))) binding_type;
-  JArray< ::org::omg::CosNaming::NameComponent * > * binding_name;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_Binding__
diff --git a/libjava/org/omg/CosNaming/BindingHelper.h b/libjava/org/omg/CosNaming/BindingHelper.h
deleted file mode 100644
index 4e3dffd5c6f..00000000000
--- a/libjava/org/omg/CosNaming/BindingHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingHelper__
-#define __org_omg_CosNaming_BindingHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class Binding;
-          class BindingHelper;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingHelper : public ::java::lang::Object
-{
-
-public:
-  BindingHelper();
-  static ::org::omg::CosNaming::Binding * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::Binding *);
-  static ::org::omg::CosNaming::Binding * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::Binding *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_BindingHelper__
diff --git a/libjava/org/omg/CosNaming/BindingHolder.h b/libjava/org/omg/CosNaming/BindingHolder.h
deleted file mode 100644
index 93431f4736c..00000000000
--- a/libjava/org/omg/CosNaming/BindingHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingHolder__
-#define __org_omg_CosNaming_BindingHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class Binding;
-          class BindingHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingHolder : public ::java::lang::Object
-{
-
-public:
-  BindingHolder();
-  BindingHolder(::org::omg::CosNaming::Binding *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::Binding * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_BindingHolder__
diff --git a/libjava/org/omg/CosNaming/BindingIterator.h b/libjava/org/omg/CosNaming/BindingIterator.h
deleted file mode 100644
index a69ed71e5c2..00000000000
--- a/libjava/org/omg/CosNaming/BindingIterator.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingIterator__
-#define __org_omg_CosNaming_BindingIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace CosNaming
-      {
-          class BindingHolder;
-          class BindingIterator;
-          class BindingListHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingIterator : public ::java::lang::Object
-{
-
-public:
-  virtual void destroy() = 0;
-  virtual jboolean next_n(jint, ::org::omg::CosNaming::BindingListHolder *) = 0;
-  virtual jboolean next_one(::org::omg::CosNaming::BindingHolder *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CosNaming_BindingIterator__
diff --git a/libjava/org/omg/CosNaming/BindingIteratorHelper.h b/libjava/org/omg/CosNaming/BindingIteratorHelper.h
deleted file mode 100644
index 789d653d6ff..00000000000
--- a/libjava/org/omg/CosNaming/BindingIteratorHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingIteratorHelper__
-#define __org_omg_CosNaming_BindingIteratorHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingIterator;
-          class BindingIteratorHelper;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingIteratorHelper : public ::java::lang::Object
-{
-
-public:
-  BindingIteratorHelper();
-  static ::org::omg::CosNaming::BindingIterator * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::BindingIterator *);
-  static ::org::omg::CosNaming::BindingIterator * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CosNaming::BindingIterator * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CosNaming::BindingIterator * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::BindingIterator *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_BindingIteratorHelper__
diff --git a/libjava/org/omg/CosNaming/BindingIteratorHolder.h b/libjava/org/omg/CosNaming/BindingIteratorHolder.h
deleted file mode 100644
index 023602b27f7..00000000000
--- a/libjava/org/omg/CosNaming/BindingIteratorHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingIteratorHolder__
-#define __org_omg_CosNaming_BindingIteratorHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingIterator;
-          class BindingIteratorHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingIteratorHolder : public ::java::lang::Object
-{
-
-public:
-  BindingIteratorHolder();
-  BindingIteratorHolder(::org::omg::CosNaming::BindingIterator *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::BindingIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_BindingIteratorHolder__
diff --git a/libjava/org/omg/CosNaming/BindingIteratorOperations.h b/libjava/org/omg/CosNaming/BindingIteratorOperations.h
deleted file mode 100644
index 61c97db99b3..00000000000
--- a/libjava/org/omg/CosNaming/BindingIteratorOperations.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingIteratorOperations__
-#define __org_omg_CosNaming_BindingIteratorOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class BindingHolder;
-          class BindingIteratorOperations;
-          class BindingListHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingIteratorOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void destroy() = 0;
-  virtual jboolean next_n(jint, ::org::omg::CosNaming::BindingListHolder *) = 0;
-  virtual jboolean next_one(::org::omg::CosNaming::BindingHolder *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CosNaming_BindingIteratorOperations__
diff --git a/libjava/org/omg/CosNaming/BindingIteratorPOA.h b/libjava/org/omg/CosNaming/BindingIteratorPOA.h
deleted file mode 100644
index 64f41248527..00000000000
--- a/libjava/org/omg/CosNaming/BindingIteratorPOA.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingIteratorPOA__
-#define __org_omg_CosNaming_BindingIteratorPOA__
-
-#pragma interface
-
-#include <org/omg/PortableServer/Servant.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingHolder;
-          class BindingIterator;
-          class BindingIteratorPOA;
-          class BindingListHolder;
-      }
-      namespace PortableServer
-      {
-          class POA;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingIteratorPOA : public ::org::omg::PortableServer::Servant
-{
-
-public:
-  BindingIteratorPOA();
-  virtual JArray< ::java::lang::String * > * _all_interfaces(::org::omg::PortableServer::POA *, JArray< jbyte > *);
-  virtual ::org::omg::CORBA::portable::OutputStream * _invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *);
-  virtual ::org::omg::CosNaming::BindingIterator * _this();
-  virtual ::org::omg::CosNaming::BindingIterator * _this(::org::omg::CORBA::ORB *);
-  virtual void destroy() = 0;
-  virtual jboolean next_n(jint, ::org::omg::CosNaming::BindingListHolder *) = 0;
-  virtual jboolean next_one(::org::omg::CosNaming::BindingHolder *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_BindingIteratorPOA__
diff --git a/libjava/org/omg/CosNaming/BindingListHelper.h b/libjava/org/omg/CosNaming/BindingListHelper.h
deleted file mode 100644
index 6c3a9cb09ad..00000000000
--- a/libjava/org/omg/CosNaming/BindingListHelper.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingListHelper__
-#define __org_omg_CosNaming_BindingListHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class Binding;
-          class BindingListHelper;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingListHelper : public ::java::lang::Object
-{
-
-public:
-  BindingListHelper();
-  static JArray< ::org::omg::CosNaming::Binding * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::CosNaming::Binding * > *);
-  static JArray< ::org::omg::CosNaming::Binding * > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::CosNaming::Binding * > *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_BindingListHelper__
diff --git a/libjava/org/omg/CosNaming/BindingListHolder.h b/libjava/org/omg/CosNaming/BindingListHolder.h
deleted file mode 100644
index 05ce6ab431e..00000000000
--- a/libjava/org/omg/CosNaming/BindingListHolder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingListHolder__
-#define __org_omg_CosNaming_BindingListHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class Binding;
-          class BindingListHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingListHolder : public ::java::lang::Object
-{
-
-public:
-  BindingListHolder();
-  BindingListHolder(JArray< ::org::omg::CosNaming::Binding * > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< ::org::omg::CosNaming::Binding * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_BindingListHolder__
diff --git a/libjava/org/omg/CosNaming/BindingType.h b/libjava/org/omg/CosNaming/BindingType.h
deleted file mode 100644
index 40c49049847..00000000000
--- a/libjava/org/omg/CosNaming/BindingType.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingType__
-#define __org_omg_CosNaming_BindingType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class BindingType;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingType : public ::java::lang::Object
-{
-
-public: // actually protected
-  BindingType(jint);
-public:
-  static ::org::omg::CosNaming::BindingType * from_int(jint);
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = 3735105633408228513LL;
-public:
-  static const jint _ncontext = 1;
-  static const jint _nobject = 0;
-  static ::org::omg::CosNaming::BindingType * ncontext;
-  static ::org::omg::CosNaming::BindingType * nobject;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_BindingType__
diff --git a/libjava/org/omg/CosNaming/BindingTypeHelper.h b/libjava/org/omg/CosNaming/BindingTypeHelper.h
deleted file mode 100644
index 4a020988f8a..00000000000
--- a/libjava/org/omg/CosNaming/BindingTypeHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingTypeHelper__
-#define __org_omg_CosNaming_BindingTypeHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingType;
-          class BindingTypeHelper;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingTypeHelper : public ::java::lang::Object
-{
-
-public:
-  BindingTypeHelper();
-  static ::org::omg::CosNaming::BindingType * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::BindingType *);
-  static ::org::omg::CosNaming::BindingType * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::BindingType *);
-private:
-  static ::java::lang::String * id__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_BindingTypeHelper__
diff --git a/libjava/org/omg/CosNaming/BindingTypeHolder.h b/libjava/org/omg/CosNaming/BindingTypeHolder.h
deleted file mode 100644
index a7d0dd3ea34..00000000000
--- a/libjava/org/omg/CosNaming/BindingTypeHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_BindingTypeHolder__
-#define __org_omg_CosNaming_BindingTypeHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingType;
-          class BindingTypeHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::BindingTypeHolder : public ::java::lang::Object
-{
-
-public:
-  BindingTypeHolder();
-  BindingTypeHolder(::org::omg::CosNaming::BindingType *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::BindingType * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_BindingTypeHolder__
diff --git a/libjava/org/omg/CosNaming/IstringHelper.h b/libjava/org/omg/CosNaming/IstringHelper.h
deleted file mode 100644
index 91c1873a313..00000000000
--- a/libjava/org/omg/CosNaming/IstringHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_IstringHelper__
-#define __org_omg_CosNaming_IstringHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class IstringHelper;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::IstringHelper : public ::java::lang::Object
-{
-
-public:
-  IstringHelper();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_IstringHelper__
diff --git a/libjava/org/omg/CosNaming/NameComponent.h b/libjava/org/omg/CosNaming/NameComponent.h
deleted file mode 100644
index 467aecac652..00000000000
--- a/libjava/org/omg/CosNaming/NameComponent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NameComponent__
-#define __org_omg_CosNaming_NameComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class NameComponent;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NameComponent : public ::java::lang::Object
-{
-
-public:
-  NameComponent();
-  NameComponent(::java::lang::String *, ::java::lang::String *);
-  jboolean equals(::java::lang::Object *);
-  ::java::lang::String * toString();
-  jint hashCode();
-private:
-  static const jlong serialVersionUID = -1052538183391762390LL;
-public:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::java::lang::String * kind;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NameComponent__
diff --git a/libjava/org/omg/CosNaming/NameComponentHelper.h b/libjava/org/omg/CosNaming/NameComponentHelper.h
deleted file mode 100644
index d01a929998c..00000000000
--- a/libjava/org/omg/CosNaming/NameComponentHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NameComponentHelper__
-#define __org_omg_CosNaming_NameComponentHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class NameComponent;
-          class NameComponentHelper;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NameComponentHelper : public ::java::lang::Object
-{
-
-public:
-  NameComponentHelper();
-  static ::org::omg::CosNaming::NameComponent * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::NameComponent *);
-  static ::org::omg::CosNaming::NameComponent * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::NameComponent *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NameComponentHelper__
diff --git a/libjava/org/omg/CosNaming/NameComponentHolder.h b/libjava/org/omg/CosNaming/NameComponentHolder.h
deleted file mode 100644
index f78c9a85f65..00000000000
--- a/libjava/org/omg/CosNaming/NameComponentHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NameComponentHolder__
-#define __org_omg_CosNaming_NameComponentHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class NameComponent;
-          class NameComponentHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NameComponentHolder : public ::java::lang::Object
-{
-
-public:
-  NameComponentHolder();
-  NameComponentHolder(::org::omg::CosNaming::NameComponent *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::NameComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NameComponentHolder__
diff --git a/libjava/org/omg/CosNaming/NameHelper.h b/libjava/org/omg/CosNaming/NameHelper.h
deleted file mode 100644
index c5dcb45f41e..00000000000
--- a/libjava/org/omg/CosNaming/NameHelper.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NameHelper__
-#define __org_omg_CosNaming_NameHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class NameComponent;
-          class NameHelper;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NameHelper : public ::java::lang::Object
-{
-
-public:
-  NameHelper();
-  static JArray< ::org::omg::CosNaming::NameComponent * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::CosNaming::NameComponent * > *);
-  static JArray< ::org::omg::CosNaming::NameComponent * > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::CosNaming::NameComponent * > *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NameHelper__
diff --git a/libjava/org/omg/CosNaming/NameHolder.h b/libjava/org/omg/CosNaming/NameHolder.h
deleted file mode 100644
index 78da1ffd15f..00000000000
--- a/libjava/org/omg/CosNaming/NameHolder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NameHolder__
-#define __org_omg_CosNaming_NameHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class NameComponent;
-          class NameHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NameHolder : public ::java::lang::Object
-{
-
-public:
-  NameHolder();
-  NameHolder(JArray< ::org::omg::CosNaming::NameComponent * > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  JArray< ::org::omg::CosNaming::NameComponent * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NameHolder__
diff --git a/libjava/org/omg/CosNaming/NamingContext.h b/libjava/org/omg/CosNaming/NamingContext.h
deleted file mode 100644
index 64c07a7915b..00000000000
--- a/libjava/org/omg/CosNaming/NamingContext.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContext__
-#define __org_omg_CosNaming_NamingContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace CosNaming
-      {
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class NameComponent;
-          class NamingContext;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContext : public ::java::lang::Object
-{
-
-public:
-  virtual void bind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void bind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * bind_new_context(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void destroy() = 0;
-  virtual void list(jint, ::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * new_context() = 0;
-  virtual void rebind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void rebind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CORBA::Object * resolve(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void unbind(JArray< ::org::omg::CosNaming::NameComponent * > *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CosNaming_NamingContext__
diff --git a/libjava/org/omg/CosNaming/NamingContextExt.h b/libjava/org/omg/CosNaming/NamingContextExt.h
deleted file mode 100644
index 5faeb7ec893..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExt.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExt__
-#define __org_omg_CosNaming_NamingContextExt__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace CosNaming
-      {
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class NameComponent;
-          class NamingContext;
-          class NamingContextExt;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExt : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Object * resolve_str(::java::lang::String *) = 0;
-  virtual JArray< ::org::omg::CosNaming::NameComponent * > * to_name(::java::lang::String *) = 0;
-  virtual ::java::lang::String * to_string(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual ::java::lang::String * to_url(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void bind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void bind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * bind_new_context(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void destroy() = 0;
-  virtual void list(jint, ::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * new_context() = 0;
-  virtual void rebind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void rebind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CORBA::Object * resolve(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void unbind(JArray< ::org::omg::CosNaming::NameComponent * > *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CosNaming_NamingContextExt__
diff --git a/libjava/org/omg/CosNaming/NamingContextExtHelper.h b/libjava/org/omg/CosNaming/NamingContextExtHelper.h
deleted file mode 100644
index 7ebda331b7c..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExtHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExtHelper__
-#define __org_omg_CosNaming_NamingContextExtHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class NamingContextExt;
-          class NamingContextExtHelper;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExtHelper : public ::java::lang::Object
-{
-
-public:
-  NamingContextExtHelper();
-  static ::org::omg::CosNaming::NamingContextExt * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::NamingContextExt *);
-  static ::org::omg::CosNaming::NamingContextExt * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CosNaming::NamingContextExt * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CosNaming::NamingContextExt * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::NamingContextExt *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextExtHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextExtHolder.h b/libjava/org/omg/CosNaming/NamingContextExtHolder.h
deleted file mode 100644
index f284357c415..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExtHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExtHolder__
-#define __org_omg_CosNaming_NamingContextExtHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class NamingContextExt;
-          class NamingContextExtHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExtHolder : public ::java::lang::Object
-{
-
-public:
-  NamingContextExtHolder();
-  NamingContextExtHolder(::org::omg::CosNaming::NamingContextExt *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::NamingContextExt * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextExtHolder__
diff --git a/libjava/org/omg/CosNaming/NamingContextExtOperations.h b/libjava/org/omg/CosNaming/NamingContextExtOperations.h
deleted file mode 100644
index 3799c676b32..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExtOperations.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExtOperations__
-#define __org_omg_CosNaming_NamingContextExtOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace CosNaming
-      {
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class NameComponent;
-          class NamingContext;
-          class NamingContextExtOperations;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExtOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Object * resolve_str(::java::lang::String *) = 0;
-  virtual JArray< ::org::omg::CosNaming::NameComponent * > * to_name(::java::lang::String *) = 0;
-  virtual ::java::lang::String * to_string(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual ::java::lang::String * to_url(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void bind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void bind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * bind_new_context(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void destroy() = 0;
-  virtual void list(jint, ::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * new_context() = 0;
-  virtual void rebind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void rebind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CORBA::Object * resolve(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void unbind(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CosNaming_NamingContextExtOperations__
diff --git a/libjava/org/omg/CosNaming/NamingContextExtPOA.h b/libjava/org/omg/CosNaming/NamingContextExtPOA.h
deleted file mode 100644
index e9dfe396705..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExtPOA.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExtPOA__
-#define __org_omg_CosNaming_NamingContextExtPOA__
-
-#pragma interface
-
-#include <org/omg/PortableServer/Servant.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class Object;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class NameComponent;
-          class NamingContext;
-          class NamingContextExt;
-          class NamingContextExtPOA;
-      }
-      namespace PortableServer
-      {
-          class POA;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExtPOA : public ::org::omg::PortableServer::Servant
-{
-
-public:
-  NamingContextExtPOA();
-  virtual JArray< ::java::lang::String * > * _all_interfaces(::org::omg::PortableServer::POA *, JArray< jbyte > *);
-  virtual ::org::omg::CORBA::portable::OutputStream * _invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *);
-public: // actually package-private
-  virtual ::org::omg::CORBA::portable::OutputStream * super_invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *);
-public:
-  virtual ::org::omg::CosNaming::NamingContextExt * _this();
-  virtual ::org::omg::CosNaming::NamingContextExt * _this(::org::omg::CORBA::ORB *);
-  virtual ::org::omg::CORBA::Object * resolve_str(::java::lang::String *) = 0;
-  virtual JArray< ::org::omg::CosNaming::NameComponent * > * to_name(::java::lang::String *) = 0;
-  virtual ::java::lang::String * to_string(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual ::java::lang::String * to_url(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void bind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void bind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * bind_new_context(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void destroy() = 0;
-  virtual void list(jint, ::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * new_context() = 0;
-  virtual void rebind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void rebind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CORBA::Object * resolve(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void unbind(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextExtPOA__
diff --git a/libjava/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.h b/libjava/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.h
deleted file mode 100644
index 48755202d51..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExtPackage_AddressHelper__
-#define __org_omg_CosNaming_NamingContextExtPackage_AddressHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextExtPackage
-        {
-            class AddressHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExtPackage::AddressHelper : public ::java::lang::Object
-{
-
-public:
-  AddressHelper();
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextExtPackage_AddressHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.h b/libjava/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.h
deleted file mode 100644
index bf32d51f0c5..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExtPackage_InvalidAddress__
-#define __org_omg_CosNaming_NamingContextExtPackage_InvalidAddress__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-        namespace NamingContextExtPackage
-        {
-            class InvalidAddress;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExtPackage::InvalidAddress : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InvalidAddress();
-  InvalidAddress(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3775583235364760385LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextExtPackage_InvalidAddress__
diff --git a/libjava/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.h b/libjava/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.h
deleted file mode 100644
index 52fe009bec0..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExtPackage_InvalidAddressHelper__
-#define __org_omg_CosNaming_NamingContextExtPackage_InvalidAddressHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextExtPackage
-        {
-            class InvalidAddress;
-            class InvalidAddressHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExtPackage::InvalidAddressHelper : public ::java::lang::Object
-{
-
-public:
-  InvalidAddressHelper();
-  static ::org::omg::CosNaming::NamingContextExtPackage::InvalidAddress * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::NamingContextExtPackage::InvalidAddress *);
-  static ::org::omg::CosNaming::NamingContextExtPackage::InvalidAddress * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::NamingContextExtPackage::InvalidAddress *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextExtPackage_InvalidAddressHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.h b/libjava/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.h
deleted file mode 100644
index a1902974dad..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExtPackage_InvalidAddressHolder__
-#define __org_omg_CosNaming_NamingContextExtPackage_InvalidAddressHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextExtPackage
-        {
-            class InvalidAddress;
-            class InvalidAddressHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExtPackage::InvalidAddressHolder : public ::java::lang::Object
-{
-
-public:
-  InvalidAddressHolder();
-  InvalidAddressHolder(::org::omg::CosNaming::NamingContextExtPackage::InvalidAddress *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::NamingContextExtPackage::InvalidAddress * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextExtPackage_InvalidAddressHolder__
diff --git a/libjava/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.h b/libjava/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.h
deleted file mode 100644
index a7c3eddbb2e..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExtPackage_StringNameHelper__
-#define __org_omg_CosNaming_NamingContextExtPackage_StringNameHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextExtPackage
-        {
-            class StringNameHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExtPackage::StringNameHelper : public ::java::lang::Object
-{
-
-public:
-  StringNameHelper();
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextExtPackage_StringNameHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.h b/libjava/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.h
deleted file mode 100644
index 1460c6761e4..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextExtPackage_URLStringHelper__
-#define __org_omg_CosNaming_NamingContextExtPackage_URLStringHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextExtPackage
-        {
-            class URLStringHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextExtPackage::URLStringHelper : public ::java::lang::Object
-{
-
-public:
-  URLStringHelper();
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextExtPackage_URLStringHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextHelper.h b/libjava/org/omg/CosNaming/NamingContextHelper.h
deleted file mode 100644
index 96c7bbeaff5..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextHelper__
-#define __org_omg_CosNaming_NamingContextHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class NamingContext;
-          class NamingContextHelper;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextHelper : public ::java::lang::Object
-{
-
-public:
-  NamingContextHelper();
-  static ::org::omg::CosNaming::NamingContext * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::NamingContext *);
-  static ::org::omg::CosNaming::NamingContext * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CosNaming::NamingContext * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CosNaming::NamingContext * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::NamingContext *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextHolder.h b/libjava/org/omg/CosNaming/NamingContextHolder.h
deleted file mode 100644
index aaee3d2fd73..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextHolder__
-#define __org_omg_CosNaming_NamingContextHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class NamingContext;
-          class NamingContextHolder;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextHolder : public ::java::lang::Object
-{
-
-public:
-  NamingContextHolder();
-  NamingContextHolder(::org::omg::CosNaming::NamingContext *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::NamingContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextHolder__
diff --git a/libjava/org/omg/CosNaming/NamingContextOperations.h b/libjava/org/omg/CosNaming/NamingContextOperations.h
deleted file mode 100644
index bb7385b8b46..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextOperations.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextOperations__
-#define __org_omg_CosNaming_NamingContextOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace CosNaming
-      {
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class NameComponent;
-          class NamingContext;
-          class NamingContextOperations;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void bind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void bind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * bind_new_context(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void destroy() = 0;
-  virtual void list(jint, ::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * new_context() = 0;
-  virtual void rebind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void rebind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CORBA::Object * resolve(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void unbind(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_CosNaming_NamingContextOperations__
diff --git a/libjava/org/omg/CosNaming/NamingContextPOA.h b/libjava/org/omg/CosNaming/NamingContextPOA.h
deleted file mode 100644
index c6e595e2221..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPOA.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPOA__
-#define __org_omg_CosNaming_NamingContextPOA__
-
-#pragma interface
-
-#include <org/omg/PortableServer/Servant.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class Object;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class NameComponent;
-          class NamingContext;
-          class NamingContextPOA;
-      }
-      namespace PortableServer
-      {
-          class POA;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPOA : public ::org::omg::PortableServer::Servant
-{
-
-public:
-  NamingContextPOA();
-  virtual JArray< ::java::lang::String * > * _all_interfaces(::org::omg::PortableServer::POA *, JArray< jbyte > *);
-  virtual ::org::omg::CORBA::portable::OutputStream * _invoke(::java::lang::String *, ::org::omg::CORBA::portable::InputStream *, ::org::omg::CORBA::portable::ResponseHandler *);
-  virtual ::org::omg::CosNaming::NamingContext * _this();
-  virtual ::org::omg::CosNaming::NamingContext * _this(::org::omg::CORBA::ORB *);
-  virtual void bind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void bind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * bind_new_context(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void destroy() = 0;
-  virtual void list(jint, ::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * new_context() = 0;
-  virtual void rebind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void rebind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CORBA::Object * resolve(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void unbind(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPOA__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/AlreadyBound.h b/libjava/org/omg/CosNaming/NamingContextPackage/AlreadyBound.h
deleted file mode 100644
index 0a28e186f0d..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/AlreadyBound.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_AlreadyBound__
-#define __org_omg_CosNaming_NamingContextPackage_AlreadyBound__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class AlreadyBound;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::AlreadyBound : public ::org::omg::CORBA::UserException
-{
-
-public:
-  AlreadyBound();
-  AlreadyBound(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5456929050527586560LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_AlreadyBound__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.h b/libjava/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.h
deleted file mode 100644
index 4f326a14e94..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_AlreadyBoundHelper__
-#define __org_omg_CosNaming_NamingContextPackage_AlreadyBoundHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class AlreadyBound;
-            class AlreadyBoundHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::AlreadyBoundHelper : public ::java::lang::Object
-{
-
-public:
-  AlreadyBoundHelper();
-  static ::org::omg::CosNaming::NamingContextPackage::AlreadyBound * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::NamingContextPackage::AlreadyBound *);
-  static ::org::omg::CosNaming::NamingContextPackage::AlreadyBound * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::NamingContextPackage::AlreadyBound *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_AlreadyBoundHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.h b/libjava/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.h
deleted file mode 100644
index 3cb61acf807..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_AlreadyBoundHolder__
-#define __org_omg_CosNaming_NamingContextPackage_AlreadyBoundHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class AlreadyBound;
-            class AlreadyBoundHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::AlreadyBoundHolder : public ::java::lang::Object
-{
-
-public:
-  AlreadyBoundHolder();
-  AlreadyBoundHolder(::org::omg::CosNaming::NamingContextPackage::AlreadyBound *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::NamingContextPackage::AlreadyBound * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_AlreadyBoundHolder__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/CannotProceed.h b/libjava/org/omg/CosNaming/NamingContextPackage/CannotProceed.h
deleted file mode 100644
index 85f92cea052..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/CannotProceed.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_CannotProceed__
-#define __org_omg_CosNaming_NamingContextPackage_CannotProceed__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class NameComponent;
-          class NamingContext;
-        namespace NamingContextPackage
-        {
-            class CannotProceed;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::CannotProceed : public ::org::omg::CORBA::UserException
-{
-
-public:
-  CannotProceed();
-  CannotProceed(::org::omg::CosNaming::NamingContext *, JArray< ::org::omg::CosNaming::NameComponent * > *);
-  CannotProceed(::java::lang::String *, ::org::omg::CosNaming::NamingContext *, JArray< ::org::omg::CosNaming::NameComponent * > *);
-private:
-  static const jlong serialVersionUID = -8627405252527310782LL;
-public:
-  ::org::omg::CosNaming::NamingContext * __attribute__((aligned(__alignof__( ::org::omg::CORBA::UserException)))) cxt;
-  JArray< ::org::omg::CosNaming::NameComponent * > * rest_of_name;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_CannotProceed__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.h b/libjava/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.h
deleted file mode 100644
index 26c1c3293b4..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_CannotProceedHelper__
-#define __org_omg_CosNaming_NamingContextPackage_CannotProceedHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class CannotProceed;
-            class CannotProceedHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::CannotProceedHelper : public ::java::lang::Object
-{
-
-public:
-  CannotProceedHelper();
-  static ::org::omg::CosNaming::NamingContextPackage::CannotProceed * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::NamingContextPackage::CannotProceed *);
-  static ::org::omg::CosNaming::NamingContextPackage::CannotProceed * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::NamingContextPackage::CannotProceed *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_CannotProceedHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.h b/libjava/org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.h
deleted file mode 100644
index ba735f5aa64..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_CannotProceedHolder__
-#define __org_omg_CosNaming_NamingContextPackage_CannotProceedHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class CannotProceed;
-            class CannotProceedHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::CannotProceedHolder : public ::java::lang::Object
-{
-
-public:
-  CannotProceedHolder();
-  CannotProceedHolder(::org::omg::CosNaming::NamingContextPackage::CannotProceed *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::NamingContextPackage::CannotProceed * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_CannotProceedHolder__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/InvalidName.h b/libjava/org/omg/CosNaming/NamingContextPackage/InvalidName.h
deleted file mode 100644
index d5dccf7fddd..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/InvalidName.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_InvalidName__
-#define __org_omg_CosNaming_NamingContextPackage_InvalidName__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class InvalidName;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::InvalidName : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InvalidName();
-  InvalidName(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 786404864997961704LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_InvalidName__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.h b/libjava/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.h
deleted file mode 100644
index aaa771ba254..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_InvalidNameHelper__
-#define __org_omg_CosNaming_NamingContextPackage_InvalidNameHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class InvalidName;
-            class InvalidNameHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::InvalidNameHelper : public ::java::lang::Object
-{
-
-public:
-  InvalidNameHelper();
-  static ::org::omg::CosNaming::NamingContextPackage::InvalidName * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::NamingContextPackage::InvalidName *);
-  static ::org::omg::CosNaming::NamingContextPackage::InvalidName * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::NamingContextPackage::InvalidName *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_InvalidNameHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.h b/libjava/org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.h
deleted file mode 100644
index 3b77117a608..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_InvalidNameHolder__
-#define __org_omg_CosNaming_NamingContextPackage_InvalidNameHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class InvalidName;
-            class InvalidNameHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::InvalidNameHolder : public ::java::lang::Object
-{
-
-public:
-  InvalidNameHolder();
-  InvalidNameHolder(::org::omg::CosNaming::NamingContextPackage::InvalidName *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::NamingContextPackage::InvalidName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_InvalidNameHolder__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/NotEmpty.h b/libjava/org/omg/CosNaming/NamingContextPackage/NotEmpty.h
deleted file mode 100644
index 38555ce46e1..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/NotEmpty.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_NotEmpty__
-#define __org_omg_CosNaming_NamingContextPackage_NotEmpty__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class NotEmpty;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::NotEmpty : public ::org::omg::CORBA::UserException
-{
-
-public:
-  NotEmpty();
-  NotEmpty(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7120362687417045881LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_NotEmpty__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.h b/libjava/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.h
deleted file mode 100644
index 85ffa61eb0e..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_NotEmptyHelper__
-#define __org_omg_CosNaming_NamingContextPackage_NotEmptyHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class NotEmpty;
-            class NotEmptyHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::NotEmptyHelper : public ::java::lang::Object
-{
-
-public:
-  NotEmptyHelper();
-  static ::org::omg::CosNaming::NamingContextPackage::NotEmpty * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::NamingContextPackage::NotEmpty *);
-  static ::org::omg::CosNaming::NamingContextPackage::NotEmpty * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::NamingContextPackage::NotEmpty *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_NotEmptyHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.h b/libjava/org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.h
deleted file mode 100644
index 55c505fae9e..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_NotEmptyHolder__
-#define __org_omg_CosNaming_NamingContextPackage_NotEmptyHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class NotEmpty;
-            class NotEmptyHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::NotEmptyHolder : public ::java::lang::Object
-{
-
-public:
-  NotEmptyHolder();
-  NotEmptyHolder(::org::omg::CosNaming::NamingContextPackage::NotEmpty *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::NamingContextPackage::NotEmpty * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_NotEmptyHolder__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/NotFound.h b/libjava/org/omg/CosNaming/NamingContextPackage/NotFound.h
deleted file mode 100644
index d6c37a6123b..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/NotFound.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_NotFound__
-#define __org_omg_CosNaming_NamingContextPackage_NotFound__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-          class NameComponent;
-        namespace NamingContextPackage
-        {
-            class NotFound;
-            class NotFoundReason;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::NotFound : public ::org::omg::CORBA::UserException
-{
-
-public:
-  NotFound();
-  NotFound(::org::omg::CosNaming::NamingContextPackage::NotFoundReason *, JArray< ::org::omg::CosNaming::NameComponent * > *);
-  NotFound(::java::lang::String *, ::org::omg::CosNaming::NamingContextPackage::NotFoundReason *, JArray< ::org::omg::CosNaming::NameComponent * > *);
-private:
-  static const jlong serialVersionUID = -7539098836265502514LL;
-public:
-  ::org::omg::CosNaming::NamingContextPackage::NotFoundReason * __attribute__((aligned(__alignof__( ::org::omg::CORBA::UserException)))) why;
-  JArray< ::org::omg::CosNaming::NameComponent * > * rest_of_name;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_NotFound__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.h b/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.h
deleted file mode 100644
index 7f0fa9b563c..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_NotFoundHelper__
-#define __org_omg_CosNaming_NamingContextPackage_NotFoundHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class NotFound;
-            class NotFoundHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::NotFoundHelper : public ::java::lang::Object
-{
-
-public:
-  NotFoundHelper();
-  static ::org::omg::CosNaming::NamingContextPackage::NotFound * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::NamingContextPackage::NotFound *);
-  static ::org::omg::CosNaming::NamingContextPackage::NotFound * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::NamingContextPackage::NotFound *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_NotFoundHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundHolder.h b/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundHolder.h
deleted file mode 100644
index 9e525afdf16..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundHolder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_NotFoundHolder__
-#define __org_omg_CosNaming_NamingContextPackage_NotFoundHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class NotFound;
-            class NotFoundHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::NotFoundHolder : public ::java::lang::Object
-{
-
-public:
-  NotFoundHolder();
-  NotFoundHolder(::org::omg::CosNaming::NamingContextPackage::NotFound *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::NamingContextPackage::NotFound * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_NotFoundHolder__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundReason.h b/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundReason.h
deleted file mode 100644
index a45d21c0249..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundReason.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_NotFoundReason__
-#define __org_omg_CosNaming_NamingContextPackage_NotFoundReason__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class NotFoundReason;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::NotFoundReason : public ::java::lang::Object
-{
-
-public: // actually protected
-  NotFoundReason(jint);
-public:
-  static ::org::omg::CosNaming::NamingContextPackage::NotFoundReason * from_int(jint);
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = -5689237060527596081LL;
-public:
-  static const jint _missing_node = 0;
-  static const jint _not_context = 1;
-  static const jint _not_object = 2;
-  static ::org::omg::CosNaming::NamingContextPackage::NotFoundReason * missing_node;
-  static ::org::omg::CosNaming::NamingContextPackage::NotFoundReason * not_context;
-  static ::org::omg::CosNaming::NamingContextPackage::NotFoundReason * not_object;
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value__;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_NotFoundReason__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.h b/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.h
deleted file mode 100644
index 557eaf89107..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_NotFoundReasonHelper__
-#define __org_omg_CosNaming_NamingContextPackage_NotFoundReasonHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class NotFoundReason;
-            class NotFoundReasonHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::NotFoundReasonHelper : public ::java::lang::Object
-{
-
-public:
-  NotFoundReasonHelper();
-  static ::org::omg::CosNaming::NamingContextPackage::NotFoundReason * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::CosNaming::NamingContextPackage::NotFoundReason *);
-  static ::org::omg::CosNaming::NamingContextPackage::NotFoundReason * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::CosNaming::NamingContextPackage::NotFoundReason *);
-private:
-  static ::java::lang::String * _id;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_NotFoundReasonHelper__
diff --git a/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.h b/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.h
deleted file mode 100644
index cb7343e5752..00000000000
--- a/libjava/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming_NamingContextPackage_NotFoundReasonHolder__
-#define __org_omg_CosNaming_NamingContextPackage_NotFoundReasonHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace CosNaming
-      {
-        namespace NamingContextPackage
-        {
-            class NotFoundReason;
-            class NotFoundReasonHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::NamingContextPackage::NotFoundReasonHolder : public ::java::lang::Object
-{
-
-public:
-  NotFoundReasonHolder();
-  NotFoundReasonHolder(::org::omg::CosNaming::NamingContextPackage::NotFoundReason *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CosNaming::NamingContextPackage::NotFoundReason * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming_NamingContextPackage_NotFoundReasonHolder__
diff --git a/libjava/org/omg/CosNaming/_BindingIteratorImplBase.h b/libjava/org/omg/CosNaming/_BindingIteratorImplBase.h
deleted file mode 100644
index 0b287bf7190..00000000000
--- a/libjava/org/omg/CosNaming/_BindingIteratorImplBase.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming__BindingIteratorImplBase__
-#define __org_omg_CosNaming__BindingIteratorImplBase__
-
-#pragma interface
-
-#include <org/omg/CORBA/DynamicImplementation.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ServerRequest;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingHolder;
-          class BindingListHolder;
-          class _BindingIteratorImplBase;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::_BindingIteratorImplBase : public ::org::omg::CORBA::DynamicImplementation
-{
-
-public:
-  _BindingIteratorImplBase();
-  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 void invoke(::org::omg::CORBA::ServerRequest *);
-  virtual void destroy() = 0;
-  virtual jboolean next_n(jint, ::org::omg::CosNaming::BindingListHolder *) = 0;
-  virtual jboolean next_one(::org::omg::CosNaming::BindingHolder *) = 0;
-private:
-  static const jlong serialVersionUID = 3472591176635005503LL;
-  static JArray< ::java::lang::String * > * ids;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming__BindingIteratorImplBase__
diff --git a/libjava/org/omg/CosNaming/_BindingIteratorStub.h b/libjava/org/omg/CosNaming/_BindingIteratorStub.h
deleted file mode 100644
index 87ba884c694..00000000000
--- a/libjava/org/omg/CosNaming/_BindingIteratorStub.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming__BindingIteratorStub__
-#define __org_omg_CosNaming__BindingIteratorStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class Delegate;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingHolder;
-          class BindingListHolder;
-          class _BindingIteratorStub;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::_BindingIteratorStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _BindingIteratorStub();
-public: // actually package-private
-  _BindingIteratorStub(::org::omg::CORBA::portable::Delegate *);
-public:
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual jboolean _non_existent();
-  virtual void destroy();
-  virtual jboolean next_n(jint, ::org::omg::CosNaming::BindingListHolder *);
-  virtual jboolean next_one(::org::omg::CosNaming::BindingHolder *);
-public: // actually protected
-  virtual void finalize();
-private:
-  static const jlong serialVersionUID = 8969257760771186704LL;
-  jboolean __attribute__((aligned(__alignof__( ::org::omg::CORBA::portable::ObjectImpl)))) destroyed;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming__BindingIteratorStub__
diff --git a/libjava/org/omg/CosNaming/_NamingContextExtImplBase.h b/libjava/org/omg/CosNaming/_NamingContextExtImplBase.h
deleted file mode 100644
index fd2a75b2537..00000000000
--- a/libjava/org/omg/CosNaming/_NamingContextExtImplBase.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming__NamingContextExtImplBase__
-#define __org_omg_CosNaming__NamingContextExtImplBase__
-
-#pragma interface
-
-#include <org/omg/CosNaming/_NamingContextImplBase.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-          class ServerRequest;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace CosNaming
-      {
-          class NameComponent;
-          class _NamingContextExtImplBase;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::_NamingContextExtImplBase : public ::org::omg::CosNaming::_NamingContextImplBase
-{
-
-public:
-  _NamingContextExtImplBase();
-  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 void invoke(::org::omg::CORBA::ServerRequest *);
-  virtual ::org::omg::CORBA::Object * resolve_str(::java::lang::String *) = 0;
-  virtual JArray< ::org::omg::CosNaming::NameComponent * > * to_name(::java::lang::String *) = 0;
-  virtual ::java::lang::String * to_string(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual ::java::lang::String * to_url(::java::lang::String *, ::java::lang::String *) = 0;
-public: // actually package-private
-  static ::java::util::Hashtable * _methods;
-private:
-  static JArray< ::java::lang::String * > * __ids;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming__NamingContextExtImplBase__
diff --git a/libjava/org/omg/CosNaming/_NamingContextExtStub.h b/libjava/org/omg/CosNaming/_NamingContextExtStub.h
deleted file mode 100644
index 25557ed53da..00000000000
--- a/libjava/org/omg/CosNaming/_NamingContextExtStub.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming__NamingContextExtStub__
-#define __org_omg_CosNaming__NamingContextExtStub__
-
-#pragma interface
-
-#include <org/omg/CosNaming/_NamingContextStub.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace CORBA
-    {
-      namespace NamingService
-      {
-          class NameTransformer;
-      }
-    }
-  }
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-        namespace portable
-        {
-            class Delegate;
-        }
-      }
-      namespace CosNaming
-      {
-          class NameComponent;
-          class _NamingContextExtStub;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::_NamingContextExtStub : public ::org::omg::CosNaming::_NamingContextStub
-{
-
-public:
-  _NamingContextExtStub();
-public: // actually package-private
-  _NamingContextExtStub(::org::omg::CORBA::portable::Delegate *);
-public:
-  virtual JArray< ::java::lang::String * > * _ids();
-  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 *);
-private:
-  static const jlong serialVersionUID = 6333293895664182866LL;
-  static JArray< ::java::lang::String * > * __ids;
-  ::gnu::CORBA::NamingService::NameTransformer * __attribute__((aligned(__alignof__( ::org::omg::CosNaming::_NamingContextStub)))) converter;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming__NamingContextExtStub__
diff --git a/libjava/org/omg/CosNaming/_NamingContextImplBase.h b/libjava/org/omg/CosNaming/_NamingContextImplBase.h
deleted file mode 100644
index a1837784a67..00000000000
--- a/libjava/org/omg/CosNaming/_NamingContextImplBase.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming__NamingContextImplBase__
-#define __org_omg_CosNaming__NamingContextImplBase__
-
-#pragma interface
-
-#include <org/omg/CORBA/DynamicImplementation.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-          class ServerRequest;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class NameComponent;
-          class NamingContext;
-          class _NamingContextImplBase;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::_NamingContextImplBase : public ::org::omg::CORBA::DynamicImplementation
-{
-
-public:
-  _NamingContextImplBase();
-  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 void invoke(::org::omg::CORBA::ServerRequest *);
-  virtual void bind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void bind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * bind_new_context(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void destroy() = 0;
-  virtual void list(jint, ::org::omg::CosNaming::BindingListHolder *, ::org::omg::CosNaming::BindingIteratorHolder *) = 0;
-  virtual ::org::omg::CosNaming::NamingContext * new_context() = 0;
-  virtual void rebind(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CORBA::Object *) = 0;
-  virtual void rebind_context(JArray< ::org::omg::CosNaming::NameComponent * > *, ::org::omg::CosNaming::NamingContext *) = 0;
-  virtual ::org::omg::CORBA::Object * resolve(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-  virtual void unbind(JArray< ::org::omg::CosNaming::NameComponent * > *) = 0;
-private:
-  static const jlong serialVersionUID = -114280294134561035LL;
-public: // actually package-private
-  static ::java::util::Hashtable * methods;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming__NamingContextImplBase__
diff --git a/libjava/org/omg/CosNaming/_NamingContextStub.h b/libjava/org/omg/CosNaming/_NamingContextStub.h
deleted file mode 100644
index fc0634f63b6..00000000000
--- a/libjava/org/omg/CosNaming/_NamingContextStub.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_CosNaming__NamingContextStub__
-#define __org_omg_CosNaming__NamingContextStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-        namespace portable
-        {
-            class Delegate;
-            class InputStream;
-        }
-      }
-      namespace CosNaming
-      {
-          class BindingIteratorHolder;
-          class BindingListHolder;
-          class NameComponent;
-          class NamingContext;
-          class _NamingContextStub;
-      }
-    }
-  }
-}
-
-class org::omg::CosNaming::_NamingContextStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _NamingContextStub();
-public: // actually package-private
-  _NamingContextStub(::org::omg::CORBA::portable::Delegate *);
-public:
-  virtual JArray< ::java::lang::String * > * _ids();
-  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 * > *);
-public: // actually package-private
-  virtual void throw4(::org::omg::CORBA::portable::InputStream *, ::java::lang::String *);
-  virtual void throw5(::org::omg::CORBA::portable::InputStream *, ::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6835430958405349379LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_CosNaming__NamingContextStub__
diff --git a/libjava/org/omg/Dynamic/Parameter.h b/libjava/org/omg/Dynamic/Parameter.h
deleted file mode 100644
index 1ebf08d23df..00000000000
--- a/libjava/org/omg/Dynamic/Parameter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_Dynamic_Parameter__
-#define __org_omg_Dynamic_Parameter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class ParameterMode;
-      }
-      namespace Dynamic
-      {
-          class Parameter;
-      }
-    }
-  }
-}
-
-class org::omg::Dynamic::Parameter : public ::java::lang::Object
-{
-
-public:
-  Parameter();
-  Parameter(::org::omg::CORBA::Any *, ::org::omg::CORBA::ParameterMode *);
-private:
-  static const jlong serialVersionUID = 892191606993734699LL;
-public:
-  ::org::omg::CORBA::Any * __attribute__((aligned(__alignof__( ::java::lang::Object)))) argument;
-  ::org::omg::CORBA::ParameterMode * mode;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_Dynamic_Parameter__
diff --git a/libjava/org/omg/DynamicAny/AnySeqHelper.h b/libjava/org/omg/DynamicAny/AnySeqHelper.h
deleted file mode 100644
index eef79d93892..00000000000
--- a/libjava/org/omg/DynamicAny/AnySeqHelper.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_AnySeqHelper__
-#define __org_omg_DynamicAny_AnySeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class AnySeqHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::AnySeqHelper : public ::java::lang::Object
-{
-
-public:
-  AnySeqHelper();
-  static JArray< ::org::omg::CORBA::Any * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::CORBA::Any * > *);
-  static JArray< ::org::omg::CORBA::Any * > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::CORBA::Any * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_AnySeqHelper__
diff --git a/libjava/org/omg/DynamicAny/DynAny.h b/libjava/org/omg/DynamicAny/DynAny.h
deleted file mode 100644
index 6332980bf25..00000000000
--- a/libjava/org/omg/DynamicAny/DynAny.h
+++ /dev/null
@@ -1,111 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAny__
-#define __org_omg_DynamicAny_DynAny__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAny : public ::java::lang::Object
-{
-
-public:
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynAny__
diff --git a/libjava/org/omg/DynamicAny/DynAnyFactory.h b/libjava/org/omg/DynamicAny/DynAnyFactory.h
deleted file mode 100644
index a61a1435bac..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyFactory.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyFactory__
-#define __org_omg_DynamicAny_DynAnyFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynAnyFactory;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any_from_type_code(::org::omg::CORBA::TypeCode *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any(::org::omg::CORBA::Any *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynAnyFactory__
diff --git a/libjava/org/omg/DynamicAny/DynAnyFactoryHelper.h b/libjava/org/omg/DynamicAny/DynAnyFactoryHelper.h
deleted file mode 100644
index 67c6f3e8fda..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyFactoryHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyFactoryHelper__
-#define __org_omg_DynamicAny_DynAnyFactoryHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynAnyFactory;
-          class DynAnyFactoryHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyFactoryHelper : public ::java::lang::Object
-{
-
-public:
-  DynAnyFactoryHelper();
-  static ::org::omg::DynamicAny::DynAnyFactory * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::DynamicAny::DynAnyFactory * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynAnyFactory *);
-  static ::org::omg::DynamicAny::DynAnyFactory * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynAnyFactory * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynAnyFactory *);
-public: // actually package-private
-  static ::java::lang::String * not_applicable(::java::lang::String *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynAnyFactoryHelper__
diff --git a/libjava/org/omg/DynamicAny/DynAnyFactoryOperations.h b/libjava/org/omg/DynamicAny/DynAnyFactoryOperations.h
deleted file mode 100644
index 57e86966d18..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyFactoryOperations.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyFactoryOperations__
-#define __org_omg_DynamicAny_DynAnyFactoryOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynAnyFactoryOperations;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyFactoryOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any_from_type_code(::org::omg::CORBA::TypeCode *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any(::org::omg::CORBA::Any *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynAnyFactoryOperations__
diff --git a/libjava/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.h b/libjava/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.h
deleted file mode 100644
index 557e36231db..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyFactoryPackage_InconsistentTypeCode__
-#define __org_omg_DynamicAny_DynAnyFactoryPackage_InconsistentTypeCode__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace DynamicAny
-      {
-        namespace DynAnyFactoryPackage
-        {
-            class InconsistentTypeCode;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyFactoryPackage::InconsistentTypeCode : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InconsistentTypeCode();
-  InconsistentTypeCode(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 3679785322052655944LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynAnyFactoryPackage_InconsistentTypeCode__
diff --git a/libjava/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.h b/libjava/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.h
deleted file mode 100644
index 88baa869864..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyFactoryPackage_InconsistentTypeCodeHelper__
-#define __org_omg_DynamicAny_DynAnyFactoryPackage_InconsistentTypeCodeHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-        namespace DynAnyFactoryPackage
-        {
-            class InconsistentTypeCode;
-            class InconsistentTypeCodeHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyFactoryPackage::InconsistentTypeCodeHelper : public ::java::lang::Object
-{
-
-public:
-  InconsistentTypeCodeHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynAnyFactoryPackage::InconsistentTypeCode *);
-  static ::org::omg::DynamicAny::DynAnyFactoryPackage::InconsistentTypeCode * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynAnyFactoryPackage::InconsistentTypeCode * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynAnyFactoryPackage::InconsistentTypeCode *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynAnyFactoryPackage_InconsistentTypeCodeHelper__
diff --git a/libjava/org/omg/DynamicAny/DynAnyHelper.h b/libjava/org/omg/DynamicAny/DynAnyHelper.h
deleted file mode 100644
index 22f371722d1..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyHelper__
-#define __org_omg_DynamicAny_DynAnyHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynAnyHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyHelper : public ::java::lang::Object
-{
-
-public:
-  DynAnyHelper();
-  static ::org::omg::DynamicAny::DynAny * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::DynamicAny::DynAny * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynAny *);
-  static ::org::omg::DynamicAny::DynAny * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynAny * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynAny *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynAnyHelper__
diff --git a/libjava/org/omg/DynamicAny/DynAnyOperations.h b/libjava/org/omg/DynamicAny/DynAnyOperations.h
deleted file mode 100644
index e7a6339bfa7..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyOperations.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyOperations__
-#define __org_omg_DynamicAny_DynAnyOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynAnyOperations;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynAnyOperations__
diff --git a/libjava/org/omg/DynamicAny/DynAnyPackage/InvalidValue.h b/libjava/org/omg/DynamicAny/DynAnyPackage/InvalidValue.h
deleted file mode 100644
index 44be0a2d4a2..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyPackage/InvalidValue.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyPackage_InvalidValue__
-#define __org_omg_DynamicAny_DynAnyPackage_InvalidValue__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace DynamicAny
-      {
-        namespace DynAnyPackage
-        {
-            class InvalidValue;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyPackage::InvalidValue : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InvalidValue();
-  InvalidValue(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4928947584617628504LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynAnyPackage_InvalidValue__
diff --git a/libjava/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.h b/libjava/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.h
deleted file mode 100644
index 961bd615d1a..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyPackage_InvalidValueHelper__
-#define __org_omg_DynamicAny_DynAnyPackage_InvalidValueHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-        namespace DynAnyPackage
-        {
-            class InvalidValue;
-            class InvalidValueHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyPackage::InvalidValueHelper : public ::java::lang::Object
-{
-
-public:
-  InvalidValueHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynAnyPackage::InvalidValue *);
-  static ::org::omg::DynamicAny::DynAnyPackage::InvalidValue * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynAnyPackage::InvalidValue * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynAnyPackage::InvalidValue *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynAnyPackage_InvalidValueHelper__
diff --git a/libjava/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.h b/libjava/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.h
deleted file mode 100644
index dda1b564892..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyPackage_TypeMismatch__
-#define __org_omg_DynamicAny_DynAnyPackage_TypeMismatch__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace DynamicAny
-      {
-        namespace DynAnyPackage
-        {
-            class TypeMismatch;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyPackage::TypeMismatch : public ::org::omg::CORBA::UserException
-{
-
-public:
-  TypeMismatch();
-  TypeMismatch(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -6393641830493471034LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynAnyPackage_TypeMismatch__
diff --git a/libjava/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.h b/libjava/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.h
deleted file mode 100644
index 43e70effed3..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnyPackage_TypeMismatchHelper__
-#define __org_omg_DynamicAny_DynAnyPackage_TypeMismatchHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-        namespace DynAnyPackage
-        {
-            class TypeMismatch;
-            class TypeMismatchHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnyPackage::TypeMismatchHelper : public ::java::lang::Object
-{
-
-public:
-  TypeMismatchHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynAnyPackage::TypeMismatch *);
-  static ::org::omg::DynamicAny::DynAnyPackage::TypeMismatch * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynAnyPackage::TypeMismatch * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynAnyPackage::TypeMismatch *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynAnyPackage_TypeMismatchHelper__
diff --git a/libjava/org/omg/DynamicAny/DynAnySeqHelper.h b/libjava/org/omg/DynamicAny/DynAnySeqHelper.h
deleted file mode 100644
index 8e28ce66608..00000000000
--- a/libjava/org/omg/DynamicAny/DynAnySeqHelper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynAnySeqHelper__
-#define __org_omg_DynamicAny_DynAnySeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynAnySeqHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynAnySeqHelper : public ::java::lang::Object
-{
-
-public:
-  DynAnySeqHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::DynamicAny::DynAny * > *);
-  static JArray< ::org::omg::DynamicAny::DynAny * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static JArray< ::org::omg::DynamicAny::DynAny * > * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::DynamicAny::DynAny * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynAnySeqHelper__
diff --git a/libjava/org/omg/DynamicAny/DynArray.h b/libjava/org/omg/DynamicAny/DynArray.h
deleted file mode 100644
index f927f6064e6..00000000000
--- a/libjava/org/omg/DynamicAny/DynArray.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynArray__
-#define __org_omg_DynamicAny_DynArray__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynArray;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynArray : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::org::omg::DynamicAny::DynAny * > * get_elements_as_dyn_any() = 0;
-  virtual JArray< ::org::omg::CORBA::Any * > * get_elements() = 0;
-  virtual void set_elements_as_dyn_any(JArray< ::org::omg::DynamicAny::DynAny * > *) = 0;
-  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynArray__
diff --git a/libjava/org/omg/DynamicAny/DynArrayHelper.h b/libjava/org/omg/DynamicAny/DynArrayHelper.h
deleted file mode 100644
index 914a7495288..00000000000
--- a/libjava/org/omg/DynamicAny/DynArrayHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynArrayHelper__
-#define __org_omg_DynamicAny_DynArrayHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynArray;
-          class DynArrayHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynArrayHelper : public ::java::lang::Object
-{
-
-public:
-  DynArrayHelper();
-  static ::org::omg::DynamicAny::DynArray * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::DynamicAny::DynArray * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynArray *);
-  static ::org::omg::DynamicAny::DynArray * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynArray * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynArray *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynArrayHelper__
diff --git a/libjava/org/omg/DynamicAny/DynArrayOperations.h b/libjava/org/omg/DynamicAny/DynArrayOperations.h
deleted file mode 100644
index 9a110716e98..00000000000
--- a/libjava/org/omg/DynamicAny/DynArrayOperations.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynArrayOperations__
-#define __org_omg_DynamicAny_DynArrayOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynArrayOperations;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynArrayOperations : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::org::omg::DynamicAny::DynAny * > * get_elements_as_dyn_any() = 0;
-  virtual JArray< ::org::omg::CORBA::Any * > * get_elements() = 0;
-  virtual void set_elements_as_dyn_any(JArray< ::org::omg::DynamicAny::DynAny * > *) = 0;
-  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynArrayOperations__
diff --git a/libjava/org/omg/DynamicAny/DynEnum.h b/libjava/org/omg/DynamicAny/DynEnum.h
deleted file mode 100644
index 5136effc1ea..00000000000
--- a/libjava/org/omg/DynamicAny/DynEnum.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynEnum__
-#define __org_omg_DynamicAny_DynEnum__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynEnum;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynEnum : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * get_as_string() = 0;
-  virtual jint get_as_ulong() = 0;
-  virtual void set_as_string(::java::lang::String *) = 0;
-  virtual void set_as_ulong(jint) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynEnum__
diff --git a/libjava/org/omg/DynamicAny/DynEnumHelper.h b/libjava/org/omg/DynamicAny/DynEnumHelper.h
deleted file mode 100644
index bc0beb5cf7d..00000000000
--- a/libjava/org/omg/DynamicAny/DynEnumHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynEnumHelper__
-#define __org_omg_DynamicAny_DynEnumHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynEnum;
-          class DynEnumHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynEnumHelper : public ::java::lang::Object
-{
-
-public:
-  DynEnumHelper();
-  static ::org::omg::DynamicAny::DynEnum * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::DynamicAny::DynEnum * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynEnum *);
-  static ::org::omg::DynamicAny::DynEnum * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynEnum * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynEnum *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynEnumHelper__
diff --git a/libjava/org/omg/DynamicAny/DynEnumOperations.h b/libjava/org/omg/DynamicAny/DynEnumOperations.h
deleted file mode 100644
index 360d38fb855..00000000000
--- a/libjava/org/omg/DynamicAny/DynEnumOperations.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynEnumOperations__
-#define __org_omg_DynamicAny_DynEnumOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynEnumOperations;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynEnumOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * get_as_string() = 0;
-  virtual jint get_as_ulong() = 0;
-  virtual void set_as_string(::java::lang::String *) = 0;
-  virtual void set_as_ulong(jint) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynEnumOperations__
diff --git a/libjava/org/omg/DynamicAny/DynFixed.h b/libjava/org/omg/DynamicAny/DynFixed.h
deleted file mode 100644
index 32abefb53b7..00000000000
--- a/libjava/org/omg/DynamicAny/DynFixed.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynFixed__
-#define __org_omg_DynamicAny_DynFixed__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynFixed;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynFixed : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * get_value() = 0;
-  virtual jboolean set_value(::java::lang::String *) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynFixed__
diff --git a/libjava/org/omg/DynamicAny/DynFixedHelper.h b/libjava/org/omg/DynamicAny/DynFixedHelper.h
deleted file mode 100644
index 15561e04193..00000000000
--- a/libjava/org/omg/DynamicAny/DynFixedHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynFixedHelper__
-#define __org_omg_DynamicAny_DynFixedHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynFixed;
-          class DynFixedHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynFixedHelper : public ::java::lang::Object
-{
-
-public:
-  DynFixedHelper();
-  static ::org::omg::DynamicAny::DynFixed * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::DynamicAny::DynFixed * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynFixed *);
-  static ::org::omg::DynamicAny::DynFixed * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynFixed * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynFixed *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynFixedHelper__
diff --git a/libjava/org/omg/DynamicAny/DynFixedOperations.h b/libjava/org/omg/DynamicAny/DynFixedOperations.h
deleted file mode 100644
index 5373b5e92b7..00000000000
--- a/libjava/org/omg/DynamicAny/DynFixedOperations.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynFixedOperations__
-#define __org_omg_DynamicAny_DynFixedOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynFixedOperations;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynFixedOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * get_value() = 0;
-  virtual jboolean set_value(::java::lang::String *) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynFixedOperations__
diff --git a/libjava/org/omg/DynamicAny/DynSequence.h b/libjava/org/omg/DynamicAny/DynSequence.h
deleted file mode 100644
index 0744cdbedcd..00000000000
--- a/libjava/org/omg/DynamicAny/DynSequence.h
+++ /dev/null
@@ -1,118 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynSequence__
-#define __org_omg_DynamicAny_DynSequence__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynSequence;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynSequence : public ::java::lang::Object
-{
-
-public:
-  virtual jint get_length() = 0;
-  virtual void set_length(jint) = 0;
-  virtual JArray< ::org::omg::DynamicAny::DynAny * > * get_elements_as_dyn_any() = 0;
-  virtual JArray< ::org::omg::CORBA::Any * > * get_elements() = 0;
-  virtual void set_elements_as_dyn_any(JArray< ::org::omg::DynamicAny::DynAny * > *) = 0;
-  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynSequence__
diff --git a/libjava/org/omg/DynamicAny/DynSequenceHelper.h b/libjava/org/omg/DynamicAny/DynSequenceHelper.h
deleted file mode 100644
index f782f528a9d..00000000000
--- a/libjava/org/omg/DynamicAny/DynSequenceHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynSequenceHelper__
-#define __org_omg_DynamicAny_DynSequenceHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynSequence;
-          class DynSequenceHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynSequenceHelper : public ::java::lang::Object
-{
-
-public:
-  DynSequenceHelper();
-  static ::org::omg::DynamicAny::DynSequence * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::DynamicAny::DynSequence * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynSequence *);
-  static ::org::omg::DynamicAny::DynSequence * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynSequence * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynSequence *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynSequenceHelper__
diff --git a/libjava/org/omg/DynamicAny/DynSequenceOperations.h b/libjava/org/omg/DynamicAny/DynSequenceOperations.h
deleted file mode 100644
index 3f80eaaa6df..00000000000
--- a/libjava/org/omg/DynamicAny/DynSequenceOperations.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynSequenceOperations__
-#define __org_omg_DynamicAny_DynSequenceOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynSequenceOperations;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynSequenceOperations : public ::java::lang::Object
-{
-
-public:
-  virtual jint get_length() = 0;
-  virtual void set_length(jint) = 0;
-  virtual JArray< ::org::omg::DynamicAny::DynAny * > * get_elements_as_dyn_any() = 0;
-  virtual JArray< ::org::omg::CORBA::Any * > * get_elements() = 0;
-  virtual void set_elements_as_dyn_any(JArray< ::org::omg::DynamicAny::DynAny * > *) = 0;
-  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynSequenceOperations__
diff --git a/libjava/org/omg/DynamicAny/DynStruct.h b/libjava/org/omg/DynamicAny/DynStruct.h
deleted file mode 100644
index 149ba055b38..00000000000
--- a/libjava/org/omg/DynamicAny/DynStruct.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynStruct__
-#define __org_omg_DynamicAny_DynStruct__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynStruct;
-          class NameDynAnyPair;
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynStruct : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::TCKind * current_member_kind() = 0;
-  virtual ::java::lang::String * current_member_name() = 0;
-  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * get_members_as_dyn_any() = 0;
-  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * get_members() = 0;
-  virtual void set_members_as_dyn_any(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *) = 0;
-  virtual void set_members(JArray< ::org::omg::DynamicAny::NameValuePair * > *) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynStruct__
diff --git a/libjava/org/omg/DynamicAny/DynStructHelper.h b/libjava/org/omg/DynamicAny/DynStructHelper.h
deleted file mode 100644
index 393cbd88443..00000000000
--- a/libjava/org/omg/DynamicAny/DynStructHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynStructHelper__
-#define __org_omg_DynamicAny_DynStructHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynStruct;
-          class DynStructHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynStructHelper : public ::java::lang::Object
-{
-
-public:
-  DynStructHelper();
-  static ::org::omg::DynamicAny::DynStruct * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::DynamicAny::DynStruct * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynStruct *);
-  static ::org::omg::DynamicAny::DynStruct * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynStruct * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynStruct *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynStructHelper__
diff --git a/libjava/org/omg/DynamicAny/DynStructOperations.h b/libjava/org/omg/DynamicAny/DynStructOperations.h
deleted file mode 100644
index 2e69f372d63..00000000000
--- a/libjava/org/omg/DynamicAny/DynStructOperations.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynStructOperations__
-#define __org_omg_DynamicAny_DynStructOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynStructOperations;
-          class NameDynAnyPair;
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynStructOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::TCKind * current_member_kind() = 0;
-  virtual ::java::lang::String * current_member_name() = 0;
-  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * get_members_as_dyn_any() = 0;
-  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * get_members() = 0;
-  virtual void set_members_as_dyn_any(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *) = 0;
-  virtual void set_members(JArray< ::org::omg::DynamicAny::NameValuePair * > *) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynStructOperations__
diff --git a/libjava/org/omg/DynamicAny/DynUnion.h b/libjava/org/omg/DynamicAny/DynUnion.h
deleted file mode 100644
index 618add73627..00000000000
--- a/libjava/org/omg/DynamicAny/DynUnion.h
+++ /dev/null
@@ -1,122 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynUnion__
-#define __org_omg_DynamicAny_DynUnion__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynUnion;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynUnion : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::DynamicAny::DynAny * get_discriminator() = 0;
-  virtual void set_discriminator(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::CORBA::TCKind * discriminator_kind() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * member() = 0;
-  virtual ::org::omg::CORBA::TCKind * member_kind() = 0;
-  virtual ::java::lang::String * member_name() = 0;
-  virtual jboolean has_no_active_member() = 0;
-  virtual void set_to_default_member() = 0;
-  virtual void set_to_no_active_member() = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynUnion__
diff --git a/libjava/org/omg/DynamicAny/DynUnionHelper.h b/libjava/org/omg/DynamicAny/DynUnionHelper.h
deleted file mode 100644
index b9cf22b5628..00000000000
--- a/libjava/org/omg/DynamicAny/DynUnionHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynUnionHelper__
-#define __org_omg_DynamicAny_DynUnionHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynUnion;
-          class DynUnionHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynUnionHelper : public ::java::lang::Object
-{
-
-public:
-  DynUnionHelper();
-  static ::org::omg::DynamicAny::DynUnion * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::DynamicAny::DynUnion * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynUnion *);
-  static ::org::omg::DynamicAny::DynUnion * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynUnion * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynUnion *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynUnionHelper__
diff --git a/libjava/org/omg/DynamicAny/DynUnionOperations.h b/libjava/org/omg/DynamicAny/DynUnionOperations.h
deleted file mode 100644
index 1b7e92527a1..00000000000
--- a/libjava/org/omg/DynamicAny/DynUnionOperations.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynUnionOperations__
-#define __org_omg_DynamicAny_DynUnionOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynUnionOperations;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynUnionOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::DynamicAny::DynAny * get_discriminator() = 0;
-  virtual void set_discriminator(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::CORBA::TCKind * discriminator_kind() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * member() = 0;
-  virtual ::org::omg::CORBA::TCKind * member_kind() = 0;
-  virtual ::java::lang::String * member_name() = 0;
-  virtual jboolean has_no_active_member() = 0;
-  virtual void set_to_default_member() = 0;
-  virtual void set_to_no_active_member() = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynUnionOperations__
diff --git a/libjava/org/omg/DynamicAny/DynValue.h b/libjava/org/omg/DynamicAny/DynValue.h
deleted file mode 100644
index 0c1dffaa204..00000000000
--- a/libjava/org/omg/DynamicAny/DynValue.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynValue__
-#define __org_omg_DynamicAny_DynValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynValue;
-          class NameDynAnyPair;
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynValue : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::TCKind * current_member_kind() = 0;
-  virtual ::java::lang::String * current_member_name() = 0;
-  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * get_members_as_dyn_any() = 0;
-  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * get_members() = 0;
-  virtual void set_members_as_dyn_any(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *) = 0;
-  virtual void set_members(JArray< ::org::omg::DynamicAny::NameValuePair * > *) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  virtual jboolean is_null() = 0;
-  virtual void set_to_null() = 0;
-  virtual void set_to_value() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynValue__
diff --git a/libjava/org/omg/DynamicAny/DynValueBox.h b/libjava/org/omg/DynamicAny/DynValueBox.h
deleted file mode 100644
index e76b4413fc3..00000000000
--- a/libjava/org/omg/DynamicAny/DynValueBox.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynValueBox__
-#define __org_omg_DynamicAny_DynValueBox__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynValueBox;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynValueBox : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::DynamicAny::DynAny * get_boxed_value_as_dyn_any() = 0;
-  virtual ::org::omg::CORBA::Any * get_boxed_value() = 0;
-  virtual void set_boxed_value_as_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual void set_boxed_value(::org::omg::CORBA::Any *) = 0;
-  virtual jboolean is_null() = 0;
-  virtual void set_to_null() = 0;
-  virtual void set_to_value() = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynValueBox__
diff --git a/libjava/org/omg/DynamicAny/DynValueBoxOperations.h b/libjava/org/omg/DynamicAny/DynValueBoxOperations.h
deleted file mode 100644
index 10caa23eb95..00000000000
--- a/libjava/org/omg/DynamicAny/DynValueBoxOperations.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynValueBoxOperations__
-#define __org_omg_DynamicAny_DynValueBoxOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynValueBoxOperations;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynValueBoxOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::DynamicAny::DynAny * get_boxed_value_as_dyn_any() = 0;
-  virtual ::org::omg::CORBA::Any * get_boxed_value() = 0;
-  virtual void set_boxed_value_as_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual void set_boxed_value(::org::omg::CORBA::Any *) = 0;
-  virtual jboolean is_null() = 0;
-  virtual void set_to_null() = 0;
-  virtual void set_to_value() = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynValueBoxOperations__
diff --git a/libjava/org/omg/DynamicAny/DynValueCommon.h b/libjava/org/omg/DynamicAny/DynValueCommon.h
deleted file mode 100644
index de40469a6f7..00000000000
--- a/libjava/org/omg/DynamicAny/DynValueCommon.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynValueCommon__
-#define __org_omg_DynamicAny_DynValueCommon__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynValueCommon;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynValueCommon : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean is_null() = 0;
-  virtual void set_to_null() = 0;
-  virtual void set_to_value() = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynValueCommon__
diff --git a/libjava/org/omg/DynamicAny/DynValueCommonOperations.h b/libjava/org/omg/DynamicAny/DynValueCommonOperations.h
deleted file mode 100644
index 4ab9d60c012..00000000000
--- a/libjava/org/omg/DynamicAny/DynValueCommonOperations.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynValueCommonOperations__
-#define __org_omg_DynamicAny_DynValueCommonOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynValueCommonOperations;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynValueCommonOperations : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean is_null() = 0;
-  virtual void set_to_null() = 0;
-  virtual void set_to_value() = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynValueCommonOperations__
diff --git a/libjava/org/omg/DynamicAny/DynValueHelper.h b/libjava/org/omg/DynamicAny/DynValueHelper.h
deleted file mode 100644
index ddb0143428a..00000000000
--- a/libjava/org/omg/DynamicAny/DynValueHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynValueHelper__
-#define __org_omg_DynamicAny_DynValueHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class DynValue;
-          class DynValueHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynValueHelper : public ::java::lang::Object
-{
-
-public:
-  DynValueHelper();
-  static ::org::omg::DynamicAny::DynValue * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::DynamicAny::DynValue * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::DynValue *);
-  static ::org::omg::DynamicAny::DynValue * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::DynValue * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::DynValue *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_DynValueHelper__
diff --git a/libjava/org/omg/DynamicAny/DynValueOperations.h b/libjava/org/omg/DynamicAny/DynValueOperations.h
deleted file mode 100644
index 269a6b09dee..00000000000
--- a/libjava/org/omg/DynamicAny/DynValueOperations.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_DynValueOperations__
-#define __org_omg_DynamicAny_DynValueOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class DynValueOperations;
-          class NameDynAnyPair;
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::DynValueOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::TCKind * current_member_kind() = 0;
-  virtual ::java::lang::String * current_member_name() = 0;
-  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * get_members_as_dyn_any() = 0;
-  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * get_members() = 0;
-  virtual void set_members_as_dyn_any(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *) = 0;
-  virtual void set_members(JArray< ::org::omg::DynamicAny::NameValuePair * > *) = 0;
-  virtual void assign(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual ::org::omg::DynamicAny::DynAny * copy() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * current_component() = 0;
-  virtual void destroy() = 0;
-  virtual void from_any(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * get_any() = 0;
-  virtual jboolean get_boolean() = 0;
-  virtual jchar get_char() = 0;
-  virtual jdouble get_double() = 0;
-  virtual jfloat get_float() = 0;
-  virtual jint get_long() = 0;
-  virtual jlong get_longlong() = 0;
-  virtual jbyte get_octet() = 0;
-  virtual ::org::omg::CORBA::Object * get_reference() = 0;
-  virtual jshort get_short() = 0;
-  virtual ::java::lang::String * get_string() = 0;
-  virtual ::org::omg::CORBA::TypeCode * get_typecode() = 0;
-  virtual jint get_ulong() = 0;
-  virtual jlong get_ulonglong() = 0;
-  virtual jshort get_ushort() = 0;
-  virtual ::java::io::Serializable * get_val() = 0;
-  virtual jchar get_wchar() = 0;
-  virtual ::java::lang::String * get_wstring() = 0;
-  virtual void insert_any(::org::omg::CORBA::Any *) = 0;
-  virtual void insert_boolean(jboolean) = 0;
-  virtual void insert_char(jchar) = 0;
-  virtual void insert_double(jdouble) = 0;
-  virtual void insert_float(jfloat) = 0;
-  virtual void insert_long(jint) = 0;
-  virtual void insert_longlong(jlong) = 0;
-  virtual void insert_octet(jbyte) = 0;
-  virtual void insert_reference(::org::omg::CORBA::Object *) = 0;
-  virtual void insert_short(jshort) = 0;
-  virtual void insert_string(::java::lang::String *) = 0;
-  virtual void insert_typecode(::org::omg::CORBA::TypeCode *) = 0;
-  virtual void insert_ulong(jint) = 0;
-  virtual void insert_ulonglong(jlong) = 0;
-  virtual void insert_ushort(jshort) = 0;
-  virtual void insert_val(::java::io::Serializable *) = 0;
-  virtual void insert_wchar(jchar) = 0;
-  virtual void insert_wstring(::java::lang::String *) = 0;
-  virtual jboolean next() = 0;
-  virtual void rewind() = 0;
-  virtual jboolean seek(jint) = 0;
-  virtual ::org::omg::CORBA::Any * to_any() = 0;
-  virtual ::org::omg::CORBA::TypeCode * type() = 0;
-  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
-  virtual jint component_count() = 0;
-  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any() = 0;
-  virtual jboolean is_null() = 0;
-  virtual void set_to_null() = 0;
-  virtual void set_to_value() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_DynamicAny_DynValueOperations__
diff --git a/libjava/org/omg/DynamicAny/FieldNameHelper.h b/libjava/org/omg/DynamicAny/FieldNameHelper.h
deleted file mode 100644
index 9276e12b0e6..00000000000
--- a/libjava/org/omg/DynamicAny/FieldNameHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_FieldNameHelper__
-#define __org_omg_DynamicAny_FieldNameHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class FieldNameHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::FieldNameHelper : public ::java::lang::Object
-{
-
-public:
-  FieldNameHelper();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_FieldNameHelper__
diff --git a/libjava/org/omg/DynamicAny/NameDynAnyPair.h b/libjava/org/omg/DynamicAny/NameDynAnyPair.h
deleted file mode 100644
index 9311531724c..00000000000
--- a/libjava/org/omg/DynamicAny/NameDynAnyPair.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_NameDynAnyPair__
-#define __org_omg_DynamicAny_NameDynAnyPair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace DynamicAny
-      {
-          class DynAny;
-          class NameDynAnyPair;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::NameDynAnyPair : public ::java::lang::Object
-{
-
-public:
-  NameDynAnyPair();
-  NameDynAnyPair(::java::lang::String *, ::org::omg::DynamicAny::DynAny *);
-private:
-  static const jlong serialVersionUID = -1992533286932908564LL;
-public:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) id;
-  ::org::omg::DynamicAny::DynAny * value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_NameDynAnyPair__
diff --git a/libjava/org/omg/DynamicAny/NameDynAnyPairHelper.h b/libjava/org/omg/DynamicAny/NameDynAnyPairHelper.h
deleted file mode 100644
index ea42e70e2cf..00000000000
--- a/libjava/org/omg/DynamicAny/NameDynAnyPairHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_NameDynAnyPairHelper__
-#define __org_omg_DynamicAny_NameDynAnyPairHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class NameDynAnyPair;
-          class NameDynAnyPairHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::NameDynAnyPairHelper : public ::java::lang::Object
-{
-
-public:
-  NameDynAnyPairHelper();
-  static ::org::omg::DynamicAny::NameDynAnyPair * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::NameDynAnyPair *);
-  static ::org::omg::DynamicAny::NameDynAnyPair * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::NameDynAnyPair *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_NameDynAnyPairHelper__
diff --git a/libjava/org/omg/DynamicAny/NameDynAnyPairSeqHelper.h b/libjava/org/omg/DynamicAny/NameDynAnyPairSeqHelper.h
deleted file mode 100644
index 40548c79084..00000000000
--- a/libjava/org/omg/DynamicAny/NameDynAnyPairSeqHelper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_NameDynAnyPairSeqHelper__
-#define __org_omg_DynamicAny_NameDynAnyPairSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class NameDynAnyPair;
-          class NameDynAnyPairSeqHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::NameDynAnyPairSeqHelper : public ::java::lang::Object
-{
-
-public:
-  NameDynAnyPairSeqHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
-  static JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_NameDynAnyPairSeqHelper__
diff --git a/libjava/org/omg/DynamicAny/NameValuePair.h b/libjava/org/omg/DynamicAny/NameValuePair.h
deleted file mode 100644
index d781837d82b..00000000000
--- a/libjava/org/omg/DynamicAny/NameValuePair.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_NameValuePair__
-#define __org_omg_DynamicAny_NameValuePair__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-      }
-      namespace DynamicAny
-      {
-          class NameValuePair;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::NameValuePair : public ::java::lang::Object
-{
-
-public:
-  NameValuePair();
-  NameValuePair(::java::lang::String *, ::org::omg::CORBA::Any *);
-private:
-  static const jlong serialVersionUID = -1289460542874201736LL;
-public:
-  ::org::omg::CORBA::Any * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  ::java::lang::String * id;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_NameValuePair__
diff --git a/libjava/org/omg/DynamicAny/NameValuePairHelper.h b/libjava/org/omg/DynamicAny/NameValuePairHelper.h
deleted file mode 100644
index cac4c62a296..00000000000
--- a/libjava/org/omg/DynamicAny/NameValuePairHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_NameValuePairHelper__
-#define __org_omg_DynamicAny_NameValuePairHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class NameValuePair;
-          class NameValuePairHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::NameValuePairHelper : public ::java::lang::Object
-{
-
-public:
-  NameValuePairHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::DynamicAny::NameValuePair *);
-  static ::org::omg::DynamicAny::NameValuePair * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::DynamicAny::NameValuePair * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::DynamicAny::NameValuePair *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_NameValuePairHelper__
diff --git a/libjava/org/omg/DynamicAny/NameValuePairSeqHelper.h b/libjava/org/omg/DynamicAny/NameValuePairSeqHelper.h
deleted file mode 100644
index fa1d8f336e6..00000000000
--- a/libjava/org/omg/DynamicAny/NameValuePairSeqHelper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny_NameValuePairSeqHelper__
-#define __org_omg_DynamicAny_NameValuePairSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace DynamicAny
-      {
-          class NameValuePair;
-          class NameValuePairSeqHelper;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::NameValuePairSeqHelper : public ::java::lang::Object
-{
-
-public:
-  NameValuePairSeqHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::DynamicAny::NameValuePair * > *);
-  static JArray< ::org::omg::DynamicAny::NameValuePair * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static JArray< ::org::omg::DynamicAny::NameValuePair * > * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::DynamicAny::NameValuePair * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny_NameValuePairSeqHelper__
diff --git a/libjava/org/omg/DynamicAny/_DynAnyFactoryStub.h b/libjava/org/omg/DynamicAny/_DynAnyFactoryStub.h
deleted file mode 100644
index ca5e2363a06..00000000000
--- a/libjava/org/omg/DynamicAny/_DynAnyFactoryStub.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny__DynAnyFactoryStub__
-#define __org_omg_DynamicAny__DynAnyFactoryStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class _DynAnyFactoryStub;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::_DynAnyFactoryStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _DynAnyFactoryStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any(::org::omg::CORBA::Any *);
-  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any_from_type_code(::org::omg::CORBA::TypeCode *);
-private:
-  static const jlong serialVersionUID = -6575269659020082310LL;
-public:
-  static ::java::lang::Class * _opsClass;
-public: // actually package-private
-  static ::java::lang::String * NOT_APPLICABLE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny__DynAnyFactoryStub__
diff --git a/libjava/org/omg/DynamicAny/_DynAnyStub.h b/libjava/org/omg/DynamicAny/_DynAnyStub.h
deleted file mode 100644
index bd4ba819ba8..00000000000
--- a/libjava/org/omg/DynamicAny/_DynAnyStub.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny__DynAnyStub__
-#define __org_omg_DynamicAny__DynAnyStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class _DynAnyStub;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::_DynAnyStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _DynAnyStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual jboolean next();
-  virtual void destroy();
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual void rewind();
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual jint component_count();
-  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_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 seek(jint);
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = -6521892777941121597LL;
-public:
-  static ::java::lang::Class * _opsClass;
-public: // actually package-private
-  static ::java::lang::String * NOT_APPLICABLE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny__DynAnyStub__
diff --git a/libjava/org/omg/DynamicAny/_DynArrayStub.h b/libjava/org/omg/DynamicAny/_DynArrayStub.h
deleted file mode 100644
index a9723ed5ca6..00000000000
--- a/libjava/org/omg/DynamicAny/_DynArrayStub.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny__DynArrayStub__
-#define __org_omg_DynamicAny__DynArrayStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class _DynArrayStub;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::_DynArrayStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _DynArrayStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual JArray< ::org::omg::CORBA::Any * > * get_elements();
-  virtual JArray< ::org::omg::DynamicAny::DynAny * > * get_elements_as_dyn_any();
-  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *);
-  virtual void set_elements_as_dyn_any(JArray< ::org::omg::DynamicAny::DynAny * > *);
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual jboolean next();
-  virtual void destroy();
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual void rewind();
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual jint component_count();
-  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_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 seek(jint);
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = -6302474930370950228LL;
-public:
-  static ::java::lang::Class * _opsClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny__DynArrayStub__
diff --git a/libjava/org/omg/DynamicAny/_DynEnumStub.h b/libjava/org/omg/DynamicAny/_DynEnumStub.h
deleted file mode 100644
index 6a4adf1aa87..00000000000
--- a/libjava/org/omg/DynamicAny/_DynEnumStub.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny__DynEnumStub__
-#define __org_omg_DynamicAny__DynEnumStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class _DynEnumStub;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::_DynEnumStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _DynEnumStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  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::TypeCode * type();
-  virtual jboolean next();
-  virtual void destroy();
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual void rewind();
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual jint component_count();
-  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_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 seek(jint);
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = 696844314172031949LL;
-public:
-  static ::java::lang::Class * _opsClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny__DynEnumStub__
diff --git a/libjava/org/omg/DynamicAny/_DynFixedStub.h b/libjava/org/omg/DynamicAny/_DynFixedStub.h
deleted file mode 100644
index f6496f2a6c0..00000000000
--- a/libjava/org/omg/DynamicAny/_DynFixedStub.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny__DynFixedStub__
-#define __org_omg_DynamicAny__DynFixedStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class _DynFixedStub;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::_DynFixedStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _DynFixedStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::java::lang::String * get_value();
-  virtual jboolean set_value(::java::lang::String *);
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual jboolean next();
-  virtual void destroy();
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual void rewind();
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual jint component_count();
-  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_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 seek(jint);
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = -1932029532964417188LL;
-public:
-  static ::java::lang::Class * _opsClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny__DynFixedStub__
diff --git a/libjava/org/omg/DynamicAny/_DynSequenceStub.h b/libjava/org/omg/DynamicAny/_DynSequenceStub.h
deleted file mode 100644
index 69c48736790..00000000000
--- a/libjava/org/omg/DynamicAny/_DynSequenceStub.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny__DynSequenceStub__
-#define __org_omg_DynamicAny__DynSequenceStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class _DynSequenceStub;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::_DynSequenceStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _DynSequenceStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual JArray< ::org::omg::CORBA::Any * > * get_elements();
-  virtual JArray< ::org::omg::DynamicAny::DynAny * > * get_elements_as_dyn_any();
-  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *);
-  virtual void set_elements_as_dyn_any(JArray< ::org::omg::DynamicAny::DynAny * > *);
-  virtual jint get_length();
-  virtual void set_length(jint);
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual jboolean next();
-  virtual void destroy();
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual void rewind();
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual jint component_count();
-  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_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 seek(jint);
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = 7191437435669107554LL;
-public:
-  static ::java::lang::Class * _opsClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny__DynSequenceStub__
diff --git a/libjava/org/omg/DynamicAny/_DynStructStub.h b/libjava/org/omg/DynamicAny/_DynStructStub.h
deleted file mode 100644
index cabaa9af35a..00000000000
--- a/libjava/org/omg/DynamicAny/_DynStructStub.h
+++ /dev/null
@@ -1,105 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny__DynStructStub__
-#define __org_omg_DynamicAny__DynStructStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class NameDynAnyPair;
-          class NameValuePair;
-          class _DynStructStub;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::_DynStructStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _DynStructStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::org::omg::CORBA::TCKind * current_member_kind();
-  virtual ::java::lang::String * current_member_name();
-  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * get_members();
-  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * get_members_as_dyn_any();
-  virtual void set_members(JArray< ::org::omg::DynamicAny::NameValuePair * > *);
-  virtual void set_members_as_dyn_any(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual jboolean next();
-  virtual void destroy();
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual void rewind();
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual jint component_count();
-  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_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 seek(jint);
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = -8415786200783826656LL;
-public:
-  static ::java::lang::Class * _opsClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny__DynStructStub__
diff --git a/libjava/org/omg/DynamicAny/_DynUnionStub.h b/libjava/org/omg/DynamicAny/_DynUnionStub.h
deleted file mode 100644
index 23cacbd138e..00000000000
--- a/libjava/org/omg/DynamicAny/_DynUnionStub.h
+++ /dev/null
@@ -1,106 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny__DynUnionStub__
-#define __org_omg_DynamicAny__DynUnionStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class _DynUnionStub;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::_DynUnionStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _DynUnionStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::org::omg::DynamicAny::DynAny * member();
-  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 void set_discriminator(::org::omg::DynamicAny::DynAny *);
-  virtual void set_to_default_member();
-  virtual void set_to_no_active_member();
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual jboolean next();
-  virtual void destroy();
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual void rewind();
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual jint component_count();
-  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_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 seek(jint);
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = -8921031953572009897LL;
-public:
-  static ::java::lang::Class * _opsClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny__DynUnionStub__
diff --git a/libjava/org/omg/DynamicAny/_DynValueStub.h b/libjava/org/omg/DynamicAny/_DynValueStub.h
deleted file mode 100644
index 7a8ecf92465..00000000000
--- a/libjava/org/omg/DynamicAny/_DynValueStub.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_DynamicAny__DynValueStub__
-#define __org_omg_DynamicAny__DynValueStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TCKind;
-          class TypeCode;
-      }
-      namespace DynamicAny
-      {
-          class DynAny;
-          class NameDynAnyPair;
-          class NameValuePair;
-          class _DynValueStub;
-      }
-    }
-  }
-}
-
-class org::omg::DynamicAny::_DynValueStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _DynValueStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::org::omg::CORBA::TCKind * current_member_kind();
-  virtual ::java::lang::String * current_member_name();
-  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * get_members();
-  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * get_members_as_dyn_any();
-  virtual void set_members(JArray< ::org::omg::DynamicAny::NameValuePair * > *);
-  virtual void set_members_as_dyn_any(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
-  virtual jboolean is_null();
-  virtual void set_to_null();
-  virtual void set_to_value();
-  virtual ::org::omg::CORBA::TypeCode * type();
-  virtual jboolean next();
-  virtual void destroy();
-  virtual ::org::omg::DynamicAny::DynAny * copy();
-  virtual void rewind();
-  virtual void assign(::org::omg::DynamicAny::DynAny *);
-  virtual jint component_count();
-  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_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 seek(jint);
-  virtual ::org::omg::CORBA::Any * to_any();
-private:
-  static const jlong serialVersionUID = 5815313794012360824LL;
-public:
-  static ::java::lang::Class * _opsClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_DynamicAny__DynValueStub__
diff --git a/libjava/org/omg/IOP/CodeSets.h b/libjava/org/omg/IOP/CodeSets.h
deleted file mode 100644
index c93ffaa6cd1..00000000000
--- a/libjava/org/omg/IOP/CodeSets.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodeSets__
-#define __org_omg_IOP_CodeSets__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class CodeSets;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodeSets : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_CodeSets__
diff --git a/libjava/org/omg/IOP/Codec.h b/libjava/org/omg/IOP/Codec.h
deleted file mode 100644
index f25bacb6dcd..00000000000
--- a/libjava/org/omg/IOP/Codec.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_Codec__
-#define __org_omg_IOP_Codec__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace IOP
-      {
-          class Codec;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::Codec : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * encode(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * decode(JArray< jbyte > *) = 0;
-  virtual JArray< jbyte > * encode_value(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * decode_value(JArray< jbyte > *, ::org::omg::CORBA::TypeCode *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_Codec__
diff --git a/libjava/org/omg/IOP/CodecFactory.h b/libjava/org/omg/IOP/CodecFactory.h
deleted file mode 100644
index b5f0b4f9bc5..00000000000
--- a/libjava/org/omg/IOP/CodecFactory.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecFactory__
-#define __org_omg_IOP_CodecFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace IOP
-      {
-          class Codec;
-          class CodecFactory;
-          class Encoding;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::IOP::Codec * create_codec(::org::omg::IOP::Encoding *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_CodecFactory__
diff --git a/libjava/org/omg/IOP/CodecFactoryHelper.h b/libjava/org/omg/IOP/CodecFactoryHelper.h
deleted file mode 100644
index 638907def12..00000000000
--- a/libjava/org/omg/IOP/CodecFactoryHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecFactoryHelper__
-#define __org_omg_IOP_CodecFactoryHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class CodecFactory;
-          class CodecFactoryHelper;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecFactoryHelper : public ::java::lang::Object
-{
-
-public:
-  CodecFactoryHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::IOP::CodecFactory *);
-  static ::org::omg::IOP::CodecFactory * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::IOP::CodecFactory * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::IOP::CodecFactory * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::IOP::CodecFactory * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::IOP::CodecFactory *);
-private:
-  static ::java::lang::String * UNSUPPORTED;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_CodecFactoryHelper__
diff --git a/libjava/org/omg/IOP/CodecFactoryOperations.h b/libjava/org/omg/IOP/CodecFactoryOperations.h
deleted file mode 100644
index 7691f738731..00000000000
--- a/libjava/org/omg/IOP/CodecFactoryOperations.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecFactoryOperations__
-#define __org_omg_IOP_CodecFactoryOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class Codec;
-          class CodecFactoryOperations;
-          class Encoding;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecFactoryOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::IOP::Codec * create_codec(::org::omg::IOP::Encoding *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_CodecFactoryOperations__
diff --git a/libjava/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.h b/libjava/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.h
deleted file mode 100644
index 6d95f21a109..00000000000
--- a/libjava/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecFactoryPackage_UnknownEncoding__
-#define __org_omg_IOP_CodecFactoryPackage_UnknownEncoding__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-        namespace CodecFactoryPackage
-        {
-            class UnknownEncoding;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecFactoryPackage::UnknownEncoding : public ::org::omg::CORBA::UserException
-{
-
-public:
-  UnknownEncoding();
-  UnknownEncoding(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1613955753212049966LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_CodecFactoryPackage_UnknownEncoding__
diff --git a/libjava/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.h b/libjava/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.h
deleted file mode 100644
index 3cc0ad3ebf7..00000000000
--- a/libjava/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecFactoryPackage_UnknownEncodingHelper__
-#define __org_omg_IOP_CodecFactoryPackage_UnknownEncodingHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-        namespace CodecFactoryPackage
-        {
-            class UnknownEncoding;
-            class UnknownEncodingHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecFactoryPackage::UnknownEncodingHelper : public ::java::lang::Object
-{
-
-public:
-  UnknownEncodingHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::IOP::CodecFactoryPackage::UnknownEncoding *);
-  static ::org::omg::IOP::CodecFactoryPackage::UnknownEncoding * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::IOP::CodecFactoryPackage::UnknownEncoding * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::IOP::CodecFactoryPackage::UnknownEncoding *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_CodecFactoryPackage_UnknownEncodingHelper__
diff --git a/libjava/org/omg/IOP/CodecOperations.h b/libjava/org/omg/IOP/CodecOperations.h
deleted file mode 100644
index 50ae2e6c865..00000000000
--- a/libjava/org/omg/IOP/CodecOperations.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecOperations__
-#define __org_omg_IOP_CodecOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-      }
-      namespace IOP
-      {
-          class CodecOperations;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecOperations : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * encode(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * decode(JArray< jbyte > *) = 0;
-  virtual JArray< jbyte > * encode_value(::org::omg::CORBA::Any *) = 0;
-  virtual ::org::omg::CORBA::Any * decode_value(JArray< jbyte > *, ::org::omg::CORBA::TypeCode *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_CodecOperations__
diff --git a/libjava/org/omg/IOP/CodecPackage/FormatMismatch.h b/libjava/org/omg/IOP/CodecPackage/FormatMismatch.h
deleted file mode 100644
index 4c007a67092..00000000000
--- a/libjava/org/omg/IOP/CodecPackage/FormatMismatch.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecPackage_FormatMismatch__
-#define __org_omg_IOP_CodecPackage_FormatMismatch__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-        namespace CodecPackage
-        {
-            class FormatMismatch;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecPackage::FormatMismatch : public ::org::omg::CORBA::UserException
-{
-
-public:
-  FormatMismatch();
-  FormatMismatch(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 5818121867618342320LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_CodecPackage_FormatMismatch__
diff --git a/libjava/org/omg/IOP/CodecPackage/FormatMismatchHelper.h b/libjava/org/omg/IOP/CodecPackage/FormatMismatchHelper.h
deleted file mode 100644
index 2c46bc3d306..00000000000
--- a/libjava/org/omg/IOP/CodecPackage/FormatMismatchHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecPackage_FormatMismatchHelper__
-#define __org_omg_IOP_CodecPackage_FormatMismatchHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-        namespace CodecPackage
-        {
-            class FormatMismatch;
-            class FormatMismatchHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecPackage::FormatMismatchHelper : public ::java::lang::Object
-{
-
-public:
-  FormatMismatchHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::IOP::CodecPackage::FormatMismatch *);
-  static ::org::omg::IOP::CodecPackage::FormatMismatch * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::IOP::CodecPackage::FormatMismatch * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::IOP::CodecPackage::FormatMismatch *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_CodecPackage_FormatMismatchHelper__
diff --git a/libjava/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.h b/libjava/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.h
deleted file mode 100644
index b5e3ff08b14..00000000000
--- a/libjava/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecPackage_InvalidTypeForEncoding__
-#define __org_omg_IOP_CodecPackage_InvalidTypeForEncoding__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-        namespace CodecPackage
-        {
-            class InvalidTypeForEncoding;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecPackage::InvalidTypeForEncoding : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InvalidTypeForEncoding();
-  InvalidTypeForEncoding(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7951932210684443970LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_CodecPackage_InvalidTypeForEncoding__
diff --git a/libjava/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.h b/libjava/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.h
deleted file mode 100644
index f28ee1ce9e0..00000000000
--- a/libjava/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecPackage_InvalidTypeForEncodingHelper__
-#define __org_omg_IOP_CodecPackage_InvalidTypeForEncodingHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-        namespace CodecPackage
-        {
-            class InvalidTypeForEncoding;
-            class InvalidTypeForEncodingHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecPackage::InvalidTypeForEncodingHelper : public ::java::lang::Object
-{
-
-public:
-  InvalidTypeForEncodingHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::IOP::CodecPackage::InvalidTypeForEncoding *);
-  static ::org::omg::IOP::CodecPackage::InvalidTypeForEncoding * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::IOP::CodecPackage::InvalidTypeForEncoding * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::IOP::CodecPackage::InvalidTypeForEncoding *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_CodecPackage_InvalidTypeForEncodingHelper__
diff --git a/libjava/org/omg/IOP/CodecPackage/TypeMismatch.h b/libjava/org/omg/IOP/CodecPackage/TypeMismatch.h
deleted file mode 100644
index ca710546681..00000000000
--- a/libjava/org/omg/IOP/CodecPackage/TypeMismatch.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecPackage_TypeMismatch__
-#define __org_omg_IOP_CodecPackage_TypeMismatch__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-        namespace CodecPackage
-        {
-            class TypeMismatch;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecPackage::TypeMismatch : public ::org::omg::CORBA::UserException
-{
-
-public:
-  TypeMismatch();
-  TypeMismatch(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -3544092104480759035LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_CodecPackage_TypeMismatch__
diff --git a/libjava/org/omg/IOP/CodecPackage/TypeMismatchHelper.h b/libjava/org/omg/IOP/CodecPackage/TypeMismatchHelper.h
deleted file mode 100644
index 97d7f927a7d..00000000000
--- a/libjava/org/omg/IOP/CodecPackage/TypeMismatchHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_CodecPackage_TypeMismatchHelper__
-#define __org_omg_IOP_CodecPackage_TypeMismatchHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-        namespace CodecPackage
-        {
-            class TypeMismatch;
-            class TypeMismatchHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::IOP::CodecPackage::TypeMismatchHelper : public ::java::lang::Object
-{
-
-public:
-  TypeMismatchHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::IOP::CodecPackage::TypeMismatch *);
-  static ::org::omg::IOP::CodecPackage::TypeMismatch * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::IOP::CodecPackage::TypeMismatch * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::IOP::CodecPackage::TypeMismatch *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_CodecPackage_TypeMismatchHelper__
diff --git a/libjava/org/omg/IOP/ComponentIdHelper.h b/libjava/org/omg/IOP/ComponentIdHelper.h
deleted file mode 100644
index d2bb02c706f..00000000000
--- a/libjava/org/omg/IOP/ComponentIdHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_ComponentIdHelper__
-#define __org_omg_IOP_ComponentIdHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class ComponentIdHelper;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::ComponentIdHelper : public ::java::lang::Object
-{
-
-public:
-  ComponentIdHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, jint);
-  static jint extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static jint read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_ComponentIdHelper__
diff --git a/libjava/org/omg/IOP/ENCODING_CDR_ENCAPS.h b/libjava/org/omg/IOP/ENCODING_CDR_ENCAPS.h
deleted file mode 100644
index eef1631809c..00000000000
--- a/libjava/org/omg/IOP/ENCODING_CDR_ENCAPS.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_ENCODING_CDR_ENCAPS__
-#define __org_omg_IOP_ENCODING_CDR_ENCAPS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class ENCODING_CDR_ENCAPS;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::ENCODING_CDR_ENCAPS : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_ENCODING_CDR_ENCAPS__
diff --git a/libjava/org/omg/IOP/Encoding.h b/libjava/org/omg/IOP/Encoding.h
deleted file mode 100644
index 787bec5d5e9..00000000000
--- a/libjava/org/omg/IOP/Encoding.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_Encoding__
-#define __org_omg_IOP_Encoding__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class Encoding;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::Encoding : public ::java::lang::Object
-{
-
-public:
-  Encoding();
-  Encoding(jshort, jbyte, jbyte);
-private:
-  static const jlong serialVersionUID = -1489257079856841992LL;
-public:
-  jshort __attribute__((aligned(__alignof__( ::java::lang::Object)))) format;
-  jbyte major_version;
-  jbyte minor_version;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_Encoding__
diff --git a/libjava/org/omg/IOP/ExceptionDetailMessage.h b/libjava/org/omg/IOP/ExceptionDetailMessage.h
deleted file mode 100644
index 20506f2871a..00000000000
--- a/libjava/org/omg/IOP/ExceptionDetailMessage.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_ExceptionDetailMessage__
-#define __org_omg_IOP_ExceptionDetailMessage__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class ExceptionDetailMessage;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::ExceptionDetailMessage : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 14;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_ExceptionDetailMessage__
diff --git a/libjava/org/omg/IOP/IOR.h b/libjava/org/omg/IOP/IOR.h
deleted file mode 100644
index c48e01a8068..00000000000
--- a/libjava/org/omg/IOP/IOR.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_IOR__
-#define __org_omg_IOP_IOR__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class IOR;
-          class TaggedProfile;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::IOR : public ::java::lang::Object
-{
-
-public:
-  IOR();
-  IOR(::java::lang::String *, JArray< ::org::omg::IOP::TaggedProfile * > *);
-private:
-  static const jlong serialVersionUID = 1901439890645554948LL;
-public:
-  JArray< ::org::omg::IOP::TaggedProfile * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) profiles;
-  ::java::lang::String * type_id;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_IOR__
diff --git a/libjava/org/omg/IOP/IORHelper.h b/libjava/org/omg/IOP/IORHelper.h
deleted file mode 100644
index c74b4658e8c..00000000000
--- a/libjava/org/omg/IOP/IORHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_IORHelper__
-#define __org_omg_IOP_IORHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class IOR;
-          class IORHelper;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::IORHelper : public ::java::lang::Object
-{
-
-public:
-  IORHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::IOP::IOR *);
-  static ::org::omg::IOP::IOR * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::IOP::IOR * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::IOP::IOR *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_IORHelper__
diff --git a/libjava/org/omg/IOP/IORHolder.h b/libjava/org/omg/IOP/IORHolder.h
deleted file mode 100644
index 54bf586a669..00000000000
--- a/libjava/org/omg/IOP/IORHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_IORHolder__
-#define __org_omg_IOP_IORHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class IOR;
-          class IORHolder;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::IORHolder : public ::java::lang::Object
-{
-
-public:
-  IORHolder();
-  IORHolder(::org::omg::IOP::IOR *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::IOP::IOR * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_IORHolder__
diff --git a/libjava/org/omg/IOP/MultipleComponentProfileHelper.h b/libjava/org/omg/IOP/MultipleComponentProfileHelper.h
deleted file mode 100644
index ca181453ff0..00000000000
--- a/libjava/org/omg/IOP/MultipleComponentProfileHelper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_MultipleComponentProfileHelper__
-#define __org_omg_IOP_MultipleComponentProfileHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class MultipleComponentProfileHelper;
-          class TaggedComponent;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::MultipleComponentProfileHelper : public ::java::lang::Object
-{
-
-public:
-  MultipleComponentProfileHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::IOP::TaggedComponent * > *);
-  static JArray< ::org::omg::IOP::TaggedComponent * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static JArray< ::org::omg::IOP::TaggedComponent * > * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::IOP::TaggedComponent * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_MultipleComponentProfileHelper__
diff --git a/libjava/org/omg/IOP/MultipleComponentProfileHolder.h b/libjava/org/omg/IOP/MultipleComponentProfileHolder.h
deleted file mode 100644
index 1d721beec8c..00000000000
--- a/libjava/org/omg/IOP/MultipleComponentProfileHolder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_MultipleComponentProfileHolder__
-#define __org_omg_IOP_MultipleComponentProfileHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class MultipleComponentProfileHolder;
-          class TaggedComponent;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::MultipleComponentProfileHolder : public ::java::lang::Object
-{
-
-public:
-  MultipleComponentProfileHolder();
-  MultipleComponentProfileHolder(JArray< ::org::omg::IOP::TaggedComponent * > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  JArray< ::org::omg::IOP::TaggedComponent * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_MultipleComponentProfileHolder__
diff --git a/libjava/org/omg/IOP/ProfileIdHelper.h b/libjava/org/omg/IOP/ProfileIdHelper.h
deleted file mode 100644
index 28c7aae9ab5..00000000000
--- a/libjava/org/omg/IOP/ProfileIdHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_ProfileIdHelper__
-#define __org_omg_IOP_ProfileIdHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class ProfileIdHelper;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::ProfileIdHelper : public ::java::lang::Object
-{
-
-public:
-  ProfileIdHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, jint);
-  static jint extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static jint read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_ProfileIdHelper__
diff --git a/libjava/org/omg/IOP/RMICustomMaxStreamFormat.h b/libjava/org/omg/IOP/RMICustomMaxStreamFormat.h
deleted file mode 100644
index 24f719dbbde..00000000000
--- a/libjava/org/omg/IOP/RMICustomMaxStreamFormat.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_RMICustomMaxStreamFormat__
-#define __org_omg_IOP_RMICustomMaxStreamFormat__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class RMICustomMaxStreamFormat;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::RMICustomMaxStreamFormat : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 17;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_RMICustomMaxStreamFormat__
diff --git a/libjava/org/omg/IOP/ServiceContext.h b/libjava/org/omg/IOP/ServiceContext.h
deleted file mode 100644
index 37773162a34..00000000000
--- a/libjava/org/omg/IOP/ServiceContext.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_ServiceContext__
-#define __org_omg_IOP_ServiceContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class ServiceContext;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::ServiceContext : public ::java::lang::Object
-{
-
-public:
-  ServiceContext();
-  ServiceContext(jint, JArray< jbyte > *);
-private:
-  static const jlong serialVersionUID = -2232391417465261379LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) context_id;
-  JArray< jbyte > * context_data;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_ServiceContext__
diff --git a/libjava/org/omg/IOP/ServiceContextHelper.h b/libjava/org/omg/IOP/ServiceContextHelper.h
deleted file mode 100644
index 368c1c12838..00000000000
--- a/libjava/org/omg/IOP/ServiceContextHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_ServiceContextHelper__
-#define __org_omg_IOP_ServiceContextHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-          class ServiceContextHelper;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::ServiceContextHelper : public ::java::lang::Object
-{
-
-public:
-  ServiceContextHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::IOP::ServiceContext *);
-  static ::org::omg::IOP::ServiceContext * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::IOP::ServiceContext * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::IOP::ServiceContext *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_ServiceContextHelper__
diff --git a/libjava/org/omg/IOP/ServiceContextHolder.h b/libjava/org/omg/IOP/ServiceContextHolder.h
deleted file mode 100644
index 2448be547d6..00000000000
--- a/libjava/org/omg/IOP/ServiceContextHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_ServiceContextHolder__
-#define __org_omg_IOP_ServiceContextHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-          class ServiceContextHolder;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::ServiceContextHolder : public ::java::lang::Object
-{
-
-public:
-  ServiceContextHolder();
-  ServiceContextHolder(::org::omg::IOP::ServiceContext *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::IOP::ServiceContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_ServiceContextHolder__
diff --git a/libjava/org/omg/IOP/ServiceContextListHelper.h b/libjava/org/omg/IOP/ServiceContextListHelper.h
deleted file mode 100644
index 3450d515af2..00000000000
--- a/libjava/org/omg/IOP/ServiceContextListHelper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_ServiceContextListHelper__
-#define __org_omg_IOP_ServiceContextListHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-          class ServiceContextListHelper;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::ServiceContextListHelper : public ::java::lang::Object
-{
-
-public:
-  ServiceContextListHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::IOP::ServiceContext * > *);
-  static JArray< ::org::omg::IOP::ServiceContext * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static JArray< ::org::omg::IOP::ServiceContext * > * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::IOP::ServiceContext * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_ServiceContextListHelper__
diff --git a/libjava/org/omg/IOP/ServiceContextListHolder.h b/libjava/org/omg/IOP/ServiceContextListHolder.h
deleted file mode 100644
index e1d406e21a1..00000000000
--- a/libjava/org/omg/IOP/ServiceContextListHolder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_ServiceContextListHolder__
-#define __org_omg_IOP_ServiceContextListHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-          class ServiceContextListHolder;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::ServiceContextListHolder : public ::java::lang::Object
-{
-
-public:
-  ServiceContextListHolder();
-  ServiceContextListHolder(JArray< ::org::omg::IOP::ServiceContext * > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  JArray< ::org::omg::IOP::ServiceContext * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_ServiceContextListHolder__
diff --git a/libjava/org/omg/IOP/ServiceIdHelper.h b/libjava/org/omg/IOP/ServiceIdHelper.h
deleted file mode 100644
index a8a72843912..00000000000
--- a/libjava/org/omg/IOP/ServiceIdHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_ServiceIdHelper__
-#define __org_omg_IOP_ServiceIdHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class ServiceIdHelper;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::ServiceIdHelper : public ::java::lang::Object
-{
-
-public:
-  ServiceIdHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, jint);
-  static jint extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static jint read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_ServiceIdHelper__
diff --git a/libjava/org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.h b/libjava/org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.h
deleted file mode 100644
index 4afab11d11d..00000000000
--- a/libjava/org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TAG_ALTERNATE_IIOP_ADDRESS__
-#define __org_omg_IOP_TAG_ALTERNATE_IIOP_ADDRESS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TAG_ALTERNATE_IIOP_ADDRESS;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TAG_ALTERNATE_IIOP_ADDRESS : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_TAG_ALTERNATE_IIOP_ADDRESS__
diff --git a/libjava/org/omg/IOP/TAG_CODE_SETS.h b/libjava/org/omg/IOP/TAG_CODE_SETS.h
deleted file mode 100644
index aae4776545b..00000000000
--- a/libjava/org/omg/IOP/TAG_CODE_SETS.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TAG_CODE_SETS__
-#define __org_omg_IOP_TAG_CODE_SETS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TAG_CODE_SETS;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TAG_CODE_SETS : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_TAG_CODE_SETS__
diff --git a/libjava/org/omg/IOP/TAG_INTERNET_IOP.h b/libjava/org/omg/IOP/TAG_INTERNET_IOP.h
deleted file mode 100644
index cba27286684..00000000000
--- a/libjava/org/omg/IOP/TAG_INTERNET_IOP.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TAG_INTERNET_IOP__
-#define __org_omg_IOP_TAG_INTERNET_IOP__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TAG_INTERNET_IOP;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TAG_INTERNET_IOP : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_TAG_INTERNET_IOP__
diff --git a/libjava/org/omg/IOP/TAG_JAVA_CODEBASE.h b/libjava/org/omg/IOP/TAG_JAVA_CODEBASE.h
deleted file mode 100644
index 0dea9b50631..00000000000
--- a/libjava/org/omg/IOP/TAG_JAVA_CODEBASE.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TAG_JAVA_CODEBASE__
-#define __org_omg_IOP_TAG_JAVA_CODEBASE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TAG_JAVA_CODEBASE;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TAG_JAVA_CODEBASE : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 25;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_TAG_JAVA_CODEBASE__
diff --git a/libjava/org/omg/IOP/TAG_MULTIPLE_COMPONENTS.h b/libjava/org/omg/IOP/TAG_MULTIPLE_COMPONENTS.h
deleted file mode 100644
index 1778342a94f..00000000000
--- a/libjava/org/omg/IOP/TAG_MULTIPLE_COMPONENTS.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TAG_MULTIPLE_COMPONENTS__
-#define __org_omg_IOP_TAG_MULTIPLE_COMPONENTS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TAG_MULTIPLE_COMPONENTS;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TAG_MULTIPLE_COMPONENTS : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_TAG_MULTIPLE_COMPONENTS__
diff --git a/libjava/org/omg/IOP/TAG_ORB_TYPE.h b/libjava/org/omg/IOP/TAG_ORB_TYPE.h
deleted file mode 100644
index 154f161d133..00000000000
--- a/libjava/org/omg/IOP/TAG_ORB_TYPE.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TAG_ORB_TYPE__
-#define __org_omg_IOP_TAG_ORB_TYPE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TAG_ORB_TYPE;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TAG_ORB_TYPE : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_TAG_ORB_TYPE__
diff --git a/libjava/org/omg/IOP/TAG_POLICIES.h b/libjava/org/omg/IOP/TAG_POLICIES.h
deleted file mode 100644
index 27d7a8f0164..00000000000
--- a/libjava/org/omg/IOP/TAG_POLICIES.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TAG_POLICIES__
-#define __org_omg_IOP_TAG_POLICIES__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TAG_POLICIES;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TAG_POLICIES : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_TAG_POLICIES__
diff --git a/libjava/org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.h b/libjava/org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.h
deleted file mode 100644
index d4b8c92bd4b..00000000000
--- a/libjava/org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TAG_RMI_CUSTOM_MAX_STREAM_FORMAT__
-#define __org_omg_IOP_TAG_RMI_CUSTOM_MAX_STREAM_FORMAT__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TAG_RMI_CUSTOM_MAX_STREAM_FORMAT;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TAG_RMI_CUSTOM_MAX_STREAM_FORMAT : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 38;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_TAG_RMI_CUSTOM_MAX_STREAM_FORMAT__
diff --git a/libjava/org/omg/IOP/TaggedComponent.h b/libjava/org/omg/IOP/TaggedComponent.h
deleted file mode 100644
index 33890b784ce..00000000000
--- a/libjava/org/omg/IOP/TaggedComponent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TaggedComponent__
-#define __org_omg_IOP_TaggedComponent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TaggedComponent;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TaggedComponent : public ::java::lang::Object
-{
-
-public:
-  TaggedComponent();
-  TaggedComponent(jint, JArray< jbyte > *);
-private:
-  static const jlong serialVersionUID = -2084695346022761692LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) tag;
-  JArray< jbyte > * component_data;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_TaggedComponent__
diff --git a/libjava/org/omg/IOP/TaggedComponentHelper.h b/libjava/org/omg/IOP/TaggedComponentHelper.h
deleted file mode 100644
index f3484297f6c..00000000000
--- a/libjava/org/omg/IOP/TaggedComponentHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TaggedComponentHelper__
-#define __org_omg_IOP_TaggedComponentHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class TaggedComponent;
-          class TaggedComponentHelper;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TaggedComponentHelper : public ::java::lang::Object
-{
-
-public:
-  TaggedComponentHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::IOP::TaggedComponent *);
-  static ::org::omg::IOP::TaggedComponent * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::IOP::TaggedComponent * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::IOP::TaggedComponent *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_TaggedComponentHelper__
diff --git a/libjava/org/omg/IOP/TaggedComponentHolder.h b/libjava/org/omg/IOP/TaggedComponentHolder.h
deleted file mode 100644
index 03200802ce6..00000000000
--- a/libjava/org/omg/IOP/TaggedComponentHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TaggedComponentHolder__
-#define __org_omg_IOP_TaggedComponentHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class TaggedComponent;
-          class TaggedComponentHolder;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TaggedComponentHolder : public ::java::lang::Object
-{
-
-public:
-  TaggedComponentHolder();
-  TaggedComponentHolder(::org::omg::IOP::TaggedComponent *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::IOP::TaggedComponent * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_TaggedComponentHolder__
diff --git a/libjava/org/omg/IOP/TaggedProfile.h b/libjava/org/omg/IOP/TaggedProfile.h
deleted file mode 100644
index 55498f7c827..00000000000
--- a/libjava/org/omg/IOP/TaggedProfile.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TaggedProfile__
-#define __org_omg_IOP_TaggedProfile__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TaggedProfile;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TaggedProfile : public ::java::lang::Object
-{
-
-public:
-  TaggedProfile();
-  TaggedProfile(jint, JArray< jbyte > *);
-private:
-  static const jlong serialVersionUID = -461232684387903343LL;
-public:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) tag;
-  JArray< jbyte > * profile_data;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_TaggedProfile__
diff --git a/libjava/org/omg/IOP/TaggedProfileHelper.h b/libjava/org/omg/IOP/TaggedProfileHelper.h
deleted file mode 100644
index 63b544e3375..00000000000
--- a/libjava/org/omg/IOP/TaggedProfileHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TaggedProfileHelper__
-#define __org_omg_IOP_TaggedProfileHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class TaggedProfile;
-          class TaggedProfileHelper;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TaggedProfileHelper : public ::java::lang::Object
-{
-
-public:
-  TaggedProfileHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::IOP::TaggedProfile *);
-  static ::org::omg::IOP::TaggedProfile * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::IOP::TaggedProfile * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::IOP::TaggedProfile *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_TaggedProfileHelper__
diff --git a/libjava/org/omg/IOP/TaggedProfileHolder.h b/libjava/org/omg/IOP/TaggedProfileHolder.h
deleted file mode 100644
index b7eb950b4dd..00000000000
--- a/libjava/org/omg/IOP/TaggedProfileHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TaggedProfileHolder__
-#define __org_omg_IOP_TaggedProfileHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace IOP
-      {
-          class TaggedProfile;
-          class TaggedProfileHolder;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TaggedProfileHolder : public ::java::lang::Object
-{
-
-public:
-  TaggedProfileHolder();
-  TaggedProfileHolder(::org::omg::IOP::TaggedProfile *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::IOP::TaggedProfile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_IOP_TaggedProfileHolder__
diff --git a/libjava/org/omg/IOP/TransactionService.h b/libjava/org/omg/IOP/TransactionService.h
deleted file mode 100644
index a41a26e53dd..00000000000
--- a/libjava/org/omg/IOP/TransactionService.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_IOP_TransactionService__
-#define __org_omg_IOP_TransactionService__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace IOP
-      {
-          class TransactionService;
-      }
-    }
-  }
-}
-
-class org::omg::IOP::TransactionService : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_IOP_TransactionService__
diff --git a/libjava/org/omg/Messaging/SYNC_WITH_TRANSPORT.h b/libjava/org/omg/Messaging/SYNC_WITH_TRANSPORT.h
deleted file mode 100644
index 6fc2b4e782e..00000000000
--- a/libjava/org/omg/Messaging/SYNC_WITH_TRANSPORT.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_Messaging_SYNC_WITH_TRANSPORT__
-#define __org_omg_Messaging_SYNC_WITH_TRANSPORT__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace Messaging
-      {
-          class SYNC_WITH_TRANSPORT;
-      }
-    }
-  }
-}
-
-class org::omg::Messaging::SYNC_WITH_TRANSPORT : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_Messaging_SYNC_WITH_TRANSPORT__
diff --git a/libjava/org/omg/Messaging/SyncScopeHelper.h b/libjava/org/omg/Messaging/SyncScopeHelper.h
deleted file mode 100644
index 26e8347431d..00000000000
--- a/libjava/org/omg/Messaging/SyncScopeHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_Messaging_SyncScopeHelper__
-#define __org_omg_Messaging_SyncScopeHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace Messaging
-      {
-          class SyncScopeHelper;
-      }
-    }
-  }
-}
-
-class org::omg::Messaging::SyncScopeHelper : public ::java::lang::Object
-{
-
-public:
-  SyncScopeHelper();
-  static jshort extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, jshort);
-  static jshort read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, jshort);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_Messaging_SyncScopeHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ACTIVE.h b/libjava/org/omg/PortableInterceptor/ACTIVE.h
deleted file mode 100644
index de14e9498f8..00000000000
--- a/libjava/org/omg/PortableInterceptor/ACTIVE.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ACTIVE__
-#define __org_omg_PortableInterceptor_ACTIVE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class ACTIVE;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ACTIVE : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ACTIVE__
diff --git a/libjava/org/omg/PortableInterceptor/AdapterManagerIdHelper.h b/libjava/org/omg/PortableInterceptor/AdapterManagerIdHelper.h
deleted file mode 100644
index aabc118e9ec..00000000000
--- a/libjava/org/omg/PortableInterceptor/AdapterManagerIdHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_AdapterManagerIdHelper__
-#define __org_omg_PortableInterceptor_AdapterManagerIdHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class AdapterManagerIdHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::AdapterManagerIdHelper : public ::java::lang::Object
-{
-
-public:
-  AdapterManagerIdHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, jint);
-  static jint extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static jint read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_AdapterManagerIdHelper__
diff --git a/libjava/org/omg/PortableInterceptor/AdapterNameHelper.h b/libjava/org/omg/PortableInterceptor/AdapterNameHelper.h
deleted file mode 100644
index 7f6552e38b6..00000000000
--- a/libjava/org/omg/PortableInterceptor/AdapterNameHelper.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_AdapterNameHelper__
-#define __org_omg_PortableInterceptor_AdapterNameHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class AdapterNameHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::AdapterNameHelper : public ::java::lang::Object
-{
-
-public:
-  AdapterNameHelper();
-  static JArray< ::java::lang::String * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::java::lang::String * > *);
-  static JArray< ::java::lang::String * > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::java::lang::String * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_AdapterNameHelper__
diff --git a/libjava/org/omg/PortableInterceptor/AdapterStateHelper.h b/libjava/org/omg/PortableInterceptor/AdapterStateHelper.h
deleted file mode 100644
index 6606a806863..00000000000
--- a/libjava/org/omg/PortableInterceptor/AdapterStateHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_AdapterStateHelper__
-#define __org_omg_PortableInterceptor_AdapterStateHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class AdapterStateHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::AdapterStateHelper : public ::java::lang::Object
-{
-
-public:
-  AdapterStateHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, jshort);
-  static jshort extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static jshort read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, jshort);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_AdapterStateHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ClientRequestInfo.h b/libjava/org/omg/PortableInterceptor/ClientRequestInfo.h
deleted file mode 100644
index 2285aabd7b6..00000000000
--- a/libjava/org/omg/PortableInterceptor/ClientRequestInfo.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ClientRequestInfo__
-#define __org_omg_PortableInterceptor_ClientRequestInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace Dynamic
-      {
-          class Parameter;
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-          class TaggedComponent;
-          class TaggedProfile;
-      }
-      namespace PortableInterceptor
-      {
-          class ClientRequestInfo;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ClientRequestInfo : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Object * target() = 0;
-  virtual ::org::omg::CORBA::Object * effective_target() = 0;
-  virtual ::org::omg::IOP::TaggedProfile * effective_profile() = 0;
-  virtual ::org::omg::IOP::TaggedComponent * get_effective_component(jint) = 0;
-  virtual JArray< ::org::omg::IOP::TaggedComponent * > * get_effective_components(jint) = 0;
-  virtual ::org::omg::CORBA::Policy * get_request_policy(jint) = 0;
-  virtual ::java::lang::String * received_exception_id() = 0;
-  virtual ::org::omg::CORBA::Any * received_exception() = 0;
-  virtual void add_request_service_context(::org::omg::IOP::ServiceContext *, jboolean) = 0;
-  virtual JArray< ::org::omg::Dynamic::Parameter * > * arguments() = 0;
-  virtual JArray< ::java::lang::String * > * contexts() = 0;
-  virtual JArray< ::org::omg::CORBA::TypeCode * > * exceptions() = 0;
-  virtual ::org::omg::CORBA::Object * forward_reference() = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_reply_service_context(jint) = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_request_service_context(jint) = 0;
-  virtual ::org::omg::CORBA::Any * get_slot(jint) = 0;
-  virtual JArray< ::java::lang::String * > * operation_context() = 0;
-  virtual ::java::lang::String * operation() = 0;
-  virtual jshort reply_status() = 0;
-  virtual jint request_id() = 0;
-  virtual jboolean response_expected() = 0;
-  virtual ::org::omg::CORBA::Any * result() = 0;
-  virtual jshort sync_scope() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ClientRequestInfo__
diff --git a/libjava/org/omg/PortableInterceptor/ClientRequestInfoOperations.h b/libjava/org/omg/PortableInterceptor/ClientRequestInfoOperations.h
deleted file mode 100644
index af573b76eab..00000000000
--- a/libjava/org/omg/PortableInterceptor/ClientRequestInfoOperations.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ClientRequestInfoOperations__
-#define __org_omg_PortableInterceptor_ClientRequestInfoOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableInterceptor
-      {
-          class ClientRequestInfoOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ClientRequestInfoOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Object * target() = 0;
-  virtual ::org::omg::CORBA::Object * effective_target() = 0;
-  virtual ::org::omg::IOP::TaggedProfile * effective_profile() = 0;
-  virtual ::org::omg::IOP::TaggedComponent * get_effective_component(jint) = 0;
-  virtual JArray< ::org::omg::IOP::TaggedComponent * > * get_effective_components(jint) = 0;
-  virtual ::org::omg::CORBA::Policy * get_request_policy(jint) = 0;
-  virtual ::java::lang::String * received_exception_id() = 0;
-  virtual ::org::omg::CORBA::Any * received_exception() = 0;
-  virtual void add_request_service_context(::org::omg::IOP::ServiceContext *, jboolean) = 0;
-  virtual JArray< ::org::omg::Dynamic::Parameter * > * arguments() = 0;
-  virtual JArray< ::java::lang::String * > * contexts() = 0;
-  virtual JArray< ::org::omg::CORBA::TypeCode * > * exceptions() = 0;
-  virtual ::org::omg::CORBA::Object * forward_reference() = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_reply_service_context(jint) = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_request_service_context(jint) = 0;
-  virtual ::org::omg::CORBA::Any * get_slot(jint) = 0;
-  virtual JArray< ::java::lang::String * > * operation_context() = 0;
-  virtual ::java::lang::String * operation() = 0;
-  virtual jshort reply_status() = 0;
-  virtual jint request_id() = 0;
-  virtual jboolean response_expected() = 0;
-  virtual ::org::omg::CORBA::Any * result() = 0;
-  virtual jshort sync_scope() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ClientRequestInfoOperations__
diff --git a/libjava/org/omg/PortableInterceptor/ClientRequestInterceptor.h b/libjava/org/omg/PortableInterceptor/ClientRequestInterceptor.h
deleted file mode 100644
index 9cb1b2a95b1..00000000000
--- a/libjava/org/omg/PortableInterceptor/ClientRequestInterceptor.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ClientRequestInterceptor__
-#define __org_omg_PortableInterceptor_ClientRequestInterceptor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableInterceptor
-      {
-          class ClientRequestInfo;
-          class ClientRequestInterceptor;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ClientRequestInterceptor : public ::java::lang::Object
-{
-
-public:
-  virtual void destroy() = 0;
-  virtual ::java::lang::String * name() = 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 void send_request(::org::omg::PortableInterceptor::ClientRequestInfo *) = 0;
-  virtual void receive_reply(::org::omg::PortableInterceptor::ClientRequestInfo *) = 0;
-  virtual void receive_exception(::org::omg::PortableInterceptor::ClientRequestInfo *) = 0;
-  virtual void receive_other(::org::omg::PortableInterceptor::ClientRequestInfo *) = 0;
-  virtual void send_poll(::org::omg::PortableInterceptor::ClientRequestInfo *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ClientRequestInterceptor__
diff --git a/libjava/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.h b/libjava/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.h
deleted file mode 100644
index 8673727711a..00000000000
--- a/libjava/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ClientRequestInterceptorOperations__
-#define __org_omg_PortableInterceptor_ClientRequestInterceptorOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class ClientRequestInfo;
-          class ClientRequestInterceptorOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ClientRequestInterceptorOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void send_request(::org::omg::PortableInterceptor::ClientRequestInfo *) = 0;
-  virtual void receive_reply(::org::omg::PortableInterceptor::ClientRequestInfo *) = 0;
-  virtual void receive_exception(::org::omg::PortableInterceptor::ClientRequestInfo *) = 0;
-  virtual void receive_other(::org::omg::PortableInterceptor::ClientRequestInfo *) = 0;
-  virtual void send_poll(::org::omg::PortableInterceptor::ClientRequestInfo *) = 0;
-  virtual void destroy() = 0;
-  virtual ::java::lang::String * name() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ClientRequestInterceptorOperations__
diff --git a/libjava/org/omg/PortableInterceptor/Current.h b/libjava/org/omg/PortableInterceptor/Current.h
deleted file mode 100644
index 04b1f431677..00000000000
--- a/libjava/org/omg/PortableInterceptor/Current.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_Current__
-#define __org_omg_PortableInterceptor_Current__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-      }
-      namespace PortableInterceptor
-      {
-          class Current;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::Current : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Any * get_slot(jint) = 0;
-  virtual void set_slot(jint, ::org::omg::CORBA::Any *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_Current__
diff --git a/libjava/org/omg/PortableInterceptor/CurrentHelper.h b/libjava/org/omg/PortableInterceptor/CurrentHelper.h
deleted file mode 100644
index 2537dcbd2c8..00000000000
--- a/libjava/org/omg/PortableInterceptor/CurrentHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_CurrentHelper__
-#define __org_omg_PortableInterceptor_CurrentHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class Current;
-          class CurrentHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::CurrentHelper : public ::java::lang::Object
-{
-
-public:
-  CurrentHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableInterceptor::Current *);
-  static ::org::omg::PortableInterceptor::Current * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableInterceptor::Current * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::PortableInterceptor::Current * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::PortableInterceptor::Current * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableInterceptor::Current *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_CurrentHelper__
diff --git a/libjava/org/omg/PortableInterceptor/CurrentOperations.h b/libjava/org/omg/PortableInterceptor/CurrentOperations.h
deleted file mode 100644
index 0095f999ebf..00000000000
--- a/libjava/org/omg/PortableInterceptor/CurrentOperations.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_CurrentOperations__
-#define __org_omg_PortableInterceptor_CurrentOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-      }
-      namespace PortableInterceptor
-      {
-          class CurrentOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::CurrentOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Any * get_slot(jint) = 0;
-  virtual void set_slot(jint, ::org::omg::CORBA::Any *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_CurrentOperations__
diff --git a/libjava/org/omg/PortableInterceptor/DISCARDING.h b/libjava/org/omg/PortableInterceptor/DISCARDING.h
deleted file mode 100644
index 1c12778ee70..00000000000
--- a/libjava/org/omg/PortableInterceptor/DISCARDING.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_DISCARDING__
-#define __org_omg_PortableInterceptor_DISCARDING__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class DISCARDING;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::DISCARDING : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_DISCARDING__
diff --git a/libjava/org/omg/PortableInterceptor/ForwardRequest.h b/libjava/org/omg/PortableInterceptor/ForwardRequest.h
deleted file mode 100644
index 63f3e49247c..00000000000
--- a/libjava/org/omg/PortableInterceptor/ForwardRequest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ForwardRequest__
-#define __org_omg_PortableInterceptor_ForwardRequest__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace PortableInterceptor
-      {
-          class ForwardRequest;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ForwardRequest : public ::org::omg::CORBA::UserException
-{
-
-public:
-  ForwardRequest();
-  ForwardRequest(::java::lang::String *, ::org::omg::CORBA::Object *);
-  ForwardRequest(::org::omg::CORBA::Object *);
-private:
-  static const jlong serialVersionUID = 2128007517550526397LL;
-public:
-  ::org::omg::CORBA::Object * __attribute__((aligned(__alignof__( ::org::omg::CORBA::UserException)))) forward;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ForwardRequest__
diff --git a/libjava/org/omg/PortableInterceptor/ForwardRequestHelper.h b/libjava/org/omg/PortableInterceptor/ForwardRequestHelper.h
deleted file mode 100644
index d5631ea1eab..00000000000
--- a/libjava/org/omg/PortableInterceptor/ForwardRequestHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ForwardRequestHelper__
-#define __org_omg_PortableInterceptor_ForwardRequestHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ForwardRequest;
-          class ForwardRequestHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ForwardRequestHelper : public ::java::lang::Object
-{
-
-public:
-  ForwardRequestHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableInterceptor::ForwardRequest *);
-  static ::org::omg::PortableInterceptor::ForwardRequest * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableInterceptor::ForwardRequest * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableInterceptor::ForwardRequest *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ForwardRequestHelper__
diff --git a/libjava/org/omg/PortableInterceptor/HOLDING.h b/libjava/org/omg/PortableInterceptor/HOLDING.h
deleted file mode 100644
index aa94377434e..00000000000
--- a/libjava/org/omg/PortableInterceptor/HOLDING.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_HOLDING__
-#define __org_omg_PortableInterceptor_HOLDING__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class HOLDING;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::HOLDING : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_HOLDING__
diff --git a/libjava/org/omg/PortableInterceptor/INACTIVE.h b/libjava/org/omg/PortableInterceptor/INACTIVE.h
deleted file mode 100644
index 89722a934c3..00000000000
--- a/libjava/org/omg/PortableInterceptor/INACTIVE.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_INACTIVE__
-#define __org_omg_PortableInterceptor_INACTIVE__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class INACTIVE;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::INACTIVE : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_INACTIVE__
diff --git a/libjava/org/omg/PortableInterceptor/IORInfo.h b/libjava/org/omg/PortableInterceptor/IORInfo.h
deleted file mode 100644
index 330de97d34d..00000000000
--- a/libjava/org/omg/PortableInterceptor/IORInfo.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_IORInfo__
-#define __org_omg_PortableInterceptor_IORInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace IOP
-      {
-          class TaggedComponent;
-      }
-      namespace PortableInterceptor
-      {
-          class IORInfo;
-          class ObjectReferenceFactory;
-          class ObjectReferenceTemplate;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::IORInfo : public ::java::lang::Object
-{
-
-public:
-  virtual void add_ior_component_to_profile(::org::omg::IOP::TaggedComponent *, jint) = 0;
-  virtual void add_ior_component(::org::omg::IOP::TaggedComponent *) = 0;
-  virtual ::org::omg::CORBA::Policy * get_effective_policy(jint) = 0;
-  virtual ::org::omg::PortableInterceptor::ObjectReferenceTemplate * adapter_template() = 0;
-  virtual ::org::omg::PortableInterceptor::ObjectReferenceFactory * current_factory() = 0;
-  virtual void current_factory(::org::omg::PortableInterceptor::ObjectReferenceFactory *) = 0;
-  virtual jint manager_id() = 0;
-  virtual jshort state() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_IORInfo__
diff --git a/libjava/org/omg/PortableInterceptor/IORInfoOperations.h b/libjava/org/omg/PortableInterceptor/IORInfoOperations.h
deleted file mode 100644
index f93bd9e2fbd..00000000000
--- a/libjava/org/omg/PortableInterceptor/IORInfoOperations.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_IORInfoOperations__
-#define __org_omg_PortableInterceptor_IORInfoOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-      }
-      namespace IOP
-      {
-          class TaggedComponent;
-      }
-      namespace PortableInterceptor
-      {
-          class IORInfoOperations;
-          class ObjectReferenceFactory;
-          class ObjectReferenceTemplate;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::IORInfoOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void add_ior_component_to_profile(::org::omg::IOP::TaggedComponent *, jint) = 0;
-  virtual void add_ior_component(::org::omg::IOP::TaggedComponent *) = 0;
-  virtual ::org::omg::CORBA::Policy * get_effective_policy(jint) = 0;
-  virtual ::org::omg::PortableInterceptor::ObjectReferenceTemplate * adapter_template() = 0;
-  virtual ::org::omg::PortableInterceptor::ObjectReferenceFactory * current_factory() = 0;
-  virtual void current_factory(::org::omg::PortableInterceptor::ObjectReferenceFactory *) = 0;
-  virtual jint manager_id() = 0;
-  virtual jshort state() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_IORInfoOperations__
diff --git a/libjava/org/omg/PortableInterceptor/IORInterceptor.h b/libjava/org/omg/PortableInterceptor/IORInterceptor.h
deleted file mode 100644
index e51016ec3a0..00000000000
--- a/libjava/org/omg/PortableInterceptor/IORInterceptor.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_IORInterceptor__
-#define __org_omg_PortableInterceptor_IORInterceptor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableInterceptor
-      {
-          class IORInfo;
-          class IORInterceptor;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::IORInterceptor : public ::java::lang::Object
-{
-
-public:
-  virtual void destroy() = 0;
-  virtual ::java::lang::String * name() = 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 void establish_components(::org::omg::PortableInterceptor::IORInfo *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_IORInterceptor__
diff --git a/libjava/org/omg/PortableInterceptor/IORInterceptorOperations.h b/libjava/org/omg/PortableInterceptor/IORInterceptorOperations.h
deleted file mode 100644
index 0a350730740..00000000000
--- a/libjava/org/omg/PortableInterceptor/IORInterceptorOperations.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_IORInterceptorOperations__
-#define __org_omg_PortableInterceptor_IORInterceptorOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class IORInfo;
-          class IORInterceptorOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::IORInterceptorOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void establish_components(::org::omg::PortableInterceptor::IORInfo *) = 0;
-  virtual void destroy() = 0;
-  virtual ::java::lang::String * name() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_IORInterceptorOperations__
diff --git a/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0.h b/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0.h
deleted file mode 100644
index 0e8ccdd31ff..00000000000
--- a/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_IORInterceptor_3_0__
-#define __org_omg_PortableInterceptor_IORInterceptor_3_0__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableInterceptor
-      {
-          class IORInfo;
-          class IORInterceptor_3_0;
-          class ObjectReferenceTemplate;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::IORInterceptor_3_0 : public ::java::lang::Object
-{
-
-public:
-  virtual void adapter_manager_state_changed(jint, jshort) = 0;
-  virtual void adapter_state_changed(JArray< ::org::omg::PortableInterceptor::ObjectReferenceTemplate * > *, jshort) = 0;
-  virtual void components_established(::org::omg::PortableInterceptor::IORInfo *) = 0;
-  virtual void establish_components(::org::omg::PortableInterceptor::IORInfo *) = 0;
-  virtual void destroy() = 0;
-  virtual ::java::lang::String * name() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_IORInterceptor_3_0__
diff --git a/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.h b/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.h
deleted file mode 100644
index a52aa51cea7..00000000000
--- a/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_IORInterceptor_3_0Helper__
-#define __org_omg_PortableInterceptor_IORInterceptor_3_0Helper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class IORInterceptor_3_0;
-          class IORInterceptor_3_0Helper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::IORInterceptor_3_0Helper : public ::java::lang::Object
-{
-
-public:
-  IORInterceptor_3_0Helper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableInterceptor::IORInterceptor_3_0 *);
-  static ::org::omg::PortableInterceptor::IORInterceptor_3_0 * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableInterceptor::IORInterceptor_3_0 * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::PortableInterceptor::IORInterceptor_3_0 * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::PortableInterceptor::IORInterceptor_3_0 * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableInterceptor::IORInterceptor_3_0 *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_IORInterceptor_3_0Helper__
diff --git a/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.h b/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.h
deleted file mode 100644
index f64d4382c85..00000000000
--- a/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_IORInterceptor_3_0Holder__
-#define __org_omg_PortableInterceptor_IORInterceptor_3_0Holder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class IORInterceptor_3_0;
-          class IORInterceptor_3_0Holder;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::IORInterceptor_3_0Holder : public ::java::lang::Object
-{
-
-public:
-  IORInterceptor_3_0Holder();
-  IORInterceptor_3_0Holder(::org::omg::PortableInterceptor::IORInterceptor_3_0 *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::PortableInterceptor::IORInterceptor_3_0 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_IORInterceptor_3_0Holder__
diff --git a/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.h b/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.h
deleted file mode 100644
index 895ee97fd89..00000000000
--- a/libjava/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_IORInterceptor_3_0Operations__
-#define __org_omg_PortableInterceptor_IORInterceptor_3_0Operations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class IORInfo;
-          class IORInterceptor_3_0Operations;
-          class ObjectReferenceTemplate;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::IORInterceptor_3_0Operations : public ::java::lang::Object
-{
-
-public:
-  virtual void adapter_manager_state_changed(jint, jshort) = 0;
-  virtual void adapter_state_changed(JArray< ::org::omg::PortableInterceptor::ObjectReferenceTemplate * > *, jshort) = 0;
-  virtual void components_established(::org::omg::PortableInterceptor::IORInfo *) = 0;
-  virtual void establish_components(::org::omg::PortableInterceptor::IORInfo *) = 0;
-  virtual void destroy() = 0;
-  virtual ::java::lang::String * name() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_IORInterceptor_3_0Operations__
diff --git a/libjava/org/omg/PortableInterceptor/Interceptor.h b/libjava/org/omg/PortableInterceptor/Interceptor.h
deleted file mode 100644
index 8cc545cef1b..00000000000
--- a/libjava/org/omg/PortableInterceptor/Interceptor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_Interceptor__
-#define __org_omg_PortableInterceptor_Interceptor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableInterceptor
-      {
-          class Interceptor;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::Interceptor : public ::java::lang::Object
-{
-
-public:
-  virtual void destroy() = 0;
-  virtual ::java::lang::String * name() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_Interceptor__
diff --git a/libjava/org/omg/PortableInterceptor/InterceptorOperations.h b/libjava/org/omg/PortableInterceptor/InterceptorOperations.h
deleted file mode 100644
index 550da35d181..00000000000
--- a/libjava/org/omg/PortableInterceptor/InterceptorOperations.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_InterceptorOperations__
-#define __org_omg_PortableInterceptor_InterceptorOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class InterceptorOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::InterceptorOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void destroy() = 0;
-  virtual ::java::lang::String * name() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_InterceptorOperations__
diff --git a/libjava/org/omg/PortableInterceptor/InvalidSlot.h b/libjava/org/omg/PortableInterceptor/InvalidSlot.h
deleted file mode 100644
index ca9301f4167..00000000000
--- a/libjava/org/omg/PortableInterceptor/InvalidSlot.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_InvalidSlot__
-#define __org_omg_PortableInterceptor_InvalidSlot__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class InvalidSlot;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::InvalidSlot : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InvalidSlot();
-  InvalidSlot(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2471643293291821501LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_InvalidSlot__
diff --git a/libjava/org/omg/PortableInterceptor/InvalidSlotHelper.h b/libjava/org/omg/PortableInterceptor/InvalidSlotHelper.h
deleted file mode 100644
index ba8b0235539..00000000000
--- a/libjava/org/omg/PortableInterceptor/InvalidSlotHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_InvalidSlotHelper__
-#define __org_omg_PortableInterceptor_InvalidSlotHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class InvalidSlot;
-          class InvalidSlotHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::InvalidSlotHelper : public ::java::lang::Object
-{
-
-public:
-  InvalidSlotHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableInterceptor::InvalidSlot *);
-  static ::org::omg::PortableInterceptor::InvalidSlot * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableInterceptor::InvalidSlot * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableInterceptor::InvalidSlot *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_InvalidSlotHelper__
diff --git a/libjava/org/omg/PortableInterceptor/LOCATION_FORWARD.h b/libjava/org/omg/PortableInterceptor/LOCATION_FORWARD.h
deleted file mode 100644
index c98609ab595..00000000000
--- a/libjava/org/omg/PortableInterceptor/LOCATION_FORWARD.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_LOCATION_FORWARD__
-#define __org_omg_PortableInterceptor_LOCATION_FORWARD__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class LOCATION_FORWARD;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::LOCATION_FORWARD : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_LOCATION_FORWARD__
diff --git a/libjava/org/omg/PortableInterceptor/NON_EXISTENT.h b/libjava/org/omg/PortableInterceptor/NON_EXISTENT.h
deleted file mode 100644
index fd62b3a9515..00000000000
--- a/libjava/org/omg/PortableInterceptor/NON_EXISTENT.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_NON_EXISTENT__
-#define __org_omg_PortableInterceptor_NON_EXISTENT__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class NON_EXISTENT;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::NON_EXISTENT : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_NON_EXISTENT__
diff --git a/libjava/org/omg/PortableInterceptor/ORBIdHelper.h b/libjava/org/omg/PortableInterceptor/ORBIdHelper.h
deleted file mode 100644
index 52d76984f98..00000000000
--- a/libjava/org/omg/PortableInterceptor/ORBIdHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ORBIdHelper__
-#define __org_omg_PortableInterceptor_ORBIdHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ORBIdHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ORBIdHelper : public ::java::lang::Object
-{
-
-public:
-  ORBIdHelper();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ORBIdHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ORBInitInfo.h b/libjava/org/omg/PortableInterceptor/ORBInitInfo.h
deleted file mode 100644
index f72efa27e3d..00000000000
--- a/libjava/org/omg/PortableInterceptor/ORBInitInfo.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ORBInitInfo__
-#define __org_omg_PortableInterceptor_ORBInitInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace IOP
-      {
-          class CodecFactory;
-      }
-      namespace PortableInterceptor
-      {
-          class ClientRequestInterceptor;
-          class IORInterceptor;
-          class ORBInitInfo;
-          class PolicyFactory;
-          class ServerRequestInterceptor;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ORBInitInfo : public ::java::lang::Object
-{
-
-public:
-  virtual void add_client_request_interceptor(::org::omg::PortableInterceptor::ClientRequestInterceptor *) = 0;
-  virtual void add_ior_interceptor(::org::omg::PortableInterceptor::IORInterceptor *) = 0;
-  virtual void add_server_request_interceptor(::org::omg::PortableInterceptor::ServerRequestInterceptor *) = 0;
-  virtual jint allocate_slot_id() = 0;
-  virtual JArray< ::java::lang::String * > * arguments() = 0;
-  virtual ::org::omg::IOP::CodecFactory * codec_factory() = 0;
-  virtual ::java::lang::String * orb_id() = 0;
-  virtual void register_initial_reference(::java::lang::String *, ::org::omg::CORBA::Object *) = 0;
-  virtual ::org::omg::CORBA::Object * resolve_initial_references(::java::lang::String *) = 0;
-  virtual void register_policy_factory(jint, ::org::omg::PortableInterceptor::PolicyFactory *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ORBInitInfo__
diff --git a/libjava/org/omg/PortableInterceptor/ORBInitInfoOperations.h b/libjava/org/omg/PortableInterceptor/ORBInitInfoOperations.h
deleted file mode 100644
index 72c9a0b069a..00000000000
--- a/libjava/org/omg/PortableInterceptor/ORBInitInfoOperations.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ORBInitInfoOperations__
-#define __org_omg_PortableInterceptor_ORBInitInfoOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace IOP
-      {
-          class CodecFactory;
-      }
-      namespace PortableInterceptor
-      {
-          class ClientRequestInterceptor;
-          class IORInterceptor;
-          class ORBInitInfoOperations;
-          class PolicyFactory;
-          class ServerRequestInterceptor;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ORBInitInfoOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void add_client_request_interceptor(::org::omg::PortableInterceptor::ClientRequestInterceptor *) = 0;
-  virtual void add_ior_interceptor(::org::omg::PortableInterceptor::IORInterceptor *) = 0;
-  virtual void add_server_request_interceptor(::org::omg::PortableInterceptor::ServerRequestInterceptor *) = 0;
-  virtual jint allocate_slot_id() = 0;
-  virtual JArray< ::java::lang::String * > * arguments() = 0;
-  virtual ::org::omg::IOP::CodecFactory * codec_factory() = 0;
-  virtual ::java::lang::String * orb_id() = 0;
-  virtual void register_initial_reference(::java::lang::String *, ::org::omg::CORBA::Object *) = 0;
-  virtual ::org::omg::CORBA::Object * resolve_initial_references(::java::lang::String *) = 0;
-  virtual void register_policy_factory(jint, ::org::omg::PortableInterceptor::PolicyFactory *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ORBInitInfoOperations__
diff --git a/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.h b/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.h
deleted file mode 100644
index e9b842112e8..00000000000
--- a/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ORBInitInfoPackage_DuplicateName__
-#define __org_omg_PortableInterceptor_ORBInitInfoPackage_DuplicateName__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-        namespace ORBInitInfoPackage
-        {
-            class DuplicateName;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ORBInitInfoPackage::DuplicateName : public ::org::omg::CORBA::UserException
-{
-
-public:
-  DuplicateName();
-  DuplicateName(::java::lang::String *, ::java::lang::String *);
-  DuplicateName(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7748239257677851130LL;
-public:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::org::omg::CORBA::UserException)))) name;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ORBInitInfoPackage_DuplicateName__
diff --git a/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.h b/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.h
deleted file mode 100644
index 8abe1f92f77..00000000000
--- a/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ORBInitInfoPackage_DuplicateNameHelper__
-#define __org_omg_PortableInterceptor_ORBInitInfoPackage_DuplicateNameHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-        namespace ORBInitInfoPackage
-        {
-            class DuplicateName;
-            class DuplicateNameHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ORBInitInfoPackage::DuplicateNameHelper : public ::java::lang::Object
-{
-
-public:
-  DuplicateNameHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableInterceptor::ORBInitInfoPackage::DuplicateName *);
-  static ::org::omg::PortableInterceptor::ORBInitInfoPackage::DuplicateName * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableInterceptor::ORBInitInfoPackage::DuplicateName * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableInterceptor::ORBInitInfoPackage::DuplicateName *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ORBInitInfoPackage_DuplicateNameHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.h b/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.h
deleted file mode 100644
index a4f515fd6d0..00000000000
--- a/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ORBInitInfoPackage_InvalidName__
-#define __org_omg_PortableInterceptor_ORBInitInfoPackage_InvalidName__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-        namespace ORBInitInfoPackage
-        {
-            class InvalidName;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ORBInitInfoPackage::InvalidName : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InvalidName();
-  InvalidName(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -4599417794753377115LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ORBInitInfoPackage_InvalidName__
diff --git a/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.h b/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.h
deleted file mode 100644
index ed921b1dc87..00000000000
--- a/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ORBInitInfoPackage_InvalidNameHelper__
-#define __org_omg_PortableInterceptor_ORBInitInfoPackage_InvalidNameHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-        namespace ORBInitInfoPackage
-        {
-            class InvalidName;
-            class InvalidNameHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ORBInitInfoPackage::InvalidNameHelper : public ::java::lang::Object
-{
-
-public:
-  InvalidNameHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableInterceptor::ORBInitInfoPackage::InvalidName *);
-  static ::org::omg::PortableInterceptor::ORBInitInfoPackage::InvalidName * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableInterceptor::ORBInitInfoPackage::InvalidName * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableInterceptor::ORBInitInfoPackage::InvalidName *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ORBInitInfoPackage_InvalidNameHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.h b/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.h
deleted file mode 100644
index df3ae67f694..00000000000
--- a/libjava/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ORBInitInfoPackage_ObjectIdHelper__
-#define __org_omg_PortableInterceptor_ORBInitInfoPackage_ObjectIdHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-        namespace ORBInitInfoPackage
-        {
-            class ObjectIdHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ORBInitInfoPackage::ObjectIdHelper : public ::java::lang::Object
-{
-
-public:
-  ObjectIdHelper();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ORBInitInfoPackage_ObjectIdHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ORBInitializer.h b/libjava/org/omg/PortableInterceptor/ORBInitializer.h
deleted file mode 100644
index 860b4651e0d..00000000000
--- a/libjava/org/omg/PortableInterceptor/ORBInitializer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ORBInitializer__
-#define __org_omg_PortableInterceptor_ORBInitializer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableInterceptor
-      {
-          class ORBInitInfo;
-          class ORBInitializer;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ORBInitializer : public ::java::lang::Object
-{
-
-public:
-  virtual void pre_init(::org::omg::PortableInterceptor::ORBInitInfo *) = 0;
-  virtual void post_init(::org::omg::PortableInterceptor::ORBInitInfo *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ORBInitializer__
diff --git a/libjava/org/omg/PortableInterceptor/ORBInitializerOperations.h b/libjava/org/omg/PortableInterceptor/ORBInitializerOperations.h
deleted file mode 100644
index 0773c8e0bad..00000000000
--- a/libjava/org/omg/PortableInterceptor/ORBInitializerOperations.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ORBInitializerOperations__
-#define __org_omg_PortableInterceptor_ORBInitializerOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class ORBInitInfo;
-          class ORBInitializerOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ORBInitializerOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void pre_init(::org::omg::PortableInterceptor::ORBInitInfo *) = 0;
-  virtual void post_init(::org::omg::PortableInterceptor::ORBInitInfo *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ORBInitializerOperations__
diff --git a/libjava/org/omg/PortableInterceptor/ObjectIdHelper.h b/libjava/org/omg/PortableInterceptor/ObjectIdHelper.h
deleted file mode 100644
index 4829abd9ac3..00000000000
--- a/libjava/org/omg/PortableInterceptor/ObjectIdHelper.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ObjectIdHelper__
-#define __org_omg_PortableInterceptor_ObjectIdHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectIdHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ObjectIdHelper : public ::java::lang::Object
-{
-
-public:
-  ObjectIdHelper();
-  static void insert(::org::omg::CORBA::Any *, JArray< jbyte > *);
-  static JArray< jbyte > * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static JArray< jbyte > * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< jbyte > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ObjectIdHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ObjectReferenceFactory.h b/libjava/org/omg/PortableInterceptor/ObjectReferenceFactory.h
deleted file mode 100644
index e55b143655d..00000000000
--- a/libjava/org/omg/PortableInterceptor/ObjectReferenceFactory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ObjectReferenceFactory__
-#define __org_omg_PortableInterceptor_ObjectReferenceFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectReferenceFactory;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ObjectReferenceFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Object * make_object(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual JArray< ::java::lang::String * > * _truncatable_ids() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ObjectReferenceFactory__
diff --git a/libjava/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.h b/libjava/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.h
deleted file mode 100644
index fad8ae60a9e..00000000000
--- a/libjava/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ObjectReferenceFactoryHelper__
-#define __org_omg_PortableInterceptor_ObjectReferenceFactoryHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectReferenceFactory;
-          class ObjectReferenceFactoryHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ObjectReferenceFactoryHelper : public ::java::lang::Object
-{
-
-public:
-  ObjectReferenceFactoryHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableInterceptor::ObjectReferenceFactory *);
-  static ::org::omg::PortableInterceptor::ObjectReferenceFactory * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableInterceptor::ObjectReferenceFactory * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableInterceptor::ObjectReferenceFactory *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ObjectReferenceFactoryHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.h b/libjava/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.h
deleted file mode 100644
index 2196531f75c..00000000000
--- a/libjava/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ObjectReferenceFactoryHolder__
-#define __org_omg_PortableInterceptor_ObjectReferenceFactoryHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectReferenceFactory;
-          class ObjectReferenceFactoryHolder;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ObjectReferenceFactoryHolder : public ::java::lang::Object
-{
-
-public:
-  ObjectReferenceFactoryHolder();
-  ObjectReferenceFactoryHolder(::org::omg::PortableInterceptor::ObjectReferenceFactory *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::PortableInterceptor::ObjectReferenceFactory * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ObjectReferenceFactoryHolder__
diff --git a/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplate.h b/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplate.h
deleted file mode 100644
index 90da0424ecb..00000000000
--- a/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplate.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ObjectReferenceTemplate__
-#define __org_omg_PortableInterceptor_ObjectReferenceTemplate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectReferenceTemplate;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ObjectReferenceTemplate : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::java::lang::String * > * adapter_name() = 0;
-  virtual ::java::lang::String * orb_id() = 0;
-  virtual ::java::lang::String * server_id() = 0;
-  virtual ::org::omg::CORBA::Object * make_object(::java::lang::String *, JArray< jbyte > *) = 0;
-  virtual JArray< ::java::lang::String * > * _truncatable_ids() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ObjectReferenceTemplate__
diff --git a/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.h b/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.h
deleted file mode 100644
index f71cbd60526..00000000000
--- a/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ObjectReferenceTemplateHelper__
-#define __org_omg_PortableInterceptor_ObjectReferenceTemplateHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectReferenceTemplate;
-          class ObjectReferenceTemplateHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ObjectReferenceTemplateHelper : public ::java::lang::Object
-{
-
-public:
-  ObjectReferenceTemplateHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableInterceptor::ObjectReferenceTemplate *);
-  static ::org::omg::PortableInterceptor::ObjectReferenceTemplate * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableInterceptor::ObjectReferenceTemplate * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableInterceptor::ObjectReferenceTemplate *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ObjectReferenceTemplateHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.h b/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.h
deleted file mode 100644
index 74ddeecbd8e..00000000000
--- a/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ObjectReferenceTemplateHolder__
-#define __org_omg_PortableInterceptor_ObjectReferenceTemplateHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectReferenceTemplate;
-          class ObjectReferenceTemplateHolder;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ObjectReferenceTemplateHolder : public ::java::lang::Object
-{
-
-public:
-  ObjectReferenceTemplateHolder();
-  ObjectReferenceTemplateHolder(::org::omg::PortableInterceptor::ObjectReferenceTemplate *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  ::org::omg::PortableInterceptor::ObjectReferenceTemplate * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ObjectReferenceTemplateHolder__
diff --git a/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.h b/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.h
deleted file mode 100644
index 9779230d587..00000000000
--- a/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ObjectReferenceTemplateSeqHelper__
-#define __org_omg_PortableInterceptor_ObjectReferenceTemplateSeqHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectReferenceTemplate;
-          class ObjectReferenceTemplateSeqHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ObjectReferenceTemplateSeqHelper : public ::java::lang::Object
-{
-
-public:
-  ObjectReferenceTemplateSeqHelper();
-  static JArray< ::org::omg::PortableInterceptor::ObjectReferenceTemplate * > * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static void insert(::org::omg::CORBA::Any *, JArray< ::org::omg::PortableInterceptor::ObjectReferenceTemplate * > *);
-  static JArray< ::org::omg::PortableInterceptor::ObjectReferenceTemplate * > * read(::org::omg::CORBA::portable::InputStream *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void write(::org::omg::CORBA::portable::OutputStream *, JArray< ::org::omg::PortableInterceptor::ObjectReferenceTemplate * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ObjectReferenceTemplateSeqHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.h b/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.h
deleted file mode 100644
index f02f111f3a9..00000000000
--- a/libjava/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ObjectReferenceTemplateSeqHolder__
-#define __org_omg_PortableInterceptor_ObjectReferenceTemplateSeqHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ObjectReferenceTemplate;
-          class ObjectReferenceTemplateSeqHolder;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ObjectReferenceTemplateSeqHolder : public ::java::lang::Object
-{
-
-public:
-  ObjectReferenceTemplateSeqHolder();
-  ObjectReferenceTemplateSeqHolder(JArray< ::org::omg::PortableInterceptor::ObjectReferenceTemplate * > *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  JArray< ::org::omg::PortableInterceptor::ObjectReferenceTemplate * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ObjectReferenceTemplateSeqHolder__
diff --git a/libjava/org/omg/PortableInterceptor/PolicyFactory.h b/libjava/org/omg/PortableInterceptor/PolicyFactory.h
deleted file mode 100644
index 41f8cd073c7..00000000000
--- a/libjava/org/omg/PortableInterceptor/PolicyFactory.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_PolicyFactory__
-#define __org_omg_PortableInterceptor_PolicyFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-      }
-      namespace PortableInterceptor
-      {
-          class PolicyFactory;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::PolicyFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Policy * create_policy(jint, ::org::omg::CORBA::Any *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_PolicyFactory__
diff --git a/libjava/org/omg/PortableInterceptor/PolicyFactoryOperations.h b/libjava/org/omg/PortableInterceptor/PolicyFactoryOperations.h
deleted file mode 100644
index fcd4c510a43..00000000000
--- a/libjava/org/omg/PortableInterceptor/PolicyFactoryOperations.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_PolicyFactoryOperations__
-#define __org_omg_PortableInterceptor_PolicyFactoryOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Policy;
-      }
-      namespace PortableInterceptor
-      {
-          class PolicyFactoryOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::PolicyFactoryOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::CORBA::Policy * create_policy(jint, ::org::omg::CORBA::Any *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_PolicyFactoryOperations__
diff --git a/libjava/org/omg/PortableInterceptor/RequestInfo.h b/libjava/org/omg/PortableInterceptor/RequestInfo.h
deleted file mode 100644
index 9a3d9521a04..00000000000
--- a/libjava/org/omg/PortableInterceptor/RequestInfo.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_RequestInfo__
-#define __org_omg_PortableInterceptor_RequestInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace Dynamic
-      {
-          class Parameter;
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-      }
-      namespace PortableInterceptor
-      {
-          class RequestInfo;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::RequestInfo : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::org::omg::Dynamic::Parameter * > * arguments() = 0;
-  virtual JArray< ::java::lang::String * > * contexts() = 0;
-  virtual JArray< ::org::omg::CORBA::TypeCode * > * exceptions() = 0;
-  virtual ::org::omg::CORBA::Object * forward_reference() = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_reply_service_context(jint) = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_request_service_context(jint) = 0;
-  virtual ::org::omg::CORBA::Any * get_slot(jint) = 0;
-  virtual JArray< ::java::lang::String * > * operation_context() = 0;
-  virtual ::java::lang::String * operation() = 0;
-  virtual jshort reply_status() = 0;
-  virtual jint request_id() = 0;
-  virtual jboolean response_expected() = 0;
-  virtual ::org::omg::CORBA::Any * result() = 0;
-  virtual jshort sync_scope() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_RequestInfo__
diff --git a/libjava/org/omg/PortableInterceptor/RequestInfoOperations.h b/libjava/org/omg/PortableInterceptor/RequestInfoOperations.h
deleted file mode 100644
index 99476565db1..00000000000
--- a/libjava/org/omg/PortableInterceptor/RequestInfoOperations.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_RequestInfoOperations__
-#define __org_omg_PortableInterceptor_RequestInfoOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-      }
-      namespace Dynamic
-      {
-          class Parameter;
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-      }
-      namespace PortableInterceptor
-      {
-          class RequestInfoOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::RequestInfoOperations : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::org::omg::Dynamic::Parameter * > * arguments() = 0;
-  virtual JArray< ::java::lang::String * > * contexts() = 0;
-  virtual JArray< ::org::omg::CORBA::TypeCode * > * exceptions() = 0;
-  virtual ::org::omg::CORBA::Object * forward_reference() = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_reply_service_context(jint) = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_request_service_context(jint) = 0;
-  virtual ::org::omg::CORBA::Any * get_slot(jint) = 0;
-  virtual JArray< ::java::lang::String * > * operation_context() = 0;
-  virtual ::java::lang::String * operation() = 0;
-  virtual jshort reply_status() = 0;
-  virtual jint request_id() = 0;
-  virtual jboolean response_expected() = 0;
-  virtual ::org::omg::CORBA::Any * result() = 0;
-  virtual jshort sync_scope() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_RequestInfoOperations__
diff --git a/libjava/org/omg/PortableInterceptor/SUCCESSFUL.h b/libjava/org/omg/PortableInterceptor/SUCCESSFUL.h
deleted file mode 100644
index a566748bf51..00000000000
--- a/libjava/org/omg/PortableInterceptor/SUCCESSFUL.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_SUCCESSFUL__
-#define __org_omg_PortableInterceptor_SUCCESSFUL__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class SUCCESSFUL;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::SUCCESSFUL : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_SUCCESSFUL__
diff --git a/libjava/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.h b/libjava/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.h
deleted file mode 100644
index 51bf8d7df0c..00000000000
--- a/libjava/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_SYSTEM_EXCEPTION__
-#define __org_omg_PortableInterceptor_SYSTEM_EXCEPTION__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class SYSTEM_EXCEPTION;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::SYSTEM_EXCEPTION : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 1;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_SYSTEM_EXCEPTION__
diff --git a/libjava/org/omg/PortableInterceptor/ServerIdHelper.h b/libjava/org/omg/PortableInterceptor/ServerIdHelper.h
deleted file mode 100644
index af6ce18644f..00000000000
--- a/libjava/org/omg/PortableInterceptor/ServerIdHelper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ServerIdHelper__
-#define __org_omg_PortableInterceptor_ServerIdHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class ServerIdHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ServerIdHelper : public ::java::lang::Object
-{
-
-public:
-  ServerIdHelper();
-  static void insert(::org::omg::CORBA::Any *, ::java::lang::String *);
-  static ::java::lang::String * extract(::org::omg::CORBA::Any *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static ::java::lang::String * id();
-  static ::java::lang::String * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor_ServerIdHelper__
diff --git a/libjava/org/omg/PortableInterceptor/ServerRequestInfo.h b/libjava/org/omg/PortableInterceptor/ServerRequestInfo.h
deleted file mode 100644
index 523c4c35554..00000000000
--- a/libjava/org/omg/PortableInterceptor/ServerRequestInfo.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ServerRequestInfo__
-#define __org_omg_PortableInterceptor_ServerRequestInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Context;
-          class ContextList;
-          class DomainManager;
-          class ExceptionList;
-          class NVList;
-          class NamedValue;
-          class Object;
-          class Policy;
-          class Request;
-          class SetOverrideType;
-          class TypeCode;
-      }
-      namespace Dynamic
-      {
-          class Parameter;
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-      }
-      namespace PortableInterceptor
-      {
-          class ServerRequestInfo;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ServerRequestInfo : public ::java::lang::Object
-{
-
-public:
-  virtual void add_reply_service_context(::org::omg::IOP::ServiceContext *, jboolean) = 0;
-  virtual JArray< jbyte > * adapter_id() = 0;
-  virtual JArray< jbyte > * object_id() = 0;
-  virtual ::org::omg::CORBA::Policy * get_server_policy(jint) = 0;
-  virtual ::org::omg::CORBA::Any * sending_exception() = 0;
-  virtual void set_slot(jint, ::org::omg::CORBA::Any *) = 0;
-  virtual jboolean target_is_a(::java::lang::String *) = 0;
-  virtual ::java::lang::String * target_most_derived_interface() = 0;
-  virtual JArray< ::java::lang::String * > * adapter_name() = 0;
-  virtual ::java::lang::String * orb_id() = 0;
-  virtual ::java::lang::String * server_id() = 0;
-  virtual JArray< ::org::omg::Dynamic::Parameter * > * arguments() = 0;
-  virtual JArray< ::java::lang::String * > * contexts() = 0;
-  virtual JArray< ::org::omg::CORBA::TypeCode * > * exceptions() = 0;
-  virtual ::org::omg::CORBA::Object * forward_reference() = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_reply_service_context(jint) = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_request_service_context(jint) = 0;
-  virtual ::org::omg::CORBA::Any * get_slot(jint) = 0;
-  virtual JArray< ::java::lang::String * > * operation_context() = 0;
-  virtual ::java::lang::String * operation() = 0;
-  virtual jshort reply_status() = 0;
-  virtual jint request_id() = 0;
-  virtual jboolean response_expected() = 0;
-  virtual ::org::omg::CORBA::Any * result() = 0;
-  virtual jshort sync_scope() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ServerRequestInfo__
diff --git a/libjava/org/omg/PortableInterceptor/ServerRequestInfoOperations.h b/libjava/org/omg/PortableInterceptor/ServerRequestInfoOperations.h
deleted file mode 100644
index 1c2ae7c9bb0..00000000000
--- a/libjava/org/omg/PortableInterceptor/ServerRequestInfoOperations.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ServerRequestInfoOperations__
-#define __org_omg_PortableInterceptor_ServerRequestInfoOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class Policy;
-          class TypeCode;
-      }
-      namespace Dynamic
-      {
-          class Parameter;
-      }
-      namespace IOP
-      {
-          class ServiceContext;
-      }
-      namespace PortableInterceptor
-      {
-          class ServerRequestInfoOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ServerRequestInfoOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void add_reply_service_context(::org::omg::IOP::ServiceContext *, jboolean) = 0;
-  virtual JArray< jbyte > * adapter_id() = 0;
-  virtual JArray< jbyte > * object_id() = 0;
-  virtual ::org::omg::CORBA::Policy * get_server_policy(jint) = 0;
-  virtual ::org::omg::CORBA::Any * sending_exception() = 0;
-  virtual void set_slot(jint, ::org::omg::CORBA::Any *) = 0;
-  virtual jboolean target_is_a(::java::lang::String *) = 0;
-  virtual ::java::lang::String * target_most_derived_interface() = 0;
-  virtual JArray< ::java::lang::String * > * adapter_name() = 0;
-  virtual ::java::lang::String * orb_id() = 0;
-  virtual ::java::lang::String * server_id() = 0;
-  virtual JArray< ::org::omg::Dynamic::Parameter * > * arguments() = 0;
-  virtual JArray< ::java::lang::String * > * contexts() = 0;
-  virtual JArray< ::org::omg::CORBA::TypeCode * > * exceptions() = 0;
-  virtual ::org::omg::CORBA::Object * forward_reference() = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_reply_service_context(jint) = 0;
-  virtual ::org::omg::IOP::ServiceContext * get_request_service_context(jint) = 0;
-  virtual ::org::omg::CORBA::Any * get_slot(jint) = 0;
-  virtual JArray< ::java::lang::String * > * operation_context() = 0;
-  virtual ::java::lang::String * operation() = 0;
-  virtual jshort reply_status() = 0;
-  virtual jint request_id() = 0;
-  virtual jboolean response_expected() = 0;
-  virtual ::org::omg::CORBA::Any * result() = 0;
-  virtual jshort sync_scope() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ServerRequestInfoOperations__
diff --git a/libjava/org/omg/PortableInterceptor/ServerRequestInterceptor.h b/libjava/org/omg/PortableInterceptor/ServerRequestInterceptor.h
deleted file mode 100644
index 7f419883830..00000000000
--- a/libjava/org/omg/PortableInterceptor/ServerRequestInterceptor.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ServerRequestInterceptor__
-#define __org_omg_PortableInterceptor_ServerRequestInterceptor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableInterceptor
-      {
-          class ServerRequestInfo;
-          class ServerRequestInterceptor;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ServerRequestInterceptor : public ::java::lang::Object
-{
-
-public:
-  virtual void destroy() = 0;
-  virtual ::java::lang::String * name() = 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 void receive_request_service_contexts(::org::omg::PortableInterceptor::ServerRequestInfo *) = 0;
-  virtual void receive_request(::org::omg::PortableInterceptor::ServerRequestInfo *) = 0;
-  virtual void send_reply(::org::omg::PortableInterceptor::ServerRequestInfo *) = 0;
-  virtual void send_exception(::org::omg::PortableInterceptor::ServerRequestInfo *) = 0;
-  virtual void send_other(::org::omg::PortableInterceptor::ServerRequestInfo *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ServerRequestInterceptor__
diff --git a/libjava/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.h b/libjava/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.h
deleted file mode 100644
index 003fa188ad5..00000000000
--- a/libjava/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_ServerRequestInterceptorOperations__
-#define __org_omg_PortableInterceptor_ServerRequestInterceptorOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class ServerRequestInfo;
-          class ServerRequestInterceptorOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::ServerRequestInterceptorOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void receive_request_service_contexts(::org::omg::PortableInterceptor::ServerRequestInfo *) = 0;
-  virtual void receive_request(::org::omg::PortableInterceptor::ServerRequestInfo *) = 0;
-  virtual void send_reply(::org::omg::PortableInterceptor::ServerRequestInfo *) = 0;
-  virtual void send_exception(::org::omg::PortableInterceptor::ServerRequestInfo *) = 0;
-  virtual void send_other(::org::omg::PortableInterceptor::ServerRequestInfo *) = 0;
-  virtual void destroy() = 0;
-  virtual ::java::lang::String * name() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_ServerRequestInterceptorOperations__
diff --git a/libjava/org/omg/PortableInterceptor/TRANSPORT_RETRY.h b/libjava/org/omg/PortableInterceptor/TRANSPORT_RETRY.h
deleted file mode 100644
index 7996b7d3089..00000000000
--- a/libjava/org/omg/PortableInterceptor/TRANSPORT_RETRY.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_TRANSPORT_RETRY__
-#define __org_omg_PortableInterceptor_TRANSPORT_RETRY__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class TRANSPORT_RETRY;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::TRANSPORT_RETRY : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_TRANSPORT_RETRY__
diff --git a/libjava/org/omg/PortableInterceptor/USER_EXCEPTION.h b/libjava/org/omg/PortableInterceptor/USER_EXCEPTION.h
deleted file mode 100644
index f972427794a..00000000000
--- a/libjava/org/omg/PortableInterceptor/USER_EXCEPTION.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor_USER_EXCEPTION__
-#define __org_omg_PortableInterceptor_USER_EXCEPTION__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableInterceptor
-      {
-          class USER_EXCEPTION;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::USER_EXCEPTION : public ::java::lang::Object
-{
-
-public:
-  static const jshort value = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableInterceptor_USER_EXCEPTION__
diff --git a/libjava/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.h b/libjava/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.h
deleted file mode 100644
index 354daeff98e..00000000000
--- a/libjava/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableInterceptor__IORInterceptor_3_0Stub__
-#define __org_omg_PortableInterceptor__IORInterceptor_3_0Stub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-        namespace portable
-        {
-            class Delegate;
-        }
-      }
-      namespace PortableInterceptor
-      {
-          class IORInfo;
-          class ObjectReferenceTemplate;
-          class _IORInterceptor_3_0Stub;
-      }
-    }
-  }
-}
-
-class org::omg::PortableInterceptor::_IORInterceptor_3_0Stub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _IORInterceptor_3_0Stub();
-  _IORInterceptor_3_0Stub(::org::omg::CORBA::portable::Delegate *);
-  virtual JArray< ::java::lang::String * > * _ids();
-  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 *);
-  virtual void establish_components(::org::omg::PortableInterceptor::IORInfo *);
-  virtual ::java::lang::String * name();
-  virtual void destroy();
-private:
-  static const jlong serialVersionUID = 1LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableInterceptor__IORInterceptor_3_0Stub__
diff --git a/libjava/org/omg/PortableServer/AdapterActivator.h b/libjava/org/omg/PortableServer/AdapterActivator.h
deleted file mode 100644
index 2f586ca498d..00000000000
--- a/libjava/org/omg/PortableServer/AdapterActivator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_AdapterActivator__
-#define __org_omg_PortableServer_AdapterActivator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class AdapterActivator;
-          class POA;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::AdapterActivator : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean unknown_adapter(::org::omg::PortableServer::POA *, ::java::lang::String *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_AdapterActivator__
diff --git a/libjava/org/omg/PortableServer/AdapterActivatorOperations.h b/libjava/org/omg/PortableServer/AdapterActivatorOperations.h
deleted file mode 100644
index 843b7ceb381..00000000000
--- a/libjava/org/omg/PortableServer/AdapterActivatorOperations.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_AdapterActivatorOperations__
-#define __org_omg_PortableServer_AdapterActivatorOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class AdapterActivatorOperations;
-          class POA;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::AdapterActivatorOperations : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean unknown_adapter(::org::omg::PortableServer::POA *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_AdapterActivatorOperations__
diff --git a/libjava/org/omg/PortableServer/Current.h b/libjava/org/omg/PortableServer/Current.h
deleted file mode 100644
index f226cb59bfa..00000000000
--- a/libjava/org/omg/PortableServer/Current.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_Current__
-#define __org_omg_PortableServer_Current__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class Current;
-          class POA;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::Current : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * get_object_id() = 0;
-  virtual ::org::omg::PortableServer::POA * get_POA() = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_Current__
diff --git a/libjava/org/omg/PortableServer/CurrentHelper.h b/libjava/org/omg/PortableServer/CurrentHelper.h
deleted file mode 100644
index c07ffd9ea9e..00000000000
--- a/libjava/org/omg/PortableServer/CurrentHelper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_CurrentHelper__
-#define __org_omg_PortableServer_CurrentHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-          class Current;
-          class CurrentHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::CurrentHelper : public ::java::lang::Object
-{
-
-public:
-  CurrentHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::Current *);
-  static ::org::omg::PortableServer::Current * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::Current * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::PortableServer::Current * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::Current *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_CurrentHelper__
diff --git a/libjava/org/omg/PortableServer/CurrentOperations.h b/libjava/org/omg/PortableServer/CurrentOperations.h
deleted file mode 100644
index 91f8c66dbe6..00000000000
--- a/libjava/org/omg/PortableServer/CurrentOperations.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_CurrentOperations__
-#define __org_omg_PortableServer_CurrentOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class CurrentOperations;
-          class POA;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::CurrentOperations : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< jbyte > * get_object_id() = 0;
-  virtual ::org::omg::PortableServer::POA * get_POA() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_CurrentOperations__
diff --git a/libjava/org/omg/PortableServer/CurrentPackage/NoContext.h b/libjava/org/omg/PortableServer/CurrentPackage/NoContext.h
deleted file mode 100644
index 58b8d15bbc2..00000000000
--- a/libjava/org/omg/PortableServer/CurrentPackage/NoContext.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_CurrentPackage_NoContext__
-#define __org_omg_PortableServer_CurrentPackage_NoContext__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace CurrentPackage
-        {
-            class NoContext;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::CurrentPackage::NoContext : public ::org::omg::CORBA::UserException
-{
-
-public:
-  NoContext();
-  NoContext(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 4345975812295650198LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_CurrentPackage_NoContext__
diff --git a/libjava/org/omg/PortableServer/CurrentPackage/NoContextHelper.h b/libjava/org/omg/PortableServer/CurrentPackage/NoContextHelper.h
deleted file mode 100644
index a5c79d658c0..00000000000
--- a/libjava/org/omg/PortableServer/CurrentPackage/NoContextHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_CurrentPackage_NoContextHelper__
-#define __org_omg_PortableServer_CurrentPackage_NoContextHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace CurrentPackage
-        {
-            class NoContext;
-            class NoContextHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::CurrentPackage::NoContextHelper : public ::java::lang::Object
-{
-
-public:
-  NoContextHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::CurrentPackage::NoContext *);
-  static ::org::omg::PortableServer::CurrentPackage::NoContext * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::CurrentPackage::NoContext * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::CurrentPackage::NoContext *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_CurrentPackage_NoContextHelper__
diff --git a/libjava/org/omg/PortableServer/DynamicImplementation.h b/libjava/org/omg/PortableServer/DynamicImplementation.h
deleted file mode 100644
index 7aa01af2eff..00000000000
--- a/libjava/org/omg/PortableServer/DynamicImplementation.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_DynamicImplementation__
-#define __org_omg_PortableServer_DynamicImplementation__
-
-#pragma interface
-
-#include <org/omg/PortableServer/Servant.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ServerRequest;
-      }
-      namespace PortableServer
-      {
-          class DynamicImplementation;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::DynamicImplementation : public ::org::omg::PortableServer::Servant
-{
-
-public:
-  DynamicImplementation();
-  virtual void invoke(::org::omg::CORBA::ServerRequest *) = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_DynamicImplementation__
diff --git a/libjava/org/omg/PortableServer/ForwardRequest.h b/libjava/org/omg/PortableServer/ForwardRequest.h
deleted file mode 100644
index 998beba3bde..00000000000
--- a/libjava/org/omg/PortableServer/ForwardRequest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ForwardRequest__
-#define __org_omg_PortableServer_ForwardRequest__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-      }
-      namespace PortableServer
-      {
-          class ForwardRequest;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ForwardRequest : public ::org::omg::CORBA::UserException
-{
-
-public:
-  ForwardRequest();
-  ForwardRequest(::java::lang::String *, ::org::omg::CORBA::Object *);
-  ForwardRequest(::org::omg::CORBA::Object *);
-private:
-  static const jlong serialVersionUID = -4159318367582473975LL;
-public:
-  ::org::omg::CORBA::Object * __attribute__((aligned(__alignof__( ::org::omg::CORBA::UserException)))) forward_reference;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ForwardRequest__
diff --git a/libjava/org/omg/PortableServer/ForwardRequestHelper.h b/libjava/org/omg/PortableServer/ForwardRequestHelper.h
deleted file mode 100644
index 5fed16257a9..00000000000
--- a/libjava/org/omg/PortableServer/ForwardRequestHelper.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ForwardRequestHelper__
-#define __org_omg_PortableServer_ForwardRequestHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-          class ForwardRequest;
-          class ForwardRequestHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::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 // __org_omg_PortableServer_ForwardRequestHelper__
diff --git a/libjava/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.h b/libjava/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.h
deleted file mode 100644
index 8b06eab7c12..00000000000
--- a/libjava/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ID_ASSIGNMENT_POLICY_ID__
-#define __org_omg_PortableServer_ID_ASSIGNMENT_POLICY_ID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class ID_ASSIGNMENT_POLICY_ID;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ID_ASSIGNMENT_POLICY_ID : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 19;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ID_ASSIGNMENT_POLICY_ID__
diff --git a/libjava/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.h b/libjava/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.h
deleted file mode 100644
index 4c38631f363..00000000000
--- a/libjava/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ID_UNIQUENESS_POLICY_ID__
-#define __org_omg_PortableServer_ID_UNIQUENESS_POLICY_ID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class ID_UNIQUENESS_POLICY_ID;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ID_UNIQUENESS_POLICY_ID : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 18;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ID_UNIQUENESS_POLICY_ID__
diff --git a/libjava/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.h b/libjava/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.h
deleted file mode 100644
index c76d8539dfe..00000000000
--- a/libjava/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_IMPLICIT_ACTIVATION_POLICY_ID__
-#define __org_omg_PortableServer_IMPLICIT_ACTIVATION_POLICY_ID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class IMPLICIT_ACTIVATION_POLICY_ID;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 20;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_IMPLICIT_ACTIVATION_POLICY_ID__
diff --git a/libjava/org/omg/PortableServer/IdAssignmentPolicy.h b/libjava/org/omg/PortableServer/IdAssignmentPolicy.h
deleted file mode 100644
index de0b67653ab..00000000000
--- a/libjava/org/omg/PortableServer/IdAssignmentPolicy.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_IdAssignmentPolicy__
-#define __org_omg_PortableServer_IdAssignmentPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class IdAssignmentPolicy;
-          class IdAssignmentPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::IdAssignmentPolicy : public ::java::lang::Object
-{
-
-public:
-  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;
-  virtual ::org::omg::PortableServer::IdAssignmentPolicyValue * value() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_IdAssignmentPolicy__
diff --git a/libjava/org/omg/PortableServer/IdAssignmentPolicyOperations.h b/libjava/org/omg/PortableServer/IdAssignmentPolicyOperations.h
deleted file mode 100644
index c6b25f52788..00000000000
--- a/libjava/org/omg/PortableServer/IdAssignmentPolicyOperations.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_IdAssignmentPolicyOperations__
-#define __org_omg_PortableServer_IdAssignmentPolicyOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-      }
-      namespace PortableServer
-      {
-          class IdAssignmentPolicyOperations;
-          class IdAssignmentPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::IdAssignmentPolicyOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::IdAssignmentPolicyValue * value() = 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 // __org_omg_PortableServer_IdAssignmentPolicyOperations__
diff --git a/libjava/org/omg/PortableServer/IdAssignmentPolicyValue.h b/libjava/org/omg/PortableServer/IdAssignmentPolicyValue.h
deleted file mode 100644
index 533b07478d2..00000000000
--- a/libjava/org/omg/PortableServer/IdAssignmentPolicyValue.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_IdAssignmentPolicyValue__
-#define __org_omg_PortableServer_IdAssignmentPolicyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class IdAssignmentPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::IdAssignmentPolicyValue : public ::java::lang::Object
-{
-
-public: // actually protected
-  IdAssignmentPolicyValue(jint);
-public:
-  static ::org::omg::PortableServer::IdAssignmentPolicyValue * from_int(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = 2024380631469554382LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-public:
-  static const jint _USER_ID = 0;
-  static ::org::omg::PortableServer::IdAssignmentPolicyValue * USER_ID;
-  static const jint _SYSTEM_ID = 1;
-  static ::org::omg::PortableServer::IdAssignmentPolicyValue * SYSTEM_ID;
-private:
-  static JArray< ::org::omg::PortableServer::IdAssignmentPolicyValue * > * enume;
-  static JArray< ::java::lang::String * > * state_names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_IdAssignmentPolicyValue__
diff --git a/libjava/org/omg/PortableServer/IdUniquenessPolicy.h b/libjava/org/omg/PortableServer/IdUniquenessPolicy.h
deleted file mode 100644
index eee06daf1e7..00000000000
--- a/libjava/org/omg/PortableServer/IdUniquenessPolicy.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_IdUniquenessPolicy__
-#define __org_omg_PortableServer_IdUniquenessPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class IdUniquenessPolicy;
-          class IdUniquenessPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::IdUniquenessPolicy : public ::java::lang::Object
-{
-
-public:
-  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;
-  virtual ::org::omg::PortableServer::IdUniquenessPolicyValue * value() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_IdUniquenessPolicy__
diff --git a/libjava/org/omg/PortableServer/IdUniquenessPolicyOperations.h b/libjava/org/omg/PortableServer/IdUniquenessPolicyOperations.h
deleted file mode 100644
index eb7fabe171c..00000000000
--- a/libjava/org/omg/PortableServer/IdUniquenessPolicyOperations.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_IdUniquenessPolicyOperations__
-#define __org_omg_PortableServer_IdUniquenessPolicyOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-      }
-      namespace PortableServer
-      {
-          class IdUniquenessPolicyOperations;
-          class IdUniquenessPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::IdUniquenessPolicyOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::IdUniquenessPolicyValue * value() = 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 // __org_omg_PortableServer_IdUniquenessPolicyOperations__
diff --git a/libjava/org/omg/PortableServer/IdUniquenessPolicyValue.h b/libjava/org/omg/PortableServer/IdUniquenessPolicyValue.h
deleted file mode 100644
index 6a6a1846662..00000000000
--- a/libjava/org/omg/PortableServer/IdUniquenessPolicyValue.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_IdUniquenessPolicyValue__
-#define __org_omg_PortableServer_IdUniquenessPolicyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class IdUniquenessPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::IdUniquenessPolicyValue : public ::java::lang::Object
-{
-
-public: // actually protected
-  IdUniquenessPolicyValue(jint);
-public:
-  static ::org::omg::PortableServer::IdUniquenessPolicyValue * from_int(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = 2698951826884611346LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-public:
-  static const jint _UNIQUE_ID = 0;
-  static ::org::omg::PortableServer::IdUniquenessPolicyValue * UNIQUE_ID;
-  static const jint _MULTIPLE_ID = 1;
-  static ::org::omg::PortableServer::IdUniquenessPolicyValue * MULTIPLE_ID;
-private:
-  static JArray< ::org::omg::PortableServer::IdUniquenessPolicyValue * > * enume;
-  static JArray< ::java::lang::String * > * state_names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_IdUniquenessPolicyValue__
diff --git a/libjava/org/omg/PortableServer/ImplicitActivationPolicy.h b/libjava/org/omg/PortableServer/ImplicitActivationPolicy.h
deleted file mode 100644
index 827100048eb..00000000000
--- a/libjava/org/omg/PortableServer/ImplicitActivationPolicy.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ImplicitActivationPolicy__
-#define __org_omg_PortableServer_ImplicitActivationPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class ImplicitActivationPolicy;
-          class ImplicitActivationPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ImplicitActivationPolicy : public ::java::lang::Object
-{
-
-public:
-  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;
-  virtual ::org::omg::PortableServer::ImplicitActivationPolicyValue * value() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ImplicitActivationPolicy__
diff --git a/libjava/org/omg/PortableServer/ImplicitActivationPolicyOperations.h b/libjava/org/omg/PortableServer/ImplicitActivationPolicyOperations.h
deleted file mode 100644
index a967c666b2e..00000000000
--- a/libjava/org/omg/PortableServer/ImplicitActivationPolicyOperations.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ImplicitActivationPolicyOperations__
-#define __org_omg_PortableServer_ImplicitActivationPolicyOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-      }
-      namespace PortableServer
-      {
-          class ImplicitActivationPolicyOperations;
-          class ImplicitActivationPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ImplicitActivationPolicyOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::ImplicitActivationPolicyValue * value() = 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 // __org_omg_PortableServer_ImplicitActivationPolicyOperations__
diff --git a/libjava/org/omg/PortableServer/ImplicitActivationPolicyValue.h b/libjava/org/omg/PortableServer/ImplicitActivationPolicyValue.h
deleted file mode 100644
index ef3c5a43057..00000000000
--- a/libjava/org/omg/PortableServer/ImplicitActivationPolicyValue.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ImplicitActivationPolicyValue__
-#define __org_omg_PortableServer_ImplicitActivationPolicyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class ImplicitActivationPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ImplicitActivationPolicyValue : public ::java::lang::Object
-{
-
-public: // actually protected
-  ImplicitActivationPolicyValue(jint);
-public:
-  static ::org::omg::PortableServer::ImplicitActivationPolicyValue * from_int(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = 3826572456602949295LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-public:
-  static const jint _IMPLICIT_ACTIVATION = 0;
-  static ::org::omg::PortableServer::ImplicitActivationPolicyValue * IMPLICIT_ACTIVATION;
-  static const jint _NO_IMPLICIT_ACTIVATION = 1;
-  static ::org::omg::PortableServer::ImplicitActivationPolicyValue * NO_IMPLICIT_ACTIVATION;
-private:
-  static JArray< ::org::omg::PortableServer::ImplicitActivationPolicyValue * > * enume;
-  static JArray< ::java::lang::String * > * state_names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ImplicitActivationPolicyValue__
diff --git a/libjava/org/omg/PortableServer/LIFESPAN_POLICY_ID.h b/libjava/org/omg/PortableServer/LIFESPAN_POLICY_ID.h
deleted file mode 100644
index b433923766d..00000000000
--- a/libjava/org/omg/PortableServer/LIFESPAN_POLICY_ID.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_LIFESPAN_POLICY_ID__
-#define __org_omg_PortableServer_LIFESPAN_POLICY_ID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class LIFESPAN_POLICY_ID;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::LIFESPAN_POLICY_ID : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 17;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_LIFESPAN_POLICY_ID__
diff --git a/libjava/org/omg/PortableServer/LifespanPolicy.h b/libjava/org/omg/PortableServer/LifespanPolicy.h
deleted file mode 100644
index 5defae72f39..00000000000
--- a/libjava/org/omg/PortableServer/LifespanPolicy.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_LifespanPolicy__
-#define __org_omg_PortableServer_LifespanPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class LifespanPolicy;
-          class LifespanPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::LifespanPolicy : public ::java::lang::Object
-{
-
-public:
-  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;
-  virtual ::org::omg::PortableServer::LifespanPolicyValue * value() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_LifespanPolicy__
diff --git a/libjava/org/omg/PortableServer/LifespanPolicyOperations.h b/libjava/org/omg/PortableServer/LifespanPolicyOperations.h
deleted file mode 100644
index 4313531ebc8..00000000000
--- a/libjava/org/omg/PortableServer/LifespanPolicyOperations.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_LifespanPolicyOperations__
-#define __org_omg_PortableServer_LifespanPolicyOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-      }
-      namespace PortableServer
-      {
-          class LifespanPolicyOperations;
-          class LifespanPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::LifespanPolicyOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::LifespanPolicyValue * value() = 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 // __org_omg_PortableServer_LifespanPolicyOperations__
diff --git a/libjava/org/omg/PortableServer/LifespanPolicyValue.h b/libjava/org/omg/PortableServer/LifespanPolicyValue.h
deleted file mode 100644
index 96b5b170f12..00000000000
--- a/libjava/org/omg/PortableServer/LifespanPolicyValue.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_LifespanPolicyValue__
-#define __org_omg_PortableServer_LifespanPolicyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class LifespanPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::LifespanPolicyValue : public ::java::lang::Object
-{
-
-public: // actually protected
-  LifespanPolicyValue(jint);
-public:
-  static ::org::omg::PortableServer::LifespanPolicyValue * from_int(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = 6604562925399671611LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-public:
-  static const jint _TRANSIENT = 0;
-  static ::org::omg::PortableServer::LifespanPolicyValue * TRANSIENT;
-  static const jint _PERSISTENT = 1;
-  static ::org::omg::PortableServer::LifespanPolicyValue * PERSISTENT;
-private:
-  static JArray< ::org::omg::PortableServer::LifespanPolicyValue * > * enume;
-  static JArray< ::java::lang::String * > * state_names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_LifespanPolicyValue__
diff --git a/libjava/org/omg/PortableServer/POA.h b/libjava/org/omg/PortableServer/POA.h
deleted file mode 100644
index 87defb66f18..00000000000
--- a/libjava/org/omg/PortableServer/POA.h
+++ /dev/null
@@ -1,109 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POA__
-#define __org_omg_PortableServer_POA__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      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 ServantManager;
-          class ServantRetentionPolicy;
-          class ServantRetentionPolicyValue;
-          class ThreadPolicy;
-          class ThreadPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POA : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::POA * create_POA(::java::lang::String *, ::org::omg::PortableServer::POAManager *, JArray< ::org::omg::CORBA::Policy * > *) = 0;
-  virtual ::org::omg::PortableServer::POA * find_POA(::java::lang::String *, jboolean) = 0;
-  virtual JArray< jbyte > * activate_object(::org::omg::PortableServer::Servant *) = 0;
-  virtual void activate_object_with_id(JArray< jbyte > *, ::org::omg::PortableServer::Servant *) = 0;
-  virtual void deactivate_object(JArray< jbyte > *) = 0;
-  virtual ::org::omg::CORBA::Object * create_reference(::java::lang::String *) = 0;
-  virtual ::org::omg::CORBA::Object * create_reference_with_id(JArray< jbyte > *, ::java::lang::String *) = 0;
-  virtual ::org::omg::PortableServer::Servant * get_servant() = 0;
-  virtual void set_servant(::org::omg::PortableServer::Servant *) = 0;
-  virtual void set_servant_manager(::org::omg::PortableServer::ServantManager *) = 0;
-  virtual ::org::omg::PortableServer::ServantManager * get_servant_manager() = 0;
-  virtual JArray< jbyte > * id() = 0;
-  virtual ::org::omg::CORBA::Object * id_to_reference(JArray< jbyte > *) = 0;
-  virtual ::org::omg::PortableServer::Servant * id_to_servant(JArray< jbyte > *) = 0;
-  virtual JArray< jbyte > * reference_to_id(::org::omg::CORBA::Object *) = 0;
-  virtual ::org::omg::PortableServer::Servant * reference_to_servant(::org::omg::CORBA::Object *) = 0;
-  virtual JArray< jbyte > * servant_to_id(::org::omg::PortableServer::Servant *) = 0;
-  virtual ::org::omg::CORBA::Object * servant_to_reference(::org::omg::PortableServer::Servant *) = 0;
-  virtual ::org::omg::PortableServer::POAManager * the_POAManager() = 0;
-  virtual ::org::omg::PortableServer::AdapterActivator * the_activator() = 0;
-  virtual void the_activator(::org::omg::PortableServer::AdapterActivator *) = 0;
-  virtual JArray< ::org::omg::PortableServer::POA * > * the_children() = 0;
-  virtual ::java::lang::String * the_name() = 0;
-  virtual ::org::omg::PortableServer::POA * the_parent() = 0;
-  virtual void destroy(jboolean, jboolean) = 0;
-  virtual ::org::omg::PortableServer::IdUniquenessPolicy * create_id_uniqueness_policy(::org::omg::PortableServer::IdUniquenessPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::ImplicitActivationPolicy * create_implicit_activation_policy(::org::omg::PortableServer::ImplicitActivationPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::LifespanPolicy * create_lifespan_policy(::org::omg::PortableServer::LifespanPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::RequestProcessingPolicy * create_request_processing_policy(::org::omg::PortableServer::RequestProcessingPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::ServantRetentionPolicy * create_servant_retention_policy(::org::omg::PortableServer::ServantRetentionPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::ThreadPolicy * create_thread_policy(::org::omg::PortableServer::ThreadPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::IdAssignmentPolicy * create_id_assignment_policy(::org::omg::PortableServer::IdAssignmentPolicyValue *) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_POA__
diff --git a/libjava/org/omg/PortableServer/POAHelper.h b/libjava/org/omg/PortableServer/POAHelper.h
deleted file mode 100644
index 7153cb097bb..00000000000
--- a/libjava/org/omg/PortableServer/POAHelper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAHelper__
-#define __org_omg_PortableServer_POAHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-          class POA;
-          class POAHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAHelper : public ::java::lang::Object
-{
-
-public:
-  POAHelper();
-  static ::org::omg::PortableServer::POA * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POA *);
-  static ::org::omg::PortableServer::POA * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POA * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POA *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAHelper__
diff --git a/libjava/org/omg/PortableServer/POAManager.h b/libjava/org/omg/PortableServer/POAManager.h
deleted file mode 100644
index f65e7979523..00000000000
--- a/libjava/org/omg/PortableServer/POAManager.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAManager__
-#define __org_omg_PortableServer_POAManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class POAManager;
-        namespace POAManagerPackage
-        {
-            class State;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAManager : public ::java::lang::Object
-{
-
-public:
-  virtual void activate() = 0;
-  virtual void deactivate(jboolean, jboolean) = 0;
-  virtual void discard_requests(jboolean) = 0;
-  virtual ::org::omg::PortableServer::POAManagerPackage::State * get_state() = 0;
-  virtual void hold_requests(jboolean) = 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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_POAManager__
diff --git a/libjava/org/omg/PortableServer/POAManagerOperations.h b/libjava/org/omg/PortableServer/POAManagerOperations.h
deleted file mode 100644
index 2e275d4121b..00000000000
--- a/libjava/org/omg/PortableServer/POAManagerOperations.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAManagerOperations__
-#define __org_omg_PortableServer_POAManagerOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class POAManagerOperations;
-        namespace POAManagerPackage
-        {
-            class State;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAManagerOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void activate() = 0;
-  virtual void deactivate(jboolean, jboolean) = 0;
-  virtual void discard_requests(jboolean) = 0;
-  virtual ::org::omg::PortableServer::POAManagerPackage::State * get_state() = 0;
-  virtual void hold_requests(jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_POAManagerOperations__
diff --git a/libjava/org/omg/PortableServer/POAManagerPackage/AdapterInactive.h b/libjava/org/omg/PortableServer/POAManagerPackage/AdapterInactive.h
deleted file mode 100644
index d0fc7c4d22f..00000000000
--- a/libjava/org/omg/PortableServer/POAManagerPackage/AdapterInactive.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAManagerPackage_AdapterInactive__
-#define __org_omg_PortableServer_POAManagerPackage_AdapterInactive__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAManagerPackage
-        {
-            class AdapterInactive;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAManagerPackage::AdapterInactive : public ::org::omg::CORBA::UserException
-{
-
-public:
-  AdapterInactive();
-  AdapterInactive(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 6945182851085567131LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAManagerPackage_AdapterInactive__
diff --git a/libjava/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.h b/libjava/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.h
deleted file mode 100644
index 182db7b24c9..00000000000
--- a/libjava/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAManagerPackage_AdapterInactiveHelper__
-#define __org_omg_PortableServer_POAManagerPackage_AdapterInactiveHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAManagerPackage
-        {
-            class AdapterInactive;
-            class AdapterInactiveHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAManagerPackage::AdapterInactiveHelper : public ::java::lang::Object
-{
-
-public:
-  AdapterInactiveHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAManagerPackage::AdapterInactive *);
-  static ::org::omg::PortableServer::POAManagerPackage::AdapterInactive * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAManagerPackage::AdapterInactive * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAManagerPackage::AdapterInactive *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAManagerPackage_AdapterInactiveHelper__
diff --git a/libjava/org/omg/PortableServer/POAManagerPackage/State.h b/libjava/org/omg/PortableServer/POAManagerPackage/State.h
deleted file mode 100644
index 62e46e12230..00000000000
--- a/libjava/org/omg/PortableServer/POAManagerPackage/State.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAManagerPackage_State__
-#define __org_omg_PortableServer_POAManagerPackage_State__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAManagerPackage
-        {
-            class State;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAManagerPackage::State : public ::java::lang::Object
-{
-
-public: // actually protected
-  State(jint);
-public:
-  static ::org::omg::PortableServer::POAManagerPackage::State * from_int(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = -2451866258678193271LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-public:
-  static const jint _HOLDING = 0;
-  static ::org::omg::PortableServer::POAManagerPackage::State * HOLDING;
-  static const jint _ACTIVE = 1;
-  static ::org::omg::PortableServer::POAManagerPackage::State * ACTIVE;
-  static const jint _DISCARDING = 2;
-  static ::org::omg::PortableServer::POAManagerPackage::State * DISCARDING;
-  static const jint _INACTIVE = 3;
-  static ::org::omg::PortableServer::POAManagerPackage::State * INACTIVE;
-private:
-  static JArray< ::org::omg::PortableServer::POAManagerPackage::State * > * enume;
-  static JArray< ::java::lang::String * > * state_names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAManagerPackage_State__
diff --git a/libjava/org/omg/PortableServer/POAOperations.h b/libjava/org/omg/PortableServer/POAOperations.h
deleted file mode 100644
index 1f8227b2abc..00000000000
--- a/libjava/org/omg/PortableServer/POAOperations.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAOperations__
-#define __org_omg_PortableServer_POAOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Object;
-          class Policy;
-      }
-      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 POAOperations;
-          class RequestProcessingPolicy;
-          class RequestProcessingPolicyValue;
-          class Servant;
-          class ServantManager;
-          class ServantRetentionPolicy;
-          class ServantRetentionPolicyValue;
-          class ThreadPolicy;
-          class ThreadPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::POA * create_POA(::java::lang::String *, ::org::omg::PortableServer::POAManager *, JArray< ::org::omg::CORBA::Policy * > *) = 0;
-  virtual ::org::omg::PortableServer::POA * find_POA(::java::lang::String *, jboolean) = 0;
-  virtual JArray< jbyte > * activate_object(::org::omg::PortableServer::Servant *) = 0;
-  virtual void activate_object_with_id(JArray< jbyte > *, ::org::omg::PortableServer::Servant *) = 0;
-  virtual void deactivate_object(JArray< jbyte > *) = 0;
-  virtual ::org::omg::CORBA::Object * create_reference(::java::lang::String *) = 0;
-  virtual ::org::omg::CORBA::Object * create_reference_with_id(JArray< jbyte > *, ::java::lang::String *) = 0;
-  virtual ::org::omg::PortableServer::Servant * get_servant() = 0;
-  virtual void set_servant(::org::omg::PortableServer::Servant *) = 0;
-  virtual void set_servant_manager(::org::omg::PortableServer::ServantManager *) = 0;
-  virtual ::org::omg::PortableServer::ServantManager * get_servant_manager() = 0;
-  virtual JArray< jbyte > * id() = 0;
-  virtual ::org::omg::CORBA::Object * id_to_reference(JArray< jbyte > *) = 0;
-  virtual ::org::omg::PortableServer::Servant * id_to_servant(JArray< jbyte > *) = 0;
-  virtual JArray< jbyte > * reference_to_id(::org::omg::CORBA::Object *) = 0;
-  virtual ::org::omg::PortableServer::Servant * reference_to_servant(::org::omg::CORBA::Object *) = 0;
-  virtual JArray< jbyte > * servant_to_id(::org::omg::PortableServer::Servant *) = 0;
-  virtual ::org::omg::CORBA::Object * servant_to_reference(::org::omg::PortableServer::Servant *) = 0;
-  virtual ::org::omg::PortableServer::POAManager * the_POAManager() = 0;
-  virtual ::org::omg::PortableServer::AdapterActivator * the_activator() = 0;
-  virtual void the_activator(::org::omg::PortableServer::AdapterActivator *) = 0;
-  virtual JArray< ::org::omg::PortableServer::POA * > * the_children() = 0;
-  virtual ::java::lang::String * the_name() = 0;
-  virtual ::org::omg::PortableServer::POA * the_parent() = 0;
-  virtual void destroy(jboolean, jboolean) = 0;
-  virtual ::org::omg::PortableServer::IdUniquenessPolicy * create_id_uniqueness_policy(::org::omg::PortableServer::IdUniquenessPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::ImplicitActivationPolicy * create_implicit_activation_policy(::org::omg::PortableServer::ImplicitActivationPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::LifespanPolicy * create_lifespan_policy(::org::omg::PortableServer::LifespanPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::RequestProcessingPolicy * create_request_processing_policy(::org::omg::PortableServer::RequestProcessingPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::ServantRetentionPolicy * create_servant_retention_policy(::org::omg::PortableServer::ServantRetentionPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::ThreadPolicy * create_thread_policy(::org::omg::PortableServer::ThreadPolicyValue *) = 0;
-  virtual ::org::omg::PortableServer::IdAssignmentPolicy * create_id_assignment_policy(::org::omg::PortableServer::IdAssignmentPolicyValue *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_POAOperations__
diff --git a/libjava/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.h b/libjava/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.h
deleted file mode 100644
index e8cac5206c4..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_AdapterAlreadyExists__
-#define __org_omg_PortableServer_POAPackage_AdapterAlreadyExists__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class AdapterAlreadyExists;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::AdapterAlreadyExists : public ::org::omg::CORBA::UserException
-{
-
-public:
-  AdapterAlreadyExists();
-  AdapterAlreadyExists(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2678288222917790041LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_AdapterAlreadyExists__
diff --git a/libjava/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.h b/libjava/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.h
deleted file mode 100644
index 5672fc9a1c1..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_AdapterAlreadyExistsHelper__
-#define __org_omg_PortableServer_POAPackage_AdapterAlreadyExistsHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class AdapterAlreadyExists;
-            class AdapterAlreadyExistsHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::AdapterAlreadyExistsHelper : public ::java::lang::Object
-{
-
-public:
-  AdapterAlreadyExistsHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAPackage::AdapterAlreadyExists *);
-  static ::org::omg::PortableServer::POAPackage::AdapterAlreadyExists * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAPackage::AdapterAlreadyExists * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAPackage::AdapterAlreadyExists *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_AdapterAlreadyExistsHelper__
diff --git a/libjava/org/omg/PortableServer/POAPackage/AdapterNonExistent.h b/libjava/org/omg/PortableServer/POAPackage/AdapterNonExistent.h
deleted file mode 100644
index 96bea04f35a..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/AdapterNonExistent.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_AdapterNonExistent__
-#define __org_omg_PortableServer_POAPackage_AdapterNonExistent__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class AdapterNonExistent;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::AdapterNonExistent : public ::org::omg::CORBA::UserException
-{
-
-public:
-  AdapterNonExistent();
-  AdapterNonExistent(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -9166706041988650696LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_AdapterNonExistent__
diff --git a/libjava/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.h b/libjava/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.h
deleted file mode 100644
index 06d76474e8d..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_AdapterNonExistentHelper__
-#define __org_omg_PortableServer_POAPackage_AdapterNonExistentHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class AdapterNonExistent;
-            class AdapterNonExistentHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::AdapterNonExistentHelper : public ::java::lang::Object
-{
-
-public:
-  AdapterNonExistentHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAPackage::AdapterNonExistent *);
-  static ::org::omg::PortableServer::POAPackage::AdapterNonExistent * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAPackage::AdapterNonExistent * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAPackage::AdapterNonExistent *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_AdapterNonExistentHelper__
diff --git a/libjava/org/omg/PortableServer/POAPackage/InvalidPolicy.h b/libjava/org/omg/PortableServer/POAPackage/InvalidPolicy.h
deleted file mode 100644
index 8e9235ef74a..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/InvalidPolicy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_InvalidPolicy__
-#define __org_omg_PortableServer_POAPackage_InvalidPolicy__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class InvalidPolicy;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::InvalidPolicy : public ::org::omg::CORBA::UserException
-{
-
-public:
-  InvalidPolicy();
-  InvalidPolicy(::java::lang::String *, jshort);
-  InvalidPolicy(jshort);
-  ::java::lang::String * getMessage();
-private:
-  static const jlong serialVersionUID = 3204212102282117205LL;
-public:
-  jshort __attribute__((aligned(__alignof__( ::org::omg::CORBA::UserException)))) index;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_InvalidPolicy__
diff --git a/libjava/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.h b/libjava/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.h
deleted file mode 100644
index 8f46cab20b0..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_InvalidPolicyHelper__
-#define __org_omg_PortableServer_POAPackage_InvalidPolicyHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class InvalidPolicy;
-            class InvalidPolicyHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::InvalidPolicyHelper : public ::java::lang::Object
-{
-
-public:
-  InvalidPolicyHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAPackage::InvalidPolicy *);
-  static ::org::omg::PortableServer::POAPackage::InvalidPolicy * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAPackage::InvalidPolicy * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAPackage::InvalidPolicy *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_InvalidPolicyHelper__
diff --git a/libjava/org/omg/PortableServer/POAPackage/NoServant.h b/libjava/org/omg/PortableServer/POAPackage/NoServant.h
deleted file mode 100644
index e0f4da1c973..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/NoServant.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_NoServant__
-#define __org_omg_PortableServer_POAPackage_NoServant__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class NoServant;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::NoServant : public ::org::omg::CORBA::UserException
-{
-
-public:
-  NoServant();
-  NoServant(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -5893773687270266061LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_NoServant__
diff --git a/libjava/org/omg/PortableServer/POAPackage/NoServantHelper.h b/libjava/org/omg/PortableServer/POAPackage/NoServantHelper.h
deleted file mode 100644
index 17250f78078..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/NoServantHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_NoServantHelper__
-#define __org_omg_PortableServer_POAPackage_NoServantHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class NoServant;
-            class NoServantHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::NoServantHelper : public ::java::lang::Object
-{
-
-public:
-  NoServantHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAPackage::NoServant *);
-  static ::org::omg::PortableServer::POAPackage::NoServant * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAPackage::NoServant * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAPackage::NoServant *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_NoServantHelper__
diff --git a/libjava/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.h b/libjava/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.h
deleted file mode 100644
index 0b10b22b48c..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_ObjectAlreadyActive__
-#define __org_omg_PortableServer_POAPackage_ObjectAlreadyActive__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class ObjectAlreadyActive;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::ObjectAlreadyActive : public ::org::omg::CORBA::UserException
-{
-
-public:
-  ObjectAlreadyActive();
-  ObjectAlreadyActive(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -2919308871345098101LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_ObjectAlreadyActive__
diff --git a/libjava/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.h b/libjava/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.h
deleted file mode 100644
index d70f153e6bb..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_ObjectAlreadyActiveHelper__
-#define __org_omg_PortableServer_POAPackage_ObjectAlreadyActiveHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class ObjectAlreadyActive;
-            class ObjectAlreadyActiveHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::ObjectAlreadyActiveHelper : public ::java::lang::Object
-{
-
-public:
-  ObjectAlreadyActiveHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAPackage::ObjectAlreadyActive *);
-  static ::org::omg::PortableServer::POAPackage::ObjectAlreadyActive * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAPackage::ObjectAlreadyActive * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAPackage::ObjectAlreadyActive *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_ObjectAlreadyActiveHelper__
diff --git a/libjava/org/omg/PortableServer/POAPackage/ObjectNotActive.h b/libjava/org/omg/PortableServer/POAPackage/ObjectNotActive.h
deleted file mode 100644
index b4503414d56..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/ObjectNotActive.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_ObjectNotActive__
-#define __org_omg_PortableServer_POAPackage_ObjectNotActive__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class ObjectNotActive;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::ObjectNotActive : public ::org::omg::CORBA::UserException
-{
-
-public:
-  ObjectNotActive();
-  ObjectNotActive(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 2269559915073532416LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_ObjectNotActive__
diff --git a/libjava/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.h b/libjava/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.h
deleted file mode 100644
index 1847674324b..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_ObjectNotActiveHelper__
-#define __org_omg_PortableServer_POAPackage_ObjectNotActiveHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class ObjectNotActive;
-            class ObjectNotActiveHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::ObjectNotActiveHelper : public ::java::lang::Object
-{
-
-public:
-  ObjectNotActiveHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAPackage::ObjectNotActive *);
-  static ::org::omg::PortableServer::POAPackage::ObjectNotActive * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAPackage::ObjectNotActive * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAPackage::ObjectNotActive *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_ObjectNotActiveHelper__
diff --git a/libjava/org/omg/PortableServer/POAPackage/ServantAlreadyActive.h b/libjava/org/omg/PortableServer/POAPackage/ServantAlreadyActive.h
deleted file mode 100644
index 01d9f2d3574..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/ServantAlreadyActive.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_ServantAlreadyActive__
-#define __org_omg_PortableServer_POAPackage_ServantAlreadyActive__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class ServantAlreadyActive;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::ServantAlreadyActive : public ::org::omg::CORBA::UserException
-{
-
-public:
-  ServantAlreadyActive();
-  ServantAlreadyActive(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 780130793809887260LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_ServantAlreadyActive__
diff --git a/libjava/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.h b/libjava/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.h
deleted file mode 100644
index 779c0343201..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_ServantAlreadyActiveHelper__
-#define __org_omg_PortableServer_POAPackage_ServantAlreadyActiveHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class ServantAlreadyActive;
-            class ServantAlreadyActiveHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::ServantAlreadyActiveHelper : public ::java::lang::Object
-{
-
-public:
-  ServantAlreadyActiveHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAPackage::ServantAlreadyActive *);
-  static ::org::omg::PortableServer::POAPackage::ServantAlreadyActive * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAPackage::ServantAlreadyActive * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAPackage::ServantAlreadyActive *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_ServantAlreadyActiveHelper__
diff --git a/libjava/org/omg/PortableServer/POAPackage/ServantNotActive.h b/libjava/org/omg/PortableServer/POAPackage/ServantNotActive.h
deleted file mode 100644
index 37249db7a16..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/ServantNotActive.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_ServantNotActive__
-#define __org_omg_PortableServer_POAPackage_ServantNotActive__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class ServantNotActive;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::ServantNotActive : public ::org::omg::CORBA::UserException
-{
-
-public:
-  ServantNotActive();
-  ServantNotActive(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = -7806868032412803953LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_ServantNotActive__
diff --git a/libjava/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.h b/libjava/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.h
deleted file mode 100644
index aa68157ab3f..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_ServantNotActiveHelper__
-#define __org_omg_PortableServer_POAPackage_ServantNotActiveHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class ServantNotActive;
-            class ServantNotActiveHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::ServantNotActiveHelper : public ::java::lang::Object
-{
-
-public:
-  ServantNotActiveHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAPackage::ServantNotActive *);
-  static ::org::omg::PortableServer::POAPackage::ServantNotActive * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAPackage::ServantNotActive * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAPackage::ServantNotActive *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_ServantNotActiveHelper__
diff --git a/libjava/org/omg/PortableServer/POAPackage/WrongAdapter.h b/libjava/org/omg/PortableServer/POAPackage/WrongAdapter.h
deleted file mode 100644
index 3f4ec19322c..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/WrongAdapter.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_WrongAdapter__
-#define __org_omg_PortableServer_POAPackage_WrongAdapter__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class WrongAdapter;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::WrongAdapter : public ::org::omg::CORBA::UserException
-{
-
-public:
-  WrongAdapter();
-  WrongAdapter(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 7505320179916389200LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_WrongAdapter__
diff --git a/libjava/org/omg/PortableServer/POAPackage/WrongAdapterHelper.h b/libjava/org/omg/PortableServer/POAPackage/WrongAdapterHelper.h
deleted file mode 100644
index bb4927be7f1..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/WrongAdapterHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_WrongAdapterHelper__
-#define __org_omg_PortableServer_POAPackage_WrongAdapterHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class WrongAdapter;
-            class WrongAdapterHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::WrongAdapterHelper : public ::java::lang::Object
-{
-
-public:
-  WrongAdapterHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAPackage::WrongAdapter *);
-  static ::org::omg::PortableServer::POAPackage::WrongAdapter * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAPackage::WrongAdapter * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAPackage::WrongAdapter *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_WrongAdapterHelper__
diff --git a/libjava/org/omg/PortableServer/POAPackage/WrongPolicy.h b/libjava/org/omg/PortableServer/POAPackage/WrongPolicy.h
deleted file mode 100644
index aa8e99bb399..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/WrongPolicy.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_WrongPolicy__
-#define __org_omg_PortableServer_POAPackage_WrongPolicy__
-
-#pragma interface
-
-#include <org/omg/CORBA/UserException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class WrongPolicy;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::WrongPolicy : public ::org::omg::CORBA::UserException
-{
-
-public:
-  WrongPolicy();
-  WrongPolicy(::java::lang::String *);
-private:
-  static const jlong serialVersionUID = 1949765652955335195LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_WrongPolicy__
diff --git a/libjava/org/omg/PortableServer/POAPackage/WrongPolicyHelper.h b/libjava/org/omg/PortableServer/POAPackage/WrongPolicyHelper.h
deleted file mode 100644
index 0d648bbfba2..00000000000
--- a/libjava/org/omg/PortableServer/POAPackage/WrongPolicyHelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_POAPackage_WrongPolicyHelper__
-#define __org_omg_PortableServer_POAPackage_WrongPolicyHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace POAPackage
-        {
-            class WrongPolicy;
-            class WrongPolicyHelper;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::POAPackage::WrongPolicyHelper : public ::java::lang::Object
-{
-
-public:
-  WrongPolicyHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::POAPackage::WrongPolicy *);
-  static ::org::omg::PortableServer::POAPackage::WrongPolicy * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::POAPackage::WrongPolicy * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::POAPackage::WrongPolicy *);
-private:
-  static ::org::omg::CORBA::TypeCode * typeCode;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_POAPackage_WrongPolicyHelper__
diff --git a/libjava/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.h b/libjava/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.h
deleted file mode 100644
index e07834e91c9..00000000000
--- a/libjava/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_REQUEST_PROCESSING_POLICY_ID__
-#define __org_omg_PortableServer_REQUEST_PROCESSING_POLICY_ID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class REQUEST_PROCESSING_POLICY_ID;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::REQUEST_PROCESSING_POLICY_ID : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 22;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_REQUEST_PROCESSING_POLICY_ID__
diff --git a/libjava/org/omg/PortableServer/RequestProcessingPolicy.h b/libjava/org/omg/PortableServer/RequestProcessingPolicy.h
deleted file mode 100644
index 64eec4dec53..00000000000
--- a/libjava/org/omg/PortableServer/RequestProcessingPolicy.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_RequestProcessingPolicy__
-#define __org_omg_PortableServer_RequestProcessingPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class RequestProcessingPolicy;
-          class RequestProcessingPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::RequestProcessingPolicy : public ::java::lang::Object
-{
-
-public:
-  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;
-  virtual ::org::omg::PortableServer::RequestProcessingPolicyValue * value() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_RequestProcessingPolicy__
diff --git a/libjava/org/omg/PortableServer/RequestProcessingPolicyOperations.h b/libjava/org/omg/PortableServer/RequestProcessingPolicyOperations.h
deleted file mode 100644
index e8769c63a43..00000000000
--- a/libjava/org/omg/PortableServer/RequestProcessingPolicyOperations.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_RequestProcessingPolicyOperations__
-#define __org_omg_PortableServer_RequestProcessingPolicyOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-      }
-      namespace PortableServer
-      {
-          class RequestProcessingPolicyOperations;
-          class RequestProcessingPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::RequestProcessingPolicyOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::RequestProcessingPolicyValue * value() = 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 // __org_omg_PortableServer_RequestProcessingPolicyOperations__
diff --git a/libjava/org/omg/PortableServer/RequestProcessingPolicyValue.h b/libjava/org/omg/PortableServer/RequestProcessingPolicyValue.h
deleted file mode 100644
index 88fdf8833ac..00000000000
--- a/libjava/org/omg/PortableServer/RequestProcessingPolicyValue.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_RequestProcessingPolicyValue__
-#define __org_omg_PortableServer_RequestProcessingPolicyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class RequestProcessingPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::RequestProcessingPolicyValue : public ::java::lang::Object
-{
-
-public: // actually protected
-  RequestProcessingPolicyValue(jint);
-public:
-  static ::org::omg::PortableServer::RequestProcessingPolicyValue * from_int(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = 7646563512329907695LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-public:
-  static const jint _USE_ACTIVE_OBJECT_MAP_ONLY = 0;
-  static ::org::omg::PortableServer::RequestProcessingPolicyValue * USE_ACTIVE_OBJECT_MAP_ONLY;
-  static const jint _USE_DEFAULT_SERVANT = 1;
-  static ::org::omg::PortableServer::RequestProcessingPolicyValue * USE_DEFAULT_SERVANT;
-  static const jint _USE_SERVANT_MANAGER = 2;
-  static ::org::omg::PortableServer::RequestProcessingPolicyValue * USE_SERVANT_MANAGER;
-private:
-  static JArray< ::org::omg::PortableServer::RequestProcessingPolicyValue * > * enume;
-  static JArray< ::java::lang::String * > * state_names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_RequestProcessingPolicyValue__
diff --git a/libjava/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.h b/libjava/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.h
deleted file mode 100644
index ae6e5c46bf3..00000000000
--- a/libjava/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_SERVANT_RETENTION_POLICY_ID__
-#define __org_omg_PortableServer_SERVANT_RETENTION_POLICY_ID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class SERVANT_RETENTION_POLICY_ID;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::SERVANT_RETENTION_POLICY_ID : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 21;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_SERVANT_RETENTION_POLICY_ID__
diff --git a/libjava/org/omg/PortableServer/Servant.h b/libjava/org/omg/PortableServer/Servant.h
deleted file mode 100644
index 8116067ff11..00000000000
--- a/libjava/org/omg/PortableServer/Servant.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_Servant__
-#define __org_omg_PortableServer_Servant__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class Object;
-      }
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-        namespace portable
-        {
-            class Delegate;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::Servant : public ::java::lang::Object
-{
-
-public:
-  Servant();
-  virtual JArray< ::java::lang::String * > * _all_interfaces(::org::omg::PortableServer::POA *, JArray< jbyte > *) = 0;
-  virtual ::org::omg::PortableServer::portable::Delegate * _get_delegate();
-  virtual ::org::omg::CORBA::Object * _get_interface_def();
-  virtual jboolean _is_a(::java::lang::String *);
-  virtual jboolean _non_existent();
-  virtual ::org::omg::CORBA::ORB * _orb();
-  virtual ::org::omg::PortableServer::POA * _default_POA();
-  virtual JArray< jbyte > * _object_id();
-  virtual ::org::omg::PortableServer::POA * _poa();
-  virtual void _set_delegate(::org::omg::PortableServer::portable::Delegate *);
-  virtual ::org::omg::CORBA::Object * _this_object(::org::omg::CORBA::ORB *);
-  virtual ::org::omg::CORBA::Object * _this_object();
-private:
-  ::org::omg::PortableServer::portable::Delegate * __attribute__((aligned(__alignof__( ::java::lang::Object)))) delegate;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_Servant__
diff --git a/libjava/org/omg/PortableServer/ServantActivator.h b/libjava/org/omg/PortableServer/ServantActivator.h
deleted file mode 100644
index 836dc9be916..00000000000
--- a/libjava/org/omg/PortableServer/ServantActivator.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantActivator__
-#define __org_omg_PortableServer_ServantActivator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-          class ServantActivator;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantActivator : public ::java::lang::Object
-{
-
-public:
-  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 void etherealize(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::org::omg::PortableServer::Servant *, jboolean, jboolean) = 0;
-  virtual ::org::omg::PortableServer::Servant * incarnate(JArray< jbyte > *, ::org::omg::PortableServer::POA *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ServantActivator__
diff --git a/libjava/org/omg/PortableServer/ServantActivatorHelper.h b/libjava/org/omg/PortableServer/ServantActivatorHelper.h
deleted file mode 100644
index 1b302600c5b..00000000000
--- a/libjava/org/omg/PortableServer/ServantActivatorHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantActivatorHelper__
-#define __org_omg_PortableServer_ServantActivatorHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-          class ServantActivator;
-          class ServantActivatorHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantActivatorHelper : public ::java::lang::Object
-{
-
-public:
-  ServantActivatorHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::ServantActivator *);
-  static ::org::omg::PortableServer::ServantActivator * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::ServantActivator * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::PortableServer::ServantActivator * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::PortableServer::ServantActivator * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::ServantActivator *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ServantActivatorHelper__
diff --git a/libjava/org/omg/PortableServer/ServantActivatorOperations.h b/libjava/org/omg/PortableServer/ServantActivatorOperations.h
deleted file mode 100644
index 436693990f8..00000000000
--- a/libjava/org/omg/PortableServer/ServantActivatorOperations.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantActivatorOperations__
-#define __org_omg_PortableServer_ServantActivatorOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-          class ServantActivatorOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantActivatorOperations : public ::java::lang::Object
-{
-
-public:
-  virtual void etherealize(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::org::omg::PortableServer::Servant *, jboolean, jboolean) = 0;
-  virtual ::org::omg::PortableServer::Servant * incarnate(JArray< jbyte > *, ::org::omg::PortableServer::POA *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ServantActivatorOperations__
diff --git a/libjava/org/omg/PortableServer/ServantActivatorPOA$delegator.h b/libjava/org/omg/PortableServer/ServantActivatorPOA$delegator.h
deleted file mode 100644
index 769c43a63d4..00000000000
--- a/libjava/org/omg/PortableServer/ServantActivatorPOA$delegator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantActivatorPOA$delegator__
-#define __org_omg_PortableServer_ServantActivatorPOA$delegator__
-
-#pragma interface
-
-#include <gnu/CORBA/Poa/gnuServantObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-          class ServantActivatorPOA;
-          class ServantActivatorPOA$delegator;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantActivatorPOA$delegator : public ::gnu::CORBA::Poa::gnuServantObject
-{
-
-public: // actually package-private
-  ServantActivatorPOA$delegator(::org::omg::PortableServer::ServantActivatorPOA *, ::org::omg::PortableServer::Servant *);
-public:
-  virtual ::org::omg::PortableServer::Servant * incarnate(JArray< jbyte > *, ::org::omg::PortableServer::POA *);
-  virtual void etherealize(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::org::omg::PortableServer::Servant *, jboolean, jboolean);
-public: // actually package-private
-  ::org::omg::PortableServer::ServantActivatorPOA * __attribute__((aligned(__alignof__( ::gnu::CORBA::Poa::gnuServantObject)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ServantActivatorPOA$delegator__
diff --git a/libjava/org/omg/PortableServer/ServantActivatorPOA.h b/libjava/org/omg/PortableServer/ServantActivatorPOA.h
deleted file mode 100644
index 8b524bf6b84..00000000000
--- a/libjava/org/omg/PortableServer/ServantActivatorPOA.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantActivatorPOA__
-#define __org_omg_PortableServer_ServantActivatorPOA__
-
-#pragma interface
-
-#include <org/omg/PortableServer/Servant.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-          class ServantActivator;
-          class ServantActivatorPOA;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantActivatorPOA : public ::org::omg::PortableServer::Servant
-{
-
-public:
-  ServantActivatorPOA();
-  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 > *);
-  virtual ::org::omg::PortableServer::ServantActivator * _this();
-  virtual ::org::omg::PortableServer::ServantActivator * _this(::org::omg::CORBA::ORB *);
-  virtual void etherealize(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::org::omg::PortableServer::Servant *, jboolean, jboolean) = 0;
-  virtual ::org::omg::PortableServer::Servant * incarnate(JArray< jbyte > *, ::org::omg::PortableServer::POA *) = 0;
-public: // actually package-private
-  ::org::omg::PortableServer::ServantActivatorPOA * __attribute__((aligned(__alignof__( ::org::omg::PortableServer::Servant)))) THIS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ServantActivatorPOA__
diff --git a/libjava/org/omg/PortableServer/ServantLocator.h b/libjava/org/omg/PortableServer/ServantLocator.h
deleted file mode 100644
index 4dd30fc38be..00000000000
--- a/libjava/org/omg/PortableServer/ServantLocator.h
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantLocator__
-#define __org_omg_PortableServer_ServantLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-          class ServantLocator;
-        namespace ServantLocatorPackage
-        {
-            class CookieHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantLocator : public ::java::lang::Object
-{
-
-public:
-  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::PortableServer::Servant * preinvoke(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::java::lang::String *, ::org::omg::PortableServer::ServantLocatorPackage::CookieHolder *) = 0;
-  virtual void postinvoke(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::java::lang::String *, ::java::lang::Object *, ::org::omg::PortableServer::Servant *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ServantLocator__
diff --git a/libjava/org/omg/PortableServer/ServantLocatorHelper.h b/libjava/org/omg/PortableServer/ServantLocatorHelper.h
deleted file mode 100644
index bd80a46ca08..00000000000
--- a/libjava/org/omg/PortableServer/ServantLocatorHelper.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantLocatorHelper__
-#define __org_omg_PortableServer_ServantLocatorHelper__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Any;
-          class Object;
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-          class ServantLocator;
-          class ServantLocatorHelper;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantLocatorHelper : public ::java::lang::Object
-{
-
-public:
-  ServantLocatorHelper();
-  static ::org::omg::CORBA::TypeCode * type();
-  static void insert(::org::omg::CORBA::Any *, ::org::omg::PortableServer::ServantLocator *);
-  static ::org::omg::PortableServer::ServantLocator * extract(::org::omg::CORBA::Any *);
-  static ::java::lang::String * id();
-  static ::org::omg::PortableServer::ServantLocator * narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::PortableServer::ServantLocator * unchecked_narrow(::org::omg::CORBA::Object *);
-  static ::org::omg::PortableServer::ServantLocator * read(::org::omg::CORBA::portable::InputStream *);
-  static void write(::org::omg::CORBA::portable::OutputStream *, ::org::omg::PortableServer::ServantLocator *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ServantLocatorHelper__
diff --git a/libjava/org/omg/PortableServer/ServantLocatorOperations.h b/libjava/org/omg/PortableServer/ServantLocatorOperations.h
deleted file mode 100644
index a54d01f23ec..00000000000
--- a/libjava/org/omg/PortableServer/ServantLocatorOperations.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantLocatorOperations__
-#define __org_omg_PortableServer_ServantLocatorOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-          class ServantLocatorOperations;
-        namespace ServantLocatorPackage
-        {
-            class CookieHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantLocatorOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::Servant * preinvoke(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::java::lang::String *, ::org::omg::PortableServer::ServantLocatorPackage::CookieHolder *) = 0;
-  virtual void postinvoke(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::java::lang::String *, ::java::lang::Object *, ::org::omg::PortableServer::Servant *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ServantLocatorOperations__
diff --git a/libjava/org/omg/PortableServer/ServantLocatorPOA$delegator.h b/libjava/org/omg/PortableServer/ServantLocatorPOA$delegator.h
deleted file mode 100644
index 37af8e7df2c..00000000000
--- a/libjava/org/omg/PortableServer/ServantLocatorPOA$delegator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantLocatorPOA$delegator__
-#define __org_omg_PortableServer_ServantLocatorPOA$delegator__
-
-#pragma interface
-
-#include <gnu/CORBA/Poa/gnuServantObject.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-          class ServantLocatorPOA;
-          class ServantLocatorPOA$delegator;
-        namespace ServantLocatorPackage
-        {
-            class CookieHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantLocatorPOA$delegator : public ::gnu::CORBA::Poa::gnuServantObject
-{
-
-public: // actually package-private
-  ServantLocatorPOA$delegator(::org::omg::PortableServer::ServantLocatorPOA *, ::org::omg::PortableServer::Servant *);
-public:
-  virtual ::org::omg::PortableServer::Servant * preinvoke(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::java::lang::String *, ::org::omg::PortableServer::ServantLocatorPackage::CookieHolder *);
-  virtual void postinvoke(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::java::lang::String *, ::java::lang::Object *, ::org::omg::PortableServer::Servant *);
-  virtual JArray< ::java::lang::String * > * _ids();
-public: // actually package-private
-  ::org::omg::PortableServer::ServantLocatorPOA * __attribute__((aligned(__alignof__( ::gnu::CORBA::Poa::gnuServantObject)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ServantLocatorPOA$delegator__
diff --git a/libjava/org/omg/PortableServer/ServantLocatorPOA.h b/libjava/org/omg/PortableServer/ServantLocatorPOA.h
deleted file mode 100644
index c4f4fcea41f..00000000000
--- a/libjava/org/omg/PortableServer/ServantLocatorPOA.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantLocatorPOA__
-#define __org_omg_PortableServer_ServantLocatorPOA__
-
-#pragma interface
-
-#include <org/omg/PortableServer/Servant.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-            class ResponseHandler;
-        }
-      }
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-          class ServantLocator;
-          class ServantLocatorPOA;
-        namespace ServantLocatorPackage
-        {
-            class CookieHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantLocatorPOA : public ::org::omg::PortableServer::Servant
-{
-
-public:
-  ServantLocatorPOA();
-  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 > *);
-  virtual ::org::omg::PortableServer::ServantLocator * _this();
-  virtual ::org::omg::PortableServer::ServantLocator * _this(::org::omg::CORBA::ORB *);
-  virtual ::org::omg::PortableServer::Servant * preinvoke(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::java::lang::String *, ::org::omg::PortableServer::ServantLocatorPackage::CookieHolder *) = 0;
-  virtual void postinvoke(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::java::lang::String *, ::java::lang::Object *, ::org::omg::PortableServer::Servant *) = 0;
-public: // actually package-private
-  ::org::omg::PortableServer::ServantLocatorPOA * __attribute__((aligned(__alignof__( ::org::omg::PortableServer::Servant)))) THIS;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ServantLocatorPOA__
diff --git a/libjava/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.h b/libjava/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.h
deleted file mode 100644
index d983d8093cf..00000000000
--- a/libjava/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantLocatorPackage_CookieHolder__
-#define __org_omg_PortableServer_ServantLocatorPackage_CookieHolder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class TypeCode;
-        namespace portable
-        {
-            class InputStream;
-            class OutputStream;
-        }
-      }
-      namespace PortableServer
-      {
-        namespace ServantLocatorPackage
-        {
-            class CookieHolder;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantLocatorPackage::CookieHolder : public ::java::lang::Object
-{
-
-public:
-  CookieHolder();
-  CookieHolder(::java::lang::Object *);
-  void _read(::org::omg::CORBA::portable::InputStream *);
-  ::org::omg::CORBA::TypeCode * _type();
-  void _write(::org::omg::CORBA::portable::OutputStream *);
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ServantLocatorPackage_CookieHolder__
diff --git a/libjava/org/omg/PortableServer/ServantManager.h b/libjava/org/omg/PortableServer/ServantManager.h
deleted file mode 100644
index 9ed97078644..00000000000
--- a/libjava/org/omg/PortableServer/ServantManager.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantManager__
-#define __org_omg_PortableServer_ServantManager__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class ServantManager;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantManager : public ::java::lang::Object
-{
-
-public:
-  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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ServantManager__
diff --git a/libjava/org/omg/PortableServer/ServantManagerOperations.h b/libjava/org/omg/PortableServer/ServantManagerOperations.h
deleted file mode 100644
index 8aa8b19df88..00000000000
--- a/libjava/org/omg/PortableServer/ServantManagerOperations.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantManagerOperations__
-#define __org_omg_PortableServer_ServantManagerOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class ServantManagerOperations;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantManagerOperations : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ServantManagerOperations__
diff --git a/libjava/org/omg/PortableServer/ServantRetentionPolicy.h b/libjava/org/omg/PortableServer/ServantRetentionPolicy.h
deleted file mode 100644
index 1d7f7d79704..00000000000
--- a/libjava/org/omg/PortableServer/ServantRetentionPolicy.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantRetentionPolicy__
-#define __org_omg_PortableServer_ServantRetentionPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class ServantRetentionPolicy;
-          class ServantRetentionPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantRetentionPolicy : public ::java::lang::Object
-{
-
-public:
-  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;
-  virtual ::org::omg::PortableServer::ServantRetentionPolicyValue * value() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ServantRetentionPolicy__
diff --git a/libjava/org/omg/PortableServer/ServantRetentionPolicyOperations.h b/libjava/org/omg/PortableServer/ServantRetentionPolicyOperations.h
deleted file mode 100644
index e6ebd89e671..00000000000
--- a/libjava/org/omg/PortableServer/ServantRetentionPolicyOperations.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantRetentionPolicyOperations__
-#define __org_omg_PortableServer_ServantRetentionPolicyOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-      }
-      namespace PortableServer
-      {
-          class ServantRetentionPolicyOperations;
-          class ServantRetentionPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantRetentionPolicyOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::ServantRetentionPolicyValue * value() = 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 // __org_omg_PortableServer_ServantRetentionPolicyOperations__
diff --git a/libjava/org/omg/PortableServer/ServantRetentionPolicyValue.h b/libjava/org/omg/PortableServer/ServantRetentionPolicyValue.h
deleted file mode 100644
index c34521b72fb..00000000000
--- a/libjava/org/omg/PortableServer/ServantRetentionPolicyValue.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ServantRetentionPolicyValue__
-#define __org_omg_PortableServer_ServantRetentionPolicyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class ServantRetentionPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ServantRetentionPolicyValue : public ::java::lang::Object
-{
-
-public: // actually protected
-  ServantRetentionPolicyValue(jint);
-public:
-  static ::org::omg::PortableServer::ServantRetentionPolicyValue * from_int(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = -7476100336036943822LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-public:
-  static const jint _RETAIN = 0;
-  static ::org::omg::PortableServer::ServantRetentionPolicyValue * RETAIN;
-  static const jint _NON_RETAIN = 1;
-  static ::org::omg::PortableServer::ServantRetentionPolicyValue * NON_RETAIN;
-private:
-  static JArray< ::org::omg::PortableServer::ServantRetentionPolicyValue * > * enume;
-  static JArray< ::java::lang::String * > * state_names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ServantRetentionPolicyValue__
diff --git a/libjava/org/omg/PortableServer/THREAD_POLICY_ID.h b/libjava/org/omg/PortableServer/THREAD_POLICY_ID.h
deleted file mode 100644
index 418919cdb86..00000000000
--- a/libjava/org/omg/PortableServer/THREAD_POLICY_ID.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_THREAD_POLICY_ID__
-#define __org_omg_PortableServer_THREAD_POLICY_ID__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class THREAD_POLICY_ID;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::THREAD_POLICY_ID : public ::java::lang::Object
-{
-
-public:
-  static const jint value = 16;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_THREAD_POLICY_ID__
diff --git a/libjava/org/omg/PortableServer/ThreadPolicy.h b/libjava/org/omg/PortableServer/ThreadPolicy.h
deleted file mode 100644
index 06e09b6526f..00000000000
--- a/libjava/org/omg/PortableServer/ThreadPolicy.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ThreadPolicy__
-#define __org_omg_PortableServer_ThreadPolicy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace PortableServer
-      {
-          class ThreadPolicy;
-          class ThreadPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ThreadPolicy : public ::java::lang::Object
-{
-
-public:
-  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;
-  virtual ::org::omg::PortableServer::ThreadPolicyValue * value() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_ThreadPolicy__
diff --git a/libjava/org/omg/PortableServer/ThreadPolicyOperations.h b/libjava/org/omg/PortableServer/ThreadPolicyOperations.h
deleted file mode 100644
index fbadf62b657..00000000000
--- a/libjava/org/omg/PortableServer/ThreadPolicyOperations.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ThreadPolicyOperations__
-#define __org_omg_PortableServer_ThreadPolicyOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class Policy;
-      }
-      namespace PortableServer
-      {
-          class ThreadPolicyOperations;
-          class ThreadPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ThreadPolicyOperations : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::ThreadPolicyValue * value() = 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 // __org_omg_PortableServer_ThreadPolicyOperations__
diff --git a/libjava/org/omg/PortableServer/ThreadPolicyValue.h b/libjava/org/omg/PortableServer/ThreadPolicyValue.h
deleted file mode 100644
index 9953a6b6968..00000000000
--- a/libjava/org/omg/PortableServer/ThreadPolicyValue.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_ThreadPolicyValue__
-#define __org_omg_PortableServer_ThreadPolicyValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class ThreadPolicyValue;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::ThreadPolicyValue : public ::java::lang::Object
-{
-
-public: // actually protected
-  ThreadPolicyValue(jint);
-public:
-  static ::org::omg::PortableServer::ThreadPolicyValue * from_int(jint);
-  virtual ::java::lang::String * toString();
-  virtual jint value();
-private:
-  static const jlong serialVersionUID = -8874988828297141512LL;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) _value;
-public:
-  static const jint _ORB_CTRL_MODEL = 0;
-  static ::org::omg::PortableServer::ThreadPolicyValue * ORB_CTRL_MODEL;
-  static const jint _SINGLE_THREAD_MODEL = 1;
-  static ::org::omg::PortableServer::ThreadPolicyValue * SINGLE_THREAD_MODEL;
-private:
-  static JArray< ::org::omg::PortableServer::ThreadPolicyValue * > * enume;
-  static JArray< ::java::lang::String * > * state_names;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer_ThreadPolicyValue__
diff --git a/libjava/org/omg/PortableServer/_ServantActivatorStub.h b/libjava/org/omg/PortableServer/_ServantActivatorStub.h
deleted file mode 100644
index d1b120fcf41..00000000000
--- a/libjava/org/omg/PortableServer/_ServantActivatorStub.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer__ServantActivatorStub__
-#define __org_omg_PortableServer__ServantActivatorStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-          class _ServantActivatorStub;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::_ServantActivatorStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _ServantActivatorStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::org::omg::PortableServer::Servant * incarnate(JArray< jbyte > *, ::org::omg::PortableServer::POA *);
-  virtual void etherealize(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::org::omg::PortableServer::Servant *, jboolean, jboolean);
-private:
-  static const jlong serialVersionUID = -685959979577281419LL;
-public:
-  static ::java::lang::Class * _opsClass;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer__ServantActivatorStub__
diff --git a/libjava/org/omg/PortableServer/_ServantLocatorStub.h b/libjava/org/omg/PortableServer/_ServantLocatorStub.h
deleted file mode 100644
index 7cfa1de88cc..00000000000
--- a/libjava/org/omg/PortableServer/_ServantLocatorStub.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer__ServantLocatorStub__
-#define __org_omg_PortableServer__ServantLocatorStub__
-
-#pragma interface
-
-#include <org/omg/CORBA/portable/ObjectImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-        namespace ServantLocatorPackage
-        {
-            class CookieHolder;
-        }
-          class _ServantLocatorStub;
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::_ServantLocatorStub : public ::org::omg::CORBA::portable::ObjectImpl
-{
-
-public:
-  _ServantLocatorStub();
-  virtual JArray< ::java::lang::String * > * _ids();
-  virtual ::org::omg::PortableServer::Servant * preinvoke(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::java::lang::String *, ::org::omg::PortableServer::ServantLocatorPackage::CookieHolder *);
-  virtual void postinvoke(JArray< jbyte > *, ::org::omg::PortableServer::POA *, ::java::lang::String *, ::java::lang::Object *, ::org::omg::PortableServer::Servant *);
-private:
-  static const jlong serialVersionUID = -2374963516905770111LL;
-public:
-  static ::java::lang::Class * _opsClass;
-public: // actually package-private
-  static ::java::lang::String * OVERRIDE;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_PortableServer__ServantLocatorStub__
diff --git a/libjava/org/omg/PortableServer/portable/Delegate.h b/libjava/org/omg/PortableServer/portable/Delegate.h
deleted file mode 100644
index ecf8c512a18..00000000000
--- a/libjava/org/omg/PortableServer/portable/Delegate.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_PortableServer_portable_Delegate__
-#define __org_omg_PortableServer_portable_Delegate__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace CORBA
-      {
-          class ORB;
-          class Object;
-      }
-      namespace PortableServer
-      {
-          class POA;
-          class Servant;
-        namespace portable
-        {
-            class Delegate;
-        }
-      }
-    }
-  }
-}
-
-class org::omg::PortableServer::portable::Delegate : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::omg::PortableServer::POA * default_POA(::org::omg::PortableServer::Servant *) = 0;
-  virtual ::org::omg::CORBA::Object * get_interface_def(::org::omg::PortableServer::Servant *) = 0;
-  virtual jboolean is_a(::org::omg::PortableServer::Servant *, ::java::lang::String *) = 0;
-  virtual jboolean non_existent(::org::omg::PortableServer::Servant *) = 0;
-  virtual JArray< jbyte > * object_id(::org::omg::PortableServer::Servant *) = 0;
-  virtual ::org::omg::CORBA::ORB * orb(::org::omg::PortableServer::Servant *) = 0;
-  virtual ::org::omg::PortableServer::POA * poa(::org::omg::PortableServer::Servant *) = 0;
-  virtual ::org::omg::CORBA::Object * this_object(::org::omg::PortableServer::Servant *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_PortableServer_portable_Delegate__
diff --git a/libjava/org/omg/SendingContext/RunTime.h b/libjava/org/omg/SendingContext/RunTime.h
deleted file mode 100644
index 95138bbaee9..00000000000
--- a/libjava/org/omg/SendingContext/RunTime.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_SendingContext_RunTime__
-#define __org_omg_SendingContext_RunTime__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  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;
-      }
-      namespace SendingContext
-      {
-          class RunTime;
-      }
-    }
-  }
-}
-
-class org::omg::SendingContext::RunTime : public ::java::lang::Object
-{
-
-public:
-  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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_SendingContext_RunTime__
diff --git a/libjava/org/omg/SendingContext/RunTimeOperations.h b/libjava/org/omg/SendingContext/RunTimeOperations.h
deleted file mode 100644
index 523afb3b98b..00000000000
--- a/libjava/org/omg/SendingContext/RunTimeOperations.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_SendingContext_RunTimeOperations__
-#define __org_omg_SendingContext_RunTimeOperations__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace SendingContext
-      {
-          class RunTimeOperations;
-      }
-    }
-  }
-}
-
-class org::omg::SendingContext::RunTimeOperations : public ::java::lang::Object
-{
-
-public:
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_omg_SendingContext_RunTimeOperations__
diff --git a/libjava/org/omg/stub/java/rmi/_Remote_Stub.h b/libjava/org/omg/stub/java/rmi/_Remote_Stub.h
deleted file mode 100644
index e6c6c164565..00000000000
--- a/libjava/org/omg/stub/java/rmi/_Remote_Stub.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_omg_stub_java_rmi__Remote_Stub__
-#define __org_omg_stub_java_rmi__Remote_Stub__
-
-#pragma interface
-
-#include <javax/rmi/CORBA/Stub.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace omg
-    {
-      namespace stub
-      {
-        namespace java
-        {
-          namespace rmi
-          {
-              class _Remote_Stub;
-          }
-        }
-      }
-    }
-  }
-}
-
-class org::omg::stub::java::rmi::_Remote_Stub : public ::javax::rmi::CORBA::Stub
-{
-
-public:
-  _Remote_Stub();
-  JArray< ::java::lang::String * > * _ids();
-private:
-  static const jlong serialVersionUID = -1967190271952680697LL;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_omg_stub_java_rmi__Remote_Stub__
diff --git a/libjava/org/relaxng/datatype/Datatype.h b/libjava/org/relaxng/datatype/Datatype.h
deleted file mode 100644
index 7274ef5b080..00000000000
--- a/libjava/org/relaxng/datatype/Datatype.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_Datatype__
-#define __org_relaxng_datatype_Datatype__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class Datatype;
-          class DatatypeStreamingValidator;
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::Datatype : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *) = 0;
-  virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *) = 0;
-  virtual ::org::relaxng::datatype::DatatypeStreamingValidator * createStreamingValidator(::org::relaxng::datatype::ValidationContext *) = 0;
-  virtual ::java::lang::Object * createValue(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *) = 0;
-  virtual jboolean sameValue(::java::lang::Object *, ::java::lang::Object *) = 0;
-  virtual jint valueHashCode(::java::lang::Object *) = 0;
-  virtual jint getIdType() = 0;
-  virtual jboolean isContextDependent() = 0;
-  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;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_relaxng_datatype_Datatype__
diff --git a/libjava/org/relaxng/datatype/DatatypeBuilder.h b/libjava/org/relaxng/datatype/DatatypeBuilder.h
deleted file mode 100644
index 7a996e68f3d..00000000000
--- a/libjava/org/relaxng/datatype/DatatypeBuilder.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_DatatypeBuilder__
-#define __org_relaxng_datatype_DatatypeBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class Datatype;
-          class DatatypeBuilder;
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::DatatypeBuilder : public ::java::lang::Object
-{
-
-public:
-  virtual void addParameter(::java::lang::String *, ::java::lang::String *, ::org::relaxng::datatype::ValidationContext *) = 0;
-  virtual ::org::relaxng::datatype::Datatype * createDatatype() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_relaxng_datatype_DatatypeBuilder__
diff --git a/libjava/org/relaxng/datatype/DatatypeException.h b/libjava/org/relaxng/datatype/DatatypeException.h
deleted file mode 100644
index e8a3f3219ca..00000000000
--- a/libjava/org/relaxng/datatype/DatatypeException.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_DatatypeException__
-#define __org_relaxng_datatype_DatatypeException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class DatatypeException;
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::DatatypeException : public ::java::lang::Exception
-{
-
-public:
-  DatatypeException(jint, ::java::lang::String *);
-  DatatypeException(::java::lang::String *);
-  DatatypeException();
-  virtual jint getIndex();
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Exception)))) index;
-public:
-  static const jint UNKNOWN = -1;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_relaxng_datatype_DatatypeException__
diff --git a/libjava/org/relaxng/datatype/DatatypeLibrary.h b/libjava/org/relaxng/datatype/DatatypeLibrary.h
deleted file mode 100644
index bdfcc94dc05..00000000000
--- a/libjava/org/relaxng/datatype/DatatypeLibrary.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_DatatypeLibrary__
-#define __org_relaxng_datatype_DatatypeLibrary__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class Datatype;
-          class DatatypeBuilder;
-          class DatatypeLibrary;
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::DatatypeLibrary : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::relaxng::datatype::DatatypeBuilder * createDatatypeBuilder(::java::lang::String *) = 0;
-  virtual ::org::relaxng::datatype::Datatype * createDatatype(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_relaxng_datatype_DatatypeLibrary__
diff --git a/libjava/org/relaxng/datatype/DatatypeLibraryFactory.h b/libjava/org/relaxng/datatype/DatatypeLibraryFactory.h
deleted file mode 100644
index 074e005e5c6..00000000000
--- a/libjava/org/relaxng/datatype/DatatypeLibraryFactory.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_DatatypeLibraryFactory__
-#define __org_relaxng_datatype_DatatypeLibraryFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class DatatypeLibrary;
-          class DatatypeLibraryFactory;
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::DatatypeLibraryFactory : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::relaxng::datatype::DatatypeLibrary * createDatatypeLibrary(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_relaxng_datatype_DatatypeLibraryFactory__
diff --git a/libjava/org/relaxng/datatype/DatatypeStreamingValidator.h b/libjava/org/relaxng/datatype/DatatypeStreamingValidator.h
deleted file mode 100644
index b05ed17d14f..00000000000
--- a/libjava/org/relaxng/datatype/DatatypeStreamingValidator.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_DatatypeStreamingValidator__
-#define __org_relaxng_datatype_DatatypeStreamingValidator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class DatatypeStreamingValidator;
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::DatatypeStreamingValidator : public ::java::lang::Object
-{
-
-public:
-  virtual void addCharacters(JArray< jchar > *, jint, jint) = 0;
-  virtual jboolean isValid() = 0;
-  virtual void checkValid() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_relaxng_datatype_DatatypeStreamingValidator__
diff --git a/libjava/org/relaxng/datatype/ValidationContext.h b/libjava/org/relaxng/datatype/ValidationContext.h
deleted file mode 100644
index 171beeb728d..00000000000
--- a/libjava/org/relaxng/datatype/ValidationContext.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_ValidationContext__
-#define __org_relaxng_datatype_ValidationContext__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class ValidationContext;
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::ValidationContext : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * resolveNamespacePrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBaseUri() = 0;
-  virtual jboolean isUnparsedEntity(::java::lang::String *) = 0;
-  virtual jboolean isNotation(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_relaxng_datatype_ValidationContext__
diff --git a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader.h b/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader.h
deleted file mode 100644
index dcefb2e48ca..00000000000
--- a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$Loader__
-#define __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$Loader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-        namespace helpers
-        {
-            class DatatypeLibraryLoader$Service$Loader;
-        }
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$Loader : public ::java::lang::Object
-{
-
-  DatatypeLibraryLoader$Service$Loader();
-public: // actually package-private
-  virtual ::java::util::Enumeration * getResources(::java::lang::String *);
-  virtual ::java::lang::Class * loadClass(::java::lang::String *);
-  DatatypeLibraryLoader$Service$Loader(::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$Loader *);
-  DatatypeLibraryLoader$Service$Loader(::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$Loader *, ::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$Loader *);
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$Loader__
diff --git a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader2.h b/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader2.h
deleted file mode 100644
index 338d0ba888e..00000000000
--- a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader2.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$Loader2__
-#define __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$Loader2__
-
-#pragma interface
-
-#include <org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loader.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-        namespace helpers
-        {
-            class DatatypeLibraryLoader$Service$Loader2;
-        }
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$Loader2 : public ::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$Loader
-{
-
-public: // actually package-private
-  DatatypeLibraryLoader$Service$Loader2();
-  virtual ::java::util::Enumeration * getResources(::java::lang::String *);
-  virtual ::java::lang::Class * loadClass(::java::lang::String *);
-private:
-  ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$Loader)))) cl;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$Loader2__
diff --git a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$ProviderEnumeration.h b/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$ProviderEnumeration.h
deleted file mode 100644
index 6f2b476513f..00000000000
--- a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$ProviderEnumeration.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$ProviderEnumeration__
-#define __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$ProviderEnumeration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-        namespace helpers
-        {
-            class DatatypeLibraryLoader$Service;
-            class DatatypeLibraryLoader$Service$ProviderEnumeration;
-        }
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$ProviderEnumeration : public ::java::lang::Object
-{
-
-  DatatypeLibraryLoader$Service$ProviderEnumeration(::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  DatatypeLibraryLoader$Service$ProviderEnumeration(::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service *, ::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$ProviderEnumeration *);
-private:
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) nextIndex;
-public: // actually package-private
-  ::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service * this$1;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$ProviderEnumeration__
diff --git a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Singleton.h b/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Singleton.h
deleted file mode 100644
index 6f6e535ee88..00000000000
--- a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Singleton.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$Singleton__
-#define __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$Singleton__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-        namespace helpers
-        {
-            class DatatypeLibraryLoader$Service$Singleton;
-        }
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$Singleton : public ::java::lang::Object
-{
-
-  DatatypeLibraryLoader$Service$Singleton(::java::lang::Object *);
-public:
-  virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
-public: // actually package-private
-  DatatypeLibraryLoader$Service$Singleton(::java::lang::Object *, ::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$Singleton *);
-private:
-  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) obj;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service$Singleton__
diff --git a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service.h b/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service.h
deleted file mode 100644
index 7757d90cad2..00000000000
--- a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service__
-#define __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-        namespace helpers
-        {
-            class DatatypeLibraryLoader$Service;
-            class DatatypeLibraryLoader$Service$Loader;
-        }
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service : public ::java::lang::Object
-{
-
-public:
-  DatatypeLibraryLoader$Service(::java::lang::Class *);
-  virtual ::java::util::Enumeration * getProviders();
-private:
-  jboolean moreProviders();
-  static ::java::util::Enumeration * parseConfigFile(::java::net::URL *);
-public: // actually package-private
-  static ::java::util::Vector * access$0(::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service *);
-  static jboolean access$1(::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service *);
-private:
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) serviceClass;
-  ::java::util::Enumeration * configFiles;
-  ::java::util::Enumeration * classNames;
-  ::java::util::Vector * providers;
-  ::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service$Loader * loader;
-  static const jint START = 0;
-  static const jint IN_NAME = 1;
-  static const jint IN_COMMENT = 2;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_relaxng_datatype_helpers_DatatypeLibraryLoader$Service__
diff --git a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader.h b/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader.h
deleted file mode 100644
index f45e713b3e4..00000000000
--- a/libjava/org/relaxng/datatype/helpers/DatatypeLibraryLoader.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_helpers_DatatypeLibraryLoader__
-#define __org_relaxng_datatype_helpers_DatatypeLibraryLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class DatatypeLibrary;
-        namespace helpers
-        {
-            class DatatypeLibraryLoader;
-            class DatatypeLibraryLoader$Service;
-        }
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::helpers::DatatypeLibraryLoader : public ::java::lang::Object
-{
-
-public:
-  DatatypeLibraryLoader();
-  virtual ::org::relaxng::datatype::DatatypeLibrary * createDatatypeLibrary(::java::lang::String *);
-private:
-  ::org::relaxng::datatype::helpers::DatatypeLibraryLoader$Service * __attribute__((aligned(__alignof__( ::java::lang::Object)))) service;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_relaxng_datatype_helpers_DatatypeLibraryLoader__
diff --git a/libjava/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.h b/libjava/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.h
deleted file mode 100644
index 38c56716260..00000000000
--- a/libjava/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_helpers_ParameterlessDatatypeBuilder__
-#define __org_relaxng_datatype_helpers_ParameterlessDatatypeBuilder__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class Datatype;
-          class ValidationContext;
-        namespace helpers
-        {
-            class ParameterlessDatatypeBuilder;
-        }
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::helpers::ParameterlessDatatypeBuilder : public ::java::lang::Object
-{
-
-public:
-  ParameterlessDatatypeBuilder(::org::relaxng::datatype::Datatype *);
-  void addParameter(::java::lang::String *, ::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
-  ::org::relaxng::datatype::Datatype * createDatatype();
-private:
-  ::org::relaxng::datatype::Datatype * __attribute__((aligned(__alignof__( ::java::lang::Object)))) baseType;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_relaxng_datatype_helpers_ParameterlessDatatypeBuilder__
diff --git a/libjava/org/relaxng/datatype/helpers/StreamingValidatorImpl.h b/libjava/org/relaxng/datatype/helpers/StreamingValidatorImpl.h
deleted file mode 100644
index 77ae7639cc3..00000000000
--- a/libjava/org/relaxng/datatype/helpers/StreamingValidatorImpl.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_relaxng_datatype_helpers_StreamingValidatorImpl__
-#define __org_relaxng_datatype_helpers_StreamingValidatorImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace relaxng
-    {
-      namespace datatype
-      {
-          class Datatype;
-          class ValidationContext;
-        namespace helpers
-        {
-            class StreamingValidatorImpl;
-        }
-      }
-    }
-  }
-}
-
-class org::relaxng::datatype::helpers::StreamingValidatorImpl : public ::java::lang::Object
-{
-
-public:
-  void addCharacters(JArray< jchar > *, jint, jint);
-  jboolean isValid();
-  void checkValid();
-  StreamingValidatorImpl(::org::relaxng::datatype::Datatype *, ::org::relaxng::datatype::ValidationContext *);
-private:
-  ::java::lang::StringBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer;
-  ::org::relaxng::datatype::Datatype * baseType;
-  ::org::relaxng::datatype::ValidationContext * context;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_relaxng_datatype_helpers_StreamingValidatorImpl__
diff --git a/libjava/org/w3c/dom/Attr.h b/libjava/org/w3c/dom/Attr.h
deleted file mode 100644
index 5dfe4639c11..00000000000
--- a/libjava/org/w3c/dom/Attr.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_Attr__
-#define __org_w3c_dom_Attr__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class Element;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::Attr : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual jboolean getSpecified() = 0;
-  virtual ::java::lang::String * getValue() = 0;
-  virtual void setValue(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Element * getOwnerElement() = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual jboolean isId() = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_Attr__
diff --git a/libjava/org/w3c/dom/CDATASection.h b/libjava/org/w3c/dom/CDATASection.h
deleted file mode 100644
index 47d07e44097..00000000000
--- a/libjava/org/w3c/dom/CDATASection.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_CDATASection__
-#define __org_w3c_dom_CDATASection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class CDATASection;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class Text;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::CDATASection : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Text * splitText(jint) = 0;
-  virtual jboolean isElementContentWhitespace() = 0;
-  virtual ::java::lang::String * getWholeText() = 0;
-  virtual ::org::w3c::dom::Text * replaceWholeText(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getData() = 0;
-  virtual void setData(::java::lang::String *) = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::String * substringData(jint, jint) = 0;
-  virtual void appendData(::java::lang::String *) = 0;
-  virtual void insertData(jint, ::java::lang::String *) = 0;
-  virtual void deleteData(jint, jint) = 0;
-  virtual void replaceData(jint, jint, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_CDATASection__
diff --git a/libjava/org/w3c/dom/CharacterData.h b/libjava/org/w3c/dom/CharacterData.h
deleted file mode 100644
index 3aca583a4f5..00000000000
--- a/libjava/org/w3c/dom/CharacterData.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_CharacterData__
-#define __org_w3c_dom_CharacterData__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class CharacterData;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::CharacterData : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getData() = 0;
-  virtual void setData(::java::lang::String *) = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::String * substringData(jint, jint) = 0;
-  virtual void appendData(::java::lang::String *) = 0;
-  virtual void insertData(jint, ::java::lang::String *) = 0;
-  virtual void deleteData(jint, jint) = 0;
-  virtual void replaceData(jint, jint, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_CharacterData__
diff --git a/libjava/org/w3c/dom/Comment.h b/libjava/org/w3c/dom/Comment.h
deleted file mode 100644
index 91014528b46..00000000000
--- a/libjava/org/w3c/dom/Comment.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_Comment__
-#define __org_w3c_dom_Comment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Comment;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::Comment : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getData() = 0;
-  virtual void setData(::java::lang::String *) = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::String * substringData(jint, jint) = 0;
-  virtual void appendData(::java::lang::String *) = 0;
-  virtual void insertData(jint, ::java::lang::String *) = 0;
-  virtual void deleteData(jint, jint) = 0;
-  virtual void replaceData(jint, jint, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_Comment__
diff --git a/libjava/org/w3c/dom/DOMConfiguration.h b/libjava/org/w3c/dom/DOMConfiguration.h
deleted file mode 100644
index 7b32b17f335..00000000000
--- a/libjava/org/w3c/dom/DOMConfiguration.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DOMConfiguration__
-#define __org_w3c_dom_DOMConfiguration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMConfiguration;
-          class DOMStringList;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DOMConfiguration : public ::java::lang::Object
-{
-
-public:
-  virtual void setParameter(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::java::lang::Object * getParameter(::java::lang::String *) = 0;
-  virtual jboolean canSetParameter(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual ::org::w3c::dom::DOMStringList * getParameterNames() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_DOMConfiguration__
diff --git a/libjava/org/w3c/dom/DOMError.h b/libjava/org/w3c/dom/DOMError.h
deleted file mode 100644
index 90ce8ad99f9..00000000000
--- a/libjava/org/w3c/dom/DOMError.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DOMError__
-#define __org_w3c_dom_DOMError__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMError;
-          class DOMLocator;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DOMError : public ::java::lang::Object
-{
-
-public:
-  virtual jshort getSeverity() = 0;
-  virtual ::java::lang::String * getMessage() = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual ::java::lang::Object * getRelatedException() = 0;
-  virtual ::java::lang::Object * getRelatedData() = 0;
-  virtual ::org::w3c::dom::DOMLocator * getLocation() = 0;
-  static const jshort SEVERITY_WARNING = 1;
-  static const jshort SEVERITY_ERROR = 2;
-  static const jshort SEVERITY_FATAL_ERROR = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_DOMError__
diff --git a/libjava/org/w3c/dom/DOMErrorHandler.h b/libjava/org/w3c/dom/DOMErrorHandler.h
deleted file mode 100644
index c0f875ebe31..00000000000
--- a/libjava/org/w3c/dom/DOMErrorHandler.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DOMErrorHandler__
-#define __org_w3c_dom_DOMErrorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMError;
-          class DOMErrorHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DOMErrorHandler : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean handleError(::org::w3c::dom::DOMError *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_DOMErrorHandler__
diff --git a/libjava/org/w3c/dom/DOMException.h b/libjava/org/w3c/dom/DOMException.h
deleted file mode 100644
index 52fd15cc241..00000000000
--- a/libjava/org/w3c/dom/DOMException.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DOMException__
-#define __org_w3c_dom_DOMException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMException;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DOMException : public ::java::lang::RuntimeException
-{
-
-public:
-  DOMException(jshort, ::java::lang::String *);
-  jshort __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) code;
-  static const jshort INDEX_SIZE_ERR = 1;
-  static const jshort DOMSTRING_SIZE_ERR = 2;
-  static const jshort HIERARCHY_REQUEST_ERR = 3;
-  static const jshort WRONG_DOCUMENT_ERR = 4;
-  static const jshort INVALID_CHARACTER_ERR = 5;
-  static const jshort NO_DATA_ALLOWED_ERR = 6;
-  static const jshort NO_MODIFICATION_ALLOWED_ERR = 7;
-  static const jshort NOT_FOUND_ERR = 8;
-  static const jshort NOT_SUPPORTED_ERR = 9;
-  static const jshort INUSE_ATTRIBUTE_ERR = 10;
-  static const jshort INVALID_STATE_ERR = 11;
-  static const jshort SYNTAX_ERR = 12;
-  static const jshort INVALID_MODIFICATION_ERR = 13;
-  static const jshort NAMESPACE_ERR = 14;
-  static const jshort INVALID_ACCESS_ERR = 15;
-  static const jshort VALIDATION_ERR = 16;
-  static const jshort TYPE_MISMATCH_ERR = 17;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_w3c_dom_DOMException__
diff --git a/libjava/org/w3c/dom/DOMImplementation.h b/libjava/org/w3c/dom/DOMImplementation.h
deleted file mode 100644
index 2d191a608a2..00000000000
--- a/libjava/org/w3c/dom/DOMImplementation.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DOMImplementation__
-#define __org_w3c_dom_DOMImplementation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class Document;
-          class DocumentType;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DOMImplementation : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean hasFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::DocumentType * createDocumentType(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Document * createDocument(::java::lang::String *, ::java::lang::String *, ::org::w3c::dom::DocumentType *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_DOMImplementation__
diff --git a/libjava/org/w3c/dom/DOMImplementationList.h b/libjava/org/w3c/dom/DOMImplementationList.h
deleted file mode 100644
index a787742ae01..00000000000
--- a/libjava/org/w3c/dom/DOMImplementationList.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DOMImplementationList__
-#define __org_w3c_dom_DOMImplementationList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class DOMImplementationList;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DOMImplementationList : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::DOMImplementation * item(jint) = 0;
-  virtual jint getLength() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_DOMImplementationList__
diff --git a/libjava/org/w3c/dom/DOMImplementationSource.h b/libjava/org/w3c/dom/DOMImplementationSource.h
deleted file mode 100644
index 3431e280497..00000000000
--- a/libjava/org/w3c/dom/DOMImplementationSource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DOMImplementationSource__
-#define __org_w3c_dom_DOMImplementationSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class DOMImplementationList;
-          class DOMImplementationSource;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DOMImplementationSource : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::DOMImplementation * getDOMImplementation(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::DOMImplementationList * getDOMImplementationList(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_DOMImplementationSource__
diff --git a/libjava/org/w3c/dom/DOMLocator.h b/libjava/org/w3c/dom/DOMLocator.h
deleted file mode 100644
index 16733f7fef1..00000000000
--- a/libjava/org/w3c/dom/DOMLocator.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DOMLocator__
-#define __org_w3c_dom_DOMLocator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMLocator;
-          class Node;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DOMLocator : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLineNumber() = 0;
-  virtual jint getColumnNumber() = 0;
-  virtual jint getByteOffset() = 0;
-  virtual jint getUtf16Offset() = 0;
-  virtual ::org::w3c::dom::Node * getRelatedNode() = 0;
-  virtual ::java::lang::String * getUri() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_DOMLocator__
diff --git a/libjava/org/w3c/dom/DOMStringList.h b/libjava/org/w3c/dom/DOMStringList.h
deleted file mode 100644
index 3cbe1825603..00000000000
--- a/libjava/org/w3c/dom/DOMStringList.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DOMStringList__
-#define __org_w3c_dom_DOMStringList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMStringList;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DOMStringList : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * item(jint) = 0;
-  virtual jint getLength() = 0;
-  virtual jboolean contains(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_DOMStringList__
diff --git a/libjava/org/w3c/dom/Document.h b/libjava/org/w3c/dom/Document.h
deleted file mode 100644
index 9101ff154d1..00000000000
--- a/libjava/org/w3c/dom/Document.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_Document__
-#define __org_w3c_dom_Document__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class CDATASection;
-          class Comment;
-          class DOMConfiguration;
-          class DOMImplementation;
-          class Document;
-          class DocumentFragment;
-          class DocumentType;
-          class Element;
-          class EntityReference;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class ProcessingInstruction;
-          class Text;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::Document : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::DocumentType * getDoctype() = 0;
-  virtual ::org::w3c::dom::DOMImplementation * getImplementation() = 0;
-  virtual ::org::w3c::dom::Element * getDocumentElement() = 0;
-  virtual ::org::w3c::dom::Element * createElement(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::DocumentFragment * createDocumentFragment() = 0;
-  virtual ::org::w3c::dom::Text * createTextNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Comment * createComment(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::CDATASection * createCDATASection(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::ProcessingInstruction * createProcessingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * createAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::EntityReference * createEntityReference(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Node * importNode(::org::w3c::dom::Node *, jboolean) = 0;
-  virtual ::org::w3c::dom::Element * createElementNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * createAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Element * getElementById(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getInputEncoding() = 0;
-  virtual ::java::lang::String * getXmlEncoding() = 0;
-  virtual jboolean getXmlStandalone() = 0;
-  virtual void setXmlStandalone(jboolean) = 0;
-  virtual ::java::lang::String * getXmlVersion() = 0;
-  virtual void setXmlVersion(::java::lang::String *) = 0;
-  virtual jboolean getStrictErrorChecking() = 0;
-  virtual void setStrictErrorChecking(jboolean) = 0;
-  virtual ::java::lang::String * getDocumentURI() = 0;
-  virtual void setDocumentURI(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Node * adoptNode(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::DOMConfiguration * getDomConfig() = 0;
-  virtual void normalizeDocument() = 0;
-  virtual ::org::w3c::dom::Node * renameNode(::org::w3c::dom::Node *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_Document__
diff --git a/libjava/org/w3c/dom/DocumentFragment.h b/libjava/org/w3c/dom/DocumentFragment.h
deleted file mode 100644
index 02abdfd97ed..00000000000
--- a/libjava/org/w3c/dom/DocumentFragment.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DocumentFragment__
-#define __org_w3c_dom_DocumentFragment__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class DocumentFragment;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DocumentFragment : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_DocumentFragment__
diff --git a/libjava/org/w3c/dom/DocumentType.h b/libjava/org/w3c/dom/DocumentType.h
deleted file mode 100644
index dc35fe84869..00000000000
--- a/libjava/org/w3c/dom/DocumentType.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_DocumentType__
-#define __org_w3c_dom_DocumentType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class DocumentType;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::DocumentType : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getEntities() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getNotations() = 0;
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual ::java::lang::String * getInternalSubset() = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_DocumentType__
diff --git a/libjava/org/w3c/dom/Element.h b/libjava/org/w3c/dom/Element.h
deleted file mode 100644
index cc61cd02e15..00000000000
--- a/libjava/org/w3c/dom/Element.h
+++ /dev/null
@@ -1,95 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_Element__
-#define __org_w3c_dom_Element__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class Element;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::Element : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_Element__
diff --git a/libjava/org/w3c/dom/Entity.h b/libjava/org/w3c/dom/Entity.h
deleted file mode 100644
index f625e5b0cc3..00000000000
--- a/libjava/org/w3c/dom/Entity.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_Entity__
-#define __org_w3c_dom_Entity__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class Entity;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::Entity : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual ::java::lang::String * getNotationName() = 0;
-  virtual ::java::lang::String * getInputEncoding() = 0;
-  virtual ::java::lang::String * getXmlEncoding() = 0;
-  virtual ::java::lang::String * getXmlVersion() = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_Entity__
diff --git a/libjava/org/w3c/dom/EntityReference.h b/libjava/org/w3c/dom/EntityReference.h
deleted file mode 100644
index d60cda8de42..00000000000
--- a/libjava/org/w3c/dom/EntityReference.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_EntityReference__
-#define __org_w3c_dom_EntityReference__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class EntityReference;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::EntityReference : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_EntityReference__
diff --git a/libjava/org/w3c/dom/NameList.h b/libjava/org/w3c/dom/NameList.h
deleted file mode 100644
index 7bbaac2ad0a..00000000000
--- a/libjava/org/w3c/dom/NameList.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_NameList__
-#define __org_w3c_dom_NameList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class NameList;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::NameList : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName(jint) = 0;
-  virtual ::java::lang::String * getNamespaceURI(jint) = 0;
-  virtual jint getLength() = 0;
-  virtual jboolean contains(::java::lang::String *) = 0;
-  virtual jboolean containsNS(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_NameList__
diff --git a/libjava/org/w3c/dom/NamedNodeMap.h b/libjava/org/w3c/dom/NamedNodeMap.h
deleted file mode 100644
index 40ed8ad7b45..00000000000
--- a/libjava/org/w3c/dom/NamedNodeMap.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_NamedNodeMap__
-#define __org_w3c_dom_NamedNodeMap__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class NamedNodeMap;
-          class Node;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::NamedNodeMap : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Node * getNamedItem(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Node * setNamedItem(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeNamedItem(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Node * item(jint) = 0;
-  virtual jint getLength() = 0;
-  virtual ::org::w3c::dom::Node * getNamedItemNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Node * setNamedItemNS(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeNamedItemNS(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_NamedNodeMap__
diff --git a/libjava/org/w3c/dom/Node.h b/libjava/org/w3c/dom/Node.h
deleted file mode 100644
index 350638eb522..00000000000
--- a/libjava/org/w3c/dom/Node.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_Node__
-#define __org_w3c_dom_Node__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::Node : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static const jshort ELEMENT_NODE = 1;
-  static const jshort ATTRIBUTE_NODE = 2;
-  static const jshort TEXT_NODE = 3;
-  static const jshort CDATA_SECTION_NODE = 4;
-  static const jshort ENTITY_REFERENCE_NODE = 5;
-  static const jshort ENTITY_NODE = 6;
-  static const jshort PROCESSING_INSTRUCTION_NODE = 7;
-  static const jshort COMMENT_NODE = 8;
-  static const jshort DOCUMENT_NODE = 9;
-  static const jshort DOCUMENT_TYPE_NODE = 10;
-  static const jshort DOCUMENT_FRAGMENT_NODE = 11;
-  static const jshort NOTATION_NODE = 12;
-  static const jshort DOCUMENT_POSITION_DISCONNECTED = 1;
-  static const jshort DOCUMENT_POSITION_PRECEDING = 2;
-  static const jshort DOCUMENT_POSITION_FOLLOWING = 4;
-  static const jshort DOCUMENT_POSITION_CONTAINS = 8;
-  static const jshort DOCUMENT_POSITION_CONTAINED_BY = 16;
-  static const jshort DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_Node__
diff --git a/libjava/org/w3c/dom/NodeList.h b/libjava/org/w3c/dom/NodeList.h
deleted file mode 100644
index da0a2214f61..00000000000
--- a/libjava/org/w3c/dom/NodeList.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_NodeList__
-#define __org_w3c_dom_NodeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-          class NodeList;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::NodeList : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Node * item(jint) = 0;
-  virtual jint getLength() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_NodeList__
diff --git a/libjava/org/w3c/dom/Notation.h b/libjava/org/w3c/dom/Notation.h
deleted file mode 100644
index 76ac4b4ed1a..00000000000
--- a/libjava/org/w3c/dom/Notation.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_Notation__
-#define __org_w3c_dom_Notation__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class Notation;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::Notation : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_Notation__
diff --git a/libjava/org/w3c/dom/ProcessingInstruction.h b/libjava/org/w3c/dom/ProcessingInstruction.h
deleted file mode 100644
index 9f6054af8ad..00000000000
--- a/libjava/org/w3c/dom/ProcessingInstruction.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ProcessingInstruction__
-#define __org_w3c_dom_ProcessingInstruction__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class ProcessingInstruction;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ProcessingInstruction : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getTarget() = 0;
-  virtual ::java::lang::String * getData() = 0;
-  virtual void setData(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ProcessingInstruction__
diff --git a/libjava/org/w3c/dom/Text.h b/libjava/org/w3c/dom/Text.h
deleted file mode 100644
index b04adfc278a..00000000000
--- a/libjava/org/w3c/dom/Text.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_Text__
-#define __org_w3c_dom_Text__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class Text;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::Text : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Text * splitText(jint) = 0;
-  virtual jboolean isElementContentWhitespace() = 0;
-  virtual ::java::lang::String * getWholeText() = 0;
-  virtual ::org::w3c::dom::Text * replaceWholeText(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getData() = 0;
-  virtual void setData(::java::lang::String *) = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::String * substringData(jint, jint) = 0;
-  virtual void appendData(::java::lang::String *) = 0;
-  virtual void insertData(jint, ::java::lang::String *) = 0;
-  virtual void deleteData(jint, jint) = 0;
-  virtual void replaceData(jint, jint, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_Text__
diff --git a/libjava/org/w3c/dom/TypeInfo.h b/libjava/org/w3c/dom/TypeInfo.h
deleted file mode 100644
index 136572ebaa8..00000000000
--- a/libjava/org/w3c/dom/TypeInfo.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_TypeInfo__
-#define __org_w3c_dom_TypeInfo__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class TypeInfo;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::TypeInfo : public ::java::lang::Object
-{
-
-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 const jint DERIVATION_RESTRICTION = 1;
-  static const jint DERIVATION_EXTENSION = 2;
-  static const jint DERIVATION_UNION = 4;
-  static const jint DERIVATION_LIST = 8;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_TypeInfo__
diff --git a/libjava/org/w3c/dom/UserDataHandler.h b/libjava/org/w3c/dom/UserDataHandler.h
deleted file mode 100644
index a47eac3c25d..00000000000
--- a/libjava/org/w3c/dom/UserDataHandler.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_UserDataHandler__
-#define __org_w3c_dom_UserDataHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-          class UserDataHandler;
-      }
-    }
-  }
-}
-
-class org::w3c::dom::UserDataHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void handle(jshort, ::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  static const jshort NODE_CLONED = 1;
-  static const jshort NODE_IMPORTED = 2;
-  static const jshort NODE_DELETED = 3;
-  static const jshort NODE_RENAMED = 4;
-  static const jshort NODE_ADOPTED = 5;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_UserDataHandler__
diff --git a/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$1.h b/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$1.h
deleted file mode 100644
index af85bdee28f..00000000000
--- a/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_bootstrap_DOMImplementationRegistry$1__
-#define __org_w3c_dom_bootstrap_DOMImplementationRegistry$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-        namespace bootstrap
-        {
-            class DOMImplementationRegistry;
-            class DOMImplementationRegistry$1;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::bootstrap::DOMImplementationRegistry$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DOMImplementationRegistry$1(::org::w3c::dom::bootstrap::DOMImplementationRegistry *, ::java::util::Vector *);
-public:
-  ::org::w3c::dom::DOMImplementation * item(jint);
-  jint getLength();
-public: // actually package-private
-  ::org::w3c::dom::bootstrap::DOMImplementationRegistry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-private:
-  ::java::util::Vector * val$implementations;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_w3c_dom_bootstrap_DOMImplementationRegistry$1__
diff --git a/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$2.h b/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$2.h
deleted file mode 100644
index 6d773f7f953..00000000000
--- a/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_bootstrap_DOMImplementationRegistry$2__
-#define __org_w3c_dom_bootstrap_DOMImplementationRegistry$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace bootstrap
-        {
-            class DOMImplementationRegistry$2;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::bootstrap::DOMImplementationRegistry$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DOMImplementationRegistry$2();
-public:
-  ::java::lang::Object * run();
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_w3c_dom_bootstrap_DOMImplementationRegistry$2__
diff --git a/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$3.h b/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$3.h
deleted file mode 100644
index a54005f5cea..00000000000
--- a/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$3.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_bootstrap_DOMImplementationRegistry$3__
-#define __org_w3c_dom_bootstrap_DOMImplementationRegistry$3__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace bootstrap
-        {
-            class DOMImplementationRegistry$3;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::bootstrap::DOMImplementationRegistry$3 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DOMImplementationRegistry$3(::java::lang::String *);
-public:
-  ::java::lang::Object * run();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_w3c_dom_bootstrap_DOMImplementationRegistry$3__
diff --git a/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$4.h b/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$4.h
deleted file mode 100644
index dbb86b0d3fb..00000000000
--- a/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry$4.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_bootstrap_DOMImplementationRegistry$4__
-#define __org_w3c_dom_bootstrap_DOMImplementationRegistry$4__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace bootstrap
-        {
-            class DOMImplementationRegistry$4;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::bootstrap::DOMImplementationRegistry$4 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  DOMImplementationRegistry$4(::java::lang::ClassLoader *, ::java::lang::String *);
-public:
-  ::java::lang::Object * run();
-private:
-  ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$classLoader;
-  ::java::lang::String * val$name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_w3c_dom_bootstrap_DOMImplementationRegistry$4__
diff --git a/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry.h b/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry.h
deleted file mode 100644
index 7f284503d9b..00000000000
--- a/libjava/org/w3c/dom/bootstrap/DOMImplementationRegistry.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_bootstrap_DOMImplementationRegistry__
-#define __org_w3c_dom_bootstrap_DOMImplementationRegistry__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMImplementation;
-          class DOMImplementationList;
-          class DOMImplementationSource;
-        namespace bootstrap
-        {
-            class DOMImplementationRegistry;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::bootstrap::DOMImplementationRegistry : public ::java::lang::Object
-{
-
-  DOMImplementationRegistry(::java::util::Vector *);
-public:
-  static ::org::w3c::dom::bootstrap::DOMImplementationRegistry * newInstance();
-  ::org::w3c::dom::DOMImplementation * getDOMImplementation(::java::lang::String *);
-  ::org::w3c::dom::DOMImplementationList * getDOMImplementationList(::java::lang::String *);
-  void addSource(::org::w3c::dom::DOMImplementationSource *);
-private:
-  static ::java::lang::ClassLoader * getClassLoader();
-  static ::java::lang::String * getServiceValue(::java::lang::ClassLoader *);
-  static jboolean isJRE11();
-  static ::java::lang::ClassLoader * getContextClassLoader();
-  static ::java::lang::String * getSystemProperty(::java::lang::String *);
-  static ::java::io::InputStream * getResourceAsStream(::java::lang::ClassLoader *, ::java::lang::String *);
-public:
-  static ::java::lang::String * PROPERTY;
-private:
-  static const jint DEFAULT_LINE_LENGTH = 80;
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sources;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_w3c_dom_bootstrap_DOMImplementationRegistry__
diff --git a/libjava/org/w3c/dom/css/CSS2Properties.h b/libjava/org/w3c/dom/css/CSS2Properties.h
deleted file mode 100644
index fd8ea04df52..00000000000
--- a/libjava/org/w3c/dom/css/CSS2Properties.h
+++ /dev/null
@@ -1,278 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSS2Properties__
-#define __org_w3c_dom_css_CSS2Properties__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSS2Properties;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSS2Properties : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAzimuth() = 0;
-  virtual void setAzimuth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBackground() = 0;
-  virtual void setBackground(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBackgroundAttachment() = 0;
-  virtual void setBackgroundAttachment(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBackgroundColor() = 0;
-  virtual void setBackgroundColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBackgroundImage() = 0;
-  virtual void setBackgroundImage(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBackgroundPosition() = 0;
-  virtual void setBackgroundPosition(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBackgroundRepeat() = 0;
-  virtual void setBackgroundRepeat(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorder() = 0;
-  virtual void setBorder(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderCollapse() = 0;
-  virtual void setBorderCollapse(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderColor() = 0;
-  virtual void setBorderColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderSpacing() = 0;
-  virtual void setBorderSpacing(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderStyle() = 0;
-  virtual void setBorderStyle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderTop() = 0;
-  virtual void setBorderTop(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderRight() = 0;
-  virtual void setBorderRight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderBottom() = 0;
-  virtual void setBorderBottom(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderLeft() = 0;
-  virtual void setBorderLeft(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderTopColor() = 0;
-  virtual void setBorderTopColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderRightColor() = 0;
-  virtual void setBorderRightColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderBottomColor() = 0;
-  virtual void setBorderBottomColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderLeftColor() = 0;
-  virtual void setBorderLeftColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderTopStyle() = 0;
-  virtual void setBorderTopStyle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderRightStyle() = 0;
-  virtual void setBorderRightStyle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderBottomStyle() = 0;
-  virtual void setBorderBottomStyle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderLeftStyle() = 0;
-  virtual void setBorderLeftStyle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderTopWidth() = 0;
-  virtual void setBorderTopWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderRightWidth() = 0;
-  virtual void setBorderRightWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderBottomWidth() = 0;
-  virtual void setBorderBottomWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderLeftWidth() = 0;
-  virtual void setBorderLeftWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorderWidth() = 0;
-  virtual void setBorderWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBottom() = 0;
-  virtual void setBottom(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCaptionSide() = 0;
-  virtual void setCaptionSide(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClear() = 0;
-  virtual void setClear(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClip() = 0;
-  virtual void setClip(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getColor() = 0;
-  virtual void setColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getContent() = 0;
-  virtual void setContent(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCounterIncrement() = 0;
-  virtual void setCounterIncrement(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCounterReset() = 0;
-  virtual void setCounterReset(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCue() = 0;
-  virtual void setCue(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCueAfter() = 0;
-  virtual void setCueAfter(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCueBefore() = 0;
-  virtual void setCueBefore(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCursor() = 0;
-  virtual void setCursor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDirection() = 0;
-  virtual void setDirection(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDisplay() = 0;
-  virtual void setDisplay(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getElevation() = 0;
-  virtual void setElevation(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getEmptyCells() = 0;
-  virtual void setEmptyCells(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCssFloat() = 0;
-  virtual void setCssFloat(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFont() = 0;
-  virtual void setFont(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFontFamily() = 0;
-  virtual void setFontFamily(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFontSize() = 0;
-  virtual void setFontSize(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFontSizeAdjust() = 0;
-  virtual void setFontSizeAdjust(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFontStretch() = 0;
-  virtual void setFontStretch(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFontStyle() = 0;
-  virtual void setFontStyle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFontVariant() = 0;
-  virtual void setFontVariant(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFontWeight() = 0;
-  virtual void setFontWeight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHeight() = 0;
-  virtual void setHeight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLeft() = 0;
-  virtual void setLeft(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLetterSpacing() = 0;
-  virtual void setLetterSpacing(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLineHeight() = 0;
-  virtual void setLineHeight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getListStyle() = 0;
-  virtual void setListStyle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getListStyleImage() = 0;
-  virtual void setListStyleImage(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getListStylePosition() = 0;
-  virtual void setListStylePosition(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getListStyleType() = 0;
-  virtual void setListStyleType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMargin() = 0;
-  virtual void setMargin(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMarginTop() = 0;
-  virtual void setMarginTop(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMarginRight() = 0;
-  virtual void setMarginRight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMarginBottom() = 0;
-  virtual void setMarginBottom(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMarginLeft() = 0;
-  virtual void setMarginLeft(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMarkerOffset() = 0;
-  virtual void setMarkerOffset(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMarks() = 0;
-  virtual void setMarks(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMaxHeight() = 0;
-  virtual void setMaxHeight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMaxWidth() = 0;
-  virtual void setMaxWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMinHeight() = 0;
-  virtual void setMinHeight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMinWidth() = 0;
-  virtual void setMinWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getOrphans() = 0;
-  virtual void setOrphans(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getOutline() = 0;
-  virtual void setOutline(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getOutlineColor() = 0;
-  virtual void setOutlineColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getOutlineStyle() = 0;
-  virtual void setOutlineStyle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getOutlineWidth() = 0;
-  virtual void setOutlineWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getOverflow() = 0;
-  virtual void setOverflow(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPadding() = 0;
-  virtual void setPadding(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPaddingTop() = 0;
-  virtual void setPaddingTop(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPaddingRight() = 0;
-  virtual void setPaddingRight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPaddingBottom() = 0;
-  virtual void setPaddingBottom(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPaddingLeft() = 0;
-  virtual void setPaddingLeft(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPage() = 0;
-  virtual void setPage(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPageBreakAfter() = 0;
-  virtual void setPageBreakAfter(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPageBreakBefore() = 0;
-  virtual void setPageBreakBefore(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPageBreakInside() = 0;
-  virtual void setPageBreakInside(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPause() = 0;
-  virtual void setPause(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPauseAfter() = 0;
-  virtual void setPauseAfter(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPauseBefore() = 0;
-  virtual void setPauseBefore(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPitch() = 0;
-  virtual void setPitch(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPitchRange() = 0;
-  virtual void setPitchRange(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPlayDuring() = 0;
-  virtual void setPlayDuring(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPosition() = 0;
-  virtual void setPosition(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getQuotes() = 0;
-  virtual void setQuotes(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getRichness() = 0;
-  virtual void setRichness(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getRight() = 0;
-  virtual void setRight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSize() = 0;
-  virtual void setSize(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSpeak() = 0;
-  virtual void setSpeak(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSpeakHeader() = 0;
-  virtual void setSpeakHeader(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSpeakNumeral() = 0;
-  virtual void setSpeakNumeral(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSpeakPunctuation() = 0;
-  virtual void setSpeakPunctuation(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSpeechRate() = 0;
-  virtual void setSpeechRate(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getStress() = 0;
-  virtual void setStress(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTableLayout() = 0;
-  virtual void setTableLayout(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTextAlign() = 0;
-  virtual void setTextAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTextDecoration() = 0;
-  virtual void setTextDecoration(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTextIndent() = 0;
-  virtual void setTextIndent(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTextShadow() = 0;
-  virtual void setTextShadow(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTextTransform() = 0;
-  virtual void setTextTransform(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTop() = 0;
-  virtual void setTop(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getUnicodeBidi() = 0;
-  virtual void setUnicodeBidi(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getVerticalAlign() = 0;
-  virtual void setVerticalAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getVisibility() = 0;
-  virtual void setVisibility(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getVoiceFamily() = 0;
-  virtual void setVoiceFamily(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getVolume() = 0;
-  virtual void setVolume(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getWhiteSpace() = 0;
-  virtual void setWhiteSpace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getWidows() = 0;
-  virtual void setWidows(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getWidth() = 0;
-  virtual void setWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getWordSpacing() = 0;
-  virtual void setWordSpacing(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getZIndex() = 0;
-  virtual void setZIndex(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSS2Properties__
diff --git a/libjava/org/w3c/dom/css/CSSCharsetRule.h b/libjava/org/w3c/dom/css/CSSCharsetRule.h
deleted file mode 100644
index 51c78a1ab45..00000000000
--- a/libjava/org/w3c/dom/css/CSSCharsetRule.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSCharsetRule__
-#define __org_w3c_dom_css_CSSCharsetRule__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSCharsetRule;
-            class CSSRule;
-            class CSSStyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSCharsetRule : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getEncoding() = 0;
-  virtual void setEncoding(::java::lang::String *) = 0;
-  virtual jshort getType() = 0;
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSStyleSheet * getParentStyleSheet() = 0;
-  virtual ::org::w3c::dom::css::CSSRule * getParentRule() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSCharsetRule__
diff --git a/libjava/org/w3c/dom/css/CSSFontFaceRule.h b/libjava/org/w3c/dom/css/CSSFontFaceRule.h
deleted file mode 100644
index 415f6945371..00000000000
--- a/libjava/org/w3c/dom/css/CSSFontFaceRule.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSFontFaceRule__
-#define __org_w3c_dom_css_CSSFontFaceRule__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSFontFaceRule;
-            class CSSRule;
-            class CSSStyleDeclaration;
-            class CSSStyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSFontFaceRule : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::css::CSSStyleDeclaration * getStyle() = 0;
-  virtual jshort getType() = 0;
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSStyleSheet * getParentStyleSheet() = 0;
-  virtual ::org::w3c::dom::css::CSSRule * getParentRule() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSFontFaceRule__
diff --git a/libjava/org/w3c/dom/css/CSSImportRule.h b/libjava/org/w3c/dom/css/CSSImportRule.h
deleted file mode 100644
index 7313ef2b058..00000000000
--- a/libjava/org/w3c/dom/css/CSSImportRule.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSImportRule__
-#define __org_w3c_dom_css_CSSImportRule__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSImportRule;
-            class CSSRule;
-            class CSSStyleSheet;
-        }
-        namespace stylesheets
-        {
-            class MediaList;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSImportRule : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getHref() = 0;
-  virtual ::org::w3c::dom::stylesheets::MediaList * getMedia() = 0;
-  virtual ::org::w3c::dom::css::CSSStyleSheet * getStyleSheet() = 0;
-  virtual jshort getType() = 0;
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSStyleSheet * getParentStyleSheet() = 0;
-  virtual ::org::w3c::dom::css::CSSRule * getParentRule() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSImportRule__
diff --git a/libjava/org/w3c/dom/css/CSSMediaRule.h b/libjava/org/w3c/dom/css/CSSMediaRule.h
deleted file mode 100644
index 62d12a8c7bd..00000000000
--- a/libjava/org/w3c/dom/css/CSSMediaRule.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSMediaRule__
-#define __org_w3c_dom_css_CSSMediaRule__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSMediaRule;
-            class CSSRule;
-            class CSSRuleList;
-            class CSSStyleSheet;
-        }
-        namespace stylesheets
-        {
-            class MediaList;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSMediaRule : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::stylesheets::MediaList * getMedia() = 0;
-  virtual ::org::w3c::dom::css::CSSRuleList * getCssRules() = 0;
-  virtual jint insertRule(::java::lang::String *, jint) = 0;
-  virtual void deleteRule(jint) = 0;
-  virtual jshort getType() = 0;
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSStyleSheet * getParentStyleSheet() = 0;
-  virtual ::org::w3c::dom::css::CSSRule * getParentRule() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSMediaRule__
diff --git a/libjava/org/w3c/dom/css/CSSPageRule.h b/libjava/org/w3c/dom/css/CSSPageRule.h
deleted file mode 100644
index 77b7167a54e..00000000000
--- a/libjava/org/w3c/dom/css/CSSPageRule.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSPageRule__
-#define __org_w3c_dom_css_CSSPageRule__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSPageRule;
-            class CSSRule;
-            class CSSStyleDeclaration;
-            class CSSStyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSPageRule : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getSelectorText() = 0;
-  virtual void setSelectorText(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSStyleDeclaration * getStyle() = 0;
-  virtual jshort getType() = 0;
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSStyleSheet * getParentStyleSheet() = 0;
-  virtual ::org::w3c::dom::css::CSSRule * getParentRule() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSPageRule__
diff --git a/libjava/org/w3c/dom/css/CSSPrimitiveValue.h b/libjava/org/w3c/dom/css/CSSPrimitiveValue.h
deleted file mode 100644
index ea502e30af9..00000000000
--- a/libjava/org/w3c/dom/css/CSSPrimitiveValue.h
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSPrimitiveValue__
-#define __org_w3c_dom_css_CSSPrimitiveValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSPrimitiveValue;
-            class Counter;
-            class RGBColor;
-            class Rect;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSPrimitiveValue : public ::java::lang::Object
-{
-
-public:
-  virtual jshort getPrimitiveType() = 0;
-  virtual void setFloatValue(jshort, jfloat) = 0;
-  virtual jfloat getFloatValue(jshort) = 0;
-  virtual void setStringValue(jshort, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getStringValue() = 0;
-  virtual ::org::w3c::dom::css::Counter * getCounterValue() = 0;
-  virtual ::org::w3c::dom::css::Rect * getRectValue() = 0;
-  virtual ::org::w3c::dom::css::RGBColor * getRGBColorValue() = 0;
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual jshort getCssValueType() = 0;
-  static const jshort CSS_UNKNOWN = 0;
-  static const jshort CSS_NUMBER = 1;
-  static const jshort CSS_PERCENTAGE = 2;
-  static const jshort CSS_EMS = 3;
-  static const jshort CSS_EXS = 4;
-  static const jshort CSS_PX = 5;
-  static const jshort CSS_CM = 6;
-  static const jshort CSS_MM = 7;
-  static const jshort CSS_IN = 8;
-  static const jshort CSS_PT = 9;
-  static const jshort CSS_PC = 10;
-  static const jshort CSS_DEG = 11;
-  static const jshort CSS_RAD = 12;
-  static const jshort CSS_GRAD = 13;
-  static const jshort CSS_MS = 14;
-  static const jshort CSS_S = 15;
-  static const jshort CSS_HZ = 16;
-  static const jshort CSS_KHZ = 17;
-  static const jshort CSS_DIMENSION = 18;
-  static const jshort CSS_STRING = 19;
-  static const jshort CSS_URI = 20;
-  static const jshort CSS_IDENT = 21;
-  static const jshort CSS_ATTR = 22;
-  static const jshort CSS_COUNTER = 23;
-  static const jshort CSS_RECT = 24;
-  static const jshort CSS_RGBCOLOR = 25;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSPrimitiveValue__
diff --git a/libjava/org/w3c/dom/css/CSSRule.h b/libjava/org/w3c/dom/css/CSSRule.h
deleted file mode 100644
index 33fc8c121b1..00000000000
--- a/libjava/org/w3c/dom/css/CSSRule.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSRule__
-#define __org_w3c_dom_css_CSSRule__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSRule;
-            class CSSStyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSRule : public ::java::lang::Object
-{
-
-public:
-  virtual jshort getType() = 0;
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSStyleSheet * getParentStyleSheet() = 0;
-  virtual ::org::w3c::dom::css::CSSRule * getParentRule() = 0;
-  static const jshort UNKNOWN_RULE = 0;
-  static const jshort STYLE_RULE = 1;
-  static const jshort CHARSET_RULE = 2;
-  static const jshort IMPORT_RULE = 3;
-  static const jshort MEDIA_RULE = 4;
-  static const jshort FONT_FACE_RULE = 5;
-  static const jshort PAGE_RULE = 6;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSRule__
diff --git a/libjava/org/w3c/dom/css/CSSRuleList.h b/libjava/org/w3c/dom/css/CSSRuleList.h
deleted file mode 100644
index c555138934c..00000000000
--- a/libjava/org/w3c/dom/css/CSSRuleList.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSRuleList__
-#define __org_w3c_dom_css_CSSRuleList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSRule;
-            class CSSRuleList;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSRuleList : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLength() = 0;
-  virtual ::org::w3c::dom::css::CSSRule * item(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSRuleList__
diff --git a/libjava/org/w3c/dom/css/CSSStyleDeclaration.h b/libjava/org/w3c/dom/css/CSSStyleDeclaration.h
deleted file mode 100644
index 1fa01cefe55..00000000000
--- a/libjava/org/w3c/dom/css/CSSStyleDeclaration.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSStyleDeclaration__
-#define __org_w3c_dom_css_CSSStyleDeclaration__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSRule;
-            class CSSStyleDeclaration;
-            class CSSValue;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSStyleDeclaration : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPropertyValue(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSValue * getPropertyCSSValue(::java::lang::String *) = 0;
-  virtual ::java::lang::String * removeProperty(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPropertyPriority(::java::lang::String *) = 0;
-  virtual void setProperty(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::String * item(jint) = 0;
-  virtual ::org::w3c::dom::css::CSSRule * getParentRule() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSStyleDeclaration__
diff --git a/libjava/org/w3c/dom/css/CSSStyleRule.h b/libjava/org/w3c/dom/css/CSSStyleRule.h
deleted file mode 100644
index 3a11990f7d3..00000000000
--- a/libjava/org/w3c/dom/css/CSSStyleRule.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSStyleRule__
-#define __org_w3c_dom_css_CSSStyleRule__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSRule;
-            class CSSStyleDeclaration;
-            class CSSStyleRule;
-            class CSSStyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSStyleRule : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getSelectorText() = 0;
-  virtual void setSelectorText(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSStyleDeclaration * getStyle() = 0;
-  virtual jshort getType() = 0;
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSStyleSheet * getParentStyleSheet() = 0;
-  virtual ::org::w3c::dom::css::CSSRule * getParentRule() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSStyleRule__
diff --git a/libjava/org/w3c/dom/css/CSSStyleSheet.h b/libjava/org/w3c/dom/css/CSSStyleSheet.h
deleted file mode 100644
index fecf2fd1d26..00000000000
--- a/libjava/org/w3c/dom/css/CSSStyleSheet.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSStyleSheet__
-#define __org_w3c_dom_css_CSSStyleSheet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace css
-        {
-            class CSSRule;
-            class CSSRuleList;
-            class CSSStyleSheet;
-        }
-        namespace stylesheets
-        {
-            class MediaList;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSStyleSheet : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::css::CSSRule * getOwnerRule() = 0;
-  virtual ::org::w3c::dom::css::CSSRuleList * getCssRules() = 0;
-  virtual jint insertRule(::java::lang::String *, jint) = 0;
-  virtual void deleteRule(jint) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual jboolean getDisabled() = 0;
-  virtual void setDisabled(jboolean) = 0;
-  virtual ::org::w3c::dom::Node * getOwnerNode() = 0;
-  virtual ::org::w3c::dom::stylesheets::StyleSheet * getParentStyleSheet() = 0;
-  virtual ::java::lang::String * getHref() = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual ::org::w3c::dom::stylesheets::MediaList * getMedia() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSStyleSheet__
diff --git a/libjava/org/w3c/dom/css/CSSUnknownRule.h b/libjava/org/w3c/dom/css/CSSUnknownRule.h
deleted file mode 100644
index b3f347b61a6..00000000000
--- a/libjava/org/w3c/dom/css/CSSUnknownRule.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSUnknownRule__
-#define __org_w3c_dom_css_CSSUnknownRule__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSRule;
-            class CSSStyleSheet;
-            class CSSUnknownRule;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSUnknownRule : public ::java::lang::Object
-{
-
-public:
-  virtual jshort getType() = 0;
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::css::CSSStyleSheet * getParentStyleSheet() = 0;
-  virtual ::org::w3c::dom::css::CSSRule * getParentRule() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSUnknownRule__
diff --git a/libjava/org/w3c/dom/css/CSSValue.h b/libjava/org/w3c/dom/css/CSSValue.h
deleted file mode 100644
index c95ae1c4830..00000000000
--- a/libjava/org/w3c/dom/css/CSSValue.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSValue__
-#define __org_w3c_dom_css_CSSValue__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSValue;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSValue : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual jshort getCssValueType() = 0;
-  static const jshort CSS_INHERIT = 0;
-  static const jshort CSS_PRIMITIVE_VALUE = 1;
-  static const jshort CSS_VALUE_LIST = 2;
-  static const jshort CSS_CUSTOM = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSValue__
diff --git a/libjava/org/w3c/dom/css/CSSValueList.h b/libjava/org/w3c/dom/css/CSSValueList.h
deleted file mode 100644
index d5fbba2cfc7..00000000000
--- a/libjava/org/w3c/dom/css/CSSValueList.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_CSSValueList__
-#define __org_w3c_dom_css_CSSValueList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSValue;
-            class CSSValueList;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::CSSValueList : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLength() = 0;
-  virtual ::org::w3c::dom::css::CSSValue * item(jint) = 0;
-  virtual ::java::lang::String * getCssText() = 0;
-  virtual void setCssText(::java::lang::String *) = 0;
-  virtual jshort getCssValueType() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_CSSValueList__
diff --git a/libjava/org/w3c/dom/css/Counter.h b/libjava/org/w3c/dom/css/Counter.h
deleted file mode 100644
index 784d2db5e82..00000000000
--- a/libjava/org/w3c/dom/css/Counter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_Counter__
-#define __org_w3c_dom_css_Counter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class Counter;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::Counter : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getIdentifier() = 0;
-  virtual ::java::lang::String * getListStyle() = 0;
-  virtual ::java::lang::String * getSeparator() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_Counter__
diff --git a/libjava/org/w3c/dom/css/DOMImplementationCSS.h b/libjava/org/w3c/dom/css/DOMImplementationCSS.h
deleted file mode 100644
index 6ce52149da1..00000000000
--- a/libjava/org/w3c/dom/css/DOMImplementationCSS.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_DOMImplementationCSS__
-#define __org_w3c_dom_css_DOMImplementationCSS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class DocumentType;
-        namespace css
-        {
-            class CSSStyleSheet;
-            class DOMImplementationCSS;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::DOMImplementationCSS : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::css::CSSStyleSheet * createCSSStyleSheet(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::DocumentType * createDocumentType(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Document * createDocument(::java::lang::String *, ::java::lang::String *, ::org::w3c::dom::DocumentType *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_DOMImplementationCSS__
diff --git a/libjava/org/w3c/dom/css/DocumentCSS.h b/libjava/org/w3c/dom/css/DocumentCSS.h
deleted file mode 100644
index a115b7fbeda..00000000000
--- a/libjava/org/w3c/dom/css/DocumentCSS.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_DocumentCSS__
-#define __org_w3c_dom_css_DocumentCSS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-        namespace css
-        {
-            class CSSStyleDeclaration;
-            class DocumentCSS;
-        }
-        namespace stylesheets
-        {
-            class StyleSheetList;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::DocumentCSS : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::css::CSSStyleDeclaration * getOverrideStyle(::org::w3c::dom::Element *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::stylesheets::StyleSheetList * getStyleSheets() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_DocumentCSS__
diff --git a/libjava/org/w3c/dom/css/ElementCSSInlineStyle.h b/libjava/org/w3c/dom/css/ElementCSSInlineStyle.h
deleted file mode 100644
index f4c26d774f9..00000000000
--- a/libjava/org/w3c/dom/css/ElementCSSInlineStyle.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_ElementCSSInlineStyle__
-#define __org_w3c_dom_css_ElementCSSInlineStyle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSStyleDeclaration;
-            class ElementCSSInlineStyle;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::ElementCSSInlineStyle : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::css::CSSStyleDeclaration * getStyle() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_ElementCSSInlineStyle__
diff --git a/libjava/org/w3c/dom/css/RGBColor.h b/libjava/org/w3c/dom/css/RGBColor.h
deleted file mode 100644
index bc0932de63b..00000000000
--- a/libjava/org/w3c/dom/css/RGBColor.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_RGBColor__
-#define __org_w3c_dom_css_RGBColor__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSPrimitiveValue;
-            class RGBColor;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::RGBColor : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::css::CSSPrimitiveValue * getRed() = 0;
-  virtual ::org::w3c::dom::css::CSSPrimitiveValue * getGreen() = 0;
-  virtual ::org::w3c::dom::css::CSSPrimitiveValue * getBlue() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_RGBColor__
diff --git a/libjava/org/w3c/dom/css/Rect.h b/libjava/org/w3c/dom/css/Rect.h
deleted file mode 100644
index e55d1e0465b..00000000000
--- a/libjava/org/w3c/dom/css/Rect.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_Rect__
-#define __org_w3c_dom_css_Rect__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace css
-        {
-            class CSSPrimitiveValue;
-            class Rect;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::Rect : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::css::CSSPrimitiveValue * getTop() = 0;
-  virtual ::org::w3c::dom::css::CSSPrimitiveValue * getRight() = 0;
-  virtual ::org::w3c::dom::css::CSSPrimitiveValue * getBottom() = 0;
-  virtual ::org::w3c::dom::css::CSSPrimitiveValue * getLeft() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_Rect__
diff --git a/libjava/org/w3c/dom/css/ViewCSS.h b/libjava/org/w3c/dom/css/ViewCSS.h
deleted file mode 100644
index a1c12555e9d..00000000000
--- a/libjava/org/w3c/dom/css/ViewCSS.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_css_ViewCSS__
-#define __org_w3c_dom_css_ViewCSS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-        namespace css
-        {
-            class CSSStyleDeclaration;
-            class ViewCSS;
-        }
-        namespace views
-        {
-            class DocumentView;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::css::ViewCSS : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::css::CSSStyleDeclaration * getComputedStyle(::org::w3c::dom::Element *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::views::DocumentView * getDocument() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_css_ViewCSS__
diff --git a/libjava/org/w3c/dom/events/DocumentEvent.h b/libjava/org/w3c/dom/events/DocumentEvent.h
deleted file mode 100644
index 2fc95507101..00000000000
--- a/libjava/org/w3c/dom/events/DocumentEvent.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_events_DocumentEvent__
-#define __org_w3c_dom_events_DocumentEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace events
-        {
-            class DocumentEvent;
-            class Event;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::events::DocumentEvent : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::events::Event * createEvent(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_events_DocumentEvent__
diff --git a/libjava/org/w3c/dom/events/Event.h b/libjava/org/w3c/dom/events/Event.h
deleted file mode 100644
index 7f1e90ee13c..00000000000
--- a/libjava/org/w3c/dom/events/Event.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_events_Event__
-#define __org_w3c_dom_events_Event__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace events
-        {
-            class Event;
-            class EventTarget;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::events::Event : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getType() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getTarget() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getCurrentTarget() = 0;
-  virtual jshort getEventPhase() = 0;
-  virtual jboolean getBubbles() = 0;
-  virtual jboolean getCancelable() = 0;
-  virtual jlong getTimeStamp() = 0;
-  virtual void stopPropagation() = 0;
-  virtual void preventDefault() = 0;
-  virtual void initEvent(::java::lang::String *, jboolean, jboolean) = 0;
-  static const jshort CAPTURING_PHASE = 1;
-  static const jshort AT_TARGET = 2;
-  static const jshort BUBBLING_PHASE = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_events_Event__
diff --git a/libjava/org/w3c/dom/events/EventException.h b/libjava/org/w3c/dom/events/EventException.h
deleted file mode 100644
index 20d2e8cfef3..00000000000
--- a/libjava/org/w3c/dom/events/EventException.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_events_EventException__
-#define __org_w3c_dom_events_EventException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace events
-        {
-            class EventException;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::events::EventException : public ::java::lang::RuntimeException
-{
-
-public:
-  EventException(jshort, ::java::lang::String *);
-  jshort __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) code;
-  static const jshort UNSPECIFIED_EVENT_TYPE_ERR = 0;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_w3c_dom_events_EventException__
diff --git a/libjava/org/w3c/dom/events/EventListener.h b/libjava/org/w3c/dom/events/EventListener.h
deleted file mode 100644
index 8f34b358725..00000000000
--- a/libjava/org/w3c/dom/events/EventListener.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_events_EventListener__
-#define __org_w3c_dom_events_EventListener__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace events
-        {
-            class Event;
-            class EventListener;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::events::EventListener : public ::java::lang::Object
-{
-
-public:
-  virtual void handleEvent(::org::w3c::dom::events::Event *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_events_EventListener__
diff --git a/libjava/org/w3c/dom/events/EventTarget.h b/libjava/org/w3c/dom/events/EventTarget.h
deleted file mode 100644
index b46815c4eef..00000000000
--- a/libjava/org/w3c/dom/events/EventTarget.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_events_EventTarget__
-#define __org_w3c_dom_events_EventTarget__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace events
-        {
-            class Event;
-            class EventListener;
-            class EventTarget;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::events::EventTarget : public ::java::lang::Object
-{
-
-public:
-  virtual void addEventListener(::java::lang::String *, ::org::w3c::dom::events::EventListener *, jboolean) = 0;
-  virtual void removeEventListener(::java::lang::String *, ::org::w3c::dom::events::EventListener *, jboolean) = 0;
-  virtual jboolean dispatchEvent(::org::w3c::dom::events::Event *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_events_EventTarget__
diff --git a/libjava/org/w3c/dom/events/MouseEvent.h b/libjava/org/w3c/dom/events/MouseEvent.h
deleted file mode 100644
index b5cdf776ab4..00000000000
--- a/libjava/org/w3c/dom/events/MouseEvent.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_events_MouseEvent__
-#define __org_w3c_dom_events_MouseEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace events
-        {
-            class EventTarget;
-            class MouseEvent;
-        }
-        namespace views
-        {
-            class AbstractView;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::events::MouseEvent : public ::java::lang::Object
-{
-
-public:
-  virtual jint getScreenX() = 0;
-  virtual jint getScreenY() = 0;
-  virtual jint getClientX() = 0;
-  virtual jint getClientY() = 0;
-  virtual jboolean getCtrlKey() = 0;
-  virtual jboolean getShiftKey() = 0;
-  virtual jboolean getAltKey() = 0;
-  virtual jboolean getMetaKey() = 0;
-  virtual jshort getButton() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getRelatedTarget() = 0;
-  virtual void initMouseEvent(::java::lang::String *, jboolean, jboolean, ::org::w3c::dom::views::AbstractView *, jint, jint, jint, jint, jint, jboolean, jboolean, jboolean, jboolean, jshort, ::org::w3c::dom::events::EventTarget *) = 0;
-  virtual ::org::w3c::dom::views::AbstractView * getView() = 0;
-  virtual jint getDetail() = 0;
-  virtual void initUIEvent(::java::lang::String *, jboolean, jboolean, ::org::w3c::dom::views::AbstractView *, jint) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getTarget() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getCurrentTarget() = 0;
-  virtual jshort getEventPhase() = 0;
-  virtual jboolean getBubbles() = 0;
-  virtual jboolean getCancelable() = 0;
-  virtual jlong getTimeStamp() = 0;
-  virtual void stopPropagation() = 0;
-  virtual void preventDefault() = 0;
-  virtual void initEvent(::java::lang::String *, jboolean, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_events_MouseEvent__
diff --git a/libjava/org/w3c/dom/events/MutationEvent.h b/libjava/org/w3c/dom/events/MutationEvent.h
deleted file mode 100644
index 4f461f7afab..00000000000
--- a/libjava/org/w3c/dom/events/MutationEvent.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_events_MutationEvent__
-#define __org_w3c_dom_events_MutationEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace events
-        {
-            class EventTarget;
-            class MutationEvent;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::events::MutationEvent : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Node * getRelatedNode() = 0;
-  virtual ::java::lang::String * getPrevValue() = 0;
-  virtual ::java::lang::String * getNewValue() = 0;
-  virtual ::java::lang::String * getAttrName() = 0;
-  virtual jshort getAttrChange() = 0;
-  virtual void initMutationEvent(::java::lang::String *, jboolean, jboolean, ::org::w3c::dom::Node *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jshort) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getTarget() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getCurrentTarget() = 0;
-  virtual jshort getEventPhase() = 0;
-  virtual jboolean getBubbles() = 0;
-  virtual jboolean getCancelable() = 0;
-  virtual jlong getTimeStamp() = 0;
-  virtual void stopPropagation() = 0;
-  virtual void preventDefault() = 0;
-  virtual void initEvent(::java::lang::String *, jboolean, jboolean) = 0;
-  static const jshort MODIFICATION = 1;
-  static const jshort ADDITION = 2;
-  static const jshort REMOVAL = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_events_MutationEvent__
diff --git a/libjava/org/w3c/dom/events/UIEvent.h b/libjava/org/w3c/dom/events/UIEvent.h
deleted file mode 100644
index 2cfbf843a3d..00000000000
--- a/libjava/org/w3c/dom/events/UIEvent.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_events_UIEvent__
-#define __org_w3c_dom_events_UIEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace events
-        {
-            class EventTarget;
-            class UIEvent;
-        }
-        namespace views
-        {
-            class AbstractView;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::events::UIEvent : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::views::AbstractView * getView() = 0;
-  virtual jint getDetail() = 0;
-  virtual void initUIEvent(::java::lang::String *, jboolean, jboolean, ::org::w3c::dom::views::AbstractView *, jint) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getTarget() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getCurrentTarget() = 0;
-  virtual jshort getEventPhase() = 0;
-  virtual jboolean getBubbles() = 0;
-  virtual jboolean getCancelable() = 0;
-  virtual jlong getTimeStamp() = 0;
-  virtual void stopPropagation() = 0;
-  virtual void preventDefault() = 0;
-  virtual void initEvent(::java::lang::String *, jboolean, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_events_UIEvent__
diff --git a/libjava/org/w3c/dom/html2/HTMLAnchorElement.h b/libjava/org/w3c/dom/html2/HTMLAnchorElement.h
deleted file mode 100644
index 01a23610264..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLAnchorElement.h
+++ /dev/null
@@ -1,134 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLAnchorElement__
-#define __org_w3c_dom_html2_HTMLAnchorElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLAnchorElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLAnchorElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAccessKey() = 0;
-  virtual void setAccessKey(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCharset() = 0;
-  virtual void setCharset(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCoords() = 0;
-  virtual void setCoords(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHref() = 0;
-  virtual void setHref(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHreflang() = 0;
-  virtual void setHreflang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getRel() = 0;
-  virtual void setRel(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getRev() = 0;
-  virtual void setRev(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getShape() = 0;
-  virtual void setShape(::java::lang::String *) = 0;
-  virtual jint getTabIndex() = 0;
-  virtual void setTabIndex(jint) = 0;
-  virtual ::java::lang::String * getTarget() = 0;
-  virtual void setTarget(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual void setType(::java::lang::String *) = 0;
-  virtual void blur() = 0;
-  virtual void focus() = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLAnchorElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLAppletElement.h b/libjava/org/w3c/dom/html2/HTMLAppletElement.h
deleted file mode 100644
index 5a53cfa9bf4..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLAppletElement.h
+++ /dev/null
@@ -1,130 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLAppletElement__
-#define __org_w3c_dom_html2_HTMLAppletElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLAppletElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLAppletElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAlt() = 0;
-  virtual void setAlt(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getArchive() = 0;
-  virtual void setArchive(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCode() = 0;
-  virtual void setCode(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCodeBase() = 0;
-  virtual void setCodeBase(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHeight() = 0;
-  virtual void setHeight(::java::lang::String *) = 0;
-  virtual jint getHspace() = 0;
-  virtual void setHspace(jint) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getObject() = 0;
-  virtual void setObject(::java::lang::String *) = 0;
-  virtual jint getVspace() = 0;
-  virtual void setVspace(jint) = 0;
-  virtual ::java::lang::String * getWidth() = 0;
-  virtual void setWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLAppletElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLAreaElement.h b/libjava/org/w3c/dom/html2/HTMLAreaElement.h
deleted file mode 100644
index 12823e89afe..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLAreaElement.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLAreaElement__
-#define __org_w3c_dom_html2_HTMLAreaElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLAreaElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLAreaElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAccessKey() = 0;
-  virtual void setAccessKey(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAlt() = 0;
-  virtual void setAlt(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCoords() = 0;
-  virtual void setCoords(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHref() = 0;
-  virtual void setHref(::java::lang::String *) = 0;
-  virtual jboolean getNoHref() = 0;
-  virtual void setNoHref(jboolean) = 0;
-  virtual ::java::lang::String * getShape() = 0;
-  virtual void setShape(::java::lang::String *) = 0;
-  virtual jint getTabIndex() = 0;
-  virtual void setTabIndex(jint) = 0;
-  virtual ::java::lang::String * getTarget() = 0;
-  virtual void setTarget(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLAreaElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLBRElement.h b/libjava/org/w3c/dom/html2/HTMLBRElement.h
deleted file mode 100644
index 1532e40f938..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLBRElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLBRElement__
-#define __org_w3c_dom_html2_HTMLBRElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLBRElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLBRElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getClear() = 0;
-  virtual void setClear(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLBRElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLBaseElement.h b/libjava/org/w3c/dom/html2/HTMLBaseElement.h
deleted file mode 100644
index ab34c703090..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLBaseElement.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLBaseElement__
-#define __org_w3c_dom_html2_HTMLBaseElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLBaseElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLBaseElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getHref() = 0;
-  virtual void setHref(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTarget() = 0;
-  virtual void setTarget(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLBaseElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLBaseFontElement.h b/libjava/org/w3c/dom/html2/HTMLBaseFontElement.h
deleted file mode 100644
index e2859b3d488..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLBaseFontElement.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLBaseFontElement__
-#define __org_w3c_dom_html2_HTMLBaseFontElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLBaseFontElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLBaseFontElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getColor() = 0;
-  virtual void setColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFace() = 0;
-  virtual void setFace(::java::lang::String *) = 0;
-  virtual jint getSize() = 0;
-  virtual void setSize(jint) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLBaseFontElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLBodyElement.h b/libjava/org/w3c/dom/html2/HTMLBodyElement.h
deleted file mode 100644
index 7c9c16a2336..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLBodyElement.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLBodyElement__
-#define __org_w3c_dom_html2_HTMLBodyElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLBodyElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLBodyElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getALink() = 0;
-  virtual void setALink(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBackground() = 0;
-  virtual void setBackground(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBgColor() = 0;
-  virtual void setBgColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLink() = 0;
-  virtual void setLink(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getText() = 0;
-  virtual void setText(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getVLink() = 0;
-  virtual void setVLink(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLBodyElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLButtonElement.h b/libjava/org/w3c/dom/html2/HTMLButtonElement.h
deleted file mode 100644
index 1c2d48b6ffd..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLButtonElement.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLButtonElement__
-#define __org_w3c_dom_html2_HTMLButtonElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLButtonElement;
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLButtonElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm() = 0;
-  virtual ::java::lang::String * getAccessKey() = 0;
-  virtual void setAccessKey(::java::lang::String *) = 0;
-  virtual jboolean getDisabled() = 0;
-  virtual void setDisabled(jboolean) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual jint getTabIndex() = 0;
-  virtual void setTabIndex(jint) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual ::java::lang::String * getValue() = 0;
-  virtual void setValue(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLButtonElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLCollection.h b/libjava/org/w3c/dom/html2/HTMLCollection.h
deleted file mode 100644
index 06a86c94835..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLCollection.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLCollection__
-#define __org_w3c_dom_html2_HTMLCollection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace html2
-        {
-            class HTMLCollection;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLCollection : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLength() = 0;
-  virtual ::org::w3c::dom::Node * item(jint) = 0;
-  virtual ::org::w3c::dom::Node * namedItem(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLCollection__
diff --git a/libjava/org/w3c/dom/html2/HTMLDListElement.h b/libjava/org/w3c/dom/html2/HTMLDListElement.h
deleted file mode 100644
index 269d051761f..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLDListElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLDListElement__
-#define __org_w3c_dom_html2_HTMLDListElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLDListElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLDListElement : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean getCompact() = 0;
-  virtual void setCompact(jboolean) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLDListElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLDirectoryElement.h b/libjava/org/w3c/dom/html2/HTMLDirectoryElement.h
deleted file mode 100644
index f6315899d27..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLDirectoryElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLDirectoryElement__
-#define __org_w3c_dom_html2_HTMLDirectoryElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLDirectoryElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLDirectoryElement : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean getCompact() = 0;
-  virtual void setCompact(jboolean) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLDirectoryElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLDivElement.h b/libjava/org/w3c/dom/html2/HTMLDivElement.h
deleted file mode 100644
index e0132bcfee7..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLDivElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLDivElement__
-#define __org_w3c_dom_html2_HTMLDivElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLDivElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLDivElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLDivElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLDocument.h b/libjava/org/w3c/dom/html2/HTMLDocument.h
deleted file mode 100644
index 223a8f69868..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLDocument.h
+++ /dev/null
@@ -1,139 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLDocument__
-#define __org_w3c_dom_html2_HTMLDocument__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class CDATASection;
-          class Comment;
-          class DOMConfiguration;
-          class DOMImplementation;
-          class Document;
-          class DocumentFragment;
-          class DocumentType;
-          class Element;
-          class EntityReference;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class ProcessingInstruction;
-          class Text;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLCollection;
-            class HTMLDocument;
-            class HTMLElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLDocument : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getReferrer() = 0;
-  virtual ::java::lang::String * getDomain() = 0;
-  virtual ::java::lang::String * getURL() = 0;
-  virtual ::org::w3c::dom::html2::HTMLElement * getBody() = 0;
-  virtual void setBody(::org::w3c::dom::html2::HTMLElement *) = 0;
-  virtual ::org::w3c::dom::html2::HTMLCollection * getImages() = 0;
-  virtual ::org::w3c::dom::html2::HTMLCollection * getApplets() = 0;
-  virtual ::org::w3c::dom::html2::HTMLCollection * getLinks() = 0;
-  virtual ::org::w3c::dom::html2::HTMLCollection * getForms() = 0;
-  virtual ::org::w3c::dom::html2::HTMLCollection * getAnchors() = 0;
-  virtual ::java::lang::String * getCookie() = 0;
-  virtual void setCookie(::java::lang::String *) = 0;
-  virtual void open() = 0;
-  virtual void close() = 0;
-  virtual void write(::java::lang::String *) = 0;
-  virtual void writeln(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByName(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::DocumentType * getDoctype() = 0;
-  virtual ::org::w3c::dom::DOMImplementation * getImplementation() = 0;
-  virtual ::org::w3c::dom::Element * getDocumentElement() = 0;
-  virtual ::org::w3c::dom::Element * createElement(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::DocumentFragment * createDocumentFragment() = 0;
-  virtual ::org::w3c::dom::Text * createTextNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Comment * createComment(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::CDATASection * createCDATASection(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::ProcessingInstruction * createProcessingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * createAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::EntityReference * createEntityReference(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Node * importNode(::org::w3c::dom::Node *, jboolean) = 0;
-  virtual ::org::w3c::dom::Element * createElementNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * createAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Element * getElementById(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getInputEncoding() = 0;
-  virtual ::java::lang::String * getXmlEncoding() = 0;
-  virtual jboolean getXmlStandalone() = 0;
-  virtual void setXmlStandalone(jboolean) = 0;
-  virtual ::java::lang::String * getXmlVersion() = 0;
-  virtual void setXmlVersion(::java::lang::String *) = 0;
-  virtual jboolean getStrictErrorChecking() = 0;
-  virtual void setStrictErrorChecking(jboolean) = 0;
-  virtual ::java::lang::String * getDocumentURI() = 0;
-  virtual void setDocumentURI(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Node * adoptNode(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::DOMConfiguration * getDomConfig() = 0;
-  virtual void normalizeDocument() = 0;
-  virtual ::org::w3c::dom::Node * renameNode(::org::w3c::dom::Node *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLDocument__
diff --git a/libjava/org/w3c/dom/html2/HTMLElement.h b/libjava/org/w3c/dom/html2/HTMLElement.h
deleted file mode 100644
index 13f7df02c94..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLElement.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLElement__
-#define __org_w3c_dom_html2_HTMLElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLFieldSetElement.h b/libjava/org/w3c/dom/html2/HTMLFieldSetElement.h
deleted file mode 100644
index 78b7ec1c04f..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLFieldSetElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLFieldSetElement__
-#define __org_w3c_dom_html2_HTMLFieldSetElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFieldSetElement;
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLFieldSetElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm() = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLFieldSetElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLFontElement.h b/libjava/org/w3c/dom/html2/HTMLFontElement.h
deleted file mode 100644
index a39953cdb47..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLFontElement.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLFontElement__
-#define __org_w3c_dom_html2_HTMLFontElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFontElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLFontElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getColor() = 0;
-  virtual void setColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFace() = 0;
-  virtual void setFace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSize() = 0;
-  virtual void setSize(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLFontElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLFormElement.h b/libjava/org/w3c/dom/html2/HTMLFormElement.h
deleted file mode 100644
index 3dea87f2bfa..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLFormElement.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLFormElement__
-#define __org_w3c_dom_html2_HTMLFormElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLCollection;
-            class HTMLFormElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLFormElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::html2::HTMLCollection * getElements() = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAcceptCharset() = 0;
-  virtual void setAcceptCharset(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAction() = 0;
-  virtual void setAction(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getEnctype() = 0;
-  virtual void setEnctype(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMethod() = 0;
-  virtual void setMethod(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTarget() = 0;
-  virtual void setTarget(::java::lang::String *) = 0;
-  virtual void submit() = 0;
-  virtual void reset() = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLFormElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLFrameElement.h b/libjava/org/w3c/dom/html2/HTMLFrameElement.h
deleted file mode 100644
index a87c07deb21..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLFrameElement.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLFrameElement__
-#define __org_w3c_dom_html2_HTMLFrameElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFrameElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLFrameElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getFrameBorder() = 0;
-  virtual void setFrameBorder(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLongDesc() = 0;
-  virtual void setLongDesc(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMarginHeight() = 0;
-  virtual void setMarginHeight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMarginWidth() = 0;
-  virtual void setMarginWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual jboolean getNoResize() = 0;
-  virtual void setNoResize(jboolean) = 0;
-  virtual ::java::lang::String * getScrolling() = 0;
-  virtual void setScrolling(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSrc() = 0;
-  virtual void setSrc(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Document * getContentDocument() = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLFrameElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLFrameSetElement.h b/libjava/org/w3c/dom/html2/HTMLFrameSetElement.h
deleted file mode 100644
index 954dc52420c..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLFrameSetElement.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLFrameSetElement__
-#define __org_w3c_dom_html2_HTMLFrameSetElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFrameSetElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLFrameSetElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getCols() = 0;
-  virtual void setCols(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getRows() = 0;
-  virtual void setRows(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLFrameSetElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLHRElement.h b/libjava/org/w3c/dom/html2/HTMLHRElement.h
deleted file mode 100644
index 3d831ab8406..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLHRElement.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLHRElement__
-#define __org_w3c_dom_html2_HTMLHRElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLHRElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLHRElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual jboolean getNoShade() = 0;
-  virtual void setNoShade(jboolean) = 0;
-  virtual ::java::lang::String * getSize() = 0;
-  virtual void setSize(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getWidth() = 0;
-  virtual void setWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLHRElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLHeadElement.h b/libjava/org/w3c/dom/html2/HTMLHeadElement.h
deleted file mode 100644
index 3e01bd20966..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLHeadElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLHeadElement__
-#define __org_w3c_dom_html2_HTMLHeadElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLHeadElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLHeadElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getProfile() = 0;
-  virtual void setProfile(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLHeadElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLHeadingElement.h b/libjava/org/w3c/dom/html2/HTMLHeadingElement.h
deleted file mode 100644
index e8c4b10c3b0..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLHeadingElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLHeadingElement__
-#define __org_w3c_dom_html2_HTMLHeadingElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLHeadingElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLHeadingElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLHeadingElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLHtmlElement.h b/libjava/org/w3c/dom/html2/HTMLHtmlElement.h
deleted file mode 100644
index 9a0837e514e..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLHtmlElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLHtmlElement__
-#define __org_w3c_dom_html2_HTMLHtmlElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLHtmlElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLHtmlElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getVersion() = 0;
-  virtual void setVersion(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLHtmlElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLIFrameElement.h b/libjava/org/w3c/dom/html2/HTMLIFrameElement.h
deleted file mode 100644
index ca09ae567c8..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLIFrameElement.h
+++ /dev/null
@@ -1,129 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLIFrameElement__
-#define __org_w3c_dom_html2_HTMLIFrameElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLIFrameElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLIFrameElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFrameBorder() = 0;
-  virtual void setFrameBorder(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHeight() = 0;
-  virtual void setHeight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLongDesc() = 0;
-  virtual void setLongDesc(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMarginHeight() = 0;
-  virtual void setMarginHeight(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMarginWidth() = 0;
-  virtual void setMarginWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getScrolling() = 0;
-  virtual void setScrolling(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSrc() = 0;
-  virtual void setSrc(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getWidth() = 0;
-  virtual void setWidth(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Document * getContentDocument() = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLIFrameElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLImageElement.h b/libjava/org/w3c/dom/html2/HTMLImageElement.h
deleted file mode 100644
index 931896bb903..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLImageElement.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLImageElement__
-#define __org_w3c_dom_html2_HTMLImageElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLImageElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLImageElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAlt() = 0;
-  virtual void setAlt(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorder() = 0;
-  virtual void setBorder(::java::lang::String *) = 0;
-  virtual jint getHeight() = 0;
-  virtual void setHeight(jint) = 0;
-  virtual jint getHspace() = 0;
-  virtual void setHspace(jint) = 0;
-  virtual jboolean getIsMap() = 0;
-  virtual void setIsMap(jboolean) = 0;
-  virtual ::java::lang::String * getLongDesc() = 0;
-  virtual void setLongDesc(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSrc() = 0;
-  virtual void setSrc(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getUseMap() = 0;
-  virtual void setUseMap(::java::lang::String *) = 0;
-  virtual jint getVspace() = 0;
-  virtual void setVspace(jint) = 0;
-  virtual jint getWidth() = 0;
-  virtual void setWidth(jint) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLImageElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLInputElement.h b/libjava/org/w3c/dom/html2/HTMLInputElement.h
deleted file mode 100644
index b6b5f5ca0a9..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLInputElement.h
+++ /dev/null
@@ -1,148 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLInputElement__
-#define __org_w3c_dom_html2_HTMLInputElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFormElement;
-            class HTMLInputElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLInputElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getDefaultValue() = 0;
-  virtual void setDefaultValue(::java::lang::String *) = 0;
-  virtual jboolean getDefaultChecked() = 0;
-  virtual void setDefaultChecked(jboolean) = 0;
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm() = 0;
-  virtual ::java::lang::String * getAccept() = 0;
-  virtual void setAccept(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAccessKey() = 0;
-  virtual void setAccessKey(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAlt() = 0;
-  virtual void setAlt(::java::lang::String *) = 0;
-  virtual jboolean getChecked() = 0;
-  virtual void setChecked(jboolean) = 0;
-  virtual jboolean getDisabled() = 0;
-  virtual void setDisabled(jboolean) = 0;
-  virtual jint getMaxLength() = 0;
-  virtual void setMaxLength(jint) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual jboolean getReadOnly() = 0;
-  virtual void setReadOnly(jboolean) = 0;
-  virtual jint getSize() = 0;
-  virtual void setSize(jint) = 0;
-  virtual ::java::lang::String * getSrc() = 0;
-  virtual void setSrc(::java::lang::String *) = 0;
-  virtual jint getTabIndex() = 0;
-  virtual void setTabIndex(jint) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual void setType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getUseMap() = 0;
-  virtual void setUseMap(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getValue() = 0;
-  virtual void setValue(::java::lang::String *) = 0;
-  virtual void blur() = 0;
-  virtual void focus() = 0;
-  virtual void select() = 0;
-  virtual void click() = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLInputElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLIsIndexElement.h b/libjava/org/w3c/dom/html2/HTMLIsIndexElement.h
deleted file mode 100644
index dc6748fcca7..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLIsIndexElement.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLIsIndexElement__
-#define __org_w3c_dom_html2_HTMLIsIndexElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFormElement;
-            class HTMLIsIndexElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLIsIndexElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm() = 0;
-  virtual ::java::lang::String * getPrompt() = 0;
-  virtual void setPrompt(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLIsIndexElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLLIElement.h b/libjava/org/w3c/dom/html2/HTMLLIElement.h
deleted file mode 100644
index 3b9caa30e23..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLLIElement.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLLIElement__
-#define __org_w3c_dom_html2_HTMLLIElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLLIElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLLIElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getType() = 0;
-  virtual void setType(::java::lang::String *) = 0;
-  virtual jint getValue() = 0;
-  virtual void setValue(jint) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLLIElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLLabelElement.h b/libjava/org/w3c/dom/html2/HTMLLabelElement.h
deleted file mode 100644
index d0f9948ddf4..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLLabelElement.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLLabelElement__
-#define __org_w3c_dom_html2_HTMLLabelElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFormElement;
-            class HTMLLabelElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLLabelElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm() = 0;
-  virtual ::java::lang::String * getAccessKey() = 0;
-  virtual void setAccessKey(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHtmlFor() = 0;
-  virtual void setHtmlFor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLLabelElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLLegendElement.h b/libjava/org/w3c/dom/html2/HTMLLegendElement.h
deleted file mode 100644
index c26a4b455f3..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLLegendElement.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLLegendElement__
-#define __org_w3c_dom_html2_HTMLLegendElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFormElement;
-            class HTMLLegendElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLLegendElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm() = 0;
-  virtual ::java::lang::String * getAccessKey() = 0;
-  virtual void setAccessKey(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLLegendElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLLinkElement.h b/libjava/org/w3c/dom/html2/HTMLLinkElement.h
deleted file mode 100644
index c58f1cf5d90..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLLinkElement.h
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLLinkElement__
-#define __org_w3c_dom_html2_HTMLLinkElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLLinkElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLLinkElement : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean getDisabled() = 0;
-  virtual void setDisabled(jboolean) = 0;
-  virtual ::java::lang::String * getCharset() = 0;
-  virtual void setCharset(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHref() = 0;
-  virtual void setHref(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHreflang() = 0;
-  virtual void setHreflang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getMedia() = 0;
-  virtual void setMedia(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getRel() = 0;
-  virtual void setRel(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getRev() = 0;
-  virtual void setRev(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTarget() = 0;
-  virtual void setTarget(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual void setType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLLinkElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLMapElement.h b/libjava/org/w3c/dom/html2/HTMLMapElement.h
deleted file mode 100644
index 4fdb470c9a4..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLMapElement.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLMapElement__
-#define __org_w3c_dom_html2_HTMLMapElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLCollection;
-            class HTMLMapElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLMapElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::html2::HTMLCollection * getAreas() = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLMapElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLMenuElement.h b/libjava/org/w3c/dom/html2/HTMLMenuElement.h
deleted file mode 100644
index e2a6e33b492..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLMenuElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLMenuElement__
-#define __org_w3c_dom_html2_HTMLMenuElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLMenuElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLMenuElement : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean getCompact() = 0;
-  virtual void setCompact(jboolean) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLMenuElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLMetaElement.h b/libjava/org/w3c/dom/html2/HTMLMetaElement.h
deleted file mode 100644
index 4d90bb5e27c..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLMetaElement.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLMetaElement__
-#define __org_w3c_dom_html2_HTMLMetaElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLMetaElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLMetaElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getContent() = 0;
-  virtual void setContent(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHttpEquiv() = 0;
-  virtual void setHttpEquiv(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getScheme() = 0;
-  virtual void setScheme(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLMetaElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLModElement.h b/libjava/org/w3c/dom/html2/HTMLModElement.h
deleted file mode 100644
index 8cdbb130862..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLModElement.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLModElement__
-#define __org_w3c_dom_html2_HTMLModElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLModElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLModElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getCite() = 0;
-  virtual void setCite(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDateTime() = 0;
-  virtual void setDateTime(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLModElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLOListElement.h b/libjava/org/w3c/dom/html2/HTMLOListElement.h
deleted file mode 100644
index 9dc476379b1..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLOListElement.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLOListElement__
-#define __org_w3c_dom_html2_HTMLOListElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLOListElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLOListElement : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean getCompact() = 0;
-  virtual void setCompact(jboolean) = 0;
-  virtual jint getStart() = 0;
-  virtual void setStart(jint) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual void setType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLOListElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLObjectElement.h b/libjava/org/w3c/dom/html2/HTMLObjectElement.h
deleted file mode 100644
index e061d879435..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLObjectElement.h
+++ /dev/null
@@ -1,145 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLObjectElement__
-#define __org_w3c_dom_html2_HTMLObjectElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFormElement;
-            class HTMLObjectElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLObjectElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm() = 0;
-  virtual ::java::lang::String * getCode() = 0;
-  virtual void setCode(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getArchive() = 0;
-  virtual void setArchive(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorder() = 0;
-  virtual void setBorder(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCodeBase() = 0;
-  virtual void setCodeBase(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCodeType() = 0;
-  virtual void setCodeType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getData() = 0;
-  virtual void setData(::java::lang::String *) = 0;
-  virtual jboolean getDeclare() = 0;
-  virtual void setDeclare(jboolean) = 0;
-  virtual ::java::lang::String * getHeight() = 0;
-  virtual void setHeight(::java::lang::String *) = 0;
-  virtual jint getHspace() = 0;
-  virtual void setHspace(jint) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getStandby() = 0;
-  virtual void setStandby(::java::lang::String *) = 0;
-  virtual jint getTabIndex() = 0;
-  virtual void setTabIndex(jint) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual void setType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getUseMap() = 0;
-  virtual void setUseMap(::java::lang::String *) = 0;
-  virtual jint getVspace() = 0;
-  virtual void setVspace(jint) = 0;
-  virtual ::java::lang::String * getWidth() = 0;
-  virtual void setWidth(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Document * getContentDocument() = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLObjectElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLOptGroupElement.h b/libjava/org/w3c/dom/html2/HTMLOptGroupElement.h
deleted file mode 100644
index b6ef2bcb7c5..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLOptGroupElement.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLOptGroupElement__
-#define __org_w3c_dom_html2_HTMLOptGroupElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLOptGroupElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLOptGroupElement : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean getDisabled() = 0;
-  virtual void setDisabled(jboolean) = 0;
-  virtual ::java::lang::String * getLabel() = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLOptGroupElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLOptionElement.h b/libjava/org/w3c/dom/html2/HTMLOptionElement.h
deleted file mode 100644
index dbf7b4c2e60..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLOptionElement.h
+++ /dev/null
@@ -1,122 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLOptionElement__
-#define __org_w3c_dom_html2_HTMLOptionElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFormElement;
-            class HTMLOptionElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLOptionElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm() = 0;
-  virtual jboolean getDefaultSelected() = 0;
-  virtual void setDefaultSelected(jboolean) = 0;
-  virtual ::java::lang::String * getText() = 0;
-  virtual jint getIndex() = 0;
-  virtual jboolean getDisabled() = 0;
-  virtual void setDisabled(jboolean) = 0;
-  virtual ::java::lang::String * getLabel() = 0;
-  virtual void setLabel(::java::lang::String *) = 0;
-  virtual jboolean getSelected() = 0;
-  virtual void setSelected(jboolean) = 0;
-  virtual ::java::lang::String * getValue() = 0;
-  virtual void setValue(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLOptionElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLOptionsCollection.h b/libjava/org/w3c/dom/html2/HTMLOptionsCollection.h
deleted file mode 100644
index ac144837c6a..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLOptionsCollection.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLOptionsCollection__
-#define __org_w3c_dom_html2_HTMLOptionsCollection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace html2
-        {
-            class HTMLOptionsCollection;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLOptionsCollection : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLength() = 0;
-  virtual void setLength(jint) = 0;
-  virtual ::org::w3c::dom::Node * item(jint) = 0;
-  virtual ::org::w3c::dom::Node * namedItem(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLOptionsCollection__
diff --git a/libjava/org/w3c/dom/html2/HTMLParagraphElement.h b/libjava/org/w3c/dom/html2/HTMLParagraphElement.h
deleted file mode 100644
index 3b4b169be22..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLParagraphElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLParagraphElement__
-#define __org_w3c_dom_html2_HTMLParagraphElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLParagraphElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLParagraphElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLParagraphElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLParamElement.h b/libjava/org/w3c/dom/html2/HTMLParamElement.h
deleted file mode 100644
index 219e40d7f35..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLParamElement.h
+++ /dev/null
@@ -1,116 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLParamElement__
-#define __org_w3c_dom_html2_HTMLParamElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLParamElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLParamElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual void setType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getValue() = 0;
-  virtual void setValue(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getValueType() = 0;
-  virtual void setValueType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLParamElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLPreElement.h b/libjava/org/w3c/dom/html2/HTMLPreElement.h
deleted file mode 100644
index 54ef9434889..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLPreElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLPreElement__
-#define __org_w3c_dom_html2_HTMLPreElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLPreElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLPreElement : public ::java::lang::Object
-{
-
-public:
-  virtual jint getWidth() = 0;
-  virtual void setWidth(jint) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLPreElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLQuoteElement.h b/libjava/org/w3c/dom/html2/HTMLQuoteElement.h
deleted file mode 100644
index fe5201fbb46..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLQuoteElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLQuoteElement__
-#define __org_w3c_dom_html2_HTMLQuoteElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLQuoteElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLQuoteElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getCite() = 0;
-  virtual void setCite(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLQuoteElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLScriptElement.h b/libjava/org/w3c/dom/html2/HTMLScriptElement.h
deleted file mode 100644
index b2fbcf521a3..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLScriptElement.h
+++ /dev/null
@@ -1,122 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLScriptElement__
-#define __org_w3c_dom_html2_HTMLScriptElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLScriptElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLScriptElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getText() = 0;
-  virtual void setText(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHtmlFor() = 0;
-  virtual void setHtmlFor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getEvent() = 0;
-  virtual void setEvent(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCharset() = 0;
-  virtual void setCharset(::java::lang::String *) = 0;
-  virtual jboolean getDefer() = 0;
-  virtual void setDefer(jboolean) = 0;
-  virtual ::java::lang::String * getSrc() = 0;
-  virtual void setSrc(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual void setType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLScriptElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLSelectElement.h b/libjava/org/w3c/dom/html2/HTMLSelectElement.h
deleted file mode 100644
index e6bf83a6622..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLSelectElement.h
+++ /dev/null
@@ -1,134 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLSelectElement__
-#define __org_w3c_dom_html2_HTMLSelectElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLElement;
-            class HTMLFormElement;
-            class HTMLOptionsCollection;
-            class HTMLSelectElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLSelectElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getType() = 0;
-  virtual jint getSelectedIndex() = 0;
-  virtual void setSelectedIndex(jint) = 0;
-  virtual ::java::lang::String * getValue() = 0;
-  virtual void setValue(::java::lang::String *) = 0;
-  virtual jint getLength() = 0;
-  virtual void setLength(jint) = 0;
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm() = 0;
-  virtual ::org::w3c::dom::html2::HTMLOptionsCollection * getOptions() = 0;
-  virtual jboolean getDisabled() = 0;
-  virtual void setDisabled(jboolean) = 0;
-  virtual jboolean getMultiple() = 0;
-  virtual void setMultiple(jboolean) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual jint getSize() = 0;
-  virtual void setSize(jint) = 0;
-  virtual jint getTabIndex() = 0;
-  virtual void setTabIndex(jint) = 0;
-  virtual void add(::org::w3c::dom::html2::HTMLElement *, ::org::w3c::dom::html2::HTMLElement *) = 0;
-  virtual void remove(jint) = 0;
-  virtual void blur() = 0;
-  virtual void focus() = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLSelectElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLStyleElement.h b/libjava/org/w3c/dom/html2/HTMLStyleElement.h
deleted file mode 100644
index 23f08187eb5..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLStyleElement.h
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLStyleElement__
-#define __org_w3c_dom_html2_HTMLStyleElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLStyleElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLStyleElement : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean getDisabled() = 0;
-  virtual void setDisabled(jboolean) = 0;
-  virtual ::java::lang::String * getMedia() = 0;
-  virtual void setMedia(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual void setType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLStyleElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLTableCaptionElement.h b/libjava/org/w3c/dom/html2/HTMLTableCaptionElement.h
deleted file mode 100644
index 344f4a53e18..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLTableCaptionElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLTableCaptionElement__
-#define __org_w3c_dom_html2_HTMLTableCaptionElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLTableCaptionElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLTableCaptionElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLTableCaptionElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLTableCellElement.h b/libjava/org/w3c/dom/html2/HTMLTableCellElement.h
deleted file mode 100644
index 17e37b51559..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLTableCellElement.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLTableCellElement__
-#define __org_w3c_dom_html2_HTMLTableCellElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLTableCellElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLTableCellElement : public ::java::lang::Object
-{
-
-public:
-  virtual jint getCellIndex() = 0;
-  virtual ::java::lang::String * getAbbr() = 0;
-  virtual void setAbbr(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAxis() = 0;
-  virtual void setAxis(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBgColor() = 0;
-  virtual void setBgColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCh() = 0;
-  virtual void setCh(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getChOff() = 0;
-  virtual void setChOff(::java::lang::String *) = 0;
-  virtual jint getColSpan() = 0;
-  virtual void setColSpan(jint) = 0;
-  virtual ::java::lang::String * getHeaders() = 0;
-  virtual void setHeaders(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getHeight() = 0;
-  virtual void setHeight(::java::lang::String *) = 0;
-  virtual jboolean getNoWrap() = 0;
-  virtual void setNoWrap(jboolean) = 0;
-  virtual jint getRowSpan() = 0;
-  virtual void setRowSpan(jint) = 0;
-  virtual ::java::lang::String * getScope() = 0;
-  virtual void setScope(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getVAlign() = 0;
-  virtual void setVAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getWidth() = 0;
-  virtual void setWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLTableCellElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLTableColElement.h b/libjava/org/w3c/dom/html2/HTMLTableColElement.h
deleted file mode 100644
index a1c143d25be..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLTableColElement.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLTableColElement__
-#define __org_w3c_dom_html2_HTMLTableColElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLTableColElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLTableColElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCh() = 0;
-  virtual void setCh(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getChOff() = 0;
-  virtual void setChOff(::java::lang::String *) = 0;
-  virtual jint getSpan() = 0;
-  virtual void setSpan(jint) = 0;
-  virtual ::java::lang::String * getVAlign() = 0;
-  virtual void setVAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getWidth() = 0;
-  virtual void setWidth(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLTableColElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLTableElement.h b/libjava/org/w3c/dom/html2/HTMLTableElement.h
deleted file mode 100644
index 5f5f9ae4b26..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLTableElement.h
+++ /dev/null
@@ -1,146 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLTableElement__
-#define __org_w3c_dom_html2_HTMLTableElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLCollection;
-            class HTMLElement;
-            class HTMLTableCaptionElement;
-            class HTMLTableElement;
-            class HTMLTableSectionElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLTableElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::html2::HTMLTableCaptionElement * getCaption() = 0;
-  virtual void setCaption(::org::w3c::dom::html2::HTMLTableCaptionElement *) = 0;
-  virtual ::org::w3c::dom::html2::HTMLTableSectionElement * getTHead() = 0;
-  virtual void setTHead(::org::w3c::dom::html2::HTMLTableSectionElement *) = 0;
-  virtual ::org::w3c::dom::html2::HTMLTableSectionElement * getTFoot() = 0;
-  virtual void setTFoot(::org::w3c::dom::html2::HTMLTableSectionElement *) = 0;
-  virtual ::org::w3c::dom::html2::HTMLCollection * getRows() = 0;
-  virtual ::org::w3c::dom::html2::HTMLCollection * getTBodies() = 0;
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBgColor() = 0;
-  virtual void setBgColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBorder() = 0;
-  virtual void setBorder(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCellPadding() = 0;
-  virtual void setCellPadding(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCellSpacing() = 0;
-  virtual void setCellSpacing(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getFrame() = 0;
-  virtual void setFrame(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getRules() = 0;
-  virtual void setRules(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSummary() = 0;
-  virtual void setSummary(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getWidth() = 0;
-  virtual void setWidth(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::html2::HTMLElement * createTHead() = 0;
-  virtual void deleteTHead() = 0;
-  virtual ::org::w3c::dom::html2::HTMLElement * createTFoot() = 0;
-  virtual void deleteTFoot() = 0;
-  virtual ::org::w3c::dom::html2::HTMLElement * createCaption() = 0;
-  virtual void deleteCaption() = 0;
-  virtual ::org::w3c::dom::html2::HTMLElement * insertRow(jint) = 0;
-  virtual void deleteRow(jint) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLTableElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLTableRowElement.h b/libjava/org/w3c/dom/html2/HTMLTableRowElement.h
deleted file mode 100644
index a8d59eaec01..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLTableRowElement.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLTableRowElement__
-#define __org_w3c_dom_html2_HTMLTableRowElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLCollection;
-            class HTMLElement;
-            class HTMLTableRowElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLTableRowElement : public ::java::lang::Object
-{
-
-public:
-  virtual jint getRowIndex() = 0;
-  virtual jint getSectionRowIndex() = 0;
-  virtual ::org::w3c::dom::html2::HTMLCollection * getCells() = 0;
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBgColor() = 0;
-  virtual void setBgColor(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCh() = 0;
-  virtual void setCh(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getChOff() = 0;
-  virtual void setChOff(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getVAlign() = 0;
-  virtual void setVAlign(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::html2::HTMLElement * insertCell(jint) = 0;
-  virtual void deleteCell(jint) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLTableRowElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLTableSectionElement.h b/libjava/org/w3c/dom/html2/HTMLTableSectionElement.h
deleted file mode 100644
index 3bec0b39ba0..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLTableSectionElement.h
+++ /dev/null
@@ -1,121 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLTableSectionElement__
-#define __org_w3c_dom_html2_HTMLTableSectionElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLCollection;
-            class HTMLElement;
-            class HTMLTableSectionElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLTableSectionElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getAlign() = 0;
-  virtual void setAlign(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getCh() = 0;
-  virtual void setCh(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getChOff() = 0;
-  virtual void setChOff(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getVAlign() = 0;
-  virtual void setVAlign(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::html2::HTMLCollection * getRows() = 0;
-  virtual ::org::w3c::dom::html2::HTMLElement * insertRow(jint) = 0;
-  virtual void deleteRow(jint) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLTableSectionElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLTextAreaElement.h b/libjava/org/w3c/dom/html2/HTMLTextAreaElement.h
deleted file mode 100644
index 844493c1e97..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLTextAreaElement.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLTextAreaElement__
-#define __org_w3c_dom_html2_HTMLTextAreaElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLFormElement;
-            class HTMLTextAreaElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLTextAreaElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getDefaultValue() = 0;
-  virtual void setDefaultValue(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::html2::HTMLFormElement * getForm() = 0;
-  virtual ::java::lang::String * getAccessKey() = 0;
-  virtual void setAccessKey(::java::lang::String *) = 0;
-  virtual jint getCols() = 0;
-  virtual void setCols(jint) = 0;
-  virtual jboolean getDisabled() = 0;
-  virtual void setDisabled(jboolean) = 0;
-  virtual ::java::lang::String * getName() = 0;
-  virtual void setName(::java::lang::String *) = 0;
-  virtual jboolean getReadOnly() = 0;
-  virtual void setReadOnly(jboolean) = 0;
-  virtual jint getRows() = 0;
-  virtual void setRows(jint) = 0;
-  virtual jint getTabIndex() = 0;
-  virtual void setTabIndex(jint) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual ::java::lang::String * getValue() = 0;
-  virtual void setValue(::java::lang::String *) = 0;
-  virtual void blur() = 0;
-  virtual void focus() = 0;
-  virtual void select() = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLTextAreaElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLTitleElement.h b/libjava/org/w3c/dom/html2/HTMLTitleElement.h
deleted file mode 100644
index edc44660171..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLTitleElement.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLTitleElement__
-#define __org_w3c_dom_html2_HTMLTitleElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLTitleElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLTitleElement : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getText() = 0;
-  virtual void setText(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLTitleElement__
diff --git a/libjava/org/w3c/dom/html2/HTMLUListElement.h b/libjava/org/w3c/dom/html2/HTMLUListElement.h
deleted file mode 100644
index 4e327652e5e..00000000000
--- a/libjava/org/w3c/dom/html2/HTMLUListElement.h
+++ /dev/null
@@ -1,112 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_html2_HTMLUListElement__
-#define __org_w3c_dom_html2_HTMLUListElement__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Attr;
-          class Document;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class TypeInfo;
-          class UserDataHandler;
-        namespace html2
-        {
-            class HTMLUListElement;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::html2::HTMLUListElement : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean getCompact() = 0;
-  virtual void setCompact(jboolean) = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual void setType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getId() = 0;
-  virtual void setId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual void setTitle(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLang() = 0;
-  virtual void setLang(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getDir() = 0;
-  virtual void setDir(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getClassName() = 0;
-  virtual void setClassName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getTagName() = 0;
-  virtual ::java::lang::String * getAttribute(::java::lang::String *) = 0;
-  virtual void setAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttribute(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNode(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::Attr * removeAttributeNode(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagName(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void setAttributeNS(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void removeAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * getAttributeNodeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Attr * setAttributeNodeNS(::org::w3c::dom::Attr *) = 0;
-  virtual ::org::w3c::dom::NodeList * getElementsByTagNameNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean hasAttribute(::java::lang::String *) = 0;
-  virtual jboolean hasAttributeNS(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::TypeInfo * getSchemaTypeInfo() = 0;
-  virtual void setIdAttribute(::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNS(::java::lang::String *, ::java::lang::String *, jboolean) = 0;
-  virtual void setIdAttributeNode(::org::w3c::dom::Attr *, jboolean) = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_html2_HTMLUListElement__
diff --git a/libjava/org/w3c/dom/ls/DOMImplementationLS.h b/libjava/org/w3c/dom/ls/DOMImplementationLS.h
deleted file mode 100644
index f94da31fd38..00000000000
--- a/libjava/org/w3c/dom/ls/DOMImplementationLS.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_DOMImplementationLS__
-#define __org_w3c_dom_ls_DOMImplementationLS__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class DOMImplementationLS;
-            class LSInput;
-            class LSOutput;
-            class LSParser;
-            class LSSerializer;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::DOMImplementationLS : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::ls::LSParser * createLSParser(jshort, ::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::ls::LSSerializer * createLSSerializer() = 0;
-  virtual ::org::w3c::dom::ls::LSInput * createLSInput() = 0;
-  virtual ::org::w3c::dom::ls::LSOutput * createLSOutput() = 0;
-  static const jshort MODE_SYNCHRONOUS = 1;
-  static const jshort MODE_ASYNCHRONOUS = 2;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ls_DOMImplementationLS__
diff --git a/libjava/org/w3c/dom/ls/LSException.h b/libjava/org/w3c/dom/ls/LSException.h
deleted file mode 100644
index c1444406724..00000000000
--- a/libjava/org/w3c/dom/ls/LSException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_LSException__
-#define __org_w3c_dom_ls_LSException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSException;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::LSException : public ::java::lang::RuntimeException
-{
-
-public:
-  LSException(jshort, ::java::lang::String *);
-  jshort __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) code;
-  static const jshort PARSE_ERR = 81;
-  static const jshort SERIALIZE_ERR = 82;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_w3c_dom_ls_LSException__
diff --git a/libjava/org/w3c/dom/ls/LSInput.h b/libjava/org/w3c/dom/ls/LSInput.h
deleted file mode 100644
index 8dd9da1747a..00000000000
--- a/libjava/org/w3c/dom/ls/LSInput.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_LSInput__
-#define __org_w3c_dom_ls_LSInput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSInput;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::LSInput : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::io::Reader * getCharacterStream() = 0;
-  virtual void setCharacterStream(::java::io::Reader *) = 0;
-  virtual ::java::io::InputStream * getByteStream() = 0;
-  virtual void setByteStream(::java::io::InputStream *) = 0;
-  virtual ::java::lang::String * getStringData() = 0;
-  virtual void setStringData(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual void setSystemId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual void setPublicId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual void setBaseURI(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getEncoding() = 0;
-  virtual void setEncoding(::java::lang::String *) = 0;
-  virtual jboolean getCertifiedText() = 0;
-  virtual void setCertifiedText(jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ls_LSInput__
diff --git a/libjava/org/w3c/dom/ls/LSLoadEvent.h b/libjava/org/w3c/dom/ls/LSLoadEvent.h
deleted file mode 100644
index 9c630339283..00000000000
--- a/libjava/org/w3c/dom/ls/LSLoadEvent.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_LSLoadEvent__
-#define __org_w3c_dom_ls_LSLoadEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-        namespace events
-        {
-            class EventTarget;
-        }
-        namespace ls
-        {
-            class LSInput;
-            class LSLoadEvent;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::LSLoadEvent : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Document * getNewDocument() = 0;
-  virtual ::org::w3c::dom::ls::LSInput * getInput() = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getTarget() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getCurrentTarget() = 0;
-  virtual jshort getEventPhase() = 0;
-  virtual jboolean getBubbles() = 0;
-  virtual jboolean getCancelable() = 0;
-  virtual jlong getTimeStamp() = 0;
-  virtual void stopPropagation() = 0;
-  virtual void preventDefault() = 0;
-  virtual void initEvent(::java::lang::String *, jboolean, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ls_LSLoadEvent__
diff --git a/libjava/org/w3c/dom/ls/LSOutput.h b/libjava/org/w3c/dom/ls/LSOutput.h
deleted file mode 100644
index 6d3990eb828..00000000000
--- a/libjava/org/w3c/dom/ls/LSOutput.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_LSOutput__
-#define __org_w3c_dom_ls_LSOutput__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSOutput;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::LSOutput : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::io::Writer * getCharacterStream() = 0;
-  virtual void setCharacterStream(::java::io::Writer *) = 0;
-  virtual ::java::io::OutputStream * getByteStream() = 0;
-  virtual void setByteStream(::java::io::OutputStream *) = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual void setSystemId(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getEncoding() = 0;
-  virtual void setEncoding(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ls_LSOutput__
diff --git a/libjava/org/w3c/dom/ls/LSParser.h b/libjava/org/w3c/dom/ls/LSParser.h
deleted file mode 100644
index 2f1e3f3c790..00000000000
--- a/libjava/org/w3c/dom/ls/LSParser.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_LSParser__
-#define __org_w3c_dom_ls_LSParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMConfiguration;
-          class Document;
-          class Node;
-        namespace ls
-        {
-            class LSInput;
-            class LSParser;
-            class LSParserFilter;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::LSParser : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::DOMConfiguration * getDomConfig() = 0;
-  virtual ::org::w3c::dom::ls::LSParserFilter * getFilter() = 0;
-  virtual void setFilter(::org::w3c::dom::ls::LSParserFilter *) = 0;
-  virtual jboolean getAsync() = 0;
-  virtual jboolean getBusy() = 0;
-  virtual ::org::w3c::dom::Document * parse(::org::w3c::dom::ls::LSInput *) = 0;
-  virtual ::org::w3c::dom::Document * parseURI(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::Node * parseWithContext(::org::w3c::dom::ls::LSInput *, ::org::w3c::dom::Node *, jshort) = 0;
-  virtual void abort() = 0;
-  static const jshort ACTION_APPEND_AS_CHILDREN = 1;
-  static const jshort ACTION_REPLACE_CHILDREN = 2;
-  static const jshort ACTION_INSERT_BEFORE = 3;
-  static const jshort ACTION_INSERT_AFTER = 4;
-  static const jshort ACTION_REPLACE = 5;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ls_LSParser__
diff --git a/libjava/org/w3c/dom/ls/LSParserFilter.h b/libjava/org/w3c/dom/ls/LSParserFilter.h
deleted file mode 100644
index 8a72aaa5d62..00000000000
--- a/libjava/org/w3c/dom/ls/LSParserFilter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_LSParserFilter__
-#define __org_w3c_dom_ls_LSParserFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Element;
-          class Node;
-        namespace ls
-        {
-            class LSParserFilter;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::LSParserFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jshort startElement(::org::w3c::dom::Element *) = 0;
-  virtual jshort acceptNode(::org::w3c::dom::Node *) = 0;
-  virtual jint getWhatToShow() = 0;
-  static const jshort FILTER_ACCEPT = 1;
-  static const jshort FILTER_REJECT = 2;
-  static const jshort FILTER_SKIP = 3;
-  static const jshort FILTER_INTERRUPT = 4;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ls_LSParserFilter__
diff --git a/libjava/org/w3c/dom/ls/LSProgressEvent.h b/libjava/org/w3c/dom/ls/LSProgressEvent.h
deleted file mode 100644
index 23762050766..00000000000
--- a/libjava/org/w3c/dom/ls/LSProgressEvent.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_LSProgressEvent__
-#define __org_w3c_dom_ls_LSProgressEvent__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace events
-        {
-            class EventTarget;
-        }
-        namespace ls
-        {
-            class LSInput;
-            class LSProgressEvent;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::LSProgressEvent : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::ls::LSInput * getInput() = 0;
-  virtual jint getPosition() = 0;
-  virtual jint getTotalSize() = 0;
-  virtual ::java::lang::String * getType() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getTarget() = 0;
-  virtual ::org::w3c::dom::events::EventTarget * getCurrentTarget() = 0;
-  virtual jshort getEventPhase() = 0;
-  virtual jboolean getBubbles() = 0;
-  virtual jboolean getCancelable() = 0;
-  virtual jlong getTimeStamp() = 0;
-  virtual void stopPropagation() = 0;
-  virtual void preventDefault() = 0;
-  virtual void initEvent(::java::lang::String *, jboolean, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ls_LSProgressEvent__
diff --git a/libjava/org/w3c/dom/ls/LSResourceResolver.h b/libjava/org/w3c/dom/ls/LSResourceResolver.h
deleted file mode 100644
index 3a983ebeac6..00000000000
--- a/libjava/org/w3c/dom/ls/LSResourceResolver.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_LSResourceResolver__
-#define __org_w3c_dom_ls_LSResourceResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ls
-        {
-            class LSInput;
-            class LSResourceResolver;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::LSResourceResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::ls::LSInput * resolveResource(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ls_LSResourceResolver__
diff --git a/libjava/org/w3c/dom/ls/LSSerializer.h b/libjava/org/w3c/dom/ls/LSSerializer.h
deleted file mode 100644
index 11ead65b906..00000000000
--- a/libjava/org/w3c/dom/ls/LSSerializer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_LSSerializer__
-#define __org_w3c_dom_ls_LSSerializer__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DOMConfiguration;
-          class Node;
-        namespace ls
-        {
-            class LSOutput;
-            class LSSerializer;
-            class LSSerializerFilter;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::LSSerializer : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::DOMConfiguration * getDomConfig() = 0;
-  virtual ::java::lang::String * getNewLine() = 0;
-  virtual void setNewLine(::java::lang::String *) = 0;
-  virtual ::org::w3c::dom::ls::LSSerializerFilter * getFilter() = 0;
-  virtual void setFilter(::org::w3c::dom::ls::LSSerializerFilter *) = 0;
-  virtual jboolean write(::org::w3c::dom::Node *, ::org::w3c::dom::ls::LSOutput *) = 0;
-  virtual jboolean writeToURI(::org::w3c::dom::Node *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * writeToString(::org::w3c::dom::Node *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ls_LSSerializer__
diff --git a/libjava/org/w3c/dom/ls/LSSerializerFilter.h b/libjava/org/w3c/dom/ls/LSSerializerFilter.h
deleted file mode 100644
index d56e7d4f9f3..00000000000
--- a/libjava/org/w3c/dom/ls/LSSerializerFilter.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ls_LSSerializerFilter__
-#define __org_w3c_dom_ls_LSSerializerFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace ls
-        {
-            class LSSerializerFilter;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ls::LSSerializerFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jint getWhatToShow() = 0;
-  virtual jshort acceptNode(::org::w3c::dom::Node *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ls_LSSerializerFilter__
diff --git a/libjava/org/w3c/dom/ranges/DocumentRange.h b/libjava/org/w3c/dom/ranges/DocumentRange.h
deleted file mode 100644
index e7a0cbe6aed..00000000000
--- a/libjava/org/w3c/dom/ranges/DocumentRange.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ranges_DocumentRange__
-#define __org_w3c_dom_ranges_DocumentRange__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ranges
-        {
-            class DocumentRange;
-            class Range;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ranges::DocumentRange : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::ranges::Range * createRange() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ranges_DocumentRange__
diff --git a/libjava/org/w3c/dom/ranges/Range.h b/libjava/org/w3c/dom/ranges/Range.h
deleted file mode 100644
index 743989a064b..00000000000
--- a/libjava/org/w3c/dom/ranges/Range.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ranges_Range__
-#define __org_w3c_dom_ranges_Range__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class DocumentFragment;
-          class Node;
-        namespace ranges
-        {
-            class Range;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ranges::Range : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Node * getStartContainer() = 0;
-  virtual jint getStartOffset() = 0;
-  virtual ::org::w3c::dom::Node * getEndContainer() = 0;
-  virtual jint getEndOffset() = 0;
-  virtual jboolean getCollapsed() = 0;
-  virtual ::org::w3c::dom::Node * getCommonAncestorContainer() = 0;
-  virtual void setStart(::org::w3c::dom::Node *, jint) = 0;
-  virtual void setEnd(::org::w3c::dom::Node *, jint) = 0;
-  virtual void setStartBefore(::org::w3c::dom::Node *) = 0;
-  virtual void setStartAfter(::org::w3c::dom::Node *) = 0;
-  virtual void setEndBefore(::org::w3c::dom::Node *) = 0;
-  virtual void setEndAfter(::org::w3c::dom::Node *) = 0;
-  virtual void collapse(jboolean) = 0;
-  virtual void selectNode(::org::w3c::dom::Node *) = 0;
-  virtual void selectNodeContents(::org::w3c::dom::Node *) = 0;
-  virtual jshort compareBoundaryPoints(jshort, ::org::w3c::dom::ranges::Range *) = 0;
-  virtual void deleteContents() = 0;
-  virtual ::org::w3c::dom::DocumentFragment * extractContents() = 0;
-  virtual ::org::w3c::dom::DocumentFragment * cloneContents() = 0;
-  virtual void insertNode(::org::w3c::dom::Node *) = 0;
-  virtual void surroundContents(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::ranges::Range * cloneRange() = 0;
-  virtual ::java::lang::String * toString() = 0;
-  virtual void detach() = 0;
-  static const jshort START_TO_START = 0;
-  static const jshort START_TO_END = 1;
-  static const jshort END_TO_END = 2;
-  static const jshort END_TO_START = 3;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_ranges_Range__
diff --git a/libjava/org/w3c/dom/ranges/RangeException.h b/libjava/org/w3c/dom/ranges/RangeException.h
deleted file mode 100644
index 50efa0f782a..00000000000
--- a/libjava/org/w3c/dom/ranges/RangeException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_ranges_RangeException__
-#define __org_w3c_dom_ranges_RangeException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace ranges
-        {
-            class RangeException;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::ranges::RangeException : public ::java::lang::RuntimeException
-{
-
-public:
-  RangeException(jshort, ::java::lang::String *);
-  jshort __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) code;
-  static const jshort BAD_BOUNDARYPOINTS_ERR = 1;
-  static const jshort INVALID_NODE_TYPE_ERR = 2;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_w3c_dom_ranges_RangeException__
diff --git a/libjava/org/w3c/dom/stylesheets/DocumentStyle.h b/libjava/org/w3c/dom/stylesheets/DocumentStyle.h
deleted file mode 100644
index f758d8647d4..00000000000
--- a/libjava/org/w3c/dom/stylesheets/DocumentStyle.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_stylesheets_DocumentStyle__
-#define __org_w3c_dom_stylesheets_DocumentStyle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace stylesheets
-        {
-            class DocumentStyle;
-            class StyleSheetList;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::stylesheets::DocumentStyle : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::stylesheets::StyleSheetList * getStyleSheets() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_stylesheets_DocumentStyle__
diff --git a/libjava/org/w3c/dom/stylesheets/LinkStyle.h b/libjava/org/w3c/dom/stylesheets/LinkStyle.h
deleted file mode 100644
index f18a57a357d..00000000000
--- a/libjava/org/w3c/dom/stylesheets/LinkStyle.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_stylesheets_LinkStyle__
-#define __org_w3c_dom_stylesheets_LinkStyle__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace stylesheets
-        {
-            class LinkStyle;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::stylesheets::LinkStyle : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::stylesheets::StyleSheet * getSheet() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_stylesheets_LinkStyle__
diff --git a/libjava/org/w3c/dom/stylesheets/MediaList.h b/libjava/org/w3c/dom/stylesheets/MediaList.h
deleted file mode 100644
index 92d2130aa5b..00000000000
--- a/libjava/org/w3c/dom/stylesheets/MediaList.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_stylesheets_MediaList__
-#define __org_w3c_dom_stylesheets_MediaList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace stylesheets
-        {
-            class MediaList;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::stylesheets::MediaList : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getMediaText() = 0;
-  virtual void setMediaText(::java::lang::String *) = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::String * item(jint) = 0;
-  virtual void deleteMedium(::java::lang::String *) = 0;
-  virtual void appendMedium(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_stylesheets_MediaList__
diff --git a/libjava/org/w3c/dom/stylesheets/StyleSheet.h b/libjava/org/w3c/dom/stylesheets/StyleSheet.h
deleted file mode 100644
index 7a8a9701204..00000000000
--- a/libjava/org/w3c/dom/stylesheets/StyleSheet.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_stylesheets_StyleSheet__
-#define __org_w3c_dom_stylesheets_StyleSheet__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace stylesheets
-        {
-            class MediaList;
-            class StyleSheet;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::stylesheets::StyleSheet : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getType() = 0;
-  virtual jboolean getDisabled() = 0;
-  virtual void setDisabled(jboolean) = 0;
-  virtual ::org::w3c::dom::Node * getOwnerNode() = 0;
-  virtual ::org::w3c::dom::stylesheets::StyleSheet * getParentStyleSheet() = 0;
-  virtual ::java::lang::String * getHref() = 0;
-  virtual ::java::lang::String * getTitle() = 0;
-  virtual ::org::w3c::dom::stylesheets::MediaList * getMedia() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_stylesheets_StyleSheet__
diff --git a/libjava/org/w3c/dom/stylesheets/StyleSheetList.h b/libjava/org/w3c/dom/stylesheets/StyleSheetList.h
deleted file mode 100644
index 4e6cb06cb37..00000000000
--- a/libjava/org/w3c/dom/stylesheets/StyleSheetList.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_stylesheets_StyleSheetList__
-#define __org_w3c_dom_stylesheets_StyleSheetList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace stylesheets
-        {
-            class StyleSheet;
-            class StyleSheetList;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::stylesheets::StyleSheetList : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLength() = 0;
-  virtual ::org::w3c::dom::stylesheets::StyleSheet * item(jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_stylesheets_StyleSheetList__
diff --git a/libjava/org/w3c/dom/traversal/DocumentTraversal.h b/libjava/org/w3c/dom/traversal/DocumentTraversal.h
deleted file mode 100644
index d4c53b38c7b..00000000000
--- a/libjava/org/w3c/dom/traversal/DocumentTraversal.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_traversal_DocumentTraversal__
-#define __org_w3c_dom_traversal_DocumentTraversal__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace traversal
-        {
-            class DocumentTraversal;
-            class NodeFilter;
-            class NodeIterator;
-            class TreeWalker;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::traversal::DocumentTraversal : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::traversal::NodeIterator * createNodeIterator(::org::w3c::dom::Node *, jint, ::org::w3c::dom::traversal::NodeFilter *, jboolean) = 0;
-  virtual ::org::w3c::dom::traversal::TreeWalker * createTreeWalker(::org::w3c::dom::Node *, jint, ::org::w3c::dom::traversal::NodeFilter *, jboolean) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_traversal_DocumentTraversal__
diff --git a/libjava/org/w3c/dom/traversal/NodeFilter.h b/libjava/org/w3c/dom/traversal/NodeFilter.h
deleted file mode 100644
index 949c567d9a6..00000000000
--- a/libjava/org/w3c/dom/traversal/NodeFilter.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_traversal_NodeFilter__
-#define __org_w3c_dom_traversal_NodeFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace traversal
-        {
-            class NodeFilter;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::traversal::NodeFilter : public ::java::lang::Object
-{
-
-public:
-  virtual jshort acceptNode(::org::w3c::dom::Node *) = 0;
-  static const jshort FILTER_ACCEPT = 1;
-  static const jshort FILTER_REJECT = 2;
-  static const jshort FILTER_SKIP = 3;
-  static const jint SHOW_ALL = -1;
-  static const jint SHOW_ELEMENT = 1;
-  static const jint SHOW_ATTRIBUTE = 2;
-  static const jint SHOW_TEXT = 4;
-  static const jint SHOW_CDATA_SECTION = 8;
-  static const jint SHOW_ENTITY_REFERENCE = 16;
-  static const jint SHOW_ENTITY = 32;
-  static const jint SHOW_PROCESSING_INSTRUCTION = 64;
-  static const jint SHOW_COMMENT = 128;
-  static const jint SHOW_DOCUMENT = 256;
-  static const jint SHOW_DOCUMENT_TYPE = 512;
-  static const jint SHOW_DOCUMENT_FRAGMENT = 1024;
-  static const jint SHOW_NOTATION = 2048;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_traversal_NodeFilter__
diff --git a/libjava/org/w3c/dom/traversal/NodeIterator.h b/libjava/org/w3c/dom/traversal/NodeIterator.h
deleted file mode 100644
index b5410dfd518..00000000000
--- a/libjava/org/w3c/dom/traversal/NodeIterator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_traversal_NodeIterator__
-#define __org_w3c_dom_traversal_NodeIterator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace traversal
-        {
-            class NodeFilter;
-            class NodeIterator;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::traversal::NodeIterator : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Node * getRoot() = 0;
-  virtual jint getWhatToShow() = 0;
-  virtual ::org::w3c::dom::traversal::NodeFilter * getFilter() = 0;
-  virtual jboolean getExpandEntityReferences() = 0;
-  virtual ::org::w3c::dom::Node * nextNode() = 0;
-  virtual ::org::w3c::dom::Node * previousNode() = 0;
-  virtual void detach() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_traversal_NodeIterator__
diff --git a/libjava/org/w3c/dom/traversal/TreeWalker.h b/libjava/org/w3c/dom/traversal/TreeWalker.h
deleted file mode 100644
index 77a7eeba1a1..00000000000
--- a/libjava/org/w3c/dom/traversal/TreeWalker.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_traversal_TreeWalker__
-#define __org_w3c_dom_traversal_TreeWalker__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace traversal
-        {
-            class NodeFilter;
-            class TreeWalker;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::traversal::TreeWalker : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Node * getRoot() = 0;
-  virtual jint getWhatToShow() = 0;
-  virtual ::org::w3c::dom::traversal::NodeFilter * getFilter() = 0;
-  virtual jboolean getExpandEntityReferences() = 0;
-  virtual ::org::w3c::dom::Node * getCurrentNode() = 0;
-  virtual void setCurrentNode(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * parentNode() = 0;
-  virtual ::org::w3c::dom::Node * firstChild() = 0;
-  virtual ::org::w3c::dom::Node * lastChild() = 0;
-  virtual ::org::w3c::dom::Node * previousSibling() = 0;
-  virtual ::org::w3c::dom::Node * nextSibling() = 0;
-  virtual ::org::w3c::dom::Node * previousNode() = 0;
-  virtual ::org::w3c::dom::Node * nextNode() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_traversal_TreeWalker__
diff --git a/libjava/org/w3c/dom/views/AbstractView.h b/libjava/org/w3c/dom/views/AbstractView.h
deleted file mode 100644
index 69cc4b27151..00000000000
--- a/libjava/org/w3c/dom/views/AbstractView.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_views_AbstractView__
-#define __org_w3c_dom_views_AbstractView__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace views
-        {
-            class AbstractView;
-            class DocumentView;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::views::AbstractView : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::views::DocumentView * getDocument() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_views_AbstractView__
diff --git a/libjava/org/w3c/dom/views/DocumentView.h b/libjava/org/w3c/dom/views/DocumentView.h
deleted file mode 100644
index c6e25e0ce99..00000000000
--- a/libjava/org/w3c/dom/views/DocumentView.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_views_DocumentView__
-#define __org_w3c_dom_views_DocumentView__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace views
-        {
-            class AbstractView;
-            class DocumentView;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::views::DocumentView : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::views::AbstractView * getDefaultView() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_views_DocumentView__
diff --git a/libjava/org/w3c/dom/xpath/XPathEvaluator.h b/libjava/org/w3c/dom/xpath/XPathEvaluator.h
deleted file mode 100644
index c8c52960f85..00000000000
--- a/libjava/org/w3c/dom/xpath/XPathEvaluator.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_xpath_XPathEvaluator__
-#define __org_w3c_dom_xpath_XPathEvaluator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace xpath
-        {
-            class XPathEvaluator;
-            class XPathExpression;
-            class XPathNSResolver;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::xpath::XPathEvaluator : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::xpath::XPathExpression * createExpression(::java::lang::String *, ::org::w3c::dom::xpath::XPathNSResolver *) = 0;
-  virtual ::org::w3c::dom::xpath::XPathNSResolver * createNSResolver(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::w3c::dom::Node *, ::org::w3c::dom::xpath::XPathNSResolver *, jshort, ::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_xpath_XPathEvaluator__
diff --git a/libjava/org/w3c/dom/xpath/XPathException.h b/libjava/org/w3c/dom/xpath/XPathException.h
deleted file mode 100644
index 2060b858363..00000000000
--- a/libjava/org/w3c/dom/xpath/XPathException.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_xpath_XPathException__
-#define __org_w3c_dom_xpath_XPathException__
-
-#pragma interface
-
-#include <java/lang/RuntimeException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace xpath
-        {
-            class XPathException;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::xpath::XPathException : public ::java::lang::RuntimeException
-{
-
-public:
-  XPathException(jshort, ::java::lang::String *);
-  jshort __attribute__((aligned(__alignof__( ::java::lang::RuntimeException)))) code;
-  static const jshort INVALID_EXPRESSION_ERR = 51;
-  static const jshort TYPE_ERR = 52;
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_w3c_dom_xpath_XPathException__
diff --git a/libjava/org/w3c/dom/xpath/XPathExpression.h b/libjava/org/w3c/dom/xpath/XPathExpression.h
deleted file mode 100644
index 22a7c268b78..00000000000
--- a/libjava/org/w3c/dom/xpath/XPathExpression.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_xpath_XPathExpression__
-#define __org_w3c_dom_xpath_XPathExpression__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace xpath
-        {
-            class XPathExpression;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::xpath::XPathExpression : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jshort, ::java::lang::Object *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_xpath_XPathExpression__
diff --git a/libjava/org/w3c/dom/xpath/XPathNSResolver.h b/libjava/org/w3c/dom/xpath/XPathNSResolver.h
deleted file mode 100644
index ce05a57e5b2..00000000000
--- a/libjava/org/w3c/dom/xpath/XPathNSResolver.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_xpath_XPathNSResolver__
-#define __org_w3c_dom_xpath_XPathNSResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-        namespace xpath
-        {
-            class XPathNSResolver;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::xpath::XPathNSResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_xpath_XPathNSResolver__
diff --git a/libjava/org/w3c/dom/xpath/XPathNamespace.h b/libjava/org/w3c/dom/xpath/XPathNamespace.h
deleted file mode 100644
index 816c751ad78..00000000000
--- a/libjava/org/w3c/dom/xpath/XPathNamespace.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_xpath_XPathNamespace__
-#define __org_w3c_dom_xpath_XPathNamespace__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Document;
-          class Element;
-          class NamedNodeMap;
-          class Node;
-          class NodeList;
-          class UserDataHandler;
-        namespace xpath
-        {
-            class XPathNamespace;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::xpath::XPathNamespace : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::w3c::dom::Element * getOwnerElement() = 0;
-  virtual ::java::lang::String * getNodeName() = 0;
-  virtual ::java::lang::String * getNodeValue() = 0;
-  virtual void setNodeValue(::java::lang::String *) = 0;
-  virtual jshort getNodeType() = 0;
-  virtual ::org::w3c::dom::Node * getParentNode() = 0;
-  virtual ::org::w3c::dom::NodeList * getChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * getFirstChild() = 0;
-  virtual ::org::w3c::dom::Node * getLastChild() = 0;
-  virtual ::org::w3c::dom::Node * getPreviousSibling() = 0;
-  virtual ::org::w3c::dom::Node * getNextSibling() = 0;
-  virtual ::org::w3c::dom::NamedNodeMap * getAttributes() = 0;
-  virtual ::org::w3c::dom::Document * getOwnerDocument() = 0;
-  virtual ::org::w3c::dom::Node * insertBefore(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * replaceChild(::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * removeChild(::org::w3c::dom::Node *) = 0;
-  virtual ::org::w3c::dom::Node * appendChild(::org::w3c::dom::Node *) = 0;
-  virtual jboolean hasChildNodes() = 0;
-  virtual ::org::w3c::dom::Node * cloneNode(jboolean) = 0;
-  virtual void normalize() = 0;
-  virtual jboolean isSupported(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getNamespaceURI() = 0;
-  virtual ::java::lang::String * getPrefix() = 0;
-  virtual void setPrefix(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getLocalName() = 0;
-  virtual jboolean hasAttributes() = 0;
-  virtual ::java::lang::String * getBaseURI() = 0;
-  virtual jshort compareDocumentPosition(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * getTextContent() = 0;
-  virtual void setTextContent(::java::lang::String *) = 0;
-  virtual jboolean isSameNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::String * lookupPrefix(::java::lang::String *) = 0;
-  virtual jboolean isDefaultNamespace(::java::lang::String *) = 0;
-  virtual ::java::lang::String * lookupNamespaceURI(::java::lang::String *) = 0;
-  virtual jboolean isEqualNode(::org::w3c::dom::Node *) = 0;
-  virtual ::java::lang::Object * getFeature(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::Object * setUserData(::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::UserDataHandler *) = 0;
-  virtual ::java::lang::Object * getUserData(::java::lang::String *) = 0;
-  static const jshort XPATH_NAMESPACE_NODE = 13;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_xpath_XPathNamespace__
diff --git a/libjava/org/w3c/dom/xpath/XPathResult.h b/libjava/org/w3c/dom/xpath/XPathResult.h
deleted file mode 100644
index 7922d250fff..00000000000
--- a/libjava/org/w3c/dom/xpath/XPathResult.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_w3c_dom_xpath_XPathResult__
-#define __org_w3c_dom_xpath_XPathResult__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace w3c
-    {
-      namespace dom
-      {
-          class Node;
-        namespace xpath
-        {
-            class XPathResult;
-        }
-      }
-    }
-  }
-}
-
-class org::w3c::dom::xpath::XPathResult : public ::java::lang::Object
-{
-
-public:
-  virtual jshort getResultType() = 0;
-  virtual jdouble getNumberValue() = 0;
-  virtual ::java::lang::String * getStringValue() = 0;
-  virtual jboolean getBooleanValue() = 0;
-  virtual ::org::w3c::dom::Node * getSingleNodeValue() = 0;
-  virtual jboolean getInvalidIteratorState() = 0;
-  virtual jint getSnapshotLength() = 0;
-  virtual ::org::w3c::dom::Node * iterateNext() = 0;
-  virtual ::org::w3c::dom::Node * snapshotItem(jint) = 0;
-  static const jshort ANY_TYPE = 0;
-  static const jshort NUMBER_TYPE = 1;
-  static const jshort STRING_TYPE = 2;
-  static const jshort BOOLEAN_TYPE = 3;
-  static const jshort UNORDERED_NODE_ITERATOR_TYPE = 4;
-  static const jshort ORDERED_NODE_ITERATOR_TYPE = 5;
-  static const jshort UNORDERED_NODE_SNAPSHOT_TYPE = 6;
-  static const jshort ORDERED_NODE_SNAPSHOT_TYPE = 7;
-  static const jshort ANY_UNORDERED_NODE_TYPE = 8;
-  static const jshort FIRST_ORDERED_NODE_TYPE = 9;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_w3c_dom_xpath_XPathResult__
diff --git a/libjava/org/xml/sax/AttributeList.h b/libjava/org/xml/sax/AttributeList.h
deleted file mode 100644
index e07e396c7a2..00000000000
--- a/libjava/org/xml/sax/AttributeList.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_AttributeList__
-#define __org_xml_sax_AttributeList__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class AttributeList;
-      }
-    }
-  }
-}
-
-class org::xml::sax::AttributeList : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLength() = 0;
-  virtual ::java::lang::String * getName(jint) = 0;
-  virtual ::java::lang::String * getType(jint) = 0;
-  virtual ::java::lang::String * getValue(jint) = 0;
-  virtual ::java::lang::String * getType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_AttributeList__
diff --git a/libjava/org/xml/sax/Attributes.h b/libjava/org/xml/sax/Attributes.h
deleted file mode 100644
index 21bde82ad36..00000000000
--- a/libjava/org/xml/sax/Attributes.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_Attributes__
-#define __org_xml_sax_Attributes__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-      }
-    }
-  }
-}
-
-class org::xml::sax::Attributes : public ::java::lang::Object
-{
-
-public:
-  virtual jint getLength() = 0;
-  virtual ::java::lang::String * getURI(jint) = 0;
-  virtual ::java::lang::String * getLocalName(jint) = 0;
-  virtual ::java::lang::String * getQName(jint) = 0;
-  virtual ::java::lang::String * getType(jint) = 0;
-  virtual ::java::lang::String * getValue(jint) = 0;
-  virtual jint getIndex(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jint getIndex(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getType(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getValue(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_Attributes__
diff --git a/libjava/org/xml/sax/ContentHandler.h b/libjava/org/xml/sax/ContentHandler.h
deleted file mode 100644
index ddbae8eba4c..00000000000
--- a/libjava/org/xml/sax/ContentHandler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_ContentHandler__
-#define __org_xml_sax_ContentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class ContentHandler;
-          class Locator;
-      }
-    }
-  }
-}
-
-class org::xml::sax::ContentHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void setDocumentLocator(::org::xml::sax::Locator *) = 0;
-  virtual void startDocument() = 0;
-  virtual void endDocument() = 0;
-  virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void endPrefixMapping(::java::lang::String *) = 0;
-  virtual void startElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::org::xml::sax::Attributes *) = 0;
-  virtual void endElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void characters(JArray< jchar > *, jint, jint) = 0;
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint) = 0;
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void skippedEntity(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_ContentHandler__
diff --git a/libjava/org/xml/sax/DTDHandler.h b/libjava/org/xml/sax/DTDHandler.h
deleted file mode 100644
index 3ff791ae0ce..00000000000
--- a/libjava/org/xml/sax/DTDHandler.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_DTDHandler__
-#define __org_xml_sax_DTDHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class DTDHandler;
-      }
-    }
-  }
-}
-
-class org::xml::sax::DTDHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void notationDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void unparsedEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_DTDHandler__
diff --git a/libjava/org/xml/sax/DocumentHandler.h b/libjava/org/xml/sax/DocumentHandler.h
deleted file mode 100644
index d9736bfe66c..00000000000
--- a/libjava/org/xml/sax/DocumentHandler.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_DocumentHandler__
-#define __org_xml_sax_DocumentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class AttributeList;
-          class DocumentHandler;
-          class Locator;
-      }
-    }
-  }
-}
-
-class org::xml::sax::DocumentHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void setDocumentLocator(::org::xml::sax::Locator *) = 0;
-  virtual void startDocument() = 0;
-  virtual void endDocument() = 0;
-  virtual void startElement(::java::lang::String *, ::org::xml::sax::AttributeList *) = 0;
-  virtual void endElement(::java::lang::String *) = 0;
-  virtual void characters(JArray< jchar > *, jint, jint) = 0;
-  virtual void ignorableWhitespace(JArray< jchar > *, jint, jint) = 0;
-  virtual void processingInstruction(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_DocumentHandler__
diff --git a/libjava/org/xml/sax/EntityResolver.h b/libjava/org/xml/sax/EntityResolver.h
deleted file mode 100644
index cb9e26e4019..00000000000
--- a/libjava/org/xml/sax/EntityResolver.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_EntityResolver__
-#define __org_xml_sax_EntityResolver__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class EntityResolver;
-          class InputSource;
-      }
-    }
-  }
-}
-
-class org::xml::sax::EntityResolver : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_EntityResolver__
diff --git a/libjava/org/xml/sax/ErrorHandler.h b/libjava/org/xml/sax/ErrorHandler.h
deleted file mode 100644
index d425d980b26..00000000000
--- a/libjava/org/xml/sax/ErrorHandler.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_ErrorHandler__
-#define __org_xml_sax_ErrorHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ErrorHandler;
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class org::xml::sax::ErrorHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void warning(::org::xml::sax::SAXParseException *) = 0;
-  virtual void error(::org::xml::sax::SAXParseException *) = 0;
-  virtual void fatalError(::org::xml::sax::SAXParseException *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_ErrorHandler__
diff --git a/libjava/org/xml/sax/HandlerBase.h b/libjava/org/xml/sax/HandlerBase.h
deleted file mode 100644
index 96d923ace78..00000000000
--- a/libjava/org/xml/sax/HandlerBase.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_HandlerBase__
-#define __org_xml_sax_HandlerBase__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class AttributeList;
-          class HandlerBase;
-          class InputSource;
-          class Locator;
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class org::xml::sax::HandlerBase : public ::java::lang::Object
-{
-
-public:
-  HandlerBase();
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::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 setDocumentLocator(::org::xml::sax::Locator *);
-  virtual void startDocument();
-  virtual void endDocument();
-  virtual void startElement(::java::lang::String *, ::org::xml::sax::AttributeList *);
-  virtual void endElement(::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 warning(::org::xml::sax::SAXParseException *);
-  virtual void error(::org::xml::sax::SAXParseException *);
-  virtual void fatalError(::org::xml::sax::SAXParseException *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_HandlerBase__
diff --git a/libjava/org/xml/sax/InputSource.h b/libjava/org/xml/sax/InputSource.h
deleted file mode 100644
index eaee940089f..00000000000
--- a/libjava/org/xml/sax/InputSource.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_InputSource__
-#define __org_xml_sax_InputSource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-      }
-    }
-  }
-}
-
-class org::xml::sax::InputSource : public ::java::lang::Object
-{
-
-public:
-  InputSource();
-  InputSource(::java::lang::String *);
-  InputSource(::java::io::InputStream *);
-  InputSource(::java::io::Reader *);
-  virtual void setPublicId(::java::lang::String *);
-  virtual ::java::lang::String * getPublicId();
-  virtual void setSystemId(::java::lang::String *);
-  virtual ::java::lang::String * getSystemId();
-  virtual void setByteStream(::java::io::InputStream *);
-  virtual ::java::io::InputStream * getByteStream();
-  virtual void setEncoding(::java::lang::String *);
-  virtual ::java::lang::String * getEncoding();
-  virtual void setCharacterStream(::java::io::Reader *);
-  virtual ::java::io::Reader * getCharacterStream();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) publicId;
-  ::java::lang::String * systemId;
-  ::java::io::InputStream * byteStream;
-  ::java::lang::String * encoding;
-  ::java::io::Reader * characterStream;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_InputSource__
diff --git a/libjava/org/xml/sax/Locator.h b/libjava/org/xml/sax/Locator.h
deleted file mode 100644
index 1005ec67d48..00000000000
--- a/libjava/org/xml/sax/Locator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_Locator__
-#define __org_xml_sax_Locator__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Locator;
-      }
-    }
-  }
-}
-
-class org::xml::sax::Locator : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual jint getLineNumber() = 0;
-  virtual jint getColumnNumber() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_Locator__
diff --git a/libjava/org/xml/sax/Parser.h b/libjava/org/xml/sax/Parser.h
deleted file mode 100644
index 143266a8623..00000000000
--- a/libjava/org/xml/sax/Parser.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_Parser__
-#define __org_xml_sax_Parser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class DTDHandler;
-          class DocumentHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-          class Parser;
-      }
-    }
-  }
-}
-
-class org::xml::sax::Parser : public ::java::lang::Object
-{
-
-public:
-  virtual void setLocale(::java::util::Locale *) = 0;
-  virtual void setEntityResolver(::org::xml::sax::EntityResolver *) = 0;
-  virtual void setDTDHandler(::org::xml::sax::DTDHandler *) = 0;
-  virtual void setDocumentHandler(::org::xml::sax::DocumentHandler *) = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual void parse(::org::xml::sax::InputSource *) = 0;
-  virtual void parse(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_Parser__
diff --git a/libjava/org/xml/sax/SAXException.h b/libjava/org/xml/sax/SAXException.h
deleted file mode 100644
index df6f41739a1..00000000000
--- a/libjava/org/xml/sax/SAXException.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_SAXException__
-#define __org_xml_sax_SAXException__
-
-#pragma interface
-
-#include <java/lang/Exception.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class SAXException;
-      }
-    }
-  }
-}
-
-class org::xml::sax::SAXException : public ::java::lang::Exception
-{
-
-public:
-  SAXException();
-  SAXException(::java::lang::String *);
-  SAXException(::java::lang::Exception *);
-  SAXException(::java::lang::String *, ::java::lang::Exception *);
-  virtual ::java::lang::String * getMessage();
-  virtual ::java::lang::Exception * getException();
-  virtual ::java::lang::String * toString();
-private:
-  ::java::lang::Exception * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) exception;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_SAXException__
diff --git a/libjava/org/xml/sax/SAXNotRecognizedException.h b/libjava/org/xml/sax/SAXNotRecognizedException.h
deleted file mode 100644
index ac5fee41fdd..00000000000
--- a/libjava/org/xml/sax/SAXNotRecognizedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_SAXNotRecognizedException__
-#define __org_xml_sax_SAXNotRecognizedException__
-
-#pragma interface
-
-#include <org/xml/sax/SAXException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class SAXNotRecognizedException;
-      }
-    }
-  }
-}
-
-class org::xml::sax::SAXNotRecognizedException : public ::org::xml::sax::SAXException
-{
-
-public:
-  SAXNotRecognizedException();
-  SAXNotRecognizedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_SAXNotRecognizedException__
diff --git a/libjava/org/xml/sax/SAXNotSupportedException.h b/libjava/org/xml/sax/SAXNotSupportedException.h
deleted file mode 100644
index 5d22ce0a8ef..00000000000
--- a/libjava/org/xml/sax/SAXNotSupportedException.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_SAXNotSupportedException__
-#define __org_xml_sax_SAXNotSupportedException__
-
-#pragma interface
-
-#include <org/xml/sax/SAXException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class SAXNotSupportedException;
-      }
-    }
-  }
-}
-
-class org::xml::sax::SAXNotSupportedException : public ::org::xml::sax::SAXException
-{
-
-public:
-  SAXNotSupportedException();
-  SAXNotSupportedException(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_SAXNotSupportedException__
diff --git a/libjava/org/xml/sax/SAXParseException.h b/libjava/org/xml/sax/SAXParseException.h
deleted file mode 100644
index 14f924655ac..00000000000
--- a/libjava/org/xml/sax/SAXParseException.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_SAXParseException__
-#define __org_xml_sax_SAXParseException__
-
-#pragma interface
-
-#include <org/xml/sax/SAXException.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Locator;
-          class SAXParseException;
-      }
-    }
-  }
-}
-
-class org::xml::sax::SAXParseException : public ::org::xml::sax::SAXException
-{
-
-public:
-  SAXParseException(::java::lang::String *, ::org::xml::sax::Locator *);
-  SAXParseException(::java::lang::String *, ::org::xml::sax::Locator *, ::java::lang::Exception *);
-  SAXParseException(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jint, jint);
-  SAXParseException(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, jint, jint, ::java::lang::Exception *);
-private:
-  void init(::java::lang::String *, ::java::lang::String *, jint, jint);
-public:
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getSystemId();
-  virtual jint getLineNumber();
-  virtual jint getColumnNumber();
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::org::xml::sax::SAXException)))) publicId;
-  ::java::lang::String * systemId;
-  jint lineNumber;
-  jint columnNumber;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_SAXParseException__
diff --git a/libjava/org/xml/sax/XMLFilter.h b/libjava/org/xml/sax/XMLFilter.h
deleted file mode 100644
index 05b30eb5941..00000000000
--- a/libjava/org/xml/sax/XMLFilter.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_XMLFilter__
-#define __org_xml_sax_XMLFilter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-          class XMLFilter;
-          class XMLReader;
-      }
-    }
-  }
-}
-
-class org::xml::sax::XMLFilter : public ::java::lang::Object
-{
-
-public:
-  virtual void setParent(::org::xml::sax::XMLReader *) = 0;
-  virtual ::org::xml::sax::XMLReader * getParent() = 0;
-  virtual jboolean getFeature(::java::lang::String *) = 0;
-  virtual void setFeature(::java::lang::String *, jboolean) = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void setEntityResolver(::org::xml::sax::EntityResolver *) = 0;
-  virtual ::org::xml::sax::EntityResolver * getEntityResolver() = 0;
-  virtual void setDTDHandler(::org::xml::sax::DTDHandler *) = 0;
-  virtual ::org::xml::sax::DTDHandler * getDTDHandler() = 0;
-  virtual void setContentHandler(::org::xml::sax::ContentHandler *) = 0;
-  virtual ::org::xml::sax::ContentHandler * getContentHandler() = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler() = 0;
-  virtual void parse(::org::xml::sax::InputSource *) = 0;
-  virtual void parse(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_XMLFilter__
diff --git a/libjava/org/xml/sax/XMLReader.h b/libjava/org/xml/sax/XMLReader.h
deleted file mode 100644
index 5ad9fa570e1..00000000000
--- a/libjava/org/xml/sax/XMLReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_XMLReader__
-#define __org_xml_sax_XMLReader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class ContentHandler;
-          class DTDHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-          class XMLReader;
-      }
-    }
-  }
-}
-
-class org::xml::sax::XMLReader : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean getFeature(::java::lang::String *) = 0;
-  virtual void setFeature(::java::lang::String *, jboolean) = 0;
-  virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *) = 0;
-  virtual void setEntityResolver(::org::xml::sax::EntityResolver *) = 0;
-  virtual ::org::xml::sax::EntityResolver * getEntityResolver() = 0;
-  virtual void setDTDHandler(::org::xml::sax::DTDHandler *) = 0;
-  virtual ::org::xml::sax::DTDHandler * getDTDHandler() = 0;
-  virtual void setContentHandler(::org::xml::sax::ContentHandler *) = 0;
-  virtual ::org::xml::sax::ContentHandler * getContentHandler() = 0;
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *) = 0;
-  virtual ::org::xml::sax::ErrorHandler * getErrorHandler() = 0;
-  virtual void parse(::org::xml::sax::InputSource *) = 0;
-  virtual void parse(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_XMLReader__
diff --git a/libjava/org/xml/sax/ext/Attributes2.h b/libjava/org/xml/sax/ext/Attributes2.h
deleted file mode 100644
index 3a61e9d12ef..00000000000
--- a/libjava/org/xml/sax/ext/Attributes2.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_ext_Attributes2__
-#define __org_xml_sax_ext_Attributes2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-        namespace ext
-        {
-            class Attributes2;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::ext::Attributes2 : public ::java::lang::Object
-{
-
-public:
-  virtual jboolean isDeclared(jint) = 0;
-  virtual jboolean isDeclared(::java::lang::String *) = 0;
-  virtual jboolean isDeclared(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean isSpecified(jint) = 0;
-  virtual jboolean isSpecified(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jboolean isSpecified(::java::lang::String *) = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::lang::String * getURI(jint) = 0;
-  virtual ::java::lang::String * getLocalName(jint) = 0;
-  virtual ::java::lang::String * getQName(jint) = 0;
-  virtual ::java::lang::String * getType(jint) = 0;
-  virtual ::java::lang::String * getValue(jint) = 0;
-  virtual jint getIndex(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual jint getIndex(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getType(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getType(::java::lang::String *) = 0;
-  virtual ::java::lang::String * getValue(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::java::lang::String * getValue(::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_ext_Attributes2__
diff --git a/libjava/org/xml/sax/ext/Attributes2Impl.h b/libjava/org/xml/sax/ext/Attributes2Impl.h
deleted file mode 100644
index 404ef367680..00000000000
--- a/libjava/org/xml/sax/ext/Attributes2Impl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_ext_Attributes2Impl__
-#define __org_xml_sax_ext_Attributes2Impl__
-
-#pragma interface
-
-#include <org/xml/sax/helpers/AttributesImpl.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-        namespace ext
-        {
-            class Attributes2Impl;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::ext::Attributes2Impl : public ::org::xml::sax::helpers::AttributesImpl
-{
-
-public:
-  Attributes2Impl();
-  Attributes2Impl(::org::xml::sax::Attributes *);
-  virtual jboolean isDeclared(jint);
-  virtual jboolean isDeclared(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean isDeclared(::java::lang::String *);
-  virtual jboolean isSpecified(jint);
-  virtual jboolean isSpecified(::java::lang::String *, ::java::lang::String *);
-  virtual jboolean isSpecified(::java::lang::String *);
-  virtual void setAttributes(::org::xml::sax::Attributes *);
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void removeAttribute(jint);
-  virtual void setDeclared(jint, jboolean);
-  virtual void setSpecified(jint, jboolean);
-private:
-  JArray< jboolean > * __attribute__((aligned(__alignof__( ::org::xml::sax::helpers::AttributesImpl)))) declared;
-  JArray< jboolean > * specified;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_ext_Attributes2Impl__
diff --git a/libjava/org/xml/sax/ext/DeclHandler.h b/libjava/org/xml/sax/ext/DeclHandler.h
deleted file mode 100644
index 237ef6623d3..00000000000
--- a/libjava/org/xml/sax/ext/DeclHandler.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_ext_DeclHandler__
-#define __org_xml_sax_ext_DeclHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-        namespace ext
-        {
-            class DeclHandler;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::ext::DeclHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void elementDecl(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void attributeDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void internalEntityDecl(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void externalEntityDecl(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_ext_DeclHandler__
diff --git a/libjava/org/xml/sax/ext/DefaultHandler2.h b/libjava/org/xml/sax/ext/DefaultHandler2.h
deleted file mode 100644
index 24ab4625551..00000000000
--- a/libjava/org/xml/sax/ext/DefaultHandler2.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_ext_DefaultHandler2__
-#define __org_xml_sax_ext_DefaultHandler2__
-
-#pragma interface
-
-#include <org/xml/sax/helpers/DefaultHandler.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-        namespace ext
-        {
-            class DefaultHandler2;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::ext::DefaultHandler2 : public ::org::xml::sax::helpers::DefaultHandler
-{
-
-public:
-  DefaultHandler2();
-  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 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 *);
-  virtual ::org::xml::sax::InputSource * getExternalSubset(::java::lang::String *, ::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 * resolveEntity(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_ext_DefaultHandler2__
diff --git a/libjava/org/xml/sax/ext/EntityResolver2.h b/libjava/org/xml/sax/ext/EntityResolver2.h
deleted file mode 100644
index 774a74a2647..00000000000
--- a/libjava/org/xml/sax/ext/EntityResolver2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_ext_EntityResolver2__
-#define __org_xml_sax_ext_EntityResolver2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class InputSource;
-        namespace ext
-        {
-            class EntityResolver2;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::ext::EntityResolver2 : public ::java::lang::Object
-{
-
-public:
-  virtual ::org::xml::sax::InputSource * getExternalSubset(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::java::lang::String *) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_ext_EntityResolver2__
diff --git a/libjava/org/xml/sax/ext/LexicalHandler.h b/libjava/org/xml/sax/ext/LexicalHandler.h
deleted file mode 100644
index 2fcdad8ae84..00000000000
--- a/libjava/org/xml/sax/ext/LexicalHandler.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_ext_LexicalHandler__
-#define __org_xml_sax_ext_LexicalHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-        namespace ext
-        {
-            class LexicalHandler;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::ext::LexicalHandler : public ::java::lang::Object
-{
-
-public:
-  virtual void startDTD(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
-  virtual void endDTD() = 0;
-  virtual void startEntity(::java::lang::String *) = 0;
-  virtual void endEntity(::java::lang::String *) = 0;
-  virtual void startCDATA() = 0;
-  virtual void endCDATA() = 0;
-  virtual void comment(JArray< jchar > *, jint, jint) = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_ext_LexicalHandler__
diff --git a/libjava/org/xml/sax/ext/Locator2.h b/libjava/org/xml/sax/ext/Locator2.h
deleted file mode 100644
index 1c61638d6ff..00000000000
--- a/libjava/org/xml/sax/ext/Locator2.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_ext_Locator2__
-#define __org_xml_sax_ext_Locator2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-        namespace ext
-        {
-            class Locator2;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::ext::Locator2 : public ::java::lang::Object
-{
-
-public:
-  virtual ::java::lang::String * getXMLVersion() = 0;
-  virtual ::java::lang::String * getEncoding() = 0;
-  virtual ::java::lang::String * getPublicId() = 0;
-  virtual ::java::lang::String * getSystemId() = 0;
-  virtual jint getLineNumber() = 0;
-  virtual jint getColumnNumber() = 0;
-  static ::java::lang::Class class$;
-} __attribute__ ((java_interface));
-
-#endif // __org_xml_sax_ext_Locator2__
diff --git a/libjava/org/xml/sax/ext/Locator2Impl.h b/libjava/org/xml/sax/ext/Locator2Impl.h
deleted file mode 100644
index d6fbb0c098b..00000000000
--- a/libjava/org/xml/sax/ext/Locator2Impl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_ext_Locator2Impl__
-#define __org_xml_sax_ext_Locator2Impl__
-
-#pragma interface
-
-#include <org/xml/sax/helpers/LocatorImpl.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Locator;
-        namespace ext
-        {
-            class Locator2Impl;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::ext::Locator2Impl : public ::org::xml::sax::helpers::LocatorImpl
-{
-
-public:
-  Locator2Impl();
-  Locator2Impl(::org::xml::sax::Locator *);
-  virtual ::java::lang::String * getXMLVersion();
-  virtual ::java::lang::String * getEncoding();
-  virtual void setXMLVersion(::java::lang::String *);
-  virtual void setEncoding(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::org::xml::sax::helpers::LocatorImpl)))) encoding;
-  ::java::lang::String * version;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_ext_Locator2Impl__
diff --git a/libjava/org/xml/sax/helpers/AttributeListImpl.h b/libjava/org/xml/sax/helpers/AttributeListImpl.h
deleted file mode 100644
index 366c4554a99..00000000000
--- a/libjava/org/xml/sax/helpers/AttributeListImpl.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_AttributeListImpl__
-#define __org_xml_sax_helpers_AttributeListImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class AttributeList;
-        namespace helpers
-        {
-            class AttributeListImpl;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::AttributeListImpl : public ::java::lang::Object
-{
-
-public:
-  AttributeListImpl();
-  AttributeListImpl(::org::xml::sax::AttributeList *);
-  virtual void setAttributeList(::org::xml::sax::AttributeList *);
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void removeAttribute(::java::lang::String *);
-  virtual void clear();
-  virtual jint getLength();
-  virtual ::java::lang::String * getName(jint);
-  virtual ::java::lang::String * getType(jint);
-  virtual ::java::lang::String * getValue(jint);
-  virtual ::java::lang::String * getType(::java::lang::String *);
-  virtual ::java::lang::String * getValue(::java::lang::String *);
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) names;
-  ::java::util::Vector * types;
-  ::java::util::Vector * values;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_AttributeListImpl__
diff --git a/libjava/org/xml/sax/helpers/AttributesImpl.h b/libjava/org/xml/sax/helpers/AttributesImpl.h
deleted file mode 100644
index 6f4fcdaf81b..00000000000
--- a/libjava/org/xml/sax/helpers/AttributesImpl.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_AttributesImpl__
-#define __org_xml_sax_helpers_AttributesImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-        namespace helpers
-        {
-            class AttributesImpl;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::AttributesImpl : public ::java::lang::Object
-{
-
-public:
-  AttributesImpl();
-  AttributesImpl(::org::xml::sax::Attributes *);
-  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 *);
-  virtual void clear();
-  virtual void setAttributes(::org::xml::sax::Attributes *);
-  virtual void addAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void setAttribute(jint, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
-  virtual void removeAttribute(jint);
-  virtual void setURI(jint, ::java::lang::String *);
-  virtual void setLocalName(jint, ::java::lang::String *);
-  virtual void setQName(jint, ::java::lang::String *);
-  virtual void setType(jint, ::java::lang::String *);
-  virtual void setValue(jint, ::java::lang::String *);
-private:
-  void ensureCapacity(jint);
-  void badIndex(jint);
-public: // actually package-private
-  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) length;
-  JArray< ::java::lang::String * > * data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_AttributesImpl__
diff --git a/libjava/org/xml/sax/helpers/DefaultHandler.h b/libjava/org/xml/sax/helpers/DefaultHandler.h
deleted file mode 100644
index 4d73466e7c1..00000000000
--- a/libjava/org/xml/sax/helpers/DefaultHandler.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_DefaultHandler__
-#define __org_xml_sax_helpers_DefaultHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class InputSource;
-          class Locator;
-          class SAXParseException;
-        namespace helpers
-        {
-            class DefaultHandler;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::DefaultHandler : public ::java::lang::Object
-{
-
-public:
-  DefaultHandler();
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::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 setDocumentLocator(::org::xml::sax::Locator *);
-  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 *);
-  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 warning(::org::xml::sax::SAXParseException *);
-  virtual void error(::org::xml::sax::SAXParseException *);
-  virtual void fatalError(::org::xml::sax::SAXParseException *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_DefaultHandler__
diff --git a/libjava/org/xml/sax/helpers/LocatorImpl.h b/libjava/org/xml/sax/helpers/LocatorImpl.h
deleted file mode 100644
index 41a67eff9f2..00000000000
--- a/libjava/org/xml/sax/helpers/LocatorImpl.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_LocatorImpl__
-#define __org_xml_sax_helpers_LocatorImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Locator;
-        namespace helpers
-        {
-            class LocatorImpl;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::LocatorImpl : public ::java::lang::Object
-{
-
-public:
-  LocatorImpl();
-  LocatorImpl(::org::xml::sax::Locator *);
-  virtual ::java::lang::String * getPublicId();
-  virtual ::java::lang::String * getSystemId();
-  virtual jint getLineNumber();
-  virtual jint getColumnNumber();
-  virtual void setPublicId(::java::lang::String *);
-  virtual void setSystemId(::java::lang::String *);
-  virtual void setLineNumber(jint);
-  virtual void setColumnNumber(jint);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) publicId;
-  ::java::lang::String * systemId;
-  jint lineNumber;
-  jint columnNumber;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_LocatorImpl__
diff --git a/libjava/org/xml/sax/helpers/NamespaceSupport$Context.h b/libjava/org/xml/sax/helpers/NamespaceSupport$Context.h
deleted file mode 100644
index 5d8d35fdcd3..00000000000
--- a/libjava/org/xml/sax/helpers/NamespaceSupport$Context.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_NamespaceSupport$Context__
-#define __org_xml_sax_helpers_NamespaceSupport$Context__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-        namespace helpers
-        {
-            class NamespaceSupport;
-            class NamespaceSupport$Context;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::NamespaceSupport$Context : public ::java::lang::Object
-{
-
-public: // actually package-private
-  NamespaceSupport$Context(::org::xml::sax::helpers::NamespaceSupport *);
-  void setParent(::org::xml::sax::helpers::NamespaceSupport$Context *);
-  void clear();
-  void declarePrefix(::java::lang::String *, ::java::lang::String *);
-  JArray< ::java::lang::String * > * processName(::java::lang::String *, jboolean);
-  ::java::lang::String * getURI(::java::lang::String *);
-  ::java::lang::String * getPrefix(::java::lang::String *);
-  ::java::util::Enumeration * getDeclaredPrefixes();
-  ::java::util::Enumeration * getPrefixes();
-private:
-  void copyTables();
-public: // actually package-private
-  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) prefixTable;
-  ::java::util::Hashtable * uriTable;
-  ::java::util::Hashtable * elementNameTable;
-  ::java::util::Hashtable * attributeNameTable;
-  ::java::lang::String * defaultNS;
-  jboolean declsOK;
-private:
-  ::java::util::Vector * declarations;
-  jboolean declSeen;
-  ::org::xml::sax::helpers::NamespaceSupport$Context * parent;
-public: // actually package-private
-  ::org::xml::sax::helpers::NamespaceSupport * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_NamespaceSupport$Context__
diff --git a/libjava/org/xml/sax/helpers/NamespaceSupport.h b/libjava/org/xml/sax/helpers/NamespaceSupport.h
deleted file mode 100644
index afb3f6dd612..00000000000
--- a/libjava/org/xml/sax/helpers/NamespaceSupport.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_NamespaceSupport__
-#define __org_xml_sax_helpers_NamespaceSupport__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-        namespace helpers
-        {
-            class NamespaceSupport;
-            class NamespaceSupport$Context;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::NamespaceSupport : public ::java::lang::Object
-{
-
-public:
-  NamespaceSupport();
-  virtual void reset();
-  virtual void pushContext();
-  virtual void popContext();
-  virtual jboolean declarePrefix(::java::lang::String *, ::java::lang::String *);
-  virtual JArray< ::java::lang::String * > * processName(::java::lang::String *, JArray< ::java::lang::String * > *, jboolean);
-  virtual ::java::lang::String * getURI(::java::lang::String *);
-  virtual ::java::util::Enumeration * getPrefixes();
-  virtual ::java::lang::String * getPrefix(::java::lang::String *);
-  virtual ::java::util::Enumeration * getPrefixes(::java::lang::String *);
-  virtual ::java::util::Enumeration * getDeclaredPrefixes();
-  virtual void setNamespaceDeclUris(jboolean);
-  virtual jboolean isNamespaceDeclUris();
-public: // actually package-private
-  static jboolean access$0(::org::xml::sax::helpers::NamespaceSupport *);
-  static ::java::util::Enumeration * access$1();
-public:
-  static ::java::lang::String * XMLNS;
-  static ::java::lang::String * NSDECL;
-private:
-  static ::java::util::Enumeration * EMPTY_ENUMERATION;
-  JArray< ::org::xml::sax::helpers::NamespaceSupport$Context * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) contexts;
-  ::org::xml::sax::helpers::NamespaceSupport$Context * currentContext;
-  jint contextPos;
-  jboolean namespaceDeclUris;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_NamespaceSupport__
diff --git a/libjava/org/xml/sax/helpers/NewInstance.h b/libjava/org/xml/sax/helpers/NewInstance.h
deleted file mode 100644
index ef1323e194e..00000000000
--- a/libjava/org/xml/sax/helpers/NewInstance.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_NewInstance__
-#define __org_xml_sax_helpers_NewInstance__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-        namespace helpers
-        {
-            class NewInstance;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::NewInstance : public ::java::lang::Object
-{
-
-public: // actually package-private
-  NewInstance();
-  static ::java::lang::Object * newInstance(::java::lang::ClassLoader *, ::java::lang::String *);
-  static ::java::lang::ClassLoader * getClassLoader();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_NewInstance__
diff --git a/libjava/org/xml/sax/helpers/ParserAdapter$AttributeListAdapter.h b/libjava/org/xml/sax/helpers/ParserAdapter$AttributeListAdapter.h
deleted file mode 100644
index 944e30db56f..00000000000
--- a/libjava/org/xml/sax/helpers/ParserAdapter$AttributeListAdapter.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_ParserAdapter$AttributeListAdapter__
-#define __org_xml_sax_helpers_ParserAdapter$AttributeListAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class AttributeList;
-        namespace helpers
-        {
-            class ParserAdapter;
-            class ParserAdapter$AttributeListAdapter;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::ParserAdapter$AttributeListAdapter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  ParserAdapter$AttributeListAdapter(::org::xml::sax::helpers::ParserAdapter *);
-  void setAttributeList(::org::xml::sax::AttributeList *);
-public:
-  jint getLength();
-  ::java::lang::String * getURI(jint);
-  ::java::lang::String * getLocalName(jint);
-  ::java::lang::String * getQName(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 *);
-private:
-  ::org::xml::sax::AttributeList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) qAtts;
-public: // actually package-private
-  ::org::xml::sax::helpers::ParserAdapter * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_ParserAdapter$AttributeListAdapter__
diff --git a/libjava/org/xml/sax/helpers/ParserAdapter.h b/libjava/org/xml/sax/helpers/ParserAdapter.h
deleted file mode 100644
index c33317b6028..00000000000
--- a/libjava/org/xml/sax/helpers/ParserAdapter.h
+++ /dev/null
@@ -1,106 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_ParserAdapter__
-#define __org_xml_sax_helpers_ParserAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class AttributeList;
-          class ContentHandler;
-          class DTDHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-          class Locator;
-          class Parser;
-          class SAXParseException;
-        namespace helpers
-        {
-            class AttributesImpl;
-            class NamespaceSupport;
-            class ParserAdapter;
-            class ParserAdapter$AttributeListAdapter;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::ParserAdapter : public ::java::lang::Object
-{
-
-public:
-  ParserAdapter();
-  ParserAdapter(::org::xml::sax::Parser *);
-private:
-  void setup(::org::xml::sax::Parser *);
-public:
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  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(::java::lang::String *);
-  virtual void parse(::org::xml::sax::InputSource *);
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  virtual void startDocument();
-  virtual void endDocument();
-  virtual void startElement(::java::lang::String *, ::org::xml::sax::AttributeList *);
-  virtual void endElement(::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 *);
-private:
-  void setupParser();
-  JArray< ::java::lang::String * > * processName(::java::lang::String *, jboolean, jboolean);
-public: // actually package-private
-  virtual void reportError(::java::lang::String *);
-private:
-  ::org::xml::sax::SAXParseException * makeException(::java::lang::String *);
-  void checkNotParsing(::java::lang::String *, ::java::lang::String *);
-public: // actually package-private
-  static ::org::xml::sax::helpers::AttributesImpl * access$0(::org::xml::sax::helpers::ParserAdapter *);
-private:
-  static ::java::lang::String * FEATURES;
-  static ::java::lang::String * NAMESPACES;
-  static ::java::lang::String * NAMESPACE_PREFIXES;
-  static ::java::lang::String * XMLNS_URIs;
-  ::org::xml::sax::helpers::NamespaceSupport * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nsSupport;
-  ::org::xml::sax::helpers::ParserAdapter$AttributeListAdapter * attAdapter;
-  jboolean parsing;
-  JArray< ::java::lang::String * > * nameParts;
-  ::org::xml::sax::Parser * parser;
-  ::org::xml::sax::helpers::AttributesImpl * atts;
-  jboolean namespaces;
-  jboolean prefixes;
-  jboolean uris;
-public: // actually package-private
-  ::org::xml::sax::Locator * locator;
-  ::org::xml::sax::EntityResolver * entityResolver;
-  ::org::xml::sax::DTDHandler * dtdHandler;
-  ::org::xml::sax::ContentHandler * contentHandler;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_ParserAdapter__
diff --git a/libjava/org/xml/sax/helpers/ParserFactory.h b/libjava/org/xml/sax/helpers/ParserFactory.h
deleted file mode 100644
index 88d9325209f..00000000000
--- a/libjava/org/xml/sax/helpers/ParserFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_ParserFactory__
-#define __org_xml_sax_helpers_ParserFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Parser;
-        namespace helpers
-        {
-            class ParserFactory;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::ParserFactory : public ::java::lang::Object
-{
-
-  ParserFactory();
-public:
-  static ::org::xml::sax::Parser * makeParser();
-  static ::org::xml::sax::Parser * makeParser(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_ParserFactory__
diff --git a/libjava/org/xml/sax/helpers/XMLFilterImpl.h b/libjava/org/xml/sax/helpers/XMLFilterImpl.h
deleted file mode 100644
index 13e4960487d..00000000000
--- a/libjava/org/xml/sax/helpers/XMLFilterImpl.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_XMLFilterImpl__
-#define __org_xml_sax_helpers_XMLFilterImpl__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class ContentHandler;
-          class DTDHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-          class Locator;
-          class SAXParseException;
-          class XMLReader;
-        namespace helpers
-        {
-            class XMLFilterImpl;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::XMLFilterImpl : public ::java::lang::Object
-{
-
-public:
-  XMLFilterImpl();
-  XMLFilterImpl(::org::xml::sax::XMLReader *);
-  virtual void setParent(::org::xml::sax::XMLReader *);
-  virtual ::org::xml::sax::XMLReader * getParent();
-  virtual void setFeature(::java::lang::String *, jboolean);
-  virtual jboolean getFeature(::java::lang::String *);
-  virtual void setProperty(::java::lang::String *, ::java::lang::Object *);
-  virtual ::java::lang::Object * getProperty(::java::lang::String *);
-  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 *);
-  virtual void parse(::java::lang::String *);
-  virtual ::org::xml::sax::InputSource * resolveEntity(::java::lang::String *, ::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 setDocumentLocator(::org::xml::sax::Locator *);
-  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 *);
-  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 warning(::org::xml::sax::SAXParseException *);
-  virtual void error(::org::xml::sax::SAXParseException *);
-  virtual void fatalError(::org::xml::sax::SAXParseException *);
-private:
-  void setupParse();
-  ::org::xml::sax::XMLReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
-  ::org::xml::sax::Locator * locator;
-  ::org::xml::sax::EntityResolver * entityResolver;
-  ::org::xml::sax::DTDHandler * dtdHandler;
-  ::org::xml::sax::ContentHandler * contentHandler;
-  ::org::xml::sax::ErrorHandler * errorHandler;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_XMLFilterImpl__
diff --git a/libjava/org/xml/sax/helpers/XMLReaderAdapter$AttributesAdapter.h b/libjava/org/xml/sax/helpers/XMLReaderAdapter$AttributesAdapter.h
deleted file mode 100644
index 888b28a188d..00000000000
--- a/libjava/org/xml/sax/helpers/XMLReaderAdapter$AttributesAdapter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_XMLReaderAdapter$AttributesAdapter__
-#define __org_xml_sax_helpers_XMLReaderAdapter$AttributesAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-        namespace helpers
-        {
-            class XMLReaderAdapter;
-            class XMLReaderAdapter$AttributesAdapter;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::XMLReaderAdapter$AttributesAdapter : public ::java::lang::Object
-{
-
-public: // actually package-private
-  XMLReaderAdapter$AttributesAdapter(::org::xml::sax::helpers::XMLReaderAdapter *);
-  void setAttributes(::org::xml::sax::Attributes *);
-public:
-  jint getLength();
-  ::java::lang::String * getName(jint);
-  ::java::lang::String * getType(jint);
-  ::java::lang::String * getValue(jint);
-  ::java::lang::String * getType(::java::lang::String *);
-  ::java::lang::String * getValue(::java::lang::String *);
-private:
-  ::org::xml::sax::Attributes * __attribute__((aligned(__alignof__( ::java::lang::Object)))) attributes;
-public: // actually package-private
-  ::org::xml::sax::helpers::XMLReaderAdapter * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_XMLReaderAdapter$AttributesAdapter__
diff --git a/libjava/org/xml/sax/helpers/XMLReaderAdapter.h b/libjava/org/xml/sax/helpers/XMLReaderAdapter.h
deleted file mode 100644
index 9d76f2e7361..00000000000
--- a/libjava/org/xml/sax/helpers/XMLReaderAdapter.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_XMLReaderAdapter__
-#define __org_xml_sax_helpers_XMLReaderAdapter__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class Attributes;
-          class DTDHandler;
-          class DocumentHandler;
-          class EntityResolver;
-          class ErrorHandler;
-          class InputSource;
-          class Locator;
-          class XMLReader;
-        namespace helpers
-        {
-            class XMLReaderAdapter;
-            class XMLReaderAdapter$AttributesAdapter;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::XMLReaderAdapter : public ::java::lang::Object
-{
-
-public:
-  XMLReaderAdapter();
-  XMLReaderAdapter(::org::xml::sax::XMLReader *);
-private:
-  void setup(::org::xml::sax::XMLReader *);
-public:
-  virtual void setLocale(::java::util::Locale *);
-  virtual void setEntityResolver(::org::xml::sax::EntityResolver *);
-  virtual void setDTDHandler(::org::xml::sax::DTDHandler *);
-  virtual void setDocumentHandler(::org::xml::sax::DocumentHandler *);
-  virtual void setErrorHandler(::org::xml::sax::ErrorHandler *);
-  virtual void parse(::java::lang::String *);
-  virtual void parse(::org::xml::sax::InputSource *);
-private:
-  void setupXMLReader();
-public:
-  virtual void setDocumentLocator(::org::xml::sax::Locator *);
-  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 *);
-  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 *);
-public: // actually package-private
-  ::org::xml::sax::XMLReader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) xmlReader;
-  ::org::xml::sax::DocumentHandler * documentHandler;
-  ::org::xml::sax::helpers::XMLReaderAdapter$AttributesAdapter * qAtts;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_XMLReaderAdapter__
diff --git a/libjava/org/xml/sax/helpers/XMLReaderFactory.h b/libjava/org/xml/sax/helpers/XMLReaderFactory.h
deleted file mode 100644
index 9be9aaf79b8..00000000000
--- a/libjava/org/xml/sax/helpers/XMLReaderFactory.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __org_xml_sax_helpers_XMLReaderFactory__
-#define __org_xml_sax_helpers_XMLReaderFactory__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace org
-  {
-    namespace xml
-    {
-      namespace sax
-      {
-          class XMLReader;
-        namespace helpers
-        {
-            class XMLReaderFactory;
-        }
-      }
-    }
-  }
-}
-
-class org::xml::sax::helpers::XMLReaderFactory : public ::java::lang::Object
-{
-
-  XMLReaderFactory();
-public:
-  static ::org::xml::sax::XMLReader * createXMLReader();
-  static ::org::xml::sax::XMLReader * createXMLReader(::java::lang::String *);
-private:
-  static ::org::xml::sax::XMLReader * loadClass(::java::lang::ClassLoader *, ::java::lang::String *);
-  static ::java::lang::String * property;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __org_xml_sax_helpers_XMLReaderFactory__
diff --git a/libjava/sun/misc/Service.h b/libjava/sun/misc/Service.h
deleted file mode 100644
index e698fed4bc4..00000000000
--- a/libjava/sun/misc/Service.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_misc_Service__
-#define __sun_misc_Service__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Service;
-    }
-  }
-}
-
-class sun::misc::Service : public ::java::lang::Object
-{
-
-public:
-  Service();
-  static ::java::util::Iterator * providers(::java::lang::Class *, ::java::lang::ClassLoader *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_misc_Service__
diff --git a/libjava/sun/misc/ServiceConfigurationError.h b/libjava/sun/misc/ServiceConfigurationError.h
deleted file mode 100644
index aee51b34711..00000000000
--- a/libjava/sun/misc/ServiceConfigurationError.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_misc_ServiceConfigurationError__
-#define __sun_misc_ServiceConfigurationError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class ServiceConfigurationError;
-    }
-  }
-}
-
-class sun::misc::ServiceConfigurationError : public ::java::lang::Error
-{
-
-public:
-  ServiceConfigurationError();
-  ServiceConfigurationError(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_misc_ServiceConfigurationError__
diff --git a/libjava/sun/misc/Unsafe.h b/libjava/sun/misc/Unsafe.h
deleted file mode 100644
index d50c3e05011..00000000000
--- a/libjava/sun/misc/Unsafe.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_misc_Unsafe__
-#define __sun_misc_Unsafe__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class sun::misc::Unsafe : public ::java::lang::Object
-{
-
-  Unsafe();
-public:
-  static ::sun::misc::Unsafe * getUnsafe();
-  virtual jlong objectFieldOffset(::java::lang::reflect::Field *);
-  virtual jboolean compareAndSwapInt(::java::lang::Object *, jlong, jint, jint);
-  virtual jboolean compareAndSwapLong(::java::lang::Object *, jlong, jlong, jlong);
-  virtual jboolean compareAndSwapObject(::java::lang::Object *, jlong, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void putOrderedInt(::java::lang::Object *, jlong, jint);
-  virtual void putOrderedLong(::java::lang::Object *, jlong, jlong);
-  virtual void putOrderedObject(::java::lang::Object *, jlong, ::java::lang::Object *);
-  virtual void putIntVolatile(::java::lang::Object *, jlong, jint);
-  virtual jint getIntVolatile(::java::lang::Object *, jlong);
-  virtual void putLongVolatile(::java::lang::Object *, jlong, jlong);
-  virtual void putLong(::java::lang::Object *, jlong, jlong);
-  virtual jlong getLongVolatile(::java::lang::Object *, jlong);
-  virtual jlong getLong(::java::lang::Object *, jlong);
-  virtual void putObjectVolatile(::java::lang::Object *, jlong, ::java::lang::Object *);
-  virtual void putObject(::java::lang::Object *, jlong, ::java::lang::Object *);
-  virtual ::java::lang::Object * getObjectVolatile(::java::lang::Object *, jlong);
-  virtual jint arrayBaseOffset(::java::lang::Class *);
-  virtual jint arrayIndexScale(::java::lang::Class *);
-  virtual void unpark(::java::lang::Thread *);
-  virtual void park(jboolean, jlong);
-private:
-  static ::sun::misc::Unsafe * unsafe;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_misc_Unsafe__
diff --git a/libjava/sun/reflect/Reflection.h b/libjava/sun/reflect/Reflection.h
deleted file mode 100644
index 7f3c82fe797..00000000000
--- a/libjava/sun/reflect/Reflection.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_Reflection__
-#define __sun_reflect_Reflection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-        class Reflection;
-    }
-  }
-}
-
-class sun::reflect::Reflection : public ::java::lang::Object
-{
-
-public:
-  Reflection();
-  static ::java::lang::Class * getCallerClass(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_Reflection__
diff --git a/libjava/sun/reflect/annotation/AnnotationInvocationHandler.h b/libjava/sun/reflect/annotation/AnnotationInvocationHandler.h
deleted file mode 100644
index 0679e3c3fd5..00000000000
--- a/libjava/sun/reflect/annotation/AnnotationInvocationHandler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_AnnotationInvocationHandler__
-#define __sun_reflect_annotation_AnnotationInvocationHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class AnnotationInvocationHandler;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::AnnotationInvocationHandler : public ::java::lang::Object
-{
-
-public:
-  AnnotationInvocationHandler(::java::lang::Class *, ::java::util::Map *);
-  static ::java::lang::annotation::Annotation * create(::java::lang::Class *, ::java::util::Map *);
-  static jboolean equals(::java::lang::Class *, ::java::util::Map *, ::java::lang::Object *);
-private:
-  static jboolean deepEquals(::java::lang::Object *, ::java::lang::Object *);
-  static jint deepHashCode(::java::lang::Object *);
-public:
-  static jint hashCode(::java::lang::Class *, ::java::util::Map *);
-private:
-  static ::java::lang::String * deepToString(::java::lang::Object *);
-public:
-  static ::java::lang::String * toString(::java::lang::Class *, ::java::util::Map *);
-private:
-  static ::java::lang::Class * getBoxedReturnType(::java::lang::reflect::Method *);
-  ::java::lang::Object * arrayClone(::java::lang::Object *);
-public:
-  ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *);
-private:
-  static const jlong serialVersionUID = 6182022883658399397LL;
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::util::Map * memberValues;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_AnnotationInvocationHandler__
diff --git a/libjava/sun/reflect/annotation/AnnotationParser.h b/libjava/sun/reflect/annotation/AnnotationParser.h
deleted file mode 100644
index d5ca9737ac9..00000000000
--- a/libjava/sun/reflect/annotation/AnnotationParser.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_AnnotationParser__
-#define __sun_reflect_annotation_AnnotationParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class AnnotationParser;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::AnnotationParser : public ::java::lang::Object
-{
-
-public:
-  AnnotationParser();
-  static ::java::lang::annotation::Annotation * annotationForMap(::java::lang::Class *, ::java::util::Map *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_AnnotationParser__
diff --git a/libjava/sun/reflect/annotation/AnnotationType.h b/libjava/sun/reflect/annotation/AnnotationType.h
deleted file mode 100644
index 3d21e0f14cb..00000000000
--- a/libjava/sun/reflect/annotation/AnnotationType.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_AnnotationType__
-#define __sun_reflect_annotation_AnnotationType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class AnnotationType;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::AnnotationType : public ::java::lang::Object
-{
-
-public:
-  AnnotationType();
-  static ::java::lang::Class * invocationHandlerReturnType(::java::lang::Class *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_AnnotationType__
diff --git a/libjava/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.h b/libjava/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.h
deleted file mode 100644
index 63d853b5d21..00000000000
--- a/libjava/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_EnumConstantNotPresentExceptionProxy__
-#define __sun_reflect_annotation_EnumConstantNotPresentExceptionProxy__
-
-#pragma interface
-
-#include <sun/reflect/annotation/ExceptionProxy.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class EnumConstantNotPresentExceptionProxy;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::EnumConstantNotPresentExceptionProxy : public ::sun::reflect::annotation::ExceptionProxy
-{
-
-public:
-  EnumConstantNotPresentExceptionProxy(::java::lang::Class *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_EnumConstantNotPresentExceptionProxy__
diff --git a/libjava/sun/reflect/annotation/ExceptionProxy.h b/libjava/sun/reflect/annotation/ExceptionProxy.h
deleted file mode 100644
index ca6a3cd692b..00000000000
--- a/libjava/sun/reflect/annotation/ExceptionProxy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_ExceptionProxy__
-#define __sun_reflect_annotation_ExceptionProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class ExceptionProxy;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::ExceptionProxy : public ::java::lang::Object
-{
-
-public:
-  ExceptionProxy();
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_ExceptionProxy__
diff --git a/libjava/sun/reflect/misc/ReflectUtil$MustBeNull.h b/libjava/sun/reflect/misc/ReflectUtil$MustBeNull.h
deleted file mode 100644
index a2e7494d8dc..00000000000
--- a/libjava/sun/reflect/misc/ReflectUtil$MustBeNull.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_misc_ReflectUtil$MustBeNull__
-#define __sun_reflect_misc_ReflectUtil$MustBeNull__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace misc
-      {
-          class ReflectUtil$MustBeNull;
-      }
-    }
-  }
-}
-
-class sun::reflect::misc::ReflectUtil$MustBeNull : public ::java::lang::Object
-{
-
-  ReflectUtil$MustBeNull();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_misc_ReflectUtil$MustBeNull__
diff --git a/libjava/sun/reflect/misc/ReflectUtil.h b/libjava/sun/reflect/misc/ReflectUtil.h
deleted file mode 100644
index 91c0b64b2c8..00000000000
--- a/libjava/sun/reflect/misc/ReflectUtil.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_misc_ReflectUtil__
-#define __sun_reflect_misc_ReflectUtil__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace misc
-      {
-          class ReflectUtil;
-          class ReflectUtil$MustBeNull;
-      }
-    }
-  }
-}
-
-class sun::reflect::misc::ReflectUtil : public ::java::lang::Object
-{
-
-public:
-  ReflectUtil();
-  static void checkPackageAccess(::java::lang::Class *);
-  static void ensureMemberAccess(::java::lang::Class *, ::java::lang::Class *, ::sun::reflect::misc::ReflectUtil$MustBeNull *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_misc_ReflectUtil__
diff --git a/libjava/testsuite/libjava.cni/PR9577.h b/libjava/testsuite/libjava.cni/PR9577.h
deleted file mode 100644
index a8d6d19ae6d..00000000000
--- a/libjava/testsuite/libjava.cni/PR9577.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __PR9577__
-#define __PR9577__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-    class PR9577;
-}
-
-class PR9577 : public ::java::lang::Object
-{
-
-public:
-  PR9577();
-private:
-  void sayHello(JArray< ::java::lang::String * > *, ::java::lang::Object *);
-public:
-  static void main(JArray< ::java::lang::String * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __PR9577__
diff --git a/libjava/testsuite/libjava.cni/PR9577.jar b/libjava/testsuite/libjava.cni/PR9577.jar
deleted file mode 100644
index 6e9f5cee757..00000000000
--- a/libjava/testsuite/libjava.cni/PR9577.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.cni/longfield.h b/libjava/testsuite/libjava.cni/longfield.h
deleted file mode 100644
index 51ea17f44cb..00000000000
--- a/libjava/testsuite/libjava.cni/longfield.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __longfield__
-#define __longfield__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-    class longfield;
-}
-
-class longfield : public ::java::lang::Object
-{
-
-public:
-  longfield();
-  virtual void doitc();
-  virtual void doitj();
-  static void main(JArray< ::java::lang::String * > *);
-public: // actually package-private
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) lval;
-  jboolean bval;
-  ::java::lang::String * sval;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __longfield__
diff --git a/libjava/testsuite/libjava.cni/longfield.jar b/libjava/testsuite/libjava.cni/longfield.jar
deleted file mode 100644
index aab94677664..00000000000
--- a/libjava/testsuite/libjava.cni/longfield.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.cni/shortfield.h b/libjava/testsuite/libjava.cni/shortfield.h
deleted file mode 100644
index 175a9fd8e5c..00000000000
--- a/libjava/testsuite/libjava.cni/shortfield.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __shortfield__
-#define __shortfield__
-
-#pragma interface
-
-#include <shortfieldbase.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-    class shortfield;
-}
-
-class shortfield : public ::shortfieldbase
-{
-
-public:
-  shortfield();
-public: // actually package-private
-  virtual void ouch();
-public:
-  static void main(JArray< ::java::lang::String * > *);
-public: // actually package-private
-  jshort __attribute__((aligned(__alignof__( ::shortfieldbase)))) size__;
-  jint data;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __shortfield__
diff --git a/libjava/testsuite/libjava.cni/shortfield.jar b/libjava/testsuite/libjava.cni/shortfield.jar
deleted file mode 100644
index f7af1afb7ca..00000000000
--- a/libjava/testsuite/libjava.cni/shortfield.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.cni/shortfieldbase.h b/libjava/testsuite/libjava.cni/shortfieldbase.h
deleted file mode 100644
index 171ca3d45a7..00000000000
--- a/libjava/testsuite/libjava.cni/shortfieldbase.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __shortfieldbase__
-#define __shortfieldbase__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-    class shortfieldbase;
-}
-
-class shortfieldbase : public ::java::lang::Object
-{
-
-public: // actually package-private
-  shortfieldbase();
-  jshort __attribute__((aligned(__alignof__( ::java::lang::Object)))) modCount;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __shortfieldbase__
diff --git a/libjava/testsuite/libjava.jni/PR15133.h b/libjava/testsuite/libjava.jni/PR15133.h
deleted file mode 100644
index af9f8f8a368..00000000000
--- a/libjava/testsuite/libjava.jni/PR15133.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __PR15133__
-#define __PR15133__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_PR15133_printIt (JNIEnv *env, jobject, jint);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __PR15133__ */
diff --git a/libjava/testsuite/libjava.jni/PR15133.jar b/libjava/testsuite/libjava.jni/PR15133.jar
deleted file mode 100644
index ad76705df4d..00000000000
--- a/libjava/testsuite/libjava.jni/PR15133.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/PR18116.h b/libjava/testsuite/libjava.jni/PR18116.h
deleted file mode 100644
index 56fc648be0a..00000000000
--- a/libjava/testsuite/libjava.jni/PR18116.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __PR18116__
-#define __PR18116__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jint JNICALL Java_PR18116_doit (JNIEnv *env, jclass, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __PR18116__ */
diff --git a/libjava/testsuite/libjava.jni/PR18116.jar b/libjava/testsuite/libjava.jni/PR18116.jar
deleted file mode 100644
index b9a0034bac3..00000000000
--- a/libjava/testsuite/libjava.jni/PR18116.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/PR28178.h b/libjava/testsuite/libjava.jni/PR28178.h
deleted file mode 100644
index e686439ecf5..00000000000
--- a/libjava/testsuite/libjava.jni/PR28178.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __PR28178__
-#define __PR28178__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_PR28178_m (JNIEnv *env, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __PR28178__ */
diff --git a/libjava/testsuite/libjava.jni/PR28178.jar b/libjava/testsuite/libjava.jni/PR28178.jar
deleted file mode 100644
index 0c9082bb906..00000000000
--- a/libjava/testsuite/libjava.jni/PR28178.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/bytebuffer.h b/libjava/testsuite/libjava.jni/bytebuffer.h
deleted file mode 100644
index 33b5c3aa061..00000000000
--- a/libjava/testsuite/libjava.jni/bytebuffer.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __bytebuffer__
-#define __bytebuffer__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_bytebuffer_testByteBuffer (JNIEnv *env, jclass, jobject);
-JNIEXPORT void JNICALL Java_bytebuffer_testCharBuffer (JNIEnv *env, jclass, jobject);
-JNIEXPORT void JNICALL Java_bytebuffer_testDoubleBuffer (JNIEnv *env, jclass, jobject);
-JNIEXPORT void JNICALL Java_bytebuffer_testFloatBuffer (JNIEnv *env, jclass, jobject);
-JNIEXPORT void JNICALL Java_bytebuffer_testIntBuffer (JNIEnv *env, jclass, jobject);
-JNIEXPORT void JNICALL Java_bytebuffer_testLongBuffer (JNIEnv *env, jclass, jobject);
-JNIEXPORT void JNICALL Java_bytebuffer_testShortBuffer (JNIEnv *env, jclass, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __bytebuffer__ */
diff --git a/libjava/testsuite/libjava.jni/bytebuffer.jar b/libjava/testsuite/libjava.jni/bytebuffer.jar
deleted file mode 100644
index d0ca6d7e923..00000000000
--- a/libjava/testsuite/libjava.jni/bytebuffer.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/calls.h b/libjava/testsuite/libjava.jni/calls.h
deleted file mode 100644
index 64b967095b7..00000000000
--- a/libjava/testsuite/libjava.jni/calls.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __calls__
-#define __calls__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jint JNICALL Java_calls_docall (JNIEnv *env, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __calls__ */
diff --git a/libjava/testsuite/libjava.jni/calls.jar b/libjava/testsuite/libjava.jni/calls.jar
deleted file mode 100644
index 3a188ea4907..00000000000
--- a/libjava/testsuite/libjava.jni/calls.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/cxxtest.h b/libjava/testsuite/libjava.jni/cxxtest.h
deleted file mode 100644
index d903636f4e4..00000000000
--- a/libjava/testsuite/libjava.jni/cxxtest.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __cxxtest__
-#define __cxxtest__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jobjectArray JNICALL Java_cxxtest_fetch (JNIEnv *env, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __cxxtest__ */
diff --git a/libjava/testsuite/libjava.jni/cxxtest.jar b/libjava/testsuite/libjava.jni/cxxtest.jar
deleted file mode 100644
index 5a9a0d77217..00000000000
--- a/libjava/testsuite/libjava.jni/cxxtest.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/directbuffer.h b/libjava/testsuite/libjava.jni/directbuffer.h
deleted file mode 100644
index 6d5c652760b..00000000000
--- a/libjava/testsuite/libjava.jni/directbuffer.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __directbuffer__
-#define __directbuffer__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jobject JNICALL Java_directbuffer_createDirectByteBuffer (JNIEnv *env, jclass);
-JNIEXPORT void JNICALL Java_directbuffer_testDirectByteBuffer (JNIEnv *env, jclass, jobject, jint);
-JNIEXPORT void JNICALL Java_directbuffer_testCharBuffer (JNIEnv *env, jclass, jobject, jint);
-JNIEXPORT void JNICALL Java_directbuffer_testDoubleBuffer (JNIEnv *env, jclass, jobject, jint);
-JNIEXPORT void JNICALL Java_directbuffer_testFloatBuffer (JNIEnv *env, jclass, jobject, jint);
-JNIEXPORT void JNICALL Java_directbuffer_testIntBuffer (JNIEnv *env, jclass, jobject, jint);
-JNIEXPORT void JNICALL Java_directbuffer_testLongBuffer (JNIEnv *env, jclass, jobject, jint);
-JNIEXPORT void JNICALL Java_directbuffer_testShortBuffer (JNIEnv *env, jclass, jobject, jint);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __directbuffer__ */
diff --git a/libjava/testsuite/libjava.jni/directbuffer.jar b/libjava/testsuite/libjava.jni/directbuffer.jar
deleted file mode 100644
index f1630dad889..00000000000
--- a/libjava/testsuite/libjava.jni/directbuffer.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/field.h b/libjava/testsuite/libjava.jni/field.h
deleted file mode 100644
index fd1597aaee0..00000000000
--- a/libjava/testsuite/libjava.jni/field.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __field__
-#define __field__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jobjectArray JNICALL Java_field_fetch (JNIEnv *env, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __field__ */
diff --git a/libjava/testsuite/libjava.jni/field.jar b/libjava/testsuite/libjava.jni/field.jar
deleted file mode 100644
index 3f636e842cc..00000000000
--- a/libjava/testsuite/libjava.jni/field.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/final_method.h b/libjava/testsuite/libjava.jni/final_method.h
deleted file mode 100644
index dbb8235496d..00000000000
--- a/libjava/testsuite/libjava.jni/final_method.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __final_1method__
-#define __final_1method__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jstring JNICALL Java_final_1method_meth (JNIEnv *env, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __final_1method__ */
diff --git a/libjava/testsuite/libjava.jni/final_method.jar b/libjava/testsuite/libjava.jni/final_method.jar
deleted file mode 100644
index a5f4b63f305..00000000000
--- a/libjava/testsuite/libjava.jni/final_method.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/findclass.h b/libjava/testsuite/libjava.jni/findclass.h
deleted file mode 100644
index d0d301e9359..00000000000
--- a/libjava/testsuite/libjava.jni/findclass.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __findclass__
-#define __findclass__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jclass JNICALL Java_findclass_doit (JNIEnv *env, jclass, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __findclass__ */
diff --git a/libjava/testsuite/libjava.jni/findclass.jar b/libjava/testsuite/libjava.jni/findclass.jar
deleted file mode 100644
index 03fe860f7e9..00000000000
--- a/libjava/testsuite/libjava.jni/findclass.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/iface.h b/libjava/testsuite/libjava.jni/iface.h
deleted file mode 100644
index 58680dd90c4..00000000000
--- a/libjava/testsuite/libjava.jni/iface.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __iface__
-#define __iface__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_iface_doCalls (JNIEnv *env, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __iface__ */
diff --git a/libjava/testsuite/libjava.jni/iface.jar b/libjava/testsuite/libjava.jni/iface.jar
deleted file mode 100644
index 0a9a1af3cf6..00000000000
--- a/libjava/testsuite/libjava.jni/iface.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/invocation/PR16923.jar b/libjava/testsuite/libjava.jni/invocation/PR16923.jar
deleted file mode 100644
index a1a7b880473..00000000000
--- a/libjava/testsuite/libjava.jni/invocation/PR16923.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/invoke.h b/libjava/testsuite/libjava.jni/invoke.h
deleted file mode 100644
index 553c598d7d0..00000000000
--- a/libjava/testsuite/libjava.jni/invoke.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __invoke__
-#define __invoke__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jint JNICALL Java_invoke_val (JNIEnv *env, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __invoke__ */
diff --git a/libjava/testsuite/libjava.jni/invoke.jar b/libjava/testsuite/libjava.jni/invoke.jar
deleted file mode 100644
index dd0579740a7..00000000000
--- a/libjava/testsuite/libjava.jni/invoke.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/jniutf.h b/libjava/testsuite/libjava.jni/jniutf.h
deleted file mode 100644
index b58db2e3248..00000000000
--- a/libjava/testsuite/libjava.jni/jniutf.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __jniutf__
-#define __jniutf__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_jniutf_printString (JNIEnv *env, jobject, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __jniutf__ */
diff --git a/libjava/testsuite/libjava.jni/jniutf.jar b/libjava/testsuite/libjava.jni/jniutf.jar
deleted file mode 100644
index 764808c4f17..00000000000
--- a/libjava/testsuite/libjava.jni/jniutf.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/martin.h b/libjava/testsuite/libjava.jni/martin.h
deleted file mode 100644
index 73b6a062e14..00000000000
--- a/libjava/testsuite/libjava.jni/martin.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __martin__
-#define __martin__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_martin_myNative (JNIEnv *env, jobject, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __martin__ */
diff --git a/libjava/testsuite/libjava.jni/martin.jar b/libjava/testsuite/libjava.jni/martin.jar
deleted file mode 100644
index a0293a75f75..00000000000
--- a/libjava/testsuite/libjava.jni/martin.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/noclass.h b/libjava/testsuite/libjava.jni/noclass.h
deleted file mode 100644
index 67869a91675..00000000000
--- a/libjava/testsuite/libjava.jni/noclass.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __noclass__
-#define __noclass__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_noclass_find_1it (JNIEnv *env, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __noclass__ */
diff --git a/libjava/testsuite/libjava.jni/noclass.jar b/libjava/testsuite/libjava.jni/noclass.jar
deleted file mode 100644
index 969aa950f33..00000000000
--- a/libjava/testsuite/libjava.jni/noclass.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/overload.h b/libjava/testsuite/libjava.jni/overload.h
deleted file mode 100644
index 7b717cd0975..00000000000
--- a/libjava/testsuite/libjava.jni/overload.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __overload__
-#define __overload__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jint JNICALL Java_overload_over__I (JNIEnv *env, jclass, jint);
-JNIEXPORT jint JNICALL Java_overload_over__II (JNIEnv *env, jclass, jint, jint);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __overload__ */
diff --git a/libjava/testsuite/libjava.jni/overload.jar b/libjava/testsuite/libjava.jni/overload.jar
deleted file mode 100644
index 430d3d665f2..00000000000
--- a/libjava/testsuite/libjava.jni/overload.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/pr11951.h b/libjava/testsuite/libjava.jni/pr11951.h
deleted file mode 100644
index caeefdb85fc..00000000000
--- a/libjava/testsuite/libjava.jni/pr11951.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __pr11951__
-#define __pr11951__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_pr11951_nmethod (JNIEnv *env, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __pr11951__ */
diff --git a/libjava/testsuite/libjava.jni/pr11951.jar b/libjava/testsuite/libjava.jni/pr11951.jar
deleted file mode 100644
index adea29fe77c..00000000000
--- a/libjava/testsuite/libjava.jni/pr11951.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/pr18278.h b/libjava/testsuite/libjava.jni/pr18278.h
deleted file mode 100644
index 4003fef37df..00000000000
--- a/libjava/testsuite/libjava.jni/pr18278.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __pr18278__
-#define __pr18278__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jobject JNICALL Java_pr18278_weakRef (JNIEnv *env, jclass, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __pr18278__ */
diff --git a/libjava/testsuite/libjava.jni/pr18278.jar b/libjava/testsuite/libjava.jni/pr18278.jar
deleted file mode 100644
index c1bf1489a5b..00000000000
--- a/libjava/testsuite/libjava.jni/pr18278.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/pr23739.h b/libjava/testsuite/libjava.jni/pr23739.h
deleted file mode 100644
index 70f228c8c0e..00000000000
--- a/libjava/testsuite/libjava.jni/pr23739.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __pr23739__
-#define __pr23739__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_pr23739_checkOrder (JNIEnv *env, jclass, jclass, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __pr23739__ */
diff --git a/libjava/testsuite/libjava.jni/pr23739.jar b/libjava/testsuite/libjava.jni/pr23739.jar
deleted file mode 100644
index d8370461b55..00000000000
--- a/libjava/testsuite/libjava.jni/pr23739.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/pr29812.h b/libjava/testsuite/libjava.jni/pr29812.h
deleted file mode 100644
index 70d19993831..00000000000
--- a/libjava/testsuite/libjava.jni/pr29812.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __pr29812__
-#define __pr29812__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_pr29812_baseN (JNIEnv *env, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __pr29812__ */
diff --git a/libjava/testsuite/libjava.jni/pr29812.jar b/libjava/testsuite/libjava.jni/pr29812.jar
deleted file mode 100644
index c3cf6aba0b5..00000000000
--- a/libjava/testsuite/libjava.jni/pr29812.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/pr29812_injar.h b/libjava/testsuite/libjava.jni/pr29812_injar.h
deleted file mode 100644
index 40f74ff393f..00000000000
--- a/libjava/testsuite/libjava.jni/pr29812_injar.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __pr29812_1injar__
-#define __pr29812_1injar__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_pr29812_1injar_doit (JNIEnv *env, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __pr29812_1injar__ */
diff --git a/libjava/testsuite/libjava.jni/pr29812_injar.jar b/libjava/testsuite/libjava.jni/pr29812_injar.jar
deleted file mode 100644
index 438dc0063b5..00000000000
--- a/libjava/testsuite/libjava.jni/pr29812_injar.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/register.h b/libjava/testsuite/libjava.jni/register.h
deleted file mode 100644
index 85b606be8cb..00000000000
--- a/libjava/testsuite/libjava.jni/register.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __register__
-#define __register__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jint JNICALL Java_register_doit (JNIEnv *env, jclass, jint);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __register__ */
diff --git a/libjava/testsuite/libjava.jni/register.jar b/libjava/testsuite/libjava.jni/register.jar
deleted file mode 100644
index e8682e1a031..00000000000
--- a/libjava/testsuite/libjava.jni/register.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/register2.jar b/libjava/testsuite/libjava.jni/register2.jar
deleted file mode 100644
index 807524cdc8b..00000000000
--- a/libjava/testsuite/libjava.jni/register2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/simple_int.h b/libjava/testsuite/libjava.jni/simple_int.h
deleted file mode 100644
index b0b9b579a8e..00000000000
--- a/libjava/testsuite/libjava.jni/simple_int.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __simple_1int__
-#define __simple_1int__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jint JNICALL Java_simple_1int_nat (JNIEnv *env, jclass, jint);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __simple_1int__ */
diff --git a/libjava/testsuite/libjava.jni/simple_int.jar b/libjava/testsuite/libjava.jni/simple_int.jar
deleted file mode 100644
index 1f0bdc67ce0..00000000000
--- a/libjava/testsuite/libjava.jni/simple_int.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/throwit.h b/libjava/testsuite/libjava.jni/throwit.h
deleted file mode 100644
index 97c7223f7d0..00000000000
--- a/libjava/testsuite/libjava.jni/throwit.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __throwit__
-#define __throwit__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_throwit_throwit (JNIEnv *env, jclass, jstring, jboolean);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __throwit__ */
diff --git a/libjava/testsuite/libjava.jni/throwit.jar b/libjava/testsuite/libjava.jni/throwit.jar
deleted file mode 100644
index 9fc43b9d871..00000000000
--- a/libjava/testsuite/libjava.jni/throwit.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jni/virtual.h b/libjava/testsuite/libjava.jni/virtual.h
deleted file mode 100644
index 7d9ef8246e5..00000000000
--- a/libjava/testsuite/libjava.jni/virtual.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#include <jni.h>
-
-#ifndef __virtual__
-#define __virtual__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jboolean JNICALL Java_virtual_equals (JNIEnv *env, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __virtual__ */
diff --git a/libjava/testsuite/libjava.jni/virtual.jar b/libjava/testsuite/libjava.jni/virtual.jar
deleted file mode 100644
index dd4090b9b30..00000000000
--- a/libjava/testsuite/libjava.jni/virtual.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jvmti/events.h b/libjava/testsuite/libjava.jvmti/events.h
deleted file mode 100644
index 2f81b63fead..00000000000
--- a/libjava/testsuite/libjava.jvmti/events.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __events__
-#define __events__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-    class events;
-}
-
-class events : public ::java::lang::Object
-{
-
-public:
-  events();
-  static void do_events_tests();
-  static void main(JArray< ::java::lang::String * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __events__
diff --git a/libjava/testsuite/libjava.jvmti/events.jar b/libjava/testsuite/libjava.jvmti/events.jar
deleted file mode 100644
index 48a69dc7ef2..00000000000
--- a/libjava/testsuite/libjava.jvmti/events.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jvmti/getallthreads.h b/libjava/testsuite/libjava.jvmti/getallthreads.h
deleted file mode 100644
index 7579892f3f7..00000000000
--- a/libjava/testsuite/libjava.jvmti/getallthreads.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __getallthreads__
-#define __getallthreads__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  class getallthreads;
-}
-
-class getallthreads : public ::java::lang::Thread
-{
-public:
-  getallthreads ();
-  static void do_getallthreads_tests ();
-  virtual void run ();
-  virtual void natPlaceholder ();
-  virtual void natRunner ();
-  virtual void placeholder ();
-  virtual void runner ();
-  static void main (JArray< ::java::lang::String *> *);
-  static jint thread_num;
-  static ::java::util::ArrayList *threads;
-  jint __attribute__((aligned(__alignof__( ::java::lang::Thread ))))  ex_frames;
-  jboolean done;
-
-  static ::java::lang::Class class$;
-};
-
-#endif /* __getallthreads__ */
diff --git a/libjava/testsuite/libjava.jvmti/getallthreads.jar b/libjava/testsuite/libjava.jvmti/getallthreads.jar
deleted file mode 100644
index 3e59ccdc362..00000000000
--- a/libjava/testsuite/libjava.jvmti/getallthreads.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.jvmti/geterrorname.h b/libjava/testsuite/libjava.jvmti/geterrorname.h
deleted file mode 100644
index 957e1c23b2e..00000000000
--- a/libjava/testsuite/libjava.jvmti/geterrorname.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __geterrorname__
-#define __geterrorname__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-    class geterrorname;
-}
-
-class geterrorname : public ::java::lang::Object
-{
-
-public:
-  geterrorname();
-  static void do_errorname_tests();
-  static void main(JArray< ::java::lang::String * > *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __geterrorname__
diff --git a/libjava/testsuite/libjava.jvmti/geterrorname.jar b/libjava/testsuite/libjava.jvmti/geterrorname.jar
deleted file mode 100644
index a0c5ae0525d..00000000000
--- a/libjava/testsuite/libjava.jvmti/geterrorname.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/ArrayStore.jar b/libjava/testsuite/libjava.lang/ArrayStore.jar
deleted file mode 100644
index 7c10d12128e..00000000000
--- a/libjava/testsuite/libjava.lang/ArrayStore.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/ArrayStore2.jar b/libjava/testsuite/libjava.lang/ArrayStore2.jar
deleted file mode 100644
index 833a2326489..00000000000
--- a/libjava/testsuite/libjava.lang/ArrayStore2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Array_1.jar b/libjava/testsuite/libjava.lang/Array_1.jar
deleted file mode 100644
index c97b13ae09e..00000000000
--- a/libjava/testsuite/libjava.lang/Array_1.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Array_2.jar b/libjava/testsuite/libjava.lang/Array_2.jar
deleted file mode 100644
index 8713ba7fcde..00000000000
--- a/libjava/testsuite/libjava.lang/Array_2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Array_3.jar b/libjava/testsuite/libjava.lang/Array_3.jar
deleted file mode 100644
index c907e652975..00000000000
--- a/libjava/testsuite/libjava.lang/Array_3.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Class_1.jar b/libjava/testsuite/libjava.lang/Class_1.jar
deleted file mode 100644
index 675609425f9..00000000000
--- a/libjava/testsuite/libjava.lang/Class_1.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/CompareNaN.jar b/libjava/testsuite/libjava.lang/CompareNaN.jar
deleted file mode 100644
index c6b8db44d2f..00000000000
--- a/libjava/testsuite/libjava.lang/CompareNaN.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Divide_1.jar b/libjava/testsuite/libjava.lang/Divide_1.jar
deleted file mode 100644
index 4add13c21e4..00000000000
--- a/libjava/testsuite/libjava.lang/Divide_1.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/EvaluationOrder.jar b/libjava/testsuite/libjava.lang/EvaluationOrder.jar
deleted file mode 100644
index f122c7223ce..00000000000
--- a/libjava/testsuite/libjava.lang/EvaluationOrder.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/ExtraClassLoader.jar b/libjava/testsuite/libjava.lang/ExtraClassLoader.jar
deleted file mode 100644
index 0230f87cade..00000000000
--- a/libjava/testsuite/libjava.lang/ExtraClassLoader.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/FileHandleGcTest.jar b/libjava/testsuite/libjava.lang/FileHandleGcTest.jar
deleted file mode 100644
index b3fc4bd3ce7..00000000000
--- a/libjava/testsuite/libjava.lang/FileHandleGcTest.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Final.jar b/libjava/testsuite/libjava.lang/Final.jar
deleted file mode 100644
index 5c64878e3d9..00000000000
--- a/libjava/testsuite/libjava.lang/Final.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Float_1.jar b/libjava/testsuite/libjava.lang/Float_1.jar
deleted file mode 100644
index 20a6ff00d0d..00000000000
--- a/libjava/testsuite/libjava.lang/Float_1.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Float_2.jar b/libjava/testsuite/libjava.lang/Float_2.jar
deleted file mode 100644
index e3ee4133593..00000000000
--- a/libjava/testsuite/libjava.lang/Float_2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/G19990301_01.jar b/libjava/testsuite/libjava.lang/G19990301_01.jar
deleted file mode 100644
index fd33638c1e1..00000000000
--- a/libjava/testsuite/libjava.lang/G19990301_01.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/G19990302_02.jar b/libjava/testsuite/libjava.lang/G19990302_02.jar
deleted file mode 100644
index bc4f2692a44..00000000000
--- a/libjava/testsuite/libjava.lang/G19990302_02.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/G19990303_01.jar b/libjava/testsuite/libjava.lang/G19990303_01.jar
deleted file mode 100644
index b3e19410316..00000000000
--- a/libjava/testsuite/libjava.lang/G19990303_01.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/G19990303_02.jar b/libjava/testsuite/libjava.lang/G19990303_02.jar
deleted file mode 100644
index e5ef15c3c33..00000000000
--- a/libjava/testsuite/libjava.lang/G19990303_02.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/G19990304_01.jar b/libjava/testsuite/libjava.lang/G19990304_01.jar
deleted file mode 100644
index 1cf234a851e..00000000000
--- a/libjava/testsuite/libjava.lang/G19990304_01.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/G19990310_01.jar b/libjava/testsuite/libjava.lang/G19990310_01.jar
deleted file mode 100644
index e689e43b11f..00000000000
--- a/libjava/testsuite/libjava.lang/G19990310_01.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/II.jar b/libjava/testsuite/libjava.lang/II.jar
deleted file mode 100644
index 22d15cd4ec9..00000000000
--- a/libjava/testsuite/libjava.lang/II.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/InterfaceDispatch.jar b/libjava/testsuite/libjava.lang/InterfaceDispatch.jar
deleted file mode 100644
index 1f87ec30c4e..00000000000
--- a/libjava/testsuite/libjava.lang/InterfaceDispatch.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/InvokeInterface.jar b/libjava/testsuite/libjava.lang/InvokeInterface.jar
deleted file mode 100644
index 55a923a6821..00000000000
--- a/libjava/testsuite/libjava.lang/InvokeInterface.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/InvokeReturn.jar b/libjava/testsuite/libjava.lang/InvokeReturn.jar
deleted file mode 100644
index a64e0d58717..00000000000
--- a/libjava/testsuite/libjava.lang/InvokeReturn.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Invoke_1.jar b/libjava/testsuite/libjava.lang/Invoke_1.jar
deleted file mode 100644
index 6d43ecbba2b..00000000000
--- a/libjava/testsuite/libjava.lang/Invoke_1.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Invoke_2.jar b/libjava/testsuite/libjava.lang/Invoke_2.jar
deleted file mode 100644
index ac8882cabf9..00000000000
--- a/libjava/testsuite/libjava.lang/Invoke_2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/KeepInline.jar b/libjava/testsuite/libjava.lang/KeepInline.jar
deleted file mode 100644
index 754becf5f97..00000000000
--- a/libjava/testsuite/libjava.lang/KeepInline.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/LargeFile.jar b/libjava/testsuite/libjava.lang/LargeFile.jar
deleted file mode 100644
index 245fa484f8a..00000000000
--- a/libjava/testsuite/libjava.lang/LargeFile.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/MathBuiltin.jar b/libjava/testsuite/libjava.lang/MathBuiltin.jar
deleted file mode 100644
index 4cefc678b12..00000000000
--- a/libjava/testsuite/libjava.lang/MathBuiltin.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Matrix4f.jar b/libjava/testsuite/libjava.lang/Matrix4f.jar
deleted file mode 100644
index eaa7241e779..00000000000
--- a/libjava/testsuite/libjava.lang/Matrix4f.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/N19990310_02.jar b/libjava/testsuite/libjava.lang/N19990310_02.jar
deleted file mode 100644
index 49e97e4206e..00000000000
--- a/libjava/testsuite/libjava.lang/N19990310_02.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/N19990310_3.jar b/libjava/testsuite/libjava.lang/N19990310_3.jar
deleted file mode 100644
index a096693aa12..00000000000
--- a/libjava/testsuite/libjava.lang/N19990310_3.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/N19990310_4.jar b/libjava/testsuite/libjava.lang/N19990310_4.jar
deleted file mode 100644
index b21f474529c..00000000000
--- a/libjava/testsuite/libjava.lang/N19990310_4.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/N19990310_5.jar b/libjava/testsuite/libjava.lang/N19990310_5.jar
deleted file mode 100644
index d944000c882..00000000000
--- a/libjava/testsuite/libjava.lang/N19990310_5.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Overflow.jar b/libjava/testsuite/libjava.lang/Overflow.jar
deleted file mode 100644
index 4bfda6b7cfb..00000000000
--- a/libjava/testsuite/libjava.lang/Overflow.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR12350.jar b/libjava/testsuite/libjava.lang/PR12350.jar
deleted file mode 100644
index 8d655c2b1c0..00000000000
--- a/libjava/testsuite/libjava.lang/PR12350.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR12416.jar b/libjava/testsuite/libjava.lang/PR12416.jar
deleted file mode 100644
index 823500854fb..00000000000
--- a/libjava/testsuite/libjava.lang/PR12416.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR12656.jar b/libjava/testsuite/libjava.lang/PR12656.jar
deleted file mode 100644
index c54e92d7885..00000000000
--- a/libjava/testsuite/libjava.lang/PR12656.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR12915.jar b/libjava/testsuite/libjava.lang/PR12915.jar
deleted file mode 100644
index 29ce9c05f68..00000000000
--- a/libjava/testsuite/libjava.lang/PR12915.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR141.jar b/libjava/testsuite/libjava.lang/PR141.jar
deleted file mode 100644
index c7b96294507..00000000000
--- a/libjava/testsuite/libjava.lang/PR141.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR160.jar b/libjava/testsuite/libjava.lang/PR160.jar
deleted file mode 100644
index f1fed747e06..00000000000
--- a/libjava/testsuite/libjava.lang/PR160.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR162.jar b/libjava/testsuite/libjava.lang/PR162.jar
deleted file mode 100644
index 69acecc9d18..00000000000
--- a/libjava/testsuite/libjava.lang/PR162.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR16867.jar b/libjava/testsuite/libjava.lang/PR16867.jar
deleted file mode 100644
index a1c46c4e760..00000000000
--- a/libjava/testsuite/libjava.lang/PR16867.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR18699.jar b/libjava/testsuite/libjava.lang/PR18699.jar
deleted file mode 100644
index c16dc755b1a..00000000000
--- a/libjava/testsuite/libjava.lang/PR18699.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR19870.jar b/libjava/testsuite/libjava.lang/PR19870.jar
deleted file mode 100644
index 13255d8a418..00000000000
--- a/libjava/testsuite/libjava.lang/PR19870.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR19870_2.jar b/libjava/testsuite/libjava.lang/PR19870_2.jar
deleted file mode 100644
index 05daaf98ea0..00000000000
--- a/libjava/testsuite/libjava.lang/PR19870_2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR19921.jar b/libjava/testsuite/libjava.lang/PR19921.jar
deleted file mode 100644
index 515f3bf6fd2..00000000000
--- a/libjava/testsuite/libjava.lang/PR19921.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR20056.jar b/libjava/testsuite/libjava.lang/PR20056.jar
deleted file mode 100644
index 2bd6d54e5bb..00000000000
--- a/libjava/testsuite/libjava.lang/PR20056.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR218.jar b/libjava/testsuite/libjava.lang/PR218.jar
deleted file mode 100644
index 76474040900..00000000000
--- a/libjava/testsuite/libjava.lang/PR218.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR242.jar b/libjava/testsuite/libjava.lang/PR242.jar
deleted file mode 100644
index 41b7fe13707..00000000000
--- a/libjava/testsuite/libjava.lang/PR242.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR25535.jar b/libjava/testsuite/libjava.lang/PR25535.jar
deleted file mode 100644
index 924c256a6d8..00000000000
--- a/libjava/testsuite/libjava.lang/PR25535.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR260.jar b/libjava/testsuite/libjava.lang/PR260.jar
deleted file mode 100644
index a0ca13254c0..00000000000
--- a/libjava/testsuite/libjava.lang/PR260.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR26858.jar b/libjava/testsuite/libjava.lang/PR26858.jar
deleted file mode 100644
index c9b3abbe5a1..00000000000
--- a/libjava/testsuite/libjava.lang/PR26858.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR27908.jar b/libjava/testsuite/libjava.lang/PR27908.jar
deleted file mode 100644
index e2804073642..00000000000
--- a/libjava/testsuite/libjava.lang/PR27908.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR29013.jar b/libjava/testsuite/libjava.lang/PR29013.jar
deleted file mode 100644
index 198ac6e2ee8..00000000000
--- a/libjava/testsuite/libjava.lang/PR29013.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR29495.jar b/libjava/testsuite/libjava.lang/PR29495.jar
deleted file mode 100644
index 6e03871c637..00000000000
--- a/libjava/testsuite/libjava.lang/PR29495.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR3096.jar b/libjava/testsuite/libjava.lang/PR3096.jar
deleted file mode 100644
index 4ed8f4ab6af..00000000000
--- a/libjava/testsuite/libjava.lang/PR3096.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR3731.jar b/libjava/testsuite/libjava.lang/PR3731.jar
deleted file mode 100644
index 7473cb4bd84..00000000000
--- a/libjava/testsuite/libjava.lang/PR3731.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR5057.jar b/libjava/testsuite/libjava.lang/PR5057.jar
deleted file mode 100644
index ac7ac957017..00000000000
--- a/libjava/testsuite/libjava.lang/PR5057.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR5057_2.jar b/libjava/testsuite/libjava.lang/PR5057_2.jar
deleted file mode 100644
index b0accb7473d..00000000000
--- a/libjava/testsuite/libjava.lang/PR5057_2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR55.jar b/libjava/testsuite/libjava.lang/PR55.jar
deleted file mode 100644
index a5cb7d61ead..00000000000
--- a/libjava/testsuite/libjava.lang/PR55.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR56.jar b/libjava/testsuite/libjava.lang/PR56.jar
deleted file mode 100644
index 20f87b596ba..00000000000
--- a/libjava/testsuite/libjava.lang/PR56.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR6085.jar b/libjava/testsuite/libjava.lang/PR6085.jar
deleted file mode 100644
index ec7066085c7..00000000000
--- a/libjava/testsuite/libjava.lang/PR6085.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR6204.jar b/libjava/testsuite/libjava.lang/PR6204.jar
deleted file mode 100644
index 704de3a0630..00000000000
--- a/libjava/testsuite/libjava.lang/PR6204.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR6520.jar b/libjava/testsuite/libjava.lang/PR6520.jar
deleted file mode 100644
index 441d1ea50c1..00000000000
--- a/libjava/testsuite/libjava.lang/PR6520.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR6729.jar b/libjava/testsuite/libjava.lang/PR6729.jar
deleted file mode 100644
index 7e63700af5d..00000000000
--- a/libjava/testsuite/libjava.lang/PR6729.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR6820.jar b/libjava/testsuite/libjava.lang/PR6820.jar
deleted file mode 100644
index ba5d3e1f455..00000000000
--- a/libjava/testsuite/libjava.lang/PR6820.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR7482.jar b/libjava/testsuite/libjava.lang/PR7482.jar
deleted file mode 100644
index f0352021927..00000000000
--- a/libjava/testsuite/libjava.lang/PR7482.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/PR8866.jar b/libjava/testsuite/libjava.lang/PR8866.jar
deleted file mode 100644
index 2bc6d586653..00000000000
--- a/libjava/testsuite/libjava.lang/PR8866.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Process_1.jar b/libjava/testsuite/libjava.lang/Process_1.jar
deleted file mode 100644
index 8499991d747..00000000000
--- a/libjava/testsuite/libjava.lang/Process_1.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Process_2.jar b/libjava/testsuite/libjava.lang/Process_2.jar
deleted file mode 100644
index 2b26bff2dc9..00000000000
--- a/libjava/testsuite/libjava.lang/Process_2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Process_3.jar b/libjava/testsuite/libjava.lang/Process_3.jar
deleted file mode 100644
index 620a644e705..00000000000
--- a/libjava/testsuite/libjava.lang/Process_3.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Process_4.jar b/libjava/testsuite/libjava.lang/Process_4.jar
deleted file mode 100644
index 2014ad0403f..00000000000
--- a/libjava/testsuite/libjava.lang/Process_4.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Process_5.jar b/libjava/testsuite/libjava.lang/Process_5.jar
deleted file mode 100644
index 1046430ddca..00000000000
--- a/libjava/testsuite/libjava.lang/Process_5.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Process_6.jar b/libjava/testsuite/libjava.lang/Process_6.jar
deleted file mode 100644
index a1a35005dfc..00000000000
--- a/libjava/testsuite/libjava.lang/Process_6.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/RH194522.jar b/libjava/testsuite/libjava.lang/RH194522.jar
deleted file mode 100644
index a7c75a24690..00000000000
--- a/libjava/testsuite/libjava.lang/RH194522.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Serialization.jar b/libjava/testsuite/libjava.lang/Serialization.jar
deleted file mode 100644
index 376cb6b46e0..00000000000
--- a/libjava/testsuite/libjava.lang/Serialization.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Shazam.jar b/libjava/testsuite/libjava.lang/Shazam.jar
deleted file mode 100644
index b3257f6f82c..00000000000
--- a/libjava/testsuite/libjava.lang/Shazam.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/StackTrace2.jar b/libjava/testsuite/libjava.lang/StackTrace2.jar
deleted file mode 100644
index fc289f1da79..00000000000
--- a/libjava/testsuite/libjava.lang/StackTrace2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/StaticConstructor.jar b/libjava/testsuite/libjava.lang/StaticConstructor.jar
deleted file mode 100644
index 0f4ff4c79b6..00000000000
--- a/libjava/testsuite/libjava.lang/StaticConstructor.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/StringBuffer_1.jar b/libjava/testsuite/libjava.lang/StringBuffer_1.jar
deleted file mode 100644
index fd406afbccf..00000000000
--- a/libjava/testsuite/libjava.lang/StringBuffer_1.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/StringBuffer_overflow.jar b/libjava/testsuite/libjava.lang/StringBuffer_overflow.jar
deleted file mode 100644
index be8b655ea6a..00000000000
--- a/libjava/testsuite/libjava.lang/StringBuffer_overflow.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/String_overflow.jar b/libjava/testsuite/libjava.lang/String_overflow.jar
deleted file mode 100644
index 1400db820dd..00000000000
--- a/libjava/testsuite/libjava.lang/String_overflow.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/SyncGlobal.jar b/libjava/testsuite/libjava.lang/SyncGlobal.jar
deleted file mode 100644
index 54589c286d6..00000000000
--- a/libjava/testsuite/libjava.lang/SyncGlobal.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/SyncTest.jar b/libjava/testsuite/libjava.lang/SyncTest.jar
deleted file mode 100644
index 3f30e7a0f64..00000000000
--- a/libjava/testsuite/libjava.lang/SyncTest.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Synch.jar b/libjava/testsuite/libjava.lang/Synch.jar
deleted file mode 100644
index 10b758009ff..00000000000
--- a/libjava/testsuite/libjava.lang/Synch.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/TLtest.jar b/libjava/testsuite/libjava.lang/TLtest.jar
deleted file mode 100644
index de4ed66d9c1..00000000000
--- a/libjava/testsuite/libjava.lang/TLtest.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/TestProxy.jar b/libjava/testsuite/libjava.lang/TestProxy.jar
deleted file mode 100644
index 706f086a4ab..00000000000
--- a/libjava/testsuite/libjava.lang/TestProxy.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Thread_Alive.jar b/libjava/testsuite/libjava.lang/Thread_Alive.jar
deleted file mode 100644
index 548b6a95fcb..00000000000
--- a/libjava/testsuite/libjava.lang/Thread_Alive.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Thread_HoldsLock.jar b/libjava/testsuite/libjava.lang/Thread_HoldsLock.jar
deleted file mode 100644
index 8c094f6b7fe..00000000000
--- a/libjava/testsuite/libjava.lang/Thread_HoldsLock.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Thread_Interrupt.jar b/libjava/testsuite/libjava.lang/Thread_Interrupt.jar
deleted file mode 100644
index b52d4367399..00000000000
--- a/libjava/testsuite/libjava.lang/Thread_Interrupt.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Thread_Join.jar b/libjava/testsuite/libjava.lang/Thread_Join.jar
deleted file mode 100644
index 4a1d2529c62..00000000000
--- a/libjava/testsuite/libjava.lang/Thread_Join.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Thread_Monitor.jar b/libjava/testsuite/libjava.lang/Thread_Monitor.jar
deleted file mode 100644
index 2345c8b63cc..00000000000
--- a/libjava/testsuite/libjava.lang/Thread_Monitor.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Thread_Sleep.jar b/libjava/testsuite/libjava.lang/Thread_Sleep.jar
deleted file mode 100644
index 2320add2920..00000000000
--- a/libjava/testsuite/libjava.lang/Thread_Sleep.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Thread_Sleep_2.jar b/libjava/testsuite/libjava.lang/Thread_Sleep_2.jar
deleted file mode 100644
index a657ed91a77..00000000000
--- a/libjava/testsuite/libjava.lang/Thread_Sleep_2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Thread_Wait.jar b/libjava/testsuite/libjava.lang/Thread_Wait.jar
deleted file mode 100644
index 1ecb6a3e383..00000000000
--- a/libjava/testsuite/libjava.lang/Thread_Wait.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Thread_Wait_2.jar b/libjava/testsuite/libjava.lang/Thread_Wait_2.jar
deleted file mode 100644
index b043de48aa9..00000000000
--- a/libjava/testsuite/libjava.lang/Thread_Wait_2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.jar b/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.jar
deleted file mode 100644
index dcafc43c660..00000000000
--- a/libjava/testsuite/libjava.lang/Thread_Wait_Interrupt.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Throw_1.jar b/libjava/testsuite/libjava.lang/Throw_1.jar
deleted file mode 100644
index 330562d501f..00000000000
--- a/libjava/testsuite/libjava.lang/Throw_1.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Throw_2.jar b/libjava/testsuite/libjava.lang/Throw_2.jar
deleted file mode 100644
index 6cfb11fe5e7..00000000000
--- a/libjava/testsuite/libjava.lang/Throw_2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/Throw_3.jar b/libjava/testsuite/libjava.lang/Throw_3.jar
deleted file mode 100644
index 0aefbe04faa..00000000000
--- a/libjava/testsuite/libjava.lang/Throw_3.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/anfi.jar b/libjava/testsuite/libjava.lang/anfi.jar
deleted file mode 100644
index 81225e4d2e5..00000000000
--- a/libjava/testsuite/libjava.lang/anfi.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/anon.jar b/libjava/testsuite/libjava.lang/anon.jar
deleted file mode 100644
index 295e1647a6e..00000000000
--- a/libjava/testsuite/libjava.lang/anon.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/anon2.jar b/libjava/testsuite/libjava.lang/anon2.jar
deleted file mode 100644
index 3906ff54076..00000000000
--- a/libjava/testsuite/libjava.lang/anon2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/anon3.jar b/libjava/testsuite/libjava.lang/anon3.jar
deleted file mode 100644
index 83bce16f830..00000000000
--- a/libjava/testsuite/libjava.lang/anon3.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/anon4.jar b/libjava/testsuite/libjava.lang/anon4.jar
deleted file mode 100644
index 5362e8d59de..00000000000
--- a/libjava/testsuite/libjava.lang/anon4.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/anon_ctor_itf_arg.jar b/libjava/testsuite/libjava.lang/anon_ctor_itf_arg.jar
deleted file mode 100644
index d9c42028a9d..00000000000
--- a/libjava/testsuite/libjava.lang/anon_ctor_itf_arg.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/anonarray.jar b/libjava/testsuite/libjava.lang/anonarray.jar
deleted file mode 100644
index d2b2070b428..00000000000
--- a/libjava/testsuite/libjava.lang/anonarray.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/anonarray2.jar b/libjava/testsuite/libjava.lang/anonarray2.jar
deleted file mode 100644
index 608a08174d6..00000000000
--- a/libjava/testsuite/libjava.lang/anonarray2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/anonarray3.jar b/libjava/testsuite/libjava.lang/anonarray3.jar
deleted file mode 100644
index b24906fa8dc..00000000000
--- a/libjava/testsuite/libjava.lang/anonarray3.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/assign.jar b/libjava/testsuite/libjava.lang/assign.jar
deleted file mode 100644
index 1b9896c7e5c..00000000000
--- a/libjava/testsuite/libjava.lang/assign.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/assign2.jar b/libjava/testsuite/libjava.lang/assign2.jar
deleted file mode 100644
index 8f1e1164b35..00000000000
--- a/libjava/testsuite/libjava.lang/assign2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/bclink.jar b/libjava/testsuite/libjava.lang/bclink.jar
deleted file mode 100644
index 86709d63d2e..00000000000
--- a/libjava/testsuite/libjava.lang/bclink.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/bytearray.jar b/libjava/testsuite/libjava.lang/bytearray.jar
deleted file mode 100644
index 550ae7b85e0..00000000000
--- a/libjava/testsuite/libjava.lang/bytearray.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/direct_read.jar b/libjava/testsuite/libjava.lang/direct_read.jar
deleted file mode 100644
index da334fb585c..00000000000
--- a/libjava/testsuite/libjava.lang/direct_read.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/direct_write.jar b/libjava/testsuite/libjava.lang/direct_write.jar
deleted file mode 100644
index b3188aa645e..00000000000
--- a/libjava/testsuite/libjava.lang/direct_write.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/emptystring.jar b/libjava/testsuite/libjava.lang/emptystring.jar
deleted file mode 100644
index 6303487c29e..00000000000
--- a/libjava/testsuite/libjava.lang/emptystring.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err1.jar b/libjava/testsuite/libjava.lang/err1.jar
deleted file mode 100644
index 11917d98b1e..00000000000
--- a/libjava/testsuite/libjava.lang/err1.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err10.jar b/libjava/testsuite/libjava.lang/err10.jar
deleted file mode 100644
index 05d8f96fcd2..00000000000
--- a/libjava/testsuite/libjava.lang/err10.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err11.jar b/libjava/testsuite/libjava.lang/err11.jar
deleted file mode 100644
index a818007ac25..00000000000
--- a/libjava/testsuite/libjava.lang/err11.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err12.jar b/libjava/testsuite/libjava.lang/err12.jar
deleted file mode 100644
index ec9f19bf239..00000000000
--- a/libjava/testsuite/libjava.lang/err12.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err13.jar b/libjava/testsuite/libjava.lang/err13.jar
deleted file mode 100644
index dde18306c2b..00000000000
--- a/libjava/testsuite/libjava.lang/err13.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err14.jar b/libjava/testsuite/libjava.lang/err14.jar
deleted file mode 100644
index f1b6785f20f..00000000000
--- a/libjava/testsuite/libjava.lang/err14.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err2.jar b/libjava/testsuite/libjava.lang/err2.jar
deleted file mode 100644
index d825a602da4..00000000000
--- a/libjava/testsuite/libjava.lang/err2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err3.jar b/libjava/testsuite/libjava.lang/err3.jar
deleted file mode 100644
index be1bd617a4b..00000000000
--- a/libjava/testsuite/libjava.lang/err3.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err4.jar b/libjava/testsuite/libjava.lang/err4.jar
deleted file mode 100644
index f1e782271ed..00000000000
--- a/libjava/testsuite/libjava.lang/err4.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err5.jar b/libjava/testsuite/libjava.lang/err5.jar
deleted file mode 100644
index 9a573abcbb9..00000000000
--- a/libjava/testsuite/libjava.lang/err5.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err6.jar b/libjava/testsuite/libjava.lang/err6.jar
deleted file mode 100644
index 2a12b80e44c..00000000000
--- a/libjava/testsuite/libjava.lang/err6.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err7.jar b/libjava/testsuite/libjava.lang/err7.jar
deleted file mode 100644
index f349844970b..00000000000
--- a/libjava/testsuite/libjava.lang/err7.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err8.jar b/libjava/testsuite/libjava.lang/err8.jar
deleted file mode 100644
index 5baf89b259a..00000000000
--- a/libjava/testsuite/libjava.lang/err8.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/err9.jar b/libjava/testsuite/libjava.lang/err9.jar
deleted file mode 100644
index cb629e3f9ff..00000000000
--- a/libjava/testsuite/libjava.lang/err9.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/final_inner.jar b/libjava/testsuite/libjava.lang/final_inner.jar
deleted file mode 100644
index 0a37fd96046..00000000000
--- a/libjava/testsuite/libjava.lang/final_inner.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/final_int.jar b/libjava/testsuite/libjava.lang/final_int.jar
deleted file mode 100644
index 43feb70e015..00000000000
--- a/libjava/testsuite/libjava.lang/final_int.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/final_static_and_friend.jar b/libjava/testsuite/libjava.lang/final_static_and_friend.jar
deleted file mode 100644
index ca7b2ad0ab1..00000000000
--- a/libjava/testsuite/libjava.lang/final_static_and_friend.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/indirect.jar b/libjava/testsuite/libjava.lang/indirect.jar
deleted file mode 100644
index bc772864ff3..00000000000
--- a/libjava/testsuite/libjava.lang/indirect.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/indirect_read.jar b/libjava/testsuite/libjava.lang/indirect_read.jar
deleted file mode 100644
index d0835e990ca..00000000000
--- a/libjava/testsuite/libjava.lang/indirect_read.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/indirect_write.jar b/libjava/testsuite/libjava.lang/indirect_write.jar
deleted file mode 100644
index 9393a27a536..00000000000
--- a/libjava/testsuite/libjava.lang/indirect_write.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/initexc.jar b/libjava/testsuite/libjava.lang/initexc.jar
deleted file mode 100644
index d43546fcb3d..00000000000
--- a/libjava/testsuite/libjava.lang/initexc.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/initfield.jar b/libjava/testsuite/libjava.lang/initfield.jar
deleted file mode 100644
index 955cb02e822..00000000000
--- a/libjava/testsuite/libjava.lang/initfield.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/inline.jar b/libjava/testsuite/libjava.lang/inline.jar
deleted file mode 100644
index b5c9449a863..00000000000
--- a/libjava/testsuite/libjava.lang/inline.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/inner1.jar b/libjava/testsuite/libjava.lang/inner1.jar
deleted file mode 100644
index 382ba64eefc..00000000000
--- a/libjava/testsuite/libjava.lang/inner1.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/inner2.jar b/libjava/testsuite/libjava.lang/inner2.jar
deleted file mode 100644
index 48e917e711f..00000000000
--- a/libjava/testsuite/libjava.lang/inner2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/inner3.jar b/libjava/testsuite/libjava.lang/inner3.jar
deleted file mode 100644
index a128236a473..00000000000
--- a/libjava/testsuite/libjava.lang/inner3.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/inner4.jar b/libjava/testsuite/libjava.lang/inner4.jar
deleted file mode 100644
index cdfb0be4b91..00000000000
--- a/libjava/testsuite/libjava.lang/inner4.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/inner_array.jar b/libjava/testsuite/libjava.lang/inner_array.jar
deleted file mode 100644
index eddcff57708..00000000000
--- a/libjava/testsuite/libjava.lang/inner_array.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/inner_interface.jar b/libjava/testsuite/libjava.lang/inner_interface.jar
deleted file mode 100644
index b85f38ac02c..00000000000
--- a/libjava/testsuite/libjava.lang/inner_interface.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/instance.jar b/libjava/testsuite/libjava.lang/instance.jar
deleted file mode 100644
index 76914109743..00000000000
--- a/libjava/testsuite/libjava.lang/instance.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/instinit.jar b/libjava/testsuite/libjava.lang/instinit.jar
deleted file mode 100644
index 93684344ef2..00000000000
--- a/libjava/testsuite/libjava.lang/instinit.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/instinit2.jar b/libjava/testsuite/libjava.lang/instinit2.jar
deleted file mode 100644
index 7573a0dd8eb..00000000000
--- a/libjava/testsuite/libjava.lang/instinit2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/invoke_from_inner.jar b/libjava/testsuite/libjava.lang/invoke_from_inner.jar
deleted file mode 100644
index 064e0184bf8..00000000000
--- a/libjava/testsuite/libjava.lang/invoke_from_inner.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/invokethrow.jar b/libjava/testsuite/libjava.lang/invokethrow.jar
deleted file mode 100644
index 1344d624d9b..00000000000
--- a/libjava/testsuite/libjava.lang/invokethrow.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/klass.jar b/libjava/testsuite/libjava.lang/klass.jar
deleted file mode 100644
index 269f96daf55..00000000000
--- a/libjava/testsuite/libjava.lang/klass.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/md5test.jar b/libjava/testsuite/libjava.lang/md5test.jar
deleted file mode 100644
index d38891b792e..00000000000
--- a/libjava/testsuite/libjava.lang/md5test.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/multiple_finit.jar b/libjava/testsuite/libjava.lang/multiple_finit.jar
deleted file mode 100644
index cd8152284cc..00000000000
--- a/libjava/testsuite/libjava.lang/multiple_finit.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/negzero.jar b/libjava/testsuite/libjava.lang/negzero.jar
deleted file mode 100644
index 1f23c61da92..00000000000
--- a/libjava/testsuite/libjava.lang/negzero.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/nested_with_ctor.jar b/libjava/testsuite/libjava.lang/nested_with_ctor.jar
deleted file mode 100644
index 31c5d456b04..00000000000
--- a/libjava/testsuite/libjava.lang/nested_with_ctor.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/newarray_overflow.jar b/libjava/testsuite/libjava.lang/newarray_overflow.jar
deleted file mode 100644
index 65413ccb0f3..00000000000
--- a/libjava/testsuite/libjava.lang/newarray_overflow.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/override.jar b/libjava/testsuite/libjava.lang/override.jar
deleted file mode 100644
index ab734b88c0c..00000000000
--- a/libjava/testsuite/libjava.lang/override.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr100.jar b/libjava/testsuite/libjava.lang/pr100.jar
deleted file mode 100644
index a7f49216faf..00000000000
--- a/libjava/testsuite/libjava.lang/pr100.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr109.jar b/libjava/testsuite/libjava.lang/pr109.jar
deleted file mode 100644
index fbcdf264da7..00000000000
--- a/libjava/testsuite/libjava.lang/pr109.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr13107.jar b/libjava/testsuite/libjava.lang/pr13107.jar
deleted file mode 100644
index 89f4779d499..00000000000
--- a/libjava/testsuite/libjava.lang/pr13107.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr13107_2.jar b/libjava/testsuite/libjava.lang/pr13107_2.jar
deleted file mode 100644
index 5dad7ade977..00000000000
--- a/libjava/testsuite/libjava.lang/pr13107_2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr13107_3.jar b/libjava/testsuite/libjava.lang/pr13107_3.jar
deleted file mode 100644
index 8fe3275139b..00000000000
--- a/libjava/testsuite/libjava.lang/pr13107_3.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr133.jar b/libjava/testsuite/libjava.lang/pr133.jar
deleted file mode 100644
index f9e36ef9bae..00000000000
--- a/libjava/testsuite/libjava.lang/pr133.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr16789.jar b/libjava/testsuite/libjava.lang/pr16789.jar
deleted file mode 100644
index 4c95e0417f7..00000000000
--- a/libjava/testsuite/libjava.lang/pr16789.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr17536.jar b/libjava/testsuite/libjava.lang/pr17536.jar
deleted file mode 100644
index 513e4d92c4c..00000000000
--- a/libjava/testsuite/libjava.lang/pr17536.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr179.jar b/libjava/testsuite/libjava.lang/pr179.jar
deleted file mode 100644
index 2eaee64e959..00000000000
--- a/libjava/testsuite/libjava.lang/pr179.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr184.jar b/libjava/testsuite/libjava.lang/pr184.jar
deleted file mode 100644
index 2770b3d1183..00000000000
--- a/libjava/testsuite/libjava.lang/pr184.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr21785.jar b/libjava/testsuite/libjava.lang/pr21785.jar
deleted file mode 100644
index e2edfd48acd..00000000000
--- a/libjava/testsuite/libjava.lang/pr21785.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr21844.jar b/libjava/testsuite/libjava.lang/pr21844.jar
deleted file mode 100644
index 92c7be511cb..00000000000
--- a/libjava/testsuite/libjava.lang/pr21844.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr22211.jar b/libjava/testsuite/libjava.lang/pr22211.jar
deleted file mode 100644
index a743c441199..00000000000
--- a/libjava/testsuite/libjava.lang/pr22211.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr24321.jar b/libjava/testsuite/libjava.lang/pr24321.jar
deleted file mode 100644
index 335298a4d91..00000000000
--- a/libjava/testsuite/libjava.lang/pr24321.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr25676.jar b/libjava/testsuite/libjava.lang/pr25676.jar
deleted file mode 100644
index c0e0d4c72b8..00000000000
--- a/libjava/testsuite/libjava.lang/pr25676.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr26390.jar b/libjava/testsuite/libjava.lang/pr26390.jar
deleted file mode 100644
index 2320e406db8..00000000000
--- a/libjava/testsuite/libjava.lang/pr26390.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr26990.jar b/libjava/testsuite/libjava.lang/pr26990.jar
deleted file mode 100644
index 32ec05673f4..00000000000
--- a/libjava/testsuite/libjava.lang/pr26990.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr27171.jar b/libjava/testsuite/libjava.lang/pr27171.jar
deleted file mode 100644
index 20422fb7ef5..00000000000
--- a/libjava/testsuite/libjava.lang/pr27171.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr6388.jar b/libjava/testsuite/libjava.lang/pr6388.jar
deleted file mode 100644
index 5f4e4c0ed5a..00000000000
--- a/libjava/testsuite/libjava.lang/pr6388.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr83.jar b/libjava/testsuite/libjava.lang/pr83.jar
deleted file mode 100644
index 68e29f8f88a..00000000000
--- a/libjava/testsuite/libjava.lang/pr83.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr8415.jar b/libjava/testsuite/libjava.lang/pr8415.jar
deleted file mode 100644
index 0701225fbd0..00000000000
--- a/libjava/testsuite/libjava.lang/pr8415.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr8676.jar b/libjava/testsuite/libjava.lang/pr8676.jar
deleted file mode 100644
index a5973015395..00000000000
--- a/libjava/testsuite/libjava.lang/pr8676.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr8823.jar b/libjava/testsuite/libjava.lang/pr8823.jar
deleted file mode 100644
index bb232843356..00000000000
--- a/libjava/testsuite/libjava.lang/pr8823.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/pr8945.jar b/libjava/testsuite/libjava.lang/pr8945.jar
deleted file mode 100644
index dd244b5b0a3..00000000000
--- a/libjava/testsuite/libjava.lang/pr8945.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/private_direct_read.jar b/libjava/testsuite/libjava.lang/private_direct_read.jar
deleted file mode 100644
index e44c0686ea0..00000000000
--- a/libjava/testsuite/libjava.lang/private_direct_read.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/private_direct_write.jar b/libjava/testsuite/libjava.lang/private_direct_write.jar
deleted file mode 100644
index 06ef8bf6a0e..00000000000
--- a/libjava/testsuite/libjava.lang/private_direct_write.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/private_indirect_read.jar b/libjava/testsuite/libjava.lang/private_indirect_read.jar
deleted file mode 100644
index 1683111acd0..00000000000
--- a/libjava/testsuite/libjava.lang/private_indirect_read.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/private_indirect_write.jar b/libjava/testsuite/libjava.lang/private_indirect_write.jar
deleted file mode 100644
index ace4c5a019b..00000000000
--- a/libjava/testsuite/libjava.lang/private_indirect_write.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/search_outer.jar b/libjava/testsuite/libjava.lang/search_outer.jar
deleted file mode 100644
index 136dbb353ac..00000000000
--- a/libjava/testsuite/libjava.lang/search_outer.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/shatest.jar b/libjava/testsuite/libjava.lang/shatest.jar
deleted file mode 100644
index 58c3d4f472c..00000000000
--- a/libjava/testsuite/libjava.lang/shatest.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/stacktrace.jar b/libjava/testsuite/libjava.lang/stacktrace.jar
deleted file mode 100644
index 9ae27ab7769..00000000000
--- a/libjava/testsuite/libjava.lang/stacktrace.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/stringconst.jar b/libjava/testsuite/libjava.lang/stringconst.jar
deleted file mode 100644
index aab9f9391d4..00000000000
--- a/libjava/testsuite/libjava.lang/stringconst.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/stringconst2.jar b/libjava/testsuite/libjava.lang/stringconst2.jar
deleted file mode 100644
index 5a6bee37ce0..00000000000
--- a/libjava/testsuite/libjava.lang/stringconst2.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/stub.jar b/libjava/testsuite/libjava.lang/stub.jar
deleted file mode 100644
index 1c2fca17bda..00000000000
--- a/libjava/testsuite/libjava.lang/stub.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/test_long.jar b/libjava/testsuite/libjava.lang/test_long.jar
deleted file mode 100644
index f6b3ee0c3fe..00000000000
--- a/libjava/testsuite/libjava.lang/test_long.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/tmi.jar b/libjava/testsuite/libjava.lang/tmi.jar
deleted file mode 100644
index 3e77d864113..00000000000
--- a/libjava/testsuite/libjava.lang/tmi.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/tp.jar b/libjava/testsuite/libjava.lang/tp.jar
deleted file mode 100644
index 9cf6cb8cb3d..00000000000
--- a/libjava/testsuite/libjava.lang/tp.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/update_outer.jar b/libjava/testsuite/libjava.lang/update_outer.jar
deleted file mode 100644
index f6489d07e7e..00000000000
--- a/libjava/testsuite/libjava.lang/update_outer.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/utf8concat.jar b/libjava/testsuite/libjava.lang/utf8concat.jar
deleted file mode 100644
index 55ba02a6a4f..00000000000
--- a/libjava/testsuite/libjava.lang/utf8concat.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/utilTest.jar b/libjava/testsuite/libjava.lang/utilTest.jar
deleted file mode 100644
index f3a4169ad96..00000000000
--- a/libjava/testsuite/libjava.lang/utilTest.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.lang/verify.jar b/libjava/testsuite/libjava.lang/verify.jar
deleted file mode 100644
index 7946994b72f..00000000000
--- a/libjava/testsuite/libjava.lang/verify.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.loader/TestEarlyGC.jar b/libjava/testsuite/libjava.loader/TestEarlyGC.jar
deleted file mode 100644
index 7a9c0ef1fca..00000000000
--- a/libjava/testsuite/libjava.loader/TestEarlyGC.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.loader/TestLeak.jar b/libjava/testsuite/libjava.loader/TestLeak.jar
deleted file mode 100644
index d7bd24737e5..00000000000
--- a/libjava/testsuite/libjava.loader/TestLeak.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.loader/TestMultiple.jar b/libjava/testsuite/libjava.loader/TestMultiple.jar
deleted file mode 100644
index dfb454cfe58..00000000000
--- a/libjava/testsuite/libjava.loader/TestMultiple.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.loader/TestParent.jar b/libjava/testsuite/libjava.loader/TestParent.jar
deleted file mode 100644
index 41f66db5281..00000000000
--- a/libjava/testsuite/libjava.loader/TestParent.jar
+++ /dev/null
diff --git a/libjava/testsuite/libjava.loader/dummy.class b/libjava/testsuite/libjava.loader/dummy.class
deleted file mode 100644
index 58ffb90f264..00000000000
--- a/libjava/testsuite/libjava.loader/dummy.class
+++ /dev/null